1 files changed, 6 insertions, 4 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 1e6f44f094..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,5 +1,6 @@
 package com.mapbox.mapboxsdk.offline;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
@@ -40,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
@@ -90,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) {
@@ -107,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();