diff options
| author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
| commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
| tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/java/eu/siacs/conversations/utils | |
| parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
| parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/FileUtils.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java index c29841112..ad8b8640f 100644 --- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java @@ -23,6 +23,9 @@ public class FileUtils { */ @SuppressLint("NewApi") public static String getPath(final Context context, final Uri uri) { + if (uri == null) { + return null; + } final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; |