update okhttp3 -> okhttp4

Author: BakerJQ

README.md

@@ -25,7 +25,7 @@ allprojects {
 Add the dependency
 ``` groovy
 dependencies {
-    implementation 'com.github.BakerJQ:RxRetroHttp:1.0.5'
+    implementation 'com.github.BakerJQ:RxRetroHttp:1.0.10'
 }
 
 ```

README_cn.md

@@ -26,7 +26,7 @@ allprojects {
 在app或相应使用的module中加入
 ``` groovy
 dependencies {
-    implementation 'com.github.BakerJQ:RxRetroHttp:1.0.5'
+    implementation 'com.github.BakerJQ:RxRetroHttp:1.0.10'
 }
 
 ```

app/build.gradle

@@ -37,12 +37,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation project(':rxretrohttp')
 //    implementation 'com.github.BakerJQ:RxRetroHttp:1.0.3'

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
 

config.gradle

@@ -1,7 +1,7 @@
 ext {
     versions = [
-            'versionCode'   : 5,
-            'versionName'   : '1.0.5',
+            'versionCode'   : 10,
+            'versionName'   : '1.0.10',
 
             'compileSdk'    : 28,
             'buildTools'    : '28.0.3',

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 18 08:52:56 CST 2019
+#Tue Oct 22 15:29:32 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

rxretrohttp/build.gradle

@@ -19,10 +19,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api 'com.squareup.retrofit2:retrofit:2.4.0'
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    api 'com.squareup.okhttp3:okhttp:4.0.0'
     api 'com.squareup.okhttp3:okhttp-urlconnection:3.11.0'
-    api 'io.reactivex.rxjava2:rxjava:2.2.3'
-    api 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    api 'io.reactivex.rxjava2:rxjava:2.2.9'
+    api 'io.reactivex.rxjava2:rxandroid:2.1.1'
     api 'com.squareup.retrofit2:converter-gson:2.4.0'
     api 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     api 'com.trello.rxlifecycle3:rxlifecycle:3.0.0'

rxretrohttp/src/main/java/com/bakerj/rxretrohttp/converter/RetroGsonResponseBodyConverter.java

@@ -34,7 +34,8 @@ class RetroGsonResponseBodyConverter<T, ApiResultType extends IApiResult> implem
     @Override
     public T convert(ResponseBody value) throws IOException {
         try {
-            String response = value.string().replaceAll("\\s*|\r|\n|\t", "");
+//            String response = value.string().replaceAll("\\s*|\r|\n|\t", "");
+            String response = value.string();
             LogUtil.e("response:" + response);
             //parse to IApiResult based obj 解析Result
             ApiResultType apiResult = gson.fromJson(response, apiClass);

rxretrohttp/src/main/java/com/bakerj/rxretrohttp/interceptors/HttpLoggingInterceptor.java

@@ -34,6 +34,9 @@
 import okio.Buffer;
 import okio.BufferedSource;
 
+import static java.net.HttpURLConnection.HTTP_NOT_MODIFIED;
+import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
+import static okhttp3.internal.http.StatusLine.HTTP_CONTINUE;
 import static okhttp3.internal.platform.Platform.INFO;
 
 /**
@@ -198,7 +201,7 @@ public Response intercept(Chain chain) throws IOException {
                 logger.log(headers.name(i) + ": " + headers.value(i));
             }
 
-            if (!logBody || !HttpHeaders.hasBody(response)) {
+            if (!logBody || !hasBody(response)) {
                 logger.log("<-- END HTTP");
             } else if (bodyEncoded(response.headers())) {
                 logger.log("<-- END HTTP (encoded body omitted)");
@@ -236,6 +239,29 @@ private boolean bodyEncoded(Headers headers) {
         return contentEncoding != null && !contentEncoding.equalsIgnoreCase("identity");
     }
 
+    public static boolean hasBody(Response response) {
+        // HEAD requests never yield a body regardless of the response headers.
+        if (response.request().method().equals("HEAD")) {
+            return false;
+        }
+
+        int responseCode = response.code();
+        if ((responseCode < HTTP_CONTINUE || responseCode >= 200)
+                && responseCode != HTTP_NO_CONTENT
+                && responseCode != HTTP_NOT_MODIFIED) {
+            return true;
+        }
+
+        // If the Content-Length or Transfer-Encoding headers disagree with the response code, the
+        // response is malformed. For best compatibility, we honor the headers.
+        if ((response.body() != null && response.body().contentLength() != -1)
+                || "chunked".equalsIgnoreCase(response.header("Transfer-Encoding"))) {
+            return true;
+        }
+
+        return false;
+    }
+
     public enum Level {
         /**
          * No logs.