From d93715a4e0e2fca6e11ee3fbbea0fa3d941653bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aldin=20Kova=C4=8Devi=C4=87?= Date: Mon, 7 Jun 2021 00:30:23 +0200 Subject: [PATCH] Android: Moved UI updates when signing load hex transactions to onPostExecute. --- .../org/electroncash/electroncash3/ColdLoad.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt b/android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt index 90cca1904731..303f3d5c76a9 100644 --- a/android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt +++ b/android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt @@ -170,7 +170,7 @@ fun canBroadcast(tx: PyObject): Boolean { /** * Sign a loaded transaction dialog. */ -class SignPasswordDialog : PasswordDialog() { +class SignPasswordDialog : PasswordDialog() { val coldLoadDialog by lazy { targetFragment as ColdLoadDialog } // Schnorr signing is supported by standard and imported private key wallets. val signSchnorr = daemonModel.walletType in listOf("standard", "imported_privkey") @@ -179,18 +179,18 @@ class SignPasswordDialog : PasswordDialog() { Kwarg("sign_schnorr", signSchnorr)) } val wallet = daemonModel.wallet!! - override fun onPassword(password: String) { + override fun onPassword(password: String): PyObject { wallet.callAttr("sign_transaction", tx, password) - postToUiThread { - coldLoadDialog.etTransaction.setText(tx.toString()) - } + return tx } - override fun onPostExecute(result: Unit) { - if (!canBroadcast(tx)) { + override fun onPostExecute(result: PyObject) { + coldLoadDialog.etTransaction.setText(result.toString()) + + if (!canBroadcast(result)) { coldLoadDialog.dismiss() - copyToClipboard(tx.toString(), R.string.signed_transaction) + copyToClipboard(result.toString(), R.string.signed_transaction) } } } \ No newline at end of file