Merge pull request #2055 from dimagi/okHttpPostRetries

Disable Retries for Post requests
dimagi · Nov 27, 2018 · a9a14c6 · a9a14c6
2 parents e7170e3 + 20d44b0
commit a9a14c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/src/org/commcare/CommCareApplication.java b/app/src/org/commcare/CommCareApplication.java
@@ -1090,7 +1090,7 @@ public static CommCareNoficationManager notificationManager() {
     public ModernHttpRequester buildHttpRequester(Context context, String url, Map<String, String> params,
                                                   HashMap headers, RequestBody requestBody, List<MultipartBody.Part> parts,
                                                   HTTPMethod method, @Nullable Pair<String, String> usernameAndPasswordToAuthWith,
-                                                  @Nullable HttpResponseProcessor responseProcessor) {
+                                                  @Nullable HttpResponseProcessor responseProcessor, boolean retry) {
         return new ModernHttpRequester(new AndroidCacheDirSetup(context),
                 url,
                 params,
@@ -1099,14 +1099,15 @@ public ModernHttpRequester buildHttpRequester(Context context, String url, Map<S
                 parts,
                 CommCareNetworkServiceGenerator.createCommCareNetworkService(
                         HttpUtils.getCredential(usernameAndPasswordToAuthWith),
-                        DeveloperPreferences.isEnforceSecureEndpointEnabled()),
+                        DeveloperPreferences.isEnforceSecureEndpointEnabled(),
+                        retry),
                 method,
                 responseProcessor);
     }
 
     public ModernHttpRequester createGetRequester(Context context, String url, Map<String, String> params,
                                                   HashMap headers, @Nullable Pair<String, String> usernameAndPasswordToAuthWith,
                                                   @Nullable HttpResponseProcessor responseProcessor) {
-        return buildHttpRequester(context, url, params, headers, null, null, HTTPMethod.GET, usernameAndPasswordToAuthWith, responseProcessor);
+        return buildHttpRequester(context, url, params, headers, null, null, HTTPMethod.GET, usernameAndPasswordToAuthWith, responseProcessor, true);
     }
 }
diff --git a/app/src/org/commcare/network/CommcareRequestGenerator.java b/app/src/org/commcare/network/CommcareRequestGenerator.java
@@ -209,7 +209,8 @@ public Response<ResponseBody> postMultipart(String url, List<MultipartBody.Part>
                 parts,
                 HTTPMethod.MULTIPART_POST,
                 new Pair(username, password),
-                null);
+                null,
+               false);
 
         return requester.makeRequest();
     }

diff --git a/app/src/org/commcare/tasks/ModernHttpTask.java b/app/src/org/commcare/tasks/ModernHttpTask.java
@@ -56,7 +56,8 @@ public ModernHttpTask(Context context, String url, HashMap<String, String> param
                 null,
                 method,
                 usernameAndPasswordToAuthWith,
-                this);
+                this,
+                method.equals(HTTPMethod.GET) ? true : false);
     }
 
     @Override

diff --git a/app/unit-tests/src/org/commcare/CommCareTestApplication.java b/app/unit-tests/src/org/commcare/CommCareTestApplication.java
@@ -249,7 +249,7 @@ public void prepareTest(Object test) {
     @Override
     public ModernHttpRequester buildHttpRequester(Context context, String url, Map<String, String> params,
                                                   HashMap headers, RequestBody requestBody, List<MultipartBody.Part> parts,
-                                                  HTTPMethod method, @Nullable Pair<String, String> usernameAndPasswordToAuthWith, HttpResponseProcessor responseProcessor) {
+                                                  HTTPMethod method, @Nullable Pair<String, String> usernameAndPasswordToAuthWith, HttpResponseProcessor responseProcessor, boolean b) {
         return new ModernHttpRequesterMock(new AndroidCacheDirSetup(context),
                 url,
                 params,
@@ -258,7 +258,8 @@ public ModernHttpRequester buildHttpRequester(Context context, String url, Map<S
                 parts,
                 CommCareNetworkServiceGenerator.createCommCareNetworkService(
                         HttpUtils.getCredential(usernameAndPasswordToAuthWith),
-                        DeveloperPreferences.isEnforceSecureEndpointEnabled()),
+                        DeveloperPreferences.isEnforceSecureEndpointEnabled(),
+                        true),
                 method,
                 responseProcessor);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     parts,
                     HTTPMethod.MULTIPART_POST,
                     new Pair(username, password),
-                    null);
+                    null,
+                   false);
             return requester.makeRequest();
         }
@@ Expand Down @@