Skip to content

Commit 5b0a5bf

Browse files
Improve file attachment handling in HelloController, enhance error handling for UI readiness check, and refine async logic in HelloModel.
1 parent 10acd5d commit 5b0a5bf

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/main/java/com/example/HelloController.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ protected void updateItem(NtfyMessageDto item, boolean empty) {
150150
// Hämta meddelandet eller visa filstatus om meddelandet är tomt
151151
String displayMessage = item.message() != null && !item.message().trim().isEmpty()
152152
? item.message()
153-
: (item.event().equals("file") ? "[File Uploaded]" : "");
153+
: ("file".equals(item.event())) ? item.topic() + " Uploaded" : "";
154154

155155
// Lägg till prefix för att visa om det är skickat lokalt
156156
String prefix = item.isLocal() ? "(Sent) " : "";
@@ -191,7 +191,15 @@ protected void sendMessage() {
191191
@FXML
192192
protected void attachFile() {
193193
// Hämta scenen från en av kontrollerna
194-
Stage stage = (Stage) (chatListView.getScene().getWindow());
194+
195+
if (attachFile == null || attachFile.getScene() == null || attachFile.getScene().getWindow() == null) {
196+
System.err.println("Cannot open file chooser: UI not ready.");
197+
return;
198+
}
199+
Stage stage = (Stage) attachFile.getScene().getWindow();
200+
201+
202+
195203

196204
FileChooser fileChooser = new FileChooser();
197205
fileChooser.setTitle("Choose file to attach");

src/main/java/com/example/HelloModel.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public void sendMessage() {
7474
// 2. Utför nätverksanropet på en bakgrundstråd
7575
CompletableFuture.runAsync(() -> {
7676
// Nätverksanropet sker här i bakgrunden
77-
connection.send(message, currentTopic.get());
7877
try {
7978
connection.send(message, currentTopic.get());
8079
} catch (Exception e) {
@@ -105,7 +104,6 @@ public void sendFile() {
105104
// 2. Utför nätverksanropet på en bakgrundstråd
106105
CompletableFuture.runAsync(() -> {
107106
// Nätverksanropet sker här i bakgrunden
108-
connection.sendFile(file, currentTopic.get());
109107
try {
110108
connection.sendFile(file, currentTopic.get());
111109
} catch( Exception e){

0 commit comments

Comments
 (0)