From 456fdbe4e95540ef095efc1ca8d63dea1d317205 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 18 Oct 2021 09:49:58 -0400 Subject: [PATCH] Make tapping library update and backup restore error notifications open log (cherry picked from commit 9352e249ee7cfbfefe66aab6856ebb0b0410c403) --- .../tachiyomi/data/backup/BackupNotifier.kt | 4 +++- .../data/library/LibraryUpdateNotifier.kt | 17 ++--------------- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt index faf7fc92f..f0c9873a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt @@ -139,10 +139,12 @@ class BackupNotifier(private val context: Context) { val destFile = File(path, file) val uri = destFile.getUriCompat(context) + val errorLogIntent = NotificationReceiver.openErrorLogPendingActivity(context, uri) + setContentIntent(errorLogIntent) addAction( R.drawable.ic_folder_24dp, context.getString(R.string.action_show_errors), - NotificationReceiver.openErrorLogPendingActivity(context, uri) + errorLogIntent, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index 15e03a351..3bd33bdb5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -118,23 +118,10 @@ class LibraryUpdateNotifier(private val context: Context) { Notifications.ID_LIBRARY_ERROR, context.notificationBuilder(Notifications.CHANNEL_LIBRARY_ERROR) { setContentTitle(context.resources.getQuantityString(R.plurals.notification_update_error, errors.size, errors.size)) - setStyle( - NotificationCompat.BigTextStyle().bigText( - errors.joinToString("\n") { - it.chop(NOTIF_TITLE_MAX_LEN) - } - ) - ) + setContentText(context.getString(R.string.action_show_errors)) setSmallIcon(R.drawable.ic_tachi) - val errorLogIntent = NotificationReceiver.openErrorLogPendingActivity(context, uri) - - setContentIntent(errorLogIntent) - addAction( - R.drawable.ic_folder_24dp, - context.getString(R.string.action_show_errors), - errorLogIntent - ) + setContentIntent(NotificationReceiver.openErrorLogPendingActivity(context, uri)) } .build() ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 212b17771..4e7ed311b 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -119,7 +119,7 @@ Reset Undo Open log - Show errors + See full error details Create Restore Back