identify when it does not require request permission

Automattic · Dec 11, 2024 · 9d8c877 · 9d8c877
1 parent fb5425b
commit 9d8c877
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 27 deletions.
diff --git a/app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt b/app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt
@@ -1580,6 +1580,7 @@ class MainActivity :
                 settings.setNotificationsDisabledMessageShown(true)
             },
             onPermissionGranted = onPermissionGranted,
+            onPermissionHandlingNotRequired = {},
         )
     }
 

diff --git a/...sts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/view/podcast/PodcastFragment.kt b/...sts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/view/podcast/PodcastFragment.kt
@@ -2,7 +2,6 @@ package au.com.shiftyjelly.pocketcasts.podcasts.view.podcast
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -500,31 +499,28 @@ class PodcastFragment : BaseFragment(), Toolbar.OnMenuItemClickListener {
 
     private val onNotificationsClicked: () -> Unit = {
         context?.let { context ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                NotificationPermissionHelper.checkForNotificationPermission(
-                    requireActivity(),
-                    launcher = notificationPermissionLauncher,
-                    onShowRequestPermissionRationale = {
-                        (activity as? FragmentHostListener)?.snackBarView()?.let { snackBarView ->
-                            Snackbar.make(snackBarView, getString(LR.string.notifications_blocked_warning), Snackbar.LENGTH_LONG)
-                                .setAction(
-                                    getString(LR.string.notifications_blocked_warning_snackbar_action)
-                                        .uppercase(Locale.getDefault()),
-                                ) {
-                                    // Open app settings for the user to enable permissions
-                                    val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    val uri: Uri = Uri.fromParts("package", requireContext().packageName, null)
-                                    intent.data = uri
-                                    startActivity(intent)
-                                }.show()
-                        }
-                    },
-                    onPermissionGranted = { viewModel.toggleNotifications(context) },
-                )
-            } else {
-                viewModel.toggleNotifications(context)
-            }
+            NotificationPermissionHelper.checkForNotificationPermission(
+                requireActivity(),
+                launcher = notificationPermissionLauncher,
+                onShowRequestPermissionRationale = {
+                    (activity as? FragmentHostListener)?.snackBarView()?.let { snackBarView ->
+                        Snackbar.make(snackBarView, getString(LR.string.notifications_blocked_warning), Snackbar.LENGTH_LONG)
+                            .setAction(
+                                getString(LR.string.notifications_blocked_warning_snackbar_action)
+                                    .uppercase(Locale.getDefault()),
+                            ) {
+                                // Open app settings for the user to enable permissions
+                                val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                val uri: Uri = Uri.fromParts("package", requireContext().packageName, null)
+                                intent.data = uri
+                                startActivity(intent)
+                            }.show()
+                    }
+                },
+                onPermissionGranted = { viewModel.toggleNotifications(context) },
+                onPermissionHandlingNotRequired = { viewModel.toggleNotifications(context) },
+            )
         }
     }
 

diff --git a/.../utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/NotificationPermissionHelper.kt b/.../utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/NotificationPermissionHelper.kt
@@ -14,6 +14,7 @@ object NotificationPermissionHelper {
         launcher: ActivityResultLauncher<String>,
         onShowRequestPermissionRationale: () -> Unit = {},
         onPermissionGranted: () -> Unit = {},
+        onPermissionHandlingNotRequired: () -> Unit = {},
     ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             when {
@@ -32,7 +33,7 @@ object NotificationPermissionHelper {
                 }
             }
         } else {
-            onPermissionGranted()
+            onPermissionHandlingNotRequired()
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1580,6 +1580,7 @@ class MainActivity : @@
                     settings.setNotificationsDisabledMessageShown(true)
                 },
                 onPermissionGranted = onPermissionGranted,
+                onPermissionHandlingNotRequired = {},
             )
         }
@@ Expand Down @@