From 532e0ff459dc9d1e298fa147e9706aae2f88fee6 Mon Sep 17 00:00:00 2001
From: gabriel20xx <gabrielfranz31@gmail.com>
Date: Tue, 11 Nov 2025 23:59:43 +0100
Subject: [PATCH] feat: add notification permission request handling in
 ListsScreen and trigger on connection

---
 .../app/ui/components/ConnectionStatus.kt     | 10 ++++++
 .../collabtable/app/ui/screens/ListsScreen.kt | 35 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/components/ConnectionStatus.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/components/ConnectionStatus.kt
index 807362c..259278b 100644
--- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/components/ConnectionStatus.kt
+++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/components/ConnectionStatus.kt
@@ -73,6 +73,7 @@ fun ConnectionStatusAction(
     prefs: PreferencesManager,
     modifier: Modifier = Modifier,
     showLatency: Boolean = true,
+    onBecameConnected: (() -> Unit)? = null,
 ) {
     var ok by remember { mutableStateOf<Boolean?>(null) }
     var latencyMs by remember { mutableStateOf<Long?>(null) }
@@ -114,6 +115,15 @@ fun ConnectionStatusAction(
             null -> MaterialTheme.colorScheme.onSurfaceVariant
         }
 
+    // Fire callback once when connection transitions to OK
+    var prevOk by remember { mutableStateOf<Boolean?>(null) }
+    LaunchedEffect(ok) {
+        if (prevOk != true && ok == true) {
+            onBecameConnected?.invoke()
+        }
+        prevOk = ok
+    }
+
     Row(
         modifier = modifier,
         verticalAlignment = Alignment.CenterVertically,
diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListsScreen.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListsScreen.kt
index 911a6f3..d36d8a3 100644
--- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListsScreen.kt
+++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListsScreen.kt
@@ -2,6 +2,8 @@
 
 package com.collabtable.app.ui.screens
 
+import android.Manifest
+import android.content.pm.PackageManager
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -48,6 +50,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import android.os.Build
 import com.collabtable.app.R
 import com.collabtable.app.data.database.CollabTableDatabase
 import com.collabtable.app.data.model.CollabList
@@ -102,7 +108,34 @@ fun ListsScreen(
                 actions = {
                     val context = LocalContext.current
                     val prefsLocal = remember { PreferencesManager.getInstance(context) }
-                    ConnectionStatusAction(prefs = prefsLocal)
+
+                    // Launcher to request Android 13+ notification permission on-the-fly
+                    var notifPrompted by remember { mutableStateOf(false) }
+                    val permissionLauncher =
+                        rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+                            // Mirror setup behavior: toggle all list notifications to granted state
+                            prefsLocal.setNotifyListAddedEnabled(granted)
+                            prefsLocal.setNotifyListEditedEnabled(granted)
+                            prefsLocal.setNotifyListRemovedEnabled(granted)
+                            try { prefsLocal.setNotifyListContentUpdatedEnabled(granted) } catch (_: Throwable) {}
+                        }
+
+                    ConnectionStatusAction(
+                        prefs = prefsLocal,
+                        onBecameConnected = {
+                            if (Build.VERSION.SDK_INT >= 33 && !notifPrompted) {
+                                val granted =
+                                    ContextCompat.checkSelfPermission(
+                                        context,
+                                        Manifest.permission.POST_NOTIFICATIONS,
+                                    ) == PackageManager.PERMISSION_GRANTED
+                                if (!granted) {
+                                    notifPrompted = true
+                                    permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+                                }
+                            }
+                        },
+                    )
                     IconButton(onClick = { showCreateDialog = true }) {
                         Icon(
                             Icons.Default.Add,