From d54c28ee4ab4837166c58796444135b261ec4f3e Mon Sep 17 00:00:00 2001
From: Jesper Larsson <jesper.larsson@iths.se>
Date: Fri, 7 Nov 2025 14:21:06 +0100
Subject: [PATCH 1/5] basic functionality

Signed-off-by: Jesper Larsson <jesper.larsson@iths.se>
---
 .gitignore                                    |  1 +
 pom.xml                                       | 10 +++
 .../java/com/example/HelloController.java     |  9 +++
 src/main/java/com/example/HelloFX.java        |  2 +
 src/main/java/com/example/HelloModel.java     | 61 +++++++++++++++++++
 src/main/java/com/example/NtfyMessage.java    |  7 +++
 src/main/java/module-info.java                |  3 +
 .../resources/com/example/hello-view.fxml     | 11 ++--
 8 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/example/NtfyMessage.java

diff --git a/.gitignore b/.gitignore
index 6ac465db..244268f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 target/
 /.idea/
+.env
diff --git a/pom.xml b/pom.xml
index c40f667e..9ee23793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,16 @@
             <artifactId>javafx-fxml</artifactId>
             <version>${javafx.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index fdd160a0..31e45720 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -1,7 +1,9 @@
 package com.example;
 
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -9,6 +11,7 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel();
+    public ListView<NtfyMessage> messageView;
 
     @FXML
     private Label messageLabel;
@@ -18,5 +21,11 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
+        messageView.setItems(model.getMessageHistory());
+        model.receiveMessage();
+    }
+
+    public void sendMessage(ActionEvent actionEvent) {
+        model.sendMessage();
     }
 }
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 96bdc5ca..263c58ca 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -1,5 +1,6 @@
 package com.example;
 
