Call goAsync() while still on the mainthread.

Fixes #6
d4rken-org · Aug 28, 2018 · 7485be9 · 7485be9
1 parent 861b961
commit 7485be9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/app/src/main/java/eu/thedarken/wldonate/main/core/receiver/LockCommandReceiver.kt b/app/src/main/java/eu/thedarken/wldonate/main/core/receiver/LockCommandReceiver.kt
@@ -59,29 +59,26 @@ class LockCommandReceiver : BroadcastReceiver() {
     }
 
     private fun releaseAll() {
-        var async: PendingResult? = null
+        val async = goAsync()
         lockController.acquireExclusive(Collections.emptySet())
-                .doOnSubscribe { async = goAsync() }
                 .subscribeOn(Schedulers.computation())
                 .doFinally { async?.finish() }
                 .subscribe()
     }
 
     private fun acquireSaved() {
         val desired = settings.getSavedLocks()
-        var async: PendingResult? = null
+        val async = goAsync()
         lockController.acquireExclusive(desired)
-                .doOnSubscribe { async = goAsync() }
                 .subscribeOn(Schedulers.computation())
                 .doFinally { async?.finish() }
                 .subscribe()
     }
 
     private fun toggle() {
-        var async: PendingResult? = null
+        val async = goAsync()
         lockController.locksPub
                 .subscribeOn(Schedulers.computation())
-                .doOnSubscribe { async = goAsync() }
                 .compose { Lock.acquiredOnly(it) }
                 .firstOrError()
                 .flatMapCompletable {