Disable alerts with missing notification permission (#341)

* disable warnings when notifications are not available

* clean up and fix tests

* update version

* cleanup

Author: wuan

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.blitzortung.android.app"
         minSdkVersion 21
         targetSdk 35
-        versionCode 342
-        versionName '2.4.1'
+        versionCode 343
+        versionName '2.4.2'
         multiDexEnabled false
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/org/blitzortung/android/app/Main.kt

@@ -449,9 +449,9 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
         Log.v(LOG_TAG, "Main.onResume()")
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            PermissionsSupport.ensurePermissions(this,
+            PermissionsSupport.ensure(this,
                 LocationPermissionRequester(preferences),
-                NotificationPermissionRequester(),
+                NotificationPermissionRequester(preferences),
                 BackgroundLocationPermissionRequester(this, preferences),
                 WakeupPermissionRequester(this, preferences)
                 )
@@ -581,18 +581,14 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        Log.v(
-            LOG_TAG,
-            "Main.onRequestPermissionsResult() $requestCode - ${permissions.joinToString()} - ${grantResults.joinToString { it.toString() }}"
-        )
-        val providerRelation = LocationProviderRelation.byOrdinal[requestCode]
-        if (providerRelation != null) {
-            val providerName = providerRelation.providerName
+        val locationProviderRelation = LocationProviderRelation.byOrdinal[requestCode]
+        if (locationProviderRelation != null) {
+            val providerName = locationProviderRelation.providerName
             if (grantResults.size == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 val previousValue = preferences.get(PreferenceKey.LOCATION_MODE, "n/a")
                 Log.i(
                     LOG_TAG,
-                    "Main..onRequestPermissionResult() $providerName permission has now been granted. (code $requestCode, previous: $previousValue)"
+                    "Main.onRequestPermissionResult() $providerName permission has now been granted. (code $requestCode, previous: $previousValue)"
                 )
                 preferences.edit {
                     put(PreferenceKey.LOCATION_MODE, providerName)
@@ -601,11 +597,24 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
             } else {
                 Log.i(
                     LOG_TAG,
-                    "Main..onRequestPermissionResult() $providerName permission was NOT granted. (code $requestCode)"
+                    "Main.onRequestPermissionResult() $providerName permission was NOT granted. (code $requestCode)"
                 )
                 locationHandler.shutdown()
             }
-        } else {
+        } else if (requestCode == REQUEST_CODE_POST_NOTIFICATIONS && grantResults.isNotEmpty()) {
+            val alertEnabled = preferences.get(PreferenceKey.ALERT_ENABLED, false)
+            if (grantResults.size == 1 && grantResults[0] == PackageManager.PERMISSION_DENIED && (alertEnabled || backgroundAlertEnabled)) {
+                Log.i(
+                    LOG_TAG,
+                    "Main.onRequestPermissionResult() POST_NOTIFICATIONS permission was NOT granted but is required for alerts. Disabling alerts and background queries"
+                )
+                Toast.makeText(baseContext, R.string.post_notifications_required_for_alerts, Toast.LENGTH_LONG).show()
+                preferences.edit {
+                    put(PreferenceKey.ALERT_ENABLED, false)
+                    put(PreferenceKey.BACKGROUND_QUERY_PERIOD, "0")
+                }
+            }
+        }else {
             Log.i(LOG_TAG, "Main.onRequestPermissionResult() permissions: $permissions, requestCode: $requestCode")
             super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         }

app/src/main/java/org/blitzortung/android/app/permission/PermissionsManager.kt

@@ -13,17 +13,17 @@ class PermissionsSupport(
 ) {
 
     @RequiresApi(Build.VERSION_CODES.M)
-    fun requestPermission(permission: String, requestCode: Int, permissionRequiredStringId: Int): Boolean {
-        val shouldShowPermissionRationale = activity.shouldShowRequestPermissionRationale(permission)
-        val permissionIsGranted = activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
+    fun request(permission: String, requestCode: Int, permissionRequiredStringId: Int): Boolean {
+        val showRationale = activity.shouldShowRequestPermissionRationale(permission)
+        val isGranted = activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
         Log.v(
             LOG_TAG,
-            "Main.requestPermission() permission: $permission, requestCode: $requestCode, isGranted: $permissionIsGranted, shouldShowRationale: ${!shouldShowPermissionRationale}"
+            "PermissionsSupport.request() permission: $permission, requestCode: $requestCode, isGranted: $isGranted, showRationale: $showRationale"
         )
 
-        return if (!permissionIsGranted) {
-            if (shouldShowPermissionRationale) {
-                requestPermissionsAfterDialog(permissionRequiredStringId, permission, requestCode)
+        return if (!isGranted) {
+            if (showRationale) {
+                requestAfterDialog(permissionRequiredStringId, permission, requestCode)
             } else {
                 activity.requestPermissions(arrayOf(permission), requestCode)
             }
@@ -34,14 +34,14 @@ class PermissionsSupport(
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
-    private fun requestPermissionsAfterDialog(
+    private fun requestAfterDialog(
         dialogTextResource: Int,
         permission: String,
         requestCode: Int,
     ) {
         Log.v(
             LOG_TAG,
-            "Main.requestPermissionsAfterDialog() permission: $permission, dialogResource: $dialogTextResource, requestCode: $requestCode"
+            "PermissionsSupport.requestPermissionsAfterDialog() permission: $permission, dialogResource: $dialogTextResource, requestCode: $requestCode"
         )
 
         val message = activity.resources.getString(dialogTextResource)
@@ -53,13 +53,13 @@ class PermissionsSupport(
 
     companion object {
         @RequiresApi(Build.VERSION_CODES.M)
-        fun ensurePermissions(activity: Activity, vararg permissionRequesters : PermissionRequester) {
+        fun ensure(activity: Activity, vararg permissionRequesters : PermissionRequester) {
 
             val permissionsSupport = PermissionsSupport(activity)
 
             for (permissionRequester in permissionRequesters) {
                 val result = permissionRequester.request(permissionsSupport)
-                Log.v(LOG_TAG, "Main.onResume() permission ${permissionRequester.name}: result: $result")
+                Log.v(LOG_TAG, "PermissionsSupport.ensure() permission ${permissionRequester.name}: result: $result")
                 if (result) {
                     break
                 }

app/src/main/java/org/blitzortung/android/app/permission/requester/BackgroundLocationPermissionRequester.kt

@@ -38,7 +38,7 @@ class BackgroundLocationPermissionRequester(
             val message = activity.resources.getString(R.string.location_permission_background_disclosure)
             AlertDialog.Builder(activity).setMessage(message).setCancelable(false)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    permissionsSupport.requestPermission(
+                    permissionsSupport.request(
                         ACCESS_BACKGROUND_LOCATION,
                         REQUEST_CODE_BACKGROUND_LOCATION,
                         R.string.location_permission_background_required

app/src/main/java/org/blitzortung/android/app/permission/requester/LocationPermissionRequester.kt

@@ -16,16 +16,16 @@ import org.blitzortung.android.app.view.PreferenceKey
 import org.blitzortung.android.app.view.get
 
 class LocationPermissionRequester(
-    private val sharedPreferences: SharedPreferences
+    private val preferences: SharedPreferences
 ) : PermissionRequester {
     override val name: String = "location"
 
     @RequiresApi(Build.VERSION_CODES.M)
     override fun request(permissionsSupport: PermissionsSupport): Boolean {
-        val (permission, requestCode) = getLocationPermission(sharedPreferences)
+        val (permission, requestCode) = getLocationPermission(preferences)
 
         return if (permission != null) {
-            permissionsSupport.requestPermission(
+            permissionsSupport.request(
                 permission, requestCode, R.string.location_permission_required
             )
         } else {
@@ -34,8 +34,8 @@ class LocationPermissionRequester(
     }
 
     companion object {
-        internal fun getLocationPermission(sharedPreferences: SharedPreferences): Pair<String?, Int> {
-            val locationProviderName = sharedPreferences.get(PreferenceKey.LOCATION_MODE, PASSIVE_PROVIDER)
+        internal fun getLocationPermission(preferences: SharedPreferences): Pair<String?, Int> {
+            val locationProviderName = preferences.get(PreferenceKey.LOCATION_MODE, PASSIVE_PROVIDER)
             val permission = when (locationProviderName) {
                 PASSIVE_PROVIDER, GPS_PROVIDER -> ACCESS_FINE_LOCATION
                 NETWORK_PROVIDER -> ACCESS_COARSE_LOCATION

app/src/main/java/org/blitzortung/android/app/permission/requester/NotificationPermissionRequester.kt

@@ -1,20 +1,36 @@
 package org.blitzortung.android.app.permission.requester
 
 import android.Manifest.permission.POST_NOTIFICATIONS
+import android.content.SharedPreferences
 import android.os.Build
+import android.util.Log
+import org.blitzortung.android.app.Main.Companion.LOG_TAG
 import org.blitzortung.android.app.Main.Companion.REQUEST_CODE_POST_NOTIFICATIONS
 import org.blitzortung.android.app.R
 import org.blitzortung.android.app.permission.PermissionRequester
 import org.blitzortung.android.app.permission.PermissionsSupport
+import org.blitzortung.android.app.permission.requester.BackgroundLocationPermissionRequester.Companion.isBackgroundAlertEnabled
+import org.blitzortung.android.app.view.PreferenceKey
+import org.blitzortung.android.app.view.get
 
-class NotificationPermissionRequester() : PermissionRequester {
+class NotificationPermissionRequester(
+    val preferences: SharedPreferences
+) : PermissionRequester {
     override val name: String = "notification"
 
     override fun request(permissionsSupport: PermissionsSupport): Boolean {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            permissionsSupport.requestPermission(POST_NOTIFICATIONS, REQUEST_CODE_POST_NOTIFICATIONS, R.string.post_notifications_request)
+        val requiresNotifications = isAlertEnabled(preferences) || isBackgroundAlertEnabled(preferences)
+        Log.v(LOG_TAG, "NotificationPermissionRequester.request() requiresNotifications: $requiresNotifications")
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && requiresNotifications) {
+            permissionsSupport.request(POST_NOTIFICATIONS, REQUEST_CODE_POST_NOTIFICATIONS, R.string.post_notifications_request)
         } else {
             false
         }
     }
+
+    companion object {
+        internal fun isAlertEnabled(preferences: SharedPreferences) : Boolean =
+            preferences.get(PreferenceKey.ALERT_ENABLED, false)
+    }
+
 }

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

@@ -385,4 +385,5 @@ Russian by Ivan Karev (karev.ivan@gmail.com)\n
     <string name="post_notifications_request">Enable post notification permission if notification alerts are desired.</string>
     <string name="background_alerts" translatable="false">Background alert symbol</string>
     <string name="default_alarm_signal">Default alarm sound</string>
+    <string name="post_notifications_required_for_alerts">Notification permission is required for alerts, disabling alerts and background queries.</string>
 </resources>

app/src/test/java/org/blitzortung/android/app/permission/PermissionsManagerTest.kt

@@ -5,23 +5,17 @@ import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Build
 import android.widget.Button
-import androidx.appcompat.app.AlertDialog
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowAlertDialog
-import org.robolectric.shadows.ShadowActivity
-import org.robolectric.shadows.ShadowResources
 import org.assertj.core.api.Assertions.assertThat
-import org.blitzortung.android.app.Main
 import org.junit.Ignore
 import org.robolectric.shadows.ShadowDialog
 import org.robolectric.shadows.ShadowLooper
@@ -52,7 +46,7 @@ class PermissionsManagerTest {
         every {activity.checkSelfPermission(PERMISSION_STRING)} answers { PackageManager.PERMISSION_GRANTED }
 
         // Act
-        val result = permissionsSupport.requestPermission(
+        val result = permissionsSupport.request(
             PERMISSION_STRING,
             REQUEST_CODE,
             PERMISSION_RATIONALE_STRING_ID
@@ -67,7 +61,7 @@ class PermissionsManagerTest {
         every {activity.checkSelfPermission(PERMISSION_STRING)} answers { PackageManager.PERMISSION_DENIED }
         every {activity.shouldShowRequestPermissionRationale(PERMISSION_STRING)} answers { false }
 
-        val result = permissionsSupport.requestPermission(
+        val result = permissionsSupport.request(
             PERMISSION_STRING,
             REQUEST_CODE,
             PERMISSION_RATIONALE_STRING_ID
@@ -88,7 +82,7 @@ class PermissionsManagerTest {
         shadowPackageManager.setShouldShowRequestPermissionRationale(PERMISSION_STRING, true)
 
         // Act
-        val result = permissionsSupport.requestPermission(
+        val result = permissionsSupport.request(
             PERMISSION_STRING,
             REQUEST_CODE,
             android.R.string.copy
@@ -134,7 +128,7 @@ class PermissionsManagerTest {
         val requester = MockPermissionRequester("TestRequester", true)
 
         // Act
-        PermissionsSupport.ensurePermissions(activity, requester)
+        PermissionsSupport.ensure(activity, requester)
 
         // Assert
         assertThat(requester.requestCalled).isTrue()
@@ -147,7 +141,7 @@ class PermissionsManagerTest {
         val requester2 = MockPermissionRequester("Requester2", true)
 
         // Act
-        PermissionsSupport.ensurePermissions(activity, requester1, requester2)
+        PermissionsSupport.ensure(activity, requester1, requester2)
 
         // Assert
         assertThat(requester1.requestCalled).isTrue()
@@ -161,7 +155,7 @@ class PermissionsManagerTest {
         val requester2 = MockPermissionRequester("Requester2", false)
 
         // Act
-        PermissionsSupport.ensurePermissions(activity, requester1, requester2)
+        PermissionsSupport.ensure(activity, requester1, requester2)
 
         // Assert
         assertThat(requester1.requestCalled).isTrue()

app/src/test/java/org/blitzortung/android/app/permission/requester/BackgroundLocationPermissionRequesterTest.kt

@@ -73,7 +73,7 @@ class BackgroundLocationPermissionRequesterTest {
 
         assertThat(result).isFalse()
         verify(exactly = 0) {
-            permissionsSupport.requestPermission(any(), any(), any())
+            permissionsSupport.request(any(), any(), any())
         }
     }
 
@@ -86,14 +86,14 @@ class BackgroundLocationPermissionRequesterTest {
         assertThat(result).isFalse()
 
         verify(exactly = 0) {
-            permissionsSupport.requestPermission(any(), any(), any())
+            permissionsSupport.request(any(), any(), any())
         }
     }
 
     @Test
     @Config(sdk = [Build.VERSION_CODES.Q])
     fun `request should open the dialog if all conditions are valid and request permission on clicking OK`() {
-        every { permissionsSupport.requestPermission(any(), any(), any()) } answers { true }
+        every { permissionsSupport.request(any(), any(), any()) } answers { true }
 
         val result = backgroundLocationPermissionRequester.request(permissionsSupport)
         assertThat(result).isTrue()
@@ -106,7 +106,7 @@ class BackgroundLocationPermissionRequesterTest {
         assertThat(dialog.isShowing).isFalse()
 
         verify(exactly = 1) {
-            permissionsSupport.requestPermission(
+            permissionsSupport.request(
                 ACCESS_BACKGROUND_LOCATION,
                 102,
                 R.string.location_permission_background_required
@@ -118,7 +118,7 @@ class BackgroundLocationPermissionRequesterTest {
     @Test
     @Config(sdk = [Build.VERSION_CODES.Q])
     fun `request should open the dialog if all conditions are valid and request permission on clicking Cancel`() {
-        every { permissionsSupport.requestPermission(any(), any(), any()) } answers { true }
+        every { permissionsSupport.request(any(), any(), any()) } answers { true }
 
         val result = backgroundLocationPermissionRequester.request(permissionsSupport)
         assertThat(result).isTrue()
@@ -131,7 +131,7 @@ class BackgroundLocationPermissionRequesterTest {
         assertThat(dialog.isShowing).isFalse()
 
         verify(exactly = 0) {
-            permissionsSupport.requestPermission(any(), any(), any())
+            permissionsSupport.request(any(), any(), any())
         }
         assertThat(preferences.getString(PreferenceKey.BACKGROUND_QUERY_PERIOD, "")).isEqualTo("0")
     }

app/src/test/java/org/blitzortung/android/app/permission/requester/LocationPermissionRequesterTest.kt

@@ -49,13 +49,13 @@ class LocationPermissionRequesterTest {
 
     @Test
     fun `request should use PASSIVE provider by default`() {
-        every { permissionsSupport.requestPermission(any(), any(), any()) } answers { true }
+        every { permissionsSupport.request(any(), any(), any()) } answers { true }
 
         val result = locationPermissionRequester.request(permissionsSupport)
         assertThat(result).isTrue()
 
         verify(exactly = 1) {
-            permissionsSupport.requestPermission(
+            permissionsSupport.request(
                 ACCESS_FINE_LOCATION, 1, R.string.location_permission_required
             )
         }
@@ -66,26 +66,26 @@ class LocationPermissionRequesterTest {
         preferences.edit {
             putString(PreferenceKey.LOCATION_MODE.toString(), MANUAL_PROVIDER)
         }
-        every { permissionsSupport.requestPermission(any(), any(), any()) } answers { false }
+        every { permissionsSupport.request(any(), any(), any()) } answers { false }
 
         val result = locationPermissionRequester.request(permissionsSupport)
         assertThat(result).isFalse()
 
-        verify(exactly = 0) { permissionsSupport.requestPermission(any(), any(), any()) }
+        verify(exactly = 0) { permissionsSupport.request(any(), any(), any()) }
     }
 
     @Test
     fun `request shold be configured correctly for Network location provider`() {
         preferences.edit {
             putString(PreferenceKey.LOCATION_MODE.toString(), NETWORK_PROVIDER)
         }
-        every { permissionsSupport.requestPermission(any(), any(), any()) } answers { true }
+        every { permissionsSupport.request(any(), any(), any()) } answers { true }
 
         val result = locationPermissionRequester.request(permissionsSupport)
         assertThat(result).isTrue()
 
         verify(exactly = 1) {
-            permissionsSupport.requestPermission(
+            permissionsSupport.request(
                 ACCESS_COARSE_LOCATION, 2, R.string.location_permission_required
             )
         }