feat(libs/permissions): overhaul permission state management

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

Author: bmc08gt

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

@@ -43,7 +43,6 @@ import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.exchange.Exchange
 import com.getcode.solana.rpc.RpcConfig
 import com.getcode.ui.testing.LocalUiTesting
-import com.getcode.util.permissions.LocalPermissionChecker
 import com.getcode.util.permissions.PermissionChecker
 import com.getcode.util.resources.LocalResources
 import com.getcode.util.resources.LocalSystemSettings
@@ -153,7 +152,6 @@ class MainActivity : FragmentActivity() {
                 LocalUserManager provides userManager,
                 LocalSessionController provides sessionController,
                 LocalBillingClient provides billing,
-                LocalPermissionChecker provides permissionChecker,
                 LocalShareController provides shareController,
                 LocalAppSettings provides appSettingsCoordinator,
                 LocalFeatureFlags provides featureFlagController,

apps/flipcash/features/backupkey/src/main/kotlin/com/flipcash/app/backupkey/internal/BackupKeyScreenContent.kt

@@ -1,6 +1,5 @@
 package com.flipcash.app.backupkey.internal
 
-import android.Manifest
 import android.os.Build
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
@@ -51,10 +50,7 @@ import com.getcode.ui.core.measured
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
 import com.getcode.util.permissions.PermissionResult
-import com.getcode.util.permissions.getPermissionLauncher
-import com.getcode.util.permissions.rememberPermissionHandler
-import kotlinx.coroutines.delay
-import kotlin.time.Duration.Companion.seconds
+import com.getcode.util.permissions.rememberStoragePermission
 
 @Composable
 internal fun BackupKeyScreenContent(viewModel: BackupKeyScreenViewModel) {
@@ -84,9 +80,7 @@ internal fun BackupKeyScreenContent(viewModel: BackupKeyScreenViewModel) {
         }
     }
 
-    val launcher =
-        getPermissionLauncher(Manifest.permission.WRITE_EXTERNAL_STORAGE, onPermissionResult)
-    val permissionChecker = rememberPermissionHandler()
+    val storage = rememberStoragePermission { onPermissionResult(it) }
 
     LaunchedEffect(isExportSeedRequested, isStoragePermissionGranted) {
         if (isExportSeedRequested && isStoragePermissionGranted) {
@@ -103,11 +97,7 @@ internal fun BackupKeyScreenContent(viewModel: BackupKeyScreenViewModel) {
         if (Build.VERSION.SDK_INT > 29) {
             isStoragePermissionGranted = true
         } else {
-            permissionChecker.request(
-                permission = Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                onPermissionResult = onPermissionResult,
-                launcher = launcher
-            )
+            storage.launch()
         }
     }
 

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/accesskey/AccessKeyScreen.kt

@@ -12,11 +12,13 @@ import com.flipcash.app.login.internal.AccessKeyScreen
 import com.flipcash.features.login.R
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.ui.components.AppBarWithTitle
+import com.getcode.util.permissions.rememberNotificationPermission
 
 @Composable
 fun AccessKeyScreen() {
     val viewModel = hiltViewModel<LoginAccessKeyViewModel>()
     val navigator = LocalCodeNavigator.current
+    val notificationPermissions = rememberNotificationPermission()
     Column(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -31,7 +33,11 @@ fun AccessKeyScreen() {
             if (requiresIap) {
                 navigator.push(AppRoute.Onboarding.Purchase())
             } else {
-                navigator.replaceAll(AppRoute.Main.Scanner)
+                if (notificationPermissions.isPermanentlyDenied) {
+                    navigator.push(AppRoute.Onboarding.NotificationPermissionRationale(true))
+                } else {
+                    navigator.push(AppRoute.Onboarding.NotificationPermission(true))
+                }
             }
         }
     }

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/internal/AccessKeyScreenContent.kt

@@ -61,8 +61,7 @@ import com.getcode.ui.core.measured
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
 import com.getcode.util.permissions.PermissionResult
-import com.getcode.util.permissions.getPermissionLauncher
-import com.getcode.util.permissions.rememberPermissionHandler
+import com.getcode.util.permissions.rememberStoragePermission
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -96,9 +95,7 @@ internal fun AccessKeyScreen(viewModel: LoginAccessKeyViewModel, onCompleted: (r
         }
     }
 
-    val launcher =
-        getPermissionLauncher(Manifest.permission.WRITE_EXTERNAL_STORAGE, onPermissionResult)
-    val permissionChecker = rememberPermissionHandler()
+    val storage = rememberStoragePermission { onPermissionResult(it) }
 
     LaunchedEffect(isExportSeedRequested, isStoragePermissionGranted) {
         if (isExportSeedRequested && isStoragePermissionGranted) {
@@ -119,11 +116,7 @@ internal fun AccessKeyScreen(viewModel: LoginAccessKeyViewModel, onCompleted: (r
         if (Build.VERSION.SDK_INT > 29) {
             isStoragePermissionGranted = true
         } else {
-            permissionChecker.request(
-                permission = Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                onPermissionResult = onPermissionResult,
-                launcher = launcher
-            )
+            storage.launch()
         }
     }
 

apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountScreenContent.kt

@@ -1,6 +1,5 @@
 package com.flipcash.app.purchase.internal
 
-import android.Manifest
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -22,12 +21,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.ui.BrandedGradientIcon
-import com.flipcash.features.purchase.R
 import com.flipcash.app.billing.IapProduct
 import com.flipcash.app.billing.ProductPrice
+import com.flipcash.app.core.AppRoute
+import com.flipcash.app.core.ui.BrandedGradientIcon
 import com.flipcash.app.theme.FlipcashPreview
+import com.flipcash.features.purchase.R
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.theme.CodeTheme
@@ -37,7 +36,6 @@ import com.getcode.ui.theme.CodeButtonSpacer
 import com.getcode.ui.theme.CodeCircularProgressIndicator
 import com.getcode.ui.theme.CodeScaffold
 import com.getcode.util.getActivity
-import com.getcode.util.permissions.LocalPermissionChecker
 import com.getcode.view.LoadingSuccessState
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -46,7 +44,6 @@ import kotlinx.coroutines.flow.onEach
 @Composable
 internal fun PurchaseAccountScreen(viewModel: PurchaseAccountViewModel) {
     val navigator = LocalCodeNavigator.current
-    val permissions = LocalPermissionChecker.current
 
     val state by viewModel.stateFlow.collectAsState()
 

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

@@ -1,6 +1,5 @@
 package com.flipcash.app.scanner.internal.bills
 
-import android.Manifest
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.EnterExitState
@@ -36,7 +35,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.flipcash.app.bill.customization.LocalBillPlaygroundController
 import com.flipcash.app.bills.AnimatedBill
 import com.flipcash.app.core.android.extensions.launchAppSettings
 import com.flipcash.app.core.bill.Bill
@@ -58,8 +56,7 @@ import com.getcode.ui.scanner.views.CameraDisabledView
 import com.getcode.ui.scanner.views.CameraPermissionsMissingView
 import com.getcode.ui.utils.AnimationUtils
 import com.getcode.util.permissions.PermissionResult
-import com.getcode.util.permissions.getPermissionLauncher
-import com.getcode.util.permissions.rememberPermissionHandler
+import com.getcode.util.permissions.rememberCameraPermission
 import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -77,7 +74,7 @@ internal fun BillContainer(
     val context = LocalContext.current
     val onPermissionResult = { result: PermissionResult ->
         session.onCameraPermissionResult(result)
-        if (result == PermissionResult.ShouldShowRationale) {
+        if (result == PermissionResult.PermanentlyDenied) {
             BottomBarManager.showError(
                 title = context.getString(R.string.action_allowCameraAccess),
                 message = context.getString(R.string.error_description_cameraAccessRequired),
@@ -94,22 +91,10 @@ internal fun BillContainer(
         }
     }
 
-    val cameraPermissionLauncher =
-        getPermissionLauncher(Manifest.permission.CAMERA, onPermissionResult)
-
-    val permissionChecker = rememberPermissionHandler()
-
-    val checkPermission = { shouldRequest: Boolean ->
-        permissionChecker.request(
-            permission = Manifest.permission.CAMERA,
-            shouldRequest = shouldRequest,
-            onPermissionResult = onPermissionResult,
-            launcher = cameraPermissionLauncher
-        )
-    }
+    val cameraPermission = rememberCameraPermission { onPermissionResult(it) }
 
     SideEffect {
-        checkPermission(false)
+        onPermissionResult(cameraPermission.status)
     }
 
     val state by session.state.collectAsState()
@@ -148,7 +133,7 @@ internal fun BillContainer(
                 CameraPermissionsMissingView(
                     modifier = Modifier.fillMaxSize(),
                     backgroundColor = Color.Black,
-                    onClick = { checkPermission(true) }
+                    onClick = { cameraPermission.launch() }
                 )
             }
         }

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt

@@ -1,8 +1,6 @@
 package com.flipcash.app.tokens.internal
 
 import android.Manifest
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -14,14 +12,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
@@ -37,10 +29,9 @@ import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.AppBarWithTitle
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
-import com.getcode.ui.theme.CodeCircularProgressIndicator
 import com.getcode.ui.theme.CodeScaffold
-import com.getcode.util.permissions.LocalPermissionChecker
-import com.getcode.util.permissions.notificationPermissionCheck
+import com.getcode.util.permissions.ProvideTestPermissions
+import com.getcode.util.permissions.rememberNotificationPermission
 import com.getcode.view.LoadingSuccessState
 
 @Composable
@@ -62,12 +53,7 @@ private fun TokenTxProcessingScreen(
     state: BuySellSwapTokenViewModel.State,
     dispatch: (BuySellSwapTokenViewModel.Event) -> Unit,
 ) {
-    val permissions = LocalPermissionChecker.current
-    var hasPushPerms by remember {
-        mutableStateOf(permissions.isGranted(Manifest.permission.POST_NOTIFICATIONS))
-    }
-
-    val notificationPermissionCheck = notificationPermissionCheck { hasPushPerms = it }
+    val notifications = rememberNotificationPermission()
 
     CodeScaffold(
         topBar = {
@@ -100,20 +86,20 @@ private fun TokenTxProcessingScreen(
                             .padding(horizontal = CodeTheme.dimens.inset)
                             .padding(bottom = CodeTheme.dimens.grid.x2)
                             .navigationBarsPadding(),
-                        text = if (hasPushPerms) {
+                        text = if (notifications.isGranted) {
                             notifyLabel.first
                         } else {
                             AnnotatedString(stringResource(R.string.action_notifyMeWhenComplete))
                         },
-                        inlineContent = if (hasPushPerms) {
+                        inlineContent = if (notifications.isGranted) {
                             notifyLabel.second
                         } else {
                             emptyMap()
                         },
                         buttonState = ButtonState.Filled,
-                        enabled = !hasPushPerms,
+                        enabled = !notifications.isGranted,
                         onClick = {
-                            notificationPermissionCheck(true)
+                            notifications.launch()
                         }
                     )
                 }
@@ -201,10 +187,12 @@ private fun TokenTxProcessingScreen(
 @Composable
 private fun TxProcessiongPreview() {
     FlipcashPreview {
-        TokenTxProcessingScreen(
-            state = BuySellSwapTokenViewModel.State(
-                processingProgress = LoadingSuccessState(loading = true)
-            )
-        ) { }
+        ProvideTestPermissions(granted = setOf(Manifest.permission.POST_NOTIFICATIONS)) {
+            TokenTxProcessingScreen(
+                state = BuySellSwapTokenViewModel.State(
+                    processingProgress = LoadingSuccessState(loading = true)
+                )
+            ) { }
+        }
     }
 }