More refactoring of expected next update logic

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt

@@ -33,8 +33,8 @@ class BackupRestorer(
     private val chapterRepository: ChapterRepository = Injekt.get()
     private val setFetchInterval: SetFetchInterval = Injekt.get()
 
-    private var zonedDateTime = ZonedDateTime.now()
-    private var currentFetchInterval = setFetchInterval.getCurrent(zonedDateTime)
+    private var now = ZonedDateTime.now()
+    private var currentFetchWindow = setFetchInterval.getWindow(now)
 
     private var backupManager = BackupManager(context)
 
@@ -102,8 +102,8 @@ class BackupRestorer(
         // Store source mapping for error messages
         val backupMaps = backup.backupBrokenSources.map { BackupSource(it.name, it.sourceId) } + backup.backupSources
         sourceMapping = backupMaps.associate { it.sourceId to it.name }
-        zonedDateTime = ZonedDateTime.now()
-        currentFetchInterval = setFetchInterval.getCurrent(zonedDateTime)
+        now = ZonedDateTime.now()
+        currentFetchWindow = setFetchInterval.getWindow(now)
 
         return coroutineScope {
             // Restore individual manga
@@ -146,8 +146,7 @@ class BackupRestorer(
                 // Fetch rest of manga information
                 restoreNewManga(updatedManga, chapters, categories, history, tracks, backupCategories)
             }
-            val updatedChapters = chapterRepository.getChapterByMangaId(restoredManga.id)
-            updateManga.awaitUpdateFetchInterval(restoredManga, updatedChapters, zonedDateTime, currentFetchInterval)
+            updateManga.awaitUpdateFetchInterval(restoredManga, now, currentFetchWindow)
         } catch (e: Exception) {
             val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
             errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")