Allow key management in blocked state

20 files changed, 7 insertions, 29 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index 05d136e4cb..e49e60165a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -18,6 +18,7 @@ import net.mullvad.mullvadvpn.ui.widget.InformationView
 import net.mullvad.mullvadvpn.ui.widget.InformationView.WhenMissing
 import net.mullvad.mullvadvpn.ui.widget.UrlButton
 import net.mullvad.mullvadvpn.util.TimeAgoFormatter
+import net.mullvad.talpid.tunnel.ErrorStateCause
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import org.joda.time.format.DateTimeFormat
@@ -65,7 +66,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
             }
         }
 
-    private var hasConnectivity = true
+    private var isOffline = true
         set(value) {
             if (field != value) {
                 field = value
@@ -153,9 +154,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
                         reconnectionExpected = false
                     }
 
-                    hasConnectivity = uiState is TunnelState.Connected ||
-                        uiState is TunnelState.Disconnected ||
-                        (uiState is TunnelState.Error && !uiState.errorState.isBlocking)
+                    isOffline = uiState is TunnelState.Error &&
+                        uiState.errorState.cause is ErrorStateCause.IsOffline
                 }
             }
         }
@@ -225,7 +225,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
             is ActionState.Generating -> statusMessage.visibility = View.INVISIBLE
             is ActionState.Verifying -> statusMessage.visibility = View.INVISIBLE
             is ActionState.Idle -> {
-                if (hasConnectivity) {
+                if (!isOffline) {
                     updateKeyStatus(state.verified, keyStatus)
                 } else {
                     updateOfflineStatus()
@@ -237,8 +237,6 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
     private fun updateOfflineStatus() {
         if (reconnectionExpected) {
             setStatusMessage(R.string.wireguard_key_reconnecting, greenColor)
-        } else {
-            setStatusMessage(R.string.wireguard_key_blocked_state_message, redColor)
         }
     }
 
@@ -271,7 +269,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
     }
 
     private fun updateGenerateKeyButtonState() {
-        generateKeyButton.setEnabled(actionState is ActionState.Idle && hasConnectivity)
+        generateKeyButton.setEnabled(actionState is ActionState.Idle && !isOffline)
     }
 
     private fun updateGenerateKeyButtonText() {
@@ -290,7 +288,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         val isIdle = actionState is ActionState.Idle
         val hasKey = keyStatus is KeygenEvent.NewKey
 
-        verifyKeyButton.setEnabled(isIdle && hasConnectivity && hasKey)
+        verifyKeyButton.setEnabled(isIdle && hasKey && !isOffline)
     }
 
     private fun updateVerifyingKeySpinner() {
diff --git a/android/src/main/res/values-da/strings.xml b/android/src/main/res/values-da/strings.xml
index 453b470386..6f577a7b60 100644
--- a/android/src/main/res/values-da/strings.xml
+++ b/android/src/main/res/values-da/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Generer nøgle</string>
     <string name="wireguard_key">WireGuard-nøgle</string>
-    <string name="wireguard_key_blocked_state_message">Kan ikke administrere nøgler under blokeret tilstand</string>
     <string name="wireguard_key_generated">Nøgle genereret</string>
     <string name="wireguard_key_invalid">Nøglen er ugyldig</string>
     <string name="wireguard_key_reconnecting">Opret forbindelse igen med den nye WireGuard-nøgle...</string>
diff --git a/android/src/main/res/values-de/strings.xml b/android/src/main/res/values-de/strings.xml
index 4fe34964f3..03d1860e9b 100644
--- a/android/src/main/res/values-de/strings.xml
+++ b/android/src/main/res/values-de/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Schlüssel generieren</string>
     <string name="wireguard_key">WireGuard-Schlüssel</string>
-    <string name="wireguard_key_blocked_state_message">Schlüssel können in einem gesperrten Zustand nicht verwaltet werden</string>
     <string name="wireguard_key_generated">Schlüssel generiert</string>
     <string name="wireguard_key_invalid">Schlüssel ist ungültig</string>
     <string name="wireguard_key_reconnecting">Es wird mit einem neuem WireGuard-Schlüssel erneut verbunden ...</string>
diff --git a/android/src/main/res/values-es/strings.xml b/android/src/main/res/values-es/strings.xml
index 3ca54630aa..fefddf32e1 100644
--- a/android/src/main/res/values-es/strings.xml
+++ b/android/src/main/res/values-es/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Generar clave</string>
     <string name="wireguard_key">Clave de WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">No se pueden administrar las claves durante un estado de bloqueo</string>
     <string name="wireguard_key_generated">Clave generada</string>
     <string name="wireguard_key_invalid">La clave no es válida</string>
     <string name="wireguard_key_reconnecting">Volviendo a conectar con la nueva clave de WireGuard…</string>
diff --git a/android/src/main/res/values-fi/strings.xml b/android/src/main/res/values-fi/strings.xml
index ff4b9f79b7..77bc86cd7d 100644
--- a/android/src/main/res/values-fi/strings.xml
+++ b/android/src/main/res/values-fi/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Luo avain</string>
     <string name="wireguard_key">WireGuard-avain</string>
-    <string name="wireguard_key_blocked_state_message">Avainten hallinta ei onnistu estetyssä tilassa</string>
     <string name="wireguard_key_generated">Avain luotu</string>
     <string name="wireguard_key_invalid">Virheellinen avain</string>
     <string name="wireguard_key_reconnecting">Yhdistetään uudelleen uudella WireGuard-avaimella...</string>
diff --git a/android/src/main/res/values-fr/strings.xml b/android/src/main/res/values-fr/strings.xml
index 2067612da2..2a2aae59b6 100644
--- a/android/src/main/res/values-fr/strings.xml
+++ b/android/src/main/res/values-fr/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Générer la clé</string>
     <string name="wireguard_key">Clé WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">Impossible de gérer les clés quand l\'état est bloqué</string>
     <string name="wireguard_key_generated">Clé générée</string>
     <string name="wireguard_key_invalid">La clé est invalide</string>
     <string name="wireguard_key_reconnecting">Reconnexion avec la nouvelle clé WireGuard…</string>
diff --git a/android/src/main/res/values-it/strings.xml b/android/src/main/res/values-it/strings.xml
index 129aff5d05..c534462d62 100644
--- a/android/src/main/res/values-it/strings.xml
+++ b/android/src/main/res/values-it/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Genera chiave</string>
     <string name="wireguard_key">Chiave WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">Impossibile gestire le chiavi in uno stato bloccato</string>
     <string name="wireguard_key_generated">Chiave generata</string>
     <string name="wireguard_key_invalid">La chiave non è valida</string>
     <string name="wireguard_key_reconnecting">Riconnessione con nuova chiave WireGuard...</string>
diff --git a/android/src/main/res/values-ja/strings.xml b/android/src/main/res/values-ja/strings.xml
index 294e60a968..99c8e91efa 100644
--- a/android/src/main/res/values-ja/strings.xml
+++ b/android/src/main/res/values-ja/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">鍵を生成</string>
     <string name="wireguard_key">WireGuard鍵</string>
-    <string name="wireguard_key_blocked_state_message">ブロックされた状態では鍵を管理できません</string>
     <string name="wireguard_key_generated">鍵が生成されました</string>
     <string name="wireguard_key_invalid">鍵は無効です</string>
     <string name="wireguard_key_reconnecting">新しいWireGuard鍵に再度接続中...</string>
diff --git a/android/src/main/res/values-ko/strings.xml b/android/src/main/res/values-ko/strings.xml
index 4f1f9d57ce..d32077f05c 100644
--- a/android/src/main/res/values-ko/strings.xml
+++ b/android/src/main/res/values-ko/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">키 생성</string>
     <string name="wireguard_key">WireGuard 키</string>
-    <string name="wireguard_key_blocked_state_message">차단된 상태에서 키를 관리할 수 ​​없습니다</string>
     <string name="wireguard_key_generated">키 생성됨</string>
     <string name="wireguard_key_invalid">유효하지 않은 키</string>
     <string name="wireguard_key_reconnecting">새 WireGuard 키로 다시 연결 중...</string>
diff --git a/android/src/main/res/values-nb/strings.xml b/android/src/main/res/values-nb/strings.xml
index beb033e1cb..720b7b9c9a 100644
--- a/android/src/main/res/values-nb/strings.xml
+++ b/android/src/main/res/values-nb/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Generer nøkkel</string>
     <string name="wireguard_key">WireGuard-nøkkel</string>
-    <string name="wireguard_key_blocked_state_message">Nøkler kan ikke behandles i en blokkert tilstand</string>
     <string name="wireguard_key_generated">Nøkkel generert</string>
     <string name="wireguard_key_invalid">Nøkkel er ugyldig</string>
     <string name="wireguard_key_reconnecting">Kobler til på nytt med ny WireGuard-nøkkel ...</string>
diff --git a/android/src/main/res/values-nl/strings.xml b/android/src/main/res/values-nl/strings.xml
index e436933b5c..ce649d0205 100644
--- a/android/src/main/res/values-nl/strings.xml
+++ b/android/src/main/res/values-nl/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Sleutel genereren</string>
     <string name="wireguard_key">WireGuard-sleutel</string>
-    <string name="wireguard_key_blocked_state_message">Kan sleutels niet beheren in geblokkeerde staat</string>
     <string name="wireguard_key_generated">Sleutel gegenereerd</string>
     <string name="wireguard_key_invalid">Sleutel is ongeldig</string>
     <string name="wireguard_key_reconnecting">Opnieuw verbinden met nieuwe WireGuard-sleutel...</string>
diff --git a/android/src/main/res/values-pl/strings.xml b/android/src/main/res/values-pl/strings.xml
index c923f4d742..fb2de3725c 100644
--- a/android/src/main/res/values-pl/strings.xml
+++ b/android/src/main/res/values-pl/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Wygeneruj klucz</string>
     <string name="wireguard_key">Klucz WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">W stanie zablokowanym nie można zarządzać kluczami</string>
     <string name="wireguard_key_generated">Wygenerowano klucz</string>
     <string name="wireguard_key_invalid">Nieprawidłowy klucz</string>
     <string name="wireguard_key_reconnecting">Ponowne łączenie z nowym kluczem WireGuard...</string>
diff --git a/android/src/main/res/values-pt/strings.xml b/android/src/main/res/values-pt/strings.xml
index c22164008a..f8ae5ee2ae 100644
--- a/android/src/main/res/values-pt/strings.xml
+++ b/android/src/main/res/values-pt/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Gerar chave</string>
     <string name="wireguard_key">Chave WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">Não é possível gerir as chaves no estado bloqueado</string>
     <string name="wireguard_key_generated">Chave gerada</string>
     <string name="wireguard_key_invalid">A chave é inválida</string>
     <string name="wireguard_key_reconnecting">A restabelecer ligação com nova chave WireGuard...</string>
diff --git a/android/src/main/res/values-ru/strings.xml b/android/src/main/res/values-ru/strings.xml
index 152726bc6e..57884567b1 100644
--- a/android/src/main/res/values-ru/strings.xml
+++ b/android/src/main/res/values-ru/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Сгенерировать ключ</string>
     <string name="wireguard_key">Ключ WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">Управлять ключами в заблокированном состоянии нельзя</string>
     <string name="wireguard_key_generated">Ключ сгенерирован</string>
     <string name="wireguard_key_invalid">Ключ недействителен</string>
     <string name="wireguard_key_reconnecting">Повторное подключение с новым ключом WireGuard...</string>
diff --git a/android/src/main/res/values-sv/strings.xml b/android/src/main/res/values-sv/strings.xml
index a5ff917487..6798d3dcdc 100644
--- a/android/src/main/res/values-sv/strings.xml
+++ b/android/src/main/res/values-sv/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Generera nyckel</string>
     <string name="wireguard_key">WireGuard-nyckel</string>
-    <string name="wireguard_key_blocked_state_message">Det går inte att hantera nycklar i blockerat tillstånd</string>
     <string name="wireguard_key_generated">Nyckel har genererats</string>
     <string name="wireguard_key_invalid">Nyckeln är ogiltig</string>
     <string name="wireguard_key_reconnecting">Återansluter med ny WireGuard-nyckel...</string>
diff --git a/android/src/main/res/values-th/strings.xml b/android/src/main/res/values-th/strings.xml
index c30b429c22..986b0bc2c7 100644
--- a/android/src/main/res/values-th/strings.xml
+++ b/android/src/main/res/values-th/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">สร้างคีย์</string>
     <string name="wireguard_key">คีย์ WireGuard</string>
-    <string name="wireguard_key_blocked_state_message">ไม่สามารถจัดการคีย์ ในขณะที่อยู่ในสถานะถูกบล็อกได้</string>
     <string name="wireguard_key_generated">สร้างคีย์แล้ว</string>
     <string name="wireguard_key_invalid">คีย์ไม่ถูกต้อง</string>
     <string name="wireguard_key_reconnecting">กำลังเชื่อมต่ออีกครั้งด้วยคีย์ WireGuard ใหม่...</string>
diff --git a/android/src/main/res/values-tr/strings.xml b/android/src/main/res/values-tr/strings.xml
index 04ca629c39..2f8c558297 100644
--- a/android/src/main/res/values-tr/strings.xml
+++ b/android/src/main/res/values-tr/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">Anahtar oluştur</string>
     <string name="wireguard_key">WireGuard anahtarı</string>
-    <string name="wireguard_key_blocked_state_message">Kilitli durumdayken anahtarları yönetemezsiniz</string>
     <string name="wireguard_key_generated">Anahtar oluşturuldu</string>
     <string name="wireguard_key_invalid">Anahtar geçersiz</string>
     <string name="wireguard_key_reconnecting">Yeni WireGuard anahtarıyla yeniden bağlanılıyor...</string>
diff --git a/android/src/main/res/values-zh-rCN/strings.xml b/android/src/main/res/values-zh-rCN/strings.xml
index 27355f5bb1..5600f98be4 100644
--- a/android/src/main/res/values-zh-rCN/strings.xml
+++ b/android/src/main/res/values-zh-rCN/strings.xml
@@ -97,7 +97,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">生成密钥</string>
     <string name="wireguard_key">WireGuard 密钥</string>
-    <string name="wireguard_key_blocked_state_message">无法在阻止状态下管理密钥</string>
     <string name="wireguard_key_generated">已生成密钥</string>
     <string name="wireguard_key_invalid">密钥无效</string>
     <string name="wireguard_key_reconnecting">正在使用新的 wireGuard 密钥重新连接…</string>
diff --git a/android/src/main/res/values-zh-rTW/strings.xml b/android/src/main/res/values-zh-rTW/strings.xml
index d39cc79a9a..6f48f40ccb 100644
--- a/android/src/main/res/values-zh-rTW/strings.xml
+++ b/android/src/main/res/values-zh-rTW/strings.xml
@@ -101,7 +101,6 @@
     <string name="wireguard">WireGuard</string>
     <string name="wireguard_generate_key">產生金鑰</string>
     <string name="wireguard_key">WireGuard 金鑰</string>
-    <string name="wireguard_key_blocked_state_message">無法在封鎖狀態下管理金鑰</string>
     <string name="wireguard_key_generated">已產生金鑰</string>
     <string name="wireguard_key_invalid">金鑰無效</string>
     <string name="wireguard_key_reconnecting">正在使用新 WireGuard 金鑰重新連線...</string>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index fd9e78d2bd..960c39dd94 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -154,8 +154,6 @@
     <string name="wireguard_replace_key">Regenerate key</string>
     <string name="wireguard_manage_keys">Manage keys</string>
     <string name="wireguard_key_reconnecting">Reconnecting with new WireGuard key...</string>
-    <string name="wireguard_key_blocked_state_message">Unable to manage keys while in a blocked
-    state</string>
     <string name="wireguard_key_valid">Key is valid</string>
     <string name="wireguard_key_invalid">Key is invalid</string>
     <string name="wireguard_key_verification_failure">Key verification failed</string>