From 16dbd572efdf532729ca1ae74cefe355e4e9bd09 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Thu, 27 Aug 2020 09:32:57 +0300
Subject: [PATCH] Modified a logic of resolving base settings.| #716

---
 .idea/codeStyles/Project.xml                  |  18 +++
 .../api/email/EmailProviderSettingsHelper.kt  |   9 +-
 .../api/retrofit/response/base/Result.kt      |   4 +
 .../OAuth2AuthCredentialsViewModel.kt         |   8 +-
 .../fragment/AddOtherAccountFragment.kt       | 106 +++++++++---------
 5 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41ae2a..0d156937bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailProviderSettingsHelper.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailProviderSettingsHelper.kt
index 801dc0606e..dafa08ea3e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailProviderSettingsHelper.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailProviderSettingsHelper.kt
@@ -7,6 +7,7 @@ package com.flowcrypt.email.api.email
 
 import com.flowcrypt.email.api.email.model.AuthCredentials
 import com.flowcrypt.email.api.email.model.SecurityType
+import com.flowcrypt.email.api.oauth.OAuth2Helper
 import com.flowcrypt.email.util.GeneralUtil
 
 /**
@@ -21,7 +22,7 @@ object EmailProviderSettingsHelper {
   /*********************** Microsoft **********************/
   private const val PROVIDER_OUTLOOK = "outlook.com"
   private const val PROVIDER_HOTMAIL = "hotmail.com"
-  private const val PROVIDER_LIVE = "Live.com"
+  private const val PROVIDER_LIVE = "live.com"
   private const val IMAP_SERVER_MICROSOFT = "outlook.office365.com"
   private const val SMTP_SERVER_MICROSOFT = "smtp.office365.com"
   private const val FAQ_URL_MICROSOFT = "https://support.microsoft.com/en-us/office/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040"
@@ -79,6 +80,12 @@ object EmailProviderSettingsHelper {
     }
   }
 
