From 0b7861e7941d446e4d14fdb39ccd30cacf3f6ee0 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 25 Nov 2022 22:32:54 -0500
Subject: [PATCH] Explicitly add READ_APP_SPECIFIC_LOCALES permission

Some devices are throwing a SecurityException (calling getApplicationLocales) for some reason.

(cherry picked from commit 7e74949d38a8ea43120e672c61556419157a4af1)
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../data/notification/NotificationReceiver.kt |  1 -
 .../tachiyomi/ui/reader/SaveImageNotifier.kt  | 54 ++++++++-----------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f9b25fb1d..767a6d4a7 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_APP_SPECIFIC_LOCALES" />
 
     <!-- Remove permission from Firebase dependency -->
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
index 913c71c16..46ddfb203 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@@ -197,7 +197,6 @@ class NotificationReceiver : BroadcastReceiver() {
      * @param notificationId id of notification
      */
     private fun deleteImage(context: Context, path: String, notificationId: Int) {
-        // Dismiss notification
         dismissNotification(context, notificationId)
 
         // Delete file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
index 5a9744613..46d6a63a6 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
@@ -20,21 +20,13 @@ import eu.kanade.tachiyomi.util.system.notificationManager
  */
 class SaveImageNotifier(private val context: Context) {
 
-    /**
-     * Notification builder.
-     */
     private val notificationBuilder = context.notificationBuilder(Notifications.CHANNEL_COMMON)
-
-    /**
-     * Id of the notification.
-     */
-    private val notificationId: Int
-        get() = Notifications.ID_DOWNLOAD_IMAGE
+    private val notificationId: Int = Notifications.ID_DOWNLOAD_IMAGE
 
     /**
      * Called when image download/copy is complete.
      *
-     * @param file image file containing downloaded page image.
+     * @param uri image file containing downloaded page image.
      */
     fun onComplete(uri: Uri) {
         val request = ImageRequest.Builder(context)
@@ -53,6 +45,27 @@ class SaveImageNotifier(private val context: Context) {
         context.imageLoader.enqueue(request)
     }
 
+    /**
+     * Clears the notification message.
+     */
+    fun onClear() {
+        context.notificationManager.cancel(notificationId)
+    }
+
+    /**
+     * Called on error while downloading image.
+     * @param error string containing error information.
+     */
+    fun onError(error: String?) {
+        // Create notification
+        with(notificationBuilder) {
+            setContentTitle(context.getString(R.string.download_notifier_title_error))
+            setContentText(error ?: context.getString(R.string.unknown_error))
+            setSmallIcon(android.R.drawable.ic_menu_report_image)
+        }
+        updateNotification()
+    }
+
     private fun showCompleteNotification(uri: Uri, image: Bitmap) {
         with(notificationBuilder) {
             setContentTitle(context.getString(R.string.picture_saved))
@@ -82,29 +95,8 @@ class SaveImageNotifier(private val context: Context) {
         }
     }
 
-    /**
-     * Clears the notification message.
-     */
-    fun onClear() {
-        context.notificationManager.cancel(notificationId)
-    }
-
     private fun updateNotification() {
         // Displays the progress bar on notification
         context.notificationManager.notify(notificationId, notificationBuilder.build())
     }
-
-    /**
-     * Called on error while downloading image.
-     * @param error string containing error information.
-     */
-    fun onError(error: String?) {
-        // Create notification
-        with(notificationBuilder) {
-            setContentTitle(context.getString(R.string.download_notifier_title_error))
-            setContentText(error ?: context.getString(R.string.unknown_error))
-            setSmallIcon(android.R.drawable.ic_menu_report_image)
-        }
-        updateNotification()
-    }
 }