HadiSharifi/HW-10-Socket-Programming
1
0
Fork 0
forked from AdvancedProgramming1404/HW-10-Socket-Programming
Code Pull Requests 1 Activity

Develop #1

Open
HadiSharifi wants to merge 7 commits from develop into main
pull from: develop
merge into: :main
Conversation 0 Commits 7 Files Changed 5
+4 -4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb1d441c9b - Show all commits
src/main/java/com/university/chat/Client/chatClient.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.nio.file.Paths;
import java.util.Scanner; import java.util.Scanner;
public class chatClient { public class chatClient {
public static void main() { public static void main(String[] args) {
String host = "localhost"; String host = "localhost";
int port = 9000; int port = 9000;
src/main/java/com/university/chat/Server/ClientSession.java
+2 -2
View File
@@ -91,7 +91,7 @@ public class ClientSession implements Runnable {
} }
case PRIVATE_MESSAGE -> { case PRIVATE_MESSAGE -> {
ClientSession receiver = userManager.getUser(msg.getSender()); ClientSession receiver = userManager.getUser(msg.getReceiver());
if (receiver != null) { if (receiver != null) {
receiver.sendMessage(msg); receiver.sendMessage(msg);
} }
@@ -107,7 +107,7 @@ public class ClientSession implements Runnable {
} }
private void handleFileMessage(FileMessage fileMsg) throws IOException { private void handleFileMessage(FileMessage fileMsg) throws IOException {
// Storing the file
var sentPath = FileManager.getSentPath(fileMsg.getSender(), fileMsg.getFilename()); var sentPath = FileManager.getSentPath(fileMsg.getSender(), fileMsg.getFilename());
var recvPath = FileManager.getReceivedPath(fileMsg.getReceiver(), fileMsg.getFilename()); var recvPath = FileManager.getReceivedPath(fileMsg.getReceiver(), fileMsg.getFilename());