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

upgrade controlsfx, fix notifications bug

Browse source
This commit is contained in:
Craig Raw 2020-08-17 16:48:31 +02:00
parent fa7d09c5a6
commit e1934c99bc
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -45,7 +45,7 @@ dependencies {
exclude group: 'com.nativelibs4java', module: 'bridj' exclude group: 'com.nativelibs4java', module: 'bridj'
} }
implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7') implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
implementation('org.controlsfx:controlsfx:11.0.1' ) { implementation('org.controlsfx:controlsfx:11.0.2' ) {
exclude group: 'org.openjfx', module: 'javafx-base' exclude group: 'org.openjfx', module: 'javafx-base'
exclude group: 'org.openjfx', module: 'javafx-graphics' exclude group: 'org.openjfx', module: 'javafx-graphics'
exclude group: 'org.openjfx', module: 'javafx-controls' exclude group: 'org.openjfx', module: 'javafx-controls'

2
drongo

@ -1 +1 @@
Subproject commit 6a2af38b8a628f36b75c11626b0a8fd608e9d5a0 Subproject commit f0aa9491746cfa9d12630ff1f5ccdcf97cc4aa90

5
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -1007,6 +1007,11 @@ public class AppController implements Initializable {
.threshold(5, Notifications.create().title("Sparrow").text("Multiple new wallet transactions").graphic(new ImageView(image))) .threshold(5, Notifications.create().title("Sparrow").text("Multiple new wallet transactions").graphic(new ImageView(image)))
.onAction(e -> selectTab(event.getWallet())); .onAction(e -> selectTab(event.getWallet()));
//If controlsfx can't find our window, we must set the window ourselves (unfortunately notification is then shown within this window)
if(org.controlsfx.tools.Utils.getWindow(null) == null) {
notificationBuilder.owner(tabs.getScene().getWindow());
}
notificationBuilder.show(); notificationBuilder.show();
} }
} }

4
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
View file

@ -535,13 +535,13 @@ public class ElectrumServer {
return Utils.bytesToHex(reversed); return Utils.bytesToHex(reversed);
} }
private String getScriptHash(TransactionOutput output) { public static String getScriptHash(TransactionOutput output) {
byte[] hash = Sha256Hash.hash(output.getScript().getProgram()); byte[] hash = Sha256Hash.hash(output.getScript().getProgram());
byte[] reversed = Utils.reverseBytes(hash); byte[] reversed = Utils.reverseBytes(hash);
return Utils.bytesToHex(reversed); return Utils.bytesToHex(reversed);
} }
static Map<String, String> getSubscribedScriptHashes() { public static Map<String, String> getSubscribedScriptHashes() {
return subscribedScriptHashes; return subscribedScriptHashes;
} }