Improve permission handle flow.

app/src/main/java/me/rosuh/easywatermark/ui/MainActivity.kt

@@ -20,7 +20,9 @@ import android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -65,6 +67,8 @@ class MainActivity : AppCompatActivity() {
     private val currentBgColor: Int
         get() = ((launchView.parent as? View?)?.background as? ColorDrawable)?.color ?: colorSurface
 
+    private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
+
     private val contentFunList: List<FuncTitleModel> by lazy {
         listOf(
             FuncTitleModel(
@@ -227,6 +231,16 @@ class MainActivity : AppCompatActivity() {
             registerForActivityResult(PickImageContract()) { uri: Uri? ->
                 handleActivityResult(REQ_PICK_ICON, listOf(uri))
             }
+        requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            if (isGranted) {
+                return@registerForActivityResult
+            }
+            Toast.makeText(
+                this,
+                getString(R.string.request_permission_failed),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -427,7 +441,7 @@ class MainActivity : AppCompatActivity() {
         }
         // pick image button
         launchView.ivSelectedPhotoTips.setOnClickListener {
-            preCheckStoragePermission {
+            checkReadingPermission(requestPermissionLauncher) {
                 performFileSearch(REQ_CODE_PICK_IMAGE)
             }
         }
@@ -581,7 +595,7 @@ class MainActivity : AppCompatActivity() {
                 TextContentDisplayFragment.replaceShow(this, launchView.fcFunctionDetail.id)
             }
             FuncTitleModel.FuncType.Icon -> {
-                preCheckStoragePermission {
+                checkReadingPermission(requestPermissionLauncher) {
                     performFileSearch(REQ_PICK_ICON)
                 }
             }
@@ -650,7 +664,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         R.id.action_pick -> {
-            preCheckStoragePermission {
+            checkReadingPermission(requestPermissionLauncher) {
                 performFileSearch(REQ_CODE_PICK_IMAGE)
             }
             true
@@ -698,25 +712,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            REQ_CODE_REQ_WRITE_PERMISSION -> {
-                if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                    Toast.makeText(
-                        this,
-                        getString(R.string.request_permission_failed),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-        }
-    }
-
     private fun dealWithImage(uri: List<Uri>) {
         if (FileUtils.isImage(this.contentResolver, uri.first())) {
             viewModel.updateImageList(uri)
@@ -827,6 +822,10 @@ class MainActivity : AppCompatActivity() {
         return ViewInfo.from(launchView.ivPhoto)
     }
 
+    fun requestPermission(block: () -> Unit) {
+        checkWritingPermission(requestPermissionLauncher, grant = block)
+    }
+
     companion object {
         private const val REQ_CODE_PICK_IMAGE: Int = 42
         const val REQ_CODE_REQ_WRITE_PERMISSION: Int = 43

app/src/main/java/me/rosuh/easywatermark/ui/dialog/SaveImageBSDialogFragment.kt

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
@@ -48,7 +49,7 @@ class SaveImageBSDialogFragment : BaseBindBSDFragment<DialogSaveFileBinding>() {
                         openShare()
                     } else {
                         // saving jobs
-                        requireActivity().preCheckStoragePermission {
+                        (activity as? MainActivity)?.requestPermission {
                             shareViewModel.saveImage(
                                 requireActivity().contentResolver,
                                 (requireContext() as MainActivity).getImageViewInfo(),

app/src/main/java/me/rosuh/easywatermark/utils/ktx/ContextExtension.kt

@@ -7,9 +7,10 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Build
 import android.util.TypedValue
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -18,54 +19,57 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import me.rosuh.cmonet.CMonet
 import me.rosuh.easywatermark.R
-import me.rosuh.easywatermark.ui.MainActivity
-
-fun Activity.isStoragePermissionGrated(): Boolean {
-    val readGranted = ContextCompat.checkSelfPermission(
-        this,
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Manifest.permission.READ_MEDIA_IMAGES
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-    ) == PackageManager.PERMISSION_GRANTED
-
-    val writeGranted =
-        Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || ContextCompat.checkSelfPermission(
-            this,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
-        ) == PackageManager.PERMISSION_GRANTED
 
-    return readGranted && writeGranted
+fun Activity.isStoragePermissionGrated(permission: String): Boolean {
+    return ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
 }
 
-fun Activity.preCheckStoragePermission(block: () -> Unit) {
-    if (isStoragePermissionGrated()) {
-        block.invoke()
+fun Activity.checkReadingPermission(
+    activityResultLauncher: ActivityResultLauncher<String>,
+    failed: (msg: String) -> Unit = {
+        Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+    },
+    grant: () -> Unit,
+) {
+    val permissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_IMAGES
     } else {
-        requestPermission()
+        Manifest.permission.READ_EXTERNAL_STORAGE
     }
+    preCheckStoragePermission(activityResultLauncher, permissions, failed, grant)
 }
 
-/**
- * 申请权限
- */
-fun Activity.requestPermission() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        ActivityCompat.requestPermissions(
-            this,
-            arrayOf(
-                Manifest.permission.READ_MEDIA_IMAGES,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ),
-            MainActivity.REQ_CODE_REQ_WRITE_PERMISSION
-        )
+fun Activity.checkWritingPermission(
+    activityResultLauncher: ActivityResultLauncher<String>,
+    failed: (msg: String) -> Unit = {
+        Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+    },
+    grant: () -> Unit,
+) {
+    val permissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        Manifest.permission.READ_MEDIA_IMAGES
     } else {
-        ActivityCompat.requestPermissions(
-            this,
-            arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE),
-            MainActivity.REQ_CODE_REQ_WRITE_PERMISSION
-        )
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    }
+    preCheckStoragePermission(activityResultLauncher, permissions, failed, grant)
+}
+
+fun Activity.preCheckStoragePermission(
+    activityResultLauncher: ActivityResultLauncher<String>,
+    permission: String,
+    failed: (msg: String) -> Unit = {
+        Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+    },
+    grant: () -> Unit,
+) {
+    if (isStoragePermissionGrated(permission)) {
+        grant.invoke()
+        return
+    }
+    kotlin.runCatching {
+        activityResultLauncher.launch(permission)
+    }.getOrElse {
+        failed.invoke(it.message ?: "Unknown error")
     }
 }
 

gradle.properties

@@ -31,4 +31,4 @@ android.nonFinalResIds=false
 
 majorVersion=2
 minorVersion=9
-patchVersion=2
+patchVersion=3