From f946b6333d36846d763a37f269a9cb138e3e4b60 Mon Sep 17 00:00:00 2001 From: adam3497 Date: Wed, 10 Apr 2019 14:57:32 -0600 Subject: [PATCH 1/2] Fix issue 183 --- .../main/java/net/osmtracker/activity/ButtonsPresets.java | 3 +-- app/src/main/java/net/osmtracker/activity/TrackLogger.java | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/net/osmtracker/activity/ButtonsPresets.java b/app/src/main/java/net/osmtracker/activity/ButtonsPresets.java index 1c7202f3c..686cbc34c 100644 --- a/app/src/main/java/net/osmtracker/activity/ButtonsPresets.java +++ b/app/src/main/java/net/osmtracker/activity/ButtonsPresets.java @@ -104,8 +104,7 @@ private void initializeAttributes(){ listener = new CheckBoxChangedListener(); prefs = PreferenceManager.getDefaultSharedPreferences(this); layoutsFileNames = new Hashtable(); - storageDir = File.separator + prefs.getString(OSMTracker.Preferences.KEY_STORAGE_DIR, - OSMTracker.Preferences.VAL_STORAGE_DIR); + storageDir = File.separator + OSMTracker.Preferences.VAL_STORAGE_DIR; } private void listLayouts(LinearLayout rootLayout){ diff --git a/app/src/main/java/net/osmtracker/activity/TrackLogger.java b/app/src/main/java/net/osmtracker/activity/TrackLogger.java index b96daf052..492d5e642 100644 --- a/app/src/main/java/net/osmtracker/activity/TrackLogger.java +++ b/app/src/main/java/net/osmtracker/activity/TrackLogger.java @@ -279,8 +279,7 @@ protected void onResume() { // Try to inflate the buttons layout try { - String userLayout = prefs.getString( - OSMTracker.Preferences.KEY_UI_BUTTONS_LAYOUT, OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT); + String userLayout = prefs.getString(OSMTracker.Preferences.KEY_UI_BUTTONS_LAYOUT, OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT); if (OSMTracker.Preferences.VAL_UI_BUTTONS_LAYOUT.equals(userLayout)) { // Using default buttons layout mainLayout = new UserDefinedLayout(this, currentTrackId, null); @@ -288,9 +287,7 @@ protected void onResume() { // Using user buttons layout File layoutFile = new File( Environment.getExternalStorageDirectory(), - prefs.getString( - OSMTracker.Preferences.KEY_STORAGE_DIR, - OSMTracker.Preferences.VAL_STORAGE_DIR) + OSMTracker.Preferences.VAL_STORAGE_DIR + File.separator + Preferences.LAYOUTS_SUBDIR + File.separator + userLayout); mainLayout = new UserDefinedLayout(this, currentTrackId, layoutFile); From 61e7f13c25766fb3e7ecb90d6469837a5ddeceb0 Mon Sep 17 00:00:00 2001 From: adam3497 Date: Fri, 10 May 2019 16:00:43 -0600 Subject: [PATCH 2/2] Fix the problem when download a new layout after the export gpx directory changed --- .../java/net/osmtracker/layout/DownloadCustomLayoutTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/net/osmtracker/layout/DownloadCustomLayoutTask.java b/app/src/main/java/net/osmtracker/layout/DownloadCustomLayoutTask.java index 708a2b048..559d181e6 100644 --- a/app/src/main/java/net/osmtracker/layout/DownloadCustomLayoutTask.java +++ b/app/src/main/java/net/osmtracker/layout/DownloadCustomLayoutTask.java @@ -44,7 +44,7 @@ protected Boolean doInBackground(String[] layoutData) { String layoutFolderName = layoutName.replace(" ", "_"); String iso = layoutData[1]; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - String storageDir =prefs.getString(OSMTracker.Preferences.KEY_STORAGE_DIR, OSMTracker.Preferences.VAL_STORAGE_DIR); + String storageDir = File.separator + OSMTracker.Preferences.VAL_STORAGE_DIR; String layoutURL = URLCreator.createLayoutFileURL(context, layoutFolderName, iso); String layoutPath = Environment.getExternalStorageDirectory() + storageDir + File.separator +