fix(permissions): don't presist Granted to memory; rely on system level checks

Handles "only this time" properly

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt

@@ -44,6 +44,7 @@ import com.getcode.opencode.exchange.Exchange
 import com.getcode.solana.rpc.RpcConfig
 import com.getcode.ui.testing.LocalUiTesting
 import com.getcode.util.permissions.PermissionChecker
+import com.getcode.util.permissions.ProvidePermissionChecker
 import com.getcode.util.resources.LocalResources
 import com.getcode.util.resources.LocalSystemSettings
 import com.getcode.util.resources.ResourceHelper
@@ -163,11 +164,13 @@ class MainActivity : FragmentActivity() {
                 LocalAppUpdater provides appUpdater,
                 LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
             ) {
-                Rinku {
-                    App(
-                        tipsEngine = tipsEngine,
-                        solanaRpcConfig = solanaRpcConfig,
-                    )
+                ProvidePermissionChecker(permissionChecker) {
+                    Rinku {
+                        App(
+                            tipsEngine = tipsEngine,
+                            solanaRpcConfig = solanaRpcConfig,
+                        )
+                    }
                 }
             }
         }

apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/Scanner.kt

@@ -54,10 +54,6 @@ internal fun Scanner() {
         mutableStateOf<Boolean?>(null)
     }
 
-    var cameraStarted by remember {
-        mutableStateOf(state.autoStartCamera == true)
-    }
-
     var cameraAvailable by remember {
         mutableStateOf(true)
     }
