diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateDownloadJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateDownloadJob.kt index 24fb5c9fe..b2f361431 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateDownloadJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateDownloadJob.kt @@ -117,7 +117,12 @@ class AppUpdateDownloadJob(private val context: Context, workerParams: WorkerPar if (shouldCancel) { notifier.cancel() } else { - notifier.onDownloadError(url) + notifier.onDownloadError( + url, + // KMK --> + e.message, + // KMK <-- + ) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt index 10b635c68..ce1780d24 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt @@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.util.system.notify import tachiyomi.core.common.i18n.stringResource import tachiyomi.domain.release.model.Release import tachiyomi.i18n.MR +import tachiyomi.i18n.kmk.KMR internal class AppUpdateNotifier(private val context: Context) { @@ -165,9 +166,19 @@ internal class AppUpdateNotifier(private val context: Context) { * * @param url web location of apk to download. */ - fun onDownloadError(url: String) { + fun onDownloadError( + url: String, + // KMK --> + error: String? = null, + // KMK <-- + ) { with(notificationBuilder) { - setContentText(context.stringResource(MR.strings.update_check_notification_download_error)) + setContentText( + context.stringResource(MR.strings.update_check_notification_download_error) + + // KMK --> + (": $error".takeIf { error != null } ?: ""), + // KMK <-- + ) setSmallIcon(R.drawable.ic_warning_white_24dp) setOnlyAlertOnce(false) setProgress(0, 0, false) @@ -183,6 +194,16 @@ internal class AppUpdateNotifier(private val context: Context) { context.stringResource(MR.strings.action_cancel), NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATE_PROMPT), ) + // KMK --> + addAction( + R.drawable.ic_get_app_24dp, + context.stringResource(KMR.strings.manual_download), + NotificationHandler.openUrl( + context, + url, + ), + ) + // KMK <-- } notificationBuilder.show(Notifications.ID_APP_UPDATE_PROMPT) } diff --git a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml index b130896ea..1c1e61718 100644 --- a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml +++ b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml @@ -126,6 +126,7 @@ Change Logs + Manual download Suggestions