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

fix:conflict.

Browse Source 
Signed-off-by: KaiserBh <kaiserbh@proton.me>
This commit is contained in:
KaiserBh 2023-08-03 01:40:46 +10:00
parent 70452acdda
commit 536c5facb9
No known key found for this signature in database
GPG Key ID: 14D73B142042BBA9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ class SyncManager(
backupManager.backupMangas(databaseManga, BACKUP_ALL), backupManager.backupMangas(databaseManga, BACKUP_ALL),
backupManager.backupCategories(BACKUP_ALL), backupManager.backupCategories(BACKUP_ALL),
emptyList(), emptyList(),
backupManager.backupExtensionInfo(databaseManga), backupManager.prepExtensionInfoForSync(databaseManga),
) )
// Create the SyncStatus object // Create the SyncStatus object
@ -215,7 +215,7 @@ class SyncManager(
localChapter.last_page_read != remoteChapter.lastPageRead || localChapter.last_page_read != remoteChapter.lastPageRead ||
localChapter.date_fetch != remoteChapter.dateFetch || localChapter.date_fetch != remoteChapter.dateFetch ||
localChapter.date_upload != remoteChapter.dateUpload || localChapter.date_upload != remoteChapter.dateUpload ||
localChapter.chapter_number != remoteChapter.chapterNumber || localChapter.chapter_number.toFloat() != remoteChapter.chapterNumber ||
localChapter.source_order != remoteChapter.sourceOrder localChapter.source_order != remoteChapter.sourceOrder
} ?: true } ?: true
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt
View File

@ -36,7 +36,7 @@ class SyncNotifier(private val context: Context) {
fun showSyncProgress(content: String = "", progress: Int = 0, maxAmount: Int = 100): NotificationCompat.Builder { fun showSyncProgress(content: String = "", progress: Int = 0, maxAmount: Int = 100): NotificationCompat.Builder {
val builder = with(progressNotificationBuilder) { val builder = with(progressNotificationBuilder) {
setContentTitle(context.getString(R.string.syncing_data)) setContentTitle(context.getString(R.string.syncing_library))
if (!preferences.hideNotificationContent().get()) { if (!preferences.hideNotificationContent().get()) {
setContentText(content) setContentText(content)

4
i18n/src/main/res/values/strings.xml
View File

@ -509,8 +509,8 @@
<!-- Sync section --> <!-- Sync section -->
<string name="syncing_library">Syncing library</string> <string name="syncing_library">Syncing library</string>
<string name="library_sync_complete">Library sync complete</string> <string name="library_sync_complete">Library sync complete</string>
<string name="sync_error">Syncing data failed</string> <string name="sync_error">Syncing library failed</string>
<string name="sync_complete">Syncing data complete</string> <string name="sync_complete">Syncing library complete</string>
<string name="sync_in_progress">Sync is already in progress</string> <string name="sync_in_progress">Sync is already in progress</string>
<string name="pref_sync_device_name">Device name</string> <string name="pref_sync_device_name">Device name</string>
<string name="pref_sync_device_name_summ">Enter a name for this device</string> <string name="pref_sync_device_name_summ">Enter a name for this device</string>