Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-01 14:13:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline the pnp feature flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-06 14:01:38 -05:00
committed by Cody Henthorne
parent 8ad77ac7aa
commit c359ddf3c8
14 changed files with 29 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
View File

@@ -371,7 +371,6 @@ public class SignalServiceAccountManager {
public CdsiV2Service.Response getRegisteredUsersWithCdsi(Set<String> previousE164s,
Set<String> newE164s,
Map<ServiceId, ProfileKey> serviceIds,
boolean requireAcis,
Optional<byte[]> token,
String mrEnclave,
Long timeoutMs,
@@ -380,7 +379,7 @@ public class SignalServiceAccountManager {
{
CdsiAuthResponse auth = pushServiceSocket.getCdsiAuth();
CdsiV2Service service = new CdsiV2Service(configuration, mrEnclave);
CdsiV2Service.Request request = new CdsiV2Service.Request(previousE164s, newE164s, serviceIds, requireAcis, token);
CdsiV2Service.Request request = new CdsiV2Service.Request(previousE164s, newE164s, serviceIds, token);
Single<ServiceResponse<CdsiV2Service.Response>> single = service.getRegisteredUsers(auth.getUsername(), auth.getPassword(), request, tokenSaver);
ServiceResponse<CdsiV2Service.Response> serviceResponse;

8
libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java
View File

@@ -101,8 +101,7 @@ public final class CdsiV2Service {
.prevE164s(toByteString(previousE164s))
.newE164s(toByteString(newE164s))
.discardE164s(toByteString(removedE164s))
.aciUakPairs(toByteString(request.serviceIds))
.returnAcisWithoutUaks(request.requireAcis);
.aciUakPairs(toByteString(request.serviceIds));
if (request.token != null) {
builder.token(ByteString.of(request.token));
@@ -155,11 +154,9 @@ public final class CdsiV2Service {
final Map<ServiceId, ProfileKey> serviceIds;
final boolean requireAcis;
final byte[] token;
public Request(Set<String> previousE164s, Set<String> newE164s, Map<ServiceId, ProfileKey> serviceIds, boolean requireAcis, Optional<byte[]> token) {
public Request(Set<String> previousE164s, Set<String> newE164s, Map<ServiceId, ProfileKey> serviceIds, Optional<byte[]> token) {
if (previousE164s.size() > 0 && !token.isPresent()) {
throw new IllegalArgumentException("You must have a token if you have previousE164s!");
}
@@ -168,7 +165,6 @@ public final class CdsiV2Service {
this.newE164s = newE164s;
this.removedE164s = Collections.emptySet();
this.serviceIds = serviceIds;
this.requireAcis = requireAcis;
this.token = token.orElse(null);
}