Merge pull request #1767 from fiaxh/path_file_accessible

Daniel Gultsch created 10 years ago

Check if path for URI is accessible

Change summary

src/main/java/eu/siacs/conversations/utils/FileUtils.java | 11 ++++++++
1 file changed, 10 insertions(+), 1 deletion(-)

Detailed changes

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())) {