mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-09-27 18:19:33 +02:00
6980c8e63d
this is the first stop towards fixing "SMACK-65: parsing should look for depth", by providing the initial parsing depth to the provider. Some methods (.e.g parseMessage) now use the depth as abort condition, instead of a unclean String equals check. parseIQ() and parseExtension() where both renamed to parse. This also restricts the Exceptions thrown by the parse method, to just XmlPullParserException, IOException and SmackException (not really a big victory, but nevertheless a slight improvement). StreamFeatureProvider is now gone, we simply use PacketExtensionProvider for stream features.
63 lines
2.1 KiB
Java
63 lines
2.1 KiB
Java
/**
|
|
*
|
|
* Copyright 2014 Georg Lukas.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package org.jivesoftware.smackx.iqversion.provider;
|
|
|
|
import java.io.IOException;
|
|
|
|
import org.jivesoftware.smack.packet.IQ;
|
|
import org.jivesoftware.smack.provider.IQProvider;
|
|
import org.jivesoftware.smackx.iqversion.packet.Version;
|
|
import org.xmlpull.v1.XmlPullParser;
|
|
import org.xmlpull.v1.XmlPullParserException;
|
|
|
|
public class VersionProvider extends IQProvider<Version> {
|
|
|
|
@Override
|
|
public Version parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
|
|
String name = null, version = null, os = null;
|
|
|
|
outerloop: while (true) {
|
|
int eventType = parser.next();
|
|
switch (eventType) {
|
|
case XmlPullParser.START_TAG:
|
|
String tagName = parser.getName();
|
|
switch (tagName) {
|
|
case "name":
|
|
name = parser.nextText();
|
|
break;
|
|
case "version":
|
|
version = parser.nextText();
|
|
break;
|
|
case "os":
|
|
os = parser.nextText();
|
|
break;
|
|
}
|
|
break;
|
|
case XmlPullParser.END_TAG:
|
|
if (parser.getDepth() == initialDepth && parser.getName().equals(IQ.QUERY_ELEMENT)) {
|
|
break outerloop;
|
|
}
|
|
}
|
|
}
|
|
if (name == null && version == null && os == null) {
|
|
return new Version();
|
|
}
|
|
return new Version(name, version, os);
|
|
}
|
|
}
|