BITAU-180 Show "Move to Bitwarden" long press action (#250)

bitwarden · Oct 24, 2024 · 5fdfb26 · 5fdfb26
1 parent 5d76563
commit 5fdfb26
Show file tree

Hide file tree

Showing 14 changed files with 358 additions and 27 deletions.
diff --git a/app/libs/authenticatorbridge-0.1.0-SNAPSHOT-release.aar b/app/libs/authenticatorbridge-0.1.0-SNAPSHOT-release.aar
diff --git a/...com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorBridgeModule.kt b/...com/bitwarden/authenticator/data/authenticator/repository/di/AuthenticatorBridgeModule.kt
@@ -51,6 +51,8 @@ object AuthenticatorBridgeModule {
             object : AuthenticatorBridgeManager {
                 override val accountSyncStateFlow: StateFlow<AccountSyncState>
                     get() = MutableStateFlow(AccountSyncState.Loading)
+
+                override fun startAddTotpLoginItemFlow(totpUri: String): Boolean = false
             }
         }
 

diff --git a/...lin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt b/...lin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt
@@ -237,6 +237,11 @@ fun ItemListingScreen(
                         viewModel.trySendAction(ItemListingAction.SyncWithBitwardenDismiss)
                     }
                 },
+                onMoveToBitwardenClick = remember(viewModel) {
+                    {
+                        viewModel.trySendAction(ItemListingAction.MoveToBitwardenClick(it))
+                    }
+                },
             )
         }
 
