Merge branch 'master' of github.com:FirebaseExtended/flutterfire into…

… dynamic_embedding

packages/firebase_dynamic_links/CHANGELOG.md

@@ -1,7 +1,11 @@
-## 0.5.0+7
+## 0.5.0+8
 
 * Support v2 embedding. This will remain compatible with the original embedding and won't require app migration.
 
+## 0.5.0+7
+
+* Add `getDynamicLink` to support expanding from short links.
+
 ## 0.5.0+6
 
 * Updated README instructions for contributing for consistency with other Flutterfire plugins.

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

@@ -182,16 +182,8 @@ private Map<String, Object> getMapFromPendingDynamicLinkData(
     return dynamicLink;
   }
 
-  private void handleGetInitialDynamicLink(final Result result) {
-    // If there's no activity, then there's no initial dynamic link.
-    if ((registrar != null && registrar.activity() == null) && activityBinding == null) {
-      result.success(null);
-      return;
-    }
-
-    FirebaseDynamicLinks.getInstance()
-        .getDynamicLink(getActivity().getIntent())
-        .addOnSuccessListener(
+  private void addDynamicLinkListener(Task<PendingDynamicLinkData> task, final Result result) {
+    task.addOnSuccessListener(
             new OnSuccessListener<PendingDynamicLinkData>() {
               @Override
               public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
@@ -214,7 +206,23 @@ public void onFailure(Exception e) {
   }
 
   private Activity getActivity() {
-    return registrar != null ? registrar.activity() : activityBinding.getActivity();
+      return registrar != null ? registrar.activity() : activityBinding.getActivity();
+    }
+
+  private void handleGetDynamicLink(final Result result, Uri uri) {
+    addDynamicLinkListener(FirebaseDynamicLinks.getInstance().getDynamicLink(uri), result);
+  }
+
+  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;
+    }
+
+    addDynamicLinkListener(
+        FirebaseDynamicLinks.getInstance().getDynamicLink(registrar.activity().getIntent()),
+        result);
   }
 
   private OnCompleteListener<ShortDynamicLink> createShortLinkListener(final Result result) {

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+7
+version: 0.5.0+8
 
 author: Flutter Team <[email protected]>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_dynamic_links