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

---
 src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java    | 6 +++---
 .../java/de/pixart/messenger/ui/adapter/ConversationAdapter.java    | 2 +-
 src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java   | 2 +-
 src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/adapter')

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
index 81a3017a8..a7c20eb0e 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
@@ -43,9 +43,9 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         }
         TextView jid = view.findViewById(R.id.account_jid);
         if (Config.DOMAIN_LOCK != null) {
-            jid.setText(account.getJid().getLocalpart());
+            jid.setText(account.getJid().getLocal());
         } else {
-            jid.setText(account.getJid().toBareJid().toString());
+            jid.setText(account.getJid().asBareJid().toString());
         }
         TextView statusView = view.findViewById(R.id.account_status);
         ImageView imageView = view.findViewById(R.id.account_image);
@@ -99,7 +99,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
             } else {
-                imageView.setBackgroundColor(UIHelper.getColorForName(account.getJid().toBareJid().toString()));
+                imageView.setBackgroundColor(UIHelper.getColorForName(account.getJid().asBareJid().toString()));
                 imageView.setImageDrawable(null);
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 16ad8f6a0..ad1f9df7b 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -85,7 +85,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
         if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
             viewHolder.name.setText(EmojiWrapper.transform(conversation.getName()));
         } else {
-            viewHolder.name.setText(conversation.getJid().toBareJid().toString());
+            viewHolder.name.setText(conversation.getJid().asBareJid().toString());
         }
 
         Message message = conversation.getLatestMessage();
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index 2df1e5b0f..f25e6e51d 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -164,7 +164,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
             } else {
-                String seed = item.getJid() != null ? item.getJid().toBareJid().toString() : item.getDisplayName();
+                String seed = item.getJid() != null ? item.getJid().asBareJid().toString() : item.getDisplayName();
                 imageView.setBackgroundColor(UIHelper.getColorForName(seed));
                 imageView.setImageDrawable(null);
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 9f09531e1..d243e60bd 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -576,7 +576,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
                 } else {
                     final String to;
                     if (message.getCounterpart() != null) {
-                        to = message.getCounterpart().getResourcepart();
+                        to = message.getCounterpart().getResource();
                     } else {
                         to = "";
                     }
-- 
cgit v1.2.3