webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hint that messages must be regularly received

Browse source
This commit is contained in:
AsamK 2021-05-24 12:14:44 +02:00
parent 2a0bba62be
commit cfc818872f
4 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -330,6 +330,17 @@ public class Manager implements Closeable {
}
public void checkAccountState() throws IOException {
if (account.getLastReceiveTimestamp() == 0) {
logger.warn("The Signal protocol expects that incoming messages are regularly received.");
} else {
var diffInMilliseconds = new Date().getTime() - account.getLastReceiveTimestamp();
long days = TimeUnit.DAYS.convert(diffInMilliseconds, TimeUnit.MILLISECONDS);
if (days > 7) {
logger.warn(
"Messages have been last received {} days ago. The Signal protocol expects that incoming messages are regularly received.",
days);
}
}
if (accountManager.getPreKeysCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
refreshPreKeys();
}
@ -1982,6 +1993,7 @@ public class Manager implements Closeable {
SignalServiceContent content = null;
Exception exception = null;
final CachedMessage[] cachedMessage = {null};
account.setLastReceiveTimestamp(new Date().getTime());
try {
var result = messagePipe.readOrEmpty(timeout, unit, envelope1 -> {
final var recipientId = envelope1.hasSource()

16
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -84,6 +84,7 @@ public class SignalAccount implements Closeable {
private ProfileKey profileKey;
private int preKeyIdOffset;
private int nextSignedPreKeyId;
private long lastReceiveTimestamp = 0;
private boolean registered = false;
@ -261,6 +262,7 @@ public class SignalAccount implements Closeable {
this.deviceId = deviceId;
this.registered = true;
this.isMultiDevice = true;
this.lastReceiveTimestamp = 0;
}
private void migrateLegacyConfigs() {
@ -368,6 +370,9 @@ public class SignalAccount implements Closeable {
if (rootNode.hasNonNull("isMultiDevice")) {
isMultiDevice = rootNode.get("isMultiDevice").asBoolean();
}
if (rootNode.hasNonNull("lastReceiveTimestamp")) {
lastReceiveTimestamp = rootNode.get("lastReceiveTimestamp").asLong();
}
int registrationId = 0;
if (rootNode.hasNonNull("registrationId")) {
registrationId = rootNode.get("registrationId").asInt();
@ -637,6 +642,7 @@ public class SignalAccount implements Closeable {
.put("deviceName", encryptedDeviceName)
.put("deviceId", deviceId)
.put("isMultiDevice", isMultiDevice)
.put("lastReceiveTimestamp", lastReceiveTimestamp)
.put("password", password)
.put("registrationId", identityKeyStore.getLocalRegistrationId())
.put("identityPrivateKey",
@ -870,6 +876,15 @@ public class SignalAccount implements Closeable {
save();
}
public long getLastReceiveTimestamp() {
return lastReceiveTimestamp;
}
public void setLastReceiveTimestamp(final long lastReceiveTimestamp) {
this.lastReceiveTimestamp = lastReceiveTimestamp;
save();
}
public boolean isUnrestrictedUnidentifiedAccess() {
// TODO make configurable
return false;
@ -893,6 +908,7 @@ public class SignalAccount implements Closeable {
this.registered = true;
this.uuid = uuid;
this.registrationLockPin = pin;
this.lastReceiveTimestamp = 0;
save();
getSessionStore().archiveAllSessions();