sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle label event and update entries

Browse source
This commit is contained in:
Craig Raw 2020-06-27 15:55:49 +02:00
parent 766afae9c1
commit 67d624f049
11 changed files with 114 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/control/AddressCell.java
View file

@ -61,7 +61,7 @@ public class AddressCell extends TreeTableCell<Entry, Entry> {
return utxoEntry.getNode().getDerivationPath() + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : "");
}
private static Glyph getDuplicateGlyph() {
public static Glyph getDuplicateGlyph() {
Glyph duplicateGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
duplicateGlyph.getStyleClass().add("duplicate-warning");
duplicateGlyph.setFontSize(12);

5
src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java
View file

@ -109,4 +109,9 @@ public class AddressTreeTable extends TreeTableView<Entry> {
sort();
}
public void updateLabel(Entry entry) {
Entry rootEntry = getRoot().getValue();
rootEntry.updateLabel(entry);
}
}

5
src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java
View file

@ -75,4 +75,9 @@ public class TransactionsTreeTable extends TreeTableView<Entry> {
rootEntry.updateTransactions();
sort();
}
public void updateLabel(Entry entry) {
Entry rootEntry = getRoot().getValue();
rootEntry.updateLabel(entry);
}
}

5
src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java
View file

@ -92,4 +92,9 @@ public class UtxosTreeTable extends TreeTableView<Entry> {
rootEntry.updateUtxos();
sort();
}
public void updateLabel(Entry entry) {
Entry rootEntry = getRoot().getValue();
rootEntry.updateLabel(entry);
}
}

9
src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java
View file

@ -5,6 +5,7 @@ import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.wallet.WalletNode;
import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.AddressTreeTable;
import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent;
import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
import javafx.fxml.FXML;
@ -54,4 +55,12 @@ public class AddressesController extends WalletFormController implements Initial
}
}
}
@Subscribe
public void walletEntryLabelChanged(WalletEntryLabelChangedEvent event) {
if(event.getWallet().equals(walletForm.getWallet())) {
receiveTable.updateLabel(event.getEntry());
changeTable.updateLabel(event.getEntry());
}
}
}

10
src/main/java/com/sparrowwallet/sparrow/wallet/Entry.java
View file

@ -33,4 +33,14 @@ public abstract class Entry {
}
public abstract Long getValue();
public void updateLabel(Entry entry) {
if(this.equals(entry)) {
labelProperty.set(entry.getLabel());
}
for(Entry child : getChildren()) {
child.updateLabel(entry);
}
}
}

2
src/main/java/com/sparrowwallet/sparrow/wallet/HashIndexEntry.java
View file

@ -74,7 +74,7 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!(o instanceof HashIndexEntry)) return false;
HashIndexEntry that = (HashIndexEntry) o;
return wallet.equals(that.wallet) &&
hashIndex.equals(that.hashIndex) &&

67
src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
View file

