FLW-3692 We everytime should ask permission to google on "Export wall…

…et" screen wip
soramitsu · Aug 11, 2023 · c11361e · c11361e
1 parent a23f353
commit c11361e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -82,7 +82,7 @@ buildscript {
         minifyRelease = true
         beaconVersion = "3.2.4"
 
-        sharedFeaturesVersion = "1.1.1.10-SNAPSHOT"
+        sharedFeaturesVersion = "1.1.1.11-SNAPSHOT"
 
         coilDep = "io.coil-kt:coil:$coilVersion"
         coilSvg = "io.coil-kt:coil-svg:$coilVersion"

diff --git a/...ain/java/jp/co/soramitsu/account/impl/presentation/backup_wallet/BackupWalletViewModel.kt b/...ain/java/jp/co/soramitsu/account/impl/presentation/backup_wallet/BackupWalletViewModel.kt
@@ -2,8 +2,6 @@ package jp.co.soramitsu.account.impl.presentation.backup_wallet
 
 import android.content.Intent
 import android.widget.LinearLayout
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
@@ -37,6 +35,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 

diff --git a/...java/jp/co/soramitsu/account/impl/presentation/mnemonic/backup/BackupMnemonicViewModel.kt b/...java/jp/co/soramitsu/account/impl/presentation/mnemonic/backup/BackupMnemonicViewModel.kt
@@ -219,6 +219,7 @@ class BackupMnemonicViewModel @Inject constructor(
             return
         }
 
+        backupService.logout()
         if (backupService.authorize(launcher)) {
             openCreateBackupPasswordDialog(
                 substrateDerivationPath,

diff --git a/.../jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/SelectWalletViewModel.kt b/.../jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/SelectWalletViewModel.kt
@@ -123,6 +123,7 @@ class SelectWalletViewModel @Inject constructor(
 
     fun authorizeGoogle(launcher: ActivityResultLauncher<Intent>) {
         launch {
+            backupService.logout()
             if (backupService.authorize(launcher)) {
                 openAddWalletThroughGoogleScreen()
             }