From c09e3a7894b6a46a03b0d24f5da853095487bf62 Mon Sep 17 00:00:00 2001 From: Oscar Mira Date: Tue, 13 Feb 2024 20:13:47 +0100 Subject: [PATCH] lib: make some AIDL parameters not nullable --- .../im/molly/monero/RemoteNodeClient.kt | 7 ++---- .../kotlin/im/molly/monero/StorageAdapter.kt | 6 ++--- .../kotlin/im/molly/monero/WalletNative.kt | 6 ++--- .../kotlin/im/molly/monero/WalletProvider.kt | 4 +-- .../kotlin/im/molly/monero/WalletService.kt | 25 ++++++++----------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt b/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt index f19780d..18853c7 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/RemoteNodeClient.kt @@ -56,15 +56,12 @@ class RemoteNodeClient private constructor( override fun requestAsync( requestId: Int, - method: String?, - path: String?, + method: String, + path: String, header: String?, body: ByteArray?, callback: IHttpRequestCallback?, ) { - requireNotNull(path) - requireNotNull(method) - logger.d("HTTP: $method $path, header_len=${header?.length}, body_size=${body?.size}") val requestJob = requestsScope.launch { diff --git a/lib/android/src/main/kotlin/im/molly/monero/StorageAdapter.kt b/lib/android/src/main/kotlin/im/molly/monero/StorageAdapter.kt index 0041295..8cc0696 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/StorageAdapter.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/StorageAdapter.kt @@ -14,8 +14,7 @@ internal class StorageAdapter(var dataStore: WalletDataStore?) : IStorageAdapter private val mutex = Mutex() - override fun writeAsync(pfd: ParcelFileDescriptor?): Boolean { - requireNotNull(pfd) + override fun writeAsync(pfd: ParcelFileDescriptor): Boolean { val localDataStore = dataStore return if (localDataStore != null) { val inputStream = ParcelFileDescriptor.AutoCloseInputStream(pfd) @@ -33,8 +32,7 @@ internal class StorageAdapter(var dataStore: WalletDataStore?) : IStorageAdapter } } - override fun readAsync(pfd: ParcelFileDescriptor?) { - requireNotNull(pfd) + override fun readAsync(pfd: ParcelFileDescriptor) { val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(pfd) ioStorageScope.launch { val localDataStore = diff --git a/lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt b/lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt index ec9758c..79d4768 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt @@ -178,16 +178,14 @@ class WalletNative private constructor( /** * Also replays the last known balance whenever a new listener registers. */ - override fun addBalanceListener(listener: IBalanceListener?) { - requireNotNull(listener) + override fun addBalanceListener(listener: IBalanceListener) { balanceListenersLock.withLock { balanceListeners.add(listener) listener.onBalanceChanged(txHistorySnapshot(), currentBlockchainTime) } } - override fun removeBalanceListener(listener: IBalanceListener?) { - requireNotNull(listener) + override fun removeBalanceListener(listener: IBalanceListener) { balanceListenersLock.withLock { balanceListeners.remove(listener) } diff --git a/lib/android/src/main/kotlin/im/molly/monero/WalletProvider.kt b/lib/android/src/main/kotlin/im/molly/monero/WalletProvider.kt index 502abd3..ad5a9dd 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/WalletProvider.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/WalletProvider.kt @@ -130,9 +130,7 @@ class WalletProvider private constructor( } object WalletServiceListener : IWalletServiceListener.Stub() { - override fun onLogMessage(priority: Int, tag: String?, msg: String?, cause: String?) { - requireNotNull(tag) - requireNotNull(msg) + override fun onLogMessage(priority: Int, tag: String, msg: String, cause: String?) { if (Logger.adapter.isLoggable(priority, tag)) { val tr = if (cause != null) Throwable(cause) else null Logger.adapter.print(priority, tag, msg, tr) diff --git a/lib/android/src/main/kotlin/im/molly/monero/WalletService.kt b/lib/android/src/main/kotlin/im/molly/monero/WalletService.kt index 34b4baf..e2026d8 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/WalletService.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/WalletService.kt @@ -41,8 +41,8 @@ internal class WalletServiceImpl( } override fun createWallet( - config: WalletConfig?, - storage: IStorageAdapter?, + config: WalletConfig, + storage: IStorageAdapter, client: IRemoteNodeClient?, callback: IWalletServiceCallbacks?, ) { @@ -56,11 +56,11 @@ internal class WalletServiceImpl( } override fun restoreWallet( - config: WalletConfig?, - storage: IStorageAdapter?, + config: WalletConfig, + storage: IStorageAdapter, client: IRemoteNodeClient?, callback: IWalletServiceCallbacks?, - secretSpendKey: SecretKey?, + secretSpendKey: SecretKey, restorePoint: Long, ) { serviceScope.launch { @@ -72,13 +72,11 @@ internal class WalletServiceImpl( } override fun openWallet( - config: WalletConfig?, - storage: IStorageAdapter?, + config: WalletConfig, + storage: IStorageAdapter, client: IRemoteNodeClient?, callback: IWalletServiceCallbacks?, ) { - requireNotNull(config) - requireNotNull(storage) serviceScope.launch { val wallet = WalletNative.fullNode( networkId = config.networkId, @@ -91,15 +89,12 @@ internal class WalletServiceImpl( } private suspend fun createOrRestoreWallet( - config: WalletConfig?, - storage: IStorageAdapter?, + config: WalletConfig, + storage: IStorageAdapter, client: IRemoteNodeClient?, - secretSpendKey: SecretKey?, + secretSpendKey: SecretKey, restorePoint: Long? = null, ): IWallet { - requireNotNull(config) - requireNotNull(storage) - requireNotNull(secretSpendKey) return WalletNative.fullNode( networkId = config.networkId, storageAdapter = storage,