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

Expose gv1-migration on profile endpoint

Browse Source
This commit is contained in:
Ehren Kret
2020-10-28 11:50:08 -05:00
committed by Jon Chambers
parent b00577fda4
commit 5587b7d469
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
View File

@@ -197,7 +197,7 @@ public class ProfileController {
accountProfile.get().getIdentityKey(),
UnidentifiedAccessChecksum.generateFor(accountProfile.get().getUnidentifiedAccessKey()),
accountProfile.get().isUnrestrictedUnidentifiedAccess(),
new UserCapabilities(accountProfile.get().isGroupsV2Supported()),
new UserCapabilities(accountProfile.get().isGroupsV2Supported(), accountProfile.get().isGv1MigrationSupported()),
username.orElse(null),
null,
credential.orElse(null),
@@ -235,7 +235,7 @@ public class ProfileController {
accountProfile.get().getIdentityKey(),
UnidentifiedAccessChecksum.generateFor(accountProfile.get().getUnidentifiedAccessKey()),
accountProfile.get().isUnrestrictedUnidentifiedAccess(),
new UserCapabilities(accountProfile.get().isGroupsV2Supported()),
new UserCapabilities(accountProfile.get().isGroupsV2Supported(), accountProfile.get().isGv1MigrationSupported()),
username,
accountProfile.get().getUuid(),
null,
@@ -308,7 +308,7 @@ public class ProfileController {
accountProfile.get().getIdentityKey(),
UnidentifiedAccessChecksum.generateFor(accountProfile.get().getUnidentifiedAccessKey()),
accountProfile.get().isUnrestrictedUnidentifiedAccess(),
new UserCapabilities(accountProfile.get().isGroupsV2Supported()),
new UserCapabilities(accountProfile.get().isGroupsV2Supported(), accountProfile.get().isGv1MigrationSupported()),
username.orElse(null),
null,
null,

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

@@ -6,13 +6,21 @@ public class UserCapabilities {
@JsonProperty
private boolean gv2;
@JsonProperty("gv1-migration")
private boolean gv1Migration;
public UserCapabilities() {}
public UserCapabilities(boolean gv2) {
public UserCapabilities(boolean gv2, boolean gv1Migration) {
this.gv2 = gv2;
this.gv1Migration = gv1Migration;
}
public boolean isGv2() {
return gv2;
}
public boolean isGv1Migration() {
return gv1Migration;
}
}