Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed history display issue

Browse source
This commit is contained in:
Sylvain Berfini 2020-01-17 10:56:12 +01:00
parent 3f65e2dc8c
commit d0ca028ebe
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -824,18 +824,7 @@ public class ChatMessagesFragment extends Fragment
private void displayChatRoomHistory() { private void displayChatRoomHistory() {
if (mChatRoom == null) return; if (mChatRoom == null) return;
ChatMessagesAdapter mEventsAdapter; ChatMessagesAdapter mEventsAdapter =
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
mEventsAdapter =
new ChatMessagesAdapter(
this,
mSelectionHelper,
R.layout.chat_bubble,
mChatRoom.getHistoryMessageEvents(MESSAGES_PER_PAGE),
mParticipants,
this);
} else {
mEventsAdapter =
new ChatMessagesAdapter( new ChatMessagesAdapter(
this, this,
mSelectionHelper, mSelectionHelper,
@ -843,7 +832,6 @@ public class ChatMessagesFragment extends Fragment
mChatRoom.getHistoryEvents(MESSAGES_PER_PAGE), mChatRoom.getHistoryEvents(MESSAGES_PER_PAGE),
mParticipants, mParticipants,
this); this);
}
mSelectionHelper.setAdapter(mEventsAdapter); mSelectionHelper.setAdapter(mEventsAdapter);
mChatEventsList.setAdapter(mEventsAdapter); mChatEventsList.setAdapter(mEventsAdapter);
scrollToBottom(); scrollToBottom();
@ -1388,6 +1376,7 @@ public class ChatMessagesFragment extends Fragment
@Override @Override
public void onEphemeralEvent(ChatRoom chatRoom, EventLog eventLog) { public void onEphemeralEvent(ChatRoom chatRoom, EventLog eventLog) {
((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addToHistory(eventLog); ((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addToHistory(eventLog);
scrollToBottom();
} }
@Override @Override