BIT-506: Hard delete (#910)

app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/disk/dao/CiphersDao.kt

@@ -40,7 +40,7 @@ interface CiphersDao {
      * Deletes the specified cipher associated with the given [userId] and [cipherId]. This will
      * return the number of rows deleted by this query.
      */
-    @Query("DELETE FROM sends WHERE user_id = :userId AND id = :cipherId")
+    @Query("DELETE FROM ciphers WHERE user_id = :userId AND id = :cipherId")
     suspend fun deleteCipher(userId: String, cipherId: String): Int
 
     /**

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

@@ -127,7 +127,7 @@ fun VaultItemScreen(
     if (pendingDeleteCipher) {
         BitwardenTwoButtonDialog(
             title = stringResource(id = R.string.delete),
-            message = stringResource(id = R.string.do_you_really_want_to_soft_delete_cipher),
+            message = state.deletionConfirmationText(),
             confirmButtonText = stringResource(id = R.string.ok),
             dismissButtonText = stringResource(id = R.string.cancel),
             onConfirmClick = {
@@ -182,7 +182,6 @@ fun VaultItemScreen(
                             onClick = { pendingRestoreCipher = true },
                         )
                     }
-                    // TODO make action list dependent on item being in an organization BIT-1446
                     BitwardenOverflowActionItem(
                         menuItemDataList = persistentListOfNotNull(
                             OverflowMenuItemData(

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

@@ -297,7 +297,11 @@ class VaultItemViewModel @Inject constructor(
             mutableStateFlow.update {
                 it.copy(
                     dialog = VaultItemState.DialogState.Loading(
-                        R.string.soft_deleting.asText(),
+                        if (state.isCipherDeleted) {
+                            R.string.deleting.asText()
+                        } else {
+                            R.string.soft_deleting.asText()
+                        },
                     ),
                 )
             }
@@ -305,10 +309,16 @@ class VaultItemViewModel @Inject constructor(
                 viewModelScope.launch {
                     trySendAction(
                         VaultItemAction.Internal.DeleteCipherReceive(
-                            result = vaultRepository.softDeleteCipher(
-                                cipherId = state.vaultItemId,
-                                cipherView = cipher,
-                            ),
+                            if (state.isCipherDeleted) {
+                                vaultRepository.hardDeleteCipher(
+                                    cipherId = state.vaultItemId,
+                                )
+                            } else {
+                                vaultRepository.softDeleteCipher(
+                                    cipherId = state.vaultItemId,
+                                    cipherView = cipher,
+                                )
+                            },
                         ),
                     )
                 }
@@ -693,7 +703,15 @@ class VaultItemViewModel @Inject constructor(
 
             DeleteCipherResult.Success -> {
                 mutableStateFlow.update { it.copy(dialog = null) }
-                sendEvent(VaultItemEvent.ShowToast(message = R.string.item_soft_deleted.asText()))
+                sendEvent(
+                    VaultItemEvent.ShowToast(
+                        message = if (state.isCipherDeleted) {
+                            R.string.item_deleted.asText()
+                        } else {
+                            R.string.item_soft_deleted.asText()
+                        },
+                    ),
+                )
                 sendEvent(VaultItemEvent.NavigateBack)
             }
         }
@@ -794,6 +812,17 @@ data class VaultItemState(
             ?.isNotEmpty()
             ?: false
 
+    /**
+     * The text to display on the deletion confirmation dialog.
+     */
+    val deletionConfirmationText: Text
+        get() = if (isCipherDeleted) {
+            R.string.do_you_really_want_to_permanently_delete_cipher
+        } else {
+            R.string.do_you_really_want_to_soft_delete_cipher
+        }
+            .asText()
+
     /**
      * Represents the specific view states for the [VaultItemScreen].
      */