From bead21be04a4d556e305e4e2202a1ce85ba524c8 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Sat, 8 Oct 2022 07:52:57 +0200 Subject: [PATCH] Revert "Show toast after restoring the database" This reverts commit b9880a3955b74203cfd070c3f1ca87f56a6af70c. --- .../ui/screens/settings/DatabaseSettings.kt | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/DatabaseSettings.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/DatabaseSettings.kt index 90b6e2c..ffe4bd9 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/DatabaseSettings.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/DatabaseSettings.kt @@ -1,7 +1,6 @@ package it.vfsfitvnm.vimusic.ui.screens.settings import android.annotation.SuppressLint -import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.ExperimentalAnimationApi @@ -56,11 +55,12 @@ fun DatabaseSettings() { query { Database.internal.checkpoint() - context.applicationContext.contentResolver.openOutputStream(uri)?.use { output -> - FileInputStream(Database.internal.path).use { input -> - input.copyTo(output) + context.applicationContext.contentResolver.openOutputStream(uri) + ?.use { outputStream -> + FileInputStream(Database.internal.path).use { inputStream -> + inputStream.copyTo(outputStream) + } } - } } } @@ -68,19 +68,16 @@ fun DatabaseSettings() { rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> if (uri == null) return@rememberLauncherForActivityResult - Toast.makeText( - context, - "${context.applicationInfo.nonLocalizedLabel} is going to close itself after restoring the database", - Toast.LENGTH_SHORT - ).show() - query { Database.internal.checkpoint() Database.internal.close() - context.applicationContext.contentResolver.openInputStream(uri)?.use { input -> - FileOutputStream(Database.internal.path).use(input::copyTo) - } + context.applicationContext.contentResolver.openInputStream(uri) + ?.use { inputStream -> + FileOutputStream(Database.internal.path).use { outputStream -> + inputStream.copyTo(outputStream) + } + } context.stopService(context.intent()) exitProcess(0)