removed debugging code + docs + some bugfixing

This commit is contained in:
m2049r 2017-08-20 17:04:57 +02:00
parent 4ad58684b4
commit 344eeb7a3b
6 changed files with 22 additions and 32 deletions

View File

@ -22,6 +22,7 @@ You may loose all your Moneroj if you use this App.
- Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/ - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
### TODO ### TODO
- Display outgoing pending transactions
- wallet backup functions - wallet backup functions
- adjust layout so we can use bigger font sizes (maybe show only 5 decimal places instead of 12 in main view) - adjust layout so we can use bigger font sizes (maybe show only 5 decimal places instead of 12 in main view)
- review visibility of methods/classes - review visibility of methods/classes

View File

@ -963,12 +963,6 @@ jobject cpp2java(JNIEnv *env, std::vector<Bitmonero::TransactionInfo *> vector)
jobject arrayList = env->NewObject(class_ArrayList, java_util_ArrayList_, vector.size()); jobject arrayList = env->NewObject(class_ArrayList, java_util_ArrayList_, vector.size());
for (Bitmonero::TransactionInfo *s: vector) { for (Bitmonero::TransactionInfo *s: vector) {
if (s->fee() > 1) {
LOGE("TX %s %"
PRIu64
" %"
PRIu64, s->hash().c_str(), s->fee(), s->amount());
}
jobject info = newTransactionInfo(env, s); jobject info = newTransactionInfo(env, s);
env->CallBooleanMethod(arrayList, java_util_ArrayList_add, info); env->CallBooleanMethod(arrayList, java_util_ArrayList_add, info);
env->DeleteLocalRef(info); env->DeleteLocalRef(info);
@ -1033,13 +1027,7 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getFee(JNIEnv *env, jobject i
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxId(JNIEnv *env, jobject instance) { Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxId(JNIEnv *env, jobject instance) {
Bitmonero::PendingTransaction *tx = getHandle<Bitmonero::PendingTransaction>(env, instance); Bitmonero::PendingTransaction *tx = getHandle<Bitmonero::PendingTransaction>(env, instance);
std::vector<std::string> txids = tx->txid(); std::vector<std::string> txids = tx->txid();
for (std::string &s: txids) {
LOGD("TX %s", s.c_str());
}
return env->NewStringUTF(txids.front().c_str()); return env->NewStringUTF(txids.front().c_str());
} }

View File

@ -104,9 +104,9 @@ public class GenerateReviewFragment extends Fragment {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
public void run() { public void run() {
show(wallet, password, type); show(wallet, password, type);
wallet.close();
} }
}); });
wallet.close();
} }
} }
, "DetailsReview", MoneroHandlerThread.THREAD_STACK_SIZE).start(); , "DetailsReview", MoneroHandlerThread.THREAD_STACK_SIZE).start();

View File

@ -100,7 +100,7 @@ public class SendFragment extends Fragment {
etPaymentId.setRawInputType(InputType.TYPE_CLASS_TEXT); etPaymentId.setRawInputType(InputType.TYPE_CLASS_TEXT);
etNotes.setRawInputType(InputType.TYPE_CLASS_TEXT); etNotes.setRawInputType(InputType.TYPE_CLASS_TEXT);
etAddress.setText("9tDC52GsMjTNt4dpnRCwAF7ekVBkbkgkXGaMKTcSTpBhGpqkPX56jCNRydLq9oGjbbAQBsZhLfgmTKsntmxRd3TaJFYM2f8"); // etAddress.setText("9tDC52GsMjTNt4dpnRCwAF7ekVBkbkgkXGaMKTcSTpBhGpqkPX56jCNRydLq9oGjbbAQBsZhLfgmTKsntmxRd3TaJFYM2f8");
boolean testnet = WalletManager.getInstance().isTestNet(); boolean testnet = WalletManager.getInstance().isTestNet();
if (!testnet) throw new IllegalStateException("Sending TX only on testnet. sorry."); if (!testnet) throw new IllegalStateException("Sending TX only on testnet. sorry.");

View File

@ -145,7 +145,6 @@ public class TxFragment extends Fragment {
sb.append(getString(R.string.tx_transfers)).append(": "); sb.append(getString(R.string.tx_transfers)).append(": ");
if (info.transfers != null) { if (info.transfers != null) {
boolean comma = false; boolean comma = false;
for (int i = 0; i < 10; i++)
for (Transfer transfer : info.transfers) { for (Transfer transfer : info.transfers) {
if (comma) { if (comma) {
sb.append(","); sb.append(",");
@ -192,7 +191,6 @@ public class TxFragment extends Fragment {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if (info.transfers != null) { if (info.transfers != null) {
boolean newline = false; boolean newline = false;
for (int i = 0; i < 10; i++)
for (Transfer transfer : info.transfers) { for (Transfer transfer : info.transfers) {
if (newline) { if (newline) {
sb.append("\n"); sb.append("\n");

View File

@ -12,6 +12,9 @@
- Spend Moneroj (only on testnet - someone will loose money and want to blame me. No thanks!) - Spend Moneroj (only on testnet - someone will loose money and want to blame me. No thanks!)
- Manually import existing wallet (by copying them to the Monerujo folder) - Manually import existing wallet (by copying them to the Monerujo folder)
## I sent a transaction but it's not in my transactions list!
Pending transactions are not displayed. Wait for the block to be mined.
## Do you have any screenshots of what it looks like and how it works? ## Do you have any screenshots of what it looks like and how it works?
Here are some old screenshots Here are some old screenshots
#### [Select Wallet](images/A-wallet_selection.png) #### [Select Wallet](images/A-wallet_selection.png)