+  fun getBaseSettingsForProvider(email: String, provider: OAuth2Helper.Provider): AuthCredentials? {
+    return when (provider) {
+      OAuth2Helper.Provider.MICROSOFT -> getOutlookSettings(email, "")
+    }
+  }
+
   private fun getOutlookSettings(email: String, password: String): AuthCredentials {
     return AuthCredentials(
         email = email,
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/Result.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/Result.kt
index 961406ddbd..447f90c18b 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/Result.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/base/Result.kt
@@ -29,6 +29,10 @@ data class Result<out T>(val status: Status,
   }
 
   companion object {
+    fun <T> clearResult(): Result<T> {
+      return Result(status = Status.SUCCESS, data = null, exception = null, requestCode = 0)
+    }
+
     fun <T> success(data: T, requestCode: Long = 0): Result<T> {
       return Result(status = Status.SUCCESS, data = data, exception = null, requestCode = requestCode)
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt
index 8585651eea..b935229ddd 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/OAuth2AuthCredentialsViewModel.kt
@@ -122,7 +122,9 @@ class OAuth2AuthCredentialsViewModel(application: Application) : BaseAndroidView
 
         val accessToken = response.data?.accessToken
             ?: throw NullPointerException("API error: accessToken is null!")
-        val recommendAuthCredentials = EmailProviderSettingsHelper.getBaseSettings(email, "")?.copy(
+        val recommendAuthCredentials = EmailProviderSettingsHelper.getBaseSettingsForProvider(email, OAuth2Helper.Provider.MICROSOFT)?.copy(
+            password = "",
+            smtpSignInPassword = null,
             useOAuth2 = true,
             displayName = displayName,
             authTokenInfo = AuthTokenInfo(
@@ -130,9 +132,7 @@ class OAuth2AuthCredentialsViewModel(application: Application) : BaseAndroidView
                 accessToken = accessToken,
                 expiresAt = OAuth2Helper.getExpiresAtTime(response.data.expiresIn),
                 refreshToken = KeyStoreCryptoManager.encryptSuspend(response.data.refreshToken)
-            )
-        )?.copy(password = "", smtpSignInPassword = null)
-            ?: throw NullPointerException("Couldn't find default settings for $email!")
+            )) ?: throw NullPointerException("Couldn't find default settings for $email!")
 
         microsoftOAuth2TokenLiveData.postValue(Result.success(recommendAuthCredentials))
       } catch (e: Exception) {
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
index 73f80ef04c..6472bc99ca 100644
--- 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
@@ -158,6 +158,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
     initViews(view)
     updateView(authCreds)
 
+    setupOAuth2AuthCredentialsViewModel()
     setupPrivateKeysViewModel()
   }
 
@@ -414,7 +415,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
     buttonSignInWithOutlook = view.findViewById(R.id.buttonSignInWithOutlook)
     buttonSignInWithOutlook?.setOnClickListener {
       it.isEnabled = false
-      getAuthorizationRequestForProvider(
+      oAuth2AuthCredentialsViewModel.getAuthorizationRequestForProvider(
           requestCode = REQUEST_CODE_FETCH_MICROSOFT_OPENID_CONFIGURATION,
           provider = OAuth2Helper.Provider.MICROSOFT)
     }
@@ -568,48 +569,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
     }
   }
 
-  private fun setupPrivateKeysViewModel() {
-    privateKeysViewModel.savePrivateKeysLiveData.observe(viewLifecycleOwner, Observer {
-      it?.let {
-        when (it.status) {
-          Result.Status.LOADING -> {
-            showProgress(progressMsg = getString(R.string.saving_prv_keys))
-          }
-
-          Result.Status.SUCCESS -> {
-            if (existedAccounts.isEmpty()) runEmailManagerActivity() else returnResultOk()
-          }
-
-          Result.Status.ERROR, Result.Status.EXCEPTION -> {
-            showContent()
-            val e = it.exception
-            if (e is SavePrivateKeyToDatabaseException) {
-              showSnackbar(rootView, e.message ?: e.javaClass.simpleName,
-                  getString(R.string.retry), Snackbar.LENGTH_INDEFINITE, View.OnClickListener {
-                privateKeysViewModel.encryptAndSaveKeysToDatabase(e.keys, KeyDetails.Type.EMAIL)
-              })
-            } else {
-              showInfoSnackbar(rootView, e?.message ?: e?.javaClass?.simpleName
-              ?: getString(R.string.unknown_error))
-            }
-          }
-        }
-      }
-    })
-  }
-
-  private fun getOAuthToken(schema: String?, code: String) {
-    authRequest?.let { request ->
-      when (schema) {
-        OAuth2Helper.MICROSOFT_OAUTH2_SCHEMA -> {
-          observeMicrosoftOAuth2TokenLiveData()
-          oAuth2AuthCredentialsViewModel.getMicrosoftOAuth2Token(authorizeCode = code, authRequest = request)
-        }
-      }
-    }
-  }
-
-  private fun observeMicrosoftOAuth2TokenLiveData() {
+  private fun setupOAuth2AuthCredentialsViewModel() {
     oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.observe(viewLifecycleOwner, Observer {
       when (it.status) {
         Result.Status.LOADING -> {
@@ -619,13 +579,13 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         Result.Status.SUCCESS -> {
           it.data?.let { authCredentials ->
             authCreds = authCredentials
+            oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.value = Result.clearResult()
 
             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()
@@ -639,7 +599,6 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
 
               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)
             }
@@ -647,7 +606,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
-          oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.removeObservers(viewLifecycleOwner)
+          oAuth2AuthCredentialsViewModel.microsoftOAuth2TokenLiveData.value = Result.clearResult()
           showContent()
           showInfoDialog(
               dialogMsg = it.exception?.message ?: it.exception?.javaClass?.simpleName
@@ -655,9 +614,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
       }
     })
-  }
 
-  private fun getAuthorizationRequestForProvider(requestCode: Long, provider: OAuth2Helper.Provider) {
     oAuth2AuthCredentialsViewModel.authorizationRequestLiveData.observe(viewLifecycleOwner, Observer {
       when (it.status) {
         Result.Status.LOADING -> {
@@ -665,11 +622,11 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
 
         Result.Status.SUCCESS -> {
-          oAuth2AuthCredentialsViewModel.authorizationRequestLiveData.removeObservers(viewLifecycleOwner)
-          buttonSignInWithOutlook?.isEnabled = true
-          showContent()
-
           it.data?.let { authorizationRequest ->
+            oAuth2AuthCredentialsViewModel.authorizationRequestLiveData.value = Result.clearResult()
+            buttonSignInWithOutlook?.isEnabled = true
+            showContent()
+
             authRequest = authorizationRequest
             authRequest?.let { request ->
               AuthorizationService(requireContext())
@@ -681,7 +638,7 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
-          oAuth2AuthCredentialsViewModel.authorizationRequestLiveData.removeObservers(viewLifecycleOwner)
+          oAuth2AuthCredentialsViewModel.authorizationRequestLiveData.value = Result.clearResult()
           buttonSignInWithOutlook?.isEnabled = true
           showContent()
           showInfoDialog(
@@ -690,8 +647,49 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
         }
       }
     })
+  }
+
+  private fun setupPrivateKeysViewModel() {
+    privateKeysViewModel.savePrivateKeysLiveData.observe(viewLifecycleOwner, Observer {
+      it?.let {
+        when (it.status) {
+          Result.Status.LOADING -> {
+            showProgress(progressMsg = getString(R.string.saving_prv_keys))
+          }
+
+          Result.Status.SUCCESS -> {
+            if (existedAccounts.isEmpty()) runEmailManagerActivity() else returnResultOk()
+          }
+
+          Result.Status.ERROR, Result.Status.EXCEPTION -> {
+            showContent()
+            val e = it.exception
+            if (e is SavePrivateKeyToDatabaseException) {
+              showSnackbar(rootView, e.message ?: e.javaClass.simpleName,
+                  getString(R.string.retry), Snackbar.LENGTH_INDEFINITE, View.OnClickListener {
+                privateKeysViewModel.encryptAndSaveKeysToDatabase(e.keys, KeyDetails.Type.EMAIL)
+              })
+            } else {
+              showInfoSnackbar(rootView, e?.message ?: e?.javaClass?.simpleName
+              ?: getString(R.string.unknown_error))
+            }
+          }
+        }
+      }
+    })
+  }
 
-    oAuth2AuthCredentialsViewModel.getAuthorizationRequestForProvider(requestCode, provider)
+  private fun getOAuthToken(schema: String?, code: String) {
+    authRequest?.let { request ->
+      when (schema) {
+        OAuth2Helper.MICROSOFT_OAUTH2_SCHEMA -> {
+          oAuth2AuthCredentialsViewModel.getMicrosoftOAuth2Token(
+              authorizeCode = code,
+              authRequest = request
+          )
+        }
+      }
+    }
   }
 
   /**