Avoid potential race condition in attachment uploads.

This commit is contained in:
Ehren Kret 2020-03-31 11:17:40 -07:00 committed by Greyson Parrelli
parent 04bb4b351a
commit a65c4f90f4

View File

@ -354,11 +354,12 @@ public class SignalServiceMessageSender {
attachment.getCancelationSignal()); 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..."); Log.d(TAG, "Using pipe to retrieve attachment upload attributes...");
try { try {
uploadAttributes = pipe.get().get().getAttachmentUploadAttributes(); uploadAttributes = localPipe.get().getAttachmentUploadAttributes();
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to retrieve attachment upload attributes using pipe. Falling back..."); Log.w(TAG, "Failed to retrieve attachment upload attributes using pipe. Falling back...");
} }