Bump Smack to 4.2.0

Flowdalic · Mar 27, 2017 · 8096ef2 · 8096ef2
1 parent 986cdb2
commit 8096ef2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/aSmack/build.gradle b/aSmack/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 ext {
-    smackVersion = "4.2.0-rc2"
+    smackVersion = "4.2.0"
 }
 
 android {

diff --git a/app/src/main/java/com/clayster/xmppiotdemo/XmppIotThing.java b/app/src/main/java/com/clayster/xmppiotdemo/XmppIotThing.java
@@ -39,7 +39,6 @@
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.PresenceTypeFilter;
 import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.roster.Roster;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smackx.iot.Thing;
@@ -51,12 +50,6 @@
 import org.jivesoftware.smackx.iot.data.ThingMomentaryReadOutRequest;
 import org.jivesoftware.smackx.iot.data.ThingMomentaryReadOutResult;
 import org.jivesoftware.smackx.iot.data.element.IoTDataField;
-import org.jivesoftware.smackx.iot.data.element.IoTDataReadOutAccepted;
-import org.jivesoftware.smackx.iot.data.element.IoTDataRequest;
-import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension;
-import org.jivesoftware.smackx.iot.data.provider.IoTDataRequestProvider;
-import org.jivesoftware.smackx.iot.data.provider.IoTDataReadOutAcceptedProvider;
-import org.jivesoftware.smackx.iot.data.provider.IoTFieldsExtensionProvider;
 import org.jivesoftware.smackx.iot.discovery.IoTClaimedException;
 import org.jivesoftware.smackx.iot.discovery.IoTDiscoveryManager;
 import org.jivesoftware.smackx.iot.discovery.ThingState;
@@ -81,13 +74,6 @@ public class XmppIotThing implements ThingMomentaryReadOutRequest, ThingControlR
 
 	private static final Logger LOGGER = Logger.getLogger(XmppIotThing.class.getName());
 
-	static {
-		// Workaround for provider enties in Smack <= 4.2.0-rc2. Remove when Smack >= 4.2.0-rc3 is used.
-		ProviderManager.addIQProvider(IoTDataRequest.ELEMENT, IoTDataRequest.NAMESPACE, new IoTDataRequestProvider());
-		ProviderManager.addIQProvider(IoTDataReadOutAccepted.ELEMENT, IoTDataReadOutAccepted.NAMESPACE, new IoTDataReadOutAcceptedProvider());
-		ProviderManager.addExtensionProvider(IoTFieldsExtension.ELEMENT, IoTFieldsExtension.NAMESPACE, new IoTFieldsExtensionProvider());
-	}
-
 	private static XmppIotThing INSTANCE;
 
 	public static synchronized XmppIotThing getInstance(Context context) {

diff --git a/app/src/main/java/com/clayster/xmppiotdemo/XmppManager.java b/app/src/main/java/com/clayster/xmppiotdemo/XmppManager.java
@@ -30,6 +30,7 @@
 import org.asmack.core.ManagedXmppConnection;
 import org.asmack.core.XmppConnectionState;
 import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.XMPPConnection;
@@ -60,6 +61,10 @@ public class XmppManager {
 
 	private static final Logger LOGGER = Logger.getLogger(XmppManager.class.getName());
 
+	static {
+		SmackConfiguration.addDisabledSmackClass("org.jivesoftware.smackx.httpupload");
+	}
+
 	private static XmppManager INSTANCE;
 
 	public static synchronized XmppManager getInstance(Context context) {