From a0f0cde1821e7978048c318fbce67c014679418a Mon Sep 17 00:00:00 2001 From: Mehmet Fidanboylu Date: Thu, 22 Aug 2019 21:26:38 -0700 Subject: [PATCH] Activity can be null --- packages/firebase_dynamic_links/CHANGELOG.md | 4 ++++ .../firebasedynamiclinks/FirebaseDynamicLinksPlugin.java | 8 ++++++-- packages/firebase_dynamic_links/pubspec.yaml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md index 04e18d9e9815..8b1fc7cbff37 100644 --- a/packages/firebase_dynamic_links/CHANGELOG.md +++ b/packages/firebase_dynamic_links/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0+1 + +* Don't crash if registrar.activity() is not there. + ## 0.5.0 * **Breaking change**. Changed architecture and method names to be able to differentiate between 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 cd5c5ea2456f..9969fc31f2dd 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 @@ -41,7 +41,6 @@ public boolean onNewIntent(Intent intent) { FirebaseDynamicLinks.getInstance() .getDynamicLink(intent) .addOnSuccessListener( - registrar.activity(), new OnSuccessListener() { @Override public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) { @@ -53,7 +52,6 @@ public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) { } }) .addOnFailureListener( - registrar.activity(), new OnFailureListener() { @Override public void onFailure(@NonNull Exception e) { @@ -117,6 +115,12 @@ private Map getMapFromPendingDynamicLinkData( } private void handleGetInitialDynamicLink(final Result result) { + // If there's no activity, then there's no initial dynamic link. + if (registrar.activity() == null) { + result.success(null); + return; + } + FirebaseDynamicLinks.getInstance() .getDynamicLink(registrar.activity().getIntent()) .addOnSuccessListener( diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml index 73848496a15b..65655fa47d52 100644 --- a/packages/firebase_dynamic_links/pubspec.yaml +++ b/packages/firebase_dynamic_links/pubspec.yaml @@ -1,7 +1,7 @@ name: firebase_dynamic_links description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating and handling links across multiple platforms. -version: 0.5.0 +version: 0.5.0+1 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_dynamic_links