From 035348016a3ab72bcaa7c5742029711b75d758f7 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 5 Nov 2022 11:56:31 -0400 Subject: [PATCH] Don't show copied to clipboard toast on A13+ when copying backup restore error (cherry picked from commit 3733871d2fbdcc5a33b4840f3405f0e005c6f091) --- .../more/settings/screen/SettingsBackupScreen.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index ce70d6147..5b9d417ee 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -33,10 +33,8 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.toMutableStateList import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import androidx.core.net.toUri import com.google.accompanist.permissions.rememberPermissionState @@ -55,6 +53,7 @@ import eu.kanade.tachiyomi.data.backup.BackupFileValidator import eu.kanade.tachiyomi.data.backup.BackupRestoreService import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.util.system.DeviceUtil +import eu.kanade.tachiyomi.util.system.copyToClipboard import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.launch import uy.kohesive.injekt.Injekt @@ -243,7 +242,6 @@ class SettingsBackupScreen : SearchableSettings { val onDismissRequest = { error = null } when (val err = error) { is InvalidRestore -> { - val clipboard = LocalClipboardManager.current AlertDialog( onDismissRequest = onDismissRequest, title = { Text(text = stringResource(R.string.invalid_backup_file)) }, @@ -251,8 +249,7 @@ class SettingsBackupScreen : SearchableSettings { dismissButton = { TextButton( onClick = { - clipboard.setText(AnnotatedString(err.message)) - context.toast(R.string.copied_to_clipboard) + context.copyToClipboard(err.message, err.message) onDismissRequest() }, ) {