Merge branch 'offer-to-store-the-account-with-credentialmanager-on-droid-1854'

3 files changed, 27 insertions, 3 deletions

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index dd660cda4b..7066e06bc9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
                  android:label="@string/app_name"
                  android:roundIcon="@mipmap/ic_launcher"
                  android:theme="@style/Theme.App.Starting"
-                 tools:ignore="GoogleAppIndexingWarning">
+                 tools:ignore="CredManMissingDal,CredentialDependency,GoogleAppIndexingWarning">
         <!--
             MainActivity
             Must be exported in order to be launchable.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
index 5146d65bb0..20396c4849 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
@@ -29,9 +29,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.credentials.CreatePasswordRequest
+import androidx.credentials.CredentialManager
+import androidx.credentials.exceptions.CreateCredentialException
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.compose.dropUnlessResumed
+import co.touchlab.kermit.Logger
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import com.ramcosta.composedestinations.generated.NavGraphs
@@ -140,6 +144,17 @@ fun Welcome(
                 snackbarHostState.showSnackbarImmediately(
                     message = context.getString(R.string.error_occurred)
                 )
+            is WelcomeViewModel.UiSideEffect.StoreCredentialsRequest -> {
+                // UserId is not allowed to be empty
+                val createPasswordRequest =
+                    CreatePasswordRequest(id = "-", password = uiSideEffect.accountNumber.value)
+                val credentialsManager = CredentialManager.create(context)
+                try {
+                    credentialsManager.createCredential(context, createPasswordRequest)
+                } catch (e: CreateCredentialException) {
+                    Logger.w("Unable to create Credentials")
+                }
+            }
         }
     }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
index 0e91390262..e22055cba7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.WelcomeUiState
 import net.mullvad.mullvadvpn.lib.common.util.isAfterNowInstant
+import net.mullvad.mullvadvpn.lib.model.AccountNumber
 import net.mullvad.mullvadvpn.lib.model.WebsiteAuthToken
 import net.mullvad.mullvadvpn.lib.shared.AccountRepository
 import net.mullvad.mullvadvpn.lib.shared.ConnectionProxy
@@ -39,12 +40,18 @@ class WelcomeViewModel(
     val uiState =
         combine(
                 connectionProxy.tunnelState,
-                deviceRepository.deviceState.filterNotNull(),
+                deviceRepository.deviceState.filterNotNull().onEach {
+                    viewModelScope.launch {
+                        it.accountNumber()?.let { accountNumber ->
+                            _uiSideEffect.send(UiSideEffect.StoreCredentialsRequest(accountNumber))
+                        }
+                    }
+                },
                 paymentUseCase.paymentAvailability,
             ) { tunnelState, accountState, paymentAvailability ->
                 WelcomeUiState(
                     tunnelState = tunnelState,
-                    accountNumber = accountState.token(),
+                    accountNumber = accountState.accountNumber(),
                     deviceName = accountState.displayName(),
                     showSitePayment = !isPlayBuild,
                     billingPaymentState = paymentAvailability?.toPaymentState(),
@@ -122,6 +129,8 @@ class WelcomeViewModel(
 
         data object OpenConnectScreen : UiSideEffect
 
+        data class StoreCredentialsRequest(val accountNumber: AccountNumber) : UiSideEffect
+
         data object GenericError : UiSideEffect
     }