mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 13:48:52 +01:00
Merge remote-tracking branch 'origin/send-to-multiple-addresses-doesn't-start-new-conversations' into send-to-multiple-addresses-doesn't-start-new-conversations
# Conflicts: # presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
This commit is contained in:
@@ -1024,14 +1024,14 @@ class ComposeViewModel @Inject constructor(
|
|||||||
return@withLatestFrom
|
return@withLatestFrom
|
||||||
}
|
}
|
||||||
|
|
||||||
val subId = state.subscription?.subscriptionId ?: -1
|
val subId = state.subscription?.subscriptionId ?: -1
|
||||||
val addresses = when (conversation.recipients.isNotEmpty()) {
|
val addresses = when (conversation.recipients.isNotEmpty()) {
|
||||||
true -> conversation.recipients.map { it.address }
|
true -> conversation.recipients.map { it.address }
|
||||||
false -> chips.map { chip -> chip.address }
|
false -> chips.map { chip -> chip.address }
|
||||||
}
|
}
|
||||||
val sendAsGroup = ((addresses.size > 1) && // if more than one address to send to
|
val sendAsGroup = ((addresses.size > 1) && // if more than one address to send to
|
||||||
(!state.editingMode || // and is not a new convo
|
(!state.editingMode || // and is not a new convo
|
||||||
state.sendAsGroup)) // or (is a new convo and) send as group is selected
|
state.sendAsGroup)) // or (is a new convo and) send as group is selected
|
||||||
|
|
||||||
when {
|
when {
|
||||||
// Scheduling a message
|
// Scheduling a message
|
||||||
|
|||||||
Reference in New Issue
Block a user