diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-10 10:36:46 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-12 18:40:29 +0200 |
commit | 617742710852a5a958a13f2b659f8c307973e49d (patch) | |
tree | 5dbda0cc3bc6c0eb22eac350fcd954ab7606ea21 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils | |
parent | a436fd233f325ddca571e3c61641588e8166a6b4 (diff) | |
download | qtlocation-mapboxgl-617742710852a5a958a13f2b659f8c307973e49d.tar.gz |
[android] - infer nullity
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils')
5 files changed, 18 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java index 34c52c829b..e90c416a2d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java @@ -35,7 +35,7 @@ public class AnimatorUtils { * @param duration the duration of the animator * @param listener the animator end listener */ - public static void animate(final View view, @AnimatorRes int animatorRes, int duration, + public static void animate(@Nullable final View view, @AnimatorRes int animatorRes, int duration, @Nullable final OnAnimationEndListener listener) { if (view == null) { return; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java index 78503f9dfe..5584a6eb58 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java @@ -7,6 +7,7 @@ import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.View; import java.io.ByteArrayOutputStream; @@ -58,7 +59,8 @@ public class BitmapUtils { * @param sourceDrawable The source drawable * @return The underlying bitmap */ - public static Bitmap getBitmapFromDrawable(Drawable sourceDrawable) { + @Nullable + public static Bitmap getBitmapFromDrawable(@Nullable Drawable sourceDrawable) { if (sourceDrawable == null) { return null; } @@ -88,7 +90,8 @@ public class BitmapUtils { * @param drawable The source drawable * @return The byte array of source drawable */ - public static byte[] getByteArrayFromDrawable(Drawable drawable) { + @Nullable + public static byte[] getByteArrayFromDrawable(@Nullable Drawable drawable) { if (drawable == null) { return null; } @@ -109,7 +112,8 @@ public class BitmapUtils { * @param array The source byte array * @return The drawable created from source byte array */ - public static Drawable getDrawableFromByteArray(Context context, byte[] array) { + @Nullable + public static Drawable getDrawableFromByteArray(@NonNull Context context, @Nullable byte[] array) { if (array == null) { return null; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index 3a53794e50..aa87f8762d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -126,7 +126,7 @@ public class ColorUtils { * @throws ConversionException on illegal input */ @ColorInt - public static int rgbaToColor(String value) { + public static int rgbaToColor(@NonNull String value) { Pattern c = Pattern.compile("rgba?\\s*\\(\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*," + "?\\s*(\\d+\\.?\\d*)?\\s*\\)"); Matcher m = c.matcher(value); @@ -193,7 +193,7 @@ public class ColorUtils { }; } - private static int getColorCompat(Context context, int id) { + private static int getColorCompat(@NonNull Context context, int id) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { return context.getResources().getColor(id, context.getTheme()); } else { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java index b7d09cda2a..52009d20ef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.utils; import android.os.AsyncTask; +import android.support.annotation.NonNull; import java.io.File; import java.lang.ref.WeakReference; @@ -11,6 +12,7 @@ public class FileUtils { * Task checking whether app's process can read a file. */ public static class CheckFileReadPermissionTask extends AsyncTask<File, Void, Boolean> { + @NonNull private final WeakReference<OnCheckFileReadPermissionListener> listenerWeakReference; public CheckFileReadPermissionTask(OnCheckFileReadPermissionListener listener) { @@ -67,6 +69,7 @@ public class FileUtils { * Task checking whether app's process can write to a file. */ public static class CheckFileWritePermissionTask extends AsyncTask<File, Void, Boolean> { + @NonNull private final WeakReference<OnCheckFileWritePermissionListener> listenerWeakReference; public CheckFileWritePermissionTask(OnCheckFileWritePermissionListener listener) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java index 08d39d6b3b..f3c8fd32cf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java @@ -3,6 +3,8 @@ package com.mapbox.mapboxsdk.utils; import android.content.Context; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; @@ -21,6 +23,7 @@ public class MapFragmentUtils { * @param options The MapboxMapOptions to convert * @return a bundle of converted fragment arguments */ + @NonNull public static Bundle createFragmentArgs(MapboxMapOptions options) { Bundle bundle = new Bundle(); bundle.putParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS, options); @@ -34,7 +37,8 @@ public class MapFragmentUtils { * @param args The fragment arguments * @return converted MapboxMapOptions */ - public static MapboxMapOptions resolveArgs(Context context, Bundle args) { + @Nullable + public static MapboxMapOptions resolveArgs(@NonNull Context context, @Nullable Bundle args) { MapboxMapOptions options; if (args != null && args.containsKey(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS)) { options = args.getParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS); |