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

Updated linphone + use new getHistoryMessageEvents method

Browse source
This commit is contained in:
Sylvain Berfini 2018-02-13 11:35:34 +01:00
parent cdec808f28
commit e1b756cf32
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -283,7 +283,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
EventLog eventLog = (EventLog)obj; EventLog eventLog = (EventLog)obj;
eventLog.deleteFromDatabase(); eventLog.deleteFromDatabase();
} }
mEventsAdapter.refresh(mChatRoom.getHistoryEvents(0)); if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
mEventsAdapter.refresh(mChatRoom.getHistoryMessageEvents(0));
} else {
mEventsAdapter.refresh(mChatRoom.getHistoryEvents(0));
}
} }
/** /**
@ -422,7 +426,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
private void displayChatRoomHistory() { private void displayChatRoomHistory() {
if (mChatRoom == null) return; if (mChatRoom == null) return;
mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants); if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryMessageEvents(0), mParticipants);
} else {
mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants);
}
mSelectionHelper.setAdapter(mEventsAdapter); mSelectionHelper.setAdapter(mEventsAdapter);
mChatEventsList.setAdapter(mEventsAdapter); mChatEventsList.setAdapter(mEventsAdapter);
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 66a6499f56f4d87d03b70ffc5890643542540eac Subproject commit 107aa11e139df6b3ab76f18930e75b9129bcbad7