From 94799917613fba9964619217163f2e3340da7e05 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Mon, 19 Aug 2019 21:45:53 -0700
Subject: [PATCH] Don't crash if activity is missing

---
 .../firebasedynamiclinks/FirebaseDynamicLinksPlugin.java   | 7 +++++--
 1 file changed, 5 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 cd5c5ea2456f..2a09402233da 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<PendingDynamicLinkData>() {
               @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,11 @@ private Map<String, Object> getMapFromPendingDynamicLinkData(
   }
 
   private void handleGetInitialDynamicLink(final Result result) {
+    if (registrar.activity() == null) {
+      result.success(null);
+      return;
+    }
+
     FirebaseDynamicLinks.getInstance()
         .getDynamicLink(registrar.activity().getIntent())
         .addOnSuccessListener(