Refactor some modules + add dependency management (still WIP)
This commit is contained in:
ganfra
parent
d1c80438d5
commit
6f0d8936eb
89 changed files with 854 additions and 580 deletions
6
libraries/matrix/src/main/AndroidManifest.xml
Normal file
6
libraries/matrix/src/main/AndroidManifest.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
</manifest>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
package io.element.android.x.sdk.matrix
|
||||
|
||||
internal const val LOG_TAG = "Matrix"
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package io.element.android.x.sdk.matrix
|
||||
|
||||
import android.content.Context
|
||||
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.ClientBuilder
|
||||
import java.io.File
|
||||
|
||||
class Matrix(
|
||||
context: Context,
|
||||
) {
|
||||
private val baseFolder = File(context.filesDir, "matrix")
|
||||
private val sessionStore = SessionStore(context)
|
||||
|
||||
suspend fun restoreSession(): MatrixClient? {
|
||||
return sessionStore.getStoredData()
|
||||
?.let { sessionData ->
|
||||
try {
|
||||
val client = ClientBuilder()
|
||||
.basePath(baseFolder.absolutePath)
|
||||
.username(sessionData.userId)
|
||||
.build()
|
||||
client.restoreLogin(sessionData.restoreToken)
|
||||
client
|
||||
} catch (throwable: Throwable) {
|
||||
logError(throwable)
|
||||
null
|
||||
}
|
||||
}?.let {
|
||||
MatrixClient(it, sessionStore)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun login(homeserver: String, username: String, password: String): MatrixClient {
|
||||
val authService = AuthenticationService(baseFolder.absolutePath)
|
||||
authService.configureHomeserver(homeserver)
|
||||
val client = authService.login(username, password, "MatrixRustSDKSample", null)
|
||||
sessionStore.storeData(SessionStore.SessionData(client.userId(), client.restoreToken()))
|
||||
return MatrixClient(client, sessionStore)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
package io.element.android.x.sdk.matrix
|
||||
|
||||
import android.util.Log
|
||||
import io.element.android.x.sdk.matrix.store.SessionStore
|
||||
import org.matrix.rustcomponents.sdk.*
|
||||
|
||||
class MatrixClient internal constructor(
|
||||
private val client: Client,
|
||||
private val sessionStore: SessionStore,
|
||||
) {
|
||||
private val roomWrapper = RoomWrapper(client)
|
||||
|
||||
fun startSync() {
|
||||
val clientDelegate = object : ClientDelegate {
|
||||
override fun didReceiveAuthError(isSoftLogout: Boolean) {
|
||||
Log.v(LOG_TAG, "didReceiveAuthError()")
|
||||
}
|
||||
|
||||
override fun didReceiveSyncUpdate() {
|
||||
Log.v(LOG_TAG, "didReceiveSyncUpdate()")
|
||||
}
|
||||
|
||||
override fun didUpdateRestoreToken() {
|
||||
Log.v(LOG_TAG, "didUpdateRestoreToken()")
|
||||
}
|
||||
}
|
||||
|
||||
client.setDelegate(clientDelegate)
|
||||
Log.v(LOG_TAG, "DisplayName = ${client.displayName()}")
|
||||
try {
|
||||
client.fullSlidingSync()
|
||||
} catch (failure: Throwable) {
|
||||
Log.e(LOG_TAG, "fullSlidingSync() fail", failure)
|
||||
}
|
||||
}
|
||||
|
||||
fun slidingSync(listener: SlidingSyncListener): 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")
|
||||
val rooms = summary.rooms.mapNotNull {
|
||||
roomWrapper.getRoom(it)
|
||||
}
|
||||
listener.onSyncUpdate(summary, rooms)
|
||||
}
|
||||
})
|
||||
return slidingSync.sync()
|
||||
}
|
||||
|
||||
suspend fun logout() {
|
||||
client.logout()
|
||||
sessionStore.reset()
|
||||
}
|
||||
|
||||
fun username(): String = client.displayName()
|
||||
fun avatarUrl(): String = client.avatarUrl()
|
||||
|
||||
interface SlidingSyncListener {
|
||||
fun onSyncUpdate(summary: UpdateSummary, rooms: List<Room>)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package io.element.android.x.sdk.matrix
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
|
||||
|
||||
object MatrixInstance {
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
private lateinit var instance: Matrix
|
||||
|
||||
fun init(context: Context) {
|
||||
instance = Matrix(context)
|
||||
}
|
||||
|
||||
fun getInstance(): Matrix {
|
||||
return instance
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package io.element.android.x.sdk.matrix
|
||||
|
||||
import android.util.Log
|
||||
import org.matrix.rustcomponents.sdk.Client
|
||||
import org.matrix.rustcomponents.sdk.Room
|
||||
|
||||
class RoomWrapper(
|
||||
private val client: Client
|
||||
) {
|
||||
fun getRoom(roomId: String): Room? {
|
||||
val rooms = client.rooms()
|
||||
Log.d(LOG_TAG, "We have ${rooms.size} rooms")
|
||||
return rooms.firstOrNull { it.id() == roomId }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
package io.element.android.x.sdk.matrix.store
|
||||
|
||||
import android.content.Context
|
||||
import androidx.datastore.core.DataStore
|
||||
import androidx.datastore.preferences.core.Preferences
|
||||
import androidx.datastore.preferences.core.edit
|
||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||
import androidx.datastore.preferences.preferencesDataStore
|
||||
import kotlinx.coroutines.flow.firstOrNull
|
||||
|
||||
|
||||
private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "elementx_sessions")
|
||||
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")
|
||||
|
||||
internal class SessionStore(
|
||||
context: Context
|
||||
) {
|
||||
data class SessionData(
|
||||
val userId: String,
|
||||
val restoreToken: String,
|
||||
)
|
||||
|
||||
private val store = context.dataStore
|
||||
|
||||
|
||||
suspend fun storeData(sessionData: SessionData) {
|
||||
store.edit { prefs ->
|
||||
prefs[userIdPreference] = sessionData.userId
|
||||
prefs[restoreTokenPreference] = sessionData.restoreToken
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun getStoredData(): SessionData? {
|
||||
return store.data.firstOrNull()?.let { prefs ->
|
||||
val userId = prefs[userIdPreference] ?: return@let null
|
||||
val restoreToken = prefs[restoreTokenPreference] ?: return@let null
|
||||
SessionData(
|
||||
userId = userId,
|
||||
restoreToken = restoreToken,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun reset() {
|
||||
store.edit { it.clear() }
|
||||
}
|
||||
}
|
||||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue