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

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

Browse Source
This commit is contained in:
str4d
2012-07-31 12:56:23 +00:00
parent cb2dd03e77
commit 3d69d2bf63
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
View File

@@ -49,8 +49,14 @@ public class BaseBean
// Fetch theme
Properties themeProps = _context.readConfigFile(THEME_CONFIG_FILE);
_theme = themeProps.getProperty(PROP_THEME_NAME);
// Ensure that theme config line exists in config file
if (_theme == null) {
// 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_NAME, _theme);
_context.writeConfigFile(THEME_CONFIG_FILE, themeProps);
@@ -75,4 +81,26 @@ public class BaseBean
url += _theme + "/";
return url;
}
/**
* Get all themes
* @return String[] -- Array of all the themes found.
* @since 0.9.2
*/
public String[] getThemes() {
String[] themes = null;
// "docs/themes/susidns/"
File dir = new File(_context.getBaseDir(), "docs/themes/susidns");
FileFilter fileFilter = new FileFilter() { public boolean accept(File file) { return file.isDirectory(); } };
// Walk the themes dir, collecting the theme names, and append them to the map
File[] dirnames = dir.listFiles(fileFilter);
if (dirnames != null) {
themes = new String[dirnames.length];
for(int i = 0; i < dirnames.length; i++) {
themes[i] = dirnames[i].getName();
}
}
// return the map.
return themes;
}
}