Fixed adding duplicate accounts.| #716

FlowCrypt · Aug 26, 2020 · 6085fdf · 6085fdf
1 parent b636360
commit 6085fdf
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 21 deletions.
diff --git a/...ypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt b/...ypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt
@@ -43,7 +43,7 @@ import java.util.*
  */
 class OAuth2AuthCredentialsViewModel(application: Application) : BaseAndroidViewModel(application) {
   private val apiRepository: ApiRepository = FlowcryptApiRepository()
-  val microsoftOAuth2TokenLiveData = MutableLiveData<Result<AuthCredentials>>()
+  val microsoftOAuth2TokenLiveData = MutableLiveData<Result<AuthCredentials?>>()
   val authorizationRequestLiveData = MutableLiveData<Result<AuthorizationRequest>>()
 
   fun getAuthorizationRequestForProvider(requestCode: Long = 0L, provider: OAuth2Helper.Provider) {

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt
@@ -282,18 +282,6 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
     }
   }
 
-  private fun storeAccountInfoToAccountManager(accountEntity: AccountEntity, authCreds: AuthCredentials) {
-    val accountManager = AccountManager.get(requireContext())
-    val account = Account(accountEntity.email.toLowerCase(Locale.US), FlowcryptAccountAuthenticator.ACCOUNT_TYPE)
-    accountManager.addAccountExplicitly(account, null, Bundle().apply {
-      with(authCreds.authTokenInfo) {
-        putString(FlowcryptAccountAuthenticator.KEY_ACCOUNT_EMAIL, this?.email)
-        putString(FlowcryptAccountAuthenticator.KEY_REFRESH_TOKEN, this?.refreshToken)
-        putString(FlowcryptAccountAuthenticator.KEY_EXPIRES_AT, this?.expiresAt?.toString())
-      }
-    })
-  }
-
   fun handleOAuth2Intent(intent: Intent?) {
     intent?.let {
       val schema = intent.data?.scheme
@@ -629,16 +617,32 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
 
         Result.Status.SUCCESS -> {
-          oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.removeObservers(viewLifecycleOwner)
           it.data?.let { authCredentials ->
             authCreds = authCredentials
-            val account = AccountEntity(authCredentials).copy(password = authCredentials
-                .peekPassword(), smtpPassword = authCredentials.peekSmtpPassword())
-            val nextFrag = AuthorizeAndSearchBackupsFragment.newInstance(account)
-            activity?.supportFragmentManager?.beginTransaction()
-                ?.replace(R.id.fragmentContainerView, nextFrag, AuthorizeAndSearchBackupsFragment::class.java.simpleName)
-                ?.addToBackStack(null)
-                ?.commit()
+
+            val existedAccount = existedAccounts.firstOrNull { account ->
+              account.email.equals(authCredentials.email, ignoreCase = true)
+            }
+
+            if (existedAccount == null) {
+              oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.removeObservers(viewLifecycleOwner)
+              val account = AccountEntity(authCredentials).copy(
+                  password = authCredentials.peekPassword(),
+                  smtpPassword = authCredentials.peekSmtpPassword()
+              )
+
+              val nextFrag = AuthorizeAndSearchBackupsFragment.newInstance(account)
+              activity?.supportFragmentManager?.beginTransaction()
+                  ?.replace(R.id.fragmentContainerView, nextFrag, AuthorizeAndSearchBackupsFragment::class.java.simpleName)
+                  ?.addToBackStack(null)
+                  ?.commit()
+
+              return@let
+            } else {
+              oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.value = Result.success(null)
+              showContent()
+              showInfoSnackbar(msgText = getString(R.string.template_email_alredy_added, existedAccount.email), duration = Snackbar.LENGTH_LONG)
+            }
           }
         }
 
@@ -923,6 +927,18 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
     }
   }
 
+  private fun storeAccountInfoToAccountManager(accountEntity: AccountEntity, authCreds: AuthCredentials) {
+    val accountManager = AccountManager.get(requireContext())
+    val account = Account(accountEntity.email.toLowerCase(Locale.US), FlowcryptAccountAuthenticator.ACCOUNT_TYPE)
+    accountManager.addAccountExplicitly(account, null, Bundle().apply {
+      with(authCreds.authTokenInfo) {
+        putString(FlowcryptAccountAuthenticator.KEY_ACCOUNT_EMAIL, this?.email)
+        putString(FlowcryptAccountAuthenticator.KEY_REFRESH_TOKEN, this?.refreshToken)
+        putString(FlowcryptAccountAuthenticator.KEY_EXPIRES_AT, this?.expiresAt?.toString())
+      }
+    })
+  }
+
   companion object {
     private val KEY_AUTH_REQUEST =
         GeneralUtil.generateUniqueExtraKey("KEY_UUID_FOR_OAUTH", AddOtherAccountFragment::class.java)