Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 07:08:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert Device.Capabilities to a record

Browse Source
This commit is contained in:
Jon Chambers
2023-08-07 12:37:07 -04:00
committed by Jon Chambers
parent d868e3075c
commit d51c6fd2f8
7 changed files with 16 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@@ -344,7 +344,7 @@ public class DeviceController {
}
static boolean isCapabilityDowngrade(Account account, DeviceCapabilities capabilities) {
return account.isPniSupported() && !capabilities.isPni();
return account.isPniSupported() && !capabilities.pni();
}
private Pair<Account, Device> createDevice(final String password,

8
service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
View File

@@ -247,21 +247,21 @@ public class Account {
public boolean isStorageSupported() {
requireNotStale();
return devices.stream().anyMatch(device -> device.getCapabilities() != null && device.getCapabilities().isStorage());
return devices.stream().anyMatch(device -> device.getCapabilities() != null && device.getCapabilities().storage());
}
public boolean isTransferSupported() {
requireNotStale();
return getMasterDevice().map(Device::getCapabilities).map(Device.DeviceCapabilities::isTransfer).orElse(false);
return getMasterDevice().map(Device::getCapabilities).map(Device.DeviceCapabilities::transfer).orElse(false);
}
public boolean isPniSupported() {
return allEnabledDevicesHaveCapability(DeviceCapabilities::isPni);
return allEnabledDevicesHaveCapability(DeviceCapabilities::pni);
}
public boolean isPaymentActivationSupported() {
return allEnabledDevicesHaveCapability(DeviceCapabilities::isPaymentActivation);
return allEnabledDevicesHaveCapability(DeviceCapabilities::paymentActivation);
}
private boolean allEnabledDevicesHaveCapability(final Predicate<DeviceCapabilities> predicate) {

39
service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
View File

@@ -274,43 +274,6 @@ public class Device {
return this.userAgent;
}
public static class DeviceCapabilities {
@JsonProperty
private boolean storage;
@JsonProperty
private boolean transfer;
@JsonProperty
private boolean pni;
@JsonProperty
private boolean paymentActivation;
public DeviceCapabilities() {
}
public DeviceCapabilities(boolean storage, boolean transfer, final boolean pni, final boolean paymentActivation) {
this.storage = storage;
this.transfer = transfer;
this.pni = pni;
this.paymentActivation = paymentActivation;
}
public boolean isStorage() {
return storage;
}
public boolean isTransfer() {
return transfer;
}
public boolean isPni() {
return pni;
}
public boolean isPaymentActivation() {
return paymentActivation;
}
public record DeviceCapabilities(boolean storage, boolean transfer, boolean pni, boolean paymentActivation) {
}
}