1 files changed, 5 insertions, 10 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt b/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
index 1bea55ab..898a9221 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
@@ -1,8 +1,7 @@
 package net.lacolaco.smileessence.util
 
 import android.util.Log
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.*
 import net.lacolaco.smileessence.World
 import java.lang.ref.WeakReference
 
@@ -12,18 +11,14 @@ private val exceptionHandler = CoroutineExceptionHandler { c, throwable ->
     throw throwable
 }
 
-val uiContext = UI + exceptionHandler
-val bgContext = CommonPool + exceptionHandler
-
-fun launchUi(block: suspend CoroutineScope.() -> Unit) {
-    launch(uiContext, CoroutineStart.DEFAULT, null, null, block)
-}
+fun launchUi(block: suspend CoroutineScope.() -> Unit) =
+        GlobalScope.launch(Dispatchers.Main, block = block)
 
 fun <T> bg(block: suspend CoroutineScope.() -> T) =
-        async(bgContext, CoroutineStart.DEFAULT, null, null, block)
+        GlobalScope.async(Dispatchers.Default + exceptionHandler, block = block)
 
 fun launchBg(block: suspend CoroutineScope.() -> Unit) =
-        launch(bgContext, CoroutineStart.DEFAULT, null, null, block)
+        GlobalScope.launch(Dispatchers.Default + exceptionHandler, block = block)
 
 fun World.getMainActivityOrCancel() =
         getMainActivity() ?: throw CancellationException("MainActivity is gone")