Merge branch 'master' into v2.4

2019-04-14 10:27:46 +08:00
parent e6ff746d2f f034abfa07
commit 484e868f1a
12 changed files with 84 additions and 85 deletions
--- a/mobile/src/main/java/be/mygod/vpnhotspot/util/MainScope.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/MainScope.kt
@@ -1,14 +0,0 @@
-package be.mygod.vpnhotspot.util
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-
-interface MainScope : CoroutineScope {
-    class Supervisor : MainScope {
-        override val job = SupervisorJob()
-    }
-    val job: Job
-    override val coroutineContext get() = Dispatchers.Main + job
-}