From 8096ef2b2cd58bc87b5a395dc97bf92f9c114333 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 27 Mar 2017 17:57:27 +0200
Subject: [PATCH] Bump Smack to 4.2.0

---
 .idea/gradle.xml                                   |  8 ++++----
 .idea/modules.xml                                  |  8 ++++----
 aSmack/build.gradle                                |  2 +-
 .../com/clayster/xmppiotdemo/XmppIotThing.java     | 14 --------------
 .../java/com/clayster/xmppiotdemo/XmppManager.java |  5 +++++
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 369b465..8e8aa22 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,10 +8,10 @@
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/MemorizingTrustManager" />
-            <option value="$PROJECT_DIR$/aSmack" />
-            <option value="$PROJECT_DIR$/app" />
+            <option value="/data/flo/code/android-xmpp-iot-demo" />
+            <option value="/data/flo/code/android-xmpp-iot-demo/MemorizingTrustManager" />
+            <option value="/data/flo/code/android-xmpp-iot-demo/aSmack" />
+            <option value="/data/flo/code/android-xmpp-iot-demo/app" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 548c4af..b6be8dd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/MemorizingTrustManager/MemorizingTrustManager.iml" filepath="$PROJECT_DIR$/MemorizingTrustManager/MemorizingTrustManager.iml" />
-      <module fileurl="file://$PROJECT_DIR$/aSmack/aSmack.iml" filepath="$PROJECT_DIR$/aSmack/aSmack.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-xmpp-iot-demo.iml" filepath="$PROJECT_DIR$/android-xmpp-iot-demo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file:///data/flo/code/android-xmpp-iot-demo/MemorizingTrustManager/MemorizingTrustManager.iml" filepath="/data/flo/code/android-xmpp-iot-demo/MemorizingTrustManager/MemorizingTrustManager.iml" />
+      <module fileurl="file:///data/flo/code/android-xmpp-iot-demo/aSmack/aSmack.iml" filepath="/data/flo/code/android-xmpp-iot-demo/aSmack/aSmack.iml" />
+      <module fileurl="file:///data/flo/code/android-xmpp-iot-demo/android-xmpp-iot-demo.iml" filepath="/data/flo/code/android-xmpp-iot-demo/android-xmpp-iot-demo.iml" />
+      <module fileurl="file:///data/flo/code/android-xmpp-iot-demo/app/app.iml" filepath="/data/flo/code/android-xmpp-iot-demo/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/aSmack/build.gradle b/aSmack/build.gradle
index 61d4661..8ff2889 100644
--- 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
index 0ddb5df..026de48 100644
--- 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
index b789dd3..052a01f 100644
--- 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) {