Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid invalid unset default browser (fixes #6520)

Browse Source 
(cherry picked from commit 7de707c60a3810442b7c6800c10e8fca36c37edb)
This commit is contained in:
arkon 2022-01-30 10:46:46 -05:00 committed by Jobobby04
parent 2003f6843d
commit efe70499ac
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 {