Browse Source

Make tapping library update and backup restore error notifications open log

arkon 3 years ago
parent
commit
9352e249ee

+ 3 - 1
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,
                 )
             }
 

+ 2 - 15
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt

@@ -117,23 +117,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()
         )

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -119,7 +119,7 @@
     <string name="action_reset">Reset</string>
     <string name="action_undo">Undo</string>
     <string name="action_open_log">Open log</string>
-    <string name="action_show_errors">Show errors</string>
+    <string name="action_show_errors">See full error details</string>
     <string name="action_create">Create</string>
     <string name="action_restore">Restore</string>
     <string name="action_webview_back">Back</string>