sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't break with srcoll events on empty message lists

This commit is contained in:
Daniel Gultsch 2016-03-03 11:14:59 +01:00
parent aaf64732b0
commit c9e4b332bf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
private int getIndexOf(String uuid, List<Message> messages) { private int getIndexOf(String uuid, List<Message> messages) {
if (uuid == null) { if (uuid == null) {
return 0; return messages.size() - 1;
} }
for(int i = 0; i < messages.size(); ++i) { for(int i = 0; i < messages.size(); ++i) {
if (uuid.equals(messages.get(i).getUuid())) { if (uuid.equals(messages.get(i).getUuid())) {
@ -164,7 +164,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
@Override @Override
public void run() { public void run() {
final int oldPosition = messagesView.getFirstVisiblePosition(); final int oldPosition = messagesView.getFirstVisiblePosition();
Message message = messageList.get(oldPosition); final Message message;
if (oldPosition < messageList.size()) {
message = messageList.get(oldPosition);
} else {
message = null;
}
String uuid = message != null ? message.getUuid() : null; String uuid = message != null ? message.getUuid() : null;
View v = messagesView.getChildAt(0); View v = messagesView.getChildAt(0);
final int pxOffset = (v == null) ? 0 : v.getTop(); final int pxOffset = (v == null) ? 0 : v.getTop();