sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

followup to test taskbar api platform support

Browse source
This commit is contained in:
Craig Raw 2022-10-24 14:06:38 +02:00
parent 0c213294ad
commit f2b0f8ca9e
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyController.java
View file

@ -32,7 +32,6 @@ import org.controlsfx.glyphfont.Glyph;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.awt.Taskbar;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -248,7 +247,7 @@ public class CounterpartyController extends SorobanController {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(JavaFxScheduler.platform()) .observeOn(JavaFxScheduler.platform())
.subscribe(responseMessage -> { .subscribe(responseMessage -> {
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
if(accepted) { if(accepted) {
startCounterpartyCollaboration(counterpartyCahootsWallet, paymentCodeInitiator, cahootsType); startCounterpartyCollaboration(counterpartyCahootsWallet, paymentCodeInitiator, cahootsType);
followPaymentCode(paymentCodeInitiator); followPaymentCode(paymentCodeInitiator);
@ -256,12 +255,12 @@ public class CounterpartyController extends SorobanController {
}, error -> { }, error -> {
log.error("Error sending meeting response", error); log.error("Error sending meeting response", error);
mixingPartner.setVisible(false); mixingPartner.setVisible(false);
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
}); });
}, error -> { }, error -> {
log.error("Failed to receive meeting request", error); log.error("Failed to receive meeting request", error);
mixingPartner.setVisible(false); mixingPartner.setVisible(false);
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
}); });
} catch(Exception e) { } catch(Exception e) {
log.error("Error sending meeting response", e); log.error("Error sending meeting response", e);

7
src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorController.java
View file

@ -56,7 +56,6 @@ import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.awt.Taskbar;
import java.util.*; import java.util.*;
import java.util.function.UnaryOperator; import java.util.function.UnaryOperator;
@ -424,7 +423,7 @@ public class InitiatorController extends SorobanController {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(JavaFxScheduler.platform()) .observeOn(JavaFxScheduler.platform())
.subscribe(sorobanResponse -> { .subscribe(sorobanResponse -> {
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
if(sorobanResponse.isAccept()) { if(sorobanResponse.isAccept()) {
sorobanProgressBar.setProgress(0.1); sorobanProgressBar.setProgress(0.1);
sorobanProgressLabel.setText("Mix partner accepted!"); sorobanProgressLabel.setText("Mix partner accepted!");
@ -438,14 +437,14 @@ public class InitiatorController extends SorobanController {
step2Desc.setText(getErrorMessage(error)); step2Desc.setText(getErrorMessage(error));
sorobanProgressLabel.setVisible(false); sorobanProgressLabel.setVisible(false);
meetingFail.setVisible(true); meetingFail.setVisible(true);
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
}); });
}, error -> { }, error -> {
log.error("Error sending meeting request", error); log.error("Error sending meeting request", error);
step2Desc.setText(getErrorMessage(error)); step2Desc.setText(getErrorMessage(error));
sorobanProgressLabel.setVisible(false); sorobanProgressLabel.setVisible(false);
meetingFail.setVisible(true); meetingFail.setVisible(true);
Taskbar.getTaskbar().requestUserAttention(true, false); requestUserAttention();
}); });
} catch(Exception e) { } catch(Exception e) {
log.error("Error sending meeting request", e); log.error("Error sending meeting request", e);

8
src/main/java/com/sparrowwallet/sparrow/soroban/SorobanController.java
View file

@ -15,8 +15,8 @@ import com.sparrowwallet.sparrow.net.ElectrumServer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.awt.Taskbar;
import java.util.*; import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class SorobanController { public class SorobanController {
@ -120,4 +120,10 @@ public class SorobanController {
return feeAmt; return feeAmt;
} }
protected void requestUserAttention() {
if(Taskbar.isTaskbarSupported()) {
Taskbar.getTaskbar().requestUserAttention(true, false);
}
}
} }