gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

load conversation from DB first, then update by request if connection is available

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-10-01 15:54:09 +02:00
parent 818a843143
commit b1d6086684
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
View File

@ -225,7 +225,7 @@ class ChatViewModel @Inject constructor(
fun getRoom(user: User, token: String) { fun getRoom(user: User, token: String) {
_getRoomViewState.value = GetRoomStartState _getRoomViewState.value = GetRoomStartState
conversationRepository.getConversationSettings(token) conversationRepository.getRoom(token)
// chatNetworkDataSource.getRoom(user, token) // chatNetworkDataSource.getRoom(user, token)
// .subscribeOn(Schedulers.io()) // .subscribeOn(Schedulers.io())

2
app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt
View File

@ -35,5 +35,5 @@ interface OfflineConversationsRepository {
* Called once onStart to emit a conversation to [conversationFlow] * Called once onStart to emit a conversation to [conversationFlow]
* to be handled asynchronously. * to be handled asynchronously.
*/ */
fun getConversationSettings(roomToken: String): Job fun getRoom(roomToken: String): Job
} }

20
app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt
View File

@ -56,17 +56,19 @@ class OfflineFirstConversationsRepository @Inject constructor(
override fun getRooms(): Job = override fun getRooms(): Job =
scope.launch { scope.launch {
val resultsFromSync = sync() val initialConversationModels = getListOfConversations(user.id!!)
if (!resultsFromSync.isNullOrEmpty()) { _roomListFlow.emit(initialConversationModels)
val conversations = resultsFromSync.map(ConversationEntity::asModel)
_roomListFlow.emit(conversations) if (monitor.isOnline.first()) {
} else { val conversationEntitiesFromSync = getRoomsFromServer()
val conversationsFromDb = getListOfConversations(user.id!!) if (!conversationEntitiesFromSync.isNullOrEmpty()) {
_roomListFlow.emit(conversationsFromDb) val conversationModelsFromSync = conversationEntitiesFromSync.map(ConversationEntity::asModel)
_roomListFlow.emit(conversationModelsFromSync)
}
} }
} }
override fun getConversationSettings(roomToken: String): Job = override fun getRoom(roomToken: String): Job =
scope.launch { scope.launch {
val id = user.id!! val id = user.id!!
val model = getConversation(id, roomToken) val model = getConversation(id, roomToken)
@ -100,7 +102,7 @@ class OfflineFirstConversationsRepository @Inject constructor(
} }
} }
private suspend fun sync(): List<ConversationEntity>? { private suspend fun getRoomsFromServer(): List<ConversationEntity>? {
var conversationsFromSync: List<ConversationEntity>? = null var conversationsFromSync: List<ConversationEntity>? = null
if (!monitor.isOnline.first()) { if (!monitor.isOnline.first()) {