3 files changed, 21 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index f5fbab1526..d16e36a1b6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -87,6 +87,11 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        keyStatusListener.onResume()
+    }
+
     override fun onStop() {
         unbindService(serviceConnection)
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
index 769a2f1ad9..e88355c274 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
@@ -22,7 +22,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
 
     external fun connect()
     external fun disconnect()
-    external fun generateWireguardKey(): Boolean
+    external fun generateWireguardKey(): KeygenEvent?
     external fun getAccountData(accountToken: String): AccountData?
     external fun getCurrentLocation(): GeoIpLocation?
     external fun getRelayLocations(): RelayList
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/KeyStatusListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/KeyStatusListener.kt
index 1279f59567..66b7a96e44 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/KeyStatusListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/KeyStatusListener.kt
@@ -4,12 +4,14 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
 
 import net.mullvad.mullvadvpn.MullvadDaemon
 import net.mullvad.mullvadvpn.model.KeygenEvent
 
 class KeyStatusListener(val asyncDaemon: Deferred<MullvadDaemon>) {
     private var daemon: MullvadDaemon? = null
+    private var retryJob: Job? = null
 
     private val setUpJob = setUp()
 
@@ -38,8 +40,21 @@ class KeyStatusListener(val asyncDaemon: Deferred<MullvadDaemon>) {
         daemon?.onKeygenEvent = { event -> keyStatus = event }
     }
 
+    fun onResume() {
+        if (keyStatus is KeygenEvent.TooManyKeys || keyStatus is KeygenEvent.GenerationFailure) {
+            retryJob?.cancel()
+            retryJob = retryKeyGeneration()
+        }
+    }
+
     fun onDestroy() {
         setUpJob.cancel()
+        retryJob?.cancel()
         daemon?.onKeygenEvent = null
     }
+
+    private fun retryKeyGeneration() = GlobalScope.launch(Dispatchers.Default) {
+        setUpJob.join()
+        keyStatus = daemon?.generateWireguardKey()
+    }
 }