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

Count accounts rather than devices that are stories-capable

This commit is contained in:
Jon Chambers 2022-10-25 16:36:05 -04:00 committed by GitHub
parent 5868d9969a
commit 91626dea45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
View File

@ -89,6 +89,8 @@ public class BaseAccountAuthenticator {
return Optional.empty(); return Optional.empty();
} }
hasStoryCapability = account.map(Account::isStoriesSupported).orElse(false);
Optional<Device> device = account.get().getDevice(deviceId); Optional<Device> device = account.get().getDevice(deviceId);
if (device.isEmpty()) { if (device.isEmpty()) {
@ -108,11 +110,6 @@ public class BaseAccountAuthenticator {
} }
} }
Device.DeviceCapabilities capabilities = device.get().getCapabilities();
if (capabilities != null) {
hasStoryCapability = capabilities.isStories();
}
AuthenticationCredentials deviceAuthenticationCredentials = device.get().getAuthenticationCredentials(); AuthenticationCredentials deviceAuthenticationCredentials = device.get().getAuthenticationCredentials();
if (deviceAuthenticationCredentials.verify(basicCredentials.getPassword())) { if (deviceAuthenticationCredentials.verify(basicCredentials.getPassword())) {
succeeded = true; succeeded = true;