Skip to content

Commit 95d7da9

Browse files
authored
Merge pull request #518 from aeirola/fix-android-custom-tab-wramup-crash
Fix crash on android when warming up custom tabs
2 parents 746b545 + ff558b1 commit 95d7da9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

android/src/main/java/com/rnappauth/RNAppAuthModule.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import androidx.browser.customtabs.CustomTabsCallback;
1313
import androidx.browser.customtabs.CustomTabsClient;
1414
import androidx.browser.customtabs.CustomTabsServiceConnection;
15+
import androidx.browser.customtabs.CustomTabsSession;
1516

1617
import com.facebook.react.bridge.ActivityEventListener;
1718
import com.facebook.react.bridge.ReactApplicationContext;
@@ -762,7 +763,11 @@ private void warmChromeCustomTab(Context context, final String issuer) {
762763
@Override
763764
public void onCustomTabsServiceConnected(ComponentName name, CustomTabsClient client) {
764765
client.warmup(0);
765-
client.newSession(new CustomTabsCallback()).mayLaunchUrl(Uri.parse(issuer), null, Collections.<Bundle>emptyList());
766+
CustomTabsSession session = client.newSession(new CustomTabsCallback());
767+
if (session == null) {
768+
return;
769+
}
770+
session.mayLaunchUrl(Uri.parse(issuer), null, Collections.<Bundle>emptyList());
766771
}
767772

768773
@Override

0 commit comments

Comments
 (0)