mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 09:20:19 +01:00
Preclude cancelation of pre-uploaded video attachments.
Addresses ##10225.
This commit is contained in:
@@ -1941,6 +1941,10 @@ class ConversationFragment :
|
||||
onComplete = {
|
||||
onSendComplete()
|
||||
afterSendComplete()
|
||||
},
|
||||
onError = {
|
||||
Log.w(TAG, "Error received during send!", it)
|
||||
toast(R.string.ConversationActivity_error_sending_media)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ class ConversationRepository(
|
||||
emitter.onComplete()
|
||||
}
|
||||
} else {
|
||||
MessageSender.sendPushWithPreUploadedMedia(
|
||||
val sendSuccessful = MessageSender.sendPushWithPreUploadedMedia(
|
||||
AppDependencies.application,
|
||||
message,
|
||||
preUploadResults,
|
||||
@@ -233,6 +233,10 @@ class ConversationRepository(
|
||||
) {
|
||||
emitter.onComplete()
|
||||
}
|
||||
|
||||
if (!sendSuccessful) {
|
||||
emitter.tryOnError(IllegalStateException("Could not send pre-uploaded attachments because they did not exist!"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user