Merge pull request #614 from BranchMetrics/Staging

Aaron Lopez · web-flow · commit 36c5adc61c10 · 2018-10-01T10:46:31.000-07:00
RC 2.19.4
diff --git a/Branch-2.19.4.jar b/Branch-2.19.4.jar
diff --git a/Branch-2.19.4_core.jar b/Branch-2.19.4_core.jar
diff --git a/Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties b/Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties
@@ -1,3 +1,3 @@
 fabric-identifier=io.branch.sdk.android.library
-fabric-version=2.19.3
+fabric-version=2.19.4
 fabric-build-type=source
diff --git a/Branch-SDK/src/io/branch/referral/Branch.java b/Branch-SDK/src/io/branch/referral/Branch.java
@@ -1413,21 +1413,35 @@ private boolean readAndStripParam(Uri data, Activity activity) {
                                 e.printStackTrace();
                             }
                         }
-                    } else { // if not check the intent data to see if there is deep link params
-                        if (!TextUtils.isEmpty(intent.getStringExtra(Defines.Jsonkey.BranchData.getKey()))) {
-                            try {
-                                String rawBranchData = intent.getStringExtra(Defines.Jsonkey.BranchData.getKey());
-                                // Make sure the data received is complete and in correct format
-                                JSONObject branchDataJson = new JSONObject(rawBranchData);
-                                branchDataJson.put(Defines.Jsonkey.Clicked_Branch_Link.getKey(), true);
-                                prefHelper_.setSessionParams(branchDataJson.toString());
-                                isInstantDeepLinkPossible = true;
-                            } catch (JSONException e) {
-                                e.printStackTrace();
+                    }
+                    // If not check the intent data to see if there is deep link params
+                    else if (!TextUtils.isEmpty(intent.getStringExtra(Defines.Jsonkey.BranchData.getKey()))) {
+                        try {
+                            String rawBranchData = intent.getStringExtra(Defines.Jsonkey.BranchData.getKey());
+                            // Make sure the data received is complete and in correct format
+                            JSONObject branchDataJson = new JSONObject(rawBranchData);
+                            branchDataJson.put(Defines.Jsonkey.Clicked_Branch_Link.getKey(), true);
+                            prefHelper_.setSessionParams(branchDataJson.toString());
+                            isInstantDeepLinkPossible = true;
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        // Remove Branch data from the intent once used
+                        intent.removeExtra(Defines.Jsonkey.BranchData.getKey());
+                        activity.setIntent(intent);
+                    }
+                    // If instant key is true in query params, use them for instant deep linking
+                    else if (data.getQueryParameterNames() != null && Boolean.valueOf(data.getQueryParameter(Defines.Jsonkey.Instant.getKey()))) {
+                        try {
+                            JSONObject branchDataJson = new JSONObject();
+                            for (String key : data.getQueryParameterNames()) {
+                                branchDataJson.put(key, data.getQueryParameter(key));
                             }
-                            // Remove Branch data from the intent once used
-                            intent.removeExtra(Defines.Jsonkey.BranchData.getKey());
-                            activity.setIntent(intent);
+                            branchDataJson.put(Defines.Jsonkey.Clicked_Branch_Link.getKey(), true);
+                            prefHelper_.setSessionParams(branchDataJson.toString());
+                            isInstantDeepLinkPossible = true;
+                        } catch (JSONException e) {
+                            e.printStackTrace();
                         }
                     }
                 }
diff --git a/Branch-SDK/src/io/branch/referral/Defines.java b/Branch-SDK/src/io/branch/referral/Defines.java
@@ -183,7 +183,8 @@ public enum Jsonkey {
         ImageCaptions("$image_captions"),
         Condition("$condition"),
         CreationTimestamp("$creation_timestamp"),
-        TrackingDisabled("tracking_disabled");
+        TrackingDisabled("tracking_disabled"),
+        Instant("instant");
         
         private String key = "";
         
diff --git a/Branch-SDK/src/io/branch/referral/ServerRequest.java b/Branch-SDK/src/io/branch/referral/ServerRequest.java
@@ -213,7 +213,7 @@ public JSONObject getPost() {
      * By default update GAds params update is turned off. Override this on request which need to have GAds params
      * </p>
      *
-     * @return A {@link Boolean} with value true if this reuest need GAds params
+     * @return A {@link Boolean} with value true if this request need GAds params
      */
     public boolean isGAdsParamsRequired() {
         return false;
@@ -396,7 +396,7 @@ private void updateGAdsParams() {
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        } else { // Add unidentified_device when neither aaid nor AndoridID present
+        } else { // Add unidentified_device when neither GAID nor AndroidID are present
             if (version == BRANCH_API_VERSION.V2) {
                 try {
                     if (version == BRANCH_API_VERSION.V2) {
diff --git a/Branch-SDK/src/io/branch/referral/ServerRequestActionCompleted.java b/Branch-SDK/src/io/branch/referral/ServerRequestActionCompleted.java
@@ -85,6 +85,11 @@ public void onRequestSucceeded(ServerResponse resp, Branch branch) {
         }
     }
 
+    @Override
+    public boolean isGAdsParamsRequired() {
+        return true;
+    }
+
     @Override
     public void handleFailure(int statusCode, String causeMsg) {
         //No implementation on purpose
diff --git a/Branch-SDK/src/io/branch/referral/ServerRequestRActionCompleted.java b/Branch-SDK/src/io/branch/referral/ServerRequestRActionCompleted.java
@@ -86,6 +86,11 @@ public void onRequestSucceeded(ServerResponse resp, Branch branch) {
         }
     }
 
+    @Override
+    public boolean isGAdsParamsRequired() {
+        return true;
+    }
+
     @Override
     public void handleFailure(int statusCode, String causeMsg) {
         //No implementation on purpose
diff --git a/Branch-SDK/src/io/branch/referral/ServerRequestRegisterOpen.java b/Branch-SDK/src/io/branch/referral/ServerRequestRegisterOpen.java
@@ -42,6 +42,18 @@ class ServerRequestRegisterOpen extends ServerRequestInitSession {
     ServerRequestRegisterOpen(String requestPath, JSONObject post, Context context) {
         super(requestPath, post, context);
     }
+
+    @Override
+    public void onPreExecute() {
+        super.onPreExecute();
+        // Instant Deep Link if possible
+        if (Branch.getInstance().isInstantDeepLinkPossible) {
+            callback_.onInitFinished(Branch.getInstance().getLatestReferringParams(), null);
+            Branch.getInstance().addExtraInstrumentationData(Defines.Jsonkey.InstantDeepLinkSession.getKey(), "true");
+            Branch.getInstance().isInstantDeepLinkPossible = false;
+            Branch.getInstance().isInitReportedThroughCallBack = true;
+        }
+    }
     
     @Override
     public void onRequestSucceeded(ServerResponse resp, Branch branch) {
diff --git a/Branch-SDK/src/io/branch/referral/util/BranchEvent.java b/Branch-SDK/src/io/branch/referral/util/BranchEvent.java
@@ -226,7 +226,7 @@ private class ServerRequestLogEvent extends ServerRequest {
                 if (standardProperties.length() > 0) {
                     reqBody.put(Defines.Jsonkey.EventData.getKey(), standardProperties);
                 }
-                if (isStandardEvent && buoList.size() > 0) {
+                if (buoList.size() > 0) {
                     JSONArray contentItemsArray = new JSONArray();
                     reqBody.put(Defines.Jsonkey.ContentItems.getKey(), contentItemsArray);
                     for (BranchUniversalObject buo : buoList) {
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,11 @@
 Branch Android SDK change log
 
+- v2.19.4
+  * _*Master Release*_ - October 1, 2018
+  * Adding Branch Universal Object to custom event request. DEVEX-761
+  * Send GAID with v1/event. DEVEX-766
+  * Adding ability to do instant deep linking with App Links. DEVEX-776
+
 - v2.19.3
   * _*Master Release*_ - August 22, 2018
   * Changed post request logic to close streams. [#600](https://github.com/BranchMetrics/android-branch-deep-linking/issues/600)
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.19.3
+VERSION_NAME=2.19.4
 VERSION_CODE=1
 GROUP=io.branch.sdk.android
 

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,11 @@ public void onRequestSucceeded(ServerResponse resp, Branch branch) {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ @Override`
	`89`	`+ public boolean isGAdsParamsRequired() {`
	`90`	`+ return true;`
	`91`	`+ }`
	`92`	`+`
`88`	`93`	`@Override`
`89`	`94`	`public void handleFailure(int statusCode, String causeMsg) {`
`90`	`95`	`//No implementation on purpose`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,11 @@ public void onRequestSucceeded(ServerResponse resp, Branch branch) {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ @Override`
	`90`	`+ public boolean isGAdsParamsRequired() {`
	`91`	`+ return true;`
	`92`	`+ }`
	`93`	`+`
`89`	`94`	`@Override`
`90`	`95`	`public void handleFailure(int statusCode, String causeMsg) {`
`91`	`96`	`//No implementation on purpose`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private class ServerRequestLogEvent extends ServerRequest {`
`226`	`226`	`if (standardProperties.length() > 0) {`
`227`	`227`	`reqBody.put(Defines.Jsonkey.EventData.getKey(), standardProperties);`
`228`	`228`	`}`
`229`		`- if (isStandardEvent && buoList.size() > 0) {`
	`229`	`+ if (buoList.size() > 0) {`
`230`	`230`	`JSONArray contentItemsArray = new JSONArray();`
`231`	`231`	`reqBody.put(Defines.Jsonkey.ContentItems.getKey(), contentItemsArray);`
`232`	`232`	`for (BranchUniversalObject buo : buoList) {`