blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #5279 - Don't use runBlocking in delete and quit

master
Emily Kager 2019-09-12 16:05:43 -07:00 committed by Emily Kager
parent 8cd0d8faf3
commit da37dedba3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/utils/DeleteAndQuit.kt
View File

@ -8,7 +8,6 @@ import android.content.Context
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.mozilla.fenix.ext.asActivity import org.mozilla.fenix.ext.asActivity
import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController
@ -17,7 +16,7 @@ import org.mozilla.fenix.settings.DefaultDeleteBrowsingDataController
*/ */
fun Context.deleteAndQuit(coroutineScope: CoroutineScope) { fun Context.deleteAndQuit(coroutineScope: CoroutineScope) {
coroutineScope.launch { coroutineScope.launch {
runBlocking { launch {
val controller = val controller =
DefaultDeleteBrowsingDataController(this@deleteAndQuit, coroutineContext) DefaultDeleteBrowsingDataController(this@deleteAndQuit, coroutineContext)
if (Settings.getInstance(this@deleteAndQuit).deleteCacheOnQuit) { if (Settings.getInstance(this@deleteAndQuit).deleteCacheOnQuit) {
@ -37,7 +36,6 @@ fun Context.deleteAndQuit(coroutineScope: CoroutineScope) {
if (Settings.getInstance(this@deleteAndQuit).deleteHistoryOnQuit) { if (Settings.getInstance(this@deleteAndQuit).deleteHistoryOnQuit) {
controller.deleteHistoryAndDOMStorages() controller.deleteHistoryAndDOMStorages()
} }
} }.invokeOnCompletion { this@deleteAndQuit.asActivity()?.finish() }
this@deleteAndQuit.asActivity()?.finish()
} }
} }