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

Retry decrypting of messages from previously untrusted keys

Browse source 
Decrypts messages from untrusted keys, if they are trusted now
This commit is contained in:
AsamK 2016-08-20 16:04:00 +02:00
parent 5ee375c74d
commit b2289568ef
1 changed files with 70 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/main/java/org/asamk/signal/Manager.java
View file

@ -864,7 +864,49 @@ class Manager implements Signal {
}
}
public void retryFailedReceivedMessages(ReceiveMessageHandler handler) {
final File cachePath = new File(getMessageCachePath());
if (!cachePath.exists()) {
return;
}
for (final File dir : cachePath.listFiles()) {
if (!dir.isDirectory()) {
continue;
}
String sender = dir.getName();
for (final File fileEntry : dir.listFiles()) {
if (!fileEntry.isFile()) {
continue;
}
SignalServiceEnvelope envelope;
try {
envelope = loadEnvelope(fileEntry);
if (envelope == null) {
continue;
}
} catch (IOException e) {
e.printStackTrace();
continue;
}
SignalServiceContent content = null;
if (!envelope.isReceipt()) {
try {
content = decryptMessage(envelope);
} catch (Exception e) {
continue;
}
handleMessage(envelope, content);
}
save();
handler.handleMessage(envelope, content, null);
fileEntry.delete();
}
}
}
public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
retryFailedReceivedMessages(handler);
final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(URL, TRUST_STORE, username, password, deviceId, signalingKey, USER_AGENT);
SignalServiceMessagePipe messagePipe = null;
@ -1000,6 +1042,34 @@ class Manager implements Signal {
}
}
private SignalServiceEnvelope loadEnvelope(File file) throws IOException {
try (FileInputStream f = new FileInputStream(file)) {
DataInputStream in = new DataInputStream(f);
int version = in.readInt();
if (version != 1) {
return null;
}
int type = in.readInt();
String source = in.readUTF();
int sourceDevice = in.readInt();
String relay = in.readUTF();
long timestamp = in.readLong();
byte[] content = null;
int contentLen = in.readInt();
if (contentLen > 0) {
content = new byte[contentLen];
in.readFully(content);
}
byte[] legacyMessage = null;
int legacyMessageLen = in.readInt();
if (legacyMessageLen > 0) {
legacyMessage = new byte[legacyMessageLen];
in.readFully(legacyMessage);
}
return new SignalServiceEnvelope(type, source, sourceDevice, relay, timestamp, legacyMessage, content);
}
}
private void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
try (FileOutputStream f = new FileOutputStream(file)) {
DataOutputStream out = new DataOutputStream(f);