Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 02:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix showing banners in conversation view.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-08-16 12:27:19 -04:00
committed by mtang-signal
parent 112473bc5c
commit cc615fbf87
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
View File

@@ -293,7 +293,11 @@ class ConversationViewModel(
.flatMapMaybe { groupRecord -> repository.getReminder(groupRecord.orNull()) }
.observeOn(AndroidSchedulers.mainThread())
groupRecordFlow = recipientRepository.groupRecord.subscribeOn(Schedulers.io()).asFlow().mapNotNull { it.orNull() }
groupRecordFlow = recipientRepository.groupRecord
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.asFlow()
.mapNotNull { it.orNull() }
Observable.combineLatest(
refreshIdentityRecords.startWithItem(Unit).observeOn(Schedulers.io()),
@@ -329,7 +333,7 @@ class ConversationViewModel(
val groupV1SuggestionsFlow = merge(
flow {
GroupsV1MigrationSuggestionsBanner(0, {}, {})
emit(GroupsV1MigrationSuggestionsBanner(0, {}, {}))
},
groupRecordFlow.flatMapConcat { GroupsV1MigrationSuggestionsBanner.createFlow(it.gv1MigrationSuggestions.size, onAddMembers, onNoThanks) }
)