From 6f049a4e5524742c5eb09fe00cfea20693157a6a Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Mon, 30 Aug 2021 15:09:38 -0500 Subject: [PATCH] fix(dynamic-links, android): null-check intent before calling getDynamicLink firebase-android-sdk requires a `@NonNull` Intent argument to the `getDynamicLink(Intent)` call, despite the documentation indicating otherwise Related https://github.com/firebase/firebase-android-sdk/issues/2336 Related https://github.com/invertase/react-native-firebase/pull/5662 --- .../firebasedynamiclinks/FirebaseDynamicLinksPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java index bbd6fe3e959f..04302840da88 100644 --- a/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java +++ b/packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java @@ -209,8 +209,8 @@ private void handleGetDynamicLink(final Result result, Uri uri) { } private void handleGetInitialDynamicLink(final Result result) { - // If there's no activity, then there's no initial dynamic link. - if (activity == null) { + // If there's no activity or initial Intent, then there's no initial dynamic link. + if (activity == null || activity.getIntent() == null) { result.success(null); return; }