From bcc219bd1fe0b1a494ab5fc017516fe4994373cd Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 13 Feb 2020 16:05:40 +1100 Subject: [PATCH] Debug --- src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 2 +- .../loki/redesign/activities/LinkedDevicesActivity.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 35532ea42c..4f382ae225 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -1773,7 +1773,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType { */ private Recipient getMasterRecipient(String hexEncodedPublicKey) { try { - String masterHexEncodedPublicKey = LokiDeviceLinkUtilities.INSTANCE.getMasterHexEncodedPublicKey(hexEncodedPublicKey).get(); + String masterHexEncodedPublicKey = PromiseUtil.timeout(LokiDeviceLinkUtilities.INSTANCE.getMasterHexEncodedPublicKey(hexEncodedPublicKey), 5000).get(); String targetHexEncodedPublicKey = (masterHexEncodedPublicKey != null) ? masterHexEncodedPublicKey : hexEncodedPublicKey; // If the public key matches our master device then we need to forward the message to ourselves (note to self) String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context); diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt index 88fc154033..94b4c09c9a 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt @@ -153,14 +153,14 @@ class LinkedDevicesActivity : PassphraseRequiredActionBarActivity, LoaderManager Timer().schedule(4000) { MessageSender.syncAllContacts(this@LinkedDevicesActivity, Address.fromSerialized(deviceLink.slaveHexEncodedPublicKey)) } - }.fail { exception -> + }.fail { LokiFileServerAPI.shared.removeDeviceLink(deviceLink) // If this fails we have a problem DatabaseFactory.getLokiPreKeyBundleDatabase(this).removePreKeyBundle(deviceLink.slaveHexEncodedPublicKey) Util.runOnMain { Toast.makeText(this, "Couldn't link device", Toast.LENGTH_LONG).show() } } - }.failUi { exception -> + }.failUi { DatabaseFactory.getLokiPreKeyBundleDatabase(this).removePreKeyBundle(deviceLink.slaveHexEncodedPublicKey) Toast.makeText(this, "Couldn't link device", Toast.LENGTH_LONG).show() }