Returns PendingDynamicLinkData while getting dynamicLink

Author: ckcz123

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

@@ -117,19 +117,16 @@ private Map<String, Object> getMapFromPendingDynamicLinkData(
     return dynamicLink;
   }
 
-  private void handleGetDynamicLink(final Result result, Uri uri) {
-    FirebaseDynamicLinks.getInstance()
-        .getDynamicLink(uri)
-        .addOnSuccessListener(
+  private void addDynamicLinkListener(Task<PendingDynamicLinkData> task, Result result) {
+    task.addOnSuccessListener(
             new OnSuccessListener<PendingDynamicLinkData>() {
               @Override
               public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
                 if (pendingDynamicLinkData != null) {
-                  Uri link = pendingDynamicLinkData.getLink();
-                  if (link != null) {
-                    result.success(link.toString());
-                    return;
-                  }
+                  Map<String, Object> dynamicLink =
+                      getMapFromPendingDynamicLinkData(pendingDynamicLinkData);
+                  result.success(dynamicLink);
+                  return;
                 }
                 result.success(null);
               }
@@ -143,37 +140,20 @@ public void onFailure(@NonNull Exception e) {
             });
   }
 
+  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;
     }
 
-    FirebaseDynamicLinks.getInstance()
-        .getDynamicLink(registrar.activity().getIntent())
-        .addOnSuccessListener(
-            registrar.activity(),
-            new OnSuccessListener<PendingDynamicLinkData>() {
-              @Override
-              public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
-                if (pendingDynamicLinkData != null) {
-                  Map<String, Object> dynamicLink =
-                      getMapFromPendingDynamicLinkData(pendingDynamicLinkData);
-                  result.success(dynamicLink);
-                  return;
-                }
-                result.success(null);
-              }
-            })
-        .addOnFailureListener(
-            registrar.activity(),
-            new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception e) {
-                result.error(e.getClass().getSimpleName(), e.getMessage(), null);
-              }
-            });
+    addDynamicLinkListener(
+        FirebaseDynamicLinks.getInstance().getDynamicLink(registrar.activity().getIntent()),
+        result);
   }
 
   private OnCompleteListener<ShortDynamicLink> createShortLinkListener(final Result result) {