From 6531f9f104662722811583a0105fe229246cae14 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Sun, 23 Mar 2025 20:23:49 +0530
Subject: [PATCH] Remove storage permission requirement

It's not necessary for importing/exporting blocked numbers or keywords.

See https://github.com/FossifyOrg/Messages/discussions/309
---
 app/src/main/AndroidManifest.xml              |  4 --
 .../ManageBlockedKeywordsActivity.kt          | 71 +++++--------------
 2 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3872b33..550c907a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,6 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission
         android:name="android.permission.USE_BIOMETRIC"
diff --git a/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
index 6d0cbf4c..71e6ac86 100644
--- a/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt
@@ -5,24 +5,17 @@ import android.net.Uri
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import org.fossify.commons.dialogs.ExportBlockedNumbersDialog
-import org.fossify.commons.dialogs.FilePickerDialog
 import org.fossify.commons.extensions.beVisibleIf
-import org.fossify.commons.extensions.getFileOutputStream
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getTempFile
 import org.fossify.commons.extensions.showErrorToast
-import org.fossify.commons.extensions.toFileDirItem
 import org.fossify.commons.extensions.toast
 import org.fossify.commons.extensions.underlineText
 import org.fossify.commons.extensions.updateTextColors
 import org.fossify.commons.extensions.viewBinding
 import org.fossify.commons.helpers.ExportResult
 import org.fossify.commons.helpers.NavigationIcon
-import org.fossify.commons.helpers.PERMISSION_READ_STORAGE
-import org.fossify.commons.helpers.PERMISSION_WRITE_STORAGE
 import org.fossify.commons.helpers.ensureBackgroundThread
-import org.fossify.commons.helpers.isQPlus
 import org.fossify.commons.interfaces.RefreshRecyclerViewListener
 import org.fossify.messages.R
 import org.fossify.messages.databinding.ActivityManageBlockedKeywordsBinding
@@ -120,27 +113,13 @@ class ManageBlockedKeywordsActivity : SimpleActivity(), RefreshRecyclerViewListe
         }
 
     private fun tryImportBlockedKeywords() {
-        if (isQPlus()) {
-            val mimeType = "text/plain"
-            try {
-                importActivityResultLauncher.launch(mimeType)
-            } catch (e: ActivityNotFoundException) {
-                toast(org.fossify.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
-            } catch (e: Exception) {
-                showErrorToast(e)
-            }
-        } else {
-            handlePermission(PERMISSION_READ_STORAGE) { isAllowed ->
-                if (isAllowed) {
-                    pickFileToImportBlockedKeywords()
-                }
-            }
-        }
-    }
-
-    private fun pickFileToImportBlockedKeywords() {
-        FilePickerDialog(this) {
-            importBlockedKeywords(it)
+        val mimeType = "text/plain"
+        try {
+            importActivityResultLauncher.launch(mimeType)
+        } catch (e: ActivityNotFoundException) {
+            toast(org.fossify.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
+        } catch (e: Exception) {
+            showErrorToast(e)
         }
     }
 
@@ -200,32 +179,16 @@ class ManageBlockedKeywordsActivity : SimpleActivity(), RefreshRecyclerViewListe
     }
 
     private fun tryExportBlockedNumbers() {
-        if (isQPlus()) {
-            ExportBlockedKeywordsDialog(this, config.lastBlockedKeywordExportPath, true) { file ->
-                try {
-                    exportActivityResultLauncher.launch(file.name)
-                } catch (e: ActivityNotFoundException) {
-                    toast(
-                        org.fossify.commons.R.string.system_service_disabled,
-                        Toast.LENGTH_LONG
-                    )
-                } catch (e: Exception) {
-                    showErrorToast(e)
-                }
-            }
-        } else {
-            handlePermission(PERMISSION_WRITE_STORAGE) { isAllowed ->
-                if (isAllowed) {
-                    ExportBlockedNumbersDialog(
-                        this,
-                        config.lastBlockedKeywordExportPath,
-                        false
-                    ) { file ->
-                        getFileOutputStream(file.toFileDirItem(this), true) { out ->
-                            exportBlockedKeywordsTo(out)
-                        }
-                    }
-                }
+        ExportBlockedKeywordsDialog(this, config.lastBlockedKeywordExportPath, true) { file ->
+            try {
+                exportActivityResultLauncher.launch(file.name)
+            } catch (e: ActivityNotFoundException) {
+                toast(
+                    org.fossify.commons.R.string.system_service_disabled,
+                    Toast.LENGTH_LONG
+                )
+            } catch (e: Exception) {
+                showErrorToast(e)
             }
         }
     }