narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

synchronize around getting last visibile uuid

Browse source
This commit is contained in:
Daniel Gultsch 2018-04-04 20:07:08 +02:00
parent 4f2c3df329
commit 41972e94eb
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1581,20 +1581,22 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
if (binding == null) {
return null;
}
int pos = binding.messagesView.getLastVisiblePosition();
if (pos >= 0) {
Message message = null;
for(int i = pos ; i >= 0; --i) {
message = (Message) binding.messagesView.getItemAtPosition(i);
if (message.getType() != Message.TYPE_STATUS) {
break;
synchronized (this.messageList) {
int pos = binding.messagesView.getLastVisiblePosition();
if (pos >= 0) {
Message message = null;
for (int i = pos; i >= 0; --i) {
message = (Message) binding.messagesView.getItemAtPosition(i);
if (message.getType() != Message.TYPE_STATUS) {
break;
}
}
}
if (message != null) {
while (message.next() != null && message.next().wasMergedIntoPrevious()) {
message = message.next();
if (message != null) {
while (message.next() != null && message.next().wasMergedIntoPrevious()) {
message = message.next();
}
return message.getUuid();
}
return message.getUuid();
}
}
return null;