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

Move some package on core + try some stuff around sync/roomlist

Browse source
This commit is contained in:
ganfra 2022-11-10 12:39:37 +01:00
parent 6cf010db44
commit 1ec8b3a994
18 changed files with 106 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -66,6 +66,7 @@ android {
dependencies {
implementation project(":libraries:designsystem")
implementation project(":libraries:matrix")
implementation project(":libraries:core")
implementation project(":features:onboarding")
implementation project(":features:login")
implementation project(":features:roomlist")

8
app/src/main/java/io/element/android/x/MainActivity.kt
View file

@ -11,12 +11,14 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.Lifecycle
import com.ramcosta.composedestinations.DestinationsNavHost
import com.ramcosta.composedestinations.rememberNavHostEngine
import io.element.android.x.core.compose.OnLifecycleEvent
import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.destinations.LoginScreenNavigationDestination
import io.element.android.x.destinations.OnBoardingScreenNavigationDestination
import kotlinx.coroutines.runBlocking
import timber.log.Timber
class MainActivity : ComponentActivity() {
@ -52,4 +54,8 @@ private fun MainScreen(viewModel: MainViewModel) {
navGraph = NavGraphs.root,
startRoute = startRoute
)
OnLifecycleEvent { _, event ->
Timber.v("OnLifecycleEvent: $event")
}
}

17
app/src/main/java/io/element/android/x/MainViewModel.kt
View file

@ -1,8 +1,10 @@
package io.element.android.x
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import io.element.android.x.matrix.MatrixInstance
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
class MainViewModel : ViewModel() {
private val matrix = MatrixInstance.getInstance()
@ -11,7 +13,22 @@ class MainViewModel : ViewModel() {
return matrix.isLoggedIn().first()
}
fun startSyncIfLogged(){
viewModelScope.launch {
if(!isLoggedIn()) return@launch
matrix.activeClient().startSync()
}
}
fun stopSyncIfLogged(){
viewModelScope.launch {
if (!isLoggedIn()) return@launch
matrix.activeClient().stopSync()
}
}
suspend fun restoreSession() {
matrix.restoreSession()
matrix.activeClient().startSync()
}
}

2
features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
View file

@ -22,7 +22,7 @@ class LoginViewModel(initialState: LoginViewState) :
viewModelScope.launch {
suspend {
matrix.login(state.homeserver, state.login, state.password)
Unit
matrix.activeClient().startSync()
}.execute {
copy(isLoggedIn = it)
}

2
features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
View file

@ -35,7 +35,7 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.zIndex
import com.airbnb.mvrx.compose.collectAsState
import com.airbnb.mvrx.compose.mavericksViewModel
import io.element.android.x.core.data.LogCompositions
import io.element.android.x.core.compose.LogCompositions
import io.element.android.x.core.data.StableCharSequence
import io.element.android.x.designsystem.components.avatar.AvatarData
import io.element.android.x.features.messages.components.*

2
features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListScreen.kt
View file

@ -18,7 +18,7 @@ import com.airbnb.mvrx.Loading
import com.airbnb.mvrx.Success
import com.airbnb.mvrx.compose.collectAsState
import com.airbnb.mvrx.compose.mavericksViewModel
import io.element.android.x.core.data.LogCompositions
import io.element.android.x.core.compose.LogCompositions
import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.designsystem.components.ProgressDialog
import io.element.android.x.designsystem.components.avatar.AvatarData

1
features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt
View file

@ -42,7 +42,6 @@ class RoomListViewModel(initialState: RoomListViewState) :
private fun handleInit() {
viewModelScope.launch {
val client = getClient()
client.startSync()
suspend {
val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
val userDisplayName = client.loadUserDisplayName().getOrNull()

2
features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
View file

@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.text.font.FontWeight
import io.element.android.x.core.data.LogCompositions
import io.element.android.x.core.compose.LogCompositions
import io.element.android.x.features.roomlist.model.MatrixUser
@Composable

2
libraries/core/src/main/java/io/element/android/x/core/data/LogCompositions.kt → libraries/core/src/main/java/io/element/android/x/core/compose/LogCompositions.kt
View file

@ -1,4 +1,4 @@
package io.element.android.x.core.data
package io.element.android.x.core.compose
import android.util.Log
import androidx.compose.runtime.Composable

27
libraries/core/src/main/java/io/element/android/x/core/compose/OnLifecycleEvent.kt Normal file
View file

@ -0,0 +1,27 @@
package io.element.android.x.core.compose
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
@Composable
fun OnLifecycleEvent(onEvent: (owner: LifecycleOwner, event: Lifecycle.Event) -> Unit) {
val eventHandler = rememberUpdatedState(onEvent)
val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
DisposableEffect(lifecycleOwner.value) {
val lifecycle = lifecycleOwner.value.lifecycle
val observer = LifecycleEventObserver { owner, event ->
eventHandler.value(owner, event)
}
lifecycle.addObserver(observer)
onDispose {
lifecycle.removeObserver(observer)
}
}
}

2
libraries/core/src/main/java/io/element/android/x/core/data/CoroutineDispatchers.kt → libraries/core/src/main/java/io/element/android/x/core/coroutine/CoroutineDispatchers.kt
View file

@ -1,4 +1,4 @@
package io.element.android.x.core.data
package io.element.android.x.core.coroutine
import kotlinx.coroutines.CoroutineDispatcher

0
libraries/core/src/main/java/io/element/android/x/core/data/flow/TimingOperators.kt → libraries/core/src/main/java/io/element/android/x/core/coroutine/TimingOperators.kt
View file

0
libraries/core/src/main/java/io/element/android/x/core/data/pmap.kt → libraries/core/src/main/java/io/element/android/x/core/coroutine/pmap.kt
View file

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

@ -1,7 +1,7 @@
package io.element.android.x.matrix
import android.content.Context
import io.element.android.x.core.data.CoroutineDispatchers
import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.matrix.session.SessionStore
import io.element.android.x.matrix.util.logError
import kotlinx.coroutines.CoroutineScope

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

@ -1,6 +1,6 @@
package io.element.android.x.matrix
import io.element.android.x.core.data.CoroutineDispatchers
import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.matrix.core.UserId
import io.element.android.x.matrix.media.MediaResolver
import io.element.android.x.matrix.media.RustMediaResolver
@ -14,6 +14,7 @@ import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.*
import timber.log.Timber
import java.io.Closeable
import java.util.concurrent.atomic.AtomicBoolean
class MatrixClient internal constructor(
private val client: Client,
@ -67,6 +68,7 @@ class MatrixClient internal constructor(
private var slidingSyncObserverToken: StoppableSpawn? = null
private val mediaResolver = RustMediaResolver(this)
private val isSyncing = AtomicBoolean(false)
init {
client.setDelegate(clientDelegate)
@ -84,15 +86,19 @@ class MatrixClient internal constructor(
}
fun startSync() {
roomSummaryDataSource.startSync()
slidingSync.setObserver(slidingSyncObserverProxy)
slidingSyncObserverToken = slidingSync.sync()
if (isSyncing.compareAndSet(false, true)) {
roomSummaryDataSource.startSync()
slidingSync.setObserver(slidingSyncObserverProxy)
slidingSyncObserverToken = slidingSync.sync()
}
}
fun stopSync() {
roomSummaryDataSource.stopSync()
slidingSync.setObserver(null)
slidingSyncObserverToken?.cancel()
if (isSyncing.compareAndSet(true, false)) {
roomSummaryDataSource.stopSync()
slidingSync.setObserver(null)
slidingSyncObserverToken?.cancel()
}
}
fun roomSummaryDataSource(): RoomSummaryDataSource = roomSummaryDataSource

2
libraries/matrix/src/main/java/io/element/android/x/matrix/room/MatrixRoom.kt
View file

@ -1,6 +1,6 @@
package io.element.android.x.matrix.room
import io.element.android.x.core.data.CoroutineDispatchers
import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.matrix.core.RoomId
import io.element.android.x.matrix.core.UserId
import io.element.android.x.matrix.timeline.MatrixTimeline

57
libraries/matrix/src/main/java/io/element/android/x/matrix/room/RoomSummaryDataSource.kt
View file

@ -1,19 +1,16 @@
package io.element.android.x.matrix.room
import io.element.android.x.core.data.CoroutineDispatchers
import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.core.data.flow.chunk
import io.element.android.x.matrix.room.message.RoomMessageFactory
import io.element.android.x.matrix.sync.roomListDiff
import io.element.android.x.matrix.sync.state
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.cancelChildren
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
import org.matrix.rustcomponents.sdk.*
import timber.log.Timber
import java.io.Closeable
import java.util.*
import java.util.concurrent.Executors
interface RoomSummaryDataSource {
fun roomSummaries(): Flow<List<RoomSummary>>
@ -27,33 +24,43 @@ internal class RustRoomSummaryDataSource(
private val roomSummaryDetailsFactory: RoomSummaryDetailsFactory = RoomSummaryDetailsFactory()
) : RoomSummaryDataSource, Closeable {
private val coroutineScope = CoroutineScope(SupervisorJob() + coroutineDispatchers.io)
private val singleDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
private val coroutineScope = CoroutineScope(SupervisorJob() + singleDispatcher)
private val roomSummaries = MutableStateFlow<List<RoomSummary>>(emptyList())
private val state = MutableStateFlow(SlidingSyncState.COLD)
fun startSync() {
coroutineScope.launch {
updateRoomSummaries {
clear()
addAll(
slidingSyncView.currentRoomsList().map(::buildSummaryForRoomListEntry)
)
}
fun startSync(){
slidingSyncView.roomListDiff()
.chunk(100)
.onEach { diffs ->
updateRoomSummaries {
diffs.forEach {
applyDiff(it)
slidingSyncView.roomListDiff()
.chunk(30)
.onEach { diffs ->
updateRoomSummaries {
diffs.forEach {
applyDiff(it)
}
}
}
}.launchIn(coroutineScope)
}.collect()
slidingSyncView.state()
.onEach { slidingSyncState ->
Timber.v("New sliding sync state: $slidingSyncState")
state.value = slidingSyncState
}.launchIn(coroutineScope)
slidingSyncView.state()
.onEach { slidingSyncState ->
Timber.v("New sliding sync state: $slidingSyncState")
state.value = slidingSyncState
}.collect()
slidingSyncUpdateFlow
.onEach {
didReceiveSyncUpdate(it)
}.launchIn(coroutineScope)
slidingSyncUpdateFlow
.onEach {
didReceiveSyncUpdate(it)
}.collect()
}
}
fun stopSync() {

2
libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
View file

@ -1,6 +1,6 @@
package io.element.android.x.matrix.timeline
import io.element.android.x.core.data.CoroutineDispatchers
import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.core.data.flow.chunk
import io.element.android.x.matrix.core.EventId
import io.element.android.x.matrix.room.MatrixRoom