diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-07-17 15:05:53 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-08-24 18:40:11 +0200 |
commit | d297bf10ef89e97da30e1a00dd49560e18bcb3f0 (patch) | |
tree | 7f7eea2ffd8125777d258a62683d3ffbeb66820f /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java | |
parent | 0f58d956d7b525f3722f24494784c8b97801105a (diff) | |
download | qtlocation-mapboxgl-d297bf10ef89e97da30e1a00dd49560e18bcb3f0.tar.gz |
[android] - modularise the sdk
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 | 16 |
1 files changed, 8 insertions, 8 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 495e425976..590a9f2862 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 @@ -9,7 +9,6 @@ import android.os.Environment; import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.UiThread; - import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -17,7 +16,7 @@ import com.mapbox.mapboxsdk.utils.ThreadUtils; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import timber.log.Timber; +import com.mapbox.mapboxsdk.log.Logger; /** * Holds a central reference to the core's DefaultFileSource for as long as @@ -25,10 +24,11 @@ import timber.log.Timber; */ public class FileSource { - private static String resourcesCachePath; - private static String internalCachePath; + private static final String TAG = "Mbgl-FileSource"; private static final Lock resourcesCachePathLoaderLock = new ReentrantLock(); private static final Lock internalCachePathLoaderLock = new ReentrantLock(); + private static String resourcesCachePath; + private static String internalCachePath; /** * This callback allows implementors to transform URLs before they are requested @@ -87,9 +87,9 @@ public class FileSource { MapboxConstants.KEY_META_DATA_SET_STORAGE_EXTERNAL, MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL); } catch (PackageManager.NameNotFoundException exception) { - Timber.e(exception, "Failed to read the package metadata: "); + Logger.e(TAG, "Failed to read the package metadata: ", exception); } catch (Exception exception) { - Timber.e(exception, "Failed to read the storage key: "); + Logger.e(TAG, "Failed to read the storage key: ", exception); } String cachePath = null; @@ -98,7 +98,7 @@ public class FileSource { // Try getting the external storage path cachePath = context.getExternalFilesDir(null).getAbsolutePath(); } catch (NullPointerException exception) { - Timber.e(exception, "Failed to obtain the external storage path: "); + Logger.e(TAG, "Failed to obtain the external storage path: ", exception); } } @@ -126,7 +126,7 @@ public class FileSource { return true; } - Timber.w("External storage was requested but it isn't readable. For API level < 18" + Logger.w(TAG, "External storage was requested but it isn't readable. For API level < 18" + " make sure you've requested READ_EXTERNAL_STORAGE or WRITE_EXTERNAL_STORAGE" + " permissions in your app Manifest (defaulting to internal storage)."); |