From 5dbeda6b65287929b5da1dfa4388d38674026dc1 Mon Sep 17 00:00:00 2001 From: KaiserBh Date: Fri, 29 Dec 2023 05:43:05 +1100 Subject: [PATCH] Revert "chore: ktlint" This reverts commit 6677c90a39e866be1814db0e125107f9a6bb187a. --- .../more/settings/screen/SettingsDataScreen.kt | 5 +++++ .../eu/kanade/tachiyomi/data/sync/SyncManager.kt | 15 +++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt index ca12e19a2..8249713ae 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt @@ -41,6 +41,9 @@ import eu.kanade.tachiyomi.data.sync.SyncDataJob import eu.kanade.tachiyomi.data.sync.SyncManager import eu.kanade.tachiyomi.data.sync.service.GoogleDriveService import eu.kanade.tachiyomi.data.sync.service.GoogleDriveSyncService +import eu.kanade.tachiyomi.util.storage.DiskUtil +import eu.kanade.tachiyomi.util.system.DeviceUtil +import eu.kanade.tachiyomi.util.system.copyToClipboard import eu.kanade.tachiyomi.util.system.toast import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentMapOf @@ -281,6 +284,7 @@ object SettingsDataScreen : SearchableSettings { ) + getSyncServicePreferences(syncPreferences, syncService) } + @Composable private fun getSyncServicePreferences(syncPreferences: SyncPreferences, syncService: Int): List { val syncServiceType = SyncManager.SyncService.fromInt(syncService) @@ -501,4 +505,5 @@ object SettingsDataScreen : SearchableSettings { }, ) } + } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt index 46ce46592..8ad1b1426 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt @@ -130,16 +130,11 @@ class SyncManager( val backupUri = writeSyncDataToCache(context, newSyncData) logcat(LogPriority.DEBUG) { "Got Backup Uri: $backupUri" } if (backupUri != null) { - BackupRestoreJob.start( - context, - backupUri, - sync = true, - options = RestoreOptions( - appSettings = true, - sourceSettings = true, - library = true, - ), - ) + BackupRestoreJob.start(context, backupUri, sync = true, options = RestoreOptions( + appSettings = true, + sourceSettings = true, + library = true, + )) } else { logcat(LogPriority.ERROR) { "Failed to write sync data to file" } }