From 621217973065960e3347262f507d7c3b39326464 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 2 Apr 2018 22:53:01 +0200
Subject: migrate to xmpp-addr

---
 .../de/pixart/messenger/parser/PresenceParser.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/parser/PresenceParser.java')

diff --git a/src/main/java/de/pixart/messenger/parser/PresenceParser.java b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
index abe5a2271..8ce9dfbf7 100644
--- a/src/main/java/de/pixart/messenger/parser/PresenceParser.java
+++ b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
@@ -20,9 +20,9 @@ import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.OnPresencePacketReceived;
-import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.pep.Avatar;
 import de.pixart.messenger.xmpp.stanzas.PresencePacket;
+import rocks.xmpp.addr.Jid;
 
 public class PresenceParser extends AbstractParser implements
         OnPresencePacketReceived {
@@ -32,7 +32,7 @@ public class PresenceParser extends AbstractParser implements
     }
 
     public void parseConferencePresence(PresencePacket packet, Account account) {
-        final Conversation conversation = packet.getFrom() == null ? null : mXmppConnectionService.find(account, packet.getFrom().toBareJid());
+        final Conversation conversation = packet.getFrom() == null ? null : mXmppConnectionService.find(account, packet.getFrom().asBareJid());
         if (conversation != null) {
             final MucOptions mucOptions = conversation.getMucOptions();
             boolean before = mucOptions.online();
@@ -85,9 +85,9 @@ public class PresenceParser extends AbstractParser implements
                             axolotlService.fetchDeviceIds(user.getRealJid());
                         }
                         if (codes.contains(MucOptions.STATUS_CODE_ROOM_CREATED) && mucOptions.autoPushConfiguration()) {
-                            Log.d(Config.LOGTAG, mucOptions.getAccount().getJid().toBareJid()
+                            Log.d(Config.LOGTAG, mucOptions.getAccount().getJid().asBareJid()
                                     + ": room '"
-                                    + mucOptions.getConversation().getJid().toBareJid()
+                                    + mucOptions.getConversation().getJid().asBareJid()
                                     + "' created. pushing default configuration");
                             mXmppConnectionService.pushConferenceConfiguration(mucOptions.getConversation(),
                                     IqGenerator.defaultRoomConfiguration(),
@@ -213,15 +213,15 @@ public class PresenceParser extends AbstractParser implements
         final String type = packet.getAttribute("type");
         final Contact contact = account.getRoster().getContact(from);
         if (type == null) {
-            final String resource = from.isBareJid() ? "" : from.getResourcepart();
+            final String resource = from.isBareJid() ? "" : from.getResource();
             if (contact.setPresenceName(packet.findChildContent("nick", Namespace.NICK))) {
                 mXmppConnectionService.getAvatarService().clear(contact);
             }
             Avatar avatar = Avatar.parsePresence(packet.findChild("x", "vcard-temp:x:update"));
             if (avatar != null && (!contact.isSelf() || account.getAvatar() == null)) {
-                avatar.owner = from.toBareJid();
+                avatar.owner = from.asBareJid();
                 if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
-                    if (avatar.owner.equals(account.getJid().toBareJid())) {
+                    if (avatar.owner.equals(account.getJid().asBareJid())) {
                         account.setAvatar(avatar.getFilename());
                         mXmppConnectionService.databaseBackend.updateAccount(account);
                         mXmppConnectionService.getAvatarService().clear(account);
@@ -280,7 +280,7 @@ public class PresenceParser extends AbstractParser implements
             if (from.isBareJid()) {
                 contact.clearPresences();
             } else {
-                contact.removePresence(from.getResourcepart());
+                contact.removePresence(from.getResource());
             }
             mXmppConnectionService.onContactStatusChanged.onContactStatusChanged(contact, false);
         } else if (type.equals("subscribe")) {
@@ -290,7 +290,7 @@ public class PresenceParser extends AbstractParser implements
             } else {
                 contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
                 final Conversation conversation = mXmppConnectionService.findOrCreateConversation(
-                        account, contact.getJid().toBareJid(), false, false);
+                        account, contact.getJid().asBareJid(), false, false);
                 final String statusMessage = packet.findChildContent("status");
                 if (statusMessage != null
                         && !statusMessage.isEmpty()
-- 
cgit v1.2.3