From d74f6d457afaf1369ba4eadf797914141004b27d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 7 Jan 2019 16:47:56 -0600
Subject: [PATCH] Fix attachment issues on pre-lollipop devices

---
 app/src/main/AndroidManifest.xml                       | 10 ++++++++++
 .../java/com/todoroo/astrid/utility/Constants.java     |  2 +-
 .../main/java/org/tasks/activities/CameraActivity.java | 10 ++++------
 app/src/main/java/org/tasks/files/FileExplore.java     |  5 ++++-
 app/src/main/java/org/tasks/files/FileHelper.java      |  8 ++------
 app/src/main/java/org/tasks/files/NNFileProvider.java  |  6 ++++++
 .../main/java/org/tasks/preferences/Preferences.java   |  2 +-
 app/src/main/res/xml/file_provider_paths.xml           |  8 ++++----
 8 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/org/tasks/files/NNFileProvider.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 811ab2c36..9d2382b86 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -228,6 +228,16 @@
       android:authorities="${applicationId}.provider"
       android:exported="false"
       android:grantUriPermissions="true"
+      android:name="org.tasks.files.NNFileProvider">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/nnf_provider_paths"/>
+    </provider>
+
+    <provider
+      android:authorities="${applicationId}.file_provider"
+      android:exported="false"
+      android:grantUriPermissions="true"
       android:name="androidx.core.content.FileProvider">
       <meta-data
         android:name="android.support.FILE_PROVIDER_PATHS"
diff --git a/app/src/main/java/com/todoroo/astrid/utility/Constants.java b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
index e5a8928b4..267a16c3e 100644
--- a/app/src/main/java/com/todoroo/astrid/utility/Constants.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
@@ -9,7 +9,7 @@ import org.tasks.BuildConfig;
 
 public final class Constants {
 
-  public static final String FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".provider";
+  public static final String FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".file_provider";
 
   /** Notification Manager id for timing */
   public static final int NOTIFICATION_TIMER = -2;
diff --git a/app/src/main/java/org/tasks/activities/CameraActivity.java b/app/src/main/java/org/tasks/activities/CameraActivity.java
index d122e7674..689eb35cc 100644
--- a/app/src/main/java/org/tasks/activities/CameraActivity.java
+++ b/app/src/main/java/org/tasks/activities/CameraActivity.java
@@ -58,10 +58,10 @@ public class CameraActivity extends InjectingAppCompatActivity {
         throw new RuntimeException("Invalid Uri");
       }
       final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-      intent.putExtra(
-          MediaStore.EXTRA_OUTPUT,
+      Uri shared =
           FileProvider.getUriForFile(
-              this, Constants.FILE_PROVIDER_AUTHORITY, new File(uri.getPath())));
+              this, Constants.FILE_PROVIDER_AUTHORITY, new File(uri.getPath()));
+      intent.putExtra(MediaStore.EXTRA_OUTPUT, shared);
       if (atLeastLollipop()) {
         intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
       } else {
@@ -69,9 +69,7 @@ public class CameraActivity extends InjectingAppCompatActivity {
             getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
         for (ResolveInfo resolveInfo : resolveInfoList) {
           grantUriPermission(
-              resolveInfo.activityInfo.packageName,
-              uri,
-              Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+              resolveInfo.activityInfo.packageName, shared, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
         }
       }
 
diff --git a/app/src/main/java/org/tasks/files/FileExplore.java b/app/src/main/java/org/tasks/files/FileExplore.java
index 4589d1d72..ba3c098a9 100644
--- a/app/src/main/java/org/tasks/files/FileExplore.java
+++ b/app/src/main/java/org/tasks/files/FileExplore.java
@@ -2,11 +2,13 @@ package org.tasks.files;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 
 import com.google.common.base.Strings;
 import com.nononsenseapps.filepicker.FilePickerActivity;
+import com.nononsenseapps.filepicker.Utils;
 
 import org.tasks.injection.ActivityComponent;
 import org.tasks.injection.InjectingAppCompatActivity;
@@ -67,7 +69,8 @@ public class FileExplore extends InjectingAppCompatActivity {
     if (requestCode == REQUEST_PICKER) {
       if (resultCode == Activity.RESULT_OK) {
         Intent intent = new Intent();
-        intent.setData(data.getData());
+        File file = Utils.getFileForUri(data.getData());
+        intent.setData(Uri.fromFile(file));
         setResult(Activity.RESULT_OK, intent);
       }
       finish();
diff --git a/app/src/main/java/org/tasks/files/FileHelper.java b/app/src/main/java/org/tasks/files/FileHelper.java
index 6b5ff1c81..09311e733 100644
--- a/app/src/main/java/org/tasks/files/FileHelper.java
+++ b/app/src/main/java/org/tasks/files/FileHelper.java
@@ -56,9 +56,7 @@ public class FileHelper {
     } else {
       Intent intent = new Intent(activity, FileExplore.class);
       if (initial != null) {
-        intent.putExtra(
-            FileExplore.EXTRA_START_PATH,
-            new File(initial.getPath()));
+        intent.putExtra(FileExplore.EXTRA_START_PATH, initial.getPath());
       }
       return intent;
     }
@@ -78,9 +76,7 @@ public class FileHelper {
       Intent intent = new Intent(activity, FileExplore.class);
       intent.putExtra(FileExplore.EXTRA_DIRECTORY_MODE, true);
       if (initial != null) {
-        intent.putExtra(
-            FileExplore.EXTRA_START_PATH,
-            new File(initial.getPath()));
+        intent.putExtra(FileExplore.EXTRA_START_PATH, initial.getPath());
       }
       activity.startActivityForResult(intent, rc);
     }
diff --git a/app/src/main/java/org/tasks/files/NNFileProvider.java b/app/src/main/java/org/tasks/files/NNFileProvider.java
new file mode 100644
index 000000000..bd4fdbdd1
--- /dev/null
+++ b/app/src/main/java/org/tasks/files/NNFileProvider.java
@@ -0,0 +1,6 @@
+package org.tasks.files;
+
+import androidx.core.content.FileProvider;
+
+public class NNFileProvider extends FileProvider {
+}
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index 6de7be91d..9df6caa3a 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -418,7 +418,7 @@ public class Preferences {
     if (atLeastKitKat()) {
       return DocumentFile.fromFile(context.getExternalCacheDir()).getUri();
     } else {
-      return Uri.fromFile(context.getCacheDir());
+      return Uri.fromFile(context.getExternalCacheDir());
     }
   }
 
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
index e35796903..e6f397a6f 100644
--- a/app/src/main/res/xml/file_provider_paths.xml
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <root-path
-        name="root"
+    <external-path
+        name="external"
         path="." />
-    <cache-path
-        name="cache"
+    <external-cache-path
+        name="external_cache"
         path="." />
 </paths>
\ No newline at end of file