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-890 Adding a check for name when we save an item (#355)

Browse Source
This commit is contained in:
Oleg Semenenko
2023-12-08 12:50:34 -06:00
committed by Álison Fernandes
parent bfc0e9831c
commit 33a99ce68d
4 changed files with 212 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemScreen.kt
View File

@@ -25,6 +25,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.BasicDialogState
import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog
import com.x8bit.bitwarden.ui.platform.components.BitwardenListHeaderText
import com.x8bit.bitwarden.ui.platform.components.BitwardenLoadingDialog
import com.x8bit.bitwarden.ui.platform.components.BitwardenMultiSelectButton
@@ -72,6 +75,16 @@ fun VaultAddItemScreen(
)
}
is VaultAddItemState.DialogState.Error -> BitwardenBasicDialog(
visibilityState = BasicDialogState.Shown(
title = R.string.an_error_has_occurred.asText(),
message = dialogState.message,
),
onDismissRequest = remember(viewModel) {
{ viewModel.trySendAction(VaultAddItemAction.DismissDialog) }
},
)
null -> Unit
}
@@ -139,11 +152,11 @@ fun VaultAddItemScreen(
)
}
VaultAddItemState.ItemType.Card -> {
is VaultAddItemState.ItemType.Card -> {
// TODO(BIT-507): Create UI for card-type item creation
}
VaultAddItemState.ItemType.Identity -> {
is VaultAddItemState.ItemType.Identity -> {
// TODO(BIT-667): Create UI for identity-type item creation
}

93
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddItemViewModel.kt
View File

@@ -9,8 +9,6 @@ import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
import com.x8bit.bitwarden.ui.platform.base.BaseViewModel
import com.x8bit.bitwarden.ui.platform.base.util.Text
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.vault.feature.additem.VaultAddItemState.ItemType.Card.displayStringResId
import com.x8bit.bitwarden.ui.vault.feature.additem.VaultAddItemState.ItemType.Identity.displayStringResId
import com.x8bit.bitwarden.ui.vault.feature.vault.util.toCipherView
import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -62,6 +60,10 @@ class VaultAddItemViewModel @Inject constructor(
handleCloseClick()
}
is VaultAddItemAction.DismissDialog -> {
handleDismissDialog()
}
is VaultAddItemAction.TypeOptionSelect -> {
handleTypeOptionSelect(action)
}
@@ -85,6 +87,18 @@ class VaultAddItemViewModel @Inject constructor(
//region Top Level Handlers
private fun handleSaveClick() {
if (state.selectedType.name.isBlank()) {
mutableStateFlow.update {
it.copy(
dialog = VaultAddItemState.DialogState.Error(
R.string.validation_field_required
.asText(R.string.name.asText()),
),
)
}
return
}
mutableStateFlow.update {
it.copy(
dialog = VaultAddItemState.DialogState.Loading(
@@ -94,27 +108,13 @@ class VaultAddItemViewModel @Inject constructor(
}
viewModelScope.launch {
when (state.selectedType) {
is VaultAddItemState.ItemType.Login,
is VaultAddItemState.ItemType.SecureNotes,
-> {
sendAction(
action = VaultAddItemAction.Internal.CreateCipherResultReceive(
createCipherResult = vaultRepository.createCipher(
cipherView = stateFlow.value.selectedType.toCipherView(),
),
),
)
}
VaultAddItemState.ItemType.Card -> {
// TODO Add Saving of Card Type (BIT-668)
}
VaultAddItemState.ItemType.Identity -> {
// TODO Add Saving of Identity type (BIT-508)
}
}
sendAction(
action = VaultAddItemAction.Internal.CreateCipherResultReceive(
createCipherResult = vaultRepository.createCipher(
cipherView = stateFlow.value.selectedType.toCipherView(),
),
),
)
}
}
@@ -124,6 +124,12 @@ class VaultAddItemViewModel @Inject constructor(
)
}
private fun handleDismissDialog() {
mutableStateFlow.update {
it.copy(dialog = null)
}
}
//endregion Top Level Handlers
//region Type Option Handlers
@@ -156,7 +162,7 @@ class VaultAddItemViewModel @Inject constructor(
private fun handleSwitchToAddCardItem() {
mutableStateFlow.update { currentState ->
currentState.copy(
selectedType = VaultAddItemState.ItemType.Card,
selectedType = VaultAddItemState.ItemType.Card(),
)
}
}
@@ -164,7 +170,7 @@ class VaultAddItemViewModel @Inject constructor(
private fun handleSwitchToAddIdentityItem() {
mutableStateFlow.update { currentState ->
currentState.copy(
selectedType = VaultAddItemState.ItemType.Identity,
selectedType = VaultAddItemState.ItemType.Identity(),
)
}
}
@@ -633,10 +639,15 @@ data class VaultAddItemState(
*/
abstract val displayStringResId: Int
/**
* Represents the name for the item type. This is an abstract property
* that must be overridden to save the item
*/
abstract val name: String
/**
* Represents the login item information.
*
* @property name The name associated with the login item.
* @property username The username required for the login item.
* @property password The password required for the login item.
* @property uri The URI associated with the login item.
@@ -650,7 +661,7 @@ data class VaultAddItemState(
*/
@Parcelize
data class Login(
val name: String = "",
override val name: String = "",
val username: String = "",
val password: String = "",
val uri: String = "",
@@ -679,22 +690,24 @@ data class VaultAddItemState(
/**
* Represents the `Card` item type.
*
* @property displayStringResId Resource ID for the display string of the card type.
*/
@Parcelize
data object Card : ItemType() {
data class Card(
// TODO create the Card Item (BIT-509)
override val name: String = "",
) : ItemType() {
override val displayStringResId: Int
get() = ItemTypeOption.CARD.labelRes
}
/**
* Represents the `Identity` item type.
*
* @property displayStringResId Resource ID for the display string of the identity type.
*/
@Parcelize
data object Identity : ItemType() {
data class Identity(
// TODO create the Identity Item (BIT-667)
override val name: String = "",
) : ItemType() {
override val displayStringResId: Int
get() = ItemTypeOption.IDENTITY.labelRes
}
@@ -702,7 +715,6 @@ data class VaultAddItemState(
/**
* Represents the `SecureNotes` item type.
*
* @property name The name associated with the SecureNotes item.
* @property folder The folder used for the SecureNotes item
* @property favorite Indicates whether this SecureNotes item is marked as a favorite.
* @property masterPasswordReprompt Indicates if a master password reprompt is required.
@@ -713,7 +725,7 @@ data class VaultAddItemState(
*/
@Parcelize
data class SecureNotes(
val name: String = "",
override val name: String = "",
val folderName: Text = DEFAULT_FOLDER,
val favorite: Boolean = false,
val masterPasswordReprompt: Boolean = false,
@@ -747,6 +759,12 @@ data class VaultAddItemState(
*/
@Parcelize
data class Loading(val label: Text) : DialogState()
/**
* Displays an error dialog to the user.
*/
@Parcelize
data class Error(val message: Text) : DialogState()
}
}
@@ -782,6 +800,11 @@ sealed class VaultAddItemAction {
*/
data object CloseClick : VaultAddItemAction()
/**
* The user has clicked to dismiss the dialog.
*/
data object DismissDialog : VaultAddItemAction()
/**
* Represents the action when a type option is selected.
*