From 8ea2aaab7f6df73a8ccbf8ef14f42d3e5b8fa622 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 14 Jul 2021 19:41:23 -0400 Subject: [PATCH] Temporarily disable miui check for extensions Moved instead to extension install failure --- .../extension/util/ExtensionInstallActivity.kt | 8 +++++++- .../ui/extension/ExtensionBottomPresenter.kt | 11 ++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt index 64313fe277..e77f2d4092 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt @@ -6,9 +6,11 @@ import android.content.Intent import android.content.pm.PackageInstaller import android.content.pm.PackageInstaller.SessionParams import android.os.Bundle +import android.widget.Toast import com.hippo.unifile.UniFile import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.ExtensionManager +import eu.kanade.tachiyomi.util.system.MiuiUtil import eu.kanade.tachiyomi.util.system.toast import uy.kohesive.injekt.injectLazy @@ -80,7 +82,11 @@ class ExtensionInstallActivity : Activity() { PackageInstaller.STATUS_FAILURE, PackageInstaller.STATUS_FAILURE_ABORTED, PackageInstaller.STATUS_FAILURE_BLOCKED, PackageInstaller.STATUS_FAILURE_CONFLICT, PackageInstaller.STATUS_FAILURE_INCOMPATIBLE, PackageInstaller.STATUS_FAILURE_INVALID, PackageInstaller.STATUS_FAILURE_STORAGE -> { extensionManager.setInstallationResult(downloadId, false) if (status != PackageInstaller.STATUS_FAILURE_ABORTED) { - toast(R.string.could_not_install_extension) + if (MiuiUtil.isMiui()) { + toast(R.string.extensions_miui_warning, Toast.LENGTH_LONG) + } else { + toast(R.string.could_not_install_extension) + } } finish() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt index 5b98e737e6..59ff68e33d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.ui.extension import android.content.pm.PackageInstaller -import android.widget.Toast import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga @@ -19,9 +18,7 @@ import eu.kanade.tachiyomi.ui.migration.MangaItem import eu.kanade.tachiyomi.ui.migration.SelectionHeader import eu.kanade.tachiyomi.ui.migration.SourceItem import eu.kanade.tachiyomi.util.system.LocaleHelper -import eu.kanade.tachiyomi.util.system.MiuiUtil import eu.kanade.tachiyomi.util.system.executeOnIO -import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -256,10 +253,10 @@ class ExtensionBottomPresenter( } fun isNotMIUIOptimized(): Boolean { - if (MiuiUtil.isMiui() && !MiuiUtil.isMiuiOptimizationDisabled()) { - preferences.context.toast(R.string.extensions_miui_warning, Toast.LENGTH_LONG) - return false - } +// if (MiuiUtil.isMiui() && !MiuiUtil.isMiuiOptimizationDisabled()) { +// preferences.context.toast(R.string.extensions_miui_warning, Toast.LENGTH_LONG) +// return false +// } return true }