From c223e087f6c2a9403688edd71b637a646d3384f9 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 1 Nov 2019 15:49:26 +1100 Subject: [PATCH] Don't block thread when retrying. --- src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt | 2 +- src/org/thoughtcrime/securesms/loki/SeedActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt b/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt index f80c89c75b..7c73b73eac 100644 --- a/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt +++ b/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt @@ -118,7 +118,7 @@ fun signAndSendPairingAuthorisationMessage(context: Context, pairingAuthorisatio return } retryIfNeeded(8) { - sendPairingAuthorisationMessage(context, pairingAuthorisation.secondaryDevicePublicKey, signedPairingAuthorisation).get() + sendPairingAuthorisationMessage(context, pairingAuthorisation.secondaryDevicePublicKey, signedPairingAuthorisation) }.fail { Log.d("Loki", "Failed to send pairing authorization message to ${pairingAuthorisation.secondaryDevicePublicKey}.") } diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt index 1d494a8711..05d40c1879 100644 --- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt @@ -203,7 +203,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate { application.setUpStorageAPIIfNeeded() DeviceLinkingDialog.show(this, DeviceLinkingView.Mode.Slave, this) retryIfNeeded(8) { - sendPairingAuthorisationMessage(this@SeedActivity, authorisation.primaryDevicePublicKey, authorisation).get() + sendPairingAuthorisationMessage(this@SeedActivity, authorisation.primaryDevicePublicKey, authorisation) } } else { startActivity(Intent(this, DisplayNameActivity::class.java))