From 857bfcb9710784ab073a164d7d67eeb151a52a80 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 12 Mar 2021 12:16:25 +0100 Subject: [PATCH] Cleanup --- CHANGES.md | 2 +- .../android/sdk/internal/session/sync/ReadReceiptHandler.kt | 6 ++---- .../session/sync/RoomSyncEphemeralTemporaryStore.kt | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e4ff049550..33bc122e57 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,7 @@ Features ✨: - Improvements 🙌: - - + - Lazy storage of ReadReceipts Bugfix 🐛: - diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt index 68beddfc5a..efa578f2b8 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt @@ -121,13 +121,11 @@ internal class ReadReceiptHandler @Inject constructor( } fun getContentFromInitSync(roomId: String): ReadReceiptContent? { + @Suppress("UNCHECKED_CAST") return roomSyncEphemeralTemporaryStore.read(roomId) ?.also { roomSyncEphemeralTemporaryStore.delete(roomId) } ?.events ?.firstOrNull { it.type == EventType.RECEIPT } - ?.let { - @Suppress("UNCHECKED_CAST") - it.content as? ReadReceiptContent - } + ?.content as? ReadReceiptContent } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt index 5241c6f725..b9fd4e3d57 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt @@ -35,7 +35,7 @@ internal interface RoomSyncEphemeralTemporaryStore { } internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor( - @SessionFilesDirectory private val fileDirectory: File + @SessionFilesDirectory fileDirectory: File ) : RoomSyncEphemeralTemporaryStore { private val workingDir = File(fileDirectory, "rr")