Added username support

Author: sowmen

app/build.gradle

@@ -56,4 +56,6 @@ dependencies {
  implementation 'com.github.kenglxn.QRGen:android:2.6.0'
 
  implementation 'com.github.QuadFlask:colorpicker:0.0.13'
+
+ implementation 'com.google.code.gson:gson:2.8.6'
 }

app/src/main/java/com/example/chatfull/ChatActivity.java

@@ -43,6 +43,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Calendar;
 
 public class ChatActivity extends AppCompatActivity
@@ -59,25 +60,25 @@ public class ChatActivity extends AppCompatActivity
 
  MessagesList messagesList;
  protected final String senderId = "1";
- private final User me = new User("1", "SELF"); // Assign Self Username
+
  MessagesListAdapter<Message> adapter;
  int cnt = 0;
 
  Button btnSend;
- ImageButton btnAttachement, btnImage;
+ ImageButton btnAttachment, btnImage;
  EditText input;
 
  RelativeLayout back_view;
  int[] colors;
 
+ ArrayList<Message> messageArrayList;
+
  @Override
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_chat_alternate);
 
  user = (User) getIntent().getSerializableExtra("user");
- user.setId("0");
- user.setName("ABAL"); // Assign user username
 
  messageReceiveServer = new MessageReceiveServer(ShowInfoActivity.getSelfIpAddress(), ShowInfoActivity.getSelfPort(), this);
 
@@ -116,11 +117,12 @@ public void loadImage(ImageView imageView, @Nullable String url, @Nullable Objec
 
  input = findViewById(R.id.et_message);
  btnSend = findViewById(R.id.bt_send);
- btnAttachement = findViewById(R.id.bt_attachment);
+ btnAttachment = findViewById(R.id.bt_attachment);
  btnImage = findViewById(R.id.bt_image);
 
  //Initialize color picker
  back_view = findViewById(R.id.background_view);
+
  TypedArray ta = getApplicationContext().getResources().obtainTypedArray(R.array.colors);
  colors = new int[ta.length()];
  for (int i = 0; i < ta.length(); i++) {
@@ -165,13 +167,13 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
  .setOnColorSelectedListener(new OnColorSelectedListener() {
  @Override
  public void onColorSelected(int selectedColor) {
- Toast.makeText(getApplicationContext(),"onColorSelected: 0x" + Integer.toHexString(selectedColor),Toast.LENGTH_SHORT).show();
+ Toast.makeText(getApplicationContext(), "onColorSelected: 0x" + Integer.toHexString(selectedColor), Toast.LENGTH_SHORT).show();
  }
  })
  .setPositiveButton("ok", new ColorPickerClickListener() {
  @Override
  public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
- Message message = new Message(Integer.toString(++cnt), me, null, Calendar.getInstance().getTime());
+ Message message = new Message(Integer.toString(++cnt), MainActivity.me, null, Calendar.getInstance().getTime());
  message.setColor(selectedColor);
  message.setIsColor(true);
 
@@ -195,7 +197,7 @@ public void onClick(DialogInterface dialog, int which) {
  public void onBtnSendClick(View view) {
  if (input.getText().toString() == null) return;
 
- Message message = new Message(Integer.toString(++cnt), me, input.getText().toString(), Calendar.getInstance().getTime());
+ Message message = new Message(Integer.toString(++cnt), MainActivity.me, input.getText().toString(), Calendar.getInstance().getTime());
  message.setIsImage(false);
  message.setFilename(null);
  adapter.addToStart(message, true);
@@ -228,7 +230,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
  if (requestCode == PICK_FILE_REQUEST && data != null) {
  if (resultCode == RESULT_OK) {
  Uri file = data.getData();
- Message message = new Message(Integer.toString(++cnt), me, null, Calendar.getInstance().getTime());
+ Message message = new Message(Integer.toString(++cnt), MainActivity.me, null, Calendar.getInstance().getTime());
  message.setFilename(getFileName(file));
  try {
  message.setFile(getBytes(this, file));
@@ -246,7 +248,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
  } else if (requestCode == PICK_IMAGE_REQUEST && data != null) {
  if (resultCode == RESULT_OK) {
  Uri file = data.getData();
- Message message = new Message(Integer.toString(++cnt), me, null, Calendar.getInstance().getTime());
+ Message message = new Message(Integer.toString(++cnt), MainActivity.me, null, Calendar.getInstance().getTime());
  message.setFilename(getFileName(file));
  try {
  message.setFile(getBytes(this, file));
@@ -382,7 +384,7 @@ protected void onDestroy() {
  @Override
  public void onBackPressed() {
  Log.e("CHAT_ACTIVITY", "PAUSE");
- Message message = new Message(Integer.toString(++cnt), me, null);
+ Message message = new Message(Integer.toString(++cnt), MainActivity.me, null);
  message.setOffline(true);
  sender = new SendMessage(user.getIpAddress(), user.getPort(), message, this);
  sender.execute();

app/src/main/java/com/example/chatfull/Client.java

@@ -33,22 +33,26 @@ protected String doInBackground(Void... arg0) {
  if (clientSocket != null) {
 
  PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true);
- out.println(ShowInfoActivity.getSelfIpAddress() + ":" + ShowInfoActivity.getSelfPort());
+ out.println(ShowInfoActivity.getSelfIpAddress() + ":" + ShowInfoActivity.getSelfPort() + "_" + MainActivity.me.getName());
 
  Log.e("CLIENT", "After Connection");
  user = new User(dstAddress, dstPort);
- activity.setUser(user);
+
  //MainActivity.userArrayList.add(user);
  }
 
  try {
  BufferedReader input = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
  serverResponse = input.readLine();
+
+ String connected_name = serverResponse.substring(serverResponse.indexOf('_')+1);
+ user.setName(connected_name);
+ user.setId(serverResponse);
  } catch (IOException e) {
  e.printStackTrace();
  Log.e("CLIENT", "Could not read socket");
  }
-
+ activity.setUser(user);
  } catch (Exception e) {
  e.printStackTrace();
  serverResponse = e.getCause().toString();

app/src/main/java/com/example/chatfull/MainActivity.java

@@ -1,27 +1,32 @@
 package com.example.chatfull;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
  Button showInfoBtn, enterInfoBtn;
-
+ EditText nameInput;
+ static User me; // Assign Self Username
  @Override
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_main);
 
  showInfoBtn = findViewById(R.id.showInfo);
  enterInfoBtn = findViewById(R.id.enterInfo);
+ nameInput = findViewById(R.id.nameInput);
+
 
  showInfoBtn.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
+ me = new User("1", nameInput.getText().toString());
  Intent intent = new Intent(getApplicationContext(), ShowInfoActivity.class);
  startActivity(intent);
  }
@@ -30,6 +35,7 @@ public void onClick(View view) {
  enterInfoBtn.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
+ me = new User("1", nameInput.getText().toString());
  Intent intent = new Intent(getApplicationContext(), ConnectToUserActivity.class);
  startActivity(intent);
  }

app/src/main/java/com/example/chatfull/Message.java

@@ -39,7 +39,6 @@ public Message(String id, User user, String text, Date createdAt) {
  public boolean isOffline() {
  return offline;
  }
-
  public void setOffline(boolean offline) {
  this.offline = offline;
  }
@@ -50,7 +49,6 @@ public void setOffline(boolean offline) {
  public boolean isFile() {
  return isFile;
  }
-
  public void setIsFile(boolean file) {
  isFile = file;
  }

app/src/main/java/com/example/chatfull/Server.java

@@ -48,14 +48,17 @@ public void run() {
  continue;
 
  String client_ip = client_cred.substring(0, client_cred.indexOf(':'));
- String client_port = client_cred.substring(client_cred.indexOf(':') + 1);
+ String client_port = client_cred.substring(client_cred.indexOf(':') + 1, client_cred.indexOf('_'));
+ String client_name = client_cred.substring(client_cred.indexOf('_')+1);
 
  user = new User(client_ip, Integer.parseInt(client_port));
+ user.setName(client_name);
+ user.setId(client_cred);
  //MainActivity.userArrayList.add(user);
 
- //---Testing Connection with response. Optional---
+ //---Sending self name---
  try {
- String response_message = self_ip_address + ":" + self_port;
+ String response_message = self_ip_address + ":" + self_port + "_" + MainActivity.me.getName();
  PrintWriter out = new PrintWriter(received_userSocket.getOutputStream(), true);
  out.println(response_message);
 

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
@@ -8,26 +8,62 @@
  android:gravity="center"
  android:orientation="vertical">
 
-
  <LinearLayout
+ android:id="@+id/linearLayout"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center">
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
+ app:layout_constraintBottom_toTopOf="@+id/showInfo"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.613">
 
- <Button
- android:id="@+id/showInfo"
+ <TextView
+ android:id="@+id/textView"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:text="Show information"/>
+ android:text="Name : "
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:layout_marginLeft="30dp"/>
 
- <Button
- android:id="@+id/enterInfo"
- android:layout_width="wrap_content"
+ <EditText
+ android:id="@+id/nameInput"
+ android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:text="Enter Ip : port"/>
-
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
+ android:paddingLeft="10dp" />
  </LinearLayout>
 
+ <Button
+ android:id="@+id/showInfo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
+ android:text="Show information"
+ app:layout_constraintBottom_toTopOf="@+id/enterInfo"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+ <Button
+ android:id="@+id/enterInfo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="332dp"
+ android:text="Enter Ip : port"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>