diff options
author | Guardiola31337 <pablo.guardiola@mapbox.com> | 2019-05-06 11:28:03 -0400 |
---|---|---|
committer | Guardiola31337 <pablo.guardiola@mapbox.com> | 2019-05-06 11:28:03 -0400 |
commit | ba73e507b845764f21228e023df111cddc9f7518 (patch) | |
tree | 3e2699d79f8d4c36b385c452d23c4bc4c661738b /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java | |
parent | 4557f254fa6bbe08f8a750a4c140c133fdcad362 (diff) | |
download | qtlocation-mapboxgl-upstream/14297-fix-offline-callbacks.tar.gz |
[android] convert context and resources cache path change callback from FileSource#setResourcesCachePath and offline manager from CopyTempDatabaseFileTask into hard referencesupstream/14297-fix-offline-callbacks
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 | 11 |
1 files changed, 2 insertions, 9 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 cc4988b549..82bd3b5f19 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 @@ -20,7 +20,6 @@ import com.mapbox.mapboxsdk.utils.FileUtils; import com.mapbox.mapboxsdk.utils.ThreadUtils; import java.io.File; -import java.lang.ref.WeakReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -270,9 +269,9 @@ public class FileSource { * @param path the new database path * @param callback the callback to obtain the result */ - public static void setResourcesCachePath(@NonNull Context context, + public static void setResourcesCachePath(final Context context, @NonNull final String path, - @NonNull ResourcesCachePathChangeCallback callback) { + final ResourcesCachePathChangeCallback callback) { final String fileSourceActivatedMessage = "Cannot set path, file source is activated." + " Make sure that the map or a resources download is not running."; if (getInstance(context).isActivated()) { @@ -282,14 +281,9 @@ public class FileSource { // no need to change the path callback.onSuccess(path); } else { - final WeakReference<Context> contextWeakReference = new WeakReference<>(context); - final WeakReference<ResourcesCachePathChangeCallback> callbackWeakReference = new WeakReference<>(callback); new FileUtils.CheckFileWritePermissionTask(new FileUtils.OnCheckFileWritePermissionListener() { @Override public void onWritePermissionGranted() { - final Context context = contextWeakReference.get(); - final ResourcesCachePathChangeCallback callback = callbackWeakReference.get(); - if (callback == null) { Logger.w(TAG, "Lost callback reference."); return; @@ -316,7 +310,6 @@ public class FileSource { @Override public void onError() { - final ResourcesCachePathChangeCallback callback = callbackWeakReference.get(); if (callback != null) { String message = "Path is not writable: " + path; Logger.e(TAG, message); |