Merge pull request #136 from vector-im/feature/bma/splitModules

Split some library modules

app/build.gradle.kts

@@ -199,6 +199,8 @@ dependencies {
     allLibraries()
     allFeatures()
     implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.dateformatter.impl)
+    implementation(projects.libraries.sessionStorage.impl)
     implementation(projects.tests.uitests)
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)

features/messages/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.textcomposer)
-    implementation(projects.libraries.dateformatter)
+    implementation(projects.libraries.dateformatter.api)
     implementation(libs.coil.compose)
     implementation(libs.datetime)
     implementation(libs.accompanist.flowlayout)
@@ -52,6 +52,7 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.dateformatter.test)
 
     androidTestImplementation(libs.test.junitext)
     ksp(libs.showkase.processor)

features/messages/src/main/kotlin/io/element/android/features/messages/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt

@@ -18,7 +18,7 @@ package io.element.android.features.messages.timeline.factories.virtual
 
 import io.element.android.features.messages.timeline.model.virtual.TimelineItemDaySeparatorModel
 import io.element.android.features.messages.timeline.model.virtual.TimelineItemVirtualModel
-import io.element.android.libraries.dateformatter.DaySeparatorFormatter
+import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter
 import org.matrix.rustcomponents.sdk.VirtualTimelineItem
 import javax.inject.Inject
 

features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.features.messages.fixtures
 
-import io.element.android.features.messages.fakes.FakeDaySeparatorFormatter
 import io.element.android.features.messages.timeline.factories.TimelineItemsFactory
 import io.element.android.features.messages.timeline.factories.event.TimelineItemContentFactory
 import io.element.android.features.messages.timeline.factories.event.TimelineItemContentFailedToParseMessageFactory
@@ -31,6 +30,7 @@ import io.element.android.features.messages.timeline.factories.event.TimelineIte
 import io.element.android.features.messages.timeline.factories.event.TimelineItemEventFactory
 import io.element.android.features.messages.timeline.factories.virtual.TimelineItemDaySeparatorFactory
 import io.element.android.features.messages.timeline.factories.virtual.TimelineItemVirtualFactory
+import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter
 
 internal fun aTimelineItemsFactory() = TimelineItemsFactory(
     dispatchers = testCoroutineDispatchers(),

features/roomlist/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.uiStrings)
-    implementation(projects.libraries.dateformatter)
+    implementation(projects.libraries.dateformatter.api)
     implementation(libs.accompanist.placeholder)
 
     testImplementation(libs.test.junit)

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt

@@ -31,7 +31,7 @@ import io.element.android.features.roomlist.model.RoomListRoomSummaryPlaceholder
 import io.element.android.features.roomlist.model.RoomListState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.parallelMap
-import io.element.android.libraries.dateformatter.LastMessageFormatter
+import io.element.android.libraries.dateformatter.api.LastMessageFormatter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.MatrixClient

features/roomlist/src/test/kotlin/io/element/android/features/roomlist/FakeLastMessageFormatter.kt

@@ -16,7 +16,7 @@
 
 package io.element.android.features.roomlist
 
-import io.element.android.libraries.dateformatter.LastMessageFormatter
+import io.element.android.libraries.dateformatter.api.LastMessageFormatter
 
 class FakeLastMessageFormatter : LastMessageFormatter {
     private var format = ""

features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt

@@ -24,7 +24,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.roomlist.model.RoomListEvents
 import io.element.android.features.roomlist.model.RoomListRoomSummary
-import io.element.android.libraries.dateformatter.LastMessageFormatter
+import io.element.android.libraries.dateformatter.api.LastMessageFormatter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EXCEPTION

libraries/dateformatter/api/build.gradle.kts

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.dateformatter.api"
+}

libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DaySeparatorFormatter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.dateformatter
+package io.element.android.libraries.dateformatter.api
 
 interface DaySeparatorFormatter {
     fun format(timestamp: Long): String

libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/LastMessageFormatter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.dateformatter
+package io.element.android.libraries.dateformatter.api
 
 interface LastMessageFormatter {
     fun format(timestamp: Long?): String

libraries/dateformatter/impl/.gitignore

@@ -0,0 +1 @@
+/build

libraries/dateformatter/impl/build.gradle.kts

@@ -27,17 +27,19 @@ anvil {
 }
 
 android {
-    namespace = "io.element.android.libraries.dateformatter"
+    namespace = "io.element.android.libraries.dateformatter.impl"
 
     dependencies {
         anvil(projects.anvilcodegen)
         implementation(libs.dagger)
         implementation(projects.libraries.di)
         implementation(projects.anvilannotations)
+
+        implementation(projects.libraries.dateformatter.api)
         api(libs.datetime)
-        ksp(libs.showkase.processor)
 
         testImplementation(libs.test.junit)
         testImplementation(libs.test.truth)
+        testImplementation(projects.libraries.dateformatter.test)
     }
 }

libraries/dateformatter/impl/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

libraries/dateformatter/impl/src/main/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest />

libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDaySeparatorFormatter.kt

@@ -17,7 +17,7 @@
 package io.element.android.libraries.dateformatter.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.dateformatter.DaySeparatorFormatter
+import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter
 import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
 

libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageFormatter.kt

@@ -17,7 +17,7 @@
 package io.element.android.libraries.dateformatter.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.dateformatter.LastMessageFormatter
+import io.element.android.libraries.dateformatter.api.LastMessageFormatter
 import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
 

libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/di/DateFormatterModule.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.dateformatter.di
+package io.element.android.libraries.dateformatter.impl.di
 
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module

libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageFormatterTest.kt

@@ -17,7 +17,8 @@
 package io.element.android.libraries.dateformatter.impl
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.dateformatter.LastMessageFormatter
+import io.element.android.libraries.dateformatter.api.LastMessageFormatter
+import io.element.android.libraries.dateformatter.test.FakeClock
 import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import org.junit.Test

libraries/dateformatter/test/.gitignore

@@ -0,0 +1 @@
+/build

libraries/dateformatter/test/build.gradle.kts

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.dateformatter.test"
+
+    dependencies {
+        implementation(projects.libraries.dateformatter.api)
+        api(libs.datetime)
+    }
+}

libraries/dateformatter/test/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

libraries/dateformatter/test/src/main/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest />

libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeClock.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.dateformatter.impl
+package io.element.android.libraries.dateformatter.test
 
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant

libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDaySeparatorFormatter.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.element.android.features.messages.fakes
+package io.element.android.libraries.dateformatter.test
 
-import io.element.android.libraries.dateformatter.DaySeparatorFormatter
+import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter
 
 class FakeDaySeparatorFormatter : DaySeparatorFormatter {
 

libraries/matrix/api/build.gradle.kts

@@ -39,6 +39,6 @@ dependencies {
     implementation(projects.libraries.core)
     implementation("net.java.dev.jna:jna:5.13.0@aar")
     implementation(libs.serialization.json)
-    api(projects.libraries.sessionStorage)
+    api(projects.libraries.sessionStorage.api)
     implementation(libs.coroutines.core)
 }

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

@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.impl.media.RustMediaResolver
 import io.element.android.libraries.matrix.impl.room.RustMatrixRoom
 import io.element.android.libraries.matrix.impl.room.RustRoomSummaryDataSource
 import io.element.android.libraries.matrix.impl.sync.SlidingSyncObserverProxy
-import io.element.android.libraries.sessionstorage.SessionStore
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.matrix.api.media.MediaResolver
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomSummaryDataSource

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

@@ -27,8 +27,8 @@ 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.matrix.impl.util.logError
-import io.element.android.libraries.matrix.session.SessionData
+import io.element.android.libraries.sessionstorage.api.SessionData
-import io.element.android.libraries.sessionstorage.SessionStore
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow

libraries/session-storage/api/build.gradle.kts

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.sessionstorage.api"
+}
+
+dependencies {
+    implementation(libs.coroutines.core)
+}

libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionData.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.sessionstorage.api
+
+data class SessionData(
+    val userId: String,
+    val deviceId: String,
+    val accessToken: String,
+    val refreshToken: String?,
+    val homeserverUrl: String,
+    val isSoftLogout: Boolean,
+    val slidingSyncProxy: String?
+)

libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.sessionstorage
+package io.element.android.libraries.sessionstorage.api
 
-import io.element.android.libraries.matrix.session.SessionData
 import kotlinx.coroutines.flow.Flow
 
 interface SessionStore {
     fun isLoggedIn(): Flow<Boolean>
-    suspend fun storeData(session: SessionData)
+    suspend fun storeData(sessionData: SessionData)
     suspend fun getSession(sessionId: String): SessionData?
     suspend fun getLatestSession(): SessionData?
     suspend fun removeSession(sessionId: String)

libraries/session-storage/impl-memory/build.gradle.kts

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.sessionstorage.impl.memory"
+}
+
+dependencies {
+    implementation(projects.libraries.sessionStorage.api)
+    implementation(libs.coroutines.core)
+}

libraries/session-storage/impl-memory/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/memory/InMemorySessionStore.kt

@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-package io.element.android.samples.minimal
+package io.element.android.libraries.sessionstorage.impl.memory
 
-import io.element.android.libraries.matrix.session.SessionData
+import io.element.android.libraries.sessionstorage.api.SessionData
-import io.element.android.libraries.sessionstorage.SessionStore
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 
 class InMemorySessionStore : SessionStore {
 
-    private var sessionData = MutableStateFlow<SessionData?>(null)
+    private var sessionDataFlow = MutableStateFlow<SessionData?>(null)
 
     override fun isLoggedIn(): Flow<Boolean> {
-        return sessionData.map { it != null }
+        return sessionDataFlow.map { it != null }
     }
 
-    override suspend fun storeData(session: SessionData) {
+    override suspend fun storeData(sessionData: SessionData) {
-        sessionData.value = session
+        sessionDataFlow.value = sessionData
     }
 
     override suspend fun getSession(sessionId: String): SessionData? {
-        return sessionData.value.takeIf { it?.userId == sessionId }
+        return sessionDataFlow.value.takeIf { it?.userId == sessionId }
     }
 
     override suspend fun getLatestSession(): SessionData? {
-        return sessionData.value
+        return sessionDataFlow.value
     }
 
     override suspend fun removeSession(sessionId: String) {
-        if (sessionData.value?.userId == sessionId) {
+        if (sessionDataFlow.value?.userId == sessionId) {
-            sessionData.value = null
+            sessionDataFlow.value = null
         }
     }
 }

libraries/session-storage/impl/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.libraries.sessionstorage"
+    namespace = "io.element.android.libraries.sessionstorage.impl"
 }
 
 anvil {
@@ -32,6 +32,7 @@ dependencies {
     implementation(libs.dagger)
     implementation(projects.libraries.core)
     implementation(projects.libraries.encryptedDb)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(libs.sqldelight.driver.android)
     implementation(libs.sqlcipher)
     implementation(libs.sqlite)

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

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.sessionstorage
+package io.element.android.libraries.sessionstorage.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
 import com.squareup.sqldelight.runtime.coroutines.asFlow
 import com.squareup.sqldelight.runtime.coroutines.mapToOneOrNull
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.session.SessionData
+import io.element.android.libraries.sessionstorage.api.SessionData
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -37,17 +38,19 @@ class DatabaseSessionStore @Inject constructor(
     }
 
     override suspend fun storeData(sessionData: SessionData) {
-        database.sessionDataQueries.insertSessionData(sessionData)
+        database.sessionDataQueries.insertSessionData(sessionData.toDbModel())
     }
 
     override suspend fun getLatestSession(): SessionData? {
         return database.sessionDataQueries.selectFirst()
             .executeAsOneOrNull()
+            ?.toApiModel()
     }
 
     override suspend fun getSession(sessionId: String): SessionData? {
         return database.sessionDataQueries.selectByUserId(sessionId)
             .executeAsOneOrNull()
+            ?.toApiModel()
     }
 
     override suspend fun removeSession(sessionId: String) {

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.sessionstorage.impl
+
+import io.element.android.libraries.sessionstorage.api.SessionData
+
+internal fun SessionData.toDbModel(): io.element.android.libraries.matrix.session.SessionData {
+    return io.element.android.libraries.matrix.session.SessionData(
+        userId = userId,
+        deviceId = deviceId,
+        accessToken = accessToken,
+        refreshToken = refreshToken,
+        homeserverUrl = homeserverUrl,
+        isSoftLogout = isSoftLogout,
+        slidingSyncProxy = slidingSyncProxy,
+    )
+}
+
+internal fun io.element.android.libraries.matrix.session.SessionData.toApiModel(): SessionData {
+    return SessionData(
+        userId = userId,
+        deviceId = deviceId,
+        accessToken = accessToken,
+        refreshToken = refreshToken,
+        homeserverUrl = homeserverUrl,
+        isSoftLogout = isSoftLogout,
+        slidingSyncProxy = slidingSyncProxy,
+    )
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.sessionstorage.di
+package io.element.android.libraries.sessionstorage.impl.di
 
 import android.content.Context
 import com.squareup.anvil.annotations.ContributesTo
@@ -23,7 +23,7 @@ import dagger.Provides
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.sessionstorage.SessionDatabase
+import io.element.android.libraries.sessionstorage.impl.SessionDatabase
 import io.element.encrypteddb.SqlCipherDriverFactory
 import io.element.encrypteddb.passphrase.RandomSecretPassphraseProvider
 

libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTests.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.sessionstorage
+package io.element.android.libraries.sessionstorage.impl
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
@@ -55,7 +55,7 @@ class DatabaseSessionStoreTests {
     fun `storeData persists the SessionData into the DB`() = runTest {
         assertThat(database.sessionDataQueries.selectFirst().executeAsOneOrNull()).isNull()
 
-        databaseSessionStore.storeData(aSessionData)
+        databaseSessionStore.storeData(aSessionData.toApiModel())
 
         assertThat(database.sessionDataQueries.selectFirst().executeAsOneOrNull()).isEqualTo(aSessionData)
     }
@@ -76,7 +76,7 @@ class DatabaseSessionStoreTests {
         database.sessionDataQueries.insertSessionData(aSessionData)
         database.sessionDataQueries.insertSessionData(aSessionData.copy(userId = "otherUserId"))
 
-        val latestSession = databaseSessionStore.getLatestSession()
+        val latestSession = databaseSessionStore.getLatestSession()?.toDbModel()
 
         assertThat(latestSession).isEqualTo(aSessionData)
     }
@@ -86,7 +86,7 @@ class DatabaseSessionStoreTests {
         database.sessionDataQueries.insertSessionData(aSessionData)
         database.sessionDataQueries.insertSessionData(aSessionData.copy(userId = "otherUserId"))
 
-        val foundSession = databaseSessionStore.getSession(aSessionData.userId)
+        val foundSession = databaseSessionStore.getSession(aSessionData.userId)?.toDbModel()
 
         assertThat(foundSession).isEqualTo(aSessionData)
     }

plugins/src/main/kotlin/extension/DependencyHandleScope.kt

@@ -55,7 +55,7 @@ fun DependencyHandlerScope.allLibraries() {
     implementation(project(":libraries:matrixui"))
     implementation(project(":libraries:core"))
     implementation(project(":libraries:architecture"))
-    implementation(project(":libraries:dateformatter"))
+    implementation(project(":libraries:dateformatter:api"))
     implementation(project(":libraries:di"))
 }
 

samples/minimal/build.gradle.kts

@@ -49,10 +49,12 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.sessionStorage.implMemory)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
-    implementation(projects.libraries.dateformatter)
+    implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.dateformatter.impl)
     implementation(projects.features.roomlist)
     implementation(projects.features.login)
     implementation(libs.coroutines.core)

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt

@@ -31,6 +31,7 @@ import androidx.core.view.WindowCompat
 import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.impl.auth.RustMatrixAuthenticationService
+import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
 import kotlinx.coroutines.runBlocking
 import org.matrix.rustcomponents.sdk.AuthenticationService
 import java.io.File

settings.gradle.kts

@@ -44,7 +44,9 @@ include(":libraries:matrix:impl")
 include(":libraries:matrix:test")
 include(":libraries:matrixui")
 include(":libraries:textcomposer")
-include(":libraries:dateformatter")
+include(":libraries:dateformatter:api")
+include(":libraries:dateformatter:impl")
+include(":libraries:dateformatter:test")
 include(":libraries:elementresources")
 include(":libraries:ui-strings")
 include(":libraries:testtags")
@@ -65,4 +67,6 @@ include(":features:template")
 include(":libraries:androidutils")
 include(":samples:minimal")
 include(":libraries:encrypted-db")
-include(":libraries:session-storage")
+include(":libraries:session-storage:api")
+include(":libraries:session-storage:impl")
+include(":libraries:session-storage:impl-memory")