From 0fd42bf37414561dfb2fcc84b802c38076c54cbb Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Thu, 2 Mar 2023 16:47:53 +0200
Subject: [PATCH] Fixed continueBasedOnFlavorSettings().| #2162

---
 .../activity/fragment/MainSignInFragment.kt   | 28 ++++++++++++-------
 FlowCrypt/src/main/res/values-ru/strings.xml  |  3 ++
 FlowCrypt/src/main/res/values-uk/strings.xml  |  3 ++
 FlowCrypt/src/main/res/values/strings.xml     |  3 ++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
index fc8c0cd76e..2d5aa29c0c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSignInFragment.kt
@@ -540,7 +540,7 @@ class MainSignInFragment : BaseSingInFragment<FragmentMainSignInBinding>() {
               )
             }
           } else {
-            continueBasedOnFlavorSettings()
+            continueBasedOnFlavorSettings(getString(R.string.fes_server_has_wrong_settings))
           }
 
           checkCustomerUrlFesServerViewModel.checkFesServerAvailabilityLiveData.value =
@@ -559,7 +559,12 @@ class MainSignInFragment : BaseSingInFragment<FragmentMainSignInBinding>() {
           when (it.exception) {
             is CommonConnectionException -> {
               if (it.exception.hasInternetAccess == true) {
-                continueBasedOnFlavorSettings()
+                continueBasedOnFlavorSettings(
+                  getString(
+                    R.string.check_fes_error_with_retry,
+                    it.exceptionMsg
+                  )
+                )
               } else {
                 showDialogWithRetryButton(
                   getString(R.string.no_connection_or_server_is_not_reachable),
@@ -575,7 +580,12 @@ class MainSignInFragment : BaseSingInFragment<FragmentMainSignInBinding>() {
                 }
 
                 else -> {
-                  continueBasedOnFlavorSettings()
+                  continueBasedOnFlavorSettings(
+                    getString(
+                      R.string.fes_server_error,
+                      it.exceptionMsg
+                    )
+                  )
                 }
               }
             }
@@ -602,14 +612,12 @@ class MainSignInFragment : BaseSingInFragment<FragmentMainSignInBinding>() {
     }
   }
 
-  private fun continueBasedOnFlavorSettings() {
+  private fun continueBasedOnFlavorSettings(errorMsg: String) {
     if (BuildConfig.FLAVOR == Constants.FLAVOR_NAME_ENTERPRISE) {
-      /*
-       here we actually need to decide if we should show error or proceed with
-       regular setup flow based on exact customers that will skip to regular setup flow,
-       and the rest will be shown error.
-      */
-      continueWithRegularFlow()
+      showDialogWithRetryButton(
+        errorMsg,
+        REQUEST_CODE_RETRY_CHECK_FES_AVAILABILITY
+      )
     } else {
       continueWithRegularFlow()
     }
diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index 3723b83a2b..d7141af049 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -494,6 +494,9 @@
     <string name="need_post_notification_permission">Нам нужно разрешение, чтобы показывать уведомления о новых сообщениях</string>
     <string name="ask">Спросить</string>
     <string name="password_should_fit_all_requirements">Пароль должен соответствовать всем требованиям</string>
+    <string name="fes_server_has_wrong_settings">Ваш FES сервер настроен неверно. Пожалуйста, обратитесь в службу поддержки.</string>
+    <string name="check_fes_error_with_retry">Произошла ошибка.\nПодробности:%1$s\n\nПожалуйста, попробуйте еще раз.</string>
+    <string name="fes_server_error">Ошибка сервера:%1$s</string>
     <plurals name="found_backup_of_your_account_key">
         <item quantity="one">Найдена %1$d резервная копия Вашего ключа</item>
         <item quantity="few">Найдено %1$d резервные копии Вашего ключа</item>
diff --git a/FlowCrypt/src/main/res/values-uk/strings.xml b/FlowCrypt/src/main/res/values-uk/strings.xml
index 37ea642711..953827d47f 100644
--- a/FlowCrypt/src/main/res/values-uk/strings.xml
+++ b/FlowCrypt/src/main/res/values-uk/strings.xml
@@ -495,6 +495,9 @@
     <string name="need_post_notification_permission">Нам потрібен дозвіл, щоб показувати сповіщення про нові листи</string>
     <string name="ask">Запитати</string>
     <string name="password_should_fit_all_requirements">Пароль має відповідати всім вимогам</string>
+    <string name="fes_server_has_wrong_settings">Ваш FES сервер налаштований не вірно. Будь ласка, зверніться до служби підтримки.</string>
+    <string name="check_fes_error_with_retry">Виникла помилка.\nДеталі:%1$s\n\nБудь ласка, спробуйте ще раз.</string>
+    <string name="fes_server_error">Помилка сервера:%1$s</string>
     <plurals name="found_backup_of_your_account_key">
         <item quantity="one">Знайдена %1$d резервна копія Вашого ключа</item>
         <item quantity="few">Знайдено %1$d резервні копії Вашого ключа</item>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 55c7152b30..8f60bb20f2 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -580,4 +580,7 @@
     <string name="need_post_notification_permission">We need permission to show notifications about new messages</string>
     <string name="ask">Ask</string>
     <string name="password_should_fit_all_requirements">Password should fit all requirements</string>
+    <string name="fes_server_has_wrong_settings">Your FES server has the wrong settings. Please ask your help desk for help.</string>
+    <string name="check_fes_error_with_retry">An error occurred.\nDetails:%1$s\n\nPlease try again.</string>
+    <string name="fes_server_error">Server error:%1$s</string>
 </resources>