signalapp/libsignal-service-java
signalapp/libsignal-service-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved socket fallback for attachment v2

Browse Source
This commit is contained in:
Greyson Parrelli 2019-06-14 14:47:12 -04:00
parent 1aebce8d6e
commit eed1625965
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -332,12 +332,18 @@ public class SignalServiceMessageSender {
new AttachmentCipherOutputStreamFactory(attachmentKey),
attachment.getListener());
AttachmentUploadAttributes uploadAttributes;
AttachmentUploadAttributes uploadAttributes = null;
if (pipe.get().isPresent()) {
Log.d(TAG, "Using pipe to retrieve attachment upload attributes...");
uploadAttributes = pipe.get().get().getAttachmentUploadAttributes();
} else {
try {
uploadAttributes = pipe.get().get().getAttachmentUploadAttributes();
} catch (IOException e) {
Log.w(TAG, "Failed to retrieve attachment upload attributes using pipe. Falling back...");
}
}
if (uploadAttributes == null) {
Log.d(TAG, "Not using pipe to retrieve attachment upload attributes...");
uploadAttributes = socket.getAttachmentUploadAttributes();
}