1 files changed, 12 insertions, 3 deletions
diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java
index 2327612928..468aa9f765 100644
--- a/android/src/com/mapswithme/maps/location/TrackRecorder.java
+++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java
@@ -8,11 +8,15 @@ import android.content.Intent;
 import android.location.Location;
 import android.os.Environment;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Log;
 
 import com.mapswithme.maps.BuildConfig;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.background.AppBackgroundTracker;
 import com.mapswithme.util.Constants;
+import com.mapswithme.util.StorageUtils;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.FileLogger;
 import com.mapswithme.util.log.Logger;
@@ -38,6 +42,7 @@ public final class TrackRecorder
   };
 
   private static Boolean sEnableLogging;
+  @Nullable
   private static Logger sLogger;
 
   private static final LocationListener sLocationListener = new LocationListener.Simple()
@@ -205,7 +210,6 @@ public final class TrackRecorder
     });
   }
 
-  @SuppressLint("SdCardPath")
   static void log(String message)
   {
     if (sEnableLogging == null)
@@ -217,10 +221,15 @@ public final class TrackRecorder
     synchronized (TrackRecorder.class)
     {
       if (sLogger == null)
-        sLogger = new FileLogger(Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.MWM_DIR_POSTFIX + "/gps-tracker.log");
+      {
+        String externalDir = StorageUtils.getExternalFilesDir();
+        if (!TextUtils.isEmpty(externalDir))
+          sLogger = new FileLogger(externalDir + "/gps-tracker.log");
+      }
+    }
 
+    if (sLogger != null)
       sLogger.d(message);
-    }
   }
 
   private static native void nativeSetEnabled(boolean enable);