import org.whispersystems.libsignal.ecc.Curve;
import org.whispersystems.libsignal.ecc.ECKeyPair;
import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.whispersystems.libsignal.fingerprint.Fingerprint;
+import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.util.KeyHelper;
return username;
}
+ private IdentityKey getIdentity() {
+ return signalProtocolStore.getIdentityKeyPair().getPublicKey();
+ }
+
public int getDeviceId() {
return deviceId;
}
}
}
- public void load() throws IOException, InvalidKeyException {
+ public void init() throws IOException {
+ load();
+
+ migrateLegacyConfigs();
+
+ accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, deviceId, USER_AGENT);
+ try {
+ if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
+ refreshPreKeys();
+ save();
+ }
+ } catch (AuthorizationFailedException e) {
+ System.err.println("Authorization failed, was the number registered elsewhere?");
+ }
+ }
+
+ private void load() throws IOException {
openFileChannel();
JsonNode rootNode = jsonProcessot.readTree(Channels.newInputStream(fileChannel));
if (groupStore == null) {
groupStore = new JsonGroupStore();
}
+
+ JsonNode contactStoreNode = rootNode.get("contactStore");
+ if (contactStoreNode != null) {
+ contactStore = jsonProcessot.convertValue(contactStoreNode, JsonContactsStore.class);
+ }
+ if (contactStore == null) {
+ contactStore = new JsonContactsStore();
+ }
+ }
+
+ private void migrateLegacyConfigs() {
// Copy group avatars that were previously stored in the attachments folder
// to the new avatar folder
- if (groupStore.groupsWithLegacyAvatarId.size() > 0) {
- for (GroupInfo g : groupStore.groupsWithLegacyAvatarId) {
+ if (JsonGroupStore.groupsWithLegacyAvatarId.size() > 0) {
+ for (GroupInfo g : JsonGroupStore.groupsWithLegacyAvatarId) {
File avatarFile = getGroupAvatarFile(g.groupId);
File attachmentFile = getAttachmentFile(g.getAvatarId());
if (!avatarFile.exists() && attachmentFile.exists()) {
}
}
}
- groupStore.groupsWithLegacyAvatarId.clear();
+ JsonGroupStore.groupsWithLegacyAvatarId.clear();
save();
}
-
- JsonNode contactStoreNode = rootNode.get("contactStore");
- if (contactStoreNode != null) {
- contactStore = jsonProcessot.convertValue(contactStoreNode, JsonContactsStore.class);
- }
- if (contactStore == null) {
- contactStore = new JsonContactsStore();
- }
-
- accountManager = new SignalServiceAccountManager(URL, TRUST_STORE, username, password, deviceId, USER_AGENT);
- try {
- if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
- refreshPreKeys();
- save();
- }
- } catch (AuthorizationFailedException e) {
- System.err.println("Authorization failed, was the number registered elsewhere?");
- }
}
private void save() {
}
}
+ 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;
} catch (Exception e) {
e.printStackTrace();
}
+ if (syncMessage.getBlockedList().isPresent()) {
+ // TODO store list of blocked numbers
+ }
}
if (syncMessage.getContacts().isPresent()) {
try {
if (c.getName().isPresent()) {
contact.name = c.getName().get();
}
+ if (c.getColor().isPresent()) {
+ contact.color = c.getColor().get();
+ }
contactStore.updateContact(contact);
if (c.getAvatar().isPresent()) {
}
}
+ 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);
try {
for (ContactInfo record : contactStore.getContacts()) {
out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
- createContactAvatarAttachment(record.number)));
+ createContactAvatarAttachment(record.number), Optional.fromNullable(record.color)));
}
} finally {
out.close();
return false;
}
+ /**
+ * Trust this the identity with this safety number
+ *
+ * @param name username of the identity
+ * @param safetyNumber Safety number
+ */
+ public boolean trustIdentityVerifiedSafetyNumber(String name, String safetyNumber) {
+ List<JsonIdentityKeyStore.Identity> ids = signalProtocolStore.getIdentities(name);
+ if (ids == null) {
+ return false;
+ }
+ for (JsonIdentityKeyStore.Identity id : ids) {
+ if (!safetyNumber.equals(computeSafetyNumber(name, id.identityKey))) {
+ continue;
+ }
+
+ signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+ save();
+ return true;
+ }
+ return false;
+ }
+
/**
* Trust all keys of this identity without verification
*
save();
return true;
}
+
+ public String computeSafetyNumber(String theirUsername, IdentityKey theirIdentityKey) {
+ Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(username, getIdentity(), theirUsername, theirIdentityKey);
+ return fingerprint.getDisplayableFingerprint().getDisplayText();
+ }
}
git.nmode.ca / signal-cli / blobdiff
