diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle index 5f30dd56..825cac4e 100644 --- a/src/java/JavaFileStorage/app/build.gradle +++ b/src/java/JavaFileStorage/app/build.gradle @@ -27,8 +27,8 @@ NOTE: If you change dependencies here, don't forget to update the jar files in J dependencies { compile 'com.android.support:appcompat-v7:28.0.0' - compile 'com.squareup.okhttp3:okhttp:4.2.2' - compile 'com.burgstaller:okhttp-digest:2.0' + compile 'com.squareup.okhttp3:okhttp:4.10.0-RC1' + compile 'com.burgstaller:okhttp-digest:2.5' compile 'com.google.android.gms:play-services:4.0.30' compile 'com.google.http-client:google-http-client-gson:1.20.0' compile('com.google.api-client:google-api-client-android:1.16.0-rc') { diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java index f71a422c..b7a350cc 100644 --- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java @@ -45,7 +45,6 @@ import keepass2android.javafilestorage.webdav.PropfindXmlParser; import keepass2android.javafilestorage.webdav.WebDavUtil; import okhttp3.MediaType; import okhttp3.OkHttpClient; -import okhttp3.Protocol; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @@ -176,12 +175,6 @@ public class WebDavStorage extends JavaFileStorageBase { builder.writeTimeout(25, TimeUnit.SECONDS); } - //OkHttp has issues with HTTP/2 (https://github.com/square/okhttp/issues/4964) - //An OkHttp developer suggested to use the same workaround as other apps: - // (https://github.com/PhilippC/keepass2android/issues/747#issuecomment-622946085) - //force HTTP1.1 - builder.protocols(Arrays.asList(Protocol.HTTP_1_1)); - OkHttpClient client = builder.build();