From 9773b16a98c946e42d39afccc6255e1f1f611aed Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 27 Mar 2016 14:41:25 +0200
Subject: Fixes FS#166 - Images cannot be opened since storing in private image
 folder

---
 src/main/AndroidManifest.xml                       |  9 ++++++++
 .../conversationsplus/persistance/FileBackend.java |  2 +-
 .../providers/ConversationsPlusFileProvider.java   | 20 +++++++++++++++++
 .../ui/adapter/MessageAdapter.java                 | 25 ++++++++++++++++++++--
 src/main/res/xml/filepaths.xml                     |  4 ++++
 5 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
 create mode 100644 src/main/res/xml/filepaths.xml

(limited to 'src')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 04f1bc33..ca369a5d 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -175,6 +175,15 @@
                 <action android:name="android.service.chooser.ChooserTargetService" />
             </intent-filter>
         </service>
+        <provider
+            android:authorities="de.thedevstack.conversationsplus"
+            android:name=".providers.ConversationsPlusFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
     </application>
 
 </manifest>
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index 45510661..5645caf6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -98,7 +98,7 @@ public class FileBackend {
 		return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + File.separator + ConversationsPlusPreferences.imgTransferFolder() + File.separator;
 	}
 
-    private static String getPrivateFileDirectoryPath() {
+    public static String getPrivateFileDirectoryPath() {
         return ConversationsPlusApplication.getPrivateFilesDir().getAbsolutePath();
     }
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java b/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
new file mode 100644
index 00000000..a718b161
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
@@ -0,0 +1,20 @@
+package de.thedevstack.conversationsplus.providers;
+
+import android.net.Uri;
+import android.support.v4.content.FileProvider;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.entities.DownloadableFile;
+
+/**
+ * Created by lookshe on 27.03.16.
+ */
+public class ConversationsPlusFileProvider extends FileProvider {
+
+    private static final String SCHEME = "content";
+    private static final String AUTHORITY = "de.thedevstack.conversationsplus";
+
+    public static Uri createUriForPrivateFile(DownloadableFile file) {
+        return FileProvider.getUriForFile(ConversationsPlusApplication.getAppContext(), AUTHORITY, file);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index 09db28d0..bcfc1dc6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -38,6 +38,7 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.crypto.axolotl.XmppAxolotlSession;
@@ -48,6 +49,7 @@ import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.Message.FileParams;
 import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
+import de.thedevstack.conversationsplus.providers.ConversationsPlusFileProvider;
 import de.thedevstack.conversationsplus.services.AvatarService;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
@@ -652,16 +654,35 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
 			return;
 		}
+		boolean bInPrivateStorage = false;
+		if (file.getAbsolutePath().startsWith(FileBackend.getPrivateFileDirectoryPath())) {
+			bInPrivateStorage = true;
+		}
 		Intent openIntent = new Intent(Intent.ACTION_VIEW);
 		String mime = file.getMimeType();
 		if (mime == null) {
 			mime = "*/*";
 		}
-		openIntent.setDataAndType(Uri.fromFile(file), mime);
+		Uri uri;
+		if (bInPrivateStorage) {
+			uri = ConversationsPlusFileProvider.createUriForPrivateFile(file);
+		} else {
+			uri = Uri.fromFile(file);
+		}
+		openIntent.setDataAndType(uri, mime);
 		PackageManager manager = activity.getPackageManager();
 		List<ResolveInfo> infos = manager.queryIntentActivities(openIntent, 0);
+		if (bInPrivateStorage) {
+			for (ResolveInfo info : infos) {
+				ConversationsPlusApplication.getAppContext().grantUriPermission(info.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+			}
+		}
 		if (infos.size() == 0) {
-			openIntent.setDataAndType(Uri.fromFile(file),"*/*");
+			openIntent.setDataAndType(uri,"*/*");
+		}
+		if (bInPrivateStorage) {
+			openIntent.putExtra(Intent.EXTRA_STREAM, uri);
+			openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 		}
 		try {
 			getContext().startActivity(openIntent);
diff --git a/src/main/res/xml/filepaths.xml b/src/main/res/xml/filepaths.xml
new file mode 100644
index 00000000..71062dda
--- /dev/null
+++ b/src/main/res/xml/filepaths.xml
@@ -0,0 +1,4 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <files-path name="conversationsplus_images" path="Images/"/>
+    <files-path name="conversationsplus_files" path="files/" />
+</paths>
\ No newline at end of file
-- 
cgit v1.2.3