Fixes #13856 - Group call for 1 member
This commit is contained in:
parent
ba79a3e83e
commit
39a23df1a7
3 changed files with 19 additions and 3 deletions
|
@ -55,7 +55,8 @@ internal object ConversationOptionsMenu {
|
|||
distributionType,
|
||||
threadId,
|
||||
messageRequestState,
|
||||
isInBubble
|
||||
isInBubble,
|
||||
isSingleMember
|
||||
) = callback.getSnapshot()
|
||||
|
||||
if (recipient == null) {
|
||||
|
@ -181,6 +182,13 @@ internal object ConversationOptionsMenu {
|
|||
}
|
||||
})
|
||||
|
||||
lifecycleDisposable += isSingleMember.subscribeBy(onNext = { yes: Boolean ->
|
||||
val item = menu.findItem(R.id.menu_video_secure)
|
||||
if(item != null) {
|
||||
item.isVisible = item.isVisible && yes
|
||||
}
|
||||
})
|
||||
|
||||
menu.findItem(R.id.menu_format_text_submenu).subMenu?.clearHeader()
|
||||
menu.findItem(R.id.edittext_bold).applyTitleSpan(MessageStyler.boldStyle())
|
||||
menu.findItem(R.id.edittext_italic).applyTitleSpan(MessageStyler.italicStyle())
|
||||
|
@ -258,7 +266,8 @@ internal object ConversationOptionsMenu {
|
|||
val distributionType: Int,
|
||||
val threadId: Long,
|
||||
val messageRequestState: MessageRequestState,
|
||||
val isInBubble: Boolean
|
||||
val isInBubble: Boolean,
|
||||
val isSingleMember: Observable<Boolean>,
|
||||
)
|
||||
|
||||
/**
|
||||
|
|
|
@ -3336,7 +3336,8 @@ class ConversationFragment :
|
|||
distributionType = args.distributionType,
|
||||
threadId = args.threadId,
|
||||
messageRequestState = viewModel.messageRequestState,
|
||||
isInBubble = args.conversationScreenType.isInBubble
|
||||
isInBubble = args.conversationScreenType.isInBubble,
|
||||
isSingleMember = viewModel.isSingleMember()
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -540,6 +540,12 @@ class ConversationViewModel(
|
|||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
|
||||
fun isSingleMember() : Observable<Boolean> {
|
||||
return groupMemberServiceIds
|
||||
.map { it.isEmpty() }
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
|
||||
fun copyToClipboard(context: Context, messageParts: Set<MultiselectPart>): Maybe<CharSequence> {
|
||||
return repository.copyToClipboard(context, messageParts)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue