Catch all exceptions when updating instrumentation values (#1250)

* Catch all exceptions when getting instrumentation values

* Update ServerRequestQueue.java

Author: gdeluna-branch

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

@@ -339,6 +339,8 @@ public JSONObject getPostWithInstrumentationValues(ConcurrentHashMap<String, Str
             BranchLogger.d(e.getMessage());
         } catch (ConcurrentModificationException ex) {
             extendedPost = params_;
+        } catch (Exception e) {
+            BranchLogger.v("ServerRequest " + this + " getPostWithInstrumentationValues caught exception: " + e.getMessage());
         }
         return extendedPost;
     }

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

@@ -517,15 +517,21 @@ protected ServerResponse doInBackground(Void... voids) {
                 return new ServerResponse(thisReq_.getRequestPath(), BranchError.ERR_BRANCH_TRACKING_DISABLED, "", "");
             }
             String branchKey = Branch.getInstance().prefHelper_.getBranchKey();
-            ServerResponse result;
-            if (thisReq_.isGetRequest()) {
-                result = Branch.getInstance().getBranchRemoteInterface().make_restful_get(thisReq_.getRequestUrl(), thisReq_.getGetParams(), thisReq_.getRequestPath(), branchKey);
-            } else {
-                BranchLogger.v("Beginning rest post for " + thisReq_);
-                result = Branch.getInstance().getBranchRemoteInterface().make_restful_post(thisReq_.getPostWithInstrumentationValues(instrumentationExtraData_), thisReq_.getRequestUrl(), thisReq_.getRequestPath(), branchKey);
+            ServerResponse result = null;
+
+            try {
+                if (thisReq_.isGetRequest()) {
+                    result = Branch.getInstance().getBranchRemoteInterface().make_restful_get(thisReq_.getRequestUrl(), thisReq_.getGetParams(), thisReq_.getRequestPath(), branchKey);
+                } else {
+                    BranchLogger.v("BranchPostTask doInBackground beginning rest post for " + thisReq_);
+                    result = Branch.getInstance().getBranchRemoteInterface().make_restful_post(thisReq_.getPostWithInstrumentationValues(instrumentationExtraData_), thisReq_.getRequestUrl(), thisReq_.getRequestPath(), branchKey);
+                }
+                if (latch_ != null) {
+                    latch_.countDown();
+                }
             }
-            if (latch_ != null) {
-                latch_.countDown();
+            catch (Exception e){
+                BranchLogger.v("BranchPostTask doInBackground caught exception: " + e.getMessage());
             }
             return result;
         }
@@ -542,7 +548,7 @@ void onPostExecuteInner(ServerResponse serverResponse) {
                 latch_.countDown();
             }
             if (serverResponse == null) {
-                thisReq_.handleFailure(BranchError.ERR_BRANCH_INVALID_REQUEST, "Null response.");
+                thisReq_.handleFailure(BranchError.ERR_OTHER, "Null response.");
                 return;
             }