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

Only consider desktop devices GV2-capable if they send the third-gen GV2 capability.

Browse Source
This commit is contained in:
Jon Chambers
2020-09-25 16:21:36 -04:00
committed by Jon Chambers
parent 9ed16478f4
commit 656e6db846
5 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,11 +252,21 @@ public class Device {
}
public boolean isGroupsV2Supported() {
if (this.getGcmId() != null) {
return this.capabilities != null && (this.capabilities.isGv2() || this.capabilities.isGv2_2());
final boolean groupsV2Supported;
if (this.capabilities != null) {
if (this.getGcmId() != null) {
groupsV2Supported = this.capabilities.isGv2() || this.capabilities.isGv2_2() || this.capabilities.isGv2_3();
} else if (this.apnId != null || this.voipApnId != null) {
groupsV2Supported = this.capabilities.isGv2_2() || this.capabilities.isGv2_3();
} else {
groupsV2Supported = this.capabilities.isGv2_3();
}
} else {
return this.capabilities != null && this.capabilities.isGv2_2();
groupsV2Supported = false;
}
return groupsV2Supported;
}
@Override
@@ -279,6 +289,9 @@ public class Device {
@JsonProperty("gv2-2")
private boolean gv2_2;
@JsonProperty("gv2-3")
private boolean gv2_3;
@JsonProperty
private boolean storage;
@@ -287,9 +300,10 @@ public class Device {
public DeviceCapabilities() {}
public DeviceCapabilities(boolean gv2, final boolean gv2_2, boolean storage, boolean transfer) {
public DeviceCapabilities(boolean gv2, final boolean gv2_2, final boolean gv2_3, boolean storage, boolean transfer) {
this.gv2 = gv2;
this.gv2_2 = gv2_2;
this.gv2_3 = gv2_3;
this.storage = storage;
this.transfer = transfer;
}
@@ -302,6 +316,10 @@ public class Device {
return gv2_2;
}
public boolean isGv2_3() {
return gv2_3;
}
public boolean isStorage() {
return storage;
}