summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-11 20:19:01 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-11 20:19:01 -0300
commitc87bf21025b6ae7e58990ee23017e9fbd33ba7bd (patch)
tree77fc35781cfd2c06c0340788e061e173e056ea0b
parent77547e5f001a87caeab23c88c421a4928b9bc990 (diff)
parenta3f99584e5f0fb2d7ebcff470061736dba9dd3e8 (diff)
downloadmullvadvpn-c87bf21025b6ae7e58990ee23017e9fbd33ba7bd.tar.xz
mullvadvpn-c87bf21025b6ae7e58990ee23017e9fbd33ba7bd.zip
Merge branch 'fix-not-null-warning'
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt10
1 files changed, 1 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt
index e3b6f56d0d..595c97220e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/KeyStatusListener.kt
@@ -12,11 +12,7 @@ class KeyStatusListener(val daemon: MullvadDaemon) {
var keyStatus by onKeyStatusChange.notifiable()
init {
- daemon.onKeygenEvent = { event ->
- if (event != null) {
- keyStatus = event
- }
- }
+ daemon.onKeygenEvent = { event -> keyStatus = event }
}
private fun getInitialKeyStatus(): KeygenEvent? {
@@ -54,8 +50,4 @@ class KeyStatusListener(val daemon: MullvadDaemon) {
daemon.onKeygenEvent = null
onKeyStatusChange.unsubscribeAll()
}
-
- private fun retryKeyGeneration() = GlobalScope.launch(Dispatchers.Default) {
- keyStatus = daemon.generateWireguardKey()
- }
}