diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module')
3 files changed, 11 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java index 3195022d3a..62ad1222cc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.module.http; import android.os.Build; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import com.mapbox.mapboxsdk.BuildConfig; @@ -46,8 +47,8 @@ public class HttpRequestImpl implements HttpRequest { private Call call; @Override - public void executeRequest(HttpResponder httpRequest, long nativePtr, String resourceUrl, - String etag, String modified) { + public void executeRequest(HttpResponder httpRequest, long nativePtr, @NonNull String resourceUrl, + @NonNull String etag, @NonNull String modified) { OkHttpCallback callback = new OkHttpCallback(httpRequest); try { HttpUrl httpUrl = HttpUrl.parse(resourceUrl); @@ -147,7 +148,7 @@ public class HttpRequestImpl implements HttpRequest { body); } - private void handleFailure(Call call, Exception e) { + private void handleFailure(@Nullable Call call, Exception e) { String errorMessage = e.getMessage() != null ? e.getMessage() : "Error processing the request"; int type = getFailureType(e); @@ -169,6 +170,7 @@ public class HttpRequestImpl implements HttpRequest { } } + @NonNull private static Dispatcher getDispatcher() { Dispatcher dispatcher = new Dispatcher(); // Matches core limit set on diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java index 66031ea724..6fdaca138e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.module.http; +import android.support.annotation.NonNull; import okhttp3.OkHttpClient; import okio.Buffer; @@ -44,6 +45,7 @@ public class HttpRequestUtil { HttpRequestImpl.setOkHttpClient(client); } + @NonNull static String toHumanReadableAscii(String s) { for (int i = 0, length = s.length(), c; i < length; i += Character.charCount(c)) { c = s.codePointAt(i); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java index e8e0504157..1b13591b81 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java @@ -1,6 +1,8 @@ package com.mapbox.mapboxsdk.module.telemetry; import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.mapbox.android.telemetry.AppUserTurnstile; import com.mapbox.android.telemetry.Event; import com.mapbox.android.telemetry.MapEventFactory; @@ -23,6 +25,7 @@ public class TelemetryImpl implements TelemetryDefinition { private static final String TAG = "Mbgl-TelemetryImpl"; private static TelemetryImpl instance; + @Nullable private MapboxTelemetry telemetry; /** @@ -154,7 +157,7 @@ public class TelemetryImpl implements TelemetryDefinition { * @deprecated use {@link #setSessionIdRotationInterval(int)} instead */ @Deprecated - public static boolean updateSessionIdRotationInterval(SessionInterval interval) { + public static boolean updateSessionIdRotationInterval(@NonNull SessionInterval interval) { try { Field field = interval.getClass().getDeclaredField("interval"); field.setAccessible(true); |