diff --git a/.gitignore b/.gitignore index 1703c9a..f8b92c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .gradle build -local.properties diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index a8adc8d..d971b42 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -147,7 +147,7 @@ target_link_libraries( monerujo blockchain_db lmdb - easylogging + #easylogging # not for 0.10.3.1 unbound p2p diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp index 9f7dbae..edcb635 100644 --- a/app/src/main/cpp/monerujo.cpp +++ b/app/src/main/cpp/monerujo.cpp @@ -465,7 +465,7 @@ JNIEXPORT jboolean JNICALL Java_com_m2049r_xmrwallet_model_WalletManager_closeJ(JNIEnv *env, jobject instance, jobject walletInstance) { Bitmonero::Wallet *wallet = getHandle(env, walletInstance); - bool closeSuccess = Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(wallet, false); + bool closeSuccess = Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(wallet); if (closeSuccess) { MyWalletListener *walletListener = getHandle(env, walletInstance, "listenerHandle"); @@ -563,13 +563,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject JNIEXPORT jstring JNICALL Java_com_m2049r_xmrwallet_model_Wallet_getSecretViewKey(JNIEnv *env, jobject instance) { Bitmonero::Wallet *wallet = getHandle(env, instance); - return env->NewStringUTF(wallet->secretViewKey().c_str()); -} - -JNIEXPORT jstring JNICALL -Java_com_m2049r_xmrwallet_model_Wallet_getSecretSpendKey(JNIEnv *env, jobject instance) { - Bitmonero::Wallet *wallet = getHandle(env, instance); - return env->NewStringUTF(wallet->secretSpendKey().c_str()); + //return env->NewStringUTF(wallet->secretViewKey().c_str()); // changed in head + return env->NewStringUTF(wallet->privateViewKey().c_str()); } JNIEXPORT jboolean JNICALL diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java index d94d168..0bd24e2 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java @@ -100,7 +100,6 @@ public class GenerateReviewFragment extends Fragment { String address; String seed; String viewKey; - String spendKey; boolean isWatchOnly; @Override @@ -124,7 +123,6 @@ public class GenerateReviewFragment extends Fragment { address = wallet.getAddress(); seed = wallet.getSeed(); viewKey = wallet.getSecretViewKey(); - spendKey = isWatchOnly ? getActivity().getString(R.string.watchonly_label) : wallet.getSecretSpendKey(); isWatchOnly = wallet.isWatchOnly(); if (closeWallet) wallet.close(); return true; @@ -143,7 +141,12 @@ public class GenerateReviewFragment extends Fragment { tvWalletAddress.setText(address); tvWalletMnemonic.setText(seed); tvWalletViewKey.setText(viewKey); - tvWalletSpendKey.setText(spendKey); + String spend = isWatchOnly ? "" : "not available - use seed for recovery"; + if (spend.length() > 0) { //TODO should be == 64, but spendkey is not in the API yet + tvWalletSpendKey.setText(spend); + } else { + tvWalletSpendKey.setText(getString(R.string.generate_wallet_watchonly)); + } } hideProgress(); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index 976fe42..3e8519e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -511,6 +511,7 @@ public class LoginActivity extends AppCompatActivity } } + private class MyProgressDialog extends ProgressDialog { Activity activity; diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java index 61c48d4..d5617d7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java @@ -67,10 +67,9 @@ public class SendFragment extends Fragment { Button bReallySend; ProgressBar pbProgress; - final static int Mixins[] = {4, 7, 12, 25}; // must match the layout XML + final static int Mixins[] = {4, 6, 8, 10, 13}; // must match the layout XML final static PendingTransaction.Priority Priorities[] = - {PendingTransaction.Priority.Priority_Default, - PendingTransaction.Priority.Priority_Low, + {PendingTransaction.Priority.Priority_Low, PendingTransaction.Priority.Priority_Medium, PendingTransaction.Priority.Priority_High}; // must match the layout XML @@ -444,7 +443,6 @@ public class SendFragment extends Fragment { } }); builder.setMessage(errorText); - builder.setCancelable(false); builder.create().show(); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java b/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java index 6168d3f..0c3e1ea 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java +++ b/app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java @@ -34,7 +34,6 @@ public class PendingTransaction { } public enum Priority { - Priority_Default(0), Priority_Low(1), Priority_Medium(2), Priority_High(3), @@ -42,8 +41,6 @@ public class PendingTransaction { public static Priority fromInteger(int n) { switch (n) { - case 0: - return Priority_Default; case 1: return Priority_Low; case 2: diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java index 3ae2bf0..8496953 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java +++ b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java @@ -81,8 +81,6 @@ public class Wallet { public native String getSecretViewKey(); - public native String getSecretSpendKey(); - public boolean store() { return store(""); } diff --git a/app/src/main/res/values/attrs_my_view.xml b/app/src/main/res/values/attrs_my_view.xml new file mode 100644 index 0000000..38a8727 --- /dev/null +++ b/app/src/main/res/values/attrs_my_view.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 45b8577..64aafbf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -190,14 +190,14 @@ 999999.999999999999 - Ringsize 5 - Ringsize 8 - Ringsize 13 - Ringsize 26 + Mixin 4 + Mixin 6 + Mixin 8 + Mixin 10 + Mixin 13 - Default Priority Low Priority Medium Priority High Priority diff --git a/external-libs/monero/include/wallet2_api.h b/external-libs/monero/include/wallet2_api.h index 17def60..6a7419b 100644 --- a/external-libs/monero/include/wallet2_api.h +++ b/external-libs/monero/include/wallet2_api.h @@ -156,7 +156,6 @@ struct TransactionInfo virtual uint64_t fee() const = 0; virtual uint64_t blockHeight() const = 0; virtual uint64_t confirmations() const = 0; - virtual uint64_t unlockTime() const = 0; //! transaction_id virtual std::string hash() const = 0; virtual std::time_t timestamp() const = 0; @@ -313,28 +312,10 @@ struct Wallet virtual std::string integratedAddress(const std::string &payment_id) const = 0; /*! - * \brief secretViewKey - returns secret view key - * \return - secret view key + * \brief privateViewKey - returns private view key + * \return - private view key */ - virtual std::string secretViewKey() const = 0; - - /*! - * \brief publicViewKey - returns public view key - * \return - public view key - */ - virtual std::string publicViewKey() const = 0; - - /*! - * \brief secretSpendKey - returns secret spend key - * \return - secret spend key - */ - virtual std::string secretSpendKey() const = 0; - - /*! - * \brief publicSpendKey - returns public spend key - * \return - public spend key - */ - virtual std::string publicSpendKey() const = 0; + virtual std::string privateViewKey() const = 0; /*! * \brief store - stores wallet to file. @@ -380,12 +361,6 @@ struct Wallet */ virtual void setRefreshFromBlockHeight(uint64_t refresh_from_block_height) = 0; - /*! - * \brief getRestoreHeight - get wallet creation height - * - */ - virtual uint64_t getRefreshFromBlockHeight() const = 0; - /*! * \brief setRecoveringFromSeed - set state recover form seed * @@ -596,9 +571,6 @@ struct Wallet virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0; virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector &unknown_parameters, std::string &error) = 0; - - virtual std::string getDefaultDataDir() const = 0; - /* * \brief rescanSpent - Rescan spent outputs - Can only be used with trusted daemon * \return true on success @@ -663,7 +635,7 @@ struct WalletManager * \param wallet previously opened / created wallet instance * \return None */ - virtual bool closeWallet(Wallet *wallet, bool store = false) = 0; + virtual bool closeWallet(Wallet *wallet) = 0; /* * ! checks if wallet with the given name already exists @@ -672,7 +644,7 @@ struct WalletManager /*! * @brief TODO: delme walletExists - check if the given filename is the wallet * @param path - filename - * @return - true if wallet exists + * @return */ virtual bool walletExists(const std::string &path) = 0; @@ -681,9 +653,9 @@ struct WalletManager * @param keys_file_name - location of keys file * @param password - password to verify * @param watch_only - verify only view keys? - * @return - true if password is correct + * @return */ - virtual bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool watch_only) const = 0; + virtual bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, const bool watch_only) = 0; /*! * \brief findWallets - searches for the wallet files by given path name recursively diff --git a/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a b/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a index 4588d7d..a3c17e0 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a and b/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libblocks.a b/external-libs/monero/lib/armeabi-v7a/libblocks.a index d7c677e..4f2accf 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libblocks.a and b/external-libs/monero/lib/armeabi-v7a/libblocks.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcncrypto.a b/external-libs/monero/lib/armeabi-v7a/libcncrypto.a index 68cf62e..3b9769b 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcncrypto.a and b/external-libs/monero/lib/armeabi-v7a/libcncrypto.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcommon.a b/external-libs/monero/lib/armeabi-v7a/libcommon.a index 667e1a4..33720a0 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcommon.a and b/external-libs/monero/lib/armeabi-v7a/libcommon.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a index 099c84c..8d0e4fe 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a index 417bd6d..92208c7 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a index 84e00c8..5d31a89 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a b/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a index 2d74bf3..568d67b 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a and b/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libeasylogging.a b/external-libs/monero/lib/armeabi-v7a/libeasylogging.a deleted file mode 100644 index fdafdbd..0000000 Binary files a/external-libs/monero/lib/armeabi-v7a/libeasylogging.a and /dev/null differ diff --git a/external-libs/monero/lib/armeabi-v7a/libepee.a b/external-libs/monero/lib/armeabi-v7a/libepee.a index 17fc422..40dd849 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libepee.a and b/external-libs/monero/lib/armeabi-v7a/libepee.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/liblmdb.a b/external-libs/monero/lib/armeabi-v7a/liblmdb.a index f521a72..dd38c1e 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/liblmdb.a and b/external-libs/monero/lib/armeabi-v7a/liblmdb.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a b/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a index 1c2763b..dba8084 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a and b/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libmnemonics.a b/external-libs/monero/lib/armeabi-v7a/libmnemonics.a index 336ea41..6df688b 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libmnemonics.a and b/external-libs/monero/lib/armeabi-v7a/libmnemonics.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libp2p.a b/external-libs/monero/lib/armeabi-v7a/libp2p.a index 7352ca0..6076496 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libp2p.a and b/external-libs/monero/lib/armeabi-v7a/libp2p.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libringct.a b/external-libs/monero/lib/armeabi-v7a/libringct.a index 0fe7a8b..21d235b 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libringct.a and b/external-libs/monero/lib/armeabi-v7a/libringct.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/librpc.a b/external-libs/monero/lib/armeabi-v7a/librpc.a index 6af790f..8136509 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/librpc.a and b/external-libs/monero/lib/armeabi-v7a/librpc.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libunbound.a b/external-libs/monero/lib/armeabi-v7a/libunbound.a index 7f739ed..a2ff8df 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libunbound.a and b/external-libs/monero/lib/armeabi-v7a/libunbound.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libwallet.a b/external-libs/monero/lib/armeabi-v7a/libwallet.a index 056dabc..2959da8 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libwallet.a and b/external-libs/monero/lib/armeabi-v7a/libwallet.a differ diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..ee2784d --- /dev/null +++ b/local.properties @@ -0,0 +1,12 @@ +## This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sat May 13 17:52:51 CEST 2017 +ndk.dir=C\:\\Users\\Test\\AppData\\Local\\Android\\Sdk\\ndk-bundle +sdk.dir=C\:\\Users\\Test\\AppData\\Local\\Android\\Sdk