Develop #1

Merged
MehrdadShirvani merged 2 commits from develop into main 2026-07-10 17:51:17 +00:00
2 changed files with 2 additions and 4 deletions
Showing only changes of commit 559f91fbf0 - Show all commits
@@ -29,10 +29,8 @@ public class ServerListener implements Runnable{
} else { } else {
System.out.println(chat.getSender() + ": " + chat.getContent()); System.out.println(chat.getSender() + ": " + chat.getContent());
} }
System.out.print("> ");
}else if(msg instanceof FileMessage file){ }else if(msg instanceof FileMessage file){
System.out.println("File received: " + file.getFilename() + " from" + file.getSender()); System.out.println("File received: " + file.getFilename() + " from " + file.getSender());
System.out.print("> ");
} }
} }
} catch (Exception e){ } catch (Exception e){
@@ -30,7 +30,7 @@ public class chatClient {
listenerThread.setDaemon(true); listenerThread.setDaemon(true);
listenerThread.start(); listenerThread.start();
out.writeObject(new ChatMessage(MessageType.LOGIN, username, null, "Login request")); out.writeObject(new ChatMessage(MessageType.LOGIN, username, null, username));
out.flush(); out.flush();
Thread.sleep(300); Thread.sleep(300);