From ed88c49da8c0f48ca816d10828e2f8f8900916da Mon Sep 17 00:00:00 2001
From: CodeDead <admin@codedead.com>
Date: Mon, 11 Dec 2023 23:32:04 +0100
Subject: [PATCH 1/2] feat: fix required permissions for android < 33

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  3 ++
 .../codedead/deadhash/gui/MainActivity.java   | 39 +++++++++++--------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 89aca36..7cd437c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,9 +6,9 @@ android {
         applicationId "com.codedead.deadhash"
         minSdk 28
         targetSdk 34
-        versionName '1.8.1'
+        versionName '1.8.2'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 11
+        versionCode 12
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 63a83ab..64e0c34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
diff --git a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
index 4e4564e..656b697 100644
--- a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
+++ b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
@@ -538,29 +538,36 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
     }
 
     private void onClickSelectFile(final View v) {
-        if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED) {
-            Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
+                ActivityCompat.requestPermissions(MainActivity.this, new String[]{
+                        Manifest.permission.READ_EXTERNAL_STORAGE
+                }, 0);
+
+                return;
+            }
+        } else {
+            if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED
+                    || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED
+                    || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(getApplicationContext(), R.string.toast_no_permissions, Toast.LENGTH_LONG).show();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 ActivityCompat.requestPermissions(MainActivity.this, new String[]{
                         Manifest.permission.READ_MEDIA_AUDIO,
                         Manifest.permission.READ_MEDIA_IMAGES,
                         Manifest.permission.READ_MEDIA_VIDEO
                 }, 0);
-            } else {
-                ActivityCompat.requestPermissions(MainActivity.this, new String[]{
-                        Manifest.permission.READ_EXTERNAL_STORAGE
-                }, 0);
-            }
-        } else {
-            final Intent intent = new Intent()
-                    .setType("*/*")
-                    .setAction(Intent.ACTION_OPEN_DOCUMENT)
-                    .addCategory(Intent.CATEGORY_OPENABLE);
 
-            activityResultLauncher.launch(Intent.createChooser(intent, getString(R.string.dialog_select_file)));
+                return;
+            }
         }
+
+        final Intent intent = new Intent()
+                .setType("*/*")
+                .setAction(Intent.ACTION_OPEN_DOCUMENT)
+                .addCategory(Intent.CATEGORY_OPENABLE);
+
+        activityResultLauncher.launch(Intent.createChooser(intent, getString(R.string.dialog_select_file)));
     }
 }

From 074df1d49b2dc7542ec6ad7ee533d478e6e630dc Mon Sep 17 00:00:00 2001
From: CodeDead <admin@codedead.com>
Date: Mon, 11 Dec 2023 23:34:04 +0100
Subject: [PATCH 2/2] feat: added changelog

---
 fastlane/metadata/android/en-US/changelogs/12.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/12.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt
new file mode 100644
index 0000000..68caaa8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/12.txt
@@ -0,0 +1 @@
+- Fixed storage permissions for Android <= 32