mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-05-02 14:43:09 +01:00
Make max envelope size remote configurable.
This commit is contained in:
@@ -186,7 +186,6 @@ public class SignalServiceMessageSender {
|
||||
private final long maxEnvelopeSize;
|
||||
private final BooleanSupplier useRestFallback;
|
||||
private final UsePqRatchet usePqRatchet;
|
||||
private final Optional<Long> internalOnlyMaxEnvelopeSize;
|
||||
|
||||
public SignalServiceMessageSender(PushServiceSocket pushServiceSocket,
|
||||
SignalServiceDataStore store,
|
||||
@@ -198,27 +197,25 @@ public class SignalServiceMessageSender {
|
||||
ExecutorService executor,
|
||||
long maxEnvelopeSize,
|
||||
BooleanSupplier useRestFallback,
|
||||
UsePqRatchet usePqRatchet,
|
||||
Optional<Long> internalOnlyMaxEnvelopeSize)
|
||||
UsePqRatchet usePqRatchet)
|
||||
{
|
||||
CredentialsProvider credentialsProvider = pushServiceSocket.getCredentialsProvider();
|
||||
|
||||
this.socket = pushServiceSocket;
|
||||
this.aciStore = store.aci();
|
||||
this.sessionLock = sessionLock;
|
||||
this.localAddress = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
|
||||
this.localDeviceId = credentialsProvider.getDeviceId();
|
||||
this.localPni = credentialsProvider.getPni();
|
||||
this.attachmentApi = attachmentApi;
|
||||
this.messageApi = messageApi;
|
||||
this.eventListener = eventListener;
|
||||
this.maxEnvelopeSize = maxEnvelopeSize;
|
||||
this.localPniIdentity = store.pni().getIdentityKeyPair();
|
||||
this.scheduler = Schedulers.from(executor, false, false);
|
||||
this.keysApi = keysApi;
|
||||
this.useRestFallback = useRestFallback;
|
||||
this.usePqRatchet = usePqRatchet;
|
||||
this.internalOnlyMaxEnvelopeSize = internalOnlyMaxEnvelopeSize;
|
||||
this.socket = pushServiceSocket;
|
||||
this.aciStore = store.aci();
|
||||
this.sessionLock = sessionLock;
|
||||
this.localAddress = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
|
||||
this.localDeviceId = credentialsProvider.getDeviceId();
|
||||
this.localPni = credentialsProvider.getPni();
|
||||
this.attachmentApi = attachmentApi;
|
||||
this.messageApi = messageApi;
|
||||
this.eventListener = eventListener;
|
||||
this.maxEnvelopeSize = maxEnvelopeSize;
|
||||
this.localPniIdentity = store.pni().getIdentityKeyPair();
|
||||
this.scheduler = Schedulers.from(executor, false, false);
|
||||
this.keysApi = keysApi;
|
||||
this.useRestFallback = useRestFallback;
|
||||
this.usePqRatchet = usePqRatchet;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2817,10 +2814,6 @@ public class SignalServiceMessageSender {
|
||||
throw new ContentTooLargeException(size);
|
||||
}
|
||||
|
||||
if (internalOnlyMaxEnvelopeSize.isPresent() && size > internalOnlyMaxEnvelopeSize.get()) {
|
||||
throw new ContentTooLargeException(size);
|
||||
}
|
||||
|
||||
return content;
|
||||
}
|
||||
|
||||
@@ -2831,10 +2824,6 @@ public class SignalServiceMessageSender {
|
||||
throw new ContentTooLargeException(size);
|
||||
}
|
||||
|
||||
if (internalOnlyMaxEnvelopeSize.isPresent() && size > internalOnlyMaxEnvelopeSize.get()) {
|
||||
throw new ContentTooLargeException(size);
|
||||
}
|
||||
|
||||
return content;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user