Simplifying introduction of new XEP implementations, implements FS#250 and FS#251 (Privacy and Security settings), refactoring of location of some interfaces

1 files changed, 16 insertions, 5 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/iqversion/IqVersionPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/iqversion/IqVersionPacketGenerator.java
index 97a7e90d..c4961c1d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/iqversion/IqVersionPacketGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/iqversion/IqVersionPacketGenerator.java
@@ -1,6 +1,12 @@
 package de.thedevstack.conversationsplus.xmpp.iqversion;
 
+import android.os.Build;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacketGenerator;
 
 /**
  * Generates the IQ Packets for Software Version
@@ -26,12 +32,17 @@ public final class IqVersionPacketGenerator {
      * @param packet the packet to respond to
      * @return
      */
-    public static IqVersionPacket generateResponse(IqPacket packet) {
-        IqVersionPacket iqVersionPacket = new IqVersionPacket();
-        iqVersionPacket.setTo(packet.getFrom());
-        iqVersionPacket.setId(packet.getId());
+    public static IqPacket generateResponse(IqPacket packet) {
+        IqPacket responsePacket = IqPacketGenerator.generateIqResultResponse(packet);
+
+        Element query = responsePacket.addChild(IqVersion.ELEMENT, IqVersion.NAMESPACE);
+        query.addChild("name").setContent(ConversationsPlusApplication.getName());
+        query.addChild("version").setContent(ConversationsPlusApplication.getVersion());
+        if (ConversationsPlusPreferences.sendOsInformation()) {
+            query.addChild("os").setContent("Android " + Build.VERSION.RELEASE);
+        }
 
-        return iqVersionPacket;
+        return responsePacket;
     }
 
     private IqVersionPacketGenerator() {}