Merge branch 'master' into support-for-legacy-sharesheets

BranchMetrics · Apr 19, 2016 · f4cebdd · f4cebdd
2 parents 3c86015 + 9e709ca
commit f4cebdd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
@@ -773,16 +773,16 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
 
             Log.d(LCAT, "SessionListener onInitFinished()");
 
-            String out = String.format("DeepLinkHandler(%s)", referringParams.toString());
-
-            webView.sendJavascript(out);
+            String out = "";
 
             if (this._callbackContext == null) {
                 return;
             }
 
             if (error == null) {
 
+                out = String.format("DeepLinkHandler(%s)", referringParams.toString());
+
                 // params are the deep linked params associated with the link that the user clicked -> was re-directed to this app
                 //  params will be empty if no data found.
                 if (referringParams == null) {
@@ -798,11 +798,15 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
             } else {
                 String errorMessage = error.getMessage();
 
+                out = String.format("NonBranchLinkHandler(%s)", error.toString());
+
                 Log.d(LCAT, errorMessage);
 
                 this._callbackContext.error(errorMessage);
             }
 
+            webView.sendJavascript(out);
+
         }
 
     }

diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js
@@ -69,6 +69,13 @@ function NonBranchLinkHandler(data)
     }
 }
 
+function NonBranchLinkHandler(data)
+{
+    if (data) {
+        alert('Non-branch link found: ' + JSON.stringify(data));
+    }
+}
+
 function SetDebug(isEnabled)
 {
     console.log('Trigger SetDebug()');