Skip to content

Android: Throw appropriate error message when sending failed #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peachbits wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Android: Throw appropriate error message when sending failed #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f211e5
Lint fixes
peachbits Feb 2, 2022
4d2357d
Throw error message when sending fails
peachbits Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions android/src/main/java/app/edge/rnzcash/RNZcashModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -64,7 +64,7 @@ class RNZcashModule(private val reactContext: ReactApplicationContext) :
}
val wallet = getWallet(alias)
wallet.synchronizer.hashCode().toString()

}

@ReactMethod
Expand All @@ -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())
Expand Down Expand Up @@ -212,21 +212,14 @@ 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) {
promise.reject("Err", t)
}
}

}

//
Expand Down Expand Up @@ -256,7 +249,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
Expand All @@ -278,13 +271,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.
Expand Down