From 3fa5dc530062e4a9af3a79846946bbed56358deb Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 7 Nov 2017 19:08:16 +0100
Subject: [PATCH] update the FileProvider pattern

---
 app/src/main/AndroidManifest.xml                   | 14 +++++++-------
 .../draw/activities/MainActivity.kt                |  3 +--
 app/src/main/res/xml/filepaths.xml                 |  6 ------
 app/src/main/res/xml/provider_paths.xml            |  6 ++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 app/src/main/res/xml/filepaths.xml
 create mode 100644 app/src/main/res/xml/provider_paths.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d7e5ff..7072c89 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings"
+            android:parentActivityName=".activities.MainActivity"/>
+
         <activity
             android:name="com.simplemobiletools.commons.activities.AboutActivity"
             android:label="@string/about"
@@ -72,19 +77,14 @@
             android:label="@string/customize_colors"
             android:parentActivityName=".activities.SettingsActivity"/>
 
-        <activity
-            android:name=".activities.SettingsActivity"
-            android:label="@string/settings"
-            android:parentActivityName=".activities.MainActivity"/>
-
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.simplemobiletools.draw.fileprovider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/filepaths"/>
+                android:resource="@xml/provider_paths"/>
         </provider>
     </application>
 </manifest>
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
index fa8faba..64e12b3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
@@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
-import android.support.v4.content.FileProvider
 import android.view.Menu
 import android.view.MenuItem
 import android.webkit.MimeTypeMap
@@ -291,7 +290,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
             fileOutputStream?.close()
         }
 
-        return FileProvider.getUriForFile(this, "com.simplemobiletools.draw.fileprovider", file)
+        return getFilePublicUri(file, BuildConfig.APPLICATION_ID)
     }
 
     private fun clearCanvas() {
diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml
deleted file mode 100644
index b414b7d..0000000
--- a/app/src/main/res/xml/filepaths.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <cache-path
-        name="shared_images"
-        path="images/"/>
-</paths>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..94f2d04
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path name="shared_images" path="images/"/>
+    <external-path name="external_files" path="."/>
+    <root-path name="external_files" path="/storage/"/>
+</paths>