Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 13:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid invalid unset default browser (fixes #6520)

Browse Source
This commit is contained in:
arkon 2022-01-30 10:46:46 -05:00
parent 5cd11ad8c3
commit 7de707c60a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
View File

@ -293,7 +293,7 @@ fun Context.openInBrowser(uri: Uri, @ColorInt toolbarColor: Int? = null) {
)
.build()
// Force default browser so that verified extensions don't re-open Tachiyomi
intent.intent.setPackage(defaultBrowserPackageName())
defaultBrowserPackageName()?.let { intent.intent.setPackage(it) }
intent.launchUrl(this, uri)
} catch (e: Exception) {
toast(e.message)
@ -302,7 +302,9 @@ fun Context.openInBrowser(uri: Uri, @ColorInt toolbarColor: Int? = null) {
fun Context.defaultBrowserPackageName(): String? {
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
return packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)?.activityInfo?.packageName
return packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
?.activityInfo?.packageName
?.takeIf { it != "android" }
}
fun Context.createFileInCacheDir(name: String): File {