Git-Mirrors/mollyim-monero-wallet-sdk
1
0
Fork 0
mirror of https://github.com/mollyim/monero-wallet-sdk.git synced 2024-10-01 03:45:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

lib: make some AIDL parameters not nullable

Browse Source
This commit is contained in:
Oscar Mira 2024-02-13 20:13:47 +01:00
parent f406edcf8c
commit c09e3a7894
5 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt
View File

@ -56,15 +56,12 @@ class RemoteNodeClient private constructor(
override fun requestAsync( override fun requestAsync(
requestId: Int, requestId: Int,
method: String?, method: String,
path: String?, path: String,
header: String?, header: String?,
body: ByteArray?, body: ByteArray?,
callback: IHttpRequestCallback?, callback: IHttpRequestCallback?,
) { ) {
requireNotNull(path)
requireNotNull(method)
logger.d("HTTP: $method $path, header_len=${header?.length}, body_size=${body?.size}") logger.d("HTTP: $method $path, header_len=${header?.length}, body_size=${body?.size}")
val requestJob = requestsScope.launch { val requestJob = requestsScope.launch {

6
lib/android/src/main/kotlin/im/molly/monero/StorageAdapter.kt
View File

@ -14,8 +14,7 @@ internal class StorageAdapter(var dataStore: WalletDataStore?) : IStorageAdapter
private val mutex = Mutex() private val mutex = Mutex()
override fun writeAsync(pfd: ParcelFileDescriptor?): Boolean { override fun writeAsync(pfd: ParcelFileDescriptor): Boolean {
requireNotNull(pfd)
val localDataStore = dataStore val localDataStore = dataStore
return if (localDataStore != null) { return if (localDataStore != null) {
val inputStream = ParcelFileDescriptor.AutoCloseInputStream(pfd) val inputStream = ParcelFileDescriptor.AutoCloseInputStream(pfd)
@ -33,8 +32,7 @@ internal class StorageAdapter(var dataStore: WalletDataStore?) : IStorageAdapter
} }
} }
override fun readAsync(pfd: ParcelFileDescriptor?) { override fun readAsync(pfd: ParcelFileDescriptor) {
requireNotNull(pfd)
val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pfd) val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pfd)
ioStorageScope.launch { ioStorageScope.launch {
val localDataStore = val localDataStore =

6
lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt
View File

@ -178,16 +178,14 @@ class WalletNative private constructor(
/** /**
* Also replays the last known balance whenever a new listener registers. * Also replays the last known balance whenever a new listener registers.
*/ */
override fun addBalanceListener(listener: IBalanceListener?) { override fun addBalanceListener(listener: IBalanceListener) {
requireNotNull(listener)
balanceListenersLock.withLock { balanceListenersLock.withLock {
balanceListeners.add(listener) balanceListeners.add(listener)
listener.onBalanceChanged(txHistorySnapshot(), currentBlockchainTime) listener.onBalanceChanged(txHistorySnapshot(), currentBlockchainTime)
} }
} }
override fun removeBalanceListener(listener: IBalanceListener?) { override fun removeBalanceListener(listener: IBalanceListener) {
requireNotNull(listener)
balanceListenersLock.withLock { balanceListenersLock.withLock {
balanceListeners.remove(listener) balanceListeners.remove(listener)
} }

4
lib/android/src/main/kotlin/im/molly/monero/WalletProvider.kt
View File

@ -130,9 +130,7 @@ class WalletProvider private constructor(
} }
object WalletServiceListener : IWalletServiceListener.Stub() { object WalletServiceListener : IWalletServiceListener.Stub() {
override fun onLogMessage(priority: Int, tag: String?, msg: String?, cause: String?) { override fun onLogMessage(priority: Int, tag: String, msg: String, cause: String?) {
requireNotNull(tag)
requireNotNull(msg)
if (Logger.adapter.isLoggable(priority, tag)) { if (Logger.adapter.isLoggable(priority, tag)) {
val tr = if (cause != null) Throwable(cause) else null val tr = if (cause != null) Throwable(cause) else null
Logger.adapter.print(priority, tag, msg, tr) Logger.adapter.print(priority, tag, msg, tr)

25
lib/android/src/main/kotlin/im/molly/monero/WalletService.kt
View File

@ -41,8 +41,8 @@ internal class WalletServiceImpl(
} }
override fun createWallet( override fun createWallet(
config: WalletConfig?, config: WalletConfig,
storage: IStorageAdapter?, storage: IStorageAdapter,
client: IRemoteNodeClient?, client: IRemoteNodeClient?,
callback: IWalletServiceCallbacks?, callback: IWalletServiceCallbacks?,
) { ) {
@ -56,11 +56,11 @@ internal class WalletServiceImpl(
} }
override fun restoreWallet( override fun restoreWallet(
config: WalletConfig?, config: WalletConfig,
storage: IStorageAdapter?, storage: IStorageAdapter,
client: IRemoteNodeClient?, client: IRemoteNodeClient?,
callback: IWalletServiceCallbacks?, callback: IWalletServiceCallbacks?,
secretSpendKey: SecretKey?, secretSpendKey: SecretKey,
restorePoint: Long, restorePoint: Long,
) { ) {
serviceScope.launch { serviceScope.launch {
@ -72,13 +72,11 @@ internal class WalletServiceImpl(
} }
override fun openWallet( override fun openWallet(
config: WalletConfig?, config: WalletConfig,
storage: IStorageAdapter?, storage: IStorageAdapter,
client: IRemoteNodeClient?, client: IRemoteNodeClient?,
callback: IWalletServiceCallbacks?, callback: IWalletServiceCallbacks?,
) { ) {
requireNotNull(config)
requireNotNull(storage)
serviceScope.launch { serviceScope.launch {
val wallet = WalletNative.fullNode( val wallet = WalletNative.fullNode(
networkId = config.networkId, networkId = config.networkId,
@ -91,15 +89,12 @@ internal class WalletServiceImpl(
} }
private suspend fun createOrRestoreWallet( private suspend fun createOrRestoreWallet(
config: WalletConfig?, config: WalletConfig,
storage: IStorageAdapter?, storage: IStorageAdapter,
client: IRemoteNodeClient?, client: IRemoteNodeClient?,
secretSpendKey: SecretKey?, secretSpendKey: SecretKey,
restorePoint: Long? = null, restorePoint: Long? = null,
): IWallet { ): IWallet {
requireNotNull(config)
requireNotNull(storage)
requireNotNull(secretSpendKey)
return WalletNative.fullNode( return WalletNative.fullNode(
networkId = config.networkId, networkId = config.networkId,
storageAdapter = storage, storageAdapter = storage,