Browse Source

Avoid trying to open links in invalid Huawei app

arkon 3 years ago
parent
commit
e1b1f4f3fc

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -304,7 +304,7 @@ fun Context.defaultBrowserPackageName(): String? {
     val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
     return packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
         ?.activityInfo?.packageName
-        ?.takeIf { it != "android" }
+        ?.takeUnless { it in DeviceUtil.invalidDefaultBrowsers }
 }
 
 fun Context.createFileInCacheDir(name: String): File {

+ 2 - 0
app/src/main/java/eu/kanade/tachiyomi/util/system/DeviceUtil.kt

@@ -35,6 +35,8 @@ object DeviceUtil {
         DynamicColors.isDynamicColorAvailable() || (isSamsung && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
     }
 
+    val invalidDefaultBrowsers = listOf("android", "com.huawei.android.internal.app")
+
     @SuppressLint("PrivateApi")
     private fun getSystemProperty(key: String?): String? {
         return try {