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

Fix for inactive auth problem

This commit is contained in:
Moxie Marlinspike 2019-01-24 17:48:04 -08:00
parent f630ccb134
commit e201344ccd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
View File

@ -66,7 +66,7 @@ public class AccountAuthenticator implements Authenticator<BasicCredentials, Acc
return Optional.empty(); return Optional.empty();
} }
if (!device.get().isMaster() && !device.get().isActive()) { if (!device.get().isMaster() && device.get().isIdleInactive()) {
return Optional.empty(); return Optional.empty();
} }

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

@ -195,7 +195,11 @@ public class Device {
boolean hasChannel = fetchesMessages || !Util.isEmpty(getApnId()) || !Util.isEmpty(getGcmId()); boolean hasChannel = fetchesMessages || !Util.isEmpty(getApnId()) || !Util.isEmpty(getGcmId());
return (id == MASTER_ID && hasChannel && signedPreKey != null) || return (id == MASTER_ID && hasChannel && signedPreKey != null) ||
(id != MASTER_ID && hasChannel && signedPreKey != null && lastSeen > (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))); (id != MASTER_ID && hasChannel && signedPreKey != null && !isIdleInactive());
}
public boolean isIdleInactive() {
return id != MASTER_ID && lastSeen < (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30));
} }
public boolean getFetchesMessages() { public boolean getFetchesMessages() {