diff options
| author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-09-12 10:36:03 +0200 |
|---|---|---|
| committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-09-12 10:36:03 +0200 |
| commit | 28b7d5cdf1b04f744582752625200213d62d3e04 (patch) | |
| tree | 8167322bb1bd07f0a44bc4a164ca5e75b24ed45a | |
| parent | 8e01f52dd212c57646a9b0fa1c65039a003b78cc (diff) | |
| parent | b113257bf5cf942029edf612313560e0a1c9bf04 (diff) | |
| download | qtlocation-mapboxgl-upstream/rjuszczyk-patch-1.tar.gz | |
Merge branch 'patch-1' of https://github.com/rjuszczyk/mapbox-gl-native into rjuszczyk-patch-1upstream/rjuszczyk-patch-1
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java | 11 |
1 files changed, 6 insertions, 5 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 91a235616a..a2fa15d509 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 @@ -56,13 +56,14 @@ class HTTPRequest implements Callback { mNativePtr = nativePtr; try { - // Don't try a request if we aren't connected - if (!Mapbox.isConnected()) { - throw new NoRouteToHostException("No Internet connection available."); - } - HttpUrl httpUrl = HttpUrl.parse(resourceUrl); final String host = httpUrl.host().toLowerCase(MapboxConstants.MAPBOX_LOCALE); + + // Don't try a request to remote server if we aren't connected + if (!Mapbox.isConnected() && !host.equals("127.0.0.1") && !host.equals("localhost")) { + throw new NoRouteToHostException("No Internet connection available."); + } + if (host.equals("mapbox.com") || host.endsWith(".mapbox.com") || host.equals("mapbox.cn") || host.endsWith(".mapbox.cn")) { if (httpUrl.querySize() == 0) { |