From 110e5c3753fc314b37744e48bb180d7b5cfec735 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 16 Jul 2019 09:42:11 +0200
Subject: [PATCH] Fix issue when free app was previously installed.

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../android/activities/TootActivity.java      | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f00c93627..63be39588 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -326,7 +326,7 @@
             />
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="app.fedilab.android.fileProvider"
+            android:authorities="${applicationId}.fileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index b51252650..febaceee2 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -1013,9 +1013,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             }
             // Continue only if the File was successfully created
             if (photoFile != null) {
-                photoFileUri = FileProvider.getUriForFile(this,
-                        "app.fedilab.android.fileProvider",
-                        photoFile);
+                if(BuildConfig.DONATIONS) {
+                    photoFileUri = FileProvider.getUriForFile(this,
+                            "fr.gouv.etalab.mastodon.fileProvider",
+                            photoFile);
+                }else{
+                    photoFileUri = FileProvider.getUriForFile(this,
+                            "app.fedilab.android.fileProvider",
+                            photoFile);
+                }
+
                 takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoFileUri);
                 startActivityForResult(takePictureIntent, TAKE_PHOTO);
             }
@@ -2538,9 +2545,15 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             while ((read = tempInput.read(buff)) > 0) {
                 tempOut.write(buff, 0, read);
             }
-            uri = FileProvider.getUriForFile(this,
-                    "app.fedilab.android.fileProvider",
-                    file);
+            if(BuildConfig.DONATIONS) {
+                uri = FileProvider.getUriForFile(this,
+                        "fr.gouv.etalab.mastodon.fileProvider",
+                        file);
+            }else{
+                uri = FileProvider.getUriForFile(this,
+                        "app.fedilab.android.fileProvider",
+                        file);
+            }
             tempInput.close();
             tempOut.close();
         } catch(IOException e) {