@ -7,13 +7,19 @@ import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
import com.sparrowwallet.sparrow.AppController;
import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.AddressCell;
import com.sparrowwallet.sparrow.control.CopyableLabel;
import com.sparrowwallet.sparrow.control.CopyableTextField;
import com.sparrowwallet.sparrow.event.ReceiveToEvent;
import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@ -22,9 +28,14 @@ import org.fxmisc.richtext.CodeArea;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ResourceBundle;
import java.util.Set;
public class ReceiveController extends WalletFormController implements Initializable {
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@FXML
private CopyableTextField address;
@ -35,7 +46,7 @@ public class ReceiveController extends WalletFormController implements Initializ
private CopyableLabel derivationPath;
@FXML
private CopyableLabel lastUsed;
private Label lastUsed;
@FXML
private ImageView qrCode;
@ -64,15 +75,11 @@ public class ReceiveController extends WalletFormController implements Initializ
}
this.currentEntry = nodeEntry;
address.setText(nodeEntry.getAddress().toString());
label.textProperty().bindBidirectional(nodeEntry.labelProperty());
derivationPath.setText(nodeEntry.getNode().getDerivationPath());
//TODO: Find last used block height if available (red flag?)
lastUsed.setText("Unknown");
updateLastUsed();
Image qrImage = getQrCode(nodeEntry.getAddress().toString());
if(qrImage != null) {
@ -86,6 +93,22 @@ public class ReceiveController extends WalletFormController implements Initializ
outputDescriptor.appendText(nodeEntry.getOutputDescriptor());
}
private void updateLastUsed() {
Set<BlockTransactionHashIndex> currentOutputs = currentEntry.getNode().getTransactionOutputs();
if(AppController.isOnline() && currentOutputs.isEmpty()) {
lastUsed.setText("Never");
lastUsed.setGraphic(null);
} else if(!currentOutputs.isEmpty()) {
long count = currentOutputs.size();
BlockTransactionHashIndex lastUsedReference = currentOutputs.stream().skip(count - 1).findFirst().get();
lastUsed.setText(DATE_FORMAT.format(lastUsedReference.getDate()));
lastUsed.setGraphic(AddressCell.getDuplicateGlyph());
} else {
lastUsed.setText("Unknown");
lastUsed.setGraphic(null);
}
}
private Image getQrCode(String address) {
try {
QRCodeWriter qrCodeWriter = new QRCodeWriter();
@ -108,10 +131,42 @@ public class ReceiveController extends WalletFormController implements Initializ
setNodeEntry(freshEntry);
}
public void clear() {
if(currentEntry != null) {
label.textProperty().unbindBidirectional(currentEntry.labelProperty());
}
address.setText("");
label.setText("");
derivationPath.setText("");
lastUsed.setText("");
lastUsed.setGraphic(null);
qrCode.setImage(null);
scriptPubKeyArea.clear();
outputDescriptor.clear();
this.currentEntry = null;
}
@Subscribe
public void receiveTo(ReceiveToEvent event) {
if(event.getReceiveEntry().getWallet().equals(getWalletForm().getWallet())) {
setNodeEntry(event.getReceiveEntry());
}
}
@Subscribe
public void walletNodesChanged(WalletNodesChangedEvent event) {
if(event.getWallet().equals(walletForm.getWallet())) {
clear();
}
}
@Subscribe
public void walletHistoryChanged(WalletHistoryChangedEvent event) {
if(event.getWallet().equals(walletForm.getWallet())) {
if(event.getHistoryChangedNodes().contains(currentEntry.getNode())) {
updateLastUsed();
}
}
}
}

8
src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java
View file

@ -4,6 +4,7 @@ import com.google.common.eventbus.Subscribe;
import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.TransactionsTreeTable;
import com.sparrowwallet.sparrow.event.WalletBlockHeightChangedEvent;
import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent;
import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
import javafx.fxml.FXML;
@ -42,6 +43,13 @@ public class TransactionsController extends WalletFormController implements Init
}
}
@Subscribe
public void walletEntryLabelChanged(WalletEntryLabelChangedEvent event) {
if(event.getWallet().equals(walletForm.getWallet())) {
transactionsTable.updateLabel(event.getEntry());
}
}
//TODO: Remove
public void advanceBlock(MouseEvent event) {
Integer currentBlock = getWalletForm().getWallet().getStoredBlockHeight();

8
src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java
View file

@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.wallet;
import com.google.common.eventbus.Subscribe;
import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.UtxosTreeTable;
import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent;
import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
import javafx.collections.ListChangeListener;
@ -97,6 +98,13 @@ public class UtxosController extends WalletFormController implements Initializab
}
}
@Subscribe
public void walletEntryLabelChanged(WalletEntryLabelChangedEvent event) {
if(event.getWallet().equals(walletForm.getWallet())) {
utxosTable.updateLabel(event.getEntry());
}
}
private static class UtxoData {
public final Entry entry;
public final String name;

2
src/main/resources/com/sparrowwallet/sparrow/wallet/receive.fxml
View file

@ -43,7 +43,7 @@
<CopyableLabel fx:id="derivationPath" />
</Field>
<Field text="Last Used:">
<CopyableLabel fx:id="lastUsed" />
<Label fx:id="lastUsed" />
</Field>
</Fieldset>
</Form>