copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Allow sync Feeds & extensionRepoSettings

Browse source
This commit is contained in:
Cuong-Tran 2024-08-23 13:25:57 +07:00
parent 87133eb571
commit be9dbc50ea
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
4 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt
View file

@ -53,12 +53,14 @@ class SyncPreferences(
tracking = preferenceStore.getBoolean("tracking", true).get(),
history = preferenceStore.getBoolean("history", true).get(),
appSettings = preferenceStore.getBoolean("appSettings", true).get(),
extensionRepoSettings = preferenceStore.getBoolean("extensionRepoSettings", true).get(),
sourceSettings = preferenceStore.getBoolean("sourceSettings", true).get(),
privateSettings = preferenceStore.getBoolean("privateSettings", true).get(),
// SY -->
customInfo = preferenceStore.getBoolean("customInfo", true).get(),
readEntries = preferenceStore.getBoolean("readEntries", true).get(),
savedSearchesFeeds = preferenceStore.getBoolean("savedSearchesFeeds", true).get(),
// SY <--
)
}
@ -70,12 +72,14 @@ class SyncPreferences(
preferenceStore.getBoolean("tracking", true).set(syncSettings.tracking)
preferenceStore.getBoolean("history", true).set(syncSettings.history)
preferenceStore.getBoolean("appSettings", true).set(syncSettings.appSettings)
preferenceStore.getBoolean("extensionRepoSettings", true).set(syncSettings.extensionRepoSettings)
preferenceStore.getBoolean("sourceSettings", true).set(syncSettings.sourceSettings)
preferenceStore.getBoolean("privateSettings", true).set(syncSettings.privateSettings)
// SY -->
preferenceStore.getBoolean("customInfo", true).set(syncSettings.customInfo)
preferenceStore.getBoolean("readEntries", true).set(syncSettings.readEntries)
preferenceStore.getBoolean("savedSearchesFeeds", true).set(syncSettings.savedSearchesFeeds)
// SY <--
}

2
app/src/main/java/eu/kanade/domain/sync/models/SyncSettings.kt
View file

@ -7,11 +7,13 @@ data class SyncSettings(
val tracking: Boolean = true,
val history: Boolean = true,
val appSettings: Boolean = true,
val extensionRepoSettings: Boolean = true,
val sourceSettings: Boolean = true,
val privateSettings: Boolean = false,
// SY -->
val customInfo: Boolean = true,
val readEntries: Boolean = true,
val savedSearchesFeeds: Boolean = true,
// SY <--
)

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/data/SyncSettingsSelector.kt
View file

@ -122,12 +122,14 @@ private class SyncSettingsSelectorModel(
tracking = syncSettings.tracking,
history = syncSettings.history,
appSettings = syncSettings.appSettings,
extensionRepoSettings = syncSettings.extensionRepoSettings,
sourceSettings = syncSettings.sourceSettings,
privateSettings = syncSettings.privateSettings,
// SY -->
customInfo = syncSettings.customInfo,
readEntries = syncSettings.readEntries,
savedSearchesFeeds = syncSettings.savedSearchesFeeds,
// SY <--
)
}
@ -140,12 +142,14 @@ private class SyncSettingsSelectorModel(
tracking = backupOptions.tracking,
history = backupOptions.history,
appSettings = backupOptions.appSettings,
extensionRepoSettings = backupOptions.extensionRepoSettings,
sourceSettings = backupOptions.sourceSettings,
privateSettings = backupOptions.privateSettings,
// SY -->
customInfo = backupOptions.customInfo,
readEntries = backupOptions.readEntries,
savedSearchesFeeds = backupOptions.savedSearchesFeeds,
// SY <--
)
}

18
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt
View file

@ -84,6 +84,7 @@ class SyncManager(
chapters = syncOptions.chapters,
tracking = syncOptions.tracking,
history = syncOptions.history,
extensionRepoSettings = syncOptions.extensionRepoSettings,
appSettings = syncOptions.appSettings,
sourceSettings = syncOptions.sourceSettings,
privateSettings = syncOptions.privateSettings,
@ -91,6 +92,7 @@ class SyncManager(
// SY -->
customInfo = syncOptions.customInfo,
readEntries = syncOptions.readEntries,
savedSearchesFeeds = syncOptions.savedSearchesFeeds,
// SY <--
)
@ -105,11 +107,11 @@ class SyncManager(
backupSourcePreferences = backupCreator.backupSourcePreferences(backupOptions),
// SY -->
backupSavedSearches = backupCreator.backupSavedSearches(),
backupSavedSearches = backupCreator.backupSavedSearches(backupOptions),
// SY <--
// KMK -->
backupFeeds = backupCreator.backupFeeds(),
backupFeeds = backupCreator.backupFeeds(backupOptions),
// KMK <--
)
logcat(LogPriority.DEBUG) { "End create backup" }
@ -180,10 +182,15 @@ class SyncManager(
backupSources = remoteBackup.backupSources,
backupPreferences = remoteBackup.backupPreferences,
backupSourcePreferences = remoteBackup.backupSourcePreferences,
backupExtensionRepo = remoteBackup.backupExtensionRepo,
// SY -->
backupSavedSearches = remoteBackup.backupSavedSearches,
// SY <--
// KMK -->
backupFeeds = remoteBackup.backupFeeds,
// KMK <--
)
// It's local sync no need to restore data. (just update remote data)
@ -201,7 +208,12 @@ class SyncManager(
context,
backupUri,
sync = true,
options = RestoreOptions(),
options = RestoreOptions(
appSettings = true,
sourceSettings = true,
libraryEntries = true,
extensionRepoSettings = true,
),
)
// update the sync timestamp