Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-30 23:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Don't invoke onCoinsSent for cases when the balance doesn't change, just onWalletChanged directly.

Browse Source 
Also implement equals/hashCodes for SaveRequest.
Resolves a couple of FindBugs warnings.
This commit is contained in:
Mike Hearn 2013-02-22 12:05:14 +01:00
parent 1a5f74a148
commit 3ae65f7a2f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -485,6 +485,20 @@ public class Wallet implements Serializable, BlockChainListener {
long delta = getDelay(TimeUnit.MILLISECONDS) - delayed.getDelay(TimeUnit.MILLISECONDS);
return (delta > 0 ? 1 : (delta < 0 ? -1 : 0));
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof WalletSaveRequest)) return false;
WalletSaveRequest w = (WalletSaveRequest) obj;
return w.startTimeMs == startTimeMs &&
w.requestedDelayMs == requestedDelayMs &&
w.wallet == wallet;
}
@Override
public int hashCode() {
return Objects.hash(wallet, startTimeMs, requestedDelayMs);
}
}
}
@ -1015,11 +1029,11 @@ public class Wallet implements Serializable, BlockChainListener {
// coins from the wallet.
if (diff > 0) {
invokeOnCoinsReceived(tx, prevBalance, newBalance);
} else if (diff == 0) {
// Hack. Invoke onCoinsSent in order to let the client save the wallet. This needs to go away.
} else if (diff < 0) {
invokeOnCoinsSent(tx, prevBalance, newBalance);
} else {
invokeOnCoinsSent(tx, prevBalance, newBalance);
// We have a transaction that didn't change our balance. Probably we sent coins between our own keys.
invokeOnWalletChanged();
}
}