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

Add a "change number" device/account capability

Browse Source
This commit is contained in:
Jon Chambers
2021-09-02 13:03:35 -04:00
committed by Jon Chambers
parent 18a6df34bd
commit 92f035bc2a
14 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,6 +228,7 @@ public class DeviceController {
private boolean isCapabilityDowngrade(Account account, DeviceCapabilities capabilities, String userAgent) {
boolean isDowngrade = false;
isDowngrade |= account.isChangeNumberSupported() && !capabilities.isChangeNumber();
isDowngrade |= account.isAnnouncementGroupSupported() && !capabilities.isAnnouncementGroup();
isDowngrade |= account.isSenderKeySupported() && !capabilities.isSenderKey();
isDowngrade |= account.isGv1MigrationSupported() && !capabilities.isGv1Migration();

18
service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java
View File

@@ -15,7 +15,8 @@ public class UserCapabilities {
account.isGroupsV2Supported(),
account.isGv1MigrationSupported(),
account.isSenderKeySupported(),
account.isAnnouncementGroupSupported());
account.isAnnouncementGroupSupported(),
account.isChangeNumberSupported());
}
@JsonProperty
@@ -30,13 +31,22 @@ public class UserCapabilities {
@JsonProperty
private boolean announcementGroup;
@JsonProperty
private boolean changeNumber;
public UserCapabilities() {}
public UserCapabilities(boolean gv2, boolean gv1Migration, final boolean senderKey, final boolean announcementGroup) {
public UserCapabilities(final boolean gv2,
boolean gv1Migration,
final boolean senderKey,
final boolean announcementGroup,
final boolean changeNumber) {
this.gv2 = gv2;
this.gv1Migration = gv1Migration;
this.senderKey = senderKey;
this.announcementGroup = announcementGroup;
this.changeNumber = changeNumber;
}
public boolean isGv2() {
@@ -54,4 +64,8 @@ public class UserCapabilities {
public boolean isAnnouncementGroup() {
return announcementGroup;
}
public boolean isChangeNumber() {
return changeNumber;
}
}

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

@@ -180,6 +180,14 @@ public class Account {
.allMatch(device -> device.getCapabilities() != null && device.getCapabilities().isAnnouncementGroup());
}
public boolean isChangeNumberSupported() {
requireNotStale();
return devices.stream()
.filter(Device::isEnabled)
.allMatch(device -> device.getCapabilities() != null && device.getCapabilities().isChangeNumber());
}
public boolean isEnabled() {
requireNotStale();

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

@@ -279,10 +279,13 @@ public class Device {
@JsonProperty
private boolean announcementGroup;
@JsonProperty
private boolean changeNumber;
public DeviceCapabilities() {}
public DeviceCapabilities(boolean gv2, final boolean gv2_2, final boolean gv2_3, boolean storage, boolean transfer,
boolean gv1Migration, final boolean senderKey, final boolean announcementGroup) {
boolean gv1Migration, final boolean senderKey, final boolean announcementGroup, final boolean changeNumber) {
this.gv2 = gv2;
this.gv2_2 = gv2_2;
this.gv2_3 = gv2_3;
@@ -291,6 +294,7 @@ public class Device {
this.gv1Migration = gv1Migration;
this.senderKey = senderKey;
this.announcementGroup = announcementGroup;
this.changeNumber = changeNumber;
}
public boolean isGv2() {
@@ -324,5 +328,9 @@ public class Device {
public boolean isAnnouncementGroup() {
return announcementGroup;
}
public boolean isChangeNumber() {
return changeNumber;
}
}
}