From 6113a10556dd527614504b33eff9f260cdd68a42 Mon Sep 17 00:00:00 2001
From: rebelonion <87634197+rebelonion@users.noreply.github.com>
Date: Sun, 21 Apr 2024 06:21:10 -0500
Subject: [PATCH] fix: update spinner

---
 .../java/ani/dantotsu/addons/AddonDownloader.kt     |  1 -
 .../ani/dantotsu/addons/AddonInstallReceiver.kt     |  1 -
 .../ani/dantotsu/media/comments/CommentsFragment.kt |  1 -
 .../installer/PackageInstallerInstaller.kt          | 13 ++++++++++++-
 app/src/main/res/layout/item_search_header.xml      |  2 +-
 app/src/main/res/values/strings.xml                 |  2 ++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt b/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt
index ddd57abd..76f077c1 100644
--- a/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonDownloader.kt
@@ -79,7 +79,6 @@ class AddonDownloader {
                                 activity.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
                             val installerSteps = InstallerSteps(notificationManager, activity)
                             manager.install(this)
-                                .observeOn(AndroidSchedulers.mainThread())
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(
                                     { installStep -> installerSteps.onInstallStep(installStep) {} },
diff --git a/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt b/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt
index 117ddf49..decc4d30 100644
--- a/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt
+++ b/app/src/main/java/ani/dantotsu/addons/AddonInstallReceiver.kt
@@ -75,7 +75,6 @@ internal class AddonInstallReceiver : BroadcastReceiver() {
             }
 
             Intent.ACTION_PACKAGE_REPLACED -> {
-                if (ExtensionInstallReceiver.isReplacing(intent)) return
                 launchNow {
                     when (type) {
                         AddonType.DOWNLOAD -> {
diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
index 7f4e77b4..ff861dbe 100644
--- a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt
@@ -121,7 +121,6 @@ class CommentsFragment : Fragment() {
                 }
             }
         } else {
-            toast("Not logged in")
             activity.binding.commentMessageContainer.visibility = View.GONE
         }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt
index 5e7be9ef..a76b68d9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt
@@ -10,7 +10,9 @@ import android.content.pm.PackageInstaller
 import android.os.Build
 import androidx.core.content.ContextCompat
 import androidx.core.content.IntentSanitizer
+import ani.dantotsu.R
 import ani.dantotsu.snackString
+import ani.dantotsu.toast
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.extension.InstallStep
 import eu.kanade.tachiyomi.util.lang.use
@@ -55,7 +57,16 @@ class PackageInstallerInstaller(private val service: Service) : Installer(servic
                 }
 
                 PackageInstaller.STATUS_SUCCESS -> continueQueue(InstallStep.Installed)
-                else -> continueQueue(InstallStep.Error)
+                PackageInstaller.STATUS_FAILURE_CONFLICT -> {
+                    Logger.log("Failed to install extension due to conflict")
+                    toast(context.getString(R.string.failed_ext_install_conflict))
+                    continueQueue(InstallStep.Error)
+                }
+                else -> {
+                    Logger.log("Fatal error for $intent")
+                    Logger.log("Status: ${intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -1)}")
+                    continueQueue(InstallStep.Error)
+                }
             }
         }
     }
diff --git a/app/src/main/res/layout/item_search_header.xml b/app/src/main/res/layout/item_search_header.xml
index 0274d224..dfd6083c 100644
--- a/app/src/main/res/layout/item_search_header.xml
+++ b/app/src/main/res/layout/item_search_header.xml
@@ -111,7 +111,7 @@
                 android:layout_gravity="center"
                 android:drawablePadding="4dp"
                 android:fontFamily="@font/poppins_bold"
-                android:text="Image"
+                android:text="@string/image"
                 android:textColor="?attr/colorPrimary"
                 app:drawableStartCompat="@drawable/ic_round_search_24"
                 app:drawableTint="?attr/colorPrimary" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fab4b7d1..3e00305c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -956,4 +956,6 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="update_addon">Update Addon</string>
     <string name="install_addon">Install Addon</string>
     <string name="download_addon_not_found">Download addon not found</string>
+    <string name="image">Image</string>
+    <string name="failed_ext_install_conflict">Failed to install extension due to conflict</string>
 </resources>