Skip to content

Commit 9995c3b

Browse files
committed
Add safe fallback
1 parent c7f6f20 commit 9995c3b

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

flutter_web_auth_2/android/src/main/kotlin/com/linusu/flutter_web_auth_2/FlutterWebAuth2Plugin.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,27 @@ class FlutterWebAuth2Plugin(
8181
* 4. Installed Browser
8282
*/
8383
private fun findTargetBrowserPackageName(options: Map<String, Any>): String? {
84-
val chromePackage = "com.android.chrome"
85-
8684
@Suppress("UNCHECKED_CAST")
8785
val customTabsPackageOrder = (options["customTabsPackageOrder"] as Iterable<String>?) ?: emptyList()
88-
//check target browser
86+
// Check target browser
8987
var targetPackage = customTabsPackageOrder.firstOrNull { isSupportCustomTabs(it) }
9088
if (targetPackage != null) {
9189
return targetPackage
9290
}
9391

94-
//check default browser
92+
// Check default browser
9593
val defaultBrowserSupported = CustomTabsClient.getPackageName(context!!, emptyList<String>()) != null
9694
if (defaultBrowserSupported) {
9795
return null;
9896
}
99-
//check installed browser
97+
// Check installed browser
10098
val allBrowsers = getInstalledBrowsers()
10199
targetPackage = allBrowsers.firstOrNull { isSupportCustomTabs(it) }
102100

103-
if (targetPackage == null) {
104-
targetPackage = chromePackage
101+
// Safely fall back on Chrome just in case
102+
val chromePackage = "com.android.chrome"
103+
if (targetPackage == null && isSupportCustomTabs(chromePackage)) {
104+
return chromePackage
105105
}
106106
return targetPackage
107107
}
@@ -127,7 +127,7 @@ class FlutterWebAuth2Plugin(
127127
return@compareBy -1
128128
}
129129

130-
//FireFox default is not enable ,must enable in the browser settings.
130+
// Firefox default is not enabled, must enable in the browser settings.
131131
if (setOf("org.mozilla.firefox").contains(it)) {
132132
return@compareBy 1
133133
}

0 commit comments

Comments
 (0)