From da37dedba39294b66c64d42b800d8d994b1591ac Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Thu, 12 Sep 2019 16:05:43 -0700 Subject: [PATCH] For #5279 - Don't use runBlocking in delete and quit --- app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt b/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt index cf02b7fe6..45a793021 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt @@ -8,7 +8,6 @@ import android.content.Context import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking import org.mozilla.fenix.ext.asActivity import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController @@ -17,7 +16,7 @@ import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController */ fun Context.deleteAndQuit(coroutineScope: CoroutineScope) { coroutineScope.launch { - runBlocking { + launch { val controller = DefaultDeleteBrowsingDataController(this@deleteAndQuit, coroutineContext) if (Settings.getInstance(this@deleteAndQuit).deleteCacheOnQuit) { @@ -37,7 +36,6 @@ fun Context.deleteAndQuit(coroutineScope: CoroutineScope) { if (Settings.getInstance(this@deleteAndQuit).deleteHistoryOnQuit) { controller.deleteHistoryAndDOMStorages() } - } - this@deleteAndQuit.asActivity()?.finish() + }.invokeOnCompletion { this@deleteAndQuit.asActivity()?.finish() } } }