migrate to xmpp-addr

1 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
index 234ddc3b4..a8f7d2e0c 100644
--- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
@@ -31,9 +31,9 @@ import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.forms.Data;
-import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.pep.Avatar;
 import de.pixart.messenger.xmpp.stanzas.IqPacket;
+import rocks.xmpp.addr.Jid;
 
 public class IqGenerator extends AbstractGenerator {
 
@@ -285,7 +285,7 @@ public class IqGenerator extends AbstractGenerator {
     public IqPacket generateSetBlockRequest(final Jid jid, boolean reportSpam) {
         final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
         final Element block = iq.addChild("block", Namespace.BLOCKING);
-        final Element item = block.addChild("item").setAttribute("jid", jid.toBareJid().toString());
+        final Element item = block.addChild("item").setAttribute("jid", jid.asBareJid().toString());
         if (reportSpam) {
             item.addChild("report", "urn:xmpp:reporting:0").addChild("spam");
         }
@@ -296,7 +296,7 @@ public class IqGenerator extends AbstractGenerator {
     public IqPacket generateSetUnblockRequest(final Jid jid) {
         final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
         final Element block = iq.addChild("unblock", Namespace.BLOCKING);
-        block.addChild("item").setAttribute("jid", jid.toBareJid().toString());
+        block.addChild("item").setAttribute("jid", jid.asBareJid().toString());
         return iq;
     }
 
@@ -305,7 +305,7 @@ public class IqGenerator extends AbstractGenerator {
         packet.setTo(account.getServer());
         final Element query = packet.addChild("query", Namespace.REGISTER);
         final Jid jid = account.getJid();
-        query.addChild("username").setContent(jid.getLocalpart());
+        query.addChild("username").setContent(jid.getLocal());
         query.addChild("password").setContent(newPassword);
         return packet;
     }
@@ -318,7 +318,7 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket changeAffiliation(Conversation conference, List<Jid> jids, String affiliation) {
         IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
-        packet.setTo(conference.getJid().toBareJid());
+        packet.setTo(conference.getJid().asBareJid());
         packet.setFrom(conference.getAccount().getJid());
         Element query = packet.query("http://jabber.org/protocol/muc#admin");
         for (Jid jid : jids) {
@@ -331,7 +331,7 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket changeRole(Conversation conference, String nick, String role) {
         IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
-        packet.setTo(conference.getJid().toBareJid());
+        packet.setTo(conference.getJid().asBareJid());
         packet.setFrom(conference.getAccount().getJid());
         Element item = packet.query("http://jabber.org/protocol/muc#admin").addChild("item");
         item.setAttribute("nick", nick);
@@ -341,11 +341,11 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket destroyConference(Conversation conference) {
         IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
-        packet.setTo(conference.getJid().toBareJid());
+        packet.setTo(conference.getJid().asBareJid());
         packet.setFrom(conference.getAccount().getJid());
         final Element query = packet.addChild("query", "http://jabber.org/protocol/muc#owner");
         final Element destroy = query.addChild("destroy");
-        destroy.setAttribute("jid", conference.getJid().toBareJid().toString());
+        destroy.setAttribute("jid", conference.getJid().asBareJid().toString());
         Log.d(Config.LOGTAG, "Destroy: " + packet.toString());
         return packet;
     }
@@ -379,7 +379,7 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket generateCreateAccountWithCaptcha(Account account, String id, Data data) {
         final IqPacket register = new IqPacket(IqPacket.TYPE.SET);
-        register.setFrom(account.getJid().toBareJid());
+        register.setFrom(account.getJid().asBareJid());
         register.setTo(account.getServer());
         register.setId(id);
         Element query = register.query("jabber:iq:register");
@@ -418,7 +418,7 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket queryAffiliation(Conversation conversation, String affiliation) {
         IqPacket packet = new IqPacket(IqPacket.TYPE.GET);
-        packet.setTo(conversation.getJid().toBareJid());
+        packet.setTo(conversation.getJid().asBareJid());
         packet.query("http://jabber.org/protocol/muc#admin").addChild("item").setAttribute("affiliation", affiliation);
         return packet;
     }