Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broadcast send when user sends to both story and non-story.

Browse Source
This commit is contained in:
Alex Hart
2022-03-24 14:09:39 -03:00
committed by Greyson Parrelli
parent 6e9a6283fc
commit 6c3baf229c
7 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
View File

@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
import org.thoughtcrime.securesms.sms.MessageSender
import org.thoughtcrime.securesms.sms.MessageSender.PreUploadResult
import org.thoughtcrime.securesms.sms.OutgoingStoryMessage
import org.thoughtcrime.securesms.util.MessageUtil
import java.util.Collections
import java.util.concurrent.TimeUnit
@@ -254,12 +255,19 @@ class MediaSelectionRepository(context: Context) {
}
}
storyMessages.forEach { (preUploadResult, messages) ->
MessageSender.sendMediaBroadcast(context, messages, Collections.singleton(preUploadResult))
}
if (broadcastMessages.isNotEmpty()) {
MessageSender.sendMediaBroadcast(context, broadcastMessages, preUploadResults)
MessageSender.sendMediaBroadcast(
context,
broadcastMessages,
preUploadResults,
storyMessages.flatMap { (preUploadResult, messages) ->
messages.map { OutgoingStoryMessage(it, preUploadResult) }
}
)
} else {
storyMessages.forEach { (preUploadResult, messages) ->
MessageSender.sendMediaBroadcast(context, messages, Collections.singleton(preUploadResult), Collections.emptyList())
}
}
}
}