diff --git a/lib/android/src/main/cpp/wallet/jni_cache.cc b/lib/android/src/main/cpp/wallet/jni_cache.cc index 98b7a62..f4314a8 100644 --- a/lib/android/src/main/cpp/wallet/jni_cache.cc +++ b/lib/android/src/main/cpp/wallet/jni_cache.cc @@ -55,7 +55,7 @@ void InitializeJniCache(JNIEnv* env) { TxInfo_ctor = GetMethodId( env, txInfo, "", - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;JIIJJJJZZ)V"); + "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;JIJJJJBZZ)V"); WalletNative_createPendingTransfer = GetMethodId( env, walletNative, "createPendingTransfer", diff --git a/lib/android/src/main/cpp/wallet/wallet.cc b/lib/android/src/main/cpp/wallet/wallet.cc index f283356..dea0b10 100644 --- a/lib/android/src/main/cpp/wallet/wallet.cc +++ b/lib/android/src/main/cpp/wallet/wallet.cc @@ -811,11 +811,11 @@ ScopedJavaLocalRef NativeToJavaTxInfo(JNIEnv* env, : nullptr, tx.m_amount, static_cast(tx.m_height), - tx.m_state, tx.m_unlock_time, tx.m_timestamp, tx.m_fee, tx.m_change, + static_cast(tx.m_state), tx.m_coinbase, tx.m_type == TxInfo::INCOMING) }; diff --git a/lib/android/src/main/cpp/wallet/wallet.h b/lib/android/src/main/cpp/wallet/wallet.h index 187dd73..cac99ec 100644 --- a/lib/android/src/main/cpp/wallet/wallet.h +++ b/lib/android/src/main/cpp/wallet/wallet.h @@ -41,10 +41,10 @@ struct TxInfo { } m_type; enum TxState { - OFF_CHAIN = 0, - PENDING = 1, - FAILED = 2, - ON_CHAIN = 3, + OFF_CHAIN = 1, + PENDING = 2, + FAILED = 3, + ON_CHAIN = 4, } m_state; TxInfo(crypto::hash tx_hash, TxType type) : diff --git a/lib/android/src/main/kotlin/im/molly/monero/internal/TxInfo.kt b/lib/android/src/main/kotlin/im/molly/monero/internal/TxInfo.kt index 92b79ac..f639f4e 100644 --- a/lib/android/src/main/kotlin/im/molly/monero/internal/TxInfo.kt +++ b/lib/android/src/main/kotlin/im/molly/monero/internal/TxInfo.kt @@ -37,20 +37,20 @@ internal data class TxInfo @CalledByNative constructor( val recipient: String?, val amount: Long, val height: Int, - val state: Int, val unlockTime: Long, val timestamp: Long, val fee: Long, val change: Long, + val state: Byte, val coinbase: Boolean, val incoming: Boolean, ) : Parcelable { companion object State { - const val OFF_CHAIN: Int = 0 - const val PENDING: Int = 1 - const val FAILED: Int = 2 - const val ON_CHAIN: Int = 3 + const val OFF_CHAIN: Byte = 1 + const val PENDING: Byte = 2 + const val FAILED: Byte = 3 + const val ON_CHAIN: Byte = 4 } init {