namming conflict solved in android app.

urvesh254 · Jun 7, 2021 · 280b653 · 280b653
1 parent 520903f
commit 280b653
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/Client.java b/Client.java
@@ -34,7 +34,7 @@ public Client() {
 			ObjectOutputStream writer = new ObjectOutputStream(socket.getOutputStream());
 
 			// Sending Information of the client.
-			writer.writeObject(new Message(clientName, Message.USER_INFO, InetAddress.getLocalHost().toString()));
+			writer.writeObject(new Message(clientName, Message.USER_JOIN, InetAddress.getLocalHost().toString()));
 			System.out.println(String.format("\nYou are connected with %s\n", HOST_NAME));
 
 			String message;
@@ -46,7 +46,7 @@ public Client() {
 					writer.writeObject(new Message(clientName, Message.USER_EXIT, ""));
 					break;
 				} else {
-					writer.writeObject(new Message(clientName, Message.MESSAGE, message));
+					writer.writeObject(new Message(clientName, Message.MESSAGE_SEND, message));
 				}
 			}
 			if (readerThread.isAlive()) {
@@ -96,7 +96,7 @@ public void run() {
 			Message message;
 			while (true) {
 				message = (Message) reader.readObject();
-				System.out.println(message.getMessage());
+				System.out.println(message.getAuthor() + " : " + message.getMessage());
 			}
 		} catch (SocketException e) {
 			System.out.println("Server is closed.");

diff --git a/ClientGUI.java b/ClientGUI.java
@@ -99,7 +99,7 @@ private void connectToServer() {
     }
 
     private void sendMessage(String messageText) {
-        Message message = new Message(clientName, Message.MESSAGE, messageText);
+        Message message = new Message(clientName, Message.MESSAGE_SEND, messageText);
         try {
             sender.writeObject(message);
             chatArea.addMessage(message, MessagePanel.USER_SEND);
@@ -119,9 +119,9 @@ private boolean isConnected() {
             sender = new ObjectOutputStream(socket.getOutputStream());
 
             // Sending Information of the client.
-            sender.writeObject(new Message(clientName, Message.USER_INFO, InetAddress.getLocalHost().toString()));
+            sender.writeObject(new Message(clientName, Message.USER_JOIN, InetAddress.getLocalHost().toString()));
             String msg = String.format("\nYou are connected with %s\n", HOST_ADDRESS);
-            chatArea.addMessage(new Message(clientName, Message.USER_INFO, msg), MessagePanel.USER_INFO);
+            chatArea.addMessage(new Message(clientName, Message.USER_JOIN, msg), MessagePanel.USER_INFO);
         } catch (UnknownHostException e) {
             showToast("\nServer is not available on " + HOST_ADDRESS);
             return false;
@@ -187,7 +187,7 @@ public void run() {
             Message message;
             while (true) {
                 message = (Message) reader.readObject();
-                if (message.getMessageType() == Message.MESSAGE)
+                if (message.getMessageType() == Message.MESSAGE_RECEIVE)
                     chatArea.addMessage(message, MessagePanel.USER_RECEIVE);
                 else
                     chatArea.addMessage(message, MessagePanel.USER_INFO);

diff --git a/Server.java b/Server.java
@@ -54,7 +54,7 @@ public void run() {
 					throw new Exception();
 				} else {
 					System.out.println(clientName + " : " + message.getMessage());
-					sendOtherClients(new Message(clientName, Message.MESSAGE, message.getMessage()));
+					sendOtherClients(new Message(clientName, Message.MESSAGE_RECEIVE, message.getMessage()));
 				}
 			}
 

diff --git a/com/ukpatel/chatly/Message.java b/com/ukpatel/chatly/Message.java
@@ -8,9 +8,9 @@ public class Message implements Serializable {
     private static final long serialVersionUID = 1L;
 
     // Type of the messages.
-    public static final int USER_INFO = 1;
-    public static final int USER_JOIN = 2;
-    public static final int MESSAGE = 3;
+    public static final int USER_JOIN = 1;
+    public static final int MESSAGE_SEND = 2;
+    public static final int MESSAGE_RECEIVE = 3;
     public static final int USER_EXIT = 4;
 
     private int messageType;
@@ -43,9 +43,7 @@ public String getTime() {
 
     private String getCurrentTimeStamp() {
         //Displaying current date and time in 12 hour format with AM/PM
-        SimpleDateFormat sdf = new SimpleDateFormat("hh:mm aa");
-        String time = sdf.format(new Date()).toString();
-        return time;
+        return new SimpleDateFormat("hh:mm aa").format(new Date());
     }
 
     @Override