MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix capabilities NPE

This commit is contained in:
Moxie Marlinspike 2019-10-20 08:27:06 -07:00
parent c623f70caa
commit 44d38a00d4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,9 @@ public class Account implements Principal {
} }
public boolean isUuidAddressingSupported() { public boolean isUuidAddressingSupported() {
return devices.stream().filter(Device::isEnabled).allMatch(device -> device.getCapabilities().isUuid()); return devices.stream()
.filter(Device::isEnabled)
.allMatch(device -> device.getCapabilities() != null && device.getCapabilities().isUuid());
} }
public boolean isEnabled() { public boolean isEnabled() {

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

@ -23,6 +23,8 @@ import org.whispersystems.textsecuregcm.entities.UserCapabilities;
import org.whispersystems.textsecuregcm.entities.SignedPreKey; import org.whispersystems.textsecuregcm.entities.SignedPreKey;
import org.whispersystems.textsecuregcm.util.Util; import org.whispersystems.textsecuregcm.util.Util;
import javax.annotation.Nullable;
import javax.validation.constraints.Null;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class Device { public class Device {
@ -188,7 +190,7 @@ public class Device {
return new AuthenticationCredentials(authToken, salt); return new AuthenticationCredentials(authToken, salt);
} }
public DeviceCapabilities getCapabilities() { public @Nullable DeviceCapabilities getCapabilities() {
return capabilities; return capabilities;
} }