summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
diff options
context:
space:
mode:
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.java14
1 files changed, 4 insertions, 10 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 5723b71ef9..2845e17312 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,7 +8,6 @@ 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;
@@ -30,7 +29,6 @@ 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;
@@ -63,7 +61,7 @@ public class FileSource {
* @return the single instance of FileSource
*/
@UiThread
- public static synchronized FileSource getInstance(@NonNull Context context) {
+ public static synchronized FileSource getInstance(Context context) {
if (INSTANCE == null) {
INSTANCE = new FileSource(getResourcesCachePath(context), context.getResources().getAssets());
}
@@ -78,9 +76,8 @@ public class FileSource {
* @return the files directory path
* @deprecated Use {@link #getResourcesCachePath(Context)} instead.
*/
- @Nullable
@Deprecated
- public static String getCachePath(@NonNull Context context) {
+ public static String getCachePath(Context context) {
// Default value
boolean isExternalStorageConfiguration = MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL;
@@ -165,7 +162,6 @@ public class FileSource {
unlockPathLoaders();
}
- @NonNull
@Override
protected String[] doInBackground(Context... contexts) {
return new String[] {
@@ -188,8 +184,7 @@ public class FileSource {
* @param context the context to derive the files directory path from
* @return the files directory path
*/
- @Nullable
- public static String getResourcesCachePath(@NonNull Context context) {
+ public static String getResourcesCachePath(Context context) {
resourcesCachePathLoaderLock.lock();
try {
if (resourcesCachePath == null) {
@@ -207,7 +202,7 @@ public class FileSource {
* @param context the context to derive the internal cache path from
* @return the internal cache path
*/
- public static String getInternalCachePath(@NonNull Context context) {
+ public static String getInternalCachePath(Context context) {
internalCachePathLoaderLock.lock();
try {
if (internalCachePath == null) {
@@ -248,7 +243,6 @@ public class FileSource {
@Keep
public native void setAccessToken(@NonNull String accessToken);
- @NonNull
@Keep
public native String getAccessToken();