lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-30 00:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes [stage]

Browse Source
This commit is contained in:
crschnick
2025-07-22 09:22:30 +00:00
parent 7667704df2
commit 70f196ff62
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/util/ClipboardHelper.java
+10 -7
View File
@@ -21,7 +21,7 @@ public class ClipboardHelper {
new LabelGraphic.IconGraphic("mdi2c-clipboard-check-outline"),
() -> {});
private static void apply(Map<DataFormat, Object> map) {
private static void apply(Map<DataFormat, Object> map, boolean showNotification) {
Clipboard clipboard = Clipboard.getSystemClipboard();
Map<DataFormat, Object> contents = Stream.of(
DataFormat.PLAIN_TEXT,
@@ -38,11 +38,14 @@ public class ClipboardHelper {
return new AbstractMap.SimpleEntry<>(dataFormat, null);
}
})
.filter(o -> o.getValue() != null)
.collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
contents.putAll(map);
contents.entrySet().removeIf(e -> e.getValue() == null);
clipboard.setContent(contents);
AppLayoutModel.get().showQueueEntry(COPY_QUEUE_ENTRY, java.time.Duration.ofSeconds(10), true);
if (showNotification) {
AppLayoutModel.get().showQueueEntry(COPY_QUEUE_ENTRY, java.time.Duration.ofSeconds(15), true);
}
}
public static void copyPassword(SecretValue pass) {
@@ -54,7 +57,7 @@ public class ClipboardHelper {
Clipboard clipboard = Clipboard.getSystemClipboard();
var text = clipboard.getString();
apply(Map.of(DataFormat.PLAIN_TEXT, pass.getSecretValue()));
apply(Map.of(DataFormat.PLAIN_TEXT, pass.getSecretValue()), true);
var transition = new PauseTransition(Duration.millis(15000));
transition.setOnFinished(e -> {
@@ -62,7 +65,7 @@ public class ClipboardHelper {
if (present != null && present.equals(pass.getSecretValue())) {
var map = new HashMap<DataFormat, Object>();
map.put(DataFormat.PLAIN_TEXT, text);
apply(map);
apply(map, false);
}
});
transition.play();
@@ -71,13 +74,13 @@ public class ClipboardHelper {
public static void copyText(String s) {
PlatformThread.runLaterIfNeeded(() -> {
apply(Map.of(DataFormat.PLAIN_TEXT, s));
apply(Map.of(DataFormat.PLAIN_TEXT, s), true);
});
}
public static void copyUrl(String s) {
PlatformThread.runLaterIfNeeded(() -> {
apply(Map.of(DataFormat.URL, s, DataFormat.PLAIN_TEXT, s));
apply(Map.of(DataFormat.URL, s, DataFormat.PLAIN_TEXT, s), true);
});
}
}
version
+1 -1
View File
@@ -1 +1 @@
17.3-1
17.3-2