Remove status code obfuscation (#1255)

Author: gdeluna-branch

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

@@ -131,14 +131,14 @@ private String initErrorCodeAndGetLocalisedMessage(int statusCode) {
             errMsg = " Session initialization already happened. To force a new session, " +
                     "set intent extra, \"branch_force_new_session\", to true.";
         } else if (statusCode >= 500 || statusCode == ERR_BRANCH_UNABLE_TO_REACH_SERVERS) {
-            errorCode_ = ERR_BRANCH_UNABLE_TO_REACH_SERVERS;
+            errorCode_ = statusCode;
             errMsg = " Unable to reach the Branch servers, please try again shortly.";
         } else if (statusCode == 409 || statusCode == ERR_BRANCH_RESOURCE_CONFLICT) {
-            errorCode_ = ERR_BRANCH_RESOURCE_CONFLICT;
+            errorCode_ = statusCode;
             errMsg = " A resource with this identifier already exists.";
         } else if (statusCode >= 400 || statusCode == ERR_BRANCH_INVALID_REQUEST) {
-            errorCode_ = ERR_BRANCH_INVALID_REQUEST;
-            errMsg = " The request was invalid.";
+            errorCode_ = statusCode;
+            errMsg = " The request was invalid";
         } else if (statusCode == ERR_IMPROPER_REINITIALIZATION) {
             errorCode_ = ERR_IMPROPER_REINITIALIZATION;
             errMsg = "Intra-app linking (i.e. session reinitialization) requires an intent flag, \"branch_force_new_session\".";

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

@@ -81,9 +81,11 @@ static void shutDown() {
      */
     @SuppressLint("CommitPrefEdits")
     private ServerRequestQueue(Context c) {
+        BranchLogger.v("Creating ServerRequestQueue " + c);
         sharedPref = c.getSharedPreferences("BNC_Server_Request_Queue", Context.MODE_PRIVATE);
         editor = sharedPref.edit();
         queue = Collections.synchronizedList(new LinkedList<ServerRequest>());
+        BranchLogger.v("Created queue " + queue);
     }
 
     /**
@@ -321,12 +323,12 @@ void processNextQueueItem(String callingMethodName) {
                         if (!(req instanceof ServerRequestRegisterInstall) && !hasUser()) {
                             BranchLogger.d("Branch Error: User session has not been initialized!");
                             networkCount_ = 0;
-                            req.handleFailure(BranchError.ERR_NO_SESSION, "");
+                            req.handleFailure(BranchError.ERR_NO_SESSION, "Request " + req + " has no session.");
                         }
                         // Determine if a session is needed to execute (SDK-271)
                         else if (requestNeedsSession(req) && !isSessionAvailableForRequest()) {
                             networkCount_ = 0;
-                            req.handleFailure(BranchError.ERR_NO_SESSION, "");
+                            req.handleFailure(BranchError.ERR_NO_SESSION, "Request " + req + " has no session.");
                         } else {
                             executeTimedBranchPostTask(req, Branch.getInstance().prefHelper_.getTaskTimeout());
                         }
@@ -434,7 +436,7 @@ private void awaitTimedBranchPostTask(CountDownLatch latch, int timeout, BranchP
         try {
             if (!latch.await(timeout, TimeUnit.MILLISECONDS)) {
                 postTask.cancel(true);
-                postTask.onPostExecuteInner(new ServerResponse(postTask.thisReq_.getRequestPath(), ERR_BRANCH_TASK_TIMEOUT, "", ""));
+                postTask.onPostExecuteInner(new ServerResponse(postTask.thisReq_.getRequestPath(), ERR_BRANCH_TASK_TIMEOUT, "", "Thread task timed out. Timeout: " + timeout));
             }
         } catch (InterruptedException e) {
             BranchLogger.e("Caught InterruptedException " + e.getMessage());
@@ -455,8 +457,9 @@ public void handleNewRequest(ServerRequest req) {
         BranchLogger.d("handleNewRequest " + req);
         // If Tracking is disabled fail all messages with ERR_BRANCH_TRACKING_DISABLED
         if (Branch.getInstance().getTrackingController().isTrackingDisabled() && !req.prepareExecuteWithoutTracking()) {
-            BranchLogger.d("Requested operation cannot be completed since tracking is disabled [" + req.requestPath_.getPath() + "]");
-            req.handleFailure(BranchError.ERR_BRANCH_TRACKING_DISABLED, "");
+            String errMsg = "Requested operation cannot be completed since tracking is disabled [" + req.requestPath_.getPath() + "]";
+            BranchLogger.d(errMsg);
+            req.handleFailure(BranchError.ERR_BRANCH_TRACKING_DISABLED, errMsg);
             return;
         }
         //If not initialised put an open or install request in front of this request(only if this needs session)
@@ -514,7 +517,7 @@ protected ServerResponse doInBackground(Void... voids) {
             // update queue wait time
             thisReq_.doFinalUpdateOnBackgroundThread();
             if (Branch.getInstance().getTrackingController().isTrackingDisabled() && !thisReq_.prepareExecuteWithoutTracking()) {
-                return new ServerResponse(thisReq_.getRequestPath(), BranchError.ERR_BRANCH_TRACKING_DISABLED, "", "");
+                return new ServerResponse(thisReq_.getRequestPath(), BranchError.ERR_BRANCH_TRACKING_DISABLED, "", "Tracking is disabled");
             }
             String branchKey = Branch.getInstance().prefHelper_.getBranchKey();
             ServerResponse result = null;
@@ -662,7 +665,7 @@ void onRequestFailed(ServerResponse serverResponse, int status) {
                 //On Network error or Branch is down fail all the pending requests in the queue except
                 //for request which need to be replayed on failure.
                 ServerRequestQueue.this.networkCount_ = 0;
-                thisReq_.handleFailure(status, serverResponse.getFailReason() + " " + serverResponse.getMessage());
+                thisReq_.handleFailure(status, serverResponse.getFailReason() + status + " " + serverResponse.getMessage());
             }
 
             boolean unretryableErrorCode = (400 <= status && status <= 451) || status == BranchError.ERR_BRANCH_TRACKING_DISABLED;

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

@@ -120,7 +120,7 @@ public void handleFailure(int statusCode, String causeMsg) {
             } catch (JSONException ex) {
                 BranchLogger.w("Caught JSONException " + ex.getMessage());
             }
-            callback_.onInitFinished(obj, new BranchError("Trouble initializing Branch. " + causeMsg, statusCode));
+            callback_.onInitFinished(obj, new BranchError("Trouble initializing Branch. " + this + " failed. " + causeMsg, statusCode));
         }
     }
 

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

@@ -93,7 +93,7 @@ public void handleFailure(int statusCode, String causeMsg) {
             } catch (JSONException ex) {
                 BranchLogger.w("Caught JSONException " + ex.getMessage());
             }
-            callback_.onInitFinished(obj, new BranchError("Trouble initializing Branch. " + causeMsg, statusCode));
+            callback_.onInitFinished(obj, new BranchError("Trouble initializing Branch. " + this + " failed. " + causeMsg, statusCode));
         }
     }
 

Branch-SDK/src/main/java/io/branch/referral/network/BranchRemoteInterface.java

@@ -94,7 +94,7 @@ public final ServerResponse make_restful_get(String url, JSONObject params, Stri
         if (addCommonParams(params, branchKey)) {
             modifiedUrl += this.convertJSONtoString(params);
         } else {
-            return new ServerResponse(tag, BranchError.ERR_BRANCH_KEY_INVALID, "", "");
+            return new ServerResponse(tag, BranchError.ERR_BRANCH_KEY_INVALID, "", "Invalid key");
         }
 
         long reqStartTime = System.currentTimeMillis();
@@ -128,7 +128,7 @@ public final ServerResponse make_restful_post(JSONObject body, String url, Strin
         body = body != null ? body : new JSONObject();
 
         if (!addCommonParams(body, branchKey)) {
-            return new ServerResponse(tag, BranchError.ERR_BRANCH_KEY_INVALID, "", "");
+            return new ServerResponse(tag, BranchError.ERR_BRANCH_KEY_INVALID, "", "Failed to set common parameters, body: " + body + " key: " + branchKey);
         }
         BranchLogger.v("posting to " + url);
         BranchLogger.v("Post value = " + body.toString());
@@ -137,7 +137,7 @@ public final ServerResponse make_restful_post(JSONObject body, String url, Strin
             BranchResponse response = doRestfulPost(url, body);
             return processEntityForJSON(response, tag, response.requestId);
         } catch (BranchRemoteException branchError) {
-            return new ServerResponse(tag, branchError.branchErrorCode, "", branchError.branchErrorMessage);
+            return new ServerResponse(tag, branchError.branchErrorCode, "",  "Failed network request. " + branchError.branchErrorMessage);
         } finally {
             if (Branch.getInstance() != null) {
                 int brttVal = (int) (System.currentTimeMillis() - reqStartTime);
@@ -201,6 +201,7 @@ private ServerResponse processEntityForJSON(BranchResponse response, String tag,
     }
 
     private boolean addCommonParams(JSONObject post, String branch_key) {
+        BranchLogger.v("addCommonParams post: " + post + " key: " + branch_key);
         try {
             if (!post.has(Defines.Jsonkey.UserData.getKey())) { // user data already has the sdk in it as part of v2 request
                 post.put(Defines.Jsonkey.SDK.getKey(), "android" + Branch.getSdkVersionNumber());