diff options
| author | Christian S <christian@pix-art.de> | 2016-03-17 20:26:23 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-17 20:26:23 +0100 |
| commit | 5ae161a593e651df09556659e129d22579548e6b (patch) | |
| tree | 860883b1e4f8adde36f7ae4b52155f4bc9bdba87 /src/main/java/eu/siacs/conversations/utils | |
| parent | 92a9299a38fdb2861ec3544950e47dd9d9e82e0a (diff) | |
| parent | c4b1f6171d2bf82e44a3ba567f7732cc8beef717 (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 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java index ad8b8640f..6e75d41cd 100644 --- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java @@ -10,6 +10,8 @@ import android.os.Environment; import android.provider.DocumentsContract; import android.provider.MediaStore; +import java.io.File; + public class FileUtils { /** @@ -77,7 +79,14 @@ public class FileUtils { } // MediaStore (and general) else if ("content".equalsIgnoreCase(uri.getScheme())) { - return getDataColumn(context, uri, null, null); + String path = getDataColumn(context, uri, null, null); + if (path != null) { + File file = new File(path); + if (!file.canRead()) { + return null; + } + } + return path; } // File else if ("file".equalsIgnoreCase(uri.getScheme())) { |