src/main/java/com/university/chat/Client/ServerListener.java

@@ -1,19 +1,39 @@
 package com.university.chat.Client;
 
-public class ServerListener implements Runnable{
-    // TODO: store the ObjectInputStream from the user socket
-    //          (this should be the same input stream the
-    //           chatClient created when connecting)
+import com.university.chat.Common.ChatMessage;
+import com.university.chat.Common.FileMessage;
+
+import java.io.ObjectInputStream;
+
+public class ServerListener implements Runnable {
+
+    private ObjectInputStream in;
+
+    public ServerListener(ObjectInputStream in) {
+        this.in = in;
+    }
 
     @Override
     public void run() {
         try {
-            // TODO: In an infinite loop read objects from the server
-            //   - if it's a ChatMessage  -> print "<sender>: <content>"
-            //   - if it's a FileMessage  -> print that a file was received
-            //                               (filename + sender), it's already
-            //                               saved to disk by the server.
-        } catch (Exception e){
+            while (true) {
+                Object object = in.readObject();
+
+                if (object instanceof ChatMessage msg) {
+                    System.out.println(msg.getSender() + ": " + msg.getContent());
+                }
+
+                if (object instanceof FileMessage fileMsg) {
+                    System.out.println(
+                            "File received: " +
+                                    fileMsg.getFilename() +
+                                    " from " +
+                                    fileMsg.getSender()
+                    );
+                }
+            }
+
+        } catch (Exception e) {
             System.out.println("Disconnected from server");
         }
     }