2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
index 96a40d5d0..5e240b18d 100644
--- a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
+++ b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
@@ -14,7 +14,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.generator.AbstractGenerator;
-import de.pixart.messenger.utils.Xmlns;
+import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
 import de.pixart.messenger.xmpp.OnIqPacketReceived;
@@ -155,7 +155,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
             this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
                 @Override
                 public void onIqPacketReceived(Account account, IqPacket packet) {
-                    Element fin = packet.findChild("fin", Xmlns.MAM);
+                    Element fin = packet.findChild("fin", Namespace.MAM);
                     if (packet.getType() == IqPacket.TYPE.TIMEOUT) {
                         synchronized (MessageArchiveService.this.queries) {
                             MessageArchiveService.this.queries.remove(query);
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 931ccf06e..b2b3e5d68 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -119,7 +119,7 @@ import de.pixart.messenger.utils.PRNGFixes;
 import de.pixart.messenger.utils.PhoneHelper;
 import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor;
 import de.pixart.messenger.utils.SerialSingleThreadExecutor;
-import de.pixart.messenger.utils.Xmlns;
+import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.OnBindListener;
@@ -135,7 +135,6 @@ import de.pixart.messenger.xmpp.Patches;
 import de.pixart.messenger.xmpp.XmppConnection;
 import de.pixart.messenger.xmpp.chatstate.ChatState;
 import de.pixart.messenger.xmpp.forms.Data;
-import de.pixart.messenger.xmpp.forms.Field;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.jingle.JingleConnectionManager;
@@ -1461,7 +1460,7 @@ public class XmppConnectionService extends Service {
         } else {
             Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
         }
-        iqPacket.query(Xmlns.ROSTER).setAttribute("ver", account.getRosterVersion());
+        iqPacket.query(Namespace.ROSTER).setAttribute("ver", account.getRosterVersion());
         sendIqPacket(account, iqPacket, mIqParser);
     }
 
@@ -2864,7 +2863,7 @@ public class XmppConnectionService extends Service {
                     .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
                     && contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
             final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
-            iq.query(Xmlns.ROSTER).addChild(contact.asElement());
+            iq.query(Namespace.ROSTER).addChild(contact.asElement());
             account.getXmppConnection().sendIqPacket(iq, mDefaultIqHandler);
             if (sendUpdates) {
                 sendPresencePacket(account,
@@ -3153,7 +3152,7 @@ public class XmppConnectionService extends Service {
         Account account = contact.getAccount();
         if (account.getStatus() == Account.State.ONLINE) {
             IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
-            Element item = iq.query(Xmlns.ROSTER).addChild("item");
+            Element item = iq.query(Namespace.ROSTER).addChild("item");
             item.setAttribute("jid", contact.getJid().toString());
             item.setAttribute("subscription", "remove");
             account.getXmppConnection().sendIqPacket(iq, mDefaultIqHandler);
@@ -3822,11 +3821,11 @@ public class XmppConnectionService extends Service {
     public void fetchMamPreferences(Account account, final OnMamPreferencesFetched callback) {
         final boolean legacy = account.getXmppConnection().getFeatures().mamLegacy();
         IqPacket request = new IqPacket(IqPacket.TYPE.GET);
-        request.addChild("prefs",legacy ? Xmlns.MAM_LEGACY : Xmlns.MAM);
+        request.addChild("prefs",legacy ? Namespace.MAM_LEGACY : Namespace.MAM);
         sendIqPacket(account, request, new OnIqPacketReceived() {
             @Override
             public void onIqPacketReceived(Account account, IqPacket packet) {
-                Element prefs = packet.findChild("prefs",legacy ? Xmlns.MAM_LEGACY : Xmlns.MAM);
+                Element prefs = packet.findChild("prefs",legacy ? Namespace.MAM_LEGACY : Namespace.MAM);
                 if (packet.getType() == IqPacket.TYPE.RESULT && prefs != null) {
                     callback.onPreferencesFetched(prefs);
                 } else {