diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-14 14:27:55 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-14 14:40:10 +0200 |
commit | 2fc0bb1a03f624e297d2afdeb95231cf906afc21 (patch) | |
tree | b1f9ed3d59683b5bbe4975821988c0e9ce7f2e84 /ui/src/main/java/com/wireguard/android/activity | |
parent | ui: remove hacky manual check for keyguard (diff) | |
download | wireguard-android-2fc0bb1a03f624e297d2afdeb95231cf906afc21.tar.xz wireguard-android-2fc0bb1a03f624e297d2afdeb95231cf906afc21.zip |
coroutines: convert low-hanging fruits
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/activity')
-rw-r--r-- | ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt index 88114800..81548fe7 100644 --- a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt @@ -19,6 +19,10 @@ import com.wireguard.android.R import com.wireguard.android.backend.WgQuickBackend import com.wireguard.android.util.AdminKnobs import com.wireguard.android.util.ModuleLoader +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import java.util.ArrayList import java.util.Arrays @@ -117,11 +121,13 @@ class SettingsActivity : ThemeChangeAwareActivity() { moduleInstaller?.parent?.removePreference(moduleInstaller) } else { kernelModuleDisabler?.parent?.removePreference(kernelModuleDisabler) - Application.getAsyncWorker().runAsync(Application.getRootShell()::start).whenComplete { _, e -> - if (e == null) + CoroutineScope(Dispatchers.Main).launch { + try { + withContext(Dispatchers.IO) { Application.getRootShell().start() } moduleInstaller?.isVisible = true - else + } catch (_: Exception) { moduleInstaller?.parent?.removePreference(moduleInstaller) + } } } } |