feat: Show patches load errors in patches tab and adjust API down notification to work correctly

Author: oSumAtrIX

app/src/main/java/app/revanced/manager/domain/repository/PatchBundleRepository.kt

@@ -61,6 +61,9 @@ class PatchBundleRepository(
     private val _updateError = MutableStateFlow<Throwable?>(null)
     val updateError = _updateError.asStateFlow()
 
+    private val _apiOutageError = MutableStateFlow<Throwable?>(null)
+    val apiOutageError = _apiOutageError.asStateFlow()
+
     val sources = store.state.map { it.sources.values.toList() }
     val bundles = store.state.map {
         it.sources.mapNotNull { (uid, src) ->
@@ -353,6 +356,8 @@ class PatchBundleRepository(
         private val showToast: Boolean = false,
         private val predicate: (bundle: RemotePatchBundle) -> Boolean = { true },
     ) : Action<State> {
+        private var attemptedMainApiBundleUpdate = false
+
         private suspend fun toast(@StringRes id: Int, vararg args: Any?) =
             withContext(Dispatchers.Main) { app.toast(app.getString(id, *args)) }
 
@@ -369,6 +374,9 @@ class PatchBundleRepository(
             val updated = current.sources.values
                 .filterIsInstance<RemotePatchBundle>()
                 .filter { predicate(it) }
+                .also { targets ->
+                    attemptedMainApiBundleUpdate = targets.any { it.uid == 0 && it is APIPatchBundle }
+                }
                 .map {
                     async {
                         Log.d(tag, "Updating patch bundle: ${it.name}")
@@ -383,6 +391,11 @@ class PatchBundleRepository(
                 .awaitAll()
                 .filterNotNull()
                 .toMap()
+
+            if (attemptedMainApiBundleUpdate) {
+                _apiOutageError.value = null
+            }
+
             if (updated.isEmpty()) {
                 if (showToast) toast(R.string.patches_update_unavailable)
                 return@coroutineScope current
@@ -404,6 +417,11 @@ class PatchBundleRepository(
         override suspend fun catch(exception: Exception) {
             Log.e(tag, "Failed to update patches", exception)
             _updateError.value = exception
+
+            if (attemptedMainApiBundleUpdate) {
+                _apiOutageError.value = exception
+            }
+
             toast(R.string.patches_download_fail, exception.simpleMessage())
         }
     }
@@ -422,4 +440,4 @@ class PatchBundleRepository(
             autoUpdate = false
         )
     }
-}
+}

app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt

@@ -39,6 +39,7 @@ import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.Restore
 import androidx.compose.material.icons.outlined.Deselect
+import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.outlined.FilterList
 import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material.icons.outlined.Save
@@ -131,6 +132,7 @@ fun PatchesSelectorScreen(
     val stickyHeaderTopGap = 8.dp
     val readOnly = viewModel.readOnly
     val bundles by viewModel.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList())
+    val bundleLoadIssues by viewModel.bundleLoadIssuesFlow.collectAsStateWithLifecycle(initialValue = emptyMap())
     val pm: PM = koinInject()
     val pmAppList by pm.appList.collectAsStateWithLifecycle(initialValue = emptyList())
     val patchLazyListState = rememberLazyListState()
@@ -494,6 +496,7 @@ fun PatchesSelectorScreen(
     ) {
         sections.forEach { section ->
             val bundle = section.bundle
+            val loadIssueResId = bundleLoadIssues[bundle.uid]
 
             stickyHeader(key = "$keyPrefix-source-${bundle.uid}") {
                 Column(
@@ -511,7 +514,10 @@ fun PatchesSelectorScreen(
                         onExpandToggle = { toggleBundleExpanded(bundle.uid) },
                         onDeleteClick = { onSourceDeleteRequest?.invoke(bundle.uid) },
                         sourceEditMode = isSourceEditMode,
-                        readOnly = readOnly
+                        readOnly = readOnly,
+                        loadIssue = loadIssueResId?.let { messageId ->
+                            stringResource(messageId)
+                        }
                     )
                 }
             }
@@ -1070,7 +1076,8 @@ private fun SourceSectionHeader(
     onExpandToggle: () -> Unit,
     onDeleteClick: () -> Unit,
     sourceEditMode: Boolean,
-    readOnly: Boolean
+    readOnly: Boolean,
+    loadIssue: String?
 ) {
     val toggleableState = when (selectionState) {
         true -> ToggleableState.On
@@ -1098,12 +1105,24 @@ private fun SourceSectionHeader(
             headlineContent = {
                 Text(text = bundle.name)
             },
-            supportingContent = bundle.version?.takeIf { it.isNotBlank() }?.let { version ->
-                {
-                    Text(
-                        text = version,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
+            supportingContent = {
+                val version = bundle.version?.takeIf { it.isNotBlank() }
+                if (version == null && loadIssue == null) return@ListItem
+
+                Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                    version?.let {
+                        Text(
+                            text = it,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+
+                    loadIssue?.let {
+                        Text(
+                            text = it,
+                            color = MaterialTheme.colorScheme.error
+                        )
+                    }
                 }
             },
             trailingContent = {
@@ -1136,4 +1155,4 @@ private fun SourceSectionHeader(
         )
         HorizontalDivider()
     }
-}
+}

app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt

@@ -46,7 +46,7 @@ class DashboardViewModel(
 ) : ViewModel() {
     val availablePatches =
         patchBundleRepository.bundleInfoFlow.map { it.values.sumOf { bundle -> bundle.patches.size } }
-    val bundleDownloadError = patchBundleRepository.updateError
+    val bundleDownloadError = patchBundleRepository.apiOutageError
     private val contentResolver: ContentResolver = app.contentResolver
     private val powerManager = app.getSystemService<PowerManager>()!!
 

app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt

@@ -15,6 +15,8 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
 import app.revanced.manager.R
+import app.revanced.manager.domain.bundles.PatchBundleSource
+import app.revanced.manager.domain.bundles.PatchBundleSource.State
 import app.revanced.manager.domain.manager.PreferencesManager
 import app.revanced.manager.domain.repository.PatchBundleRepository
 import app.revanced.manager.patcher.patch.PatchBundleInfo
@@ -37,6 +39,7 @@ import kotlinx.collections.immutable.toPersistentMap
 import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -65,11 +68,34 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
     val allowIncompatiblePatches =
         get<PreferencesManager>().disablePatchVersionCompatCheck.getBlocking() || appVersion == null
     val bundlesFlow = if (browseAllBundles) {
-        bundleRepository.bundleInfoFlow.map { bundles ->
-            bundles.values.map(PatchBundleInfo.Global::asReadonlyScoped)
+        combine(bundleRepository.sources, bundleRepository.bundleInfoFlow) { sources, bundles ->
+            mergeSourcesWithBundleInfo(
+                sources,
+                bundles.mapValues { (_, bundle) -> bundle.asReadonlyScoped() }
+            )
         }
     } else {
-        bundleRepository.scopedBundleInfoFlow(packageName, input.app.version)
+        combine(
+            bundleRepository.sources,
+            bundleRepository.scopedBundleInfoFlow(packageName, input.app.version)
+        ) { sources, bundles ->
+            mergeSourcesWithBundleInfo(
+                sources,
+                bundles.associateBy(PatchBundleInfo.Scoped::uid)
+            )
+        }
+    }
+
+    val bundleLoadIssuesFlow = bundleRepository.sources.map { sources ->
+        sources.mapNotNull { source ->
+            val messageId = when {
+                source.error != null -> R.string.patches_error_description
+                source.state is State.Missing -> R.string.patches_not_downloaded
+                else -> null
+            } ?: return@mapNotNull null
+
+            source.uid to messageId
+        }.toMap()
     }
 
     init {
@@ -306,6 +332,13 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
         private val selectionSaver: Saver<PersistentPatchSelection?, Nullable<PatchSelection>> =
             nullableSaver(persistentMapSaver(valueSaver = persistentSetSaver()))
     }
+
+    private fun mergeSourcesWithBundleInfo(
+        sources: List<PatchBundleSource>,
+        scopedBundleInfoByUid: Map<Int, PatchBundleInfo.Scoped>
+    ) = sources.map { source ->
+        scopedBundleInfoByUid[source.uid] ?: source.emptyScopedBundleInfo()
+    }
 }
 
 // Versions of other types, but utilizing persistent/observable collection types.
@@ -324,3 +357,13 @@ private fun PatchBundleInfo.Global.asReadonlyScoped() = PatchBundleInfo.Scoped(
     incompatible = emptyList(),
     universal = emptyList()
 )
+
+private fun PatchBundleSource.emptyScopedBundleInfo() = PatchBundleInfo.Scoped(
+    name = name,
+    version = version,
+    uid = uid,
+    patches = emptyList(),
+    compatible = emptyList(),
+    incompatible = emptyList(),
+    universal = emptyList()
+)

app/src/main/res/values/strings.xml

@@ -87,7 +87,7 @@ Second \"item\" text"</string>
     <string name="patches_missing">Missing</string>
     <string name="patches_error">Error</string>
     <string name="patches_error_description">Patches could not be loaded. Click to view the error</string>
-    <string name="patches_not_downloaded">Patches has not been downloaded. Click here to download it</string>
+    <string name="patches_not_downloaded">Patches has not been downloaded.</string>
     <string name="patches_name_default">Patches</string>
     <string name="patches_name_fallback">Unnamed</string>