echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the theme set for snark doesn't exist, use the default instead

Browse Source
This commit is contained in:
str4d
2012-07-23 10:39:11 +00:00
parent a7c8a7201a
commit 945a0f30aa
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -289,14 +289,7 @@ public class SnarkManager implements Snark.CompleteListener {
if (!_config.containsKey(PROP_STARTUP_DELAY)) if (!_config.containsKey(PROP_STARTUP_DELAY))
_config.setProperty(PROP_STARTUP_DELAY, Integer.toString(DEFAULT_STARTUP_DELAY)); _config.setProperty(PROP_STARTUP_DELAY, Integer.toString(DEFAULT_STARTUP_DELAY));
// Fetch theme // Fetch theme
Properties themeProps = _context.readConfigFile(THEME_CONFIG_FILE); _theme = getTheme();
_theme = themeProps.getProperty(PROP_THEME);
// Ensure that theme config line exists in config file
if (_theme == null) {
_theme = DEFAULT_THEME;
themeProps.put(PROP_THEME, _theme);
_context.writeConfigFile(THEME_CONFIG_FILE, themeProps);
}
updateConfig(); updateConfig();
} }
/** /**
@ -305,7 +298,20 @@ public class SnarkManager implements Snark.CompleteListener {
* @return String -- the current theme * @return String -- the current theme
*/ */
public String getTheme() { public String getTheme() {
_theme = _context.readConfigFile(THEME_CONFIG_FILE).getProperty(PROP_THEME, DEFAULT_THEME); Properties themeProps = _context.readConfigFile(THEME_CONFIG_FILE);
_theme = themeProps.getProperty(PROP_THEME);
// Ensure that theme config line exists in config file, and theme exists
String[] themes = getThemes();
boolean themeExists = false;
for (int i = 0; i < themes.length; i++) {
if (themes[i].equals(_theme))
themeExists = true;
}
if (_theme == null || !themeExists) {
_theme = DEFAULT_THEME;
themeProps.put(PROP_THEME, _theme);
_context.writeConfigFile(THEME_CONFIG_FILE, themeProps);
}
return _theme; return _theme;
} }