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