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

Fixed some group chat events visible in one-to-one rooms

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-28 12:50:46 +01:00
parent 6ea6389939
commit 651ce6f223
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -510,13 +510,23 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
int maxSize = mChatRoom.getHistoryEventsSize(); int maxSize;
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
maxSize = mChatRoom.getHistorySize();
} else {
maxSize = mChatRoom.getHistoryEventsSize();
}
if (totalItemsCount < maxSize) { if (totalItemsCount < maxSize) {
int upperBound = totalItemsCount + MESSAGES_PER_PAGE; int upperBound = totalItemsCount + MESSAGES_PER_PAGE;
if (upperBound > maxSize) { if (upperBound > maxSize) {
upperBound = maxSize; upperBound = maxSize;
} }
EventLog[] newLogs = mChatRoom.getHistoryRangeEvents(totalItemsCount, upperBound); EventLog[] newLogs;
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
newLogs = mChatRoom.getHistoryRangeMessageEvents(totalItemsCount, upperBound);
} else {
newLogs = mChatRoom.getHistoryRangeEvents(totalItemsCount, upperBound);
}
ArrayList<EventLog> logsList = new ArrayList<>(Arrays.asList(newLogs)); ArrayList<EventLog> logsList = new ArrayList<>(Arrays.asList(newLogs));
((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addAllToHistory(logsList); ((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addAllToHistory(logsList);
} }