diff --git a/.idea/modules.xml b/.idea/modules.xml index dce0d43..34cdcac 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f06cd4d..5f5d4ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 + compileSdkVersion 28 buildToolsVersion '27.0.3' defaultConfig { - applicationId 'org.wownero.wownerojo' + applicationId 'com.wownero.wownerujo' minSdkVersion 21 targetSdkVersion 25 versionCode 100 diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index d08ba7f..0000000 Binary files a/app/src/debug/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index c45b492..0000000 Binary files a/app/src/debug/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index 44f4c13..0000000 Binary files a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index 257fc8e..0000000 Binary files a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100755 index 27e58bb..0000000 Binary files a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 4e67f5c..eafbe9c 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ - monerujo - Debug + wownerujo - Debug \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4bf5b3a..6c14685 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.wownero.wownerujo"> @@ -39,7 +39,7 @@ android:name=".service.WalletService" android:description="@string/service_description" android:exported="false" - android:label="Monero Wallet Service" /> + android:label="Wownero Wallet Service" /> diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp index 5441aa6..e71a2c6 100644 --- a/app/src/main/cpp/monerujo.cpp +++ b/app/src/main/cpp/monerujo.cpp @@ -53,11 +53,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) { class_ArrayList = static_cast(jenv->NewGlobalRef( jenv->FindClass("java/util/ArrayList"))); class_TransactionInfo = static_cast(jenv->NewGlobalRef( - jenv->FindClass("com/m2049r/xmrwallet/model/TransactionInfo"))); + jenv->FindClass("com/wownero/wownerujo/model/TransactionInfo"))); class_Transfer = static_cast(jenv->NewGlobalRef( - jenv->FindClass("com/m2049r/xmrwallet/model/Transfer"))); + jenv->FindClass("com/wownero/wownerujo/model/Transfer"))); class_WalletListener = static_cast(jenv->NewGlobalRef( - jenv->FindClass("com/m2049r/xmrwallet/model/WalletListener"))); + jenv->FindClass("com/wownero/wownerujo/model/WalletListener"))); return JNI_VERSION_1_6; } #ifdef __cplusplus @@ -250,7 +250,7 @@ extern "C" /********** WalletManager *********/ /**********************************/ JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_createWalletJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_createWalletJ(JNIEnv *env, jobject instance, jstring path, jstring password, jstring language, jint networkType) { @@ -273,7 +273,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletJ(JNIEnv *env, jobject } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_openWalletJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_openWalletJ(JNIEnv *env, jobject instance, jstring path, jstring password, jint networkType) { const char *_path = env->GetStringUTFChars(path, NULL); @@ -292,7 +292,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_openWalletJ(JNIEnv *env, jobject i } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_recoveryWalletJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_recoveryWalletJ(JNIEnv *env, jobject instance, jstring path, jstring password, jstring mnemonic, jint networkType, @@ -317,7 +317,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_recoveryWalletJ(JNIEnv *env, jobje } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromKeysJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_createWalletFromKeysJ(JNIEnv *env, jobject instance, jstring path, jstring password, jstring language, jint networkType, @@ -354,7 +354,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromKeysJ(JNIEnv *env, } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_walletExists(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_walletExists(JNIEnv *env, jobject instance, jstring path) { const char *_path = env->GetStringUTFChars(path, NULL); bool exists = @@ -364,7 +364,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_walletExists(JNIEnv *env, jobject } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_verifyWalletPassword(JNIEnv *env, jobject instance, jstring keys_file_name, jstring password, jboolean watch_only) { @@ -380,7 +380,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env, JNIEXPORT jobject JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_findWallets(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_findWallets(JNIEnv *env, jobject instance, jstring path) { const char *_path = env->GetStringUTFChars(path, NULL); std::vector walletPaths = @@ -390,7 +390,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_findWallets(JNIEnv *env, jobject i } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getErrorString(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_getErrorString(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->errorString().c_str()); } @@ -398,7 +398,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_getErrorString(JNIEnv *env, jobjec //TODO virtual bool checkPayment(const std::string &address, const std::string &txid, const std::string &txkey, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const = 0; JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_setDaemonAddressJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_setDaemonAddressJ(JNIEnv *env, jobject instance, jstring address) { const char *_address = env->GetStringUTFChars(address, NULL); Bitmonero::WalletManagerFactory::getWalletManager()->setDaemonAddress(std::string(_address)); @@ -407,7 +407,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_setDaemonAddressJ(JNIEnv *env, job // returns whether the daemon can be reached, and its version number JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getDaemonVersion(JNIEnv *env, +Java_com_wownero_wownerujo_model_WalletManager_getDaemonVersion(JNIEnv *env, jobject instance) { uint32_t version; bool isConnected = @@ -417,38 +417,38 @@ Java_com_m2049r_xmrwallet_model_WalletManager_getDaemonVersion(JNIEnv *env, } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainHeight(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_getBlockchainHeight(JNIEnv *env, jobject instance) { return Bitmonero::WalletManagerFactory::getWalletManager()->blockchainHeight(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getBlockchainTargetHeight(JNIEnv *env, +Java_com_wownero_wownerujo_model_WalletManager_getBlockchainTargetHeight(JNIEnv *env, jobject instance) { return Bitmonero::WalletManagerFactory::getWalletManager()->blockchainTargetHeight(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getNetworkDifficulty(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_getNetworkDifficulty(JNIEnv *env, jobject instance) { return Bitmonero::WalletManagerFactory::getWalletManager()->networkDifficulty(); } JNIEXPORT jdouble JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getMiningHashRate(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_getMiningHashRate(JNIEnv *env, jobject instance) { return Bitmonero::WalletManagerFactory::getWalletManager()->miningHashRate(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_getBlockTarget(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_getBlockTarget(JNIEnv *env, jobject instance) { return Bitmonero::WalletManagerFactory::getWalletManager()->blockTarget(); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_isMining(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_WalletManager_isMining(JNIEnv *env, jobject instance) { return static_cast(Bitmonero::WalletManagerFactory::getWalletManager()->isMining()); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_startMining(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_startMining(JNIEnv *env, jobject instance, jstring address, jboolean background_mining, jboolean ignore_battery) { @@ -462,12 +462,12 @@ 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) { +Java_com_wownero_wownerujo_model_WalletManager_stopMining(JNIEnv *env, jobject instance) { return static_cast(Bitmonero::WalletManagerFactory::getWalletManager()->stopMining()); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobject instance, jstring address, jboolean dnssec_valid) { const char *_address = env->GetStringUTFChars(address, NULL); @@ -483,7 +483,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobj //TODO static std::tuple checkUpdates(const std::string &software, const std::string &subdir); JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_closeJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_closeJ(JNIEnv *env, jobject instance, jobject walletInstance) { Bitmonero::Wallet *wallet = getHandle(env, walletInstance); bool closeSuccess = Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(wallet, @@ -508,19 +508,19 @@ 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) { +Java_com_wownero_wownerujo_model_Wallet_getSeed(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->seed().c_str()); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getSeedLanguage(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getSeedLanguage(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->getSeedLanguage().c_str()); } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_setSeedLanguage(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_setSeedLanguage(JNIEnv *env, jobject instance, jstring language) { const char *_language = env->GetStringUTFChars(language, NULL); Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -529,19 +529,19 @@ Java_com_m2049r_xmrwallet_model_Wallet_setSeedLanguage(JNIEnv *env, jobject inst } JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getStatusJ(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getStatusJ(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->status(); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getErrorString(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getErrorString(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->errorString().c_str()); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_setPassword(JNIEnv *env, jobject instance, jstring password) { const char *_password = env->GetStringUTFChars(password, NULL); Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -551,7 +551,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getAddressJ(JNIEnv *env, jobject instance, jint accountIndex, jint addressIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -560,13 +560,13 @@ Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getPath(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getPath(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->path().c_str()); } JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_nettype(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_nettype(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->nettype(); } @@ -575,7 +575,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_nettype(JNIEnv *env, jobject instance) { //TODO virtual bool useForkRules(uint8_t version, int64_t early_blocks) const = 0; JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject instance, jstring payment_id) { const char *_payment_id = env->GetStringUTFChars(payment_id, NULL); Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -585,19 +585,19 @@ Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getSecretViewKey(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getSecretViewKey(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->secretViewKey().c_str()); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getSecretSpendKey(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getSecretSpendKey(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->secretSpendKey().c_str()); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_store(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_store(JNIEnv *env, jobject instance, jstring path) { const char *_path = env->GetStringUTFChars(path, NULL); Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -610,7 +610,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) { +Java_com_wownero_wownerujo_model_Wallet_getFilename(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return env->NewStringUTF(wallet->filename().c_str()); } @@ -618,7 +618,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getFilename(JNIEnv *env, jobject instance // virtual std::string keysFilename() const = 0; JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_initJ(JNIEnv *env, jobject instance, jstring daemon_address, jlong upper_transaction_size_limit, jstring daemon_username, jstring daemon_password) { @@ -641,7 +641,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance, // virtual bool connectToDaemon() = 0; JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->connected(); } @@ -649,72 +649,72 @@ Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject //TODO virtual bool trustedDaemon() const = 0; JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getBalance(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getBalance(JNIEnv *env, jobject instance, jint accountIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->balance((uint32_t) accountIndex); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getBalanceAll(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getBalanceAll(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->balanceAll(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalance(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getUnlockedBalance(JNIEnv *env, jobject instance, jint accountIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->unlockedBalance((uint32_t) accountIndex); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalanceAll(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getUnlockedBalanceAll(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->unlockedBalanceAll(); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_isWatchOnly(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_isWatchOnly(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return static_cast(wallet->watchOnly()); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getBlockChainHeight(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getBlockChainHeight(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->blockChainHeight(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getApproximateBlockChainHeight(JNIEnv *env, +Java_com_wownero_wownerujo_model_Wallet_getApproximateBlockChainHeight(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->approximateBlockChainHeight(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainHeight(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_getDaemonBlockChainHeight(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->daemonBlockChainHeight(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getDaemonBlockChainTargetHeight(JNIEnv *env, +Java_com_wownero_wownerujo_model_Wallet_getDaemonBlockChainTargetHeight(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return wallet->daemonBlockChainTargetHeight(); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_isSynchronized(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_isSynchronized(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return static_cast(wallet->synchronized()); } //void cn_slow_hash(const void *data, size_t length, char *hash); // from crypto/hash-ops.h JNIEXPORT jbyteArray JNICALL -Java_com_m2049r_xmrwallet_util_KeyStoreHelper_slowHash(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_util_KeyStoreHelper_slowHash(JNIEnv *env, jobject clazz, jbyteArray data, jint brokenVariant) { char hash[HASH_SIZE]; jsize size = env->GetArrayLength(data); @@ -727,13 +727,13 @@ Java_com_m2049r_xmrwallet_util_KeyStoreHelper_slowHash(JNIEnv *env, jobject claz } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getDisplayAmount(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_getDisplayAmount(JNIEnv *env, jobject clazz, jlong amount) { return env->NewStringUTF(Bitmonero::Wallet::displayAmount(amount).c_str()); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_getAmountFromString(JNIEnv *env, jobject clazz, jstring amount) { const char *_amount = env->GetStringUTFChars(amount, NULL); uint64_t x = Bitmonero::Wallet::amountFromString(_amount); @@ -742,18 +742,18 @@ Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString(JNIEnv *env, jobject } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromDouble(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_getAmountFromDouble(JNIEnv *env, jobject clazz, jdouble amount) { return Bitmonero::Wallet::amountFromDouble(amount); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_generatePaymentId(JNIEnv *env, jobject clazz) { +Java_com_wownero_wownerujo_model_Wallet_generatePaymentId(JNIEnv *env, jobject clazz) { return env->NewStringUTF(Bitmonero::Wallet::genPaymentId().c_str()); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_isPaymentIdValid(JNIEnv *env, jobject clazz, jstring payment_id) { const char *_payment_id = env->GetStringUTFChars(payment_id, NULL); bool isValid = Bitmonero::Wallet::paymentIdValid(_payment_id); @@ -762,7 +762,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid(JNIEnv *env, jobject cla } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_isAddressValid(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_isAddressValid(JNIEnv *env, jobject clazz, jstring address, jint networkType) { const char *_address = env->GetStringUTFChars(address, NULL); Monero::NetworkType _networkType = static_cast(networkType); @@ -772,7 +772,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_isAddressValid(JNIEnv *env, jobject clazz } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getPaymentIdFromAddress(JNIEnv *env, jobject clazz, +Java_com_wownero_wownerujo_model_Wallet_getPaymentIdFromAddress(JNIEnv *env, jobject clazz, jstring address, jint networkType) { Monero::NetworkType _networkType = static_cast(networkType); @@ -783,30 +783,30 @@ Java_com_m2049r_xmrwallet_model_Wallet_getPaymentIdFromAddress(JNIEnv *env, jobj } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getMaximumAllowedAmount(JNIEnv *env, jobject clazz) { +Java_com_wownero_wownerujo_model_Wallet_getMaximumAllowedAmount(JNIEnv *env, jobject clazz) { return Bitmonero::Wallet::maximumAllowedAmount(); } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_startRefresh(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_startRefresh(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); wallet->startRefresh(); } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_pauseRefresh(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_pauseRefresh(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); wallet->pauseRefresh(); } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_refresh(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_refresh(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return static_cast(wallet->refresh()); } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_Wallet_refreshAsync(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); wallet->refreshAsync(); } @@ -815,7 +815,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync(JNIEnv *env, jobject instanc //TODO virtual int autoRefreshInterval() const = 0; JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_createTransactionJ(JNIEnv *env, jobject instance, jstring dst_addr, jstring payment_id, jlong amount, jint mixin_count, jint priority, @@ -838,7 +838,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject i } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_createSweepTransaction(JNIEnv *env, jobject instance, jstring dst_addr, jstring payment_id, jint mixin_count, jint priority, @@ -863,7 +863,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobje } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_createSweepUnmixableTransactionJ(JNIEnv *env, +Java_com_wownero_wownerujo_model_Wallet_createSweepUnmixableTransactionJ(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); Bitmonero::PendingTransaction *tx = wallet->createSweepUnmixableTransaction(); @@ -874,7 +874,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_createSweepUnmixableTransactionJ(JNIEnv * //virtual bool submitTransaction(const std::string &fileName) = 0; JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_disposeTransaction(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_disposeTransaction(JNIEnv *env, jobject instance, jobject pendingTransaction) { Bitmonero::Wallet *wallet = getHandle(env, instance); Bitmonero::PendingTransaction *_pendingTransaction = @@ -888,7 +888,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) { +Java_com_wownero_wownerujo_model_Wallet_getHistoryJ(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return reinterpret_cast(wallet->history()); } @@ -896,7 +896,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getHistoryJ(JNIEnv *env, jobject instance //virtual AddressBook * addressBook() const = 0; JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_setListenerJ(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_setListenerJ(JNIEnv *env, jobject instance, jobject javaListener) { Bitmonero::Wallet *wallet = getHandle(env, instance); wallet->setListener(nullptr); // clear old listener @@ -918,7 +918,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setListenerJ(JNIEnv *env, jobject instanc } JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_setUserNote(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_setUserNote(JNIEnv *env, jobject instance, jstring txid, jstring note) { const char *_txid = env->GetStringUTFChars(txid, NULL); @@ -935,7 +935,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setUserNote(JNIEnv *env, jobject instance } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getUserNote(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getUserNote(JNIEnv *env, jobject instance, jstring txid) { const char *_txid = env->GetStringUTFChars(txid, NULL); @@ -949,7 +949,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getUserNote(JNIEnv *env, jobject instance } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getTxKey(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getTxKey(JNIEnv *env, jobject instance, jstring txid) { const char *_txid = env->GetStringUTFChars(txid, NULL); @@ -964,7 +964,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getTxKey(JNIEnv *env, jobject instance, //virtual void addSubaddressAccount(const std::string& label) = 0; JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_addAccount(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_addAccount(JNIEnv *env, jobject instance, jstring label) { const char *_label = env->GetStringUTFChars(label, NULL); @@ -977,7 +977,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_addAccount(JNIEnv *env, jobject instance, //virtual std::string getSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex) const = 0; JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getSubaddressLabel(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getSubaddressLabel(JNIEnv *env, jobject instance, jint accountIndex, jint addressIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -990,7 +990,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getSubaddressLabel(JNIEnv *env, jobject i //virtual void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label) = 0; JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_setSubaddressLabel(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_setSubaddressLabel(JNIEnv *env, jobject instance, jint accountIndex, jint addressIndex, jstring label) { @@ -1004,14 +1004,14 @@ 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) { +Java_com_wownero_wownerujo_model_Wallet_getNumAccounts(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); return static_cast(wallet->numSubaddressAccounts()); } //virtual size_t numSubaddresses(uint32_t accountIndex) const = 0; JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getNumSubaddresses(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getNumSubaddresses(JNIEnv *env, jobject instance, jint accountIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); return static_cast(wallet->numSubaddresses(accountIndex)); @@ -1019,7 +1019,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getNumSubaddresses(JNIEnv *env, jobject i //virtual void addSubaddress(uint32_t accountIndex, const std::string &label) = 0; JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_addSubaddress(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_addSubaddress(JNIEnv *env, jobject instance, jint accountIndex, jstring label) { @@ -1030,7 +1030,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_addSubaddress(JNIEnv *env, jobject instan } /*JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getLastSubaddress(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_Wallet_getLastSubaddress(JNIEnv *env, jobject instance, jint accountIndex) { Bitmonero::Wallet *wallet = getHandle(env, instance); @@ -1051,7 +1051,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) { +Java_com_wownero_wownerujo_model_TransactionHistory_getCount(JNIEnv *env, jobject instance) { Bitmonero::TransactionHistory *history = getHandle(env, instance); return history->count(); @@ -1133,7 +1133,7 @@ jobject cpp2java(JNIEnv *env, std::vector vector) } JNIEXPORT jobject JNICALL -Java_com_m2049r_xmrwallet_model_TransactionHistory_refreshJ(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_TransactionHistory_refreshJ(JNIEnv *env, jobject instance) { Bitmonero::TransactionHistory *history = getHandle(env, instance); history->refresh(); @@ -1143,20 +1143,20 @@ Java_com_m2049r_xmrwallet_model_TransactionHistory_refreshJ(JNIEnv *env, jobject // TransactionInfo is implemented in Java - no need here JNIEXPORT jint JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_getStatusJ(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_PendingTransaction_getStatusJ(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); return tx->status(); } JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_getErrorString(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_PendingTransaction_getErrorString(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); return env->NewStringUTF(tx->errorString().c_str()); } // commit transaction or save to file if filename is provided. JNIEXPORT jboolean JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_commit(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_PendingTransaction_commit(JNIEnv *env, jobject instance, jstring filename, jboolean overwrite) { const char *_filename = env->GetStringUTFChars(filename, NULL); @@ -1170,26 +1170,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) { +Java_com_wownero_wownerujo_model_PendingTransaction_getAmount(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); return tx->amount(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_getDust(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_PendingTransaction_getDust(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); return tx->dust(); } JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_getFee(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_PendingTransaction_getFee(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(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) { +Java_com_wownero_wownerujo_model_PendingTransaction_getFirstTxIdJ(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); std::vector txids = tx->txid(); if (!txids.empty()) @@ -1200,7 +1200,7 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxIdJ(JNIEnv *env, jo JNIEXPORT jlong JNICALL -Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount(JNIEnv *env, jobject instance) { +Java_com_wownero_wownerujo_model_PendingTransaction_getTxCount(JNIEnv *env, jobject instance) { Bitmonero::PendingTransaction *tx = getHandle(env, instance); return tx->txCount(); } @@ -1213,7 +1213,7 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount(JNIEnv *env, jobje //static void warning(const std::string &category, const std::string &str); //static void error(const std::string &category, const std::string &str); JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_initLogger(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_initLogger(JNIEnv *env, jobject instance, jstring argv0, jstring default_log_base_name) { @@ -1227,7 +1227,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_initLogger(JNIEnv *env, jobject in } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_logDebug(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_logDebug(JNIEnv *env, jobject instance, jstring category, jstring message) { const char *_category = env->GetStringUTFChars(category, NULL); @@ -1240,7 +1240,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logDebug(JNIEnv *env, jobject inst } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_logInfo(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_logInfo(JNIEnv *env, jobject instance, jstring category, jstring message) { const char *_category = env->GetStringUTFChars(category, NULL); @@ -1253,7 +1253,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logInfo(JNIEnv *env, jobject insta } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_logWarning(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_logWarning(JNIEnv *env, jobject instance, jstring category, jstring message) { const char *_category = env->GetStringUTFChars(category, NULL); @@ -1266,7 +1266,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logWarning(JNIEnv *env, jobject in } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_logError(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_logError(JNIEnv *env, jobject instance, jstring category, jstring message) { const char *_category = env->GetStringUTFChars(category, NULL); @@ -1279,7 +1279,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_logError(JNIEnv *env, jobject inst } JNIEXPORT void JNICALL -Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel(JNIEnv *env, jobject instance, +Java_com_wownero_wownerujo_model_WalletManager_setLogLevel(JNIEnv *env, jobject instance, jint level) { Bitmonero::WalletManagerFactory::setLogLevel(level); } diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 8047f23..f646173 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java rename to app/src/main/java/com/wownero/wownerujo/GenerateFragment.java index eea3c99..ec8535c 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/GenerateFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.app.AlertDialog; import android.content.Context; @@ -40,13 +40,13 @@ import android.widget.Switch; import android.widget.TextView; import android.text.TextUtils; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.FingerprintHelper; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.KeyStoreHelper; -import com.m2049r.xmrwallet.util.RestoreHeight; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.FingerprintHelper; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.KeyStoreHelper; +import com.wownero.wownerujo.util.RestoreHeight; +import com.wownero.wownerujo.widget.Toolbar; import com.nulabinc.zxcvbn.Strength; import com.nulabinc.zxcvbn.Zxcvbn; diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/wownero/wownerujo/GenerateReviewFragment.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java rename to app/src/main/java/com/wownero/wownerujo/GenerateReviewFragment.java index 6f44246..5e9ad33 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/GenerateReviewFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.app.AlertDialog; import android.content.Context; @@ -43,14 +43,14 @@ import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.FingerprintHelper; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.KeyStoreHelper; -import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.FingerprintHelper; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.KeyStoreHelper; +import com.wownero.wownerujo.util.MoneroThreadPoolExecutor; +import com.wownero.wownerujo.widget.Toolbar; import java.io.File; diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/wownero/wownerujo/LoginActivity.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java rename to app/src/main/java/com/wownero/wownerujo/LoginActivity.java index eeeb18e..1740ed7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/wownero/wownerujo/LoginActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.app.Activity; import android.app.AlertDialog; @@ -41,19 +41,19 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.data.WalletNode; -import com.m2049r.xmrwallet.dialog.AboutFragment; -import com.m2049r.xmrwallet.dialog.CreditsFragment; -import com.m2049r.xmrwallet.dialog.HelpFragment; -import com.m2049r.xmrwallet.dialog.PrivacyFragment; -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.service.WalletService; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.KeyStoreHelper; -import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.data.WalletNode; +import com.wownero.wownerujo.dialog.AboutFragment; +import com.wownero.wownerujo.dialog.CreditsFragment; +import com.wownero.wownerujo.dialog.HelpFragment; +import com.wownero.wownerujo.dialog.PrivacyFragment; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.service.WalletService; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.KeyStoreHelper; +import com.wownero.wownerujo.util.MoneroThreadPoolExecutor; +import com.wownero.wownerujo.widget.Toolbar; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java b/app/src/main/java/com/wownero/wownerujo/LoginFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java rename to app/src/main/java/com/wownero/wownerujo/LoginFragment.java index 5fab97a..f5102ed 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/LoginFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.content.Context; import android.content.SharedPreferences; @@ -43,15 +43,15 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.layout.WalletInfoAdapter; -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.KeyStoreHelper; -import com.m2049r.xmrwallet.util.NodeList; -import com.m2049r.xmrwallet.util.Notice; -import com.m2049r.xmrwallet.widget.DropDownEditText; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.layout.WalletInfoAdapter; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.KeyStoreHelper; +import com.wownero.wownerujo.util.NodeList; +import com.wownero.wownerujo.util.Notice; +import com.wownero.wownerujo.widget.DropDownEditText; +import com.wownero.wownerujo.widget.Toolbar; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/m2049r/xmrwallet/OnBackPressedListener.java b/app/src/main/java/com/wownero/wownerujo/OnBackPressedListener.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/OnBackPressedListener.java rename to app/src/main/java/com/wownero/wownerujo/OnBackPressedListener.java index eb09125..e6e43de 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/OnBackPressedListener.java +++ b/app/src/main/java/com/wownero/wownerujo/OnBackPressedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; public interface OnBackPressedListener { boolean onBackPressed(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java rename to app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java index 3e92f63..5bae32d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/ReceiveFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.content.Context; import android.graphics.Bitmap; @@ -46,13 +46,13 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor; -import com.m2049r.xmrwallet.widget.ExchangeView; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.MoneroThreadPoolExecutor; +import com.wownero.wownerujo.widget.ExchangeView; +import com.wownero.wownerujo.widget.Toolbar; import java.util.HashMap; import java.util.Map; @@ -454,7 +454,7 @@ public class ReceiveFragment extends Fragment { Bitmap logoBitmap = Bitmap.createBitmap(qrWidth, qrHeight, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(logoBitmap); canvas.drawBitmap(qrBitmap, 0, 0, null); - canvas.save(Canvas.ALL_SAVE_FLAG); + canvas.save(); // figure out how to scale the logo float scaleSize = 1.0f; while ((logoWidth / scaleSize) > (qrWidth / 5) || (logoHeight / scaleSize) > (qrHeight / 5)) { @@ -471,7 +471,7 @@ public class ReceiveFragment extends Fragment { private Bitmap getMoneroLogo() { if (logo == null) { - logo = Helper.getBitmap(getContext(), R.drawable.ic_monero_logo_b); + logo = Helper.getBitmap(getContext(), R.drawable.ic_wownero_logo_b); } return logo; } diff --git a/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java b/app/src/main/java/com/wownero/wownerujo/ScannerFragment.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java rename to app/src/main/java/com/wownero/wownerujo/ScannerFragment.java index 31de64e..0d66543 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/ScannerFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java b/app/src/main/java/com/wownero/wownerujo/SecureActivity.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java rename to app/src/main/java/com/wownero/wownerujo/SecureActivity.java index ee74998..20b106e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java +++ b/app/src/main/java/com/wownero/wownerujo/SecureActivity.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.util.Helper; import java.io.File; diff --git a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java b/app/src/main/java/com/wownero/wownerujo/TxFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/TxFragment.java rename to app/src/main/java/com/wownero/wownerujo/TxFragment.java index ea86aa5..8a9d99a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/TxFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.content.Context; import android.content.Intent; @@ -32,12 +32,12 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.model.TransactionInfo; -import com.m2049r.xmrwallet.model.Transfer; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.model.TransactionInfo; +import com.wownero.wownerujo.model.Transfer; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.UserNotes; +import com.wownero.wownerujo.widget.Toolbar; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/wownero/wownerujo/WalletActivity.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java rename to app/src/main/java/com/wownero/wownerujo/WalletActivity.java index 52de0c9..1059204 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/wownero/wownerujo/WalletActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.app.AlertDialog; import android.content.ComponentName; @@ -45,20 +45,20 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.dialog.CreditsFragment; -import com.m2049r.xmrwallet.dialog.HelpFragment; -import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment; -import com.m2049r.xmrwallet.fragment.send.SendFragment; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.model.TransactionInfo; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.service.WalletService; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.dialog.CreditsFragment; +import com.wownero.wownerujo.dialog.HelpFragment; +import com.wownero.wownerujo.fragment.send.SendAddressWizardFragment; +import com.wownero.wownerujo.fragment.send.SendFragment; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.model.TransactionInfo; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.service.WalletService; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.UserNotes; +import com.wownero.wownerujo.widget.Toolbar; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/wownero/wownerujo/WalletFragment.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java rename to app/src/main/java/com/wownero/wownerujo/WalletFragment.java index 16c9767..c2a94d3 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/WalletFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.content.Context; import android.os.Bundle; @@ -37,14 +37,14 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.TextView; -import com.m2049r.xmrwallet.layout.TransactionInfoAdapter; -import com.m2049r.xmrwallet.model.TransactionInfo; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.layout.TransactionInfoAdapter; +import com.wownero.wownerujo.model.TransactionInfo; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.service.exchange.api.ExchangeApi; +import com.wownero.wownerujo.service.exchange.api.ExchangeCallback; +import com.wownero.wownerujo.service.exchange.api.ExchangeRate; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.widget.Toolbar; import java.text.NumberFormat; import java.util.List; @@ -102,6 +102,7 @@ public class WalletFragment extends Fragment ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance); currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item); sCurrency.setAdapter(currencyAdapter); + sCurrency.setEnabled(false); bSend = (Button) view.findViewById(R.id.bSend); bReceive = (Button) view.findViewById(R.id.bReceive); @@ -339,7 +340,7 @@ public class WalletFragment extends Fragment refreshBalance(); double amountXmr = Double.parseDouble(Helper.getDisplayAmount(balance - unlockedBalance)); // assume this cannot fail! String unconfirmed = Helper.getFormattedAmount(amountXmr, true); - tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed)); + tvUnconfirmedAmount.setText(getResources().getString(R.string.wow_unconfirmed_amount, unconfirmed)); String sync = ""; if (!activityCallback.hasBoundService()) throw new IllegalStateException("WalletService not bound."); diff --git a/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java b/app/src/main/java/com/wownero/wownerujo/XmrWalletApplication.java similarity index 92% rename from app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java rename to app/src/main/java/com/wownero/wownerujo/XmrWalletApplication.java index f6fecc5..a55bd7f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java +++ b/app/src/main/java/com/wownero/wownerujo/XmrWalletApplication.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet; +package com.wownero.wownerujo; import android.app.Application; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.util.Helper; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java b/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java rename to app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java index 1471c89..83a8379 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java +++ b/app/src/main/java/com/wownero/wownerujo/data/BarcodeData.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.data; +package com.wownero.wownerujo.data; import android.net.Uri; -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.BitcoinAddressValidator; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.BitcoinAddressValidator; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/PendingTx.java b/app/src/main/java/com/wownero/wownerujo/data/PendingTx.java similarity index 93% rename from app/src/main/java/com/m2049r/xmrwallet/data/PendingTx.java rename to app/src/main/java/com/wownero/wownerujo/data/PendingTx.java index 7f99ad9..90007cc 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/PendingTx.java +++ b/app/src/main/java/com/wownero/wownerujo/data/PendingTx.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.data; +package com.wownero.wownerujo.data; -import com.m2049r.xmrwallet.model.PendingTransaction; +import com.wownero.wownerujo.model.PendingTransaction; public class PendingTx { final public PendingTransaction.Status status; diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java b/app/src/main/java/com/wownero/wownerujo/data/TxData.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/data/TxData.java rename to app/src/main/java/com/wownero/wownerujo/data/TxData.java index 55505da..6a67df2 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java +++ b/app/src/main/java/com/wownero/wownerujo/data/TxData.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.data; +package com.wownero.wownerujo.data; import android.os.Parcel; import android.os.Parcelable; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.util.UserNotes; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.util.UserNotes; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/TxDataBtc.java b/app/src/main/java/com/wownero/wownerujo/data/TxDataBtc.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/data/TxDataBtc.java rename to app/src/main/java/com/wownero/wownerujo/data/TxDataBtc.java index 6b61e10..b1ee458 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/TxDataBtc.java +++ b/app/src/main/java/com/wownero/wownerujo/data/TxDataBtc.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.data; +package com.wownero.wownerujo.data; import android.os.Parcel; -import com.m2049r.xmrwallet.model.PendingTransaction; +import com.wownero.wownerujo.model.PendingTransaction; public class TxDataBtc extends TxData { diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/WalletNode.java b/app/src/main/java/com/wownero/wownerujo/data/WalletNode.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/data/WalletNode.java rename to app/src/main/java/com/wownero/wownerujo/data/WalletNode.java index 5702815..952aa4e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/WalletNode.java +++ b/app/src/main/java/com/wownero/wownerujo/data/WalletNode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.data; +package com.wownero.wownerujo.data; -import com.m2049r.xmrwallet.model.NetworkType; +import com.wownero.wownerujo.model.NetworkType; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java b/app/src/main/java/com/wownero/wownerujo/dialog/AboutFragment.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java rename to app/src/main/java/com/wownero/wownerujo/dialog/AboutFragment.java index fb48cec..f664eda 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/dialog/AboutFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.dialog; +package com.wownero.wownerujo.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -29,8 +29,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.m2049r.xmrwallet.BuildConfig; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.BuildConfig; +import com.wownero.wownerujo.R; public class AboutFragment extends DialogFragment { static final String TAG = "AboutFragment"; diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/CreditsFragment.java b/app/src/main/java/com/wownero/wownerujo/dialog/CreditsFragment.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/dialog/CreditsFragment.java rename to app/src/main/java/com/wownero/wownerujo/dialog/CreditsFragment.java index 89b443b..e5f0fdd 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/CreditsFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/dialog/CreditsFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.dialog; +package com.wownero.wownerujo.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -29,7 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; public class CreditsFragment extends DialogFragment { static final String TAG = "DonationFragment"; diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/HelpFragment.java b/app/src/main/java/com/wownero/wownerujo/dialog/HelpFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/dialog/HelpFragment.java rename to app/src/main/java/com/wownero/wownerujo/dialog/HelpFragment.java index da4333d..8aa474b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/HelpFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/dialog/HelpFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.dialog; +package com.wownero.wownerujo.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -29,7 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; public class HelpFragment extends DialogFragment { static final String TAG = "HelpFragment"; diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/PrivacyFragment.java b/app/src/main/java/com/wownero/wownerujo/dialog/PrivacyFragment.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/dialog/PrivacyFragment.java rename to app/src/main/java/com/wownero/wownerujo/dialog/PrivacyFragment.java index 24fafbf..3f26dd5 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/PrivacyFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/dialog/PrivacyFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.dialog; +package com.wownero.wownerujo.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -29,7 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; public class PrivacyFragment extends DialogFragment { static final String TAG = "PrivacyFragment"; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendAddressWizardFragment.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendAddressWizardFragment.java index e1db43b..c58f01c 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendAddressWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.content.Context; import android.os.Bundle; @@ -33,14 +33,14 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.data.TxDataBtc; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.BitcoinAddressValidator; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.data.TxDataBtc; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.BitcoinAddressValidator; +import com.wownero.wownerujo.util.Helper; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendAmountWizardFragment.java similarity index 92% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendAmountWizardFragment.java index 8b90393..e6556a7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendAmountWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.os.Bundle; import android.view.LayoutInflater; @@ -25,13 +25,13 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.widget.ExchangeTextView; -import com.m2049r.xmrwallet.widget.NumberPadView; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.widget.ExchangeTextView; +import com.wownero.wownerujo.widget.NumberPadView; import timber.log.Timber; @@ -148,7 +148,7 @@ public class SendAmountWizardFragment extends SendWizardFragment { Timber.d("onResumeFragment()"); Helper.hideKeyboard(getActivity()); final long funds = getTotalFunds(); - maxFunds = 1.0 * funds / 1000000000000L; + maxFunds = 10.0 * funds / 1000000000000L; tvFunds.setText(getString(R.string.send_available, Wallet.getDisplayAmount(funds))); // getAmount is null if exchange is in progress diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcAmountWizardFragment.java similarity index 92% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcAmountWizardFragment.java index bee7808..1ada5f4 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcAmountWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.os.Bundle; import android.text.Html; @@ -25,21 +25,21 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.data.TxDataBtc; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.OkHttpClientSingleton; -import com.m2049r.xmrwallet.widget.ExchangeBtcTextView; -import com.m2049r.xmrwallet.widget.NumberPadView; -import com.m2049r.xmrwallet.widget.SendProgressView; -import com.m2049r.xmrwallet.xmrto.XmrToError; -import com.m2049r.xmrwallet.xmrto.XmrToException; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderParameters; -import com.m2049r.xmrwallet.xmrto.api.XmrToApi; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.network.XmrToApiImpl; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.data.TxDataBtc; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.OkHttpClientSingleton; +import com.wownero.wownerujo.widget.ExchangeBtcTextView; +import com.wownero.wownerujo.widget.NumberPadView; +import com.wownero.wownerujo.widget.SendProgressView; +import com.wownero.wownerujo.xmrto.XmrToError; +import com.wownero.wownerujo.xmrto.XmrToException; +import com.wownero.wownerujo.xmrto.api.QueryOrderParameters; +import com.wownero.wownerujo.xmrto.api.XmrToApi; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.network.XmrToApiImpl; import java.text.NumberFormat; import java.util.Locale; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcConfirmWizardFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcConfirmWizardFragment.java index 9288870..60b59d1 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcConfirmWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.app.Activity; import android.content.DialogInterface; @@ -32,21 +32,21 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.data.TxDataBtc; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.OkHttpClientSingleton; -import com.m2049r.xmrwallet.widget.SendProgressView; -import com.m2049r.xmrwallet.xmrto.XmrToError; -import com.m2049r.xmrwallet.xmrto.XmrToException; -import com.m2049r.xmrwallet.xmrto.api.CreateOrder; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus; -import com.m2049r.xmrwallet.xmrto.api.XmrToApi; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.network.XmrToApiImpl; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.data.TxDataBtc; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.OkHttpClientSingleton; +import com.wownero.wownerujo.widget.SendProgressView; +import com.wownero.wownerujo.xmrto.XmrToError; +import com.wownero.wownerujo.xmrto.XmrToException; +import com.wownero.wownerujo.xmrto.api.CreateOrder; +import com.wownero.wownerujo.xmrto.api.QueryOrderStatus; +import com.wownero.wownerujo.xmrto.api.XmrToApi; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.network.XmrToApiImpl; import java.text.NumberFormat; import java.util.Locale; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcSuccessWizardFragment.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcSuccessWizardFragment.java index ca56e2a..ff2b5eb 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendBtcSuccessWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.os.Bundle; import android.view.LayoutInflater; @@ -26,16 +26,16 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.PendingTx; -import com.m2049r.xmrwallet.data.TxDataBtc; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.OkHttpClientSingleton; -import com.m2049r.xmrwallet.xmrto.XmrToException; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus; -import com.m2049r.xmrwallet.xmrto.api.XmrToApi; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.network.XmrToApiImpl; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.PendingTx; +import com.wownero.wownerujo.data.TxDataBtc; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.OkHttpClientSingleton; +import com.wownero.wownerujo.xmrto.XmrToException; +import com.wownero.wownerujo.xmrto.api.QueryOrderStatus; +import com.wownero.wownerujo.xmrto.api.XmrToApi; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.network.XmrToApiImpl; import java.text.NumberFormat; import java.util.Locale; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirm.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirm.java similarity index 88% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirm.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirm.java index 965ca4c..eb98101 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirm.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirm.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; -import com.m2049r.xmrwallet.model.PendingTransaction; +import com.wownero.wownerujo.model.PendingTransaction; interface SendConfirm { void sendFailed(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirmWizardFragment.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirmWizardFragment.java index fe8395f..3fcd17b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendConfirmWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.app.Activity; import android.content.DialogInterface; @@ -31,12 +31,12 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.UserNotes; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendFragment.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendFragment.java index 05dcdc8..748aa70 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.content.Context; import android.content.SharedPreferences; @@ -36,21 +36,21 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; -import com.m2049r.xmrwallet.OnBackPressedListener; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.BarcodeData; -import com.m2049r.xmrwallet.data.PendingTx; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.data.TxDataBtc; -import com.m2049r.xmrwallet.dialog.HelpFragment; -import com.m2049r.xmrwallet.layout.SpendViewPager; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.NodeList; -import com.m2049r.xmrwallet.util.Notice; -import com.m2049r.xmrwallet.util.UserNotes; -import com.m2049r.xmrwallet.widget.DotBar; -import com.m2049r.xmrwallet.widget.Toolbar; +import com.wownero.wownerujo.OnBackPressedListener; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.BarcodeData; +import com.wownero.wownerujo.data.PendingTx; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.data.TxDataBtc; +import com.wownero.wownerujo.dialog.HelpFragment; +import com.wownero.wownerujo.layout.SpendViewPager; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.NodeList; +import com.wownero.wownerujo.util.Notice; +import com.wownero.wownerujo.util.UserNotes; +import com.wownero.wownerujo.widget.DotBar; +import com.wownero.wownerujo.widget.Toolbar; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendSettingsWizardFragment.java similarity index 93% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendSettingsWizardFragment.java index 9e58775..0805612 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendSettingsWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.os.Bundle; import android.text.InputType; @@ -27,11 +27,11 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.UserNotes; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendSuccessWizardFragment.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendSuccessWizardFragment.java index 2d2588a..b14ca7f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendSuccessWizardFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.os.Bundle; import android.view.LayoutInflater; @@ -24,10 +24,10 @@ import android.widget.ImageButton; import android.widget.TextView; import android.widget.Toast; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.PendingTx; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.data.PendingTx; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.util.Helper; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendWizardFragment.java b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendWizardFragment.java similarity index 90% rename from app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendWizardFragment.java rename to app/src/main/java/com/wownero/wownerujo/fragment/send/SendWizardFragment.java index 0ef911d..d30184d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendWizardFragment.java +++ b/app/src/main/java/com/wownero/wownerujo/fragment/send/SendWizardFragment.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.fragment.send; +package com.wownero.wownerujo.fragment.send; import android.support.v4.app.Fragment; -import com.m2049r.xmrwallet.layout.SpendViewPager; +import com.wownero.wownerujo.layout.SpendViewPager; abstract public class SendWizardFragment extends Fragment implements SpendViewPager.OnValidateFieldsListener { diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java b/app/src/main/java/com/wownero/wownerujo/layout/SpendViewPager.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java rename to app/src/main/java/com/wownero/wownerujo/layout/SpendViewPager.java index 1ddde3e..20297a9 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java +++ b/app/src/main/java/com/wownero/wownerujo/layout/SpendViewPager.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.layout; +package com.wownero.wownerujo.layout; import android.content.Context; import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; -import com.m2049r.xmrwallet.fragment.send.SendFragment; +import com.wownero.wownerujo.fragment.send.SendFragment; public class SpendViewPager extends ViewPager { diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java b/app/src/main/java/com/wownero/wownerujo/layout/TransactionInfoAdapter.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java rename to app/src/main/java/com/wownero/wownerujo/layout/TransactionInfoAdapter.java index 0fa4109..0a3e28b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java +++ b/app/src/main/java/com/wownero/wownerujo/layout/TransactionInfoAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.layout; +package com.wownero.wownerujo.layout; import android.content.Context; import android.support.v4.content.ContextCompat; @@ -25,10 +25,10 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.model.TransactionInfo; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.model.TransactionInfo; +import com.wownero.wownerujo.util.Helper; +import com.wownero.wownerujo.util.UserNotes; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java b/app/src/main/java/com/wownero/wownerujo/layout/WalletInfoAdapter.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java rename to app/src/main/java/com/wownero/wownerujo/layout/WalletInfoAdapter.java index da9ed78..ca2e489 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java +++ b/app/src/main/java/com/wownero/wownerujo/layout/WalletInfoAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.layout; +package com.wownero.wownerujo.layout; import android.content.Context; import android.support.v7.widget.PopupMenu; @@ -26,8 +26,8 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.model.WalletManager; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.model.WalletManager; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/NetworkType.java b/app/src/main/java/com/wownero/wownerujo/model/NetworkType.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/model/NetworkType.java rename to app/src/main/java/com/wownero/wownerujo/model/NetworkType.java index ae1c84f..61786f0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/NetworkType.java +++ b/app/src/main/java/com/wownero/wownerujo/model/NetworkType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; public enum NetworkType { NetworkType_Mainnet(0), diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java b/app/src/main/java/com/wownero/wownerujo/model/PendingTransaction.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java rename to app/src/main/java/com/wownero/wownerujo/model/PendingTransaction.java index 6ad620a..8ef49e3 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java +++ b/app/src/main/java/com/wownero/wownerujo/model/PendingTransaction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; public class PendingTransaction { static { diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java b/app/src/main/java/com/wownero/wownerujo/model/TransactionHistory.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java rename to app/src/main/java/com/wownero/wownerujo/model/TransactionHistory.java index 3d91080..b6b893b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java +++ b/app/src/main/java/com/wownero/wownerujo/model/TransactionHistory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java b/app/src/main/java/com/wownero/wownerujo/model/TransactionInfo.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java rename to app/src/main/java/com/wownero/wownerujo/model/TransactionInfo.java index 74ada2c..902c927 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java +++ b/app/src/main/java/com/wownero/wownerujo/model/TransactionInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/Transfer.java b/app/src/main/java/com/wownero/wownerujo/model/Transfer.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/model/Transfer.java rename to app/src/main/java/com/wownero/wownerujo/model/Transfer.java index 27ce6a0..fbdea87 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/Transfer.java +++ b/app/src/main/java/com/wownero/wownerujo/model/Transfer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java b/app/src/main/java/com/wownero/wownerujo/model/Wallet.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java rename to app/src/main/java/com/wownero/wownerujo/model/Wallet.java index 50d313b..4e6e538 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java +++ b/app/src/main/java/com/wownero/wownerujo/model/Wallet.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; -import com.m2049r.xmrwallet.data.TxData; +import com.wownero.wownerujo.data.TxData; import java.io.File; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/WalletListener.java b/app/src/main/java/com/wownero/wownerujo/model/WalletListener.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/model/WalletListener.java rename to app/src/main/java/com/wownero/wownerujo/model/WalletListener.java index f7ee66f..c57d701 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletListener.java +++ b/app/src/main/java/com/wownero/wownerujo/model/WalletListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; public interface WalletListener { /** diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java b/app/src/main/java/com/wownero/wownerujo/model/WalletManager.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java rename to app/src/main/java/com/wownero/wownerujo/model/WalletManager.java index 2ee5a7f..ca831a4 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java +++ b/app/src/main/java/com/wownero/wownerujo/model/WalletManager.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.model; +package com.wownero.wownerujo.model; -import com.m2049r.xmrwallet.data.WalletNode; +import com.wownero.wownerujo.data.WalletNode; import java.io.BufferedReader; import java.io.File; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/MoneroHandlerThread.java b/app/src/main/java/com/wownero/wownerujo/service/MoneroHandlerThread.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/service/MoneroHandlerThread.java rename to app/src/main/java/com/wownero/wownerujo/service/MoneroHandlerThread.java index 79ac246..fb91865 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/MoneroHandlerThread.java +++ b/app/src/main/java/com/wownero/wownerujo/service/MoneroHandlerThread.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service; +package com.wownero.wownerujo.service; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java b/app/src/main/java/com/wownero/wownerujo/service/WalletService.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java rename to app/src/main/java/com/wownero/wownerujo/service/WalletService.java index 677fc5c..513793d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java +++ b/app/src/main/java/com/wownero/wownerujo/service/WalletService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service; +package com.wownero.wownerujo.service; import android.app.Notification; import android.app.PendingIntent; @@ -28,14 +28,14 @@ import android.os.Looper; import android.os.Message; import android.os.Process; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.WalletActivity; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletListener; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.WalletActivity; +import com.wownero.wownerujo.data.TxData; +import com.wownero.wownerujo.model.PendingTransaction; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletListener; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.util.Helper; import timber.log.Timber; @@ -550,7 +550,7 @@ public class WalletService extends Service { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0); Notification notification = new Notification.Builder(this) .setContentTitle(getString(R.string.service_description)) - .setSmallIcon(R.drawable.ic_monerujo) + .setSmallIcon(R.drawable.ic_wownero_logo_transparent) .setContentIntent(pendingIntent) .build(); startForeground(NOTIFICATION_ID, notification); diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeApi.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeApi.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeApi.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeApi.java index 9601ba6..70c3ab8 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeApi.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeApi.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.api; +package com.wownero.wownerujo.service.exchange.api; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeCallback.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeCallback.java similarity index 93% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeCallback.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeCallback.java index c5b939c..390fe24 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeCallback.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeCallback.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.api; +package com.wownero.wownerujo.service.exchange.api; public interface ExchangeCallback { diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeException.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeException.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeException.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeException.java index 905819d..7fdb43f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeException.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.api; +package com.wownero.wownerujo.service.exchange.api; public class ExchangeException extends Exception { private final int code; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeRate.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeRate.java similarity index 93% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeRate.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeRate.java index 3c0fadf..f9ed27f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/api/ExchangeRate.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/api/ExchangeRate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.api; +package com.wownero.wownerujo.service.exchange.api; public interface ExchangeRate { diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeApiImpl.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeApiImpl.java similarity index 92% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeApiImpl.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeApiImpl.java index 5008715..80b2282 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeApiImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeApiImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.coinmarketcap; +package com.wownero.wownerujo.service.exchange.coinmarketcap; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeException; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.service.exchange.api.ExchangeApi; +import com.wownero.wownerujo.service.exchange.api.ExchangeCallback; +import com.wownero.wownerujo.service.exchange.api.ExchangeException; +import com.wownero.wownerujo.service.exchange.api.ExchangeRate; +import com.wownero.wownerujo.util.Helper; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeRateImpl.java b/app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeRateImpl.java similarity index 93% rename from app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeRateImpl.java rename to app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeRateImpl.java index 42a16d7..cae0bb2 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeRateImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/service/exchange/coinmarketcap/ExchangeRateImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.service.exchange.coinmarketcap; +package com.wownero.wownerujo.service.exchange.coinmarketcap; import android.support.annotation.NonNull; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeException; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; +import com.wownero.wownerujo.service.exchange.api.ExchangeException; +import com.wownero.wownerujo.service.exchange.api.ExchangeRate; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java b/app/src/main/java/com/wownero/wownerujo/util/BitcoinAddressValidator.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java rename to app/src/main/java/com/wownero/wownerujo/util/BitcoinAddressValidator.java index 5d1dda9..2cfc72b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java +++ b/app/src/main/java/com/wownero/wownerujo/util/BitcoinAddressValidator.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; // based on https://rosettacode.org/wiki/Bitcoin/address_validation#Java -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.WalletManager; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.WalletManager; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/CrazyPassEncoder.java b/app/src/main/java/com/wownero/wownerujo/util/CrazyPassEncoder.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/util/CrazyPassEncoder.java rename to app/src/main/java/com/wownero/wownerujo/util/CrazyPassEncoder.java index cd884d7..f7d2daf 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/CrazyPassEncoder.java +++ b/app/src/main/java/com/wownero/wownerujo/util/CrazyPassEncoder.java @@ -1,6 +1,6 @@ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; -import com.m2049r.xmrwallet.model.WalletManager; +import com.wownero.wownerujo.model.WalletManager; import java.math.BigInteger; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java b/app/src/main/java/com/wownero/wownerujo/util/FingerprintHelper.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java rename to app/src/main/java/com/wownero/wownerujo/util/FingerprintHelper.java index 960c484..a091fec 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java +++ b/app/src/main/java/com/wownero/wownerujo/util/FingerprintHelper.java @@ -1,4 +1,4 @@ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import android.app.KeyguardManager; import android.content.Context; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java b/app/src/main/java/com/wownero/wownerujo/util/Helper.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/util/Helper.java rename to app/src/main/java/com/wownero/wownerujo/util/Helper.java index f6b8ede..f38235e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java +++ b/app/src/main/java/com/wownero/wownerujo/util/Helper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import android.Manifest; import android.app.Activity; @@ -53,12 +53,12 @@ import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.TextView; -import com.m2049r.xmrwallet.BuildConfig; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.model.NetworkType; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; +import com.wownero.wownerujo.BuildConfig; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.model.NetworkType; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.model.WalletManager; +import com.wownero.wownerujo.service.exchange.api.ExchangeApi; import java.io.File; import java.io.IOException; @@ -78,8 +78,8 @@ import timber.log.Timber; public class Helper { static public final String CRYPTO = "WOW"; - static private final String WALLET_DIR = "monerujo" + (BuildConfig.DEBUG ? "-debug" : ""); - static private final String HOME_DIR = "monero" + (BuildConfig.DEBUG ? "-debug" : ""); + static private final String WALLET_DIR = "wownerujo" + (BuildConfig.DEBUG ? "-debug" : ""); + static private final String HOME_DIR = "wownero" + (BuildConfig.DEBUG ? "-debug" : ""); static public int DISPLAY_DIGITS_INFO = 5; @@ -209,7 +209,7 @@ public class Helper { if (isXmr) { // XMR long xmr = Wallet.getAmountFromDouble(amount); if ((xmr > 0) || (amount == 0)) { - displayB = String.format(Locale.US, "%,.5f", amount); + displayB = String.format(Locale.US, "%,.4f", amount); } else { displayB = null; } @@ -337,7 +337,7 @@ public class Helper { // TODO make the log levels refer to the WalletManagerFactory::LogLevel enum ? static public void initLogger(Context context, int level) { String home = getStorage(context, HOME_DIR).getAbsolutePath(); - WalletManager.initLogger(home + "/monerujo", "monerujo.log"); + WalletManager.initLogger(home + "/wownerujo", "wownerujo.log"); if (level >= WalletManager.LOGLEVEL_SILENT) WalletManager.setLogLevel(level); } @@ -575,7 +575,7 @@ public class Helper { } static public ExchangeApi getExchangeApi() { - return new com.m2049r.xmrwallet.service.exchange.coinmarketcap.ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient()); + return new com.wownero.wownerujo.service.exchange.coinmarketcap.ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient()); } } diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java b/app/src/main/java/com/wownero/wownerujo/util/KeyStoreHelper.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java rename to app/src/main/java/com/wownero/wownerujo/util/KeyStoreHelper.java index c49c750..1e355da 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java +++ b/app/src/main/java/com/wownero/wownerujo/util/KeyStoreHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/MoneroThreadPoolExecutor.java b/app/src/main/java/com/wownero/wownerujo/util/MoneroThreadPoolExecutor.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/util/MoneroThreadPoolExecutor.java rename to app/src/main/java/com/wownero/wownerujo/util/MoneroThreadPoolExecutor.java index 27bb64c..3f40960 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/MoneroThreadPoolExecutor.java +++ b/app/src/main/java/com/wownero/wownerujo/util/MoneroThreadPoolExecutor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; -import com.m2049r.xmrwallet.service.MoneroHandlerThread; +import com.wownero.wownerujo.service.MoneroHandlerThread; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executor; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/NodeList.java b/app/src/main/java/com/wownero/wownerujo/util/NodeList.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/util/NodeList.java rename to app/src/main/java/com/wownero/wownerujo/util/NodeList.java index c73643e..0ab186a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/NodeList.java +++ b/app/src/main/java/com/wownero/wownerujo/util/NodeList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java b/app/src/main/java/com/wownero/wownerujo/util/Notice.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/util/Notice.java rename to app/src/main/java/com/wownero/wownerujo/util/Notice.java index 6480efc..e3d3c88 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java +++ b/app/src/main/java/com/wownero/wownerujo/util/Notice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import android.content.Context; import android.content.SharedPreferences; @@ -27,8 +27,8 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.dialog.HelpFragment; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.dialog.HelpFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/OkHttpClientSingleton.java b/app/src/main/java/com/wownero/wownerujo/util/OkHttpClientSingleton.java similarity index 88% rename from app/src/main/java/com/m2049r/xmrwallet/util/OkHttpClientSingleton.java rename to app/src/main/java/com/wownero/wownerujo/util/OkHttpClientSingleton.java index f1dae5c..2d97140 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/OkHttpClientSingleton.java +++ b/app/src/main/java/com/wownero/wownerujo/util/OkHttpClientSingleton.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import okhttp3.OkHttpClient; @@ -23,7 +23,7 @@ public class OkHttpClientSingleton { static public final OkHttpClient getOkHttpClient() { if (Singleton == null) { - synchronized (com.m2049r.xmrwallet.util.OkHttpClientSingleton.class) { + synchronized (com.wownero.wownerujo.util.OkHttpClientSingleton.class) { if (Singleton == null) { Singleton = new OkHttpClient(); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java b/app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java rename to app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java index f535dda..f32102e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java +++ b/app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/UserNotes.java b/app/src/main/java/com/wownero/wownerujo/util/UserNotes.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/util/UserNotes.java rename to app/src/main/java/com/wownero/wownerujo/util/UserNotes.java index e6e463c..66b7c2f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/UserNotes.java +++ b/app/src/main/java/com/wownero/wownerujo/util/UserNotes.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.util; +package com.wownero.wownerujo.util; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus; +import com.wownero.wownerujo.xmrto.api.QueryOrderStatus; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java b/app/src/main/java/com/wownero/wownerujo/widget/CTextInputLayout.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java rename to app/src/main/java/com/wownero/wownerujo/widget/CTextInputLayout.java index 8933509..cc7b30a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/CTextInputLayout.java @@ -16,7 +16,7 @@ // based on from https://stackoverflow.com/a/45325876 (which did not work for me) -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.support.design.widget.TextInputLayout; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/DotBar.java b/app/src/main/java/com/wownero/wownerujo/widget/DotBar.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/widget/DotBar.java rename to app/src/main/java/com/wownero/wownerujo/widget/DotBar.java index 0baf2d3..1eaeabd 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/DotBar.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/DotBar.java @@ -16,7 +16,7 @@ // based on https://github.com/marcokstephen/StepProgressBar -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.content.res.TypedArray; @@ -25,7 +25,7 @@ import android.graphics.Paint; import android.util.AttributeSet; import android.view.View; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java b/app/src/main/java/com/wownero/wownerujo/widget/DropDownEditText.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java rename to app/src/main/java/com/wownero/wownerujo/widget/DropDownEditText.java index e6cd404..1c4f3d1 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/DropDownEditText.java @@ -16,7 +16,7 @@ // https://stackoverflow.com/questions/2126717/android-autocompletetextview-show-suggestions-when-no-text-entered -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.graphics.Rect; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeBtcTextView.java b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeBtcTextView.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeBtcTextView.java rename to app/src/main/java/com/wownero/wownerujo/widget/ExchangeBtcTextView.java index 5a86ed1..301e4d6 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeBtcTextView.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeBtcTextView.java @@ -16,7 +16,7 @@ // based on https://code.tutsplus.com/tutorials/creating-compound-views-on-android--cms-22889 -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.util.AttributeSet; @@ -26,8 +26,8 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.util.Helper; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeTextView.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java rename to app/src/main/java/com/wownero/wownerujo/widget/ExchangeTextView.java index 6043c0b..8778d33 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeTextView.java @@ -16,7 +16,7 @@ // based on https://code.tutsplus.com/tutorials/creating-compound-views-on-android--cms-22889 -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.os.Handler; @@ -32,12 +32,12 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.service.exchange.api.ExchangeApi; +import com.wownero.wownerujo.service.exchange.api.ExchangeCallback; +import com.wownero.wownerujo.service.exchange.api.ExchangeRate; +import com.wownero.wownerujo.util.Helper; import java.util.Locale; @@ -190,6 +190,7 @@ public class ExchangeTextView extends LinearLayout android.graphics.PorterDuff.Mode.MULTIPLY); + sCurrencyA.setEnabled(false); sCurrencyA.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parentView, View selectedItemView, int position, long id) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeView.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java rename to app/src/main/java/com/wownero/wownerujo/widget/ExchangeView.java index 203ed09..0fa8012 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/ExchangeView.java @@ -16,7 +16,7 @@ // based on https://code.tutsplus.com/tutorials/creating-compound-views-on-android--cms-22889 -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.os.Handler; @@ -37,12 +37,12 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.TextView; -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; -import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; -import com.m2049r.xmrwallet.util.Helper; +import com.wownero.wownerujo.R; +import com.wownero.wownerujo.model.Wallet; +import com.wownero.wownerujo.service.exchange.api.ExchangeApi; +import com.wownero.wownerujo.service.exchange.api.ExchangeCallback; +import com.wownero.wownerujo.service.exchange.api.ExchangeRate; +import com.wownero.wownerujo.util.Helper; import java.util.Locale; @@ -178,7 +178,7 @@ public class ExchangeView extends LinearLayout setColorFilter(getResources().getColor(R.color.trafficGray), android.graphics.PorterDuff.Mode.MULTIPLY); - + sCurrencyA.setEnabled(false); sCurrencyA.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parentView, View selectedItemView, int position, long id) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/NumberPadView.java b/app/src/main/java/com/wownero/wownerujo/widget/NumberPadView.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/NumberPadView.java rename to app/src/main/java/com/wownero/wownerujo/widget/NumberPadView.java index 6a16474..501752e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/NumberPadView.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/NumberPadView.java @@ -1,4 +1,4 @@ -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; @@ -7,7 +7,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; public class NumberPadView extends LinearLayout implements View.OnClickListener, View.OnLongClickListener { diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/SendProgressView.java b/app/src/main/java/com/wownero/wownerujo/widget/SendProgressView.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/widget/SendProgressView.java rename to app/src/main/java/com/wownero/wownerujo/widget/SendProgressView.java index 1ffcdab..edb98fb 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/SendProgressView.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/SendProgressView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.util.AttributeSet; @@ -23,7 +23,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; public class SendProgressView extends LinearLayout { diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java b/app/src/main/java/com/wownero/wownerujo/widget/Toolbar.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java rename to app/src/main/java/com/wownero/wownerujo/widget/Toolbar.java index 8f96d12..cf86154 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java +++ b/app/src/main/java/com/wownero/wownerujo/widget/Toolbar.java @@ -16,7 +16,7 @@ // based on https://code.tutsplus.com/tutorials/creating-compound-views-on-android--cms-22889 -package com.m2049r.xmrwallet.widget; +package com.wownero.wownerujo.widget; import android.content.Context; import android.os.Build; @@ -27,7 +27,7 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import com.m2049r.xmrwallet.R; +import com.wownero.wownerujo.R; import timber.log.Timber; @@ -82,7 +82,7 @@ public class Toolbar extends android.support.v7.widget.Toolbar { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { // the vector image does not work well for androis < Nougat toolbarImage.getLayoutParams().width = (int) getResources().getDimension(R.dimen.logo_width); - toolbarImage.setImageResource(R.drawable.logo_horizontol_xmrujo); + toolbarImage.setImageResource(R.drawable.logo_horizontol_wownerujo); } toolbarTitle = (TextView) findViewById(R.id.toolbarTitle); diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToError.java b/app/src/main/java/com/wownero/wownerujo/xmrto/XmrToError.java similarity index 99% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToError.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/XmrToError.java index 2ac5bc2..3722d84 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToError.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/XmrToError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto; +package com.wownero.wownerujo.xmrto; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToException.java b/app/src/main/java/com/wownero/wownerujo/xmrto/XmrToException.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToException.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/XmrToException.java index 05f810e..679b841 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/XmrToException.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/XmrToException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto; +package com.wownero.wownerujo.xmrto; public class XmrToException extends Exception { private int code; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/CreateOrder.java b/app/src/main/java/com/wownero/wownerujo/xmrto/api/CreateOrder.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/api/CreateOrder.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/api/CreateOrder.java index b03abe7..8100888 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/CreateOrder.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/api/CreateOrder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.api; +package com.wownero.wownerujo.xmrto.api; public interface CreateOrder { Double getBtcAmount(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderParameters.java b/app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderParameters.java similarity index 96% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderParameters.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderParameters.java index e27c458..1e71ec4 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderParameters.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderParameters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.api; +package com.wownero.wownerujo.xmrto.api; public interface QueryOrderParameters { diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderStatus.java b/app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderStatus.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderStatus.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderStatus.java index 21603a9..82d9c89 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/QueryOrderStatus.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/api/QueryOrderStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.api; +package com.wownero.wownerujo.xmrto.api; import java.util.Date; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToApi.java b/app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToApi.java similarity index 97% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToApi.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToApi.java index daaf071..d6832ed 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToApi.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.api; +package com.wownero.wownerujo.xmrto.api; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToCallback.java b/app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToCallback.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToCallback.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToCallback.java index 1758363..e0ddd0d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/api/XmrToCallback.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/api/XmrToCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.api; +package com.wownero.wownerujo.xmrto.api; public interface XmrToCallback { diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/CreateOrderImpl.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/CreateOrderImpl.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/CreateOrderImpl.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/CreateOrderImpl.java index f6faf98..f3e6745 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/CreateOrderImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/CreateOrderImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import android.support.annotation.NonNull; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.api.CreateOrder; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.api.CreateOrder; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/NetworkCallback.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/NetworkCallback.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/NetworkCallback.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/NetworkCallback.java index ba7caab..b7bcfb1 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/NetworkCallback.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/NetworkCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import org.json.JSONObject; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderParametersImpl.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderParametersImpl.java similarity index 94% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderParametersImpl.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderParametersImpl.java index dc413e5..e8169d7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderParametersImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderParametersImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import android.support.annotation.NonNull; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderParameters; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.api.QueryOrderParameters; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderStatusImpl.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderStatusImpl.java similarity index 98% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderStatusImpl.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderStatusImpl.java index 91b721d..b89bc52 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/QueryOrderStatusImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/QueryOrderStatusImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import android.support.annotation.NonNull; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.api.QueryOrderStatus; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiCall.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiCall.java similarity index 95% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiCall.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiCall.java index b4816a1..08415cd 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiCall.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiCall.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiImpl.java b/app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiImpl.java similarity index 91% rename from app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiImpl.java rename to app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiImpl.java index 8d8946b..a834161 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/XmrToApiImpl.java +++ b/app/src/main/java/com/wownero/wownerujo/xmrto/network/XmrToApiImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.m2049r.xmrwallet.xmrto.network; +package com.wownero.wownerujo.xmrto.network; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; -import com.m2049r.xmrwallet.xmrto.api.XmrToCallback; -import com.m2049r.xmrwallet.xmrto.XmrToError; -import com.m2049r.xmrwallet.xmrto.XmrToException; -import com.m2049r.xmrwallet.xmrto.api.CreateOrder; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderParameters; -import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus; -import com.m2049r.xmrwallet.xmrto.api.XmrToApi; +import com.wownero.wownerujo.xmrto.api.XmrToCallback; +import com.wownero.wownerujo.xmrto.XmrToError; +import com.wownero.wownerujo.xmrto.XmrToException; +import com.wownero.wownerujo.xmrto.api.CreateOrder; +import com.wownero.wownerujo.xmrto.api.QueryOrderParameters; +import com.wownero.wownerujo.xmrto.api.QueryOrderStatus; +import com.wownero.wownerujo.xmrto.api.XmrToApi; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/res/drawable/backgound_toolbar_mainnet.xml b/app/src/main/res/drawable/backgound_toolbar_mainnet.xml index 5d19b55..03760b4 100644 --- a/app/src/main/res/drawable/backgound_toolbar_mainnet.xml +++ b/app/src/main/res/drawable/backgound_toolbar_mainnet.xml @@ -1,7 +1,7 @@ - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_flip.xml b/app/src/main/res/drawable/background_flip.xml new file mode 100644 index 0000000..0e0262a --- /dev/null +++ b/app/src/main/res/drawable/background_flip.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..01f0af0 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_monerujo.xml b/app/src/main/res/drawable/ic_monerujo.xml index 024769e..ba1d8e1 100644 --- a/app/src/main/res/drawable/ic_monerujo.xml +++ b/app/src/main/res/drawable/ic_monerujo.xml @@ -15,20 +15,22 @@ L 1270,-73 Z" /--> + android:scaleY="1" + android:translateX="-103" + android:translateY="401"> + android:translateY="-350.4532"> + android:scaleX="-1" + android:translateX="160" + android:translateY="500"> diff --git a/app/src/main/res/drawable/ic_wownero_logo_b.png b/app/src/main/res/drawable/ic_wownero_logo_b.png new file mode 100644 index 0000000..079a4ec Binary files /dev/null and b/app/src/main/res/drawable/ic_wownero_logo_b.png differ diff --git a/app/src/main/res/drawable/ic_wownero_logo_transparent.png b/app/src/main/res/drawable/ic_wownero_logo_transparent.png new file mode 100644 index 0000000..a38afda Binary files /dev/null and b/app/src/main/res/drawable/ic_wownero_logo_transparent.png differ diff --git a/app/src/main/res/drawable/logo_horizontol_wownerujo.png b/app/src/main/res/drawable/logo_horizontol_wownerujo.png new file mode 100644 index 0000000..beaddcf Binary files /dev/null and b/app/src/main/res/drawable/logo_horizontol_wownerujo.png differ diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4df48d5..f135367 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -6,7 +6,7 @@ android:gravity="center_horizontal" android:orientation="vertical"> - -