@@ -83,9 +79,6 @@ internal fun Scanner() {
     @SuppressLint("LocalContextGetResourceValueCall")
     BillContainer(
         isPaused = isPaused,
-        isCameraReady = previewing == true,
-        isCameraStarted = cameraStarted,
-        onStartCamera = { cameraStarted = true },
         onAction = {
             when (it) {
                 ScannerDecorItem.Give -> {
@@ -165,9 +158,6 @@ internal fun Scanner() {
 
             Lifecycle.Event.ON_STOP -> {
                 Timber.d("onStop")
-                if (state.autoStartCamera == false) {
-                    cameraStarted = false
-                }
             }
 
             Lifecycle.Event.ON_PAUSE -> {

apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/bills/BillContainerView.kt

@@ -46,6 +46,8 @@ import com.flipcash.app.session.Grabbed
 import com.flipcash.app.session.LocalSessionController
 import com.flipcash.app.session.PutInWallet
 import com.flipcash.app.updates.LocalAppUpdater
+import com.getcode.ui.components.OnLifecycleEvent
+import androidx.lifecycle.Lifecycle
 import com.flipcash.features.scanner.R
 import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
@@ -63,17 +65,13 @@ import kotlinx.coroutines.delay
 @Composable
 internal fun BillContainer(
     modifier: Modifier = Modifier,
-    isCameraReady: Boolean,
-    isCameraStarted: Boolean,
     isPaused: Boolean,
     scannerView: @Composable () -> Unit,
-    onStartCamera: () -> Unit,
     onAction: (ScannerDecorItem) -> Unit
 ) {
     val session = LocalSessionController.current!!
     val context = LocalContext.current
     val onPermissionResult = { result: PermissionResult ->
-        session.onCameraPermissionResult(result)
         if (result == PermissionResult.PermanentlyDenied) {
             BottomBarManager.showError(
                 title = context.getString(R.string.action_allowCameraAccess),
@@ -100,6 +98,15 @@ internal fun BillContainer(
     val state by session.state.collectAsState()
     val billState by session.billState.collectAsState()
 
+    val autoStart = state.autoStartCamera == true
+    var cameraStarted by remember { mutableStateOf(autoStart) }
+
+    OnLifecycleEvent { _, event ->
+        if (event == Lifecycle.Event.ON_STOP && !autoStart) {
+            cameraStarted = false
+        }
+    }
+
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -117,25 +124,36 @@ internal fun BillContainer(
                 // waiting for update
             }
 
-            state.isCameraPermissionGranted == true || state.isCameraPermissionGranted == null -> {
-                if (state.autoStartCamera == null) {
-                    // waiting for result
-                } else if (!state.autoStartCamera!! && !isCameraStarted) {
-                    CameraDisabledView(modifier = Modifier.fillMaxSize()) {
-                        onStartCamera()
+            else ->{
+                when (cameraPermission.status) {
+                    PermissionResult.Denied -> {
+                        CameraDisabledView(modifier = Modifier.fillMaxSize()) {
+                            cameraPermission.launch()
+                        }
+                    }
+                    PermissionResult.NotRequested -> {
+                        CameraPermissionsMissingView(
+                            modifier = Modifier.fillMaxSize(),
+                            backgroundColor = Color.Black,
+                            onClick = { cameraPermission.launch() }
+                        )
+                    }
+                    PermissionResult.Granted -> {
+                        if (!cameraStarted) {
+                            CameraDisabledView(modifier = Modifier.fillMaxSize()) {
+                                cameraStarted = true
+                            }
+                        } else {
+                            scannerView()
+                        }
+                    }
+                    PermissionResult.PermanentlyDenied -> {
+                        CameraDisabledView(modifier = Modifier.fillMaxSize()) {
+                            context.launchAppSettings()
+                        }
                     }
-                } else {
-                    scannerView()
                 }
             }
-
-            else -> {
-                CameraPermissionsMissingView(
-                    modifier = Modifier.fillMaxSize(),
-                    backgroundColor = Color.Black,
-                    onClick = { cameraPermission.launch() }
-                )
-            }
         }
 
         val updatedState by rememberUpdatedState(state)

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/SessionController.kt

@@ -26,15 +26,13 @@ interface SessionController {
     fun onAppInForeground()
     fun onAppInBackground()
     fun onCameraScanning(scanning: Boolean)
-    fun onCameraPermissionResult(result: PermissionResult)
     fun showBill(bill: Bill)
     fun dismissBill(action: BillDeterminationResult)
     fun onCodeScan(code: ScannableKikCode)
     fun openCashLink(cashLink: String?)
 }
 
 data class SessionState(
-    val isCameraPermissionGranted: Boolean? = null,
     val vibrateOnScan: Boolean = false,
     val giveableBalance: Fiat? = null,
     val logScanTimes: Boolean = false,

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -289,10 +289,6 @@ class RealSessionController @Inject constructor(
         _state.update { it.copy(isCameraUp = scanning) }
     }
 
-    override fun onCameraPermissionResult(result: PermissionResult) {
-        _state.update { it.copy(isCameraPermissionGranted = result == PermissionResult.Granted) }
-    }
-
     override fun showBill(bill: Bill) {
         if (bill.amount.nativeAmount.decimalValue == 0.0) return
         val owner = userManager.accountCluster ?: return

libs/permissions/public/src/main/kotlin/com/getcode/util/permissions/PermissionChecker.kt

@@ -55,6 +55,36 @@ private class FakePermissionChecker(
 internal val LocalPermissionChecker: ProvidableCompositionLocal<PermissionChecker> =
     staticCompositionLocalOf { DefaultPermissionChecker }
 
+/**
+ * Provides the given [PermissionChecker] to the composition tree.
+ *
+ * Call this from your activity's `setContent` block to connect the Hilt-injected
+ * [AndroidPermissionChecker] to [rememberPermission].
+ *
+ * Without this, the default checker (which treats all permissions as denied) is used,
+ * and permission state falls back entirely to SharedPreferences — which can become
+ * stale if the user revokes a permission via system Settings.
+ *
+ * Usage:
+ * ```
+ * setContent {
+ *     ProvidePermissionChecker(permissionChecker) {
+ *         App()
+ *     }
+ * }
+ * ```
+ */
+@Composable
+fun ProvidePermissionChecker(
+    checker: PermissionChecker,
+    content: @Composable () -> Unit,
+) {
+    CompositionLocalProvider(
+        LocalPermissionChecker provides checker,
+        content = content,
+    )
+}
+
 /**
  * Provides a [FakePermissionChecker] for use in tests and Compose previews.
  *

libs/permissions/public/src/main/kotlin/com/getcode/util/permissions/Permissions.kt

@@ -25,26 +25,34 @@ private const val PREFS_NAME = "permissions"
  * Returns [PermissionResult.NotRequested] if no result has been persisted,
  * meaning the permission has never been requested in any session.
  */
-private fun SharedPreferences.restoreResult(permission: String): PermissionResult =
+/**
+ * Restores the last known denial state for [permission] from SharedPreferences.
+ *
+ * [PermissionResult.Granted] is never persisted — the OS is the sole source of truth
+ * for granted state. This avoids stale "Granted" entries when the user selects
+ * "Only this time" or revokes the permission via system Settings.
+ */
+private fun SharedPreferences.restoreDenialState(permission: String): PermissionResult =
     when (getString(permission, null)) {
         "Denied" -> PermissionResult.Denied
         "PermanentlyDenied" -> PermissionResult.PermanentlyDenied
-        "Granted" -> PermissionResult.Granted
         else -> PermissionResult.NotRequested
     }
 
 /**
- * Persists [result] for [permission] to SharedPreferences.
- * [PermissionResult.NotRequested] is a no-op — absence of a key represents this state.
+ * Persists denial state for [permission] to SharedPreferences.
+ *
+ * Only [PermissionResult.Denied] and [PermissionResult.PermanentlyDenied] are stored.
+ * [PermissionResult.Granted] clears any prior denial record.
+ * [PermissionResult.NotRequested] is a no-op.
  */
 private fun SharedPreferences.Editor.persistResult(permission: String, result: PermissionResult) {
-    val key = when (result) {
-        PermissionResult.Denied -> "Denied"
-        PermissionResult.PermanentlyDenied -> "PermanentlyDenied"
-        PermissionResult.Granted -> "Granted"
+    when (result) {
+        PermissionResult.Denied -> putString(permission, "Denied")
+        PermissionResult.PermanentlyDenied -> putString(permission, "PermanentlyDenied")
+        PermissionResult.Granted -> remove(permission)
         PermissionResult.NotRequested -> return
     }
-    putString(permission, key)
 }
 
 /**
@@ -88,7 +96,7 @@ fun rememberPermission(
         when {
             checker.isGranted(config.permission) -> PermissionResult.Granted
             !config.requiresRuntimeRequest -> PermissionResult.Granted
-            else -> prefs.restoreResult(config.permission)
+            else -> prefs.restoreDenialState(config.permission)
         }
     }
 
@@ -110,7 +118,7 @@ fun rememberPermission(
                     // Returning from system Settings — re-evaluate from source of truth
                     handle.status = when {
                         checker.isGranted(config.permission) -> PermissionResult.Granted
-                        else -> prefs.restoreResult(config.permission)
+                        else -> prefs.restoreDenialState(config.permission)
                     }
                 }
             }