@ -96,7 +96,7 @@ void detachJVM(JNIEnv *jenv, int envStat) {
}
}
}
}
struct MyWalletListener : Bitm onero: : WalletListener {
struct MyWalletListener : M onero: : WalletListener {
jobject jlistener ;
jobject jlistener ;
MyWalletListener ( JNIEnv * env , jobject aListener ) {
MyWalletListener ( JNIEnv * env , jobject aListener ) {
@ -191,12 +191,13 @@ struct MyWalletListener : Bitmonero::WalletListener {
/**
/**
* @ brief refreshed - called when wallet refreshed by background thread or explicitly refreshed by calling " refresh " synchronously
* @ brief refreshed - called when wallet refreshed by background thread or explicitly refreshed by calling " refresh " synchronously
*/
*/
void refreshed ( ) {
void refreshed ( bool success ) {
std : : lock_guard < std : : mutex > lock ( _listenerMutex ) ;
std : : lock_guard < std : : mutex > lock ( _listenerMutex ) ;
if ( jlistener = = nullptr ) return ;
if ( jlistener = = nullptr ) return ;
LOGD ( " refreshed " ) ;
LOGD ( " refreshed %s" , success ? " true " : " false " ) ;
JNIEnv * jenv ;
if ( ! success ) return ;
JNIEnv * jenv ;
int envStat = attachJVM ( & jenv ) ;
int envStat = attachJVM ( & jenv ) ;
if ( envStat = = JNI_ERR ) return ;
if ( envStat = = JNI_ERR ) return ;
@ -229,7 +230,7 @@ std::vector<std::string> java2cpp(JNIEnv *env, jobject arrayList) {
return result ;
return result ;
}
}
jobject cpp2java ( JNIEnv * env , const std : : vector < std : : string > & vector ) {
jobject cpp2java ( JNIEnv * env , const std : : vector < std : : string > & vector ) {
jmethodID java_util_ArrayList_ = env - > GetMethodID ( class_ArrayList , " <init> " , " (I)V " ) ;
jmethodID java_util_ArrayList_ = env - > GetMethodID ( class_ArrayList , " <init> " , " (I)V " ) ;
jmethodID java_util_ArrayList_add = env - > GetMethodID ( class_ArrayList , " add " ,
jmethodID java_util_ArrayList_add = env - > GetMethodID ( class_ArrayList , " add " ,
@ -266,8 +267,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletJ(JNIEnv *env, jobject
const char * _language = env - > GetStringUTFChars ( language , nullptr ) ;
const char * _language = env - > GetStringUTFChars ( language , nullptr ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Bitm onero: : Wallet * wallet =
M onero: : Wallet * wallet =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > createWallet (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > createWallet (
std : : string ( _path ) ,
std : : string ( _path ) ,
std : : string ( _password ) ,
std : : string ( _password ) ,
std : : string ( _language ) ,
std : : string ( _language ) ,
@ -287,8 +288,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_openWalletJ(JNIEnv *env, jobject i
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Bitm onero: : Wallet * wallet =
M onero: : Wallet * wallet =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > openWallet (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > openWallet (
std : : string ( _path ) ,
std : : string ( _path ) ,
std : : string ( _password ) ,
std : : string ( _password ) ,
_networkType ) ;
_networkType ) ;
@ -309,8 +310,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_recoveryWalletJ(JNIEnv *env, jobje
const char * _mnemonic = env - > GetStringUTFChars ( mnemonic , nullptr ) ;
const char * _mnemonic = env - > GetStringUTFChars ( mnemonic , nullptr ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Bitm onero: : Wallet * wallet =
M onero: : Wallet * wallet =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > recoveryWallet (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > recoveryWallet (
std : : string ( _path ) ,
std : : string ( _path ) ,
std : : string ( _password ) ,
std : : string ( _password ) ,
std : : string ( _mnemonic ) ,
std : : string ( _mnemonic ) ,
@ -340,8 +341,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromKeysJ(JNIEnv *env,
const char * _viewKeyString = env - > GetStringUTFChars ( viewKeyString , nullptr ) ;
const char * _viewKeyString = env - > GetStringUTFChars ( viewKeyString , nullptr ) ;
const char * _spendKeyString = env - > GetStringUTFChars ( spendKeyString , nullptr ) ;
const char * _spendKeyString = env - > GetStringUTFChars ( spendKeyString , nullptr ) ;
Bitm onero: : Wallet * wallet =
M onero: : Wallet * wallet =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > createWalletFromKeys (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > createWalletFromKeys (
std : : string ( _path ) ,
std : : string ( _path ) ,
std : : string ( _password ) ,
std : : string ( _password ) ,
std : : string ( _language ) ,
std : : string ( _language ) ,
@ -377,8 +378,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromDeviceJ(JNIEnv *en
const char * _deviceName = env - > GetStringUTFChars ( deviceName , nullptr ) ;
const char * _deviceName = env - > GetStringUTFChars ( deviceName , nullptr ) ;
const char * _subaddressLookahead = env - > GetStringUTFChars ( subaddressLookahead , nullptr ) ;
const char * _subaddressLookahead = env - > GetStringUTFChars ( subaddressLookahead , nullptr ) ;
Bitm onero: : Wallet * wallet =
M onero: : Wallet * wallet =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > createWalletFromDevice (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > createWalletFromDevice (
std : : string ( _path ) ,
std : : string ( _path ) ,
std : : string ( _password ) ,
std : : string ( _password ) ,
_networkType ,
_networkType ,
@ -398,7 +399,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_walletExists(JNIEnv *env, jobject
jstring path ) {
jstring path ) {
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
bool exists =
bool exists =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > walletExists ( std : : string ( _path ) ) ;
M onero: : WalletManagerFactory : : getWalletManager ( ) - > walletExists ( std : : string ( _path ) ) ;
env - > ReleaseStringUTFChars ( path , _path ) ;
env - > ReleaseStringUTFChars ( path , _path ) ;
return static_cast < jboolean > ( exists ) ;
return static_cast < jboolean > ( exists ) ;
}
}
@ -411,7 +412,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env,
const char * _keys_file_name = env - > GetStringUTFChars ( keys_file_name , nullptr ) ;
const char * _keys_file_name = env - > GetStringUTFChars ( keys_file_name , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
bool passwordOk =
bool passwordOk =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > verifyWalletPassword (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > verifyWalletPassword (
std : : string ( _keys_file_name ) , std : : string ( _password ) , watch_only ) ;
std : : string ( _keys_file_name ) , std : : string ( _password ) , watch_only ) ;
env - > ReleaseStringUTFChars ( keys_file_name , _keys_file_name ) ;
env - > ReleaseStringUTFChars ( keys_file_name , _keys_file_name ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
@ -425,8 +426,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_queryWalletDeviceJ(JNIEnv *env, jo
jstring password ) {
jstring password ) {
const char * _keys_file_name = env - > GetStringUTFChars ( keys_file_name , nullptr ) ;
const char * _keys_file_name = env - > GetStringUTFChars ( keys_file_name , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
Bitm onero: : Wallet : : Device device_type ;
M onero: : Wallet : : Device device_type ;
bool ok = Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - >
bool ok = M onero: : WalletManagerFactory : : getWalletManager ( ) - >
queryWalletDevice ( device_type , std : : string ( _keys_file_name ) , std : : string ( _password ) ) ;
queryWalletDevice ( device_type , std : : string ( _keys_file_name ) , std : : string ( _password ) ) ;
env - > ReleaseStringUTFChars ( keys_file_name , _keys_file_name ) ;
env - > ReleaseStringUTFChars ( keys_file_name , _keys_file_name ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
@ -441,7 +442,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_findWallets(JNIEnv *env, jobject i
jstring path ) {
jstring path ) {
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
std : : vector < std : : string > walletPaths =
std : : vector < std : : string > walletPaths =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > findWallets ( std : : string ( _path ) ) ;
M onero: : WalletManagerFactory : : getWalletManager ( ) - > findWallets ( std : : string ( _path ) ) ;
env - > ReleaseStringUTFChars ( path , _path ) ;
env - > ReleaseStringUTFChars ( path , _path ) ;
return cpp2java ( env , walletPaths ) ;
return cpp2java ( env , walletPaths ) ;
}
}
@ -452,7 +453,7 @@ JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_setDaemonAddressJ ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_WalletManager_setDaemonAddressJ ( JNIEnv * env , jobject instance ,
jstring address ) {
jstring address ) {
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > setDaemonAddress ( std : : string ( _address ) ) ;
M onero: : WalletManagerFactory : : getWalletManager ( ) - > setDaemonAddress ( std : : string ( _address ) ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
}
}
@ -462,40 +463,40 @@ Java_com_m2049r_xmrwallet_model_WalletManager_getDaemonVersion(JNIEnv *env,
jobject instance ) {
jobject instance ) {
uint32_t version ;
uint32_t version ;
bool isConnected =
bool isConnected =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > connected ( & version ) ;
M onero: : WalletManagerFactory : : getWalletManager ( ) - > connected ( & version ) ;
if ( ! isConnected ) version = 0 ;
if ( ! isConnected ) version = 0 ;
return version ;
return version ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainHeight ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainHeight ( JNIEnv * env , jobject instance ) {
return Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > blockchainHeight ( ) ;
return M onero: : WalletManagerFactory : : getWalletManager ( ) - > blockchainHeight ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainTargetHeight ( JNIEnv * env ,
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainTargetHeight ( JNIEnv * env ,
jobject instance ) {
jobject instance ) {
return Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > blockchainTargetHeight ( ) ;
return M onero: : WalletManagerFactory : : getWalletManager ( ) - > blockchainTargetHeight ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_getNetworkDifficulty ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_getNetworkDifficulty ( JNIEnv * env , jobject instance ) {
return Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > networkDifficulty ( ) ;
return M onero: : WalletManagerFactory : : getWalletManager ( ) - > networkDifficulty ( ) ;
}
}
JNIEXPORT jdouble JNICALL
JNIEXPORT jdouble JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_getMiningHashRate ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_getMiningHashRate ( JNIEnv * env , jobject instance ) {
return Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > miningHashRate ( ) ;
return M onero: : WalletManagerFactory : : getWalletManager ( ) - > miningHashRate ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockTarget ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_getBlockTarget ( JNIEnv * env , jobject instance ) {
return Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > blockTarget ( ) ;
return M onero: : WalletManagerFactory : : getWalletManager ( ) - > blockTarget ( ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_isMining ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_isMining ( JNIEnv * env , jobject instance ) {
return static_cast < jboolean > ( Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > isMining ( ) ) ;
return static_cast < jboolean > ( M onero: : WalletManagerFactory : : getWalletManager ( ) - > isMining ( ) ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
@ -505,16 +506,16 @@ Java_com_m2049r_xmrwallet_model_WalletManager_startMining(JNIEnv *env, jobject i
jboolean ignore_battery ) {
jboolean ignore_battery ) {
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
bool success =
bool success =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > startMining ( std : : string ( _address ) ,
M onero: : WalletManagerFactory : : getWalletManager ( ) - > startMining ( std : : string ( _address ) ,
background_mining ,
background_mining ,
ignore_battery ) ;
ignore_battery ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
return static_cast < jboolean > ( success ) ;
return static_cast < jboolean > ( success ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_stopMining ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_WalletManager_stopMining ( JNIEnv * env , jobject instance ) {
return static_cast < jboolean > ( Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > stopMining ( ) ) ;
return static_cast < jboolean > ( M onero: : WalletManagerFactory : : getWalletManager ( ) - > stopMining ( ) ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
@ -524,7 +525,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobj
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
bool _dnssec_valid = ( bool ) dnssec_valid ;
bool _dnssec_valid = ( bool ) dnssec_valid ;
std : : string resolvedAlias =
std : : string resolvedAlias =
Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > resolveOpenAlias (
M onero: : WalletManagerFactory : : getWalletManager ( ) - > resolveOpenAlias (
std : : string ( _address ) ,
std : : string ( _address ) ,
_dnssec_valid ) ;
_dnssec_valid ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
@ -536,9 +537,9 @@ Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobj
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_closeJ ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_WalletManager_closeJ ( JNIEnv * env , jobject instance ,
jobject walletInstance ) {
jobject walletInstance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , walletInstance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , walletInstance ) ;
bool closeSuccess = Bitm onero: : WalletManagerFactory : : getWalletManager ( ) - > closeWallet ( wallet ,
bool closeSuccess = M onero: : WalletManagerFactory : : getWalletManager ( ) - > closeWallet ( wallet ,
false ) ;
false ) ;
if ( closeSuccess ) {
if ( closeSuccess ) {
MyWalletListener * walletListener = getHandle < MyWalletListener > ( env , walletInstance ,
MyWalletListener * walletListener = getHandle < MyWalletListener > ( env , walletInstance ,
" listenerHandle " ) ;
" listenerHandle " ) ;
@ -560,13 +561,13 @@ Java_com_m2049r_xmrwallet_model_WalletManager_closeJ(JNIEnv *env, jobject instan
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getSeed ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getSeed ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > seed ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > seed ( ) . c_str ( ) ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getSeedLanguage ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getSeedLanguage ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > getSeedLanguage ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > getSeedLanguage ( ) . c_str ( ) ) ;
}
}
@ -574,14 +575,14 @@ JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_setSeedLanguage ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_setSeedLanguage ( JNIEnv * env , jobject instance ,
jstring language ) {
jstring language ) {
const char * _language = env - > GetStringUTFChars ( language , nullptr ) ;
const char * _language = env - > GetStringUTFChars ( language , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > setSeedLanguage ( std : : string ( _language ) ) ;
wallet - > setSeedLanguage ( std : : string ( _language ) ) ;
env - > ReleaseStringUTFChars ( language , _language ) ;
env - > ReleaseStringUTFChars ( language , _language ) ;
}
}
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getStatusJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getStatusJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > status ( ) ;
return wallet - > status ( ) ;
}
}
@ -597,7 +598,7 @@ jobject newWalletStatusInstance(JNIEnv *env, int status, const std::string &erro
JNIEXPORT jobject JNICALL
JNIEXPORT jobject JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_statusWithErrorString ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_statusWithErrorString ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
int status ;
int status ;
std : : string errorString ;
std : : string errorString ;
@ -610,7 +611,7 @@ JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_setPassword ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_setPassword ( JNIEnv * env , jobject instance ,
jstring password ) {
jstring password ) {
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
const char * _password = env - > GetStringUTFChars ( password , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
bool success = wallet - > setPassword ( std : : string ( _password ) ) ;
bool success = wallet - > setPassword ( std : : string ( _password ) ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
env - > ReleaseStringUTFChars ( password , _password ) ;
return static_cast < jboolean > ( success ) ;
return static_cast < jboolean > ( success ) ;
@ -620,20 +621,20 @@ JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ ( JNIEnv * env , jobject instance ,
jint accountIndex ,
jint accountIndex ,
jint addressIndex ) {
jint addressIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF (
return env - > NewStringUTF (
wallet - > address ( ( uint32_t ) accountIndex , ( uint32_t ) addressIndex ) . c_str ( ) ) ;
wallet - > address ( ( uint32_t ) accountIndex , ( uint32_t ) addressIndex ) . c_str ( ) ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getPath ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getPath ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > path ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > path ( ) . c_str ( ) ) ;
}
}
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_nettype ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_nettype ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > nettype ( ) ;
return wallet - > nettype ( ) ;
}
}
@ -644,7 +645,7 @@ JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress ( JNIEnv * env , jobject instance ,
jstring payment_id ) {
jstring payment_id ) {
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
std : : string address = wallet - > integratedAddress ( _payment_id ) ;
std : : string address = wallet - > integratedAddress ( _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
return env - > NewStringUTF ( address . c_str ( ) ) ;
return env - > NewStringUTF ( address . c_str ( ) ) ;
@ -652,13 +653,13 @@ Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getSecretViewKey ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getSecretViewKey ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > secretViewKey ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > secretViewKey ( ) . c_str ( ) ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getSecretSpendKey ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getSecretSpendKey ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > secretSpendKey ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > secretSpendKey ( ) . c_str ( ) ) ;
}
}
@ -666,7 +667,7 @@ JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_store ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_store ( JNIEnv * env , jobject instance ,
jstring path ) {
jstring path ) {
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
const char * _path = env - > GetStringUTFChars ( path , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
bool success = wallet - > store ( std : : string ( _path ) ) ;
bool success = wallet - > store ( std : : string ( _path ) ) ;
if ( ! success ) {
if ( ! success ) {
LOGE ( " store() %s " , wallet - > errorString ( ) . c_str ( ) ) ;
LOGE ( " store() %s " , wallet - > errorString ( ) . c_str ( ) ) ;
@ -677,7 +678,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_store(JNIEnv *env, jobject instance,
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getFilename ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getFilename ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return env - > NewStringUTF ( wallet - > filename ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( wallet - > filename ( ) . c_str ( ) ) ;
}
}
@ -691,7 +692,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance,
const char * _daemon_address = env - > GetStringUTFChars ( daemon_address , nullptr ) ;
const char * _daemon_address = env - > GetStringUTFChars ( daemon_address , nullptr ) ;
const char * _daemon_username = env - > GetStringUTFChars ( daemon_username , nullptr ) ;
const char * _daemon_username = env - > GetStringUTFChars ( daemon_username , nullptr ) ;
const char * _daemon_password = env - > GetStringUTFChars ( daemon_password , nullptr ) ;
const char * _daemon_password = env - > GetStringUTFChars ( daemon_password , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
bool status = wallet - > init ( _daemon_address , ( uint64_t ) upper_transaction_size_limit ,
bool status = wallet - > init ( _daemon_address , ( uint64_t ) upper_transaction_size_limit ,
_daemon_username ,
_daemon_username ,
_daemon_password ) ;
_daemon_password ) ;
@ -706,13 +707,13 @@ Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance,
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_setRestoreHeight ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_setRestoreHeight ( JNIEnv * env , jobject instance ,
jlong height ) {
jlong height ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > setRefreshFromBlockHeight ( ( uint64_t ) height ) ;
wallet - > setRefreshFromBlockHeight ( ( uint64_t ) height ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getRestoreHeight ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getRestoreHeight ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > getRefreshFromBlockHeight ( ) ;
return wallet - > getRefreshFromBlockHeight ( ) ;
}
}
@ -721,7 +722,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getRestoreHeight(JNIEnv *env, jobject ins
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > connected ( ) ;
return wallet - > connected ( ) ;
}
}
//TODO virtual void setTrustedDaemon(bool arg) = 0;
//TODO virtual void setTrustedDaemon(bool arg) = 0;
@ -730,71 +731,71 @@ Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getBalance ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getBalance ( JNIEnv * env , jobject instance ,
jint accountIndex ) {
jint accountIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > balance ( ( uint32_t ) accountIndex ) ;
return wallet - > balance ( ( uint32_t ) accountIndex ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getBalanceAll ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getBalanceAll ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > balanceAll ( ) ;
return wallet - > balanceAll ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalance ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalance ( JNIEnv * env , jobject instance ,
jint accountIndex ) {
jint accountIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > unlockedBalance ( ( uint32_t ) accountIndex ) ;
return wallet - > unlockedBalance ( ( uint32_t ) accountIndex ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalanceAll ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalanceAll ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > unlockedBalanceAll ( ) ;
return wallet - > unlockedBalanceAll ( ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_isWatchOnly ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_isWatchOnly ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return static_cast < jboolean > ( wallet - > watchOnly ( ) ) ;
return static_cast < jboolean > ( wallet - > watchOnly ( ) ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getBlockChainHeight ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getBlockChainHeight ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > blockChainHeight ( ) ;
return wallet - > blockChainHeight ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getApproximateBlockChainHeight ( JNIEnv * env ,
Java_com_m2049r_xmrwallet_model_Wallet_getApproximateBlockChainHeight ( JNIEnv * env ,
jobject instance ) {
jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > approximateBlockChainHeight ( ) ;
return wallet - > approximateBlockChainHeight ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainHeight ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainHeight ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > daemonBlockChainHeight ( ) ;
return wallet - > daemonBlockChainHeight ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainTargetHeight ( JNIEnv * env ,
Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainTargetHeight ( JNIEnv * env ,
jobject instance ) {
jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > daemonBlockChainTargetHeight ( ) ;
return wallet - > daemonBlockChainTargetHeight ( ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_isSynchronizedJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_isSynchronizedJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return static_cast < jboolean > ( wallet - > synchronized ( ) ) ;
return static_cast < jboolean > ( wallet - > synchronized ( ) ) ;
}
}
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getDeviceTypeJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getDeviceTypeJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
Bitm onero: : Wallet : : Device device_type = wallet - > getDeviceType ( ) ;
M onero: : Wallet : : Device device_type = wallet - > getDeviceType ( ) ;
return static_cast < jint > ( device_type ) ;
return static_cast < jint > ( device_type ) ;
}
}
@ -828,14 +829,14 @@ Java_com_m2049r_xmrwallet_util_KeyStoreHelper_slowHash(JNIEnv *env, jclass clazz
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getDisplayAmount ( JNIEnv * env , jclass clazz ,
Java_com_m2049r_xmrwallet_model_Wallet_getDisplayAmount ( JNIEnv * env , jclass clazz ,
jlong amount ) {
jlong amount ) {
return env - > NewStringUTF ( Bitm onero: : Wallet : : displayAmount ( amount ) . c_str ( ) ) ;
return env - > NewStringUTF ( M onero: : Wallet : : displayAmount ( amount ) . c_str ( ) ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString ( JNIEnv * env , jclass clazz ,
Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString ( JNIEnv * env , jclass clazz ,
jstring amount ) {
jstring amount ) {
const char * _amount = env - > GetStringUTFChars ( amount , nullptr ) ;
const char * _amount = env - > GetStringUTFChars ( amount , nullptr ) ;
uint64_t x = Bitm onero: : Wallet : : amountFromString ( _amount ) ;
uint64_t x = M onero: : Wallet : : amountFromString ( _amount ) ;
env - > ReleaseStringUTFChars ( amount , _amount ) ;
env - > ReleaseStringUTFChars ( amount , _amount ) ;
return x ;
return x ;
}
}
@ -843,19 +844,19 @@ Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString(JNIEnv *env, jclass c
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromDouble ( JNIEnv * env , jclass clazz ,
Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromDouble ( JNIEnv * env , jclass clazz ,
jdouble amount ) {
jdouble amount ) {
return Bitm onero: : Wallet : : amountFromDouble ( amount ) ;
return M onero: : Wallet : : amountFromDouble ( amount ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_generatePaymentId ( JNIEnv * env , jclass clazz ) {
Java_com_m2049r_xmrwallet_model_Wallet_generatePaymentId ( JNIEnv * env , jclass clazz ) {
return env - > NewStringUTF ( Bitm onero: : Wallet : : genPaymentId ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( M onero: : Wallet : : genPaymentId ( ) . c_str ( ) ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid ( JNIEnv * env , jclass clazz ,
Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid ( JNIEnv * env , jclass clazz ,
jstring payment_id ) {
jstring payment_id ) {
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
bool isValid = Bitm onero: : Wallet : : paymentIdValid ( _payment_id ) ;
bool isValid = M onero: : Wallet : : paymentIdValid ( _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
return static_cast < jboolean > ( isValid ) ;
return static_cast < jboolean > ( isValid ) ;
}
}
@ -865,7 +866,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_isAddressValid(JNIEnv *env, jclass clazz,
jstring address , jint networkType ) {
jstring address , jint networkType ) {
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
bool isValid = Bitm onero: : Wallet : : addressValid ( _address , _networkType ) ;
bool isValid = M onero: : Wallet : : addressValid ( _address , _networkType ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
return static_cast < jboolean > ( isValid ) ;
return static_cast < jboolean > ( isValid ) ;
}
}
@ -876,37 +877,37 @@ Java_com_m2049r_xmrwallet_model_Wallet_getPaymentIdFromAddress(JNIEnv *env, jcla
jint networkType ) {
jint networkType ) {
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
Monero : : NetworkType _networkType = static_cast < Monero : : NetworkType > ( networkType ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
const char * _address = env - > GetStringUTFChars ( address , nullptr ) ;
std : : string payment_id = Bitm onero: : Wallet : : paymentIdFromAddress ( _address , _networkType ) ;
std : : string payment_id = M onero: : Wallet : : paymentIdFromAddress ( _address , _networkType ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
env - > ReleaseStringUTFChars ( address , _address ) ;
return env - > NewStringUTF ( payment_id . c_str ( ) ) ;
return env - > NewStringUTF ( payment_id . c_str ( ) ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getMaximumAllowedAmount ( JNIEnv * env , jclass clazz ) {
Java_com_m2049r_xmrwallet_model_Wallet_getMaximumAllowedAmount ( JNIEnv * env , jclass clazz ) {
return Bitm onero: : Wallet : : maximumAllowedAmount ( ) ;
return M onero: : Wallet : : maximumAllowedAmount ( ) ;
}
}
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_startRefresh ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_startRefresh ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > startRefresh ( ) ;
wallet - > startRefresh ( ) ;
}
}
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_pauseRefresh ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_pauseRefresh ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > pauseRefresh ( ) ;
wallet - > pauseRefresh ( ) ;
}
}
JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_refresh ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_refresh ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return static_cast < jboolean > ( wallet - > refresh ( ) ) ;
return static_cast < jboolean > ( wallet - > refresh ( ) ) ;
}
}
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > refreshAsync ( ) ;
wallet - > refreshAsync ( ) ;
}
}
@ -914,8 +915,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync(JNIEnv *env, jobject instanc
//virtual void rescanBlockchainAsync() = 0;
//virtual void rescanBlockchainAsync() = 0;
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_rescanBlockchainAsync ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_rescanBlockchainAsync J ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > rescanBlockchainAsync ( ) ;
wallet - > rescanBlockchainAsync ( ) ;
}
}
@ -932,14 +933,14 @@ Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject i
const char * _dst_addr = env - > GetStringUTFChars ( dst_addr , nullptr ) ;
const char * _dst_addr = env - > GetStringUTFChars ( dst_addr , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
Bitm onero: : PendingTransaction : : Priority _priority =
M onero: : PendingTransaction : : Priority _priority =
static_cast < Bitm onero: : PendingTransaction : : Priority > ( priority ) ;
static_cast < M onero: : PendingTransaction : : Priority > ( priority ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
Bitm onero: : PendingTransaction * tx = wallet - > createTransaction ( _dst_addr , _payment_id ,
M onero: : PendingTransaction * tx = wallet - > createTransaction ( _dst_addr , _payment_id ,
amount , ( uint32_t ) mixin_count ,
amount , ( uint32_t ) mixin_count ,
_priority ,
_priority ,
( uint32_t ) accountIndex ) ;
( uint32_t ) accountIndex ) ;
env - > ReleaseStringUTFChars ( dst_addr , _dst_addr ) ;
env - > ReleaseStringUTFChars ( dst_addr , _dst_addr ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
@ -955,16 +956,16 @@ Java_com_m2049r_xmrwallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobje
const char * _dst_addr = env - > GetStringUTFChars ( dst_addr , nullptr ) ;
const char * _dst_addr = env - > GetStringUTFChars ( dst_addr , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
const char * _payment_id = env - > GetStringUTFChars ( payment_id , nullptr ) ;
Bitm onero: : PendingTransaction : : Priority _priority =
M onero: : PendingTransaction : : Priority _priority =
static_cast < Bitm onero: : PendingTransaction : : Priority > ( priority ) ;
static_cast < M onero: : PendingTransaction : : Priority > ( priority ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
Monero : : optional < uint64_t > empty ;
Monero : : optional < uint64_t > empty ;
Bitm onero: : PendingTransaction * tx = wallet - > createTransaction ( _dst_addr , _payment_id ,
M onero: : PendingTransaction * tx = wallet - > createTransaction ( _dst_addr , _payment_id ,
empty , ( uint32_t ) mixin_count ,
empty , ( uint32_t ) mixin_count ,
_priority ,
_priority ,
( uint32_t ) accountIndex ) ;
( uint32_t ) accountIndex ) ;
env - > ReleaseStringUTFChars ( dst_addr , _dst_addr ) ;
env - > ReleaseStringUTFChars ( dst_addr , _dst_addr ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
env - > ReleaseStringUTFChars ( payment_id , _payment_id ) ;
@ -974,8 +975,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobje
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_createSweepUnmixableTransactionJ ( JNIEnv * env ,
Java_com_m2049r_xmrwallet_model_Wallet_createSweepUnmixableTransactionJ ( JNIEnv * env ,
jobject instance ) {
jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
Bitm onero: : PendingTransaction * tx = wallet - > createSweepUnmixableTransaction ( ) ;
M onero: : PendingTransaction * tx = wallet - > createSweepUnmixableTransaction ( ) ;
return reinterpret_cast < jlong > ( tx ) ;
return reinterpret_cast < jlong > ( tx ) ;
}
}
@ -985,9 +986,9 @@ Java_com_m2049r_xmrwallet_model_Wallet_createSweepUnmixableTransactionJ(JNIEnv *
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_disposeTransaction ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_disposeTransaction ( JNIEnv * env , jobject instance ,
jobject pendingTransaction ) {
jobject pendingTransaction ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
Bitm onero: : PendingTransaction * _pendingTransaction =
M onero: : PendingTransaction * _pendingTransaction =
getHandle < Bitm onero: : PendingTransaction > ( env , pendingTransaction ) ;
getHandle < M onero: : PendingTransaction > ( env , pendingTransaction ) ;
wallet - > disposeTransaction ( _pendingTransaction ) ;
wallet - > disposeTransaction ( _pendingTransaction ) ;
}
}
@ -998,7 +999,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_disposeTransaction(JNIEnv *env, jobject i
//virtual TransactionHistory * history() const = 0;
//virtual TransactionHistory * history() const = 0;
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getHistoryJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getHistoryJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return reinterpret_cast < jlong > ( wallet - > history ( ) ) ;
return reinterpret_cast < jlong > ( wallet - > history ( ) ) ;
}
}
@ -1007,7 +1008,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getHistoryJ(JNIEnv *env, jobject instance
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_setListenerJ ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_setListenerJ ( JNIEnv * env , jobject instance ,
jobject javaListener ) {
jobject javaListener ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > setListener ( nullptr ) ; // clear old listener
wallet - > setListener ( nullptr ) ; // clear old listener
// delete old listener
// delete old listener
MyWalletListener * oldListener = getHandle < MyWalletListener > ( env , instance ,
MyWalletListener * oldListener = getHandle < MyWalletListener > ( env , instance ,
@ -1028,13 +1029,13 @@ Java_com_m2049r_xmrwallet_model_Wallet_setListenerJ(JNIEnv *env, jobject instanc
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getDefaultMixin ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getDefaultMixin ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > defaultMixin ( ) ;
return wallet - > defaultMixin ( ) ;
}
}
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_setDefaultMixin ( JNIEnv * env , jobject instance , jint mixin ) {
Java_com_m2049r_xmrwallet_model_Wallet_setDefaultMixin ( JNIEnv * env , jobject instance , jint mixin ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return wallet - > setDefaultMixin ( mixin ) ;
return wallet - > setDefaultMixin ( mixin ) ;
}
}
@ -1045,7 +1046,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setUserNote(JNIEnv *env, jobject instance
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
const char * _note = env - > GetStringUTFChars ( note , nullptr ) ;
const char * _note = env - > GetStringUTFChars ( note , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
bool success = wallet - > setUserNote ( _txid , _note ) ;
bool success = wallet - > setUserNote ( _txid , _note ) ;
@ -1061,7 +1062,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getUserNote(JNIEnv *env, jobject instance
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
std : : string note = wallet - > getUserNote ( _txid ) ;
std : : string note = wallet - > getUserNote ( _txid ) ;
@ -1075,7 +1076,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getTxKey(JNIEnv *env, jobject instance,
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
const char * _txid = env - > GetStringUTFChars ( txid , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
std : : string txKey = wallet - > getTxKey ( _txid ) ;
std : : string txKey = wallet - > getTxKey ( _txid ) ;
@ -1090,7 +1091,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_addAccount(JNIEnv *env, jobject instance,
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > addSubaddressAccount ( _label ) ;
wallet - > addSubaddressAccount ( _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
@ -1101,7 +1102,7 @@ JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getSubaddressLabel ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getSubaddressLabel ( JNIEnv * env , jobject instance ,
jint accountIndex , jint addressIndex ) {
jint accountIndex , jint addressIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
std : : string label = wallet - > getSubaddressLabel ( ( uint32_t ) accountIndex ,
std : : string label = wallet - > getSubaddressLabel ( ( uint32_t ) accountIndex ,
( uint32_t ) addressIndex ) ;
( uint32_t ) addressIndex ) ;
@ -1117,7 +1118,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setSubaddressLabel(JNIEnv *env, jobject i
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > setSubaddressLabel ( accountIndex , addressIndex , _label ) ;
wallet - > setSubaddressLabel ( accountIndex , addressIndex , _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
@ -1126,7 +1127,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setSubaddressLabel(JNIEnv *env, jobject i
// virtual size_t numSubaddressAccounts() const = 0;
// virtual size_t numSubaddressAccounts() const = 0;
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getNumAccounts ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_Wallet_getNumAccounts ( JNIEnv * env , jobject instance ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return static_cast < jint > ( wallet - > numSubaddressAccounts ( ) ) ;
return static_cast < jint > ( wallet - > numSubaddressAccounts ( ) ) ;
}
}
@ -1134,7 +1135,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getNumAccounts(JNIEnv *env, jobject insta
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_Wallet_getNumSubaddresses ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getNumSubaddresses ( JNIEnv * env , jobject instance ,
jint accountIndex ) {
jint accountIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
return static_cast < jint > ( wallet - > numSubaddresses ( accountIndex ) ) ;
return static_cast < jint > ( wallet - > numSubaddresses ( accountIndex ) ) ;
}
}
@ -1145,7 +1146,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_addSubaddress(JNIEnv *env, jobject instan
jstring label ) {
jstring label ) {
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
const char * _label = env - > GetStringUTFChars ( label , nullptr ) ;
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
wallet - > addSubaddress ( accountIndex , _label ) ;
wallet - > addSubaddress ( accountIndex , _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
env - > ReleaseStringUTFChars ( label , _label ) ;
}
}
@ -1154,7 +1155,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_addSubaddress(JNIEnv *env, jobject instan
Java_com_m2049r_xmrwallet_model_Wallet_getLastSubaddress ( JNIEnv * env , jobject instance ,
Java_com_m2049r_xmrwallet_model_Wallet_getLastSubaddress ( JNIEnv * env , jobject instance ,
jint accountIndex ) {
jint accountIndex ) {
Bitm onero: : Wallet * wallet = getHandle < Bitm onero: : Wallet > ( env , instance ) ;
M onero: : Wallet * wallet = getHandle < M onero: : Wallet > ( env , instance ) ;
size_t num = wallet - > numSubaddresses ( accountIndex ) ;
size_t num = wallet - > numSubaddresses ( accountIndex ) ;
//wallet->subaddress()->getAll()[num]->getAddress().c_str()
//wallet->subaddress()->getAll()[num]->getAddress().c_str()
Monero : : Subaddress * s = wallet - > subaddress ( ) ;
Monero : : Subaddress * s = wallet - > subaddress ( ) ;
@ -1173,8 +1174,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_getLastSubaddress(JNIEnv *env, jobject in
// TransactionHistory
// TransactionHistory
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_TransactionHistory_getCount ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_TransactionHistory_getCount ( JNIEnv * env , jobject instance ) {
Bitm onero: : TransactionHistory * history = getHandle < Bitm onero: : TransactionHistory > ( env ,
M onero: : TransactionHistory * history = getHandle < M onero: : TransactionHistory > ( env ,
instance ) ;
instance ) ;
return history - > count ( ) ;
return history - > count ( ) ;
}
}
@ -1187,8 +1188,8 @@ jobject newTransferInstance(JNIEnv *env, uint64_t amount, const std::string &add
return transfer ;
return transfer ;
}
}
jobject newTransferList ( JNIEnv * env , Bitm onero: : TransactionInfo * info ) {
jobject newTransferList ( JNIEnv * env , M onero: : TransactionInfo * info ) {
const std : : vector < Bitm onero: : TransactionInfo : : Transfer > & transfers = info - > transfers ( ) ;
const std : : vector < M onero: : TransactionInfo : : Transfer > & transfers = info - > transfers ( ) ;
if ( transfers . empty ( ) ) { // don't create empty Lists
if ( transfers . empty ( ) ) { // don't create empty Lists
return nullptr ;
return nullptr ;
}
}
@ -1199,7 +1200,7 @@ jobject newTransferList(JNIEnv *env, Bitmonero::TransactionInfo *info) {
jobject result = env - > NewObject ( class_ArrayList , java_util_ArrayList_ ,
jobject result = env - > NewObject ( class_ArrayList , java_util_ArrayList_ ,
static_cast < jint > ( transfers . size ( ) ) ) ;
static_cast < jint > ( transfers . size ( ) ) ) ;
// create Transfer objects and stick them in the List
// create Transfer objects and stick them in the List
for ( const Bitm onero: : TransactionInfo : : Transfer & s : transfers ) {
for ( const M onero: : TransactionInfo : : Transfer & s : transfers ) {
jobject element = newTransferInstance ( env , s . amount , s . address ) ;
jobject element = newTransferInstance ( env , s . amount , s . address ) ;
env - > CallBooleanMethod ( result , java_util_ArrayList_add , element ) ;
env - > CallBooleanMethod ( result , java_util_ArrayList_add , element ) ;
env - > DeleteLocalRef ( element ) ;
env - > DeleteLocalRef ( element ) ;
@ -1207,7 +1208,7 @@ jobject newTransferList(JNIEnv *env, Bitmonero::TransactionInfo *info) {
return result ;
return result ;
}
}
jobject newTransactionInfo ( JNIEnv * env , Bitm onero: : TransactionInfo * info ) {
jobject newTransactionInfo ( JNIEnv * env , M onero: : TransactionInfo * info ) {
jmethodID c = env - > GetMethodID ( class_TransactionInfo , " <init> " ,
jmethodID c = env - > GetMethodID ( class_TransactionInfo , " <init> " ,
" (IZZJJJLjava/lang/String;JLjava/lang/String;IIJLjava/lang/String;Ljava/util/List;)V " ) ;
" (IZZJJJLjava/lang/String;JLjava/lang/String;IIJLjava/lang/String;Ljava/util/List;)V " ) ;
jobject transfers = newTransferList ( env , info ) ;
jobject transfers = newTransferList ( env , info ) ;
@ -1215,7 +1216,7 @@ jobject newTransactionInfo(JNIEnv *env, Bitmonero::TransactionInfo *info) {
jstring _paymentId = env - > NewStringUTF ( info - > paymentId ( ) . c_str ( ) ) ;
jstring _paymentId = env - > NewStringUTF ( info - > paymentId ( ) . c_str ( ) ) ;
jstring _label = env - > NewStringUTF ( info - > label ( ) . c_str ( ) ) ;
jstring _label = env - > NewStringUTF ( info - > label ( ) . c_str ( ) ) ;
uint32_t subaddrIndex = 0 ;
uint32_t subaddrIndex = 0 ;
if ( info - > direction ( ) = = Bitm onero: : TransactionInfo : : Direction_In )
if ( info - > direction ( ) = = M onero: : TransactionInfo : : Direction_In )
subaddrIndex = * ( info - > subaddrIndex ( ) . begin ( ) ) ;
subaddrIndex = * ( info - > subaddrIndex ( ) . begin ( ) ) ;
jobject result = env - > NewObject ( class_TransactionInfo , c ,
jobject result = env - > NewObject ( class_TransactionInfo , c ,
info - > direction ( ) ,
info - > direction ( ) ,
@ -1241,7 +1242,7 @@ jobject newTransactionInfo(JNIEnv *env, Bitmonero::TransactionInfo *info) {
# include <stdio.h>
# include <stdio.h>
# include <stdlib.h>
# include <stdlib.h>
jobject cpp2java ( JNIEnv * env , const std : : vector < Bitm onero: : TransactionInfo * > & vector ) {
jobject cpp2java ( JNIEnv * env , const std : : vector < M onero: : TransactionInfo * > & vector ) {
jmethodID java_util_ArrayList_ = env - > GetMethodID ( class_ArrayList , " <init> " , " (I)V " ) ;
jmethodID java_util_ArrayList_ = env - > GetMethodID ( class_ArrayList , " <init> " , " (I)V " ) ;
jmethodID java_util_ArrayList_add = env - > GetMethodID ( class_ArrayList , " add " ,
jmethodID java_util_ArrayList_add = env - > GetMethodID ( class_ArrayList , " add " ,
@ -1249,7 +1250,7 @@ jobject cpp2java(JNIEnv *env, const std::vector<Bitmonero::TransactionInfo *>& v
jobject arrayList = env - > NewObject ( class_ArrayList , java_util_ArrayList_ ,
jobject arrayList = env - > NewObject ( class_ArrayList , java_util_ArrayList_ ,
static_cast < jint > ( vector . size ( ) ) ) ;
static_cast < jint > ( vector . size ( ) ) ) ;
for ( Bitm onero: : TransactionInfo * s : vector ) {
for ( M onero: : TransactionInfo * s : vector ) {
jobject info = newTransactionInfo ( env , s ) ;
jobject info = newTransactionInfo ( env , s ) ;
env - > CallBooleanMethod ( arrayList , java_util_ArrayList_add , info ) ;
env - > CallBooleanMethod ( arrayList , java_util_ArrayList_add , info ) ;
env - > DeleteLocalRef ( info ) ;
env - > DeleteLocalRef ( info ) ;
@ -1259,8 +1260,8 @@ jobject cpp2java(JNIEnv *env, const std::vector<Bitmonero::TransactionInfo *>& v
JNIEXPORT jobject JNICALL
JNIEXPORT jobject JNICALL
Java_com_m2049r_xmrwallet_model_TransactionHistory_refreshJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_TransactionHistory_refreshJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : TransactionHistory * history = getHandle < Bitm onero: : TransactionHistory > ( env ,
M onero: : TransactionHistory * history = getHandle < M onero: : TransactionHistory > ( env ,
instance ) ;
instance ) ;
history - > refresh ( ) ;
history - > refresh ( ) ;
return cpp2java ( env , history - > getAll ( ) ) ;
return cpp2java ( env , history - > getAll ( ) ) ;
}
}
@ -1269,13 +1270,13 @@ Java_com_m2049r_xmrwallet_model_TransactionHistory_refreshJ(JNIEnv *env, jobject
JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getStatusJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getStatusJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return tx - > status ( ) ;
return tx - > status ( ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getErrorString ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getErrorString ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return env - > NewStringUTF ( tx - > errorString ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( tx - > errorString ( ) . c_str ( ) ) ;
}
}
@ -1286,7 +1287,7 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_commit(JNIEnv *env, jobject i
const char * _filename = env - > GetStringUTFChars ( filename , nullptr ) ;
const char * _filename = env - > GetStringUTFChars ( filename , nullptr ) ;
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
bool success = tx - > commit ( _filename , overwrite ) ;
bool success = tx - > commit ( _filename , overwrite ) ;
env - > ReleaseStringUTFChars ( filename , _filename ) ;
env - > ReleaseStringUTFChars ( filename , _filename ) ;
@ -1296,26 +1297,26 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_commit(JNIEnv *env, jobject i
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getAmount ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getAmount ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return tx - > amount ( ) ;
return tx - > amount ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getDust ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getDust ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return tx - > dust ( ) ;
return tx - > dust ( ) ;
}
}
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getFee ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getFee ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return tx - > fee ( ) ;
return tx - > fee ( ) ;
}
}
// TODO this returns a vector of strings - deal with this later - for now return first one
// TODO this returns a vector of strings - deal with this later - for now return first one
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxIdJ ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxIdJ ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
std : : vector < std : : string > txids = tx - > txid ( ) ;
std : : vector < std : : string > txids = tx - > txid ( ) ;
if ( ! txids . empty ( ) )
if ( ! txids . empty ( ) )
return env - > NewStringUTF ( txids . front ( ) . c_str ( ) ) ;
return env - > NewStringUTF ( txids . front ( ) . c_str ( ) ) ;
@ -1325,12 +1326,12 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxIdJ(JNIEnv *env, jo
JNIEXPORT jlong JNICALL
JNIEXPORT jlong JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount ( JNIEnv * env , jobject instance ) {
Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount ( JNIEnv * env , jobject instance ) {
Bitm onero: : PendingTransaction * tx = getHandle < Bitm onero: : PendingTransaction > ( env , instance ) ;
M onero: : PendingTransaction * tx = getHandle < M onero: : PendingTransaction > ( env , instance ) ;
return tx - > txCount ( ) ;
return tx - > txCount ( ) ;
}
}
// these are all in Bitm onero::Wallet - which I find wrong, so they are here!
// these are all in M onero::Wallet - which I find wrong, so they are here!
//static void init(const char *argv0, const char *default_log_base_name);
//static void init(const char *argv0, const char *default_log_base_name);
//static void debug(const std::string &category, const std::string &str);
//static void debug(const std::string &category, const std::string &str);
//static void info(const std::string &category, const std::string &str);
//static void info(const std::string &category, const std::string &str);
@ -1344,7 +1345,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_initLogger(JNIEnv *env, jclass cla
const char * _argv0 = env - > GetStringUTFChars ( argv0 , nullptr ) ;
const char * _argv0 = env - > GetStringUTFChars ( argv0 , nullptr ) ;
const char * _default_log_base_name = env - > GetStringUTFChars ( default_log_base_name , nullptr ) ;
const char * _default_log_base_name = env - > GetStringUTFChars ( default_log_base_name , nullptr ) ;
Bitm onero: : Wallet : : init ( _argv0 , _default_log_base_name ) ;
M onero: : Wallet : : init ( _argv0 , _default_log_base_name ) ;
env - > ReleaseStringUTFChars ( argv0 , _argv0 ) ;
env - > ReleaseStringUTFChars ( argv0 , _argv0 ) ;
env - > ReleaseStringUTFChars ( default_log_base_name , _default_log_base_name ) ;
env - > ReleaseStringUTFChars ( default_log_base_name , _default_log_base_name ) ;
@ -1357,7 +1358,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logDebug(JNIEnv *env, jclass clazz
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
Bitm onero: : Wallet : : debug ( _category , _message ) ;
M onero: : Wallet : : debug ( _category , _message ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
@ -1370,7 +1371,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logInfo(JNIEnv *env, jclass clazz,
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
Bitm onero: : Wallet : : info ( _category , _message ) ;
M onero: : Wallet : : info ( _category , _message ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
@ -1383,7 +1384,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logWarning(JNIEnv *env, jclass cla
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
Bitm onero: : Wallet : : warning ( _category , _message ) ;
M onero: : Wallet : : warning ( _category , _message ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
@ -1396,7 +1397,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logError(JNIEnv *env, jclass clazz
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _category = env - > GetStringUTFChars ( category , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
const char * _message = env - > GetStringUTFChars ( message , nullptr ) ;
Bitm onero: : Wallet : : error ( _category , _message ) ;
M onero: : Wallet : : error ( _category , _message ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( category , _category ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
env - > ReleaseStringUTFChars ( message , _message ) ;
@ -1405,7 +1406,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logError(JNIEnv *env, jclass clazz
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel ( JNIEnv * env , jclass clazz ,
Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel ( JNIEnv * env , jclass clazz ,
jint level ) {
jint level ) {
Bitm onero: : WalletManagerFactory : : setLogLevel ( level ) ;
M onero: : WalletManagerFactory : : setLogLevel ( level ) ;
}
}
JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL