diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-11-21 10:13:18 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2017-11-21 10:13:18 +0100 |
| commit | 0c08993fb1879eb5e5e3aff0cb820f25d9a68c22 (patch) | |
| tree | 324dce5671071c91316580089b7af07a130a7ce1 | |
| parent | 9206e46154f4d3c79ebe3da405fc6b641d336cb9 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-bump-okhttp.tar.gz | |
[android] - bump okhttp, remove workaround for Android Oreoupstream/tvn-bump-okhttp
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java | 9 | ||||
| -rw-r--r-- | platform/android/dependencies.gradle | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java index 9f887ab7cc..f25ecd4d4d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java @@ -86,14 +86,7 @@ class HTTPRequest implements Callback { } mRequest = builder.build(); mCall = mClient.newCall(mRequest); - - // TODO remove code block for workaround in #10303 - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) { - mCall.enqueue(this); - } else { - // Calling execute instead of enqueue is a workaround for #10303 - onResponse(mCall, mCall.execute()); - } + mCall.enqueue(this); } catch (Exception exception) { onFailure(exception); } diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index 0094b79281..541b3c5236 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/dependencies.gradle @@ -42,7 +42,7 @@ ext { // square crew timber : 'com.jakewharton.timber:timber:4.5.1', - okhttp3 : 'com.squareup.okhttp3:okhttp:3.9.0', + okhttp3 : 'com.squareup.okhttp3:okhttp:3.9.1', leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}", leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}" ] |