From 45ecd61f645f89a99dde00aafc585e18766255ac Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Fri, 20 Aug 2021 11:33:33 +0300
Subject: [PATCH] Avoid authority clashing between debug and release builds of
 Pojav

---
 app_pojavlauncher/build.gradle                 | 2 ++
 app_pojavlauncher/src/main/AndroidManifest.xml | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle
index a8f847e90..71b53e832 100644
--- a/app_pojavlauncher/build.gradle
+++ b/app_pojavlauncher/build.gradle
@@ -76,6 +76,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.customDebug
+            resValue 'string', 'storageProviderAuthorities', 'net.kdt.pojavlaunch.scoped.gamefolder.debug'
         }
 		
         release {
@@ -85,6 +86,7 @@ android {
 	    // defaultConfig already set
             // multiDexEnabled = true
            // debuggable = true
+            resValue 'string', 'storageProviderAuthorities', 'net.kdt.pojavlaunch.scoped.gamefolder'
         }
         gplay {
             initWith release
diff --git a/app_pojavlauncher/src/main/AndroidManifest.xml b/app_pojavlauncher/src/main/AndroidManifest.xml
index 06ec1cf09..b21901cf4 100644
--- a/app_pojavlauncher/src/main/AndroidManifest.xml
+++ b/app_pojavlauncher/src/main/AndroidManifest.xml
@@ -3,8 +3,10 @@
     package="net.kdt.pojavlaunch">
 
     <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -77,7 +79,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation"/>
         <provider
             android:name=".scoped.GameFolderProvider"
-            android:authorities="net.kdt.pojavlaunch.scoped.gamefolder"
+            android:authorities="@string/storageProviderAuthorities"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS"