Mirrors
/
wowwallet
mirror of https://gitlab.com/monerujo-io/wowwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't do stuff if the wallet is already closed

This commit is contained in:
m2049r 2020-09-18 09:39:51 +02:00 committed by m2049r
parent d803a1e220
commit 454f3e412a
1 changed files with 101 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
View File

@ -281,7 +281,8 @@ public class WalletService extends Service {
case START_SERVICE: { case START_SERVICE: {
Bundle extras = msg.getData(); Bundle extras = msg.getData();
String cmd = extras.getString(REQUEST, null); String cmd = extras.getString(REQUEST, null);
if (cmd.equals(REQUEST_CMD_LOAD)) { switch (cmd) {
case REQUEST_CMD_LOAD:
String walletId = extras.getString(REQUEST_WALLET, null); String walletId = extras.getString(REQUEST_WALLET, null);
String walletPw = extras.getString(REQUEST_CMD_LOAD_PW, null); String walletPw = extras.getString(REQUEST_CMD_LOAD_PW, null);
Timber.d("LOAD wallet %s", walletId); Timber.d("LOAD wallet %s", walletId);
@ -295,8 +296,10 @@ public class WalletService extends Service {
stop(); stop();
} }
} }
} else if (cmd.equals(REQUEST_CMD_STORE)) { break;
case REQUEST_CMD_STORE: {
Wallet myWallet = getWallet(); Wallet myWallet = getWallet();
if (myWallet == null) break;
Timber.d("STORE wallet: %s", myWallet.getName()); Timber.d("STORE wallet: %s", myWallet.getName());
boolean rc = myWallet.store(); boolean rc = myWallet.store();
Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc); Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
@ -304,10 +307,14 @@ public class WalletService extends Service {
Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString()); Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
} }
if (observer != null) observer.onWalletStored(rc); if (observer != null) observer.onWalletStored(rc);
} else if (cmd.equals(REQUEST_CMD_TX)) { break;
}
case REQUEST_CMD_TX: {
Wallet myWallet = getWallet(); Wallet myWallet = getWallet();
if (myWallet == null) break;
Timber.d("CREATE TX for wallet: %s", myWallet.getName()); Timber.d("CREATE TX for wallet: %s", myWallet.getName());
myWallet.disposePendingTransaction(); // remove any old pending tx myWallet.disposePendingTransaction(); // remove any old pending tx
TxData txData = extras.getParcelable(REQUEST_CMD_TX_DATA); TxData txData = extras.getParcelable(REQUEST_CMD_TX_DATA);
String txTag = extras.getString(REQUEST_CMD_TX_TAG); String txTag = extras.getString(REQUEST_CMD_TX_TAG);
PendingTransaction pendingTransaction = myWallet.createTransaction(txData); PendingTransaction pendingTransaction = myWallet.createTransaction(txData);
@ -321,10 +328,14 @@ public class WalletService extends Service {
} else { } else {
myWallet.disposePendingTransaction(); myWallet.disposePendingTransaction();
} }
} else if (cmd.equals(REQUEST_CMD_SWEEP)) { break;
}
case REQUEST_CMD_SWEEP: {
Wallet myWallet = getWallet(); Wallet myWallet = getWallet();
if (myWallet == null) break;
Timber.d("SWEEP TX for wallet: %s", myWallet.getName()); Timber.d("SWEEP TX for wallet: %s", myWallet.getName());
myWallet.disposePendingTransaction(); // remove any old pending tx myWallet.disposePendingTransaction(); // remove any old pending tx
String txTag = extras.getString(REQUEST_CMD_TX_TAG); String txTag = extras.getString(REQUEST_CMD_TX_TAG);
PendingTransaction pendingTransaction = myWallet.createSweepUnmixableTransaction(); PendingTransaction pendingTransaction = myWallet.createSweepUnmixableTransaction();
PendingTransaction.Status status = pendingTransaction.getStatus(); PendingTransaction.Status status = pendingTransaction.getStatus();
@ -337,8 +348,11 @@ public class WalletService extends Service {
} else { } else {
myWallet.disposePendingTransaction(); myWallet.disposePendingTransaction();
} }
} else if (cmd.equals(REQUEST_CMD_SEND)) { break;
}
case REQUEST_CMD_SEND: {
Wallet myWallet = getWallet(); Wallet myWallet = getWallet();
if (myWallet == null) break;
Timber.d("SEND TX for wallet: %s", myWallet.getName()); Timber.d("SEND TX for wallet: %s", myWallet.getName());
PendingTransaction pendingTransaction = myWallet.getPendingTransaction(); PendingTransaction pendingTransaction = myWallet.getPendingTransaction();
if (pendingTransaction == null) { if (pendingTransaction == null) {
@ -352,6 +366,7 @@ public class WalletService extends Service {
return; return;
} }
final String txid = pendingTransaction.getFirstTxId(); // tx ids vanish after commit()! final String txid = pendingTransaction.getFirstTxId(); // tx ids vanish after commit()!
boolean success = pendingTransaction.commit("", true); boolean success = pendingTransaction.commit("", true);
if (success) { if (success) {
myWallet.disposePendingTransaction(); myWallet.disposePendingTransaction();
@ -373,6 +388,8 @@ public class WalletService extends Service {
if (observer != null) observer.onSendTransactionFailed(error); if (observer != null) observer.onSendTransactionFailed(error);
return; return;
} }
break;
}
} }
} }
break; break;