Skip to content

Commit 8fe253b

Browse files
authored
[firebase_dynamic_links] Don't crash if activity is missing
1 parent 58b956f commit 8fe253b

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

packages/firebase_dynamic_links/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.0+3
2+
3+
* Don't crash if registrar.activity() is not there.
4+
15
## 0.5.0+2
26

37
* Change the OnLinkError object to be a real exception.

packages/firebase_dynamic_links/android/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public boolean onNewIntent(Intent intent) {
4141
FirebaseDynamicLinks.getInstance()
4242
.getDynamicLink(intent)
4343
.addOnSuccessListener(
44-
registrar.activity(),
4544
new OnSuccessListener<PendingDynamicLinkData>() {
4645
@Override
4746
public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
@@ -53,7 +52,6 @@ public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
5352
}
5453
})
5554
.addOnFailureListener(
56-
registrar.activity(),
5755
new OnFailureListener() {
5856
@Override
5957
public void onFailure(@NonNull Exception e) {
@@ -117,6 +115,12 @@ private Map<String, Object> getMapFromPendingDynamicLinkData(
117115
}
118116

119117
private void handleGetInitialDynamicLink(final Result result) {
118+
// If there's no activity, then there's no initial dynamic link.
119+
if (registrar.activity() == null) {
120+
result.success(null);
121+
return;
122+
}
123+
120124
FirebaseDynamicLinks.getInstance()
121125
.getDynamicLink(registrar.activity().getIntent())
122126
.addOnSuccessListener(

packages/firebase_dynamic_links/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: firebase_dynamic_links
22
description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
33
and handling links across multiple platforms.
4-
version: 0.5.0+2
4+
version: 0.5.0+3
55

66
author: Flutter Team <flutter-dev@googlegroups.com>
77
homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_dynamic_links

0 commit comments

Comments
 (0)