empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Avoid potential race condition in attachment uploads.

Browse source
This commit is contained in:
Ehren Kret 2020-03-31 11:17:40 -07:00 • committed by Greyson Parrelli
parent 04bb4b351a
commit a65c4f90f4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View file

@ -353,12 +353,13 @@ public class SignalServiceMessageSender {
attachment.getListener(),
attachment.getCancelationSignal());
AttachmentUploadAttributes uploadAttributes = null;
AttachmentUploadAttributes uploadAttributes = null;
Optional<SignalServiceMessagePipe> localPipe = pipe.get();
if (pipe.get().isPresent()) {
if (localPipe.isPresent()) {
Log.d(TAG, "Using pipe to retrieve attachment upload attributes...");
try {
uploadAttributes = pipe.get().get().getAttachmentUploadAttributes();
uploadAttributes = localPipe.get().getAttachmentUploadAttributes();
} catch (IOException e) {
Log.w(TAG, "Failed to retrieve attachment upload attributes using pipe. Falling back...");
}