From 536c5facb9a261364a67451f674556980df89868 Mon Sep 17 00:00:00 2001
From: KaiserBh <kaiserbh@proton.me>
Date: Thu, 3 Aug 2023 01:40:46 +1000
Subject: [PATCH] fix:conflict.

Signed-off-by: KaiserBh <kaiserbh@proton.me>
---
 .../main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt    | 4 ++--
 .../main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt   | 2 +-
 i18n/src/main/res/values/strings.xml                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 16d0f55f52..7bb5f16103 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
@@ -75,7 +75,7 @@ class SyncManager(
             backupManager.backupMangas(databaseManga, BACKUP_ALL),
             backupManager.backupCategories(BACKUP_ALL),
             emptyList(),
-            backupManager.backupExtensionInfo(databaseManga),
+            backupManager.prepExtensionInfoForSync(databaseManga),
         )
 
         // Create the SyncStatus object
@@ -215,7 +215,7 @@ class SyncManager(
                     localChapter.last_page_read != remoteChapter.lastPageRead ||
                     localChapter.date_fetch != remoteChapter.dateFetch ||
                     localChapter.date_upload != remoteChapter.dateUpload ||
-                    localChapter.chapter_number != remoteChapter.chapterNumber ||
+                    localChapter.chapter_number.toFloat() != remoteChapter.chapterNumber ||
                     localChapter.source_order != remoteChapter.sourceOrder
             } ?: true
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt
index 6d11a62f60..b0f079b8d7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncNotifier.kt
@@ -36,7 +36,7 @@ class SyncNotifier(private val context: Context) {
 
     fun showSyncProgress(content: String = "", progress: Int = 0, maxAmount: Int = 100): NotificationCompat.Builder {
         val builder = with(progressNotificationBuilder) {
-            setContentTitle(context.getString(R.string.syncing_data))
+            setContentTitle(context.getString(R.string.syncing_library))
 
             if (!preferences.hideNotificationContent().get()) {
                 setContentText(content)
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index 73f9bcdc1f..319f644e38 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -509,8 +509,8 @@
     <!-- Sync section -->
     <string name="syncing_library">Syncing library</string>
     <string name="library_sync_complete">Library sync complete</string>
-    <string name="sync_error">Syncing data failed</string>
-    <string name="sync_complete">Syncing data complete</string>
+    <string name="sync_error">Syncing library failed</string>
+    <string name="sync_complete">Syncing library complete</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_summ">Enter a name for this device</string>