From 1eccc07673eedc4b5e7d6a00385a031423f5ccdb Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 12 Jun 2017 09:47:58 -0700 Subject: [PATCH] Temporarily disable synchronization messages Until desktop catches up // FREEBIE --- .../jobs/MultiDeviceVerifiedUpdateJob.java | 24 +++++++++---------- .../securesms/jobs/PushDecryptJob.java | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index 92028384b6..45d7ef5203 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -71,18 +71,18 @@ public class MultiDeviceVerifiedUpdateJob extends ContextJob implements Injectab @Override public void onRun() throws IOException, UntrustedIdentityException { - try { - if (!TextSecurePreferences.isMultiDevice(context)) { - Log.w(TAG, "Not multi device..."); - return; - } - - if (destination != null) sendSpecificUpdate(destination, identityKey, verifiedStatus); - else sendFullUpdate(); - - } catch (InvalidNumberException | InvalidKeyException e) { - throw new IOException(e); - } +// try { +// if (!TextSecurePreferences.isMultiDevice(context)) { +// Log.w(TAG, "Not multi device..."); +// return; +// } +// +// if (destination != null) sendSpecificUpdate(destination, identityKey, verifiedStatus); +// else sendFullUpdate(); +// +// } catch (InvalidNumberException | InvalidKeyException e) { +// throw new IOException(e); +// } } private void sendSpecificUpdate(String destination, byte[] identityKey, VerifiedStatus verifiedStatus) diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 5c09002c10..9f6db7e0c6 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -394,9 +394,9 @@ public class PushDecryptJob extends ContextJob { private void handleSynchronizeVerifiedMessage(@NonNull MasterSecretUnion masterSecret, @NonNull List verifiedMessages) { - for (VerifiedMessage verifiedMessage : verifiedMessages) { - IdentityUtil.processVerifiedMessage(context, masterSecret, verifiedMessage); - } +// for (VerifiedMessage verifiedMessage : verifiedMessages) { +// IdentityUtil.processVerifiedMessage(context, masterSecret, verifiedMessage); +// } } private void handleSynchronizeSentMessage(@NonNull MasterSecretUnion masterSecret,