diff options
| author | rsudev <rasch@munin-soft.de> | 2012-11-06 22:18:51 +0100 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2012-11-06 22:18:51 +0100 |
| commit | 0990c4e6a9243f06691e5667b72baeb5b57cd912 (patch) | |
| tree | 9702f6b51c121777c4d1e3d4a027523380bcea86 | |
| parent | 63e157e5a653d52b98198bb672447a19102c2dca (diff) | |
| download | cgeo-0990c4e6a9243f06691e5667b72baeb5b57cd912.zip cgeo-0990c4e6a9243f06691e5667b72baeb5b57cd912.tar.gz cgeo-0990c4e6a9243f06691e5667b72baeb5b57cd912.tar.bz2 | |
Fixes #2146, Settings - themes folder: changes in textbox are not saved
This adds the saving of the them folder textbox to saveValues
| -rw-r--r-- | main/src/cgeo/geocaching/Settings.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/SettingsActivity.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java index 8ecc0e5..fdd2f22 100644 --- a/main/src/cgeo/geocaching/Settings.java +++ b/main/src/cgeo/geocaching/Settings.java @@ -1296,8 +1296,8 @@ public final class Settings { return sharedPrefs.getString(KEY_RENDER_THEME_BASE_FOLDER, ""); } - public static void setCustomRenderThemeBaseFolder(final String customRenderThemeBaseFolder) { - editSharedSettings(new PrefRunnable() { + public static boolean setCustomRenderThemeBaseFolder(final String customRenderThemeBaseFolder) { + return editSharedSettings(new PrefRunnable() { @Override public void edit(Editor edit) { diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java index 80bdf69..823b52f 100644 --- a/main/src/cgeo/geocaching/SettingsActivity.java +++ b/main/src/cgeo/geocaching/SettingsActivity.java @@ -828,6 +828,7 @@ public class SettingsActivity extends AbstractActivity { // don't trim signature, user may want to have whitespace at the beginning String signatureNew = ((EditText) findViewById(R.id.signature)).getText().toString(); String mapDirectoryNew = StringUtils.trimToEmpty(((EditText) findViewById(R.id.map_directory)).getText().toString()); + String themesDirectoryNew = StringUtils.trimToEmpty(((EditText) findViewById(R.id.themefolder)).getText().toString()); String altitudeNew = StringUtils.trimToNull(((EditText) findViewById(R.id.altitude)).getText().toString()); int altitudeNewInt = parseNumber(altitudeNew, 0); @@ -840,6 +841,7 @@ public class SettingsActivity extends AbstractActivity { final boolean status3 = Settings.setSignature(signatureNew); final boolean status4 = Settings.setAltCorrection(altitudeNewInt); final boolean status5 = Settings.setMapFileDirectory(mapDirectoryNew); + final boolean status6 = Settings.setCustomRenderThemeBaseFolder(themesDirectoryNew); Settings.setShowWaypointsThreshold(waypointThreshold); String importNew = StringUtils.trimToEmpty(((EditText) findViewById(R.id.gpx_importdir)).getText().toString()); @@ -847,7 +849,7 @@ public class SettingsActivity extends AbstractActivity { Settings.setGpxImportDir(importNew); Settings.setGpxExportDir(exportNew); - return status1 && status2 && status3 && status4 && status5; + return status1 && status2 && status3 && status4 && status5 && status6; } /** |
