chore: merge upstream

Signed-off-by: KaiserBh <kaiserbh@proton.me>

domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt

@@ -1,8 +1,10 @@
 package tachiyomi.domain.manga.model
 
+import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import tachiyomi.core.preference.TriState
 import java.io.Serializable
+import java.time.Instant
 
 data class Manga(
     val id: Long,
@@ -29,6 +31,11 @@ data class Manga(
     val favoriteModifiedAt: Long?,
 ) : Serializable {
 
+    val expectedNextUpdate: Instant?
+        get() = nextUpdate
+            .takeIf { status != SManga.COMPLETED.toLong() }
+            ?.let { Instant.ofEpochMilli(it) }
+
     val sorting: Long
         get() = chapterFlags and CHAPTER_SORTING_MASK
 

domain/src/main/java/tachiyomi/domain/sync/SyncPreferences.kt

@@ -2,6 +2,7 @@ package tachiyomi.domain.sync
 
 import tachiyomi.core.preference.Preference
 import tachiyomi.core.preference.PreferenceStore
+import java.util.UUID
 
 class SyncPreferences(
     private val preferenceStore: PreferenceStore,
@@ -43,6 +44,19 @@ class SyncPreferences(
         "",
     )
 
+    fun uniqueDeviceID(): String {
+        val uniqueIDPreference = preferenceStore.getString("unique_device_id", "")
+
+        // Retrieve the current value of the preference
+        var uniqueID = uniqueIDPreference.get()
+        if (uniqueID.isBlank()) {
+            uniqueID = UUID.randomUUID().toString()
+            uniqueIDPreference.set(uniqueID)
+        }
+
+        return uniqueID
+    }
+
     fun syncFlags() = preferenceStore.getInt("sync_flags", Flags.Defaults)
 
     fun isSyncEnabled(): Boolean {