mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-15 15:02:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "chore: ktlint"

Browse Source 
This reverts commit 6677c90a39.
This commit is contained in:
KaiserBh 2023-12-29 05:43:05 +11:00
parent 080192a1a5
commit 5dbeda6b65
No known key found for this signature in database
GPG Key ID: 14D73B142042BBA9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
View File

@ -41,6 +41,9 @@ import eu.kanade.tachiyomi.data.sync.SyncDataJob
import eu.kanade.tachiyomi.data.sync.SyncManager import eu.kanade.tachiyomi.data.sync.SyncManager
import eu.kanade.tachiyomi.data.sync.service.GoogleDriveService import eu.kanade.tachiyomi.data.sync.service.GoogleDriveService
import eu.kanade.tachiyomi.data.sync.service.GoogleDriveSyncService 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 eu.kanade.tachiyomi.util.system.toast
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentMapOf import kotlinx.collections.immutable.persistentMapOf
@ -281,6 +284,7 @@ object SettingsDataScreen : SearchableSettings {
) + getSyncServicePreferences(syncPreferences, syncService) ) + getSyncServicePreferences(syncPreferences, syncService)
} }
@Composable @Composable
private fun getSyncServicePreferences(syncPreferences: SyncPreferences, syncService: Int): List<Preference> { private fun getSyncServicePreferences(syncPreferences: SyncPreferences, syncService: Int): List<Preference> {
val syncServiceType = SyncManager.SyncService.fromInt(syncService) val syncServiceType = SyncManager.SyncService.fromInt(syncService)
@ -501,4 +505,5 @@ object SettingsDataScreen : SearchableSettings {
}, },
) )
} }
} }

9
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt
View File

@ -130,16 +130,11 @@ class SyncManager(
val backupUri = writeSyncDataToCache(context, newSyncData) val backupUri = writeSyncDataToCache(context, newSyncData)
logcat(LogPriority.DEBUG) { "Got Backup Uri: $backupUri" } logcat(LogPriority.DEBUG) { "Got Backup Uri: $backupUri" }
if (backupUri != null) { if (backupUri != null) {
BackupRestoreJob.start( BackupRestoreJob.start(context, backupUri, sync = true, options = RestoreOptions(
context,
backupUri,
sync = true,
options = RestoreOptions(
appSettings = true, appSettings = true,
sourceSettings = true, sourceSettings = true,
library = true, library = true,
), ))
)
} else { } else {
logcat(LogPriority.ERROR) { "Failed to write sync data to file" } logcat(LogPriority.ERROR) { "Failed to write sync data to file" }
} }