[android] - add FileSource activation/deactivation to MapSnapshotter, handle multiple deactivate scenario in FileSourceupstream/tvn-filesource-activate-deactivate

1 files changed, 2 insertions, 22 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 41dc449b50..f0cb8d973a 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
@@ -6,10 +6,8 @@ import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.os.Environment;
 import android.support.annotation.NonNull;
-
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
-
 import timber.log.Timber;
 
 /**
@@ -119,28 +117,14 @@ public class FileSource {
   }
 
   private long nativePtr;
-  private long activeCounter;
-  private boolean wasPaused;
 
   private FileSource(String cachePath, AssetManager assetManager) {
     initialize(Mapbox.getAccessToken(), cachePath, assetManager);
   }
 
-  public void activate() {
-    activeCounter++;
-    if (activeCounter == 1 && wasPaused) {
-      wasPaused = false;
-      resume();
-    }
-  }
+  public native void activate();
 
-  public void deactivate() {
-    activeCounter--;
-    if (activeCounter == 0) {
-      wasPaused = true;
-      pause();
-    }
-  }
+  public native void deactivate();
 
   public native void setAccessToken(@NonNull String accessToken);
 
@@ -148,10 +132,6 @@ public class FileSource {
 
   public native void setApiBaseUrl(String baseUrl);
 
-  private native void resume();
-
-  private native void pause();
-
   /**
    * Sets a callback for transforming URLs requested from the internet
    * <p>