From b8b171a4f575f0290f404504f2cc10a0388e3d17 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 30 Sep 2019 02:34:47 +0200
Subject: [PATCH] Rename chatPojos peerName field to contactName

---
 .../messenger/ui/chatlist/ChatListRecyclerViewAdapter.java    | 4 ++--
 .../mercury_im/messenger/core/stores/PlainMessageStore.java   | 2 +-
 .../mercury_im/messenger/persistence/room/dao/ChatDao.java    | 2 +-
 .../java/org/mercury_im/messenger/persistence/pojo/Chat.java  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java
index 8f47514..16e1407 100644
--- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java
+++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java
@@ -38,8 +38,8 @@ public class ChatListRecyclerViewAdapter
     @Override
     public void onBindViewHolder(@NonNull ChatHolder holder, int position) {
         Chat model = getModelAt(position);
-        holder.nameView.setText(model.peerName != null ?
-                model.peerName : model.jid.toString());
+        holder.nameView.setText(model.contactName != null ?
+                model.contactName : model.jid.toString());
         holder.avatarView.setColorFilter(ColorUtil.consistentColor(model.jid.toString()));
 
         holder.itemView.setOnClickListener(view -> {
diff --git a/core/src/main/java/org/mercury_im/messenger/core/stores/PlainMessageStore.java b/core/src/main/java/org/mercury_im/messenger/core/stores/PlainMessageStore.java
index 93bdb86..b3bc5e8 100644
--- a/core/src/main/java/org/mercury_im/messenger/core/stores/PlainMessageStore.java
+++ b/core/src/main/java/org/mercury_im/messenger/core/stores/PlainMessageStore.java
@@ -45,7 +45,7 @@ public class PlainMessageStore {
         org.mercury_im.messenger.persistence.pojo.Chat chatPojo = new org.mercury_im.messenger.persistence.pojo.Chat();
         chatPojo.jid = from;
         chatPojo.accountId = accountId;
-        chatPojo.peerName = null;
+        chatPojo.contactName = null;
         notificationManager.chatMessageReceived(chatPojo, null, message.getBody());
 
         MessageModel messageModel = messageRepository.newMessageModel();
diff --git a/persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/dao/ChatDao.java b/persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/dao/ChatDao.java
index f074dc0..2b61ef6 100644
--- a/persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/dao/ChatDao.java
+++ b/persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/dao/ChatDao.java
@@ -44,7 +44,7 @@ public interface ChatDao extends BaseDao<RoomChatModel> {
 
     @Query("SELECT chats.pk_chat_id as chatId, " +
             "chats.fk_entity_id as entityId, " +
-            "contacts.rostername as peerName, " +
+            "contacts.rostername as contactName, " +
             "entities.fk_account_id as accountId, " +
             "jid, active " +
             "from chats " +
diff --git a/persistence/src/main/java/org/mercury_im/messenger/persistence/pojo/Chat.java b/persistence/src/main/java/org/mercury_im/messenger/persistence/pojo/Chat.java
index cc3e3e3..801f88a 100644
--- a/persistence/src/main/java/org/mercury_im/messenger/persistence/pojo/Chat.java
+++ b/persistence/src/main/java/org/mercury_im/messenger/persistence/pojo/Chat.java
@@ -5,7 +5,7 @@ import org.jxmpp.jid.EntityBareJid;
 public class Chat {
     public long chatId;
     public long entityId;
-    public String peerName;
+    public String contactName;
     public long accountId;
     public EntityBareJid jid;
     public boolean active;