From 49cea4f6f4d1f35a6afb51c5a4bb76a50cef3495 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 21 Nov 2017 19:48:49 +0100
Subject: FileProvider: attempt to work with sd cards

---
 src/main/java/de/pixart/messenger/persistance/FileBackend.java   | 2 +-
 src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 43f362993..17a90c84a 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -554,7 +554,7 @@ public class FileBackend {
                 return FileProvider.getUriForFile(context, packageId + FILE_PROVIDER, file);
             } catch (IllegalArgumentException e) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    throw new SecurityException();
+                    throw new SecurityException(e);
                 } else {
                     return Uri.fromFile(file);
                 }
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index fdb57e692..48f971ac9 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -1096,6 +1096,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         try {
             uri = FileBackend.getUriForFile(activity, file);
         } catch (SecurityException e) {
+            Log.d(Config.LOGTAG, "No permission to access " + file.getAbsolutePath(), e);
             Toast.makeText(activity, activity.getString(R.string.no_permission_to_access_x, file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
             return;
         }
-- 
cgit v1.2.3