Issue #620 PR2 break dependency on httpclient and replace with okhttp3

build.gradle

@@ -51,5 +51,6 @@ ext {
     leakyCanaryVersion = '1.5.4'
     daggerVersion = '2.16'
     rxLifecycleVersion = '2.2.1'
+    okhttp3Version = '3.11.0'
     workManagerVersion = "1.0.0-alpha10"
 }

collect_app/build.gradle

@@ -181,7 +181,6 @@ allprojects {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: '*.jar')
     implementation "com.android.support:support-v13:${rootProject.supportLibraryVersion}"
     implementation "com.android.support:customtabs:${rootProject.supportLibraryVersion}"
     implementation "com.android.support:design:${rootProject.supportLibraryVersion}"
@@ -212,6 +211,10 @@ dependencies {
         exclude group: 'org.apache.httpcomponents'
     }
 
+
+    implementation "com.squareup.okhttp3:okhttp:${rootProject.okhttp3Version}"
+    implementation 'com.burgstaller:okhttp-digest:1.18'
+
     implementation 'bikramsambat:bikram-sambat:1.0.0'
     implementation "com.evernote:android-job:1.2.5"
     implementation "com.rarepebble:colorpicker:2.3.1"
@@ -317,7 +320,7 @@ dependencies {
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
 
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:3.9.0"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:${rootProject.okhttp3Version}"
 
     androidTestImplementation "android.arch.work:work-testing:${rootProject.workManagerVersion}"
 }

collect_app/src/androidTest/java/org/odk/collect/android/SNITest.java

@@ -6,8 +6,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.odk.collect.android.http.CollectServerClient;
-import org.odk.collect.android.http.HttpClientConnection;
 import org.odk.collect.android.http.HttpGetResult;
+import org.odk.collect.android.http.OkHttpConnection;
 import org.odk.collect.android.utilities.WebCredentialsUtils;
 
 import java.io.BufferedReader;
@@ -35,7 +35,7 @@ public class SNITest {
 
     @Test
     public void testThatHttpClientSupportsSNI() throws Exception {
-        CollectServerClient serverClient = new CollectServerClient(new HttpClientConnection(), new WebCredentialsUtils());
+        CollectServerClient serverClient = new CollectServerClient(new OkHttpConnection(), new WebCredentialsUtils());
         HttpGetResult inputStreamResult = serverClient.getHttpInputStream(SNI_URI, null);
         assertHttpSuccess(inputStreamResult.getStatusCode());
         assertPageContent(inputStreamResult.getInputStream());

collect_app/src/androidTest/java/org/odk/collect/android/tasks/DownloadFormListTaskTest.java

@@ -24,12 +24,12 @@ public void shouldProcessAndReturnAFormList() throws Exception {
         final Map<String, FormDetails> fetched = new DownloadFormListTask().doInBackground();
 
         // then
-        RecordedRequest r = nextRequest();
-        assertEquals("GET", r.getMethod());
-        assertEquals("/formList", r.getPath());
-        assertMatches("Dalvik/.* org.odk.collect.android/.*", r.getHeader("User-Agent"));
-        assertEquals("1.0", r.getHeader("X-OpenRosa-Version"));
-        assertEquals("gzip", r.getHeader("Accept-Encoding"));
+        RecordedRequest recordedRequest = nextRequest();
+        assertEquals("GET", recordedRequest.getMethod());
+        assertMatches(".*/formList", recordedRequest.getPath());
+        assertMatches("Dalvik/.* org.odk.collect.android/.*", recordedRequest.getHeader("User-Agent"));
+        assertEquals("1.0", recordedRequest.getHeader("X-OpenRosa-Version"));
+        assertEquals("gzip,deflate", recordedRequest.getHeader("Accept-Encoding"));
 
         // and
         assertEquals(2, fetched.size());

collect_app/src/androidTest/java/org/odk/collect/android/utilities/CollectServerClientTest.java

@@ -3,7 +3,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.odk.collect.android.http.CollectServerClient;
-import org.odk.collect.android.http.HttpClientConnection;
+import org.odk.collect.android.http.OkHttpConnection;
 import org.odk.collect.android.test.MockedServerTest;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.RecordedRequest;
@@ -21,19 +21,19 @@ public class CollectServerClientTest extends MockedServerTest {
     public void setUp() throws Exception {
         // server hangs without a response queued:
         server.enqueue(new MockResponse());
-        collectServerClient = new CollectServerClient(new HttpClientConnection(), new WebCredentialsUtils());
+        collectServerClient = new CollectServerClient(new OkHttpConnection(), new WebCredentialsUtils());
     }
 
-        @Test
-        public void httpRequests_shouldHaveUseragentHeader() throws Exception {
-            // when
-            doRequest(url("/some-path"));
+    @Test
+    public void httpRequests_shouldHaveUserAgentHeader() throws Exception {
+        // when
+        doRequest(url("/some-path"));
 
-            // then
-            RecordedRequest r = nextRequest();
-            assertEquals("GET /some-path HTTP/1.1", r.getRequestLine());
-            assertTrue(r.getHeader("User-Agent").matches("Dalvik/.* org.odk.collect.android/.*"));
-        }
+        // then
+        RecordedRequest recordedRequest = nextRequest();
+        assertEquals("GET /some-path HTTP/1.1", recordedRequest.getRequestLine());
+        assertTrue(recordedRequest.getHeader("User-Agent").matches("Dalvik/.* org.odk.collect.android/.*"));
+    }
 
     @Test
     public void getXmlDocument_request_shouldSupplyHeader_UserAgent() throws Exception {
@@ -62,7 +62,7 @@ public void getXmlDocument_request_shouldSupplyHeader_AcceptEncoding_gzip() thro
         collectServerClient.getXmlDocument(url("/list-forms"));
 
         // then
-        assertEquals("gzip",
+        assertEquals("gzip,deflate",
                 nextRequest().getHeader("Accept-Encoding"));
     }
 

collect_app/src/main/java/org/odk/collect/android/http/CollectServerClient.java

@@ -99,7 +99,7 @@ HttpGetResult getHttpInputStream(@NonNull String downloadUrl, @Nullable final St
             throw new Exception("Invalid server URL (no hostname): " + downloadUrl);
         }
 
-        return httpInterface.get(uri, contentType, webCredentialsUtils.getCredentials(uri));
+        return httpInterface.executeGetRequest(uri, contentType, webCredentialsUtils.getCredentials(uri));
     }
 
     public static String getPlainTextMimeType() {