Skip to content

Commit 437d906

Browse files
committed
comment out generalUIFlow and removeMessageFlow
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 817555a commit 437d906

4 files changed

Lines changed: 38 additions & 39 deletions

File tree

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,13 +1097,13 @@ class ChatActivity :
10971097
// }
10981098
// .launchIn(lifecycleScope)
10991099

1100-
this.lifecycleScope.launch {
1101-
chatViewModel.getRemoveMessageFlow
1102-
.onEach {
1103-
removeMessageById(it.id)
1104-
}
1105-
.collect()
1106-
}
1100+
// this.lifecycleScope.launch {
1101+
// chatViewModel.getRemoveMessageFlow
1102+
// .onEach {
1103+
// removeMessageById(it.id)
1104+
// }
1105+
// .collect()
1106+
// }
11071107

11081108
this.lifecycleScope.launch {
11091109
chatViewModel.getUpdateMessageFlow
@@ -1130,19 +1130,19 @@ class ChatActivity :
11301130
.collect()
11311131
}
11321132

1133-
this.lifecycleScope.launch {
1134-
chatViewModel.getGeneralUIFlow.onEach { key ->
1135-
when (key) {
1136-
NO_OFFLINE_MESSAGES_FOUND -> {
1137-
binding.progressBar.visibility = View.GONE
1138-
binding.messagesListView.visibility = View.GONE
1139-
binding.offline.root.visibility = View.VISIBLE
1140-
}
1141-
1142-
else -> {}
1143-
}
1144-
}.collect()
1145-
}
1133+
// this.lifecycleScope.launch {
1134+
// chatViewModel.getGeneralUIFlow.onEach { key ->
1135+
// when (key) {
1136+
// NO_OFFLINE_MESSAGES_FOUND -> {
1137+
// binding.progressBar.visibility = View.GONE
1138+
// binding.messagesListView.visibility = View.GONE
1139+
// binding.offline.root.visibility = View.VISIBLE
1140+
// }
1141+
//
1142+
// else -> {}
1143+
// }
1144+
// }.collect()
1145+
// }
11461146

11471147
this.lifecycleScope.launch {
11481148
chatViewModel.mediaPlayerSeekbarObserver.onEach { msg ->

app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ interface ChatMessageRepository : LifecycleAwareManager {
4040

4141
val lastReadMessageFlow: Flow<Int>
4242

43-
/**
44-
* Used for informing the user of the underlying processing behind offline support, [String] is the key
45-
* which is handled in a switch statement in ChatActivity.
46-
*/
47-
val generalUIFlow: Flow<String>
43+
// /**
44+
// * Used for informing the user of the underlying processing behind offline support, [String] is the key
45+
// * which is handled in a switch statement in ChatActivity.
46+
// */
47+
// val generalUIFlow: Flow<String>
4848

49-
val removeMessageFlow: Flow<ChatMessage>
49+
// val removeMessageFlow: Flow<ChatMessage>
5050

5151
fun initData(currentUser: User, credentials: String, urlForChatting: String, roomToken: String, threadId: Long?)
5252

app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ class OfflineFirstChatRepository @Inject constructor(
102102
private val _lastReadMessageFlow:
103103
MutableSharedFlow<Int> = MutableSharedFlow()
104104

105-
override val generalUIFlow: Flow<String>
106-
get() = _generalUIFlow
107-
108-
private val _generalUIFlow: MutableSharedFlow<String> = MutableSharedFlow()
109-
110-
override val removeMessageFlow: Flow<ChatMessage>
111-
get() = _removeMessageFlow
105+
// override val generalUIFlow: Flow<String>
106+
// get() = _generalUIFlow
107+
//
108+
// private val _generalUIFlow: MutableSharedFlow<String> = MutableSharedFlow()
112109

113-
private val _removeMessageFlow:
114-
MutableSharedFlow<ChatMessage> = MutableSharedFlow()
110+
// override val removeMessageFlow: Flow<ChatMessage>
111+
// get() = _removeMessageFlow
112+
//
113+
// private val _removeMessageFlow:
114+
// MutableSharedFlow<ChatMessage> = MutableSharedFlow()
115115

116116
private var newXChatLastCommonRead: Int? = null
117117
private var itIsPaused = false
@@ -191,7 +191,7 @@ class OfflineFirstChatRepository @Inject constructor(
191191
} else if (!weAlreadyHaveSomeOfflineMessages) {
192192
Log.d(TAG, "An online request for newest 100 messages is made because offline chat is empty")
193193
if (networkMonitor.isOnline.value.not()) {
194-
_generalUIFlow.emit(ChatActivity.NO_OFFLINE_MESSAGES_FOUND)
194+
// _generalUIFlow.emit(ChatActivity.NO_OFFLINE_MESSAGES_FOUND)
195195
}
196196
} else {
197197
Log.d(
@@ -1024,7 +1024,6 @@ class OfflineFirstChatRepository @Inject constructor(
10241024

10251025
override suspend fun deleteTempMessage(chatMessage: ChatMessage) {
10261026
chatDao.deleteTempChatMessages(internalConversationId, listOf(chatMessage.referenceId.orEmpty()))
1027-
_removeMessageFlow.emit(chatMessage)
10281027
}
10291028

10301029
override suspend fun pinMessage(credentials: String, url: String, pinUntil: Int): Flow<ChatMessage?> =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ class ChatViewModel @Inject constructor(
221221
// _chatMessageViewState.value = ChatMessageErrorState
222222
// }
223223

224-
val getRemoveMessageFlow = chatRepository.removeMessageFlow
224+
// val getRemoveMessageFlow = chatRepository.removeMessageFlow
225225

226226
val getUpdateMessageFlow = chatRepository.updateMessageFlow
227227

@@ -236,7 +236,7 @@ class ChatViewModel @Inject constructor(
236236
_getRoomViewState.value = GetRoomErrorState
237237
}
238238

239-
val getGeneralUIFlow = chatRepository.generalUIFlow
239+
// val getGeneralUIFlow = chatRepository.generalUIFlow
240240

241241
sealed interface ViewState
242242

0 commit comments

Comments
 (0)