wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #750 from Unpublished/downgradeOkHttp

Browse source 
Downgrade okhttp to 3.12.2 and use same version for all okhttp deps
This commit is contained in:
David Luhmer 2019-04-07 17:03:05 -03:00 committed by GitHub
commit 786cb5ec36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
News-Android-App/build.gradle
View file

@ -106,6 +106,8 @@ repositories {
maven { url "https://dl.bintray.com/lukaville/maven" } //Needed for com.nbsp:library:1.02 in Material File Picker maven { url "https://dl.bintray.com/lukaville/maven" } //Needed for com.nbsp:library:1.02 in Material File Picker
} }
final OKHTTP_VERSION = '3.12.2'
dependencies { dependencies {
// core android studio module // core android studio module
//compile project(':core') //compile project(':core')
@ -165,8 +167,8 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.0' implementation "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0' implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
implementation 'com.nbsp:library:1.02' // MaterialFilePicker implementation 'com.nbsp:library:1.02' // MaterialFilePicker
@ -179,14 +181,13 @@ dependencies {
} }
testImplementation 'com.google.dexmaker:dexmaker:1.2' testImplementation 'com.google.dexmaker:dexmaker:1.2'
testImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' testImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
testImplementation 'com.squareup.okhttp3:mockwebserver:3.14.0' testImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP_VERSION}"
androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.16" androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.16"
//androidTestCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
// https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver // https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver
//androidTestImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.14.0' //androidTestImplementation "com.squareup.okhttp3:mockwebserver:${OKHTTP_VERSION}"
androidTestImplementation 'tools.fastlane:screengrab:1.2.0' androidTestImplementation 'tools.fastlane:screengrab:1.2.0'

5
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/OkHttpSSLClient.java
View file

@ -3,7 +3,6 @@ package de.luhmer.owncloudnewsreader.ssl;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import androidx.annotation.RequiresApi;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
@ -30,6 +29,7 @@ import okhttp3.Interceptor;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.internal.Util;
import okhttp3.logging.HttpLoggingInterceptor; import okhttp3.logging.HttpLoggingInterceptor;
/** /**
@ -38,7 +38,6 @@ import okhttp3.logging.HttpLoggingInterceptor;
public class OkHttpSSLClient { public class OkHttpSSLClient {
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
public static OkHttpClient GetSslClient(HttpUrl baseUrl, String username, String password, SharedPreferences sp, MemorizingTrustManager mtm) { public static OkHttpClient GetSslClient(HttpUrl baseUrl, String username, String password, SharedPreferences sp, MemorizingTrustManager mtm) {
// set location of the keystore // set location of the keystore
MemorizingTrustManager.setKeyStoreFile("private", "sslkeys.bks"); MemorizingTrustManager.setKeyStoreFile("private", "sslkeys.bks");
@ -49,7 +48,7 @@ public class OkHttpSSLClient {
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder() OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.MINUTES) .readTimeout(30, TimeUnit.MINUTES)
.addInterceptor(new AuthorizationInterceptor(baseUrl, Credentials.basic(username, password, java.nio.charset.StandardCharsets.UTF_8))) .addInterceptor(new AuthorizationInterceptor(baseUrl, Credentials.basic(username, password, Util.UTF_8)))
.addInterceptor(interceptor); .addInterceptor(interceptor);
// register MemorizingTrustManager for HTTPS // register MemorizingTrustManager for HTTPS