Merge branch 'release/tchap_v1.2.1'

tchapgouv · Apr 2, 2021 · 4d9e6aa · 4d9e6aa
2 parents 8e8f824 + 07f7a82
commit 4d9e6aa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in Tchap 1.2.1 (2021-04-02)
+===================================================
+
+Bug Fix:
+ * Some last message are missing in the rooms list (PR #707)
+
 Changes in Tchap 1.2.0 (2021-03-24)
 ===================================================
 

diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 78
-    versionNameProp = "1.2.0"
+    versionCodeProp = 79
+    versionNameProp = "1.2.1"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

diff --git a/vector/src/main/java/im/vector/util/RoomUtils.java b/vector/src/main/java/im/vector/util/RoomUtils.java
@@ -390,14 +390,18 @@ public static CharSequence getRoomMessageToDisplay(final Context context,
                     if (retentionInDays != RoomRetentionKt.UNDEFINED_RETENTION_VALUE) {
                         long retentionDurationMs = TimeUnit.DAYS.toMillis(retentionInDays);
                         long eventLifetime = System.currentTimeMillis() - latestEvent.getOriginServerTs();
-                        if (eventLifetime <= retentionDurationMs) {
-                            eventDisplay = new EventDisplay(context);
-                            eventDisplay.setPrependMessagesWithAuthor(false);
-                            messageToDisplay = eventDisplay.getTextualDisplay(ThemeUtils.INSTANCE.getColor(context, R.attr.vctr_room_notification_text_color),
-                                    latestEvent,
-                                    roomSummary.getLatestRoomState());
+                        if (eventLifetime > retentionDurationMs) {
+                            latestEvent = null;
                         }
                     }
+
+                    if (latestEvent != null) {
+                        eventDisplay = new EventDisplay(context);
+                        eventDisplay.setPrependMessagesWithAuthor(false);
+                        messageToDisplay = eventDisplay.getTextualDisplay(ThemeUtils.INSTANCE.getColor(context, R.attr.vctr_room_notification_text_color),
+                                latestEvent,
+                                roomSummary.getLatestRoomState());
+                    }
                 }
             }