Browse Source

check if tab wallet on event

bwt
Craig Raw 5 years ago
parent
commit
6731823bef
  1. 2
      src/main/java/com/sparrowwallet/sparrow/transaction/TransactionController.java
  2. 12
      src/main/java/com/sparrowwallet/sparrow/wallet/NodeEntry.java
  3. 4
      src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
  4. 8
      src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java
  5. 12
      src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java

2
src/main/java/com/sparrowwallet/sparrow/transaction/TransactionController.java

@ -244,7 +244,7 @@ public class TransactionController implements Initializable {
@Subscribe
public void transactionChanged(TransactionChangedEvent event) {
if (event.getTransaction().equals(transaction)) {
if(event.getTransaction().equals(transaction)) {
refreshTxHex();
txtree.refresh();
}

12
src/main/java/com/sparrowwallet/sparrow/wallet/NodeEntry.java

@ -24,6 +24,14 @@ public class NodeEntry extends Entry {
});
}
public Wallet getWallet() {
return wallet;
}
public WalletNode getNode() {
return node;
}
public Address getAddress() {
return wallet.getAddress(node);
}
@ -42,8 +50,4 @@ public class NodeEntry extends Entry {
return null;
}
public WalletNode getNode() {
return node;
}
}

4
src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java

@ -110,6 +110,8 @@ public class ReceiveController extends WalletFormController implements Initializ
@Subscribe
public void receiveTo(ReceiveToEvent event) {
setNodeEntry(event.getReceiveEntry());
if(event.getReceiveEntry().getWallet().equals(getWalletForm().getWallet())) {
setNodeEntry(event.getReceiveEntry());
}
}
}

8
src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java

@ -96,11 +96,15 @@ public class WalletController extends WalletFormController implements Initializa
@Subscribe
public void walletSettingsChanged(WalletSettingsChangedEvent event) {
configure(walletForm.getWallet().isValid());
if(event.getWalletFile().equals(walletForm.getWalletFile())) {
configure(walletForm.getWallet().isValid());
}
}
@Subscribe
public void receiveAction(ReceiveActionEvent event) {
selectFunction(Function.RECEIVE);
if(event.getReceiveEntry().getWallet().equals(walletForm.getWallet())) {
selectFunction(Function.RECEIVE);
}
}
}

12
src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java

@ -110,11 +110,13 @@ public class WalletForm {
@Subscribe
public void walletChanged(WalletChangedEvent event) {
try {
save();
} catch (IOException e) {
//Background save failed
e.printStackTrace();
if(event.getWallet().equals(wallet)) {
try {
save();
} catch (IOException e) {
//Background save failed
e.printStackTrace();
}
}
}
}

Loading…
Cancel
Save