Merge branch 'fix-missing-logged-in-status'

24 files changed, 57 insertions, 21 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 1503052c93..424872bf43 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -138,6 +138,7 @@ class LoginFragment : BaseFragment(), NavigationBarPainter {
 
             is LoginViewModel.LoginUiState.Success -> {
                 // MainActivity responsible for transition to connect/out-of-time view.
+                showLoggedIn()
             }
 
             is LoginViewModel.LoginUiState.AccountCreated -> {
@@ -215,6 +216,19 @@ class LoginFragment : BaseFragment(), NavigationBarPainter {
         scrollToShow(loggingInStatus)
     }
 
+    private fun showLoggedIn() {
+        title.setText(R.string.logged_in_title)
+        subtitle.setText(R.string.logged_in_description)
+
+        loggingInStatus.visibility = View.GONE
+        loginFailStatus.visibility = View.GONE
+        loggedInStatus.visibility = View.VISIBLE
+
+        accountLogin.state = LoginState.Success
+
+        scrollToShow(loggedInStatus)
+    }
+
     private fun showCreatingAccount() {
         title.setText(R.string.logging_in_title)
         subtitle.setText(R.string.creating_new_account)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index ec31a4c706..c7eae144c5 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
@@ -142,17 +143,6 @@ open class MainActivity : FragmentActivity() {
         }
     }
 
-    fun returnToLaunchScreen() {
-        supportFragmentManager.apply {
-            popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-
-            beginTransaction().apply {
-                replace(R.id.main_fragment, LaunchFragment())
-                commit()
-            }
-        }
-    }
-
     private fun launchDeviceStateHandler() {
         var currentState: DeviceState? = null
 
@@ -171,7 +161,10 @@ open class MainActivity : FragmentActivity() {
                             is DeviceState.LoggedOut -> openLoginView()
                             is DeviceState.Revoked -> openRevokedView()
                             is DeviceState.LoggedIn -> {
-                                openLoggedInView(newState.accountAndDevice.account_token)
+                                openLoggedInView(
+                                    accountToken = newState.accountAndDevice.account_token,
+                                    shouldDelayLogin = currentState is DeviceState.LoggedOut
+                                )
                             }
                         }
                         currentState = newState
@@ -194,12 +187,17 @@ open class MainActivity : FragmentActivity() {
         }
     }
 
-    private fun openLoggedInView(accountToken: String) {
+    private suspend fun openLoggedInView(accountToken: String, shouldDelayLogin: Boolean) {
         val isNewAccount = accountToken == accountRepository.cachedCreatedAccount.value
 
         val fragment = when {
             isNewAccount -> WelcomeFragment()
-            else -> ConnectFragment()
+            else -> {
+                if (shouldDelayLogin) {
+                    delay(LOGIN_DELAY_MILLIS)
+                }
+                ConnectFragment()
+            }
         }
 
         supportFragmentManager.beginTransaction().apply {
@@ -237,4 +235,8 @@ open class MainActivity : FragmentActivity() {
             }
         }
     }
+
+    companion object {
+        private const val LOGIN_DELAY_MILLIS = 1000L
+    }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
index 1a496933a4..38b42ca351 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
@@ -131,10 +131,15 @@ class AccountInput : LinearLayout {
     }
 
     private fun successState() {
+        input.apply {
+            setTextColor(disabledTextColor)
+            setEnabled(false)
+            setFocusable(false)
+            visibility = View.VISIBLE
+        }
+
         button.visibility = View.GONE
         setButtonEnabled(false)
-
-        input.visibility = View.GONE
     }
 
     private fun failureState() {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
index f3eca196f2..c204445168 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.view.View
 import android.view.View.OnLayoutChangeListener
 import android.view.inputmethod.InputMethodManager
 import android.widget.RelativeLayout
@@ -114,10 +113,6 @@ class AccountLogin : RelativeLayout {
         input.loginState = newState
 
         updateBorder()
-
-        if (newState == LoginState.Success) {
-            visibility = View.INVISIBLE
-        }
     }
 
     var onLogin: ((String) -> Unit)?
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index befa8dbdb6..344c00365b 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">mindre end et minut siden</string>
     <string name="local_network_sharing">Lokal netværksdeling</string>
     <string name="log_out">Log af</string>
+    <string name="logged_in_description">Gyldigt kontonummer</string>
     <string name="logged_in_title">Logget ind</string>
     <string name="logging_in_description">Kontrollerer kontonummer</string>
     <string name="logging_in_title">Logger ind...</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 27391cf699..1b8fe28a20 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">vor weniger als einer Minute</string>
     <string name="local_network_sharing">Teilen im lokalen Netzwerk</string>
     <string name="log_out">Abmelden</string>
+    <string name="logged_in_description">Gültige Kontonummer</string>
     <string name="logged_in_title">Angemeldet</string>
     <string name="logging_in_description">Ihre Kontonummer wird geprüft</string>
     <string name="logging_in_title">Anmeldung läuft...</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 5350762301..5d6043a13e 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">hace menos de un minuto</string>
     <string name="local_network_sharing">Uso compartido de la red local</string>
     <string name="log_out">Cerrar sesión</string>
+    <string name="logged_in_description">Número de cuenta válido</string>
     <string name="logged_in_title">Sesión iniciada</string>
     <string name="logging_in_description">Comprobando número de cuenta</string>
     <string name="logging_in_title">Iniciando la sesión…</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 317901e6b1..0307a6898f 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">alle minuutti sitten</string>
     <string name="local_network_sharing">Paikallisen verkon jakaminen</string>
     <string name="log_out">Kirjaudu ulos</string>
+    <string name="logged_in_description">Oikea tilin numero</string>
     <string name="logged_in_title">Kirjautuneena sisään</string>
     <string name="logging_in_description">Tarkistetaan tilin numeroa</string>
     <string name="logging_in_title">Kirjaudutaan sisään...</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 87d63b0c9e..e8dc8cf1b0 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">il y a moins d\'une minute</string>
     <string name="local_network_sharing">Partage réseau local</string>
     <string name="log_out">Déconnexion</string>
+    <string name="logged_in_description">Numéro de compte valide</string>
     <string name="logged_in_title">Connecté</string>
     <string name="logging_in_description">Vérification du numéro de compte</string>
     <string name="logging_in_title">Connexion...</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 16963598d6..3807256476 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">meno di un minuto fa</string>
     <string name="local_network_sharing">Condivisione rete locale</string>
     <string name="log_out">Esci</string>
+    <string name="logged_in_description">Numero di account valido</string>
     <string name="logged_in_title">Accesso effettuato</string>
     <string name="logging_in_description">Verifica numero di account</string>
     <string name="logging_in_title">Accesso...</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 2d511a1024..cea681d71f 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">1分未満前</string>
     <string name="local_network_sharing">ローカルネットワーク共有</string>
     <string name="log_out">ログアウト</string>
+    <string name="logged_in_description">有効なアカウント番号</string>
     <string name="logged_in_title">ログインしました</string>
     <string name="logging_in_description">アカウント番号を確認中</string>
     <string name="logging_in_title">ログイン中...</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 8ccfd3162f..547d34cd14 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">1분 이내</string>
     <string name="local_network_sharing">로컬 네트워크 공유</string>
     <string name="log_out">로그아웃</string>
+    <string name="logged_in_description">유효한 계정 번호</string>
     <string name="logged_in_title">다음으로 로그인</string>
     <string name="logging_in_description">계정 번호 확인 중</string>
     <string name="logging_in_title">로그인 중...</string>
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index befb621716..1635d122f1 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">လွန်ခဲ့သော စက္ကန့်ပိုင်း</string>
     <string name="local_network_sharing">လိုကယ် ကွန်ရက် ဝေမျှမှု</string>
     <string name="log_out">ထွက်ရန်</string>
+    <string name="logged_in_description">မှန်ကန်သည့် အကောင့်နံပါတ်</string>
     <string name="logged_in_title">ဝင်ရောက်ထားပြီး</string>
     <string name="logging_in_description">အကောင့်နံပါတ်ကို စစ်နေပါသည်</string>
     <string name="logging_in_title">ဝင်ရောက်နေဆဲ...</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 9807a61cf1..13b2e2e850 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">mindre enn ett minutt siden</string>
     <string name="local_network_sharing">Deling over lokalt nettverk</string>
     <string name="log_out">Logg ut</string>
+    <string name="logged_in_description">Gyldig kontonummer</string>
     <string name="logged_in_title">Du er logget inn</string>
     <string name="logging_in_description">Kontrollerer kontonummer</string>
     <string name="logging_in_title">Logger inn ...</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index a04955781d..fd29e1ab42 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">minder dan een minuut geleden</string>
     <string name="local_network_sharing">Delen op lokaal netwerk</string>
     <string name="log_out">Afmelden</string>
+    <string name="logged_in_description">Geldig accountnummer</string>
     <string name="logged_in_title">Aangemeld</string>
     <string name="logging_in_description">Accountnummer wordt gecontroleerd</string>
     <string name="logging_in_title">Aanmelden...</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 66428fd280..8e0a34905d 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">mniej niż minutę temu</string>
     <string name="local_network_sharing">Udostępnianie sieci lokalnej</string>
     <string name="log_out">Wyloguj się</string>
+    <string name="logged_in_description">Prawidłowy numer konta</string>
     <string name="logged_in_title">Zalogowano jako</string>
     <string name="logging_in_description">Sprawdzanie numeru konta</string>
     <string name="logging_in_title">Logowanie...</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 05b1b80738..77534a73cf 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">há menos de um minuto</string>
     <string name="local_network_sharing">Partilha de rede local</string>
     <string name="log_out">Terminar sessão</string>
+    <string name="logged_in_description">Número de conta válido</string>
     <string name="logged_in_title">Sessão iniciada</string>
     <string name="logging_in_description">A verificar o número da conta</string>
     <string name="logging_in_title">A iniciar sessão...</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 30d75efee5..8d0061f1ac 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">менее минуты назад</string>
     <string name="local_network_sharing">Обмен данными в локальной сети</string>
     <string name="log_out">Выйти</string>
+    <string name="logged_in_description">Действительный номер учетной записи</string>
     <string name="logged_in_title">Вход выполнен</string>
     <string name="logging_in_description">Проверка номера учетной записи</string>
     <string name="logging_in_title">Выполняется вход...</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index c935f7705b..829418519e 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">mindre än en minut sedan</string>
     <string name="local_network_sharing">Lokal nätverksdelning</string>
     <string name="log_out">Logga ut</string>
+    <string name="logged_in_description">Giltigt kontonummer</string>
     <string name="logged_in_title">Inloggad</string>
     <string name="logging_in_description">Kontrollerar kontonummer</string>
     <string name="logging_in_title">Loggar in...</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 32c325d0aa..f0be3eb07b 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">น้อยกว่าหนึ่งนาทีก่อน</string>
     <string name="local_network_sharing">การแชร์ในเครือข่ายท้องถิ่น</string>
     <string name="log_out">ลงชื่อออก</string>
+    <string name="logged_in_description">หมายเลขบัญชีที่ถูกต้อง</string>
     <string name="logged_in_title">เข้าสู่ระบบแล้ว</string>
     <string name="logging_in_description">กำลังตรวจสอบหมายเลขบัญชี</string>
     <string name="logging_in_title">กำลังเข้าสู่ระบบ...</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 16c326961b..687f2fdfd9 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">bir dakikadan az</string>
     <string name="local_network_sharing">Yerel ağ paylaşımı</string>
     <string name="log_out">Oturumu kapat</string>
+    <string name="logged_in_description">Geçerli hesap numarası</string>
     <string name="logged_in_title">Oturum açıldı</string>
     <string name="logging_in_description">Hesap numarası kontrol ediliyor</string>
     <string name="logging_in_title">Oturum açılıyor...</string>
diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml
index 67f77a4835..73f6ccbbb6 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">不到 1 分钟前</string>
     <string name="local_network_sharing">本地网络共享</string>
     <string name="log_out">退出</string>
+    <string name="logged_in_description">有效帐号</string>
     <string name="logged_in_title">已登录</string>
     <string name="logging_in_description">正在检查帐号</string>
     <string name="logging_in_title">登录中…</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 10c14e595d..0748fd9787 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -76,6 +76,7 @@
     <string name="less_than_a_minute_ago">不到 1 分鐘前</string>
     <string name="local_network_sharing">本機網路分享</string>
     <string name="log_out">登出</string>
+    <string name="logged_in_description">有效帳號</string>
     <string name="logged_in_title">已登入</string>
     <string name="logging_in_description">檢查帳號中</string>
     <string name="logging_in_title">登入中...</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 29495c80e2..70cccd341e 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="logging_in_title">Logging in...</string>
     <string name="logging_in_description">Checking account number</string>
     <string name="logged_in_title">Logged in</string>
+    <string name="logged_in_description">Valid account number</string>
     <string name="login_fail_title">Login failed</string>
     <string name="login_fail_description">Invalid account number</string>
     <string name="dont_have_an_account">Don\'t have an account number?</string>