From 00425eb281d621b03ea17744e84dcb90cd75073a Mon Sep 17 00:00:00 2001
From: jahway603 <64485701+jahway603@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:08:24 -0500
Subject: [PATCH] Fix no permission to import from file (#254)

* Fix no permission to import from file for Android 13+

* Made changes and successfully tested fixing no permission to import from file for Android 13+
---
 app/src/main/AndroidManifest.xml                           | 5 +++--
 .../etesync/syncadapter/ui/importlocal/ImportFragment.kt   | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23160172..c473eb0e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,8 +36,9 @@
     -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
 
-    <!-- Used for external log and vcf import. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<!-- Used for external log and vcf import. Permissions changed for SDK >= 33. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
 
     <!-- other permissions -->
     <!-- android.permission-group.CONTACTS -->
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
index 89ae0043..815e260e 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
@@ -10,6 +10,7 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.provider.ContactsContract
@@ -63,7 +64,11 @@ class ImportFragment : DialogFragment() {
 
     @TargetApi(Build.VERSION_CODES.M)
     private fun requestPermissions() {
-        requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 0)
+        if (SDK_INT <= 32) {
+            requestPermissions(kotlin.arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE), 0)
+        } else {
+            requestPermissions(arrayOf(Manifest.permission.READ_MEDIA_IMAGES), 0)
+        }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {