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/storage/FileSource.java | |
parent | a436fd233f325ddca571e3c61641588e8166a6b4 (diff) | |
download | qtlocation-mapboxgl-617742710852a5a958a13f2b659f8c307973e49d.tar.gz |
[android] - infer nullity
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java index c242ef3699..ec75f66112 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java @@ -8,6 +8,7 @@ import android.os.AsyncTask; import android.os.Environment; import android.support.annotation.Keep; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.UiThread; import com.mapbox.mapboxsdk.MapStrictMode; @@ -29,6 +30,7 @@ public class FileSource { private static final String TAG = "Mbgl-FileSource"; private static final Lock resourcesCachePathLoaderLock = new ReentrantLock(); private static final Lock internalCachePathLoaderLock = new ReentrantLock(); + @Nullable private static String resourcesCachePath; private static String internalCachePath; @@ -61,7 +63,7 @@ public class FileSource { * @return the single instance of FileSource */ @UiThread - public static synchronized FileSource getInstance(Context context) { + public static synchronized FileSource getInstance(@NonNull Context context) { if (INSTANCE == null) { INSTANCE = new FileSource(getResourcesCachePath(context), context.getResources().getAssets()); } @@ -76,8 +78,9 @@ public class FileSource { * @return the files directory path * @deprecated Use {@link #getResourcesCachePath(Context)} instead. */ + @Nullable @Deprecated - public static String getCachePath(Context context) { + public static String getCachePath(@NonNull Context context) { // Default value boolean setStorageExternal = MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL; @@ -159,6 +162,7 @@ public class FileSource { unlockPathLoaders(); } + @NonNull @Override protected String[] doInBackground(Context... contexts) { return new String[] { @@ -181,7 +185,8 @@ public class FileSource { * @param context the context to derive the files directory path from * @return the files directory path */ - public static String getResourcesCachePath(Context context) { + @Nullable + public static String getResourcesCachePath(@NonNull Context context) { resourcesCachePathLoaderLock.lock(); try { if (resourcesCachePath == null) { @@ -199,7 +204,7 @@ public class FileSource { * @param context the context to derive the internal cache path from * @return the internal cache path */ - public static String getInternalCachePath(Context context) { + public static String getInternalCachePath(@NonNull Context context) { internalCachePathLoaderLock.lock(); try { if (internalCachePath == null) { @@ -240,6 +245,7 @@ public class FileSource { @Keep public native void setAccessToken(@NonNull String accessToken); + @NonNull @Keep public native String getAccessToken(); |