Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show copied to clipboard toast on A13+ when copying backup restore error

Browse Source 
(cherry picked from commit 3733871d2fbdcc5a33b4840f3405f0e005c6f091)
This commit is contained in:
arkon 2022-11-05 11:56:31 -04:00 committed by Jobobby04
parent 771ec24d28
commit 035348016a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
View File

@ -33,10 +33,8 @@ import androidx.compose.runtime.setValue
import androidx.compose.runtime.toMutableStateList import androidx.compose.runtime.toMutableStateList
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.core.net.toUri import androidx.core.net.toUri
import com.google.accompanist.permissions.rememberPermissionState 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.BackupRestoreService
import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.models.Backup
import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.DeviceUtil
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
@ -243,7 +242,6 @@ class SettingsBackupScreen : SearchableSettings {
val onDismissRequest = { error = null } val onDismissRequest = { error = null }
when (val err = error) { when (val err = error) {
is InvalidRestore -> { is InvalidRestore -> {
val clipboard = LocalClipboardManager.current
AlertDialog( AlertDialog(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
title = { Text(text = stringResource(R.string.invalid_backup_file)) }, title = { Text(text = stringResource(R.string.invalid_backup_file)) },
@ -251,8 +249,7 @@ class SettingsBackupScreen : SearchableSettings {
dismissButton = { dismissButton = {
TextButton( TextButton(
onClick = { onClick = {
clipboard.setText(AnnotatedString(err.message)) context.copyToClipboard(err.message, err.message)
context.toast(R.string.copied_to_clipboard)
onDismissRequest() onDismissRequest()
}, },
) { ) {