Mapsforge themes compatibility improvements #100, fix #392

vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  * Copyright 2017 Longri
  *
  * This program is free software: you can redistribute it and/or modify it under the
@@ -27,7 +27,6 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.File;
-import java.io.FileInputStream;
 
 import javax.xml.parsers.SAXParserFactory;
 
@@ -43,7 +42,7 @@ public final class ValidRenderTheme implements ValidFileFilter {
         try {
             ThemeFile theme = new ExternalRenderTheme(file.getAbsolutePath());
             DefaultHandler renderThemeHandler;
-            if (ThemeUtils.isMapsforgeTheme(new FileInputStream(file)))
+            if (ThemeUtils.isMapsforgeTheme(theme))
                 renderThemeHandler = new XmlMapsforgeThemeBuilder(theme);
             else
                 renderThemeHandler = new XmlThemeBuilder(theme);

vtm-android-example/src/org/oscim/android/test/MapsforgeStyleActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  *
  * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -58,7 +58,7 @@ public class MapsforgeStyleActivity extends MapsforgeMapActivity {
 
     @Override
     protected void loadTheme(final String styleId) {
-        mMap.setTheme(new AssetsRenderTheme(this, "", "vtm/stylemenu.xml", new XmlRenderThemeMenuCallback() {
+        mMap.setTheme(new AssetsRenderTheme(getAssets(), "", "vtm/stylemenu.xml", new XmlRenderThemeMenuCallback() {
             @Override
             public Set<String> getCategories(XmlRenderThemeStyleMenu renderThemeStyleMenu) {
                 // Use the selected style or the default