Fix detected forbidden pattern.

libraries/matrix/impl/build.gradle.kts

@@ -32,6 +32,7 @@ dependencies {
     // api(projects.libraries.rustsdk)
     implementation(libs.matrix.sdk)
     implementation(projects.libraries.di)
+    implementation(projects.services.toolbox.api)
     api(projects.libraries.matrix.api)
     implementation(libs.dagger)
     implementation(projects.libraries.core)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -44,6 +44,7 @@ import io.element.android.libraries.matrix.impl.usersearch.UserProfileMapper
 import io.element.android.libraries.matrix.impl.usersearch.UserSearchResultMapper
 import io.element.android.libraries.matrix.impl.verification.RustSessionVerificationService
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -77,6 +78,7 @@ class RustMatrixClient constructor(
     private val coroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,
     private val baseDirectory: File,
+    private val clock: SystemClock,
 ) : MatrixClient {
 
     override val sessionId: UserId = UserId(client.userId())
@@ -215,6 +217,7 @@ class RustMatrixClient constructor(
             innerRoom = fullRoom,
             coroutineScope = coroutineScope,
             coroutineDispatchers = dispatchers,
+            clock = clock,
         )
     }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt

@@ -25,10 +25,10 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.impl.RustMatrixClient
 import io.element.android.libraries.sessionstorage.api.SessionData
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -49,6 +49,7 @@ class RustMatrixAuthenticationService @Inject constructor(
     private val coroutineScope: CoroutineScope,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val sessionStore: SessionStore,
+    private val clock: SystemClock,
 ) : MatrixAuthenticationService {
 
     private val authService: RustAuthenticationService = RustAuthenticationService(baseDirectory.absolutePath, null, null)
@@ -115,6 +116,7 @@ class RustMatrixAuthenticationService @Inject constructor(
             coroutineScope = coroutineScope,
             dispatchers = coroutineDispatchers,
             baseDirectory = baseDirectory,
+            clock = clock,
         )
     }
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -31,6 +31,7 @@ import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.impl.media.map
 import io.element.android.libraries.matrix.impl.timeline.RustMatrixTimeline
+import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -54,6 +55,7 @@ class RustMatrixRoom(
     private val innerRoom: Room,
     private val coroutineScope: CoroutineScope,
     private val coroutineDispatchers: CoroutineDispatchers,
+    private val clock: SystemClock,
 ) : MatrixRoom {
 
     override val membersStateFlow: StateFlow<MatrixRoomMembersState>
@@ -77,9 +79,9 @@ class RustMatrixRoom(
                 it.rooms.contains(roomId.value)
             }
             .map {
-                System.currentTimeMillis()
+                clock.epochMillis()
             }
-            .onStart { emit(System.currentTimeMillis()) }
+            .onStart { emit(clock.epochMillis()) }
     }
 
     override fun timeline(): MatrixTimeline {

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt

@@ -115,8 +115,7 @@ class PushersManager @Inject constructor(
             appDisplayName = appName,
             deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE"
         )
-
-         */
+        */
     }
 
     fun getPusherForCurrentSession() {}/*: Pusher? {

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt

@@ -71,32 +71,32 @@ class NotifiableEventResolver @Inject constructor(
 
         return notificationData.asNotifiableEvent(sessionId)
     }
-}
 
-private fun NotificationData.asNotifiableEvent(userId: SessionId): NotifiableEvent {
-    return NotifiableMessageEvent(
-        sessionId = userId,
-        roomId = roomId,
-        eventId = eventId,
-        editedEventId = null,
-        canBeReplaced = true,
-        noisy = isNoisy,
-        timestamp = System.currentTimeMillis(),
-        senderName = senderDisplayName,
-        senderId = senderId.value,
-        body = "Message ${eventId.value.take(8)}… in room ${roomId.value.take(8)}…",
-        imageUriString = null,
-        threadId = null,
-        roomName = null,
-        roomIsDirect = false,
-        roomAvatarPath = roomAvatarUrl,
-        senderAvatarPath = senderAvatarUrl,
-        soundName = null,
-        outGoingMessage = false,
-        outGoingMessageFailed = false,
-        isRedacted = false,
-        isUpdated = false
-    )
+    private fun NotificationData.asNotifiableEvent(userId: SessionId): NotifiableEvent {
+        return NotifiableMessageEvent(
+            sessionId = userId,
+            roomId = roomId,
+            eventId = eventId,
+            editedEventId = null,
+            canBeReplaced = true,
+            noisy = isNoisy,
+            timestamp = clock.epochMillis(),
+            senderName = senderDisplayName,
+            senderId = senderId.value,
+            body = "Message ${eventId.value.take(8)}… in room ${roomId.value.take(8)}…",
+            imageUriString = null,
+            threadId = null,
+            roomName = null,
+            roomIsDirect = false,
+            roomAvatarPath = roomAvatarUrl,
+            senderAvatarPath = senderAvatarUrl,
+            soundName = null,
+            outGoingMessage = false,
+            outGoingMessageFailed = false,
+            isRedacted = false,
+            isUpdated = false
+        )
+    }
 }
 
 /**

libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt

@@ -34,10 +34,10 @@ object SessionStorageModule {
     @SingleIn(AppScope::class)
     fun provideMatrixDatabase(@ApplicationContext context: Context): SessionDatabase {
         val name = "session_database"
-        val secretFile = context.getDatabasePath("$name.key")
+        val secretFile = context.getDatabasePath("${name}.key")
         val passphraseProvider = RandomSecretPassphraseProvider(context, secretFile)
         val driver = SqlCipherDriverFactory(passphraseProvider)
-            .create(SessionDatabase.Schema, "$name.db", context)
+            .create(SessionDatabase.Schema, "${name}.db", context)
         return SessionDatabase(driver)
     }
 }