Merge branch 'v2.4' into q-beta

2019-04-14 13:06:12 +08:00
parent 219d868089 4b9edba173
commit b70abd6ffb
15 changed files with 96 additions and 93 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
-}