Dismiss extension update notification if all updates installed

(cherry picked from commit 10b0ef9b6dbe94b80e9cfcaf244883a99b42737f)
This commit is contained in:
arkon 2023-08-02 18:00:06 -04:00 committed by Jobobby04
parent 50f59befb4
commit c67580ed83
4 changed files with 18 additions and 8 deletions

View File

@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
import eu.kanade.tachiyomi.extension.api.ExtensionUpdateNotifier
import eu.kanade.tachiyomi.extension.model.Extension
import eu.kanade.tachiyomi.extension.model.InstallStep
import eu.kanade.tachiyomi.extension.model.LoadResult
@ -251,7 +252,7 @@ class ExtensionManager(
}
/**
* Returns an observable of the installation process for the given extension. It will complete
* Returns a flow of the installation process for the given extension. It will complete
* once the extension is installed or throws an error. The process will be canceled if
* unsubscribed before its completion.
*
@ -262,7 +263,7 @@ class ExtensionManager(
}
/**
* Returns an observable of the installation process for the given extension. It will complete
* Returns a flow of the installation process for the given extension. It will complete
* once the extension is updated or throws an error. The process will be canceled if
* unsubscribed before its completion.
*
@ -426,6 +427,10 @@ class ExtensionManager(
}
private fun updatePendingUpdatesCount() {
preferences.extensionUpdatesCount().set(_installedExtensionsFlow.value.count { it.hasUpdate })
val pendingUpdateCount = _installedExtensionsFlow.value.count { it.hasUpdate }
preferences.extensionUpdatesCount().set(pendingUpdateCount)
if (pendingUpdateCount == 0) {
ExtensionUpdateNotifier(context).dismiss()
}
}
}

View File

@ -5,6 +5,7 @@ import androidx.core.app.NotificationCompat
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.util.system.cancelNotification
import eu.kanade.tachiyomi.util.system.notify
class ExtensionUpdateNotifier(private val context: Context) {
@ -29,4 +30,8 @@ class ExtensionUpdateNotifier(private val context: Context) {
setAutoCancel(true)
}
}
fun dismiss() {
context.cancelNotification(Notifications.ID_UPDATES_TO_EXTS)
}
}

View File

@ -157,14 +157,14 @@ class ExtensionsScreenModel(
extensionManager.cancelInstallUpdateExtension(extension)
}
private fun removeDownloadState(extension: Extension) {
_currentDownloads.update { it - extension.pkgName }
}
private fun addDownloadState(extension: Extension, installStep: InstallStep) {
_currentDownloads.update { it + Pair(extension.pkgName, installStep) }
}
private fun removeDownloadState(extension: Extension) {
_currentDownloads.update { it - extension.pkgName }
}
private suspend fun Flow<InstallStep>.collectToInstallUpdate(extension: Extension) =
this
.onEach { installStep -> addDownloadState(extension, installStep) }

View File

@ -40,7 +40,7 @@ class SetFetchInterval(
fun getWindow(dateTime: ZonedDateTime): Pair<Long, Long> {
val today = dateTime.toLocalDate().atStartOfDay(dateTime.zone)
val lowerBound = today.minusDays(FETCH_INTERVAL_GRACE_PERIOD.toLong())
val upperBound = lowerBound.plusDays(FETCH_INTERVAL_GRACE_PERIOD.toLong())
val upperBound = today.plusDays(FETCH_INTERVAL_GRACE_PERIOD.toLong())
return Pair(lowerBound.toEpochSecond() * 1000, upperBound.toEpochSecond() * 1000 - 1)
}