Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Restore session

Browse source
This commit is contained in:
Benoit Marty 2022-10-11 17:59:57 +02:00
parent 2d402c6847
commit adfdcaca94
4 changed files with 64 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt
View file

@ -2,6 +2,7 @@ package io.element.android.x.sdk.matrix
import android.content.Context import android.content.Context
import io.element.android.x.sdk.matrix.store.SessionStore import io.element.android.x.sdk.matrix.store.SessionStore
import io.element.android.x.sdk.matrix.util.logError
import org.matrix.rustcomponents.sdk.AuthenticationService import org.matrix.rustcomponents.sdk.AuthenticationService
import org.matrix.rustcomponents.sdk.ClientBuilder import org.matrix.rustcomponents.sdk.ClientBuilder
import java.io.File import java.io.File
@ -9,27 +10,33 @@ import java.io.File
class Matrix( class Matrix(
context: Context, context: Context,
) { ) {
private val authFolder = File(context.filesDir, "auth") private val baseFolder = File(context.filesDir, "matrix")
private val sessionStore = SessionStore(context) private val sessionStore = SessionStore(context)
suspend fun restoreSession(): MatrixClient? { suspend fun restoreSession(): MatrixClient? {
return sessionStore.getStoredData() return sessionStore.getStoredData()
?.let { sessionData -> ?.let { sessionData ->
val client = ClientBuilder() try {
.username(sessionData.userId) val client = ClientBuilder()
.build() .basePath(baseFolder.absolutePath)
client.restoreLogin(sessionData.restoreToken) .username(sessionData.userId)
client .build()
client.restoreLogin(sessionData.restoreToken)
client
} catch (throwable: Throwable) {
logError(throwable)
null
}
}?.let { }?.let {
MatrixClient(it) MatrixClient(it, sessionStore)
} }
} }
suspend fun login(homeserver: String, username: String, password: String): MatrixClient { suspend fun login(homeserver: String, username: String, password: String): MatrixClient {
val authService = AuthenticationService(authFolder.absolutePath) val authService = AuthenticationService(baseFolder.absolutePath)
authService.configureHomeserver(homeserver) authService.configureHomeserver(homeserver)
val client = authService.login(username, password, "MatrixRustSDKSample", null) val client = authService.login(username, password, "MatrixRustSDKSample", null)
sessionStore.storeData(SessionStore.SessionData(username, client.restoreToken())) sessionStore.storeData(SessionStore.SessionData(client.userId(), client.restoreToken()))
return MatrixClient(client) return MatrixClient(client, sessionStore)
} }
} }

33
libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt
View file

@ -1,11 +1,12 @@
package io.element.android.x.sdk.matrix package io.element.android.x.sdk.matrix
import android.util.Log import android.util.Log
import org.matrix.rustcomponents.sdk.Client import io.element.android.x.sdk.matrix.store.SessionStore
import org.matrix.rustcomponents.sdk.ClientDelegate import org.matrix.rustcomponents.sdk.*
class MatrixClient internal constructor( class MatrixClient internal constructor(
private val client: Client private val client: Client,
private val sessionStore: SessionStore,
) { ) {
fun startSync() { fun startSync() {
val clientDelegate = object : ClientDelegate { val clientDelegate = object : ClientDelegate {
@ -31,7 +32,31 @@ class MatrixClient internal constructor(
} }
} }
fun logout() { fun slidingSync(onSyncUpdate: (UpdateSummary) -> Unit): StoppableSpawn {
val slidingSyncView = SlidingSyncViewBuilder()
.timelineLimit(limit = 10u)
.requiredState(requiredState = listOf(RequiredState(key = "m.room.avatar", value = "")))
.name(name = "HomeScreenView")
.syncMode(mode = SlidingSyncMode.FULL_SYNC)
.build()
val slidingSync = client
.slidingSync()
.homeserver("https://slidingsync.lab.element.dev")
.addView(slidingSyncView)
.build()
slidingSync.setObserver(object : SlidingSyncObserver {
override fun didReceiveSyncUpdate(summary: UpdateSummary) {
Log.v(LOG_TAG, "didReceiveSyncUpdate=$summary")
onSyncUpdate.invoke(summary)
}
})
return slidingSync.sync()
}
suspend fun logout() {
client.logout() client.logout()
sessionStore.reset()
} }
} }

2
libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt
View file

@ -22,6 +22,8 @@ internal class SessionStore(
private val store = context.dataStore private val store = context.dataStore
private val userIdPreference = stringPreferencesKey("userId") private val userIdPreference = stringPreferencesKey("userId")
// TODO It contains the access token, so it has to be stored in a more secured storage.
// I would expect the Rust SDK to provide a more obscure token.
private val restoreTokenPreference = stringPreferencesKey("restoreToken") private val restoreTokenPreference = stringPreferencesKey("restoreToken")
suspend fun storeData(sessionData: SessionData) { suspend fun storeData(sessionData: SessionData) {

16
libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt Normal file
View file

@ -0,0 +1,16 @@
package io.element.android.x.sdk.matrix.util
import android.util.Log
import io.element.android.x.sdk.matrix.LOG_TAG
import org.matrix.rustcomponents.sdk.ClientException
fun logError(throwable: Throwable) {
when (throwable) {
is ClientException.Generic -> {
Log.e(LOG_TAG, "Error ${throwable.msg}", throwable)
}
else -> {
Log.e(LOG_TAG, "Error", throwable)
}
}
}