diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java index 89713ede..01a97f2d 100644 --- a/framework/src/org/apache/cordova/ConfigXmlParser.java +++ b/framework/src/org/apache/cordova/ConfigXmlParser.java @@ -25,10 +25,10 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import android.content.Context; -import android.content.res.XmlResourceParser; public class ConfigXmlParser { private static String TAG = "ConfigXmlParser"; @@ -67,14 +67,14 @@ public class ConfigXmlParser { String service = "", pluginClass = "", paramType = ""; boolean onload = false; - public void parse(XmlResourceParser xml) { + public void parse(XmlPullParser xml) { int eventType = -1; - while (eventType != XmlResourceParser.END_DOCUMENT) { - if (eventType == XmlResourceParser.START_TAG) { + while (eventType != XmlPullParser.END_DOCUMENT) { + if (eventType == XmlPullParser.START_TAG) { handleStartTag(xml); } - else if (eventType == XmlResourceParser.END_TAG) + else if (eventType == XmlPullParser.END_TAG) { handleEndTag(xml); } @@ -88,7 +88,7 @@ public class ConfigXmlParser { } } - public void handleStartTag(XmlResourceParser xml) { + public void handleStartTag(XmlPullParser xml) { String strNode = xml.getName(); if (strNode.equals("feature")) { //Check for supported feature sets aka. plugins (Accelerometer, Geolocation, etc) @@ -118,7 +118,7 @@ public class ConfigXmlParser { } } - public void handleEndTag(XmlResourceParser xml) { + public void handleEndTag(XmlPullParser xml) { String strNode = xml.getName(); if (strNode.equals("feature")) { pluginEntries.add(new PluginEntry(service, pluginClass, onload));