Merge pull request #709 from BranchMetrics/Staging

Release v3.2.0

Author: csalmi-branch

Branch-SDK/src/io/branch/referral/Branch.java

@@ -2318,8 +2318,8 @@ private void processNextQueueItem() {
                             networkCount_ = 0;
                             handleFailure(requestQueue_.getSize() - 1, BranchError.ERR_NO_SESSION);
                         }
-                        //All request except open and install need a session to execute
-                        else if (!(req instanceof ServerRequestInitSession) && (!hasSession() || !hasDeviceFingerPrint())) {
+                        // Determine if a session is needed to execute (SDK-271)
+                        else if (requestNeedsSession(req) && !isSessionAvailableForRequest()) {
                             networkCount_ = 0;
                             handleFailure(requestQueue_.getSize() - 1, BranchError.ERR_NO_SESSION);
                         } else {
@@ -2339,6 +2339,23 @@ else if (!(req instanceof ServerRequestInitSession) && (!hasSession() || !hasDev
             e.printStackTrace();
         }
     }
+
+    // Determine if a Request needs a Session to proceed.
+    private boolean requestNeedsSession(ServerRequest request) {
+        if (request instanceof ServerRequestInitSession) {
+            return false;
+        } else if (request instanceof ServerRequestCreateUrl) {
+            return false;
+        }
+
+        // All other Request Types need a session.
+        return true;
+    }
+
+    // Determine if a Session is available for a Request to proceed.
+    private boolean isSessionAvailableForRequest() {
+        return (hasSession() && hasDeviceFingerPrint());
+    }
 
     private void handleFailure(int index, int statusCode) {
         ServerRequest req;
@@ -2565,7 +2582,7 @@ public void onStrongMatchCheckFinished() {
      */
     public void handleNewRequest(ServerRequest req) {
         // If Tracking is disabled fail all messages with ERR_BRANCH_TRACKING_DISABLED
-        if (trackingController.isTrackingDisabled()) {
+        if (trackingController.isTrackingDisabled() && !req.prepareExecuteWithoutTracking()) {
             req.reportTrackingDisabledError();
             return;
         }

Branch-SDK/src/io/branch/referral/ServerRequestCreateUrl.java

@@ -273,4 +273,11 @@ private void updateShareEventToFabric(String url) {
     boolean isPersistable() {
         return false; // No need to retrieve create url request from previous session
     }
+
+    @Override
+    protected boolean prepareExecuteWithoutTracking() {
+        // SDK-271 -- Allow creation of short links when tracking is disabled.
+        return true;
+    }
+
 }

ChangeLog.md

@@ -1,4 +1,8 @@
 # Branch Android SDK change log
+- v3.2.0
+  * _*Master Release*_ - May 2, 2019
+  * SDK-271 Allow short link creation while privacy is enabled
+
 - v3.1.2
   * _*Master Release*_ - April 16, 2019
   * Hardware ID is now included in every request

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=3.1.2
-VERSION_CODE=030102
+VERSION_NAME=3.2.0
+VERSION_CODE=030200
 GROUP=io.branch.sdk.android
 
 POM_DESCRIPTION=Use the Branch SDK (branch.io) to create and power the links that point back to your apps for all of these things and more. Branch makes it incredibly simple to create powerful deep links that can pass data across app install and open while handling all edge cases (using on desktop vs. mobile vs. already having the app installed, etc). Best of all, it is really simple to start using the links for your own app: only 2 lines of code to register the deep link router and one more line of code to create the links with custom data.