TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove AttachmentsV3 feature flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-09-10 22:02:38 -04:00
parent dc4faf57cb
commit 706f43caa8
7 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -124,7 +124,6 @@ public class SignalServiceMessageSender {
private final AtomicReference<Optional<SignalServiceMessagePipe>> pipe;
private final AtomicReference<Optional<SignalServiceMessagePipe>> unidentifiedPipe;
private final AtomicBoolean isMultiDevice;
private final AtomicBoolean attachmentsV3;
private final ExecutorService executor;
@@ -144,14 +143,13 @@ public class SignalServiceMessageSender {
SignalProtocolStore store,
String signalAgent,
boolean isMultiDevice,
boolean attachmentsV3,
Optional<SignalServiceMessagePipe> pipe,
Optional<SignalServiceMessagePipe> unidentifiedPipe,
Optional<EventListener> eventListener,
ClientZkProfileOperations clientZkProfileOperations,
ExecutorService executor)
{
this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, signalAgent, isMultiDevice, attachmentsV3, pipe, unidentifiedPipe, eventListener, clientZkProfileOperations, executor);
this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, signalAgent, isMultiDevice, pipe, unidentifiedPipe, eventListener, clientZkProfileOperations, executor);
}
public SignalServiceMessageSender(SignalServiceConfiguration urls,
@@ -159,7 +157,6 @@ public class SignalServiceMessageSender {
SignalProtocolStore store,
String signalAgent,
boolean isMultiDevice,
boolean attachmentsV3,
Optional<SignalServiceMessagePipe> pipe,
Optional<SignalServiceMessagePipe> unidentifiedPipe,
Optional<EventListener> eventListener,
@@ -172,7 +169,6 @@ public class SignalServiceMessageSender {
this.pipe = new AtomicReference<>(pipe);
this.unidentifiedPipe = new AtomicReference<>(unidentifiedPipe);
this.isMultiDevice = new AtomicBoolean(isMultiDevice);
this.attachmentsV3 = new AtomicBoolean(attachmentsV3);
this.eventListener = eventListener;
this.executor = executor != null ? executor : Executors.newSingleThreadExecutor();
}
@@ -365,11 +361,10 @@ public class SignalServiceMessageSender {
socket.cancelInFlightRequests();
}
public void update(SignalServiceMessagePipe pipe, SignalServiceMessagePipe unidentifiedPipe, boolean isMultiDevice, boolean attachmentsV3) {
public void update(SignalServiceMessagePipe pipe, SignalServiceMessagePipe unidentifiedPipe, boolean isMultiDevice) {
this.pipe.set(Optional.fromNullable(pipe));
this.unidentifiedPipe.set(Optional.fromNullable(unidentifiedPipe));
this.isMultiDevice.set(isMultiDevice);
this.attachmentsV3.set(attachmentsV3);
}
public SignalServiceAttachmentPointer uploadAttachment(SignalServiceAttachmentStream attachment) throws IOException {