From 6f211e536034a758068f7118598257205e2ad610 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 1 Feb 2022 23:53:45 -0800 Subject: [PATCH 1/2] Lint fixes --- .../main/java/app/edge/rnzcash/RNZcashModule.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt b/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt index 1b55b678..8b5672c4 100644 --- a/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt +++ b/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets import kotlin.coroutines.EmptyCoroutineContext class WalletSynchronizer constructor(val initializer: Initializer) { - + val synchronizer: SdkSynchronizer = Synchronizer( initializer ) as SdkSynchronizer @@ -64,7 +64,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : } val wallet = getWallet(alias) wallet.synchronizer.hashCode().toString() - + } @ReactMethod @@ -83,7 +83,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : args.putInt("networkBlockHeight", update.networkBlockHeight) } }) - wallet.synchronizer.status.collectWith(scope, { status -> + wallet.synchronizer.status.collectWith(scope, { status -> sendEvent("StatusEvent") { args -> args.putString("alias", alias) args.putString("name", status.toString()) @@ -226,7 +226,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : promise.reject("Err", t) } } - + } // @@ -256,7 +256,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : } @ReactMethod - fun isValidTransparentAddress(address: String, network: String, promise: Promise) { + fun isValidTransparentAddress(address: String, network: String, promise: Promise) { moduleScope.launch { promise.wrap { var isValid = false @@ -278,13 +278,13 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : /** * Retrieve wallet object from synchronizer map - */ + */ private fun getWallet(alias: String): WalletSynchronizer { val wallet = synchronizerMap.get(alias) if (wallet == null) throw Exception("Wallet not found") return wallet } - + /** * Wrap the given block of logic in a promise, rejecting for any error. From 4d2357d3e892a5e84400d62a896c8d5e2d432a9d Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 1 Feb 2022 23:54:44 -0800 Subject: [PATCH 2/2] Throw error message when sending fails --- android/src/main/java/app/edge/rnzcash/RNZcashModule.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt b/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt index 8b5672c4..56645d3c 100644 --- a/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt +++ b/android/src/main/java/app/edge/rnzcash/RNZcashModule.kt @@ -212,14 +212,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) : map.putString("raw", tx.raw?.toHexReversed()) promise.resolve(map) } else if (tx.isFailure()) { - val map = Arguments.createMap() - map.putInt("expiryHeight", tx.expiryHeight) - map.putString("cancelled", tx.cancelled.toString()) - map.putString("encodeAttempts", tx.encodeAttempts.toString()) - map.putString("submitAttempts", tx.submitAttempts.toString()) - if (tx.errorMessage != null) map.putString("errorMessage", tx.errorMessage) - if (tx.errorCode != null) map.putString("errorCode", tx.errorCode.toString()) - promise.resolve(false) + throw Exception(tx.errorMessage) } } } catch (t: Throwable) {