Refactor some tracking-related logic

(cherry picked from commit 98d6ce2eaf2c1e85f4763dd37303155d1fc6690d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt

app/src/main/java/eu/kanade/domain/DomainModule.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain
 
 import eu.kanade.domain.chapter.interactor.SetReadStatus
+import eu.kanade.domain.chapter.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource
-import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
 import eu.kanade.domain.download.interactor.DeleteDownload
 import eu.kanade.domain.extension.interactor.GetExtensionLanguages
 import eu.kanade.domain.extension.interactor.GetExtensionSources
@@ -127,7 +127,7 @@ class DomainModule : InjektModule {
         addFactory { SetReadStatus(get(), get(), get(), get(), get()) }
         addFactory { ShouldUpdateDbChapter() }
         addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get()) }
-        addFactory { SyncChaptersWithTrackServiceTwoWay(get(), get(), get()) }
+        addFactory { SyncChapterProgressWithTrack(get(), get(), get()) }
 
         addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
         addFactory { GetHistory(get()) }

app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChapterProgressWithTrack.kt

@@ -11,7 +11,7 @@ import tachiyomi.domain.chapter.model.toChapterUpdate
 import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.model.Track
 
-class SyncChaptersWithTrackServiceTwoWay(
+class SyncChapterProgressWithTrack(
     private val updateChapter: UpdateChapter,
     private val insertTrack: InsertTrack,
     private val getChapterByMangaId: GetChapterByMangaId,

app/src/main/java/eu/kanade/domain/track/interactor/RefreshTracks.kt

@@ -1,14 +1,13 @@
 package eu.kanade.domain.track.interactor
 
-import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
+import eu.kanade.domain.chapter.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.domain.track.model.toDomainTrack
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.data.track.TrackService
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.supervisorScope
-import logcat.LogPriority
-import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.track.interactor.GetTracks
 import tachiyomi.domain.track.interactor.InsertTrack
 
@@ -16,28 +15,34 @@ class RefreshTracks(
     private val getTracks: GetTracks,
     private val trackManager: TrackManager,
     private val insertTrack: InsertTrack,
-    private val syncChaptersWithTrackServiceTwoWay: SyncChaptersWithTrackServiceTwoWay,
+    private val syncChapterProgressWithTrack: SyncChapterProgressWithTrack,
 ) {
 
-    suspend fun await(mangaId: Long) {
-        supervisorScope {
-            getTracks.await(mangaId)
+    /**
+     * Fetches updated tracking data from all logged in trackers.
+     *
+     * @return Failed updates.
+     */
+    suspend fun await(mangaId: Long): List<Pair<TrackService?, Throwable>> {
+        return supervisorScope {
+            return@supervisorScope getTracks.await(mangaId)
                 .map { track ->
                     async {
                         val service = trackManager.getService(track.syncId)
-                        if (service != null && service.isLoggedIn) {
-                            try {
+                        return@async try {
+                            if (service?.isLoggedIn == true) {
                                 val updatedTrack = service.refresh(track.toDbTrack())
                                 insertTrack.await(updatedTrack.toDomainTrack()!!)
-                                syncChaptersWithTrackServiceTwoWay.await(mangaId, track, service)
-                            } catch (e: Throwable) {
-                                // Ignore errors and continue
-                                logcat(LogPriority.ERROR, e)
+                                syncChapterProgressWithTrack.await(mangaId, track, service)
                             }
+                            null
+                        } catch (e: Throwable) {
+                            service to e
                         }
                     }
                 }
                 .awaitAll()
+                .filterNotNull()
         }
     }
 }