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

reorder and scroll down after resending a message

Browse source
This commit is contained in:
Daniel Gultsch 2018-03-05 13:23:04 +01:00
parent 3bff110587
commit de2f5e7a83
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -848,9 +848,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public void sort() { public void sort() {
synchronized (this.messages) { synchronized (this.messages) {
Collections.sort(this.messages, new Comparator<Message>() { Collections.sort(this.messages, (left, right) -> {
@Override
public int compare(Message left, Message right) {
if (left.getTimeSent() < right.getTimeSent()) { if (left.getTimeSent() < right.getTimeSent()) {
return -1; return -1;
} else if (left.getTimeSent() > right.getTimeSent()) { } else if (left.getTimeSent() > right.getTimeSent()) {
@ -858,7 +856,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} else { } else {
return 0; return 0;
} }
}
}); });
untieMessages(); untieMessages();
} }

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -3588,6 +3588,8 @@ public class XmppConnectionService extends Service {
markMessage(msg, Message.STATUS_WAITING); markMessage(msg, Message.STATUS_WAITING);
this.resendMessage(msg, false); this.resendMessage(msg, false);
} }
message.getConversation().sort();
updateConversationUi();
} }
public void clearConversationHistory(final Conversation conversation) { public void clearConversationHistory(final Conversation conversation) {

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

@ -1528,6 +1528,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
activity.selectPresence(conversation, () -> { activity.selectPresence(conversation, () -> {
message.setCounterpart(conversation.getNextCounterpart()); message.setCounterpart(conversation.getNextCounterpart());
activity.xmppConnectionService.resendFailedMessages(message); activity.xmppConnectionService.resendFailedMessages(message);
new Handler().post(() -> {
int size = messageList.size();
this.binding.messagesView.setSelection(size - 1);
});
}); });
return; return;
} }
@ -1540,7 +1544,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} }
} }
activity.xmppConnectionService.resendFailedMessages(message); activity.xmppConnectionService.resendFailedMessages(message);
} new Handler().post(() -> {
int size = messageList.size();
this.binding.messagesView.setSelection(size - 1);
}); }
private void copyUrl(Message message) { private void copyUrl(Message message) {
final String url; final String url;