From a3b3e09b78f26ff8dfadcc605ff89ffb5ae83413 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 14 Feb 2018 10:41:01 +0100 Subject: [PATCH] A bit of cleanup --- src/android/org/linphone/chat/ChatListFragment.java | 1 - src/android/org/linphone/chat/ChatRoomsAdapter.java | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java index ba8674d35..4c3b07035 100644 --- a/src/android/org/linphone/chat/ChatListFragment.java +++ b/src/android/org/linphone/chat/ChatListFragment.java @@ -33,7 +33,6 @@ import android.widget.TextView; import org.linphone.contacts.ContactsManager; import org.linphone.core.ChatRoomListenerStub; -import org.linphone.mediastream.Log; import org.linphone.ui.ListSelectionHelper; import org.linphone.contacts.ContactsUpdatedListener; import org.linphone.fragments.FragmentsAvailable; diff --git a/src/android/org/linphone/chat/ChatRoomsAdapter.java b/src/android/org/linphone/chat/ChatRoomsAdapter.java index 0b434313a..90088932d 100644 --- a/src/android/org/linphone/chat/ChatRoomsAdapter.java +++ b/src/android/org/linphone/chat/ChatRoomsAdapter.java @@ -40,9 +40,6 @@ import org.linphone.core.Address; import org.linphone.core.ChatMessage; import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoomCapabilities; -import org.linphone.core.Event; -import org.linphone.core.EventLog; -import org.linphone.mediastream.Log; import org.linphone.ui.ListSelectionAdapter; import org.linphone.ui.ListSelectionHelper; @@ -140,9 +137,6 @@ public class ChatRoomsAdapter extends ListSelectionAdapter { contactAddress = chatRoom.getParticipants()[0].getAddress(); } - LinphoneContact contact = null; - String message = ""; - Long time; int unreadMessagesCount = chatRoom.getUnreadMessagesCount(); ChatMessage lastMessage = chatRoom.getLastMessageInHistory(); @@ -153,9 +147,8 @@ public class ChatRoomsAdapter extends ListSelectionAdapter { if (lastMessage.getFileTransferInformation() != null || lastMessage.getExternalBodyUrl() != null || lastMessage.getAppdata() != null) { holder.lastMessageView.setBackgroundResource(R.drawable.chat_file_message); } else if (lastMessage.getTextContent() != null && lastMessage.getTextContent().length() > 0) { - message = lastMessage.getTextContent(); holder.lastMessageView.setBackgroundResource(0); - holder.lastMessageView.setText(message); + holder.lastMessageView.setText(lastMessage.getTextContent()); } } @@ -163,6 +156,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter { holder.contactPicture.setImageBitmap(mDefaultBitmap); if (chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) { + LinphoneContact contact; if (chatRoom.getParticipants().length > 0) { contact = ContactsManager.getInstance().findContactFromAddress(chatRoom.getParticipants()[0].getAddress()); if (contact != null) {