+import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -10,6 +11,7 @@ public class HelloFX extends Application {
 
     @Override
     public void start(Stage stage) throws Exception {
+
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
         Scene scene = new Scene(root, 640, 480);
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 385cfd10..d7dd2aca 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,9 +1,40 @@
 package com.example;
 
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Model layer: encapsulates application data and business logic.
  */
 public class HelloModel {
+
+    private final String HOSTNAME;
+    private final HttpClient httpClient = HttpClient.newHttpClient();
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObservableList<NtfyMessage> messageHistory = FXCollections.observableArrayList();
+
+    public HelloModel() {
+        Dotenv dotenv = Dotenv.load();
+        HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
+    }
+
+    public ObservableList<NtfyMessage> getMessageHistory() {
+        return messageHistory;
+    }
+
     /**
      * Returns a greeting based on the current Java and JavaFX versions.
      */
@@ -12,4 +43,34 @@ public String getGreeting() {
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
+
+    public void sendMessage() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString("Hello World!"))
+                .uri(URI.create(HOSTNAME + "/aTopic"))
+                .build();
+
+        try {
+            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException e) {
+            System.err.println("Error sending message");
+        } catch (InterruptedException e) {
+            System.err.println("Interrupted sending message");
+        }
+
+    }
+
+    public void receiveMessage() {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .GET()
+                .uri(URI.create(HOSTNAME + "/aTopic/json"))
+                .build();
+
+        httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                .thenAccept(response -> response.body()
+                        .map(s -> objectMapper.readValue(s, NtfyMessage.class))
+                        .filter(m -> m.event().equals("message"))
+                        .forEach((m -> Platform.runLater(() -> messageHistory.add(m)))));
+    }
 }
+
diff --git a/src/main/java/com/example/NtfyMessage.java b/src/main/java/com/example/NtfyMessage.java
new file mode 100644
index 00000000..3a0bee6f
--- /dev/null
+++ b/src/main/java/com/example/NtfyMessage.java
@@ -0,0 +1,7 @@
+package com.example;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record NtfyMessage(String id, long time, String event, String topic, String message){}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 71574a27..649be1ab 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,6 +1,9 @@
 module hellofx {
     requires javafx.controls;
     requires javafx.fxml;
+    requires io.github.cdimascio.dotenv.java;
+    requires java.net.http;
+    requires tools.jackson.databind;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 20a7dc82..b4c98dd8 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -2,8 +2,11 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.control.Label?>
 
-<StackPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
-    <children>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ListView?>
+<VBox alignment="CENTER" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
         <Label fx:id="messageLabel" text="Hello, JavaFX!" />
-    </children>
-</StackPane>
+        <Button text="Send message" onAction="#sendMessage"/>
+        <ListView fx:id="messageView" />
+</VBox>

From 175a1913d567ea43beaa4bec71d9827937e4d318 Mon Sep 17 00:00:00 2001
From: Jesper Larsson <jesper.larsson@iths.se>
Date: Wed, 12 Nov 2025 15:48:23 +0100
Subject: [PATCH 2/5] basic program functional

Signed-off-by: Jesper Larsson <jesper.larsson@iths.se>
---
 .../java/com/example/HelloController.java     | 21 +++--
 src/main/java/com/example/HelloModel.java     | 94 +++++++++++++++----
 .../resources/com/example/hello-view.fxml     | 37 ++++++--
 3 files changed, 118 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index 31e45720..7b6d5f52 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -4,6 +4,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -11,21 +12,27 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel();
-    public ListView<NtfyMessage> messageView;
+    public ListView<String> messageView;
 
     @FXML
-    private Label messageLabel;
+    private Label topic;
+
+    @FXML
+    TextField input;
 
     @FXML
     private void initialize() {
-        if (messageLabel != null) {
-            messageLabel.setText(model.getGreeting());
-        }
-        messageView.setItems(model.getMessageHistory());
+        topic.textProperty().bind(model.topicProperty());
+        messageView.setItems(model.getFormatedMessages());
         model.receiveMessage();
     }
 
     public void sendMessage(ActionEvent actionEvent) {
-        model.sendMessage();
+        model.sendMessage(input.getText().trim());
+        input.clear();
+    }
+
+    public void changeTopic(ActionEvent actionEvent) {
+        model.changeTopic();
     }
 }
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index d7dd2aca..2099aae6 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -2,8 +2,14 @@
 
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
 import tools.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
@@ -11,8 +17,9 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.ArrayList;
-import java.util.List;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -25,7 +32,10 @@ public class HelloModel {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
     private final ObservableList<NtfyMessage> messageHistory = FXCollections.observableArrayList();
-
+    private final ObservableList<String> formatedMessages = FXCollections.observableArrayList();
+    
+    private SimpleStringProperty topic = new SimpleStringProperty("");
+    
     public HelloModel() {
         Dotenv dotenv = Dotenv.load();
         HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
@@ -34,20 +44,12 @@ public HelloModel() {
     public ObservableList<NtfyMessage> getMessageHistory() {
         return messageHistory;
     }
+    
 
-    /**
-     * Returns a greeting based on the current Java and JavaFX versions.
-     */
-    public String getGreeting() {
-        String javaVersion = System.getProperty("java.version");
-        String javafxVersion = System.getProperty("javafx.version");
-        return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
-    }
-
-    public void sendMessage() {
+    public void sendMessage(String message) {
         HttpRequest request = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString("Hello World!"))
-                .uri(URI.create(HOSTNAME + "/aTopic"))
+                .POST(HttpRequest.BodyPublishers.ofString(message))
+                .uri(URI.create(HOSTNAME + "/" + getTopic()))
                 .build();
 
         try {
@@ -61,16 +63,74 @@ public void sendMessage() {
     }
 
     public void receiveMessage() {
+        formatedMessages.clear();
+
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .GET()
-                .uri(URI.create(HOSTNAME + "/aTopic/json"))
+                .uri(URI.create(HOSTNAME + "/" + getTopic() + "/json?since=all"))
                 .build();
 
         httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
                 .thenAccept(response -> response.body()
                         .map(s -> objectMapper.readValue(s, NtfyMessage.class))
                         .filter(m -> m.event().equals("message"))
-                        .forEach((m -> Platform.runLater(() -> messageHistory.add(m)))));
+                        .forEach((m -> Platform.runLater(() -> logMessage(m)))));
+    }
+
+    public void logMessage(NtfyMessage message) {
+        messageHistory.add(message);;
+
+        Date timeStamp = new Date(message.time()*1000);
+        DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+        String stringMessage = dateFormat.format(timeStamp) + " : " + message.message();
+        formatedMessages.add(stringMessage);
+    }
+
+    public String getTopic() {
+        return topic.get();
+    }
+
+    public SimpleStringProperty topicProperty() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic.set(topic);
+    }
+
+    public void changeTopic() {
+        Dialog dialog = new Dialog();
+        dialog.setTitle("Add Topic");
+
+        ButtonType addTopicButton = new ButtonType("Add Topic", ButtonBar.ButtonData.OK_DONE);
+        dialog.getDialogPane().getButtonTypes().addAll(addTopicButton, ButtonType.CANCEL);
+
+        TextField topic = new TextField();
+        topic.setPromptText("Topic");
+
+        GridPane gridPane = new GridPane();
+        gridPane.setHgap(10);
+        gridPane.setVgap(10);
+
+        gridPane.add(topic, 0, 0);
+
+        dialog.getDialogPane().setContent(gridPane);
+
+        Platform.runLater(() -> topic.requestFocus());
+
+        dialog.setResultConverter(pressedButton -> {
+            if (pressedButton == addTopicButton) {
+                    setTopic(topic.getText().trim());
+                    receiveMessage();
+            }
+            return null;
+        });
+
+        dialog.show();
+    }
+
+    public ObservableList<String> getFormatedMessages() {
+        return formatedMessages;
     }
 }
 
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index b4c98dd8..ee05c8e4 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -1,12 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.control.Label?>
 
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
-<VBox alignment="CENTER" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
-        <Label fx:id="messageLabel" text="Hello, JavaFX!" />
-        <Button text="Send message" onAction="#sendMessage"/>
-        <ListView fx:id="messageView" />
-</VBox>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+
+<BorderPane xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.HelloController">
+   <center>
+      <VBox alignment="CENTER">
+              <ListView fx:id="messageView" />
+      </VBox>
+   </center>
+   <bottom>
+       <HBox spacing="2" BorderPane.alignment="CENTER">
+           <TextField fx:id="input" onAction="#sendMessage" promptText="..." HBox.hgrow="ALWAYS" />
+           <Button alignment="BOTTOM_RIGHT" onAction="#sendMessage" text="Send" />
+           <MenuButton mnemonicParsing="false" text="Menu">
+               <items>
+                   <MenuItem fx:id="addTopic" mnemonicParsing="false" onAction="#changeTopic" onMenuValidation="#changeTopic" text="Change Topic" />
+                   <SeparatorMenuItem mnemonicParsing="false" />
+                   <MenuItem mnemonicParsing="false" text="Add Image" />
+               </items>
+           </MenuButton>
+       </HBox>
+   </bottom>
+   <top>
+           <Label fx:id="topic" BorderPane.alignment="CENTER" />
+   </top>
+</BorderPane>

From 63db1f693c5e0245c5611a5eefbab8ac548a5b82 Mon Sep 17 00:00:00 2001
From: Jesper Larsson <jesper.larsson@iths.se>
Date: Thu, 13 Nov 2025 16:32:35 +0100
Subject: [PATCH 3/5] functional todo:addTests

Signed-off-by: Jesper Larsson <jesper.larsson@iths.se>
---
 .../java/com/example/HelloController.java     |  37 ++++-
 src/main/java/com/example/HelloFX.java        |   1 -
 src/main/java/com/example/HelloModel.java     | 126 ++++++++++++++----
 src/main/java/com/example/NtfyMessage.java    |   4 +-
 .../resources/com/example/hello-view.fxml     |  11 +-
 5 files changed, 147 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index 7b6d5f52..846246d8 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -5,6 +5,10 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+
+import java.io.File;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -12,7 +16,7 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel();
-    public ListView<String> messageView;
+    public ListView<Object> messageView;
 
     @FXML
     private Label topic;
@@ -20,6 +24,8 @@ public class HelloController {
     @FXML
     TextField input;
 
+    File attachment = null;
+
     @FXML
     private void initialize() {
         topic.textProperty().bind(model.topicProperty());
@@ -27,11 +33,38 @@ private void initialize() {
         model.receiveMessage();
     }
 
+    /**
+     * Send a message, file if one has been attached else a string from the input field
+     * @param actionEvent
+     */
     public void sendMessage(ActionEvent actionEvent) {
-        model.sendMessage(input.getText().trim());
+        if(attachment != null) {
+            model.sendFile(attachment);
+            attachment = null;
+        }
+        else{
+            model.sendMessage(input.getText().trim());
+        }
         input.clear();
     }
 
+    /**
+     * Opens a filechooser and adds selected file as attachement to be sent
+     * @param actionEvent
+     */
+    public void sendFile(ActionEvent actionEvent){
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Attach a file");
+
+        Stage stage = (Stage) topic.getScene().getWindow();
+
+
+        attachment = fileChooser.showOpenDialog(stage);
+        if(attachment != null) {
+            input.setText(attachment.getAbsolutePath());
+        }
+    }
+
     public void changeTopic(ActionEvent actionEvent) {
         model.changeTopic();
     }
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 263c58ca..f37f5cb9 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -1,6 +1,5 @@
 package com.example;
 
-import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 2099aae6..c11a39cb 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -9,18 +9,27 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
 import tools.jackson.databind.ObjectMapper;
 
-import java.io.IOException;
+import java.io.*;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Objects;
+import java.util.regex.Pattern;
 
 /**
  * Model layer: encapsulates application data and business logic.
@@ -32,24 +41,49 @@ public class HelloModel {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
     private final ObservableList<NtfyMessage> messageHistory = FXCollections.observableArrayList();
-    private final ObservableList<String> formatedMessages = FXCollections.observableArrayList();
-    
-    private SimpleStringProperty topic = new SimpleStringProperty("");
+    private final ObservableList<Object> formatedMessages = FXCollections.observableArrayList();
     
+    private SimpleStringProperty topic = new SimpleStringProperty("JUV25D");
+
+
     public HelloModel() {
         Dotenv dotenv = Dotenv.load();
         HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
+
+    }
+
+
+    public ObservableList<Object> getFormatedMessages() {
+        return formatedMessages;
     }
 
     public ObservableList<NtfyMessage> getMessageHistory() {
         return messageHistory;
     }
-    
 
+    public String getTopic() {
+        return topic.get();
+    }
+
+    public SimpleStringProperty topicProperty() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic.set(topic);
+    }
+
+
+    /**
+     * Sends a string as message
+     * @param message String to send
+     */
     public void sendMessage(String message) {
+        if(message.isBlank()) return; //only send messages that has text
+
         HttpRequest request = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString(message))
                 .uri(URI.create(HOSTNAME + "/" + getTopic()))
+                .POST(HttpRequest.BodyPublishers.ofString(message))
                 .build();
 
         try {
@@ -59,9 +93,38 @@ public void sendMessage(String message) {
         } catch (InterruptedException e) {
             System.err.println("Interrupted sending message");
         }
+    }
+
+    /**
+     * Converts a file to bytes and sends it with correct header
+     * @param attachment File to be sent
+     */
+    public void sendFile(File attachment){
+
+        try {
+            byte[] attachmentAsBytes = Files.readAllBytes(Paths.get(attachment.getAbsolutePath()));
+
+            String contentType = Files.probeContentType(attachment.toPath());
 
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URI.create(HOSTNAME + "/" + getTopic()))
+                    .header("Content-Type", contentType)
+                    .header("Filename", attachment.getName())
+                    .POST(HttpRequest.BodyPublishers.ofByteArray(attachmentAsBytes))
+                    .build();
+
+
+            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException e) {
+            System.err.println("Error sending attachment");
+        } catch (InterruptedException e) {
+            System.err.println("Interrupted sending attachment");
+        }
     }
 
+    /**
+     * Clears the display before opening a new connection to a topic and displaying it
+     */
     public void receiveMessage() {
         formatedMessages.clear();
 
@@ -77,27 +140,47 @@ public void receiveMessage() {
                         .forEach((m -> Platform.runLater(() -> logMessage(m)))));
     }
 
+
+    /**
+     * Adds the message to internal message history and the values to be displayed formated in the display list
+     * @param message received message from NTFY server
+     */
     public void logMessage(NtfyMessage message) {
-        messageHistory.add(message);;
+        messageHistory.add(message);
 
-        Date timeStamp = new Date(message.time()*1000);
-        DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
-        String stringMessage = dateFormat.format(timeStamp) + " : " + message.message();
-        formatedMessages.add(stringMessage);
-    }
+        if(message.attachment() != null) {
+            try {
+                URL url = new URL(message.attachment().get("url"));
 
-    public String getTopic() {
-        return topic.get();
-    }
+                if(Pattern.matches("^image\\/\\w+",message.attachment().get("type"))) {//check if the attachment is an image
+                    ImageView image = new ImageView(new Image(url.toExternalForm()));
+                    image.setPreserveRatio(true);
+                    image.setFitHeight ( 250 );
+                    image.setFitWidth ( 250 );
 
-    public SimpleStringProperty topicProperty() {
-        return topic;
-    }
+                    formatedMessages.addFirst(image);
+                }
 
-    public void setTopic(String topic) {
-        this.topic.set(topic);
+                else{
+                    formatedMessages.addFirst(url);
+                }
+
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+
+        Date timeStamp = new Date(message.time()*1000);
+        DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+        String stringMessage = dateFormat.format(timeStamp) + " : " + message.message();
+        formatedMessages.addFirst(stringMessage);
     }
 
+    /**
+     * Opens as dialog with text input
+     * If a value is entered and the add button pressed, change the topic per the input
+     */
     public void changeTopic() {
         Dialog dialog = new Dialog();
         dialog.setTitle("Add Topic");
@@ -129,8 +212,5 @@ public void changeTopic() {
         dialog.show();
     }
 
-    public ObservableList<String> getFormatedMessages() {
-        return formatedMessages;
-    }
 }
 
diff --git a/src/main/java/com/example/NtfyMessage.java b/src/main/java/com/example/NtfyMessage.java
index 3a0bee6f..e8d1a5ef 100644
--- a/src/main/java/com/example/NtfyMessage.java
+++ b/src/main/java/com/example/NtfyMessage.java
@@ -3,5 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+import java.util.HashMap;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record NtfyMessage(String id, long time, String event, String topic, String message){}
+public record NtfyMessage(String id, long time, String event, String topic, String message, HashMap<String, String> attachment){}
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index ee05c8e4..8bd8d2d3 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -3,11 +3,12 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-
 <BorderPane xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.HelloController">
    <center>
-      <VBox alignment="CENTER">
-              <ListView fx:id="messageView" />
+      <VBox>
+         <children>
+                 <ListView fx:id="messageView" VBox.vgrow="ALWAYS" />
+         </children>
       </VBox>
    </center>
    <bottom>
@@ -16,9 +17,9 @@
            <Button alignment="BOTTOM_RIGHT" onAction="#sendMessage" text="Send" />
            <MenuButton mnemonicParsing="false" text="Menu">
                <items>
-                   <MenuItem fx:id="addTopic" mnemonicParsing="false" onAction="#changeTopic" onMenuValidation="#changeTopic" text="Change Topic" />
+                   <MenuItem fx:id="addTopic" mnemonicParsing="false" onAction="#changeTopic" text="Change Topic" />
                    <SeparatorMenuItem mnemonicParsing="false" />
-                   <MenuItem mnemonicParsing="false" text="Add Image" />
+                   <MenuItem mnemonicParsing="false" onAction="#sendFile" text="Add File" />
                </items>
            </MenuButton>
        </HBox>

From 1ff47ac9aca5c2e3907c6cae69f1072cffcdd4d6 Mon Sep 17 00:00:00 2001
From: Jesper Larsson <jesper.larsson@iths.se>
Date: Fri, 14 Nov 2025 13:16:24 +0100
Subject: [PATCH 4/5] testbranch

Signed-off-by: Jesper Larsson <jesper.larsson@iths.se>
---
 .../java/com/example/HelloController.java     |   2 +-
 src/main/java/com/example/HelloModel.java     | 120 ++--------------
 src/main/java/com/example/NtfyConnection.java |  14 ++
 .../java/com/example/NtfyConnectionImpl.java  | 134 ++++++++++++++++++
 src/main/java/module-info.java                |   2 +
 .../resources/com/example/hello-view.fxml     |   4 +-
 src/test/java/com/example/HelloModelTest.java |  24 ++++
 .../java/com/example/NtfyConnectionSpy.java   |  19 +++
 8 files changed, 207 insertions(+), 112 deletions(-)
 create mode 100644 src/main/java/com/example/NtfyConnection.java
 create mode 100644 src/main/java/com/example/NtfyConnectionImpl.java
 create mode 100644 src/test/java/com/example/HelloModelTest.java
 create mode 100644 src/test/java/com/example/NtfyConnectionSpy.java

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index 846246d8..edb8743d 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -15,7 +15,7 @@
  */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel();
+    private final HelloModel model = new HelloModel(null);
     public ListView<Object> messageView;
 
     @FXML
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index c11a39cb..1e172f7e 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,34 +1,19 @@
 package com.example;
 
-import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
-import tools.jackson.databind.ObjectMapper;
 
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URI;
+import java.io.IOException;
 import java.net.URL;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -36,20 +21,14 @@
  */
 public class HelloModel {
 
-    private final String HOSTNAME;
-    private final HttpClient httpClient = HttpClient.newHttpClient();
+    private final NtfyConnection connection;
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
     private final ObservableList<NtfyMessage> messageHistory = FXCollections.observableArrayList();
     private final ObservableList<Object> formatedMessages = FXCollections.observableArrayList();
-    
-    private SimpleStringProperty topic = new SimpleStringProperty("JUV25D");
 
 
-    public HelloModel() {
-        Dotenv dotenv = Dotenv.load();
-        HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
-
+    public HelloModel(NtfyConnection connection) {
+        this.connection = connection;
     }
 
 
@@ -79,47 +58,7 @@ public void setTopic(String topic) {
      * @param message String to send
      */
     public void sendMessage(String message) {
-        if(message.isBlank()) return; //only send messages that has text
-
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(HOSTNAME + "/" + getTopic()))
-                .POST(HttpRequest.BodyPublishers.ofString(message))
-                .build();
-
-        try {
-            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
-            System.err.println("Error sending message");
-        } catch (InterruptedException e) {
-            System.err.println("Interrupted sending message");
-        }
-    }
-
-    /**
-     * Converts a file to bytes and sends it with correct header
-     * @param attachment File to be sent
-     */
-    public void sendFile(File attachment){
-
-        try {
-            byte[] attachmentAsBytes = Files.readAllBytes(Paths.get(attachment.getAbsolutePath()));
-
-            String contentType = Files.probeContentType(attachment.toPath());
-
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(HOSTNAME + "/" + getTopic()))
-                    .header("Content-Type", contentType)
-                    .header("Filename", attachment.getName())
-                    .POST(HttpRequest.BodyPublishers.ofByteArray(attachmentAsBytes))
-                    .build();
-
-
-            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
-            System.err.println("Error sending attachment");
-        } catch (InterruptedException e) {
-            System.err.println("Interrupted sending attachment");
-        }
+        connection.send(message);
     }
 
     /**
@@ -127,22 +66,13 @@ public void sendFile(File attachment){
      */
     public void receiveMessage() {
         formatedMessages.clear();
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .GET()
-                .uri(URI.create(HOSTNAME + "/" + getTopic() + "/json?since=all"))
-                .build();
-
-        httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(response -> response.body()
-                        .map(s -> objectMapper.readValue(s, NtfyMessage.class))
-                        .filter(m -> m.event().equals("message"))
-                        .forEach((m -> Platform.runLater(() -> logMessage(m)))));
+        connection.recieve(m -> Platform.runLater(() -> logMessage(m)));
     }
 
 
     /**
      * Adds the message to internal message history and the values to be displayed formated in the display list
+     * If the message is an attachment it displays it as an image or hyperlink depending on content
      * @param message received message from NTFY server
      */
     public void logMessage(NtfyMessage message) {
@@ -162,7 +92,8 @@ public void logMessage(NtfyMessage message) {
                 }
 
                 else{
-                    formatedMessages.addFirst(url);
+                    Hyperlink hyperlink = new Hyperlink(url.toExternalForm());
+                    formatedMessages.addFirst(hyperlink);
                 }
 
             } catch (IOException e) {
@@ -182,35 +113,6 @@ public void logMessage(NtfyMessage message) {
      * If a value is entered and the add button pressed, change the topic per the input
      */
     public void changeTopic() {
-        Dialog dialog = new Dialog();
-        dialog.setTitle("Add Topic");
-
-        ButtonType addTopicButton = new ButtonType("Add Topic", ButtonBar.ButtonData.OK_DONE);
-        dialog.getDialogPane().getButtonTypes().addAll(addTopicButton, ButtonType.CANCEL);
-
-        TextField topic = new TextField();
-        topic.setPromptText("Topic");
-
-        GridPane gridPane = new GridPane();
-        gridPane.setHgap(10);
-        gridPane.setVgap(10);
-
-        gridPane.add(topic, 0, 0);
 
-        dialog.getDialogPane().setContent(gridPane);
-
-        Platform.runLater(() -> topic.requestFocus());
-
-        dialog.setResultConverter(pressedButton -> {
-            if (pressedButton == addTopicButton) {
-                    setTopic(topic.getText().trim());
-                    receiveMessage();
-            }
-            return null;
-        });
-
-        dialog.show();
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
new file mode 100644
index 00000000..0b18939e
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -0,0 +1,14 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public interface NtfyConnection {
+
+    public boolean send(String message);
+
+    public void recieve(Consumer<NtfyMessage> messageHandler);
+
+    public void changeTopic();
+
+
+}
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
new file mode 100644
index 00000000..0a7f62a6
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -0,0 +1,134 @@
+package com.example;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+public class NtfyConnectionImpl implements NtfyConnection {
+
+    private final HttpClient httpClient = HttpClient.newHttpClient();
+    private final String HOSTNAME;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private SimpleStringProperty topic = new SimpleStringProperty("JUV25D"); //Default value simplifies code
+
+    public NtfyConnectionImpl() {
+        Dotenv dotenv = Dotenv.load();
+        HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
+    }
+
+    @Override
+    public boolean send(String message) {
+        if (message == null) return false; if(message.isBlank()) return false; //only send messages that isn't null and has  text
+
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(HOSTNAME + "/" + topic.getValue()))
+                .POST(HttpRequest.BodyPublishers.ofString(message))
+                .build();
+
+        try {
+            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException e) {
+            System.err.println("Error sending message");
+            return false;
+        } catch (InterruptedException e) {
+            System.err.println("Interrupted sending message");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Converts a file to bytes and sends it with correct header
+     * @param attachment File to be sent
+     */
+    public void sendFile(File attachment){
+
+        try {
+            byte[] attachmentAsBytes = Files.readAllBytes(Paths.get(attachment.getAbsolutePath()));
+
+            String contentType = Files.probeContentType(attachment.toPath());
+
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URI.create(HOSTNAME + "/" + topic.getValue()))
+                    .header("Content-Type", contentType)
+                    .header("Filename", attachment.getName())
+                    .POST(HttpRequest.BodyPublishers.ofByteArray(attachmentAsBytes))
+                    .build();
+
+
+            HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException e) {
+            System.err.println("Error sending attachment");
+        } catch (InterruptedException e) {
+            System.err.println("Interrupted sending attachment");
+        }
+    }
+
+    @Override
+    public void recieve(Consumer<NtfyMessage> messageHandler) {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .GET()
+                .uri(URI.create(HOSTNAME + "/" + topic.getValue() + "/json?since=all"))
+                .build();
+
+        httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                .thenAccept(response -> response.body()
+                        .map(s -> objectMapper.readValue(s, NtfyMessage.class))
+                        .filter(m -> m.event().equals("message"))
+                        .forEach(messageHandler));
+    }
+
+    @Override
+    public void changeTopic() {
+        Dialog dialog = new Dialog();
+        dialog.setTitle("Add Topic");
+
+        ButtonType addTopicButton = new ButtonType("Add Topic", ButtonBar.ButtonData.OK_DONE);
+        dialog.getDialogPane().getButtonTypes().addAll(addTopicButton, ButtonType.CANCEL);
+
+        TextField newTopic = new TextField();
+        newTopic.setPromptText("Topic");
+
+        GridPane gridPane = new GridPane();
+        gridPane.setHgap(10);
+        gridPane.setVgap(10);
+
+        gridPane.add(newTopic, 0, 0);
+
+        dialog.getDialogPane().setContent(gridPane);
+
+        Platform.runLater(() -> newTopic.requestFocus());
+
+        dialog.setResultConverter(pressedButton -> {
+            if (pressedButton == addTopicButton) {
+                if(!newTopic.getText().isBlank()){
+                    topic.setValue(newTopic.getText().trim());
+                    receive();
+                }
+            }
+            return null;
+        });
+
+        dialog.show();
+    }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 649be1ab..ad7ed70a 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -4,6 +4,8 @@
     requires io.github.cdimascio.dotenv.java;
     requires java.net.http;
     requires tools.jackson.databind;
+    requires javafx.graphics;
+    requires javafx.base;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 8bd8d2d3..49277535 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -7,7 +7,7 @@
    <center>
       <VBox>
          <children>
-                 <ListView fx:id="messageView" VBox.vgrow="ALWAYS" />
+             <ListView fx:id="messageView" VBox.vgrow="ALWAYS" />
          </children>
       </VBox>
    </center>
@@ -25,6 +25,6 @@
        </HBox>
    </bottom>
    <top>
-           <Label fx:id="topic" BorderPane.alignment="CENTER" />
+       <Label fx:id="topic" BorderPane.alignment="CENTER" />
    </top>
 </BorderPane>
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
new file mode 100644
index 00000000..169667f6
--- /dev/null
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -0,0 +1,24 @@
+package com.example;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class HelloModelTest {
+
+    @Test
+    @DisplayName("When calling sendMessage it should call connection send")
+    void sendMessageCallsConnectionWithMessageToSend() {
+        //Arrange
+        var spy = new NtfyConnectionSpy();
+        var model = new HelloModel(spy);
+
+        //Act
+        model.sendMessage("Hello World");
+
+        //Assert
+        assertThat(spy.message).isEqualTo("Hello World");
+    }
+
+}
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
new file mode 100644
index 00000000..68c7e325
--- /dev/null
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -0,0 +1,19 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public class NtfyConnectionSpy implements NtfyConnection{
+
+    String message;
+
+    @Override
+    public boolean send(String message) {
+        this.message = message;
+        return true;
+    }
+
+    @Override
+    public void recieve(Consumer<NtfyMessage> messageHandler) {
+
+    }
+}

From 6baf403702cad1df51c116e03b2d4cc3a34c680c Mon Sep 17 00:00:00 2001
From: Jesper Larsson <jesper.larsson@iths.se>
Date: Fri, 14 Nov 2025 14:37:47 +0100
Subject: [PATCH 5/5] moved to NtfyConnection and added first test

Signed-off-by: Jesper Larsson <jesper.larsson@iths.se>
---
 .../java/com/example/HelloController.java     |  8 +-
 src/main/java/com/example/HelloModel.java     | 43 ++++++---
 src/main/java/com/example/NtfyConnection.java | 15 ++-
 .../java/com/example/NtfyConnectionImpl.java  | 95 ++++++++++---------
 src/test/java/com/example/HelloModelTest.java | 18 ++++
 .../java/com/example/NtfyConnectionSpy.java   | 25 +++++
 6 files changed, 140 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index edb8743d..0a03e770 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -15,7 +15,9 @@
  */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel(null);
+    private final NtfyConnection connection = new NtfyConnectionImpl();
+    private final HelloModel model = new HelloModel(connection);
+
     public ListView<Object> messageView;
 
     @FXML
@@ -28,7 +30,7 @@ public class HelloController {
 
     @FXML
     private void initialize() {
-        topic.textProperty().bind(model.topicProperty());
+        topic.textProperty().bind(connection.topicProperty());
         messageView.setItems(model.getFormatedMessages());
         model.receiveMessage();
     }
@@ -39,7 +41,7 @@ private void initialize() {
      */
     public void sendMessage(ActionEvent actionEvent) {
         if(attachment != null) {
-            model.sendFile(attachment);
+            connection.sendFile(attachment);
             attachment = null;
         }
         else{
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 1e172f7e..41a1bb14 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,7 +1,6 @@
 package com.example;
 
 import javafx.application.Platform;
-import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.*;
@@ -40,19 +39,6 @@ public ObservableList<NtfyMessage> getMessageHistory() {
         return messageHistory;
     }
 
-    public String getTopic() {
-        return topic.get();
-    }
-
-    public SimpleStringProperty topicProperty() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic.set(topic);
-    }
-
-
     /**
      * Sends a string as message
      * @param message String to send
@@ -113,6 +99,35 @@ public void logMessage(NtfyMessage message) {
      * If a value is entered and the add button pressed, change the topic per the input
      */
     public void changeTopic() {
+        Dialog dialog = new Dialog();
+        dialog.setTitle("Add Topic");
+
+        ButtonType addTopicButton = new ButtonType("Add Topic", ButtonBar.ButtonData.OK_DONE);
+        dialog.getDialogPane().getButtonTypes().addAll(addTopicButton, ButtonType.CANCEL);
+
+        TextField newTopic = new TextField();
+        newTopic.setPromptText("Topic");
+
+        GridPane gridPane = new GridPane();
+        gridPane.setHgap(10);
+        gridPane.setVgap(10);
+
+        gridPane.add(newTopic, 0, 0);
+
+        dialog.getDialogPane().setContent(gridPane);
+
+        Platform.runLater(() -> newTopic.requestFocus());
+
+        dialog.setResultConverter(pressedButton -> {
+            if (pressedButton == addTopicButton) {
+                if(!newTopic.getText().isBlank()){
+                    connection.setTopic(newTopic.getText().trim());
+                    receiveMessage();
+                }
+            }
+            return null;
+        });
 
+        dialog.show();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
index 0b18939e..f5a0e5cf 100644
--- a/src/main/java/com/example/NtfyConnection.java
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -1,14 +1,23 @@
 package com.example;
 
+import javafx.beans.property.SimpleStringProperty;
+
+import java.io.File;
 import java.util.function.Consumer;
 
 public interface NtfyConnection {
 
-    public boolean send(String message);
+    SimpleStringProperty topic = new SimpleStringProperty();
 
-    public void recieve(Consumer<NtfyMessage> messageHandler);
+    public SimpleStringProperty topicProperty();
+
+    public String getTopic();
 
-    public void changeTopic();
+    public void setTopic(String topic);
 
+    public boolean send(String message);
+
+    public void recieve(Consumer<NtfyMessage> messageHandler);
 
+    public boolean sendFile(File attachment);
 }
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 0a7f62a6..fcf135b4 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -1,13 +1,7 @@
 package com.example;
 
 import io.github.cdimascio.dotenv.Dotenv;
-import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
 import tools.jackson.databind.ObjectMapper;
 
 import java.io.File;
@@ -35,9 +29,37 @@ public NtfyConnectionImpl() {
         HOSTNAME = Objects.requireNonNull(dotenv.get("HOSTNAME"));
     }
 
+    public NtfyConnectionImpl(String HOSTNAME) {
+        this.HOSTNAME = HOSTNAME;
+    }
+
+    @Override
+    public SimpleStringProperty topicProperty() {
+        return topic;
+    }
+
+
+    @Override
+    public String getTopic() {
+        return topic.getValue();
+    }
+
+
+    @Override
+    public void setTopic(String topic) {
+        if (topic != null && !topic.isEmpty()) {
+            this.topic.setValue(topic);
+        }
+    }
+
+    /**
+     * Sends a string as message
+     *
+     * @param message String to send
+     */
     @Override
     public boolean send(String message) {
-        if (message == null) return false; if(message.isBlank()) return false; //only send messages that isn't null and has  text
+        if (message == null || message.isBlank()) return false; //only send messages that isn't null and has  text
 
 
         HttpRequest request = HttpRequest.newBuilder()
@@ -47,21 +69,29 @@ public boolean send(String message) {
 
         try {
             HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+            if (response.statusCode() >= 200 && response.statusCode() < 300) {
+                return true;
+            } else {
+                System.out.println("Error sending message " + response.statusCode());
+                return false;
+            }
         } catch (IOException e) {
             System.err.println("Error sending message");
-            return false;
         } catch (InterruptedException e) {
             System.err.println("Interrupted sending message");
-            return false;
         }
-        return true;
+        return false;
     }
 
+
     /**
      * Converts a file to bytes and sends it with correct header
+     *
      * @param attachment File to be sent
      */
-    public void sendFile(File attachment){
+    public boolean sendFile(File attachment) {
+        if (attachment == null || !attachment.exists()) return false;
 
         try {
             byte[] attachmentAsBytes = Files.readAllBytes(Paths.get(attachment.getAbsolutePath()));
@@ -77,13 +107,22 @@ public void sendFile(File attachment){
 
 
             HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+            if (response.statusCode() >= 200 && response.statusCode() < 300) {
+                return true;
+            } else {
+                System.out.println("Error sending attachment " + response.statusCode());
+                return false;
+            }
         } catch (IOException e) {
             System.err.println("Error sending attachment");
         } catch (InterruptedException e) {
             System.err.println("Interrupted sending attachment");
         }
+        return false;
     }
 
+
     @Override
     public void recieve(Consumer<NtfyMessage> messageHandler) {
         HttpRequest httpRequest = HttpRequest.newBuilder()
@@ -97,38 +136,6 @@ public void recieve(Consumer<NtfyMessage> messageHandler) {
                         .filter(m -> m.event().equals("message"))
                         .forEach(messageHandler));
     }
+}
 
-    @Override
-    public void changeTopic() {
-        Dialog dialog = new Dialog();
-        dialog.setTitle("Add Topic");
-
-        ButtonType addTopicButton = new ButtonType("Add Topic", ButtonBar.ButtonData.OK_DONE);
-        dialog.getDialogPane().getButtonTypes().addAll(addTopicButton, ButtonType.CANCEL);
-
-        TextField newTopic = new TextField();
-        newTopic.setPromptText("Topic");
-
-        GridPane gridPane = new GridPane();
-        gridPane.setHgap(10);
-        gridPane.setVgap(10);
-
-        gridPane.add(newTopic, 0, 0);
-
-        dialog.getDialogPane().setContent(gridPane);
-
-        Platform.runLater(() -> newTopic.requestFocus());
-
-        dialog.setResultConverter(pressedButton -> {
-            if (pressedButton == addTopicButton) {
-                if(!newTopic.getText().isBlank()){
-                    topic.setValue(newTopic.getText().trim());
-                    receive();
-                }
-            }
-            return null;
-        });
 
-        dialog.show();
-    }
-}
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 169667f6..d7bc38ff 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -1,10 +1,14 @@
 package com.example;
 
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+@WireMockTest
 public class HelloModelTest {
 
     @Test
@@ -21,4 +25,18 @@ void sendMessageCallsConnectionWithMessageToSend() {
         assertThat(spy.message).isEqualTo("Hello World");
     }
 
+    @Test
+    void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        var con = new NtfyConnectionImpl("http://localhost:" + wireMockRuntimeInfo.getHttpPort());
+        var model = new HelloModel(con);
+
+        stubFor(post("JUV25D").willReturn(ok()));
+
+        model.sendMessage("Hello World");
+
+        //verify
+        verify(postRequestedFor(urlEqualTo("/JUV25D")).withRequestBody(containing("Hello World")));
+
+    }
+
 }
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 68c7e325..d888eb9d 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -1,11 +1,31 @@
 package com.example;
 
+import javafx.beans.property.SimpleStringProperty;
+
+import java.io.File;
 import java.util.function.Consumer;
 
 public class NtfyConnectionSpy implements NtfyConnection{
 
+    private SimpleStringProperty topic = new SimpleStringProperty();
+
     String message;
 
+    @Override
+    public SimpleStringProperty topicProperty() {
+        return topic;
+    }
+
+    @Override
+    public String getTopic() {
+        return topic.get();
+    }
+
+    @Override
+    public void setTopic(String topic) {
+        this.topic.set(topic);
+    }
+
     @Override
     public boolean send(String message) {
         this.message = message;
@@ -16,4 +36,9 @@ public boolean send(String message) {
     public void recieve(Consumer<NtfyMessage> messageHandler) {
 
     }
+
+    @Override
+    public boolean sendFile(File attachment) {
+        return false;
+    }
 }