Merge pull request #2083 from vector-im/riot_2081

BF: Room: Events with unexpected timestamps get stuck at the bottom of the history
element-hq · Mar 16, 2018 · e4c2152 · e4c2152
2 parents 3da0d08 + 19f1d2c
commit e4c2152
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java
@@ -724,15 +724,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
     @Override
     public void notifyDataSetChanged() {
-        // the event with invalid timestamp must be pushed at the end of the history
+        // undelivered events must be pushed at the end of the history
         this.setNotifyOnChange(false);
         List<MessageRow> undeliverableEvents = new ArrayList<>();
 
         for (int i = 0; i < getCount(); i++) {
             MessageRow row = getItem(i);
             Event event = row.getEvent();
 
-            if ((null != event) && (!event.isValidOriginServerTs() || event.isUnkownDevice())) {
+            if ((null != event) && (event.isUndeliverable() || event.isUnkownDevice())) {
                 undeliverableEvents.add(row);
                 remove(row);
                 i--;