1 files changed, 13 insertions, 9 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
index d572d696db..130284e88d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
@@ -1,10 +1,12 @@
 package com.mapbox.mapboxsdk.offline;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 
+import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
@@ -25,7 +27,7 @@ public class OfflineManager {
   //
 
   static {
-    System.loadLibrary("mapbox-gl");
+    LibraryLoader.load();
   }
 
   // Native peer pointer
@@ -39,6 +41,7 @@ public class OfflineManager {
   private Handler handler;
 
   // This object is implemented as a singleton
+  @SuppressLint("StaticFieldLeak")
   private static OfflineManager instance;
 
   // The application context
@@ -89,11 +92,11 @@ public class OfflineManager {
    */
   private OfflineManager(Context context) {
     this.context = context.getApplicationContext();
-    this.fileSource = FileSource.getInstance(context);
+    this.fileSource = FileSource.getInstance(this.context);
     initialize(fileSource);
 
     // Delete any existing previous ambient cache database
-    deleteAmbientDatabase(context);
+    deleteAmbientDatabase(this.context);
   }
 
   private void deleteAmbientDatabase(final Context context) {
@@ -106,10 +109,10 @@ public class OfflineManager {
           File file = new File(path);
           if (file.exists()) {
             file.delete();
-            Timber.d("Old ambient cache database deleted to save space: " + path);
+            Timber.d("Old ambient cache database deleted to save space: %s", path);
           }
         } catch (Exception exception) {
-          Timber.e("Failed to delete old ambient cache database: ", exception);
+          Timber.e(exception, "Failed to delete old ambient cache database: ");
         }
       }
     }).start();
@@ -235,10 +238,11 @@ public class OfflineManager {
     return LatLngBounds.world().contains(definition.getBounds());
   }
 
-  /*
-  * Changing or bypassing this limit without permission from Mapbox is prohibited
-  * by the Mapbox Terms of Service.
-  */
+  /**
+   * Changing or bypassing this limit without permission from Mapbox is prohibited
+   * by the Mapbox Terms of Service.
+   * @param limit the new tile count limit.
+   */
   public native void setOfflineMapboxTileCountLimit(long limit);
 
   private native void initialize(FileSource fileSource);