Handle permission denied from system and handle minimal flavor

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewActivity.kt

@@ -354,9 +354,9 @@ class WebViewActivity :
                     isExoFullScreen = isFullScreen
                     if (isFullScreen) hideSystemUI() else showSystemUI()
                 },
-                onDiscardNotificationPermission = {
+                onNotificationPermissionResult = { granted ->
                     coroutineScope.launch {
-                        presenter.discardNotificationPermission()
+                        presenter.onNotificationPermissionResult(granted)
                         shouldAskNotificationPermission = false
                     }
                 },

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewContentScreen.kt

@@ -84,7 +84,7 @@ internal fun WebViewContentScreen(
     shouldAskNotificationPermission: Boolean,
     webViewInitialized: Boolean,
     onFullscreenClicked: (isFullscreen: Boolean) -> Unit,
-    onDiscardNotificationPermission: () -> Unit,
+    onNotificationPermissionResult: (Boolean) -> Unit,
     nightModeTheme: NightModeTheme? = null,
     statusBarColor: Color? = null,
     backgroundColor: Color? = null,
@@ -135,7 +135,7 @@ internal fun WebViewContentScreen(
         }
         if (webViewInitialized && shouldAskNotificationPermission && supportsNotificationPermission) {
             @SuppressLint("InlinedApi")
-            NotificationPermission(onDiscardNotificationPermission)
+            NotificationPermission(onNotificationPermissionResult)
         }
     }
 }
@@ -198,7 +198,7 @@ private fun SafeHAWebView(
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
 @Composable
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-private fun NotificationPermission(onDiscardNotificationPermission: () -> Unit) {
+private fun NotificationPermission(onPermissionResult: (Boolean) -> Unit) {
     val bottomSheetState = rememberStandardBottomSheetState(skipHiddenState = false)
     val coroutineScope = rememberCoroutineScope()
 
@@ -221,6 +221,7 @@ private fun NotificationPermission(onDiscardNotificationPermission: () -> Unit)
         permission = Manifest.permission.POST_NOTIFICATIONS,
         previewPermissionStatus = PermissionStatus.Denied(true),
         onPermissionResult = {
+            onPermissionResult(it)
             closeSheet()
         },
     )
@@ -264,7 +265,7 @@ private fun NotificationPermission(onDiscardNotificationPermission: () -> Unit)
                     HAPlainButton(
                         text = stringResource(commonR.string.notification_permission_dialog_deny),
                         onClick = {
-                            onDiscardNotificationPermission()
+                            onPermissionResult(false)
                             closeSheet()
                         },
                         modifier = Modifier

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenter.kt

@@ -81,6 +81,6 @@ interface WebViewPresenter {
     fun startScanningForImprov(): Boolean
     fun stopScanningForImprov(force: Boolean)
 
-    suspend fun discardNotificationPermission()
+    suspend fun onNotificationPermissionResult(granted: Boolean)
     suspend fun shouldAskNotificationPermission(): Boolean
 }

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt

@@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.toColorInt
 import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ActivityContext
+import io.homeassistant.companion.android.BuildConfig
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.common.data.authentication.SessionState
 import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
@@ -19,6 +20,10 @@ import io.homeassistant.companion.android.common.util.DisabledLocationHandler
 import io.homeassistant.companion.android.common.util.GestureAction
 import io.homeassistant.companion.android.common.util.GestureDirection
 import io.homeassistant.companion.android.common.util.HAGesture
+import io.homeassistant.companion.android.database.settings.SensorUpdateFrequencySetting
+import io.homeassistant.companion.android.database.settings.Setting
+import io.homeassistant.companion.android.database.settings.SettingsDao
+import io.homeassistant.companion.android.database.settings.WebsocketSetting
 import io.homeassistant.companion.android.improv.ImprovRepository
 import io.homeassistant.companion.android.matter.MatterManager
 import io.homeassistant.companion.android.thread.ThreadManager
@@ -54,6 +59,7 @@ class WebViewPresenterImpl @Inject constructor(
     private val prefsRepository: PrefsRepository,
     private val matterUseCase: MatterManager,
     private val threadUseCase: ThreadManager,
+    private val settingsDao: SettingsDao,
 ) : WebViewPresenter {
 
     private val view = context as WebView
@@ -582,7 +588,16 @@ class WebViewPresenterImpl @Inject constructor(
         }
     }
 
-    override suspend fun discardNotificationPermission() {
+    override suspend fun onNotificationPermissionResult(granted: Boolean) {
+        if (granted && BuildConfig.FLAVOR != "full") {
+            settingsDao.insert(
+                Setting(
+                    serverId,
+                    WebsocketSetting.ALWAYS,
+                    SensorUpdateFrequencySetting.NORMAL,
+                ),
+            )
+        }
         prefsRepository.setAskNotificationPermission(false)
     }