aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/src/cgeo/geocaching/Settings.java35
-rw-r--r--main/src/cgeo/geocaching/SettingsActivity.java6
-rw-r--r--main/src/cgeo/geocaching/files/FileList.java10
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java11
-rw-r--r--main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java2
5 files changed, 29 insertions, 35 deletions
diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 2afd32b..dc7bd99 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -101,8 +101,8 @@ public final class Settings {
private static final String KEY_LAST_TRACKABLE_ACTION = "trackableaction";
private static final String KEY_SHARE_AFTER_EXPORT = "shareafterexport";
private static final String KEY_GPX_EXPORT_DIR = "gpxExportDir";
- private static final String KEY_RENDER_THEME_PATH = "renderthemepath";
- private static final String KEY_RENDER_THEME_FILE = "renderthemefile";
+ private static final String KEY_RENDER_THEME_BASE_FOLDER = "renderthemepath";
+ private static final String KEY_RENDER_THEME_FILE_PATH = "renderthemefile";
private static final String KEY_GPX_IMPORT_DIR = "gpxImportDir";
private static final String KEY_PLAIN_LOGS = "plainLogs";
private static final String KEY_NATIVE_UA = "nativeUa";
@@ -1215,22 +1215,22 @@ public final class Settings {
});
}
- public static String getCustomRenderThemeBasefolder() {
- return sharedPrefs.getString(KEY_RENDER_THEME_PATH, "");
+ public static String getCustomRenderThemeBaseFolder() {
+ return sharedPrefs.getString(KEY_RENDER_THEME_BASE_FOLDER, "");
}
- public static void setCustomRenderThemeBasefolder(final String customRenderThemeBasefolder) {
+ public static void setCustomRenderThemeBaseFolder(final String customRenderThemeBaseFolder) {
editSharedSettings(new PrefRunnable() {
@Override
public void edit(Editor edit) {
- edit.putString(KEY_RENDER_THEME_PATH, customRenderThemeBasefolder);
+ edit.putString(KEY_RENDER_THEME_BASE_FOLDER, customRenderThemeBaseFolder);
}
});
}
- public static String getCustomRenderThemeFile() {
- return sharedPrefs.getString(KEY_RENDER_THEME_FILE, "");
+ public static String getCustomRenderThemeFilePath() {
+ return sharedPrefs.getString(KEY_RENDER_THEME_FILE_PATH, "");
}
public static void setCustomRenderThemeFile(final String customRenderThemeFile) {
@@ -1238,14 +1238,14 @@ public final class Settings {
@Override
public void edit(Editor edit) {
- edit.putString(KEY_RENDER_THEME_FILE, customRenderThemeFile);
+ edit.putString(KEY_RENDER_THEME_FILE_PATH, customRenderThemeFile);
}
});
}
public static File[] getMapThemeFiles() {
- File directory = new File(Settings.getCustomRenderThemeBasefolder());
+ File directory = new File(Settings.getCustomRenderThemeBaseFolder());
List<File> result = new ArrayList<File>();
@@ -1256,17 +1256,16 @@ public final class Settings {
private static class ExtensionsBasedFileSelector extends FileSelector {
- private final String[] _extensions;
- private boolean _shouldEnd = false;
+ private final String[] extensions;
public ExtensionsBasedFileSelector(String[] extensions) {
- _extensions = extensions;
+ this.extensions = extensions;
}
@Override
public boolean isSelected(File file) {
String filename = file.getName();
- for (String ext : _extensions) {
+ for (String ext : extensions) {
if (StringUtils.endsWithIgnoreCase(filename, ext)) {
return true;
}
@@ -1275,12 +1274,8 @@ public final class Settings {
}
@Override
- public synchronized boolean shouldEnd() {
- return _shouldEnd;
- }
-
- public synchronized void setShouldEnd(boolean shouldEnd) {
- _shouldEnd = shouldEnd;
+ public boolean shouldEnd() {
+ return false;
}
}
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index 8e14c47..e86ab56 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -591,7 +591,7 @@ public class SettingsActivity extends AbstractActivity {
@Override
public void onClick(View v) {
Intent dirChooser = new Intent(SettingsActivity.this, SimpleDirChooser.class);
- dirChooser.putExtra(SimpleDirChooser.START_DIR, Settings.getCustomRenderThemeBasefolder());
+ dirChooser.putExtra(SimpleDirChooser.START_DIR, Settings.getCustomRenderThemeBaseFolder());
startActivityForResult(dirChooser, SELECT_THEMEFOLDER_REQUEST);
}
});
@@ -760,7 +760,7 @@ public class SettingsActivity extends AbstractActivity {
private void initThemefolderEdittext(boolean setFocus) {
EditText themeFileEdit = (EditText) findViewById(R.id.themefolder);
- themeFileEdit.setText(Settings.getCustomRenderThemeBasefolder());
+ themeFileEdit.setText(Settings.getCustomRenderThemeBaseFolder());
if (setFocus) {
themeFileEdit.requestFocus();
}
@@ -996,7 +996,7 @@ public class SettingsActivity extends AbstractActivity {
@Override
public void run(String directory) {
- Settings.setCustomRenderThemeBasefolder(directory);
+ Settings.setCustomRenderThemeBaseFolder(directory);
}
});
}
diff --git a/main/src/cgeo/geocaching/files/FileList.java b/main/src/cgeo/geocaching/files/FileList.java
index e7bd807..1eaefbb 100644
--- a/main/src/cgeo/geocaching/files/FileList.java
+++ b/main/src/cgeo/geocaching/files/FileList.java
@@ -293,7 +293,7 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
private class FileListSelector extends FileUtils.FileSelector {
- boolean _shouldEnd = false;
+ boolean shouldEnd = false;
@Override
public boolean isSelected(File file) {
@@ -301,12 +301,12 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
}
@Override
- public boolean shouldEnd() {
- return _shouldEnd;
+ public synchronized boolean shouldEnd() {
+ return shouldEnd;
}
- public void setShouldEnd(boolean shouldEnd) {
- _shouldEnd = shouldEnd;
+ public synchronized void setShouldEnd(boolean shouldEnd) {
+ this.shouldEnd = shouldEnd;
}
}
}
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 4f003a5..6062469 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -747,19 +747,18 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
final File[] themeFiles = Settings.getMapThemeFiles();
String currentTheme = StringUtils.EMPTY;
- int currentItem = 0;
- if (StringUtils.isNotEmpty(Settings.getCustomRenderThemeFile())) {
- File currentThemeFile = new File(Settings.getCustomRenderThemeFile());
+ String currentThemePath = Settings.getCustomRenderThemeFilePath();
+ if (StringUtils.isNotEmpty(currentThemePath)) {
+ File currentThemeFile = new File(currentThemePath);
currentTheme = currentThemeFile.getName();
}
- int index = 0;
+ int currentItem = 0;
List<String> names = new ArrayList<String>();
names.add(res.getString(R.string.map_theme_builtin));
for (File file : themeFiles) {
- index++;
if (currentTheme.equalsIgnoreCase(file.getName())) {
- currentItem = index;
+ currentItem = names.size();
}
names.add(file.getName());
}
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
index 40b0f11..9e570c4 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
@@ -235,7 +235,7 @@ public class MapsforgeMapView extends MapView implements MapViewImpl {
@Override
public void setMapTheme() {
- String customRenderTheme = Settings.getCustomRenderThemeFile();
+ String customRenderTheme = Settings.getCustomRenderThemeFilePath();
if (!StringUtils.isEmpty(customRenderTheme)) {
try {
setRenderTheme(new File(customRenderTheme));
generated by cgit v1.1 at 2025-11-10 20:49:43 +0000