crude dialog for notification permission bug #1414

Author: bitmold

app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java

@@ -321,7 +321,7 @@ public final AlertDialog initiateScan(@Nullable Collection<String> desiredBarcod
             // set the desired barcode types
             StringBuilder joinedByComma = new StringBuilder();
             for (String format : desiredBarcodeFormats) {
-                if (joinedByComma.length() > 0) {
+                if (!joinedByComma.isEmpty()) {
                     joinedByComma.append(',');
                 }
                 joinedByComma.append(format);
@@ -393,6 +393,7 @@ private AlertDialog showDownloadDialog() {
                 packageName = BS_PACKAGE;
             } else {
                 // Otherwise, first option:
+                //noinspection SequencedCollectionMethodCanBeUsed
                 packageName = targetApplications.get(0);
             }
             Uri uri = Uri.parse("market://details?id=" + packageName);

app/src/main/java/org/torproject/android/OrbotActivity.kt

@@ -9,13 +9,15 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.WindowInsetsController
 import androidx.activity.addCallback
 
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
@@ -36,6 +38,7 @@ import org.torproject.android.service.util.Prefs
 import org.torproject.android.service.util.showToast
 import org.torproject.android.ui.more.LogBottomSheet
 import org.torproject.android.ui.connect.ConnectViewModel
+import org.torproject.android.ui.connect.RequestPostNotificationPermission
 import org.torproject.android.ui.core.DeviceAuthenticationPrompt
 import java.util.Locale
 
@@ -186,25 +189,32 @@ class OrbotActivity : BaseActivity() {
             rootDetectionShown = true
         }
 
-        onBackPressedDispatcher.addCallback(this ) {
+        onBackPressedDispatcher.addCallback(this) {
             if (lastSelectedItemId != R.id.connectFragment) {
                 bottomNavigationView.selectedItemId = R.id.connectFragment
-            }
-            else finish()
+            } else finish()
         }
     }
 
     private fun requestNotificationPermission() {
-        when (PackageManager.PERMISSION_GRANTED) {
-            ContextCompat.checkSelfPermission(
-                this, Manifest.permission.POST_NOTIFICATIONS
-            ) -> {
-                // You can use the API that requires the permission.
+        // automatically granted on Android 12 and lower
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
+            return
+        val checkPostNotificationPerm =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+        when (checkPostNotificationPerm) {
+            PackageManager.PERMISSION_GRANTED -> {
+                Log.d(
+                    "OrbotActivity",
+                    "Granted Permission ${Manifest.permission.POST_NOTIFICATIONS}"
+                )
             }
 
             else -> {
-                // You can directly ask for the permission.
-                // The registered ActivityResultCallback gets the result of this request.
+                Log.d(
+                    "OrbotActivity",
+                    "Try Prompting For ${Manifest.permission.POST_NOTIFICATIONS}"
+                )
                 requestPermissionLauncher.launch(
                     Manifest.permission.POST_NOTIFICATIONS
                 )
@@ -213,21 +223,16 @@ class OrbotActivity : BaseActivity() {
     }
 
     // Register the permissions callback, which handles the user's response to the
-// system permissions dialog. Save the return value, an instance of
-// ActivityResultLauncher. You can use either a val, as shown in this snippet,
-// or a lateinit var in your onAttach() or onCreate() method.
+    // system permissions dialog.
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     private val requestPermissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
     ) { isGranted: Boolean ->
         if (isGranted) {
-            // Permission is granted. Continue the action or workflow in your
-            // app.
+            Log.d("OrbotActivity", "User just granted ${Manifest.permission.POST_NOTIFICATIONS}")
         } else {
-            // Explain to the user that the feature is unavailable because the
-            // feature requires a permission that the user has denied. At the
-            // same time, respect the user's decision. Don't link to system
-            // settings in an effort to convince the user to change their
-            // decision.
+            Log.d("OrbotActivity", "Notification denied")
+            RequestPostNotificationPermission().show(supportFragmentManager, "RequestNotificationDialog")
         }
     }
 

app/src/main/java/org/torproject/android/ui/connect/RequestPostNotificationPermission.kt

@@ -0,0 +1,32 @@
+package org.torproject.android.ui.connect
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import org.torproject.android.R
+
+class RequestPostNotificationPermission : DialogFragment() {
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+        AlertDialog.Builder(requireActivity())
+            .setTitle(R.string.request_notification_permission)
+            .setMessage(R.string.request_notification_permission_msg)
+            .setCancelable(false)
+            .setPositiveButton(
+                R.string.open_settings
+            ) { dialog: DialogInterface?, which: Int ->
+                val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .putExtra(Settings.EXTRA_APP_PACKAGE, requireActivity().packageName)
+
+                startActivity(intent)
+                dismiss()
+            }
+            .create()
+}

app/src/main/res/values/strings.xml

@@ -239,6 +239,10 @@
     <string name="power_user_mode_permission">Alarms &amp; Reminders Permission Needed for Power User Mode</string>
     <string name="power_user_mode_permission_msg">Please allow Orbot to set alarms and reminders in order to use power user mode. This won\'t actually set any alarms on your device. This permission is needed to have the system keep OrbotService running when Orbot is not being used as a system-wide VPN.</string>
 
+    <string name="request_notification_permission">Please enable notifications for Orbot</string>
+    <string name="request_notification_permission_msg">Without turning on notifications Orbot can\'t act as a Tor VPN or use Kindness Mode.\n\nWhen enabled, we only show a single notification when Orbot is running.</string>
+    <string name="open_settings">Open Settings</string>
+
     <string name="pref_require_password">Orbot Authentication</string>
     <string name="pref_require_password_description">Prevent access to Orbot until you authenticate by entering your device password or fingerprint. This can be combined with Camouflage Mode to help hide that Orbot is installed on your device</string>
     <string name="error_no_password_set">Please secure your device in order to use Orbot Authentication </string>