BIT-1076 Requesting Camera Permission (#415)

This commit is contained in:
Oleg Semenenko
2023-12-19 13:27:35 -06:00
committed by Álison Fernandes
parent f2f3a6a386
commit 39e285fff8
11 changed files with 247 additions and 19 deletions

View File

@@ -0,0 +1,30 @@
package com.x8bit.bitwarden.ui.platform.base.util
import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
/**
* Interface for managing permissions.
*/
@Immutable
interface PermissionsManager {
/**
* Method for creating and returning a permission launcher.
*/
@Composable
fun getLauncher(onResult: (Boolean) -> Unit): ManagedActivityResultLauncher<String, Boolean>
/**
* Method for checking whether the permission is granted.
*/
fun checkPermission(permission: String): Boolean
/**
* Method for checking if an informative UI should be shown the user.
*/
fun shouldShouldRequestPermissionRationale(
permission: String,
): Boolean
}

View File

@@ -0,0 +1,37 @@
package com.x8bit.bitwarden.ui.platform.base.util
import android.app.Activity
import android.content.pm.PackageManager
import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
import androidx.core.content.ContextCompat
/**
* Primary implementation of [PermissionsManager].
*/
class PermissionsManagerImpl(
private val activity: Activity,
) : PermissionsManager {
@Composable
override fun getLauncher(
onResult: (Boolean) -> Unit,
): ManagedActivityResultLauncher<String, Boolean> =
rememberLauncherForActivityResult(
contract = ActivityResultContracts.RequestPermission(),
onResult,
)
override fun checkPermission(permission: String): Boolean =
ContextCompat.checkSelfPermission(
activity,
permission,
) == PackageManager.PERMISSION_GRANTED
override fun shouldShouldRequestPermissionRationale(
permission: String,
): Boolean =
activity.shouldShowRequestPermissionRationale(permission)
}

View File

@@ -1,5 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.additem
import android.Manifest
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@@ -11,6 +12,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.PermissionsManager
import com.x8bit.bitwarden.ui.platform.components.BitwardenListHeaderText
import com.x8bit.bitwarden.ui.platform.components.BitwardenMultiSelectButton
import kotlinx.collections.immutable.toImmutableList
@@ -19,6 +21,7 @@ import kotlinx.collections.immutable.toImmutableList
* The top level content UI state for the [VaultAddItemScreen].
*/
@Composable
@Suppress("LongMethod")
fun AddEditItemContent(
state: VaultAddItemState.ViewState.Content,
isAddItemMode: Boolean,
@@ -26,7 +29,23 @@ fun AddEditItemContent(
commonTypeHandlers: VaultAddItemCommonTypeHandlers,
loginItemTypeHandlers: VaultAddLoginItemTypeHandlers,
modifier: Modifier = Modifier,
permissionsManager: PermissionsManager,
) {
val launcher = permissionsManager.getLauncher(
onResult = { isGranted ->
when (state.type) {
is VaultAddItemState.ViewState.Content.ItemType.SecureNotes -> Unit
// TODO: Create UI for card-type item creation BIT-507
is VaultAddItemState.ViewState.Content.ItemType.Card -> Unit
// TODO: Create UI for identity-type item creation BIT-667
is VaultAddItemState.ViewState.Content.ItemType.Identity -> Unit
is VaultAddItemState.ViewState.Content.ItemType.Login -> {
loginItemTypeHandlers.onSetupTotpClick(isGranted)
}
}
},
)
LazyColumn(
modifier = modifier,
) {
@@ -57,6 +76,13 @@ fun AddEditItemContent(
isAddItemMode = isAddItemMode,
commonActionHandler = commonTypeHandlers,
loginItemTypeHandlers = loginItemTypeHandlers,
onTotpSetupClick = {
if (permissionsManager.checkPermission(Manifest.permission.CAMERA)) {
loginItemTypeHandlers.onSetupTotpClick(true)
} else {
launcher.launch(Manifest.permission.CAMERA)
}
},
)
}

View File

@@ -32,13 +32,14 @@ import kotlinx.collections.immutable.toImmutableList
/**
* The UI for adding and editing a login cipher.
*/
@Suppress("LongMethod")
@Suppress("LongMethod", "LongParameterList")
fun LazyListScope.addEditLoginItems(
commonState: VaultAddItemState.ViewState.Content.Common,
loginState: VaultAddItemState.ViewState.Content.ItemType.Login,
isAddItemMode: Boolean,
commonActionHandler: VaultAddItemCommonTypeHandlers,
loginItemTypeHandlers: VaultAddLoginItemTypeHandlers,
onTotpSetupClick: () -> Unit,
) {
item {
Spacer(modifier = Modifier.height(8.dp))
@@ -112,7 +113,7 @@ fun LazyListScope.addEditLoginItems(
BitwardenFilledTonalButtonWithIcon(
label = stringResource(id = R.string.setup_totp),
icon = painterResource(id = R.drawable.ic_light_bulb),
onClick = loginItemTypeHandlers.onSetupTotpClick,
onClick = onTotpSetupClick,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),

View File

@@ -1,5 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.additem
import android.app.Activity
import android.widget.Toast
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.imePadding
@@ -27,6 +28,8 @@ import com.x8bit.bitwarden.ui.platform.components.BitwardenScaffold
import com.x8bit.bitwarden.ui.platform.components.BitwardenTextButton
import com.x8bit.bitwarden.ui.platform.components.BitwardenTopAppBar
import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
import com.x8bit.bitwarden.ui.platform.base.util.PermissionsManager
import com.x8bit.bitwarden.ui.platform.base.util.PermissionsManagerImpl
/**
* Top level composable for the vault add item screen.
@@ -37,6 +40,8 @@ import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
fun VaultAddItemScreen(
onNavigateBack: () -> Unit,
viewModel: VaultAddItemViewModel = hiltViewModel(),
permissionsManager: PermissionsManager =
PermissionsManagerImpl(LocalContext.current as Activity),
) {
val state by viewModel.stateFlow.collectAsStateWithLifecycle()
val context = LocalContext.current
@@ -101,6 +106,7 @@ fun VaultAddItemScreen(
},
loginItemTypeHandlers = loginItemTypeHandlers,
commonTypeHandlers = commonTypeHandlers,
permissionsManager = permissionsManager,
modifier = Modifier
.imePadding()
.padding(innerPadding)

View File

@@ -15,8 +15,8 @@ import com.x8bit.bitwarden.ui.platform.base.util.Text
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.base.util.concat
import com.x8bit.bitwarden.ui.vault.feature.additem.model.CustomFieldType
import com.x8bit.bitwarden.ui.vault.feature.additem.util.toViewState
import com.x8bit.bitwarden.ui.vault.feature.additem.model.toCustomField
import com.x8bit.bitwarden.ui.vault.feature.additem.util.toViewState
import com.x8bit.bitwarden.ui.vault.feature.vault.util.toCipherView
import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
@@ -332,7 +332,7 @@ class VaultAddItemViewModel @Inject constructor(
}
is VaultAddItemAction.ItemType.LoginType.SetupTotpClick -> {
handleLoginSetupTotpClick()
handleLoginSetupTotpClick(action)
}
is VaultAddItemAction.ItemType.LoginType.UriSettingsClick -> {
@@ -399,11 +399,18 @@ class VaultAddItemViewModel @Inject constructor(
}
}
private fun handleLoginSetupTotpClick() {
private fun handleLoginSetupTotpClick(
action: VaultAddItemAction.ItemType.LoginType.SetupTotpClick,
) {
viewModelScope.launch {
val message = if (action.isGranted) {
"Permission Granted, QR Code Scanner Not Implemented"
} else {
"Permission Not Granted, Manual QR Code Entry Not Implemented"
}
sendEvent(
event = VaultAddItemEvent.ShowToast(
message = "Setup TOTP",
message = message,
),
)
}
@@ -972,6 +979,13 @@ sealed class VaultAddItemAction {
*/
data class UriTextChange(val uri: String) : LoginType()
/**
* Represents the action to set up TOTP.
*
* @property isGranted the status of the camera permission
*/
data class SetupTotpClick(val isGranted: Boolean) : LoginType()
/**
* Represents the action to open the username generator.
*/
@@ -987,11 +1001,6 @@ sealed class VaultAddItemAction {
*/
data object OpenPasswordGeneratorClick : LoginType()
/**
* Represents the action to set up TOTP.
*/
data object SetupTotpClick : LoginType()
/**
* Represents the action of clicking TOTP settings
*/

View File

@@ -26,7 +26,7 @@ class VaultAddLoginItemTypeHandlers(
val onOpenUsernameGeneratorClick: () -> Unit,
val onPasswordCheckerClick: () -> Unit,
val onOpenPasswordGeneratorClick: () -> Unit,
val onSetupTotpClick: () -> Unit,
val onSetupTotpClick: (Boolean) -> Unit,
val onUriSettingsClick: () -> Unit,
val onAddNewUriClick: () -> Unit,
) {
@@ -72,8 +72,10 @@ class VaultAddLoginItemTypeHandlers(
VaultAddItemAction.ItemType.LoginType.OpenPasswordGeneratorClick,
)
},
onSetupTotpClick = {
viewModel.trySendAction(VaultAddItemAction.ItemType.LoginType.SetupTotpClick)
onSetupTotpClick = { isGranted ->
viewModel.trySendAction(
VaultAddItemAction.ItemType.LoginType.SetupTotpClick(isGranted),
)
},
onUriSettingsClick = {
viewModel.trySendAction(VaultAddItemAction.ItemType.LoginType.UriSettingsClick)