diff options
Diffstat (limited to 'navit/android/src/org/navitproject/navit/Navit.java')
| -rw-r--r-- | navit/android/src/org/navitproject/navit/Navit.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index bacc15213..011acd9fe 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -248,10 +248,15 @@ public class Navit extends Activity { private void verifyPermissions() { if (ContextCompat.checkSelfPermission(this, - Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else if (ContextCompat.checkSelfPermission(this, + Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else { Log.d(TAG,"ask for permission(s)"); ActivityCompat.requestPermissions(this, new String[] { - Manifest.permission.ACCESS_FINE_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); + Manifest.permission.ACCESS_BACKGROUND_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); } } @@ -728,7 +733,7 @@ public class Navit extends Activity { if (resultCode == RESULT_OK) { String newDir = data.getStringExtra(FileBrowserActivity.returnDirectoryParameter); Log.d(TAG, "selected path= " + newDir); - if (!newDir.contains("/navit")) { + if (!(newDir.contains("/navit") || newDir.contains("/org.navitproject.navit"))) { newDir = newDir + "/navit/"; } else { newDir = newDir + "/"; @@ -774,7 +779,8 @@ public class Navit extends Activity { private void setMapLocation() { Intent fileExploreIntent = new Intent(this,FileBrowserActivity.class); fileExploreIntent - .putExtra(FileBrowserActivity.startDirectoryParameter, "/mnt") + .putExtra(FileBrowserActivity.startDirectoryParameter, + getApplicationContext().getExternalFilesDir(null).toString()) .setAction(FileBrowserActivity.INTENT_ACTION_SELECT_DIR); startActivityForResult(fileExploreIntent,NavitSelectStorage_id); } |