Merge pull request #598 from BranchMetrics/Staging

Staging

Author: Aaron Lopez

Branch-2.19.1.jar Branch-2.19.2.jarBranch-2.19.1.jar renamed to Branch-2.19.2.jar

@@ -1,3 +1,3 @@
 fabric-identifier=io.branch.sdk.android.library
-fabric-version=2.19.1
+fabric-version=2.19.2
 fabric-build-type=source

Branch-2.19.1_core.jar Branch-2.19.2_core.jarBranch-2.19.1_core.jar renamed to Branch-2.19.2_core.jar

@@ -2454,13 +2454,22 @@ public void handleNewRequest(ServerRequest req) {
                 }
             }
         }
-        
-        requestQueue_.enqueue(req);
-        req.onRequestQueued();
+
+        if (!(req instanceof ServerRequestPing)) {
+            requestQueue_.enqueue(req);
+            req.onRequestQueued();
+        }
         processNextQueueItem();
     }
-    
-    
+
+    /**
+     * Notify Branch when network is available in order to process the next request in the queue.
+     */
+    public void notifyNetworkAvailable() {
+        ServerRequest req = new ServerRequestPing(context_);
+        handleNewRequest(req);
+    }
+
     @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     private void setActivityLifeCycleObserver(Application application) {
         try {

Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties

@@ -26,7 +26,7 @@ public abstract class ServerRequest {
 
     private static final String POST_KEY = "REQ_POST";
     private static final String POST_PATH_KEY = "REQ_POST_PATH";
-    
+
     private JSONObject params_;
     protected String requestPath_;
     protected final PrefHelper prefHelper_;

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

@@ -0,0 +1,51 @@
+package io.branch.referral;
+
+import android.app.Application;
+import android.content.Context;
+import android.util.Log;
+
+/**
+ * * <p>
+ * The server request for pinging the API to process the queue.
+ * </p>
+ */
+public class ServerRequestPing extends ServerRequest {
+
+    /**
+     * <p>Configures a server request to process the request queue.</p>
+     *
+     * @param context Current {@link Application} context
+     */
+    public ServerRequestPing(Context context) {
+        super(context, null);
+    }
+
+    @Override
+    public boolean handleErrors(Context context) {
+        if (!super.doesAppHasInternetPermission(context)) {
+            PrefHelper.Debug("BranchSDK", "Trouble executing your request. Please add 'android.permission.INTERNET' in your applications manifest file");
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onRequestSucceeded(ServerResponse response, Branch branch) {
+        //No implementation on purpose
+    }
+
+    @Override
+    public void handleFailure(int statusCode, String causeMsg) {
+        //No implementation on purpose
+    }
+
+    @Override
+    public boolean isGetRequest() {
+        return false;
+    }
+
+    @Override
+    public void clearCallbacks() {
+        //No implementation on purpose
+    }
+}

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

@@ -1,4 +1,9 @@
 Branch Android SDK change log
+
+- v2.19.2
+  * _*Master Release*_ - August 10, 2018
+  * Added notify network API to process requests when network is available. DEVEX-711
+
 - v2.19.1 [09-AUG-18] Fixed GAID fetch issue.
 
 - v2.19.0 [03-JUL-18] Support for adding custom install metadata. Fix for an ANR in debug mode. Fix for crash caused by reading user agent. SDK Integration validator.

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

@@ -1,4 +1,4 @@
-VERSION_NAME=2.19.1
+VERSION_NAME=2.19.2
 VERSION_CODE=1
 GROUP=io.branch.sdk.android