github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-08 08:06:32 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

BIT-1551: Restrict cloning to items not assigned to a collection (#751)

Browse Source
This commit is contained in:
Ramsey Smith
2024-01-24 11:24:51 -07:00
committed by Álison Fernandes
parent 862d9b5c94
commit 4f0fa96dc0
4 changed files with 173 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt
View File

@@ -45,10 +45,10 @@ import com.x8bit.bitwarden.ui.platform.components.LoadingDialogState
import com.x8bit.bitwarden.ui.platform.components.OverflowMenuItemData
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
import com.x8bit.bitwarden.ui.platform.theme.LocalIntentManager
import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull
import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultCardItemTypeHandlers
import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultCommonItemTypeHandlers
import com.x8bit.bitwarden.ui.vault.feature.item.handlers.VaultLoginItemTypeHandlers
import kotlinx.collections.immutable.persistentListOf
/**
* Displays the vault item screen.
@@ -97,6 +97,11 @@ fun VaultItemScreen(
onNavigateToMoveToOrganization(event.itemId)
}
is VaultItemEvent.NavigateToCollections -> {
// TODO implement Collections in BIT-1575
Toast.makeText(context, "Not yet implemented.", Toast.LENGTH_SHORT).show()
}
is VaultItemEvent.ShowToast -> {
Toast.makeText(context, event.message(resources), Toast.LENGTH_SHORT).show()
}
@@ -173,11 +178,7 @@ fun VaultItemScreen(
}
// TODO make action list dependent on item being in an organization BIT-1446
BitwardenOverflowActionItem(
menuItemDataList = persistentListOf(
OverflowMenuItemData(
text = stringResource(id = R.string.delete),
onClick = { pendingDeleteCipher = true },
),
menuItemDataList = persistentListOfNotNull(
OverflowMenuItemData(
text = stringResource(id = R.string.attachments),
onClick = remember(viewModel) {
@@ -193,7 +194,8 @@ fun VaultItemScreen(
onClick = remember(viewModel) {
{ viewModel.trySendAction(VaultItemAction.Common.CloneClick) }
},
),
)
.takeUnless { state.isCipherInCollection },
OverflowMenuItemData(
text = stringResource(id = R.string.move_to_organization),
onClick = remember(viewModel) {
@@ -203,6 +205,22 @@ fun VaultItemScreen(
)
}
},
)
.takeUnless { state.isCipherInCollection },
OverflowMenuItemData(
text = stringResource(id = R.string.collections),
onClick = remember(viewModel) {
{
viewModel.trySendAction(
VaultItemAction.Common.CollectionsClick,
)
}
},
)
.takeIf { state.isCipherInCollection },
OverflowMenuItemData(
text = stringResource(id = R.string.delete),
onClick = { pendingDeleteCipher = true },
),
),
)

28
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
View File

@@ -102,6 +102,7 @@ class VaultItemViewModel @Inject constructor(
is VaultItemAction.Common.AttachmentsClick -> handleAttachmentsClick()
is VaultItemAction.Common.CloneClick -> handleCloneClick()
is VaultItemAction.Common.MoveToOrganizationClick -> handleMoveToOrganizationClick()
is VaultItemAction.Common.CollectionsClick -> handleCollectionsClick()
is VaultItemAction.Common.ConfirmDeleteClick -> handleConfirmDeleteClick()
is VaultItemAction.Common.ConfirmRestoreClick -> handleConfirmRestoreClick()
}
@@ -221,6 +222,10 @@ class VaultItemViewModel @Inject constructor(
sendEvent(VaultItemEvent.NavigateToMoveToOrganization(itemId = state.vaultItemId))
}
private fun handleCollectionsClick() {
sendEvent(VaultItemEvent.NavigateToCollections(itemId = state.vaultItemId))
}
private fun handleConfirmDeleteClick() {
mutableStateFlow.update {
it.copy(
@@ -659,6 +664,17 @@ data class VaultItemState(
val isFabVisible: Boolean
get() = viewState is ViewState.Content && !isCipherDeleted
/**
* Whether or not the cipher is in a collection.
*/
val isCipherInCollection: Boolean
get() = (viewState as? ViewState.Content)
?.common
?.currentCipher
?.collectionIds
?.isNotEmpty()
?: false
/**
* Represents the specific view states for the [VaultItemScreen].
*/
@@ -936,6 +952,13 @@ sealed class VaultItemEvent {
val itemId: String,
) : VaultItemEvent()
/**
* Navigates to the collections screen.
*/
data class NavigateToCollections(
val itemId: String,
) : VaultItemEvent()
/**
* Places the given [message] in your clipboard.
*/
@@ -1028,6 +1051,11 @@ sealed class VaultItemAction {
* The user has clicked the move to organization button.
*/
data object MoveToOrganizationClick : Common()
/**
* The user has clicked the collections button.
*/
data object CollectionsClick : Common()
}
/**