@@ -342,6 +347,7 @@ private fun ItemListingContent(
     onItemClick: (String) -> Unit,
     onEditItemClick: (String) -> Unit,
     onDeleteItemClick: (String) -> Unit,
+    onMoveToBitwardenClick: (String) -> Unit,
     onDownloadBitwardenClick: () -> Unit,
     onDismissDownloadBitwardenClick: () -> Unit,
     onSyncWithBitwardenClick: () -> Unit,
@@ -453,6 +459,8 @@ private fun ItemListingContent(
                             onItemClick = { onItemClick(it.authCode) },
                             onEditItemClick = { onEditItemClick(it.id) },
                             onDeleteItemClick = { onDeleteItemClick(it.id) },
+                            onMoveToBitwardenClick = { onMoveToBitwardenClick(it.id) },
+                            showMoveToBitwarden = it.showMoveToBitwarden,
                             allowLongPress = it.allowLongPressActions,
                             modifier = Modifier.fillMaxWidth(),
                         )
@@ -481,6 +489,8 @@ private fun ItemListingContent(
                         onItemClick = { onItemClick(it.authCode) },
                         onEditItemClick = { onEditItemClick(it.id) },
                         onDeleteItemClick = { onDeleteItemClick(it.id) },
+                        onMoveToBitwardenClick = { onMoveToBitwardenClick(it.id) },
+                        showMoveToBitwarden = it.showMoveToBitwarden,
                         allowLongPress = it.allowLongPressActions,
                         modifier = Modifier.fillMaxWidth(),
                     )
@@ -515,6 +525,8 @@ private fun ItemListingContent(
                                     onItemClick = { onItemClick(it.authCode) },
                                     onEditItemClick = { },
                                     onDeleteItemClick = { },
+                                    onMoveToBitwardenClick = { },
+                                    showMoveToBitwarden = it.showMoveToBitwarden,
                                     allowLongPress = it.allowLongPressActions,
                                     modifier = Modifier.fillMaxWidth(),
                                 )

diff --git a/.../com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt b/.../com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingViewModel.kt
@@ -28,8 +28,10 @@ import com.bitwarden.authenticator.ui.platform.base.BaseViewModel
 import com.bitwarden.authenticator.ui.platform.base.util.Text
 import com.bitwarden.authenticator.ui.platform.base.util.asText
 import com.bitwarden.authenticator.ui.platform.feature.settings.appearance.model.AppTheme
+import com.bitwarden.authenticatorbridge.manager.AuthenticatorBridgeManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -46,6 +48,7 @@ import javax.inject.Inject
 @HiltViewModel
 class ItemListingViewModel @Inject constructor(
     private val authenticatorRepository: AuthenticatorRepository,
+    private val authenticatorBridgeManager: AuthenticatorBridgeManager,
     private val clipboardManager: BitwardenClipboardManager,
     private val encodingManager: BitwardenEncodingManager,
     private val settingsRepository: SettingsRepository,
@@ -144,9 +147,14 @@ class ItemListingViewModel @Inject constructor(
             ItemListingAction.SyncWithBitwardenClick -> {
                 handleSyncWithBitwardenClick()
             }
+
             ItemListingAction.SyncWithBitwardenDismiss -> {
                 handleSyncWithBitwardenDismiss()
             }
+
+            is ItemListingAction.MoveToBitwardenClick -> {
+                handleMoveToBitwardenClick(action)
+            }
         }
     }
 
@@ -167,6 +175,28 @@ class ItemListingViewModel @Inject constructor(
         sendEvent(ItemListingEvent.NavigateToEditItem(action.itemId))
     }
 
+    private fun handleMoveToBitwardenClick(action: ItemListingAction.MoveToBitwardenClick) {
+        viewModelScope.launch {
+            val item = authenticatorRepository
+                .getItemStateFlow(action.entityId)
+                .first { it.data != null }
+
+            val didLaunchAddTotpFlow = authenticatorBridgeManager.startAddTotpLoginItemFlow(
+                totpUri = item.data!!.toOtpAuthUriString(),
+            )
+            if (!didLaunchAddTotpFlow) {
+                mutableStateFlow.update {
+                    it.copy(
+                        dialog = ItemListingState.DialogState.Error(
+                            title = R.string.something_went_wrong.asText(),
+                            message = R.string.please_try_again.asText(),
+                        ),
+                    )
+                }
+            }
+        }
+    }
+
     private fun handleDeleteItemClick(action: ItemListingAction.DeleteItemClick) {
         mutableStateFlow.update {
             it.copy(
@@ -439,7 +469,9 @@ class ItemListingViewModel @Inject constructor(
                 -> SharedCodesDisplayState.Codes(emptyList())
 
             is SharedVerificationCodesState.Success ->
-                action.sharedCodesState.toSharedCodesDisplayState(state.alertThresholdSeconds)
+                action.sharedCodesState.toSharedCodesDisplayState(
+                    alertThresholdSeconds = state.alertThresholdSeconds,
+                )
         }
 
         if (localItems.isEmpty() && sharedItemsState.isEmpty()) {
@@ -456,12 +488,20 @@ class ItemListingViewModel @Inject constructor(
                 favoriteItems = localItems
                     .filter { it.source is AuthenticatorItem.Source.Local && it.source.isFavorite }
                     .map {
-                        it.toDisplayItem(alertThresholdSeconds = state.alertThresholdSeconds)
+                        it.toDisplayItem(
+                            alertThresholdSeconds = state.alertThresholdSeconds,
+                            sharedVerificationCodesState =
+                            authenticatorRepository.sharedCodesStateFlow.value,
+                        )
                     },
                 itemList = localItems
                     .filter { it.source is AuthenticatorItem.Source.Local && !it.source.isFavorite }
                     .map {
-                        it.toDisplayItem(alertThresholdSeconds = state.alertThresholdSeconds)
+                        it.toDisplayItem(
+                            alertThresholdSeconds = state.alertThresholdSeconds,
+                            sharedVerificationCodesState =
+                            authenticatorRepository.sharedCodesStateFlow.value,
+                        )
                     },
                 sharedItems = sharedItemsState,
                 actionCard = action.sharedCodesState.toActionCard(),
@@ -538,7 +578,7 @@ class ItemListingViewModel @Inject constructor(
             SharedVerificationCodesState.Loading,
             SharedVerificationCodesState.OsVersionNotSupported,
             is SharedVerificationCodesState.Success,
-            -> ItemListingState.ActionCardState.None
+                -> ItemListingState.ActionCardState.None
         }
 
     private fun String.toAuthenticatorEntityOrNull(): AuthenticatorItemEntity? {
@@ -818,6 +858,11 @@ sealed class ItemListingAction {
      */
     data object SyncWithBitwardenDismiss : ItemListingAction()
 
+    /**
+     * The user clicked the "Move to Bitwarden" action on a local verification item.
+     */
+    data class MoveToBitwardenClick(val entityId: String) : ItemListingAction()
+
     /**
      * Models actions that [ItemListingScreen] itself may send.
      */

diff --git a/...bitwarden/authenticator/ui/authenticator/feature/itemlisting/VaultVerificationCodeItem.kt b/...bitwarden/authenticator/ui/authenticator/feature/itemlisting/VaultVerificationCodeItem.kt
@@ -64,7 +64,9 @@ fun VaultVerificationCodeItem(
     onItemClick: () -> Unit,
     onEditItemClick: () -> Unit,
     onDeleteItemClick: () -> Unit,
+    onMoveToBitwardenClick: () -> Unit,
     allowLongPress: Boolean,
+    showMoveToBitwarden: Boolean,
     modifier: Modifier = Modifier,
 ) {
     var shouldShowDropdownMenu by remember { mutableStateOf(value = false) }
@@ -168,6 +170,24 @@ fun VaultVerificationCodeItem(
                     )
                 },
             )
+            if (showMoveToBitwarden) {
+                HorizontalDivider()
+                DropdownMenuItem(
+                    text = {
+                        Text(text = stringResource(id = R.string.move_to_bitwarden))
+                    },
+                    onClick = {
+                        shouldShowDropdownMenu = false
+                        onMoveToBitwardenClick()
+                    },
+                    leadingIcon = {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_arrow_right),
+                            contentDescription = stringResource(id = R.string.move_to_bitwarden),
+                        )
+                    },
+                )
+            }
             HorizontalDivider()
             DropdownMenuItem(
                 text = {
@@ -204,8 +224,10 @@ private fun VerificationCodeItem_preview() {
             onItemClick = {},
             onEditItemClick = {},
             onDeleteItemClick = {},
+            onMoveToBitwardenClick = {},
             allowLongPress = true,
             modifier = Modifier.padding(horizontal = 16.dp),
+            showMoveToBitwarden = true,
         )
     }
 }
diff --git a/...n/authenticator/ui/authenticator/feature/itemlisting/model/VerificationCodeDisplayItem.kt b/...n/authenticator/ui/authenticator/feature/itemlisting/model/VerificationCodeDisplayItem.kt
@@ -20,4 +20,5 @@ data class VerificationCodeDisplayItem(
     val startIcon: IconData = IconData.Local(R.drawable.ic_login_item),
     val favorite: Boolean,
     val allowLongPressActions: Boolean,
+    val showMoveToBitwarden: Boolean,
 ) : Parcelable
diff --git a/...cator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateExtensions.kt b/...cator/ui/authenticator/feature/itemlisting/util/SharedVerificationCodesStateExtensions.kt
@@ -19,7 +19,14 @@ fun SharedVerificationCodesState.Success.toSharedCodesDisplayState(
     // codes for that account:
     this.items.forEach {
         codesMap.putIfAbsent(it.source as AuthenticatorItem.Source.Shared, mutableListOf())
-        codesMap[it.source]?.add(it.toDisplayItem(alertThresholdSeconds))
+        codesMap[it.source]?.add(
+            it.toDisplayItem(
+                alertThresholdSeconds = alertThresholdSeconds,
+                // Always map based on Error state, because shared codes will never
+                // show "Move to Bitwarden" action.
+                sharedVerificationCodesState = SharedVerificationCodesState.Error,
+            ),
+        )
     }
     // Flatten that map down to a list of accounts that each has a list of codes:
     return codesMap

diff --git a/...authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt b/...authenticator/ui/authenticator/feature/itemlisting/util/VerificationCodeItemExtensions.kt
@@ -2,23 +2,43 @@ package com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.util
 
 import com.bitwarden.authenticator.data.authenticator.manager.model.VerificationCodeItem
 import com.bitwarden.authenticator.data.authenticator.repository.model.AuthenticatorItem
+import com.bitwarden.authenticator.data.authenticator.repository.model.SharedVerificationCodesState
 import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.model.VerificationCodeDisplayItem
 
 /**
  * Converts [VerificationCodeItem] to a [VerificationCodeDisplayItem].
  */
-fun VerificationCodeItem.toDisplayItem(alertThresholdSeconds: Int) =
-    VerificationCodeDisplayItem(
-        id = id,
-        issuer = issuer,
-        label = accountName,
-        timeLeftSeconds = timeLeftSeconds,
-        periodSeconds = periodSeconds,
-        alertThresholdSeconds = alertThresholdSeconds,
-        authCode = code,
-        allowLongPressActions = when (source) {
-            is AuthenticatorItem.Source.Local -> true
-            is AuthenticatorItem.Source.Shared -> false
-        },
-        favorite = (source as? AuthenticatorItem.Source.Local)?.isFavorite ?: false,
-    )
+fun VerificationCodeItem.toDisplayItem(
+    alertThresholdSeconds: Int,
+    sharedVerificationCodesState: SharedVerificationCodesState,
+) = VerificationCodeDisplayItem(
+    id = id,
+    issuer = issuer,
+    label = accountName,
+    timeLeftSeconds = timeLeftSeconds,
+    periodSeconds = periodSeconds,
+    alertThresholdSeconds = alertThresholdSeconds,
+    authCode = code,
+    allowLongPressActions = when (source) {
+        is AuthenticatorItem.Source.Local -> true
+        is AuthenticatorItem.Source.Shared -> false
+    },
+    favorite = (source as? AuthenticatorItem.Source.Local)?.isFavorite ?: false,
+    showMoveToBitwarden = when (source) {
+        // Shared items should never show Move to Bitwarden action:
+        is AuthenticatorItem.Source.Shared -> false
+
+        // Local items should only show Move to Bitwarden if we are successfully syncing: =
+        is AuthenticatorItem.Source.Local -> when (sharedVerificationCodesState) {
+            SharedVerificationCodesState.AppNotInstalled,
+            SharedVerificationCodesState.Error,
+            SharedVerificationCodesState.FeatureNotEnabled,
+            SharedVerificationCodesState.Loading,
+            SharedVerificationCodesState.OsVersionNotSupported,
+            SharedVerificationCodesState.SyncNotEnabled,
+                -> false
+
+            is SharedVerificationCodesState.Success -> true
+        }
+    },
+)
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M15.616,10.5C15.247,10.888 9.462,16.961 8.962,17.5C8.446,18.057 9.202,19.084 9.975,18.244C10.747,17.405 16.759,11.113 16.759,11.113C17.301,10.447 17.301,9.539 16.759,8.874L10.002,1.77C9.151,0.832 8.201,1.678 8.987,2.5C11.77,5.412 15.124,8.963 15.631,9.5H2.5C2.224,9.5 2,9.724 2,10C2,10.276 2.224,10.5 2.5,10.5H15.616Z"
+      android:fillColor="#45464F"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -130,4 +130,7 @@
     <string name="sync_with_the_bitwarden_app">Sync with the Bitwarden app</string>
     <string name="go_to_settings">Go to settings</string>
     <string name="sync_with_bitwarden_action_card_message">Allow Authenticator app syncing in settings to view all of your verification codes here.</string>
+    <string name="something_went_wrong">Something went wrong</string>
+    <string name="please_try_again">Please try again</string>
+    <string name="move_to_bitwarden">Move to Bitwarden</string>
 </resources>