xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: no NPE when theme is invalid

Browse Source
This commit is contained in:
Hannes Janetzek 2013-10-06 20:45:07 +02:00
parent 9189cbd51c
commit fc1a907af0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm/src/org/oscim/map/Map.java
View File

@ -109,7 +109,7 @@ public abstract class Map implements EventDispatcher {
IRenderTheme t = ThemeLoader.load(theme); IRenderTheme t = ThemeLoader.load(theme);
if (t == null) { if (t == null) {
Log.e(TAG, "Invalid theme"); Log.e(TAG, "Invalid theme");
throw new IllegalStateException(); return;
} }
mCurrentTheme = theme; mCurrentTheme = theme;

4
vtm/src/org/oscim/theme/ThemeLoader.java
View File

@ -53,7 +53,9 @@ public class ThemeLoader {
try { try {
inputStream = theme.getRenderThemeAsStream(); inputStream = theme.getRenderThemeAsStream();
IRenderTheme t = RenderThemeHandler.getRenderTheme(inputStream); IRenderTheme t = RenderThemeHandler.getRenderTheme(inputStream);
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
if (t != null)
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
return t; return t;
} catch (IOException e) { } catch (IOException e) {