diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/generator')
3 files changed, 21 insertions, 21 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; } diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java index cc641a3b8..0a113b420 100644 --- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java @@ -20,8 +20,8 @@ import de.pixart.messenger.services.XmppConnectionService; import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.xml.Element; import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.jid.Jid; import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import rocks.xmpp.addr.Jid; public class MessageGenerator extends AbstractGenerator { public static final String OTR_FALLBACK_MESSAGE = "I would like to start a private (OTR encrypted) conversation but your client doesn’t seem to support that"; @@ -51,7 +51,7 @@ public class MessageGenerator extends AbstractGenerator { packet.addChild("request", "urn:xmpp:receipts"); } } else { - packet.setTo(message.getCounterpart().toBareJid()); + packet.setTo(message.getCounterpart().asBareJid()); packet.setType(MessagePacket.TYPE_GROUPCHAT); } if (conversation.isSingleOrPrivateAndNonAnonymous() && message.getType() != Message.TYPE_PRIVATE) { @@ -171,7 +171,7 @@ public class MessageGenerator extends AbstractGenerator { final Account account = conversation.getAccount(); MessagePacket packet = new MessagePacket(); packet.setType(conversation.getMode() == Conversation.MODE_MULTI ? MessagePacket.TYPE_GROUPCHAT : MessagePacket.TYPE_CHAT); - packet.setTo(conversation.getJid().toBareJid()); + packet.setTo(conversation.getJid().asBareJid()); packet.setFrom(account.getJid()); packet.addChild(ChatState.toElement(conversation.getOutgoingChatState())); packet.addChild("no-store", "urn:xmpp:hints"); @@ -182,12 +182,12 @@ public class MessageGenerator extends AbstractGenerator { public MessagePacket confirm(final Account account, final Jid to, final String id, final Jid counterpart, final boolean groupChat) { MessagePacket packet = new MessagePacket(); packet.setType(groupChat ? MessagePacket.TYPE_GROUPCHAT : MessagePacket.TYPE_CHAT); - packet.setTo(groupChat ? to.toBareJid() : to); + packet.setTo(groupChat ? to.asBareJid() : to); packet.setFrom(account.getJid()); Element displayed = packet.addChild("displayed", "urn:xmpp:chat-markers:0"); displayed.setAttribute("id", id); if (groupChat && counterpart != null) { - displayed.setAttribute("sender", counterpart.toPreppedString()); + displayed.setAttribute("sender", counterpart.toString()); } packet.addChild("store", "urn:xmpp:hints"); return packet; @@ -196,11 +196,11 @@ public class MessageGenerator extends AbstractGenerator { public MessagePacket conferenceSubject(Conversation conversation, String subject) { MessagePacket packet = new MessagePacket(); packet.setType(MessagePacket.TYPE_GROUPCHAT); - packet.setTo(conversation.getJid().toBareJid()); + packet.setTo(conversation.getJid().asBareJid()); Element subjectChild = new Element("subject"); subjectChild.setContent(subject); packet.addChild(subjectChild); - packet.setFrom(conversation.getAccount().getJid().toBareJid()); + packet.setFrom(conversation.getAccount().getJid().asBareJid()); return packet; } @@ -210,7 +210,7 @@ public class MessageGenerator extends AbstractGenerator { packet.setTo(contact); packet.setFrom(conversation.getAccount().getJid()); Element x = packet.addChild("x", "jabber:x:conference"); - x.setAttribute("jid", conversation.getJid().toBareJid().toString()); + x.setAttribute("jid", conversation.getJid().asBareJid().toString()); String password = conversation.getMucOptions().getPassword(); if (password != null) { x.setAttribute("password", password); @@ -220,12 +220,12 @@ public class MessageGenerator extends AbstractGenerator { public MessagePacket invite(Conversation conversation, Jid contact) { MessagePacket packet = new MessagePacket(); - packet.setTo(conversation.getJid().toBareJid()); + packet.setTo(conversation.getJid().asBareJid()); packet.setFrom(conversation.getAccount().getJid()); Element x = new Element("x"); x.setAttribute("xmlns", "http://jabber.org/protocol/muc#user"); Element invite = new Element("invite"); - invite.setAttribute("to", contact.toBareJid().toString()); + invite.setAttribute("to", contact.asBareJid().toString()); x.addChild(invite); packet.addChild(x); return packet; diff --git a/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java b/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java index 9bbf2191d..b66f6b184 100644 --- a/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java @@ -18,7 +18,7 @@ public class PresenceGenerator extends AbstractGenerator { PresencePacket packet = new PresencePacket(); packet.setAttribute("type", type); packet.setTo(contact.getJid()); - packet.setFrom(contact.getAccount().getJid().toBareJid()); + packet.setFrom(contact.getAccount().getJid().asBareJid()); return packet; } |