From 4d324b544c25b45bfc7b0aba328c7fc5be2717da Mon Sep 17 00:00:00 2001
From: xsling <me@xsl.sh>
Date: Tue, 21 Jun 2022 00:20:16 +0800
Subject: [PATCH] fix: workaround on android permission policy updates

---
 app/build.gradle                                           | 2 +-
 app/src/main/AndroidManifest.xml                           | 7 +++++--
 .../sh/xsl/reedisland/screens/widgets/popups/PostPopup.kt  | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7088ce0..e9315128 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 32
         versionCode 48
-        versionName "v2.0.30"
+        versionName "v2.0.31"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6b3bab97..677d9e7c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,8 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission-group.CAMERA" />
     <uses-permission android:name="android.permission-group.STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 
     <uses-feature
@@ -43,6 +45,7 @@
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/DawnTheme"
@@ -53,8 +56,8 @@
 
         <activity
             android:name=".screens.MainActivity"
-            android:launchMode="singleTask"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTask">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/sh/xsl/reedisland/screens/widgets/popups/PostPopup.kt b/app/src/main/java/sh/xsl/reedisland/screens/widgets/popups/PostPopup.kt
index 9a20cef0..096c8394 100644
--- a/app/src/main/java/sh/xsl/reedisland/screens/widgets/popups/PostPopup.kt
+++ b/app/src/main/java/sh/xsl/reedisland/screens/widgets/popups/PostPopup.kt
@@ -483,6 +483,7 @@ class PostPopup(private val caller: MainActivity, private val sharedVM: SharedVi
         }
 
 
+        // TODO: follow new storage permission policy(use MediaStore)
         findViewById<Button>(R.id.postImage).setOnClickListener {
             if (!caller.intentsHelper.checkAndRequestSinglePermission(
                     caller, permission.READ_EXTERNAL_STORAGE, true