diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-22 14:02:44 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-23 13:19:26 +0200 |
commit | 83ac1152757dfda0964383ac0fed6d87cd188b6d (patch) | |
tree | ba1a71e914898c95b8423a6198070f4401c9bb9d /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http | |
parent | 3ef5bc604b29a5e3c1050bff66f78c49ffd898cc (diff) | |
download | qtlocation-mapboxgl-83ac1152757dfda0964383ac0fed6d87cd188b6d.tar.gz |
Revert "[android] - infer nullity"
This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http')
2 files changed, 3 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java index 37e3869692..fde8ae4a5d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.http; -import android.support.annotation.NonNull; - public class HttpRequestUrl { private HttpRequestUrl() { @@ -15,7 +13,7 @@ public class HttpRequestUrl { * @param querySize the query size of the resource request * @return the adapted resource url */ - public static String buildResourceUrl(@NonNull String host, String resourceUrl, int querySize) { + public static String buildResourceUrl(String host, String resourceUrl, int querySize) { if (isValidMapboxEndpoint(host)) { if (querySize == 0) { resourceUrl = resourceUrl + "?"; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java index fc98a38319..7884033de7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java @@ -3,8 +3,6 @@ package com.mapbox.mapboxsdk.http; import android.content.res.AssetManager; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.log.Logger; @@ -22,7 +20,6 @@ class LocalRequestTask extends AsyncTask<String, Void, byte[]> { this.requestResponse = requestResponse; } - @Nullable @Override protected byte[] doInBackground(String... strings) { return loadFile(Mapbox.getApplicationContext().getAssets(), @@ -33,15 +30,14 @@ class LocalRequestTask extends AsyncTask<String, Void, byte[]> { } @Override - protected void onPostExecute(@Nullable byte[] bytes) { + protected void onPostExecute(byte[] bytes) { super.onPostExecute(bytes); if (bytes != null && requestResponse != null) { requestResponse.onResponse(bytes); } } - @Nullable - private static byte[] loadFile(AssetManager assets, @NonNull String path) { + private static byte[] loadFile(AssetManager assets, String path) { byte[] buffer = null; try (InputStream input = assets.open(path)) { int size = input.available(); |