Skip to content

Commit 7a659c9

Browse files
committed
unify System message checks for needsRoomRefresh
for all of them it makes sense to apply the age check Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 6d4e348 commit 7a659c9

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

‎app/src/main/java/com/nextcloud/talk/chat/data/network/ChatMessageSyncer.kt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -704,10 +704,6 @@ class ChatMessageSyncer @Inject constructor(
704704
ChatMessage.SystemMessageType.MESSAGE_EDITED ->
705705
upsertParentMessage(target, messageJson)
706706

707-
ChatMessage.SystemMessageType.LOBBY_NONE,
708-
ChatMessage.SystemMessageType.LOBBY_NON_MODERATORS,
709-
ChatMessage.SystemMessageType.LOBBY_OPEN_TO_EVERYONE -> needsRoomRefresh = true
710-
711707
ChatMessage.SystemMessageType.CLEARED_CHAT -> {
712708
// for lookIntoFuture just deleting everything would be fine.
713709
// But lets say we did not open the chat for a while and in between it was cleared.
@@ -719,16 +715,18 @@ class ChatMessageSyncer @Inject constructor(
719715
chatBlocksDao.deleteChatBlocksOlderThan(target.internalConversationId, messageJson.id)
720716
}
721717

718+
ChatMessage.SystemMessageType.LOBBY_NONE,
719+
ChatMessage.SystemMessageType.LOBBY_NON_MODERATORS,
720+
ChatMessage.SystemMessageType.LOBBY_OPEN_TO_EVERYONE,
722721
ChatMessage.SystemMessageType.MESSAGE_PINNED,
723-
ChatMessage.SystemMessageType.MESSAGE_UNPINNED -> needsRoomRefresh = true
724-
722+
ChatMessage.SystemMessageType.MESSAGE_UNPINNED,
725723
ChatMessage.SystemMessageType.CALL_STARTED,
726724
ChatMessage.SystemMessageType.CALL_ENDED,
727725
ChatMessage.SystemMessageType.CALL_ENDED_EVERYONE,
728726
ChatMessage.SystemMessageType.CALL_MISSED,
729727
ChatMessage.SystemMessageType.CALL_TRIED -> {
730728
val messageAgeMillis = System.currentTimeMillis() - messageJson.timestamp * MILLIS_PER_SECOND
731-
if (messageAgeMillis <= CALL_REFRESH_MAX_AGE_MILLIS) {
729+
if (messageAgeMillis <= ROOM_REFRESH_MAX_AGE_MILLIS) {
732730
needsRoomRefresh = true
733731
}
734732
}
@@ -848,7 +846,7 @@ class ChatMessageSyncer @Inject constructor(
848846

849847
private const val DEFAULT_MESSAGES_LIMIT = 100
850848
private const val MILLIS_PER_SECOND = 1000L
851-
private const val CALL_REFRESH_MAX_AGE_MILLIS = 3 * 60 * 60 * 1000L // 3 hours
849+
private const val ROOM_REFRESH_MAX_AGE_MILLIS = 3 * 60 * 60 * 1000L // 3 hours
852850
private const val CATCH_UP_COOLDOWN_MILLIS = 5_000L
853851
private const val MAX_CATCH_UP_RUNS_PER_BURST = 3
854852
private const val MAX_BACKLOG_ROUNDS = 5

0 commit comments

Comments
 (0)