fixed somewhat back problem

Author: sowmen

.gitignore

@@ -1,13 +1,93 @@
+
+# Created by https://www.gitignore.io/api/android
+# Edit at https://www.gitignore.io/?templates=android
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
 *.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
+
+# End of https://www.gitignore.io/api/android

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

@@ -23,6 +23,7 @@ public class ChatActivity extends AppCompatActivity {
  User user;
  ArrayList<String> received_message = new ArrayList<>();
  SendMessage sender;
+ MessageReceiveServer messageReceiveServer;
 
  @Override
  protected void onCreate(Bundle savedInstanceState) {
@@ -38,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
  messageDisplay.setText("Connected to: " + user.getIpAddress() + ":" + user.getPort() + "\n");
  messageDisplay.append("Self: " + ShowInfoActivity.getSelfIpAddress() + ":" + ShowInfoActivity.getSelfPort());
 
- new MessageReceiveServer(ShowInfoActivity.getSelfIpAddress(),ShowInfoActivity.getSelfPort(),this);
+ messageReceiveServer = new MessageReceiveServer(ShowInfoActivity.getSelfIpAddress(),ShowInfoActivity.getSelfPort(),this);
  }
 
  public void OnMsgSendBtnClick(View view){
@@ -61,4 +62,11 @@ public void run() {
  }
  });
  }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ sender.cancel(true);
+ messageReceiveServer.onDestroy();
+ }
 }

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

@@ -15,6 +15,7 @@ public class ConnectToUserActivity extends AppCompatActivity {
  Button connectBtn;
  Client myClient;
  User user;
+ boolean paused = false;
 
  public void setUser(User user) {
  this.user = user;
@@ -34,6 +35,21 @@ protected void onCreate(Bundle savedInstanceState) {
  connectBtn = findViewById(R.id.connectBtn);
  }
 
+ @Override
+ protected void onResume() {
+ super.onResume();
+ if(paused) {
+ myClient.cancel(true);
+ recreate();
+ }
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ paused = true;
+ }
+
  public void connectBtnListener(View view){
  myClient = new Client(ipInput.getText().toString(),Integer.parseInt(portInput.getText().toString()),this);
  myClient.execute();

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

@@ -13,6 +13,7 @@ public class MessageReceiveServer{
  int port;
  ChatActivity activity;
  ServerSocket serverSocket;
+ boolean stop = false;
  int cnt = 0;
 
  MessageReceiveServer(String ip_address, int port, ChatActivity activity){
@@ -29,7 +30,7 @@ private class MessageSocketServerThread extends Thread {
  public void run() {
  try {
  serverSocket = new ServerSocket(port);
- while (true) {
+ while (stop == false) {
  cnt++;
  Log.e("Abar",""+cnt);
 
@@ -55,5 +56,15 @@ public void run() {
  }
  }
  }
+ public void onDestroy(){
+ if(serverSocket != null){
+ try {
+ serverSocket.close();
+ stop = true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
 
 }

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

@@ -41,7 +41,6 @@ protected String doInBackground(Void... arg0) {
  Log.e("SendMSG","ConnectHoyNai"+message);
  e.printStackTrace();
  }
-// Thread.interrupted();
  return "";
  }
 

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

@@ -16,6 +16,7 @@ public class Server {
  String self_ip_address;
  int self_port;
  public User user;
+ boolean stop = false;
 
  public Server(ShowInfoActivity activity, String self_ip_address, int self_port) {
  this.activity = activity;
@@ -33,7 +34,7 @@ public void run() {
  // create ServerSocket using specified port
  serverSocket = new ServerSocket(self_port);
 
- while (true) {
+ while (stop == false) {
  // block the call until connection is created and return
  // Socket object
  Log.e("Server","InsideServer");
@@ -67,20 +68,26 @@ public void run() {
  activity.setConnected(true);
  }
  });
+ stop = true;
  break;
  }
  } catch (IOException e) {
  // TODO Auto-generated catch block
  e.printStackTrace();
  }
- if (serverSocket != null) {
- try {
- Log.e("Server","Close Server");
- serverSocket.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ onDestroy();
+ }
+ }
+
+ void onDestroy(){
+ if (serverSocket != null) {
+ try {
+ Log.e("Server","Close Server");
+ serverSocket.close();
+ stop = true;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
  }
  }
  }

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

@@ -17,6 +17,7 @@ public class ShowInfoActivity extends AppCompatActivity {
 
  static final int selfPort = 8080;
  Server myServer;
+ boolean paused = false;
 
  public void setConnected(boolean connected) {
  this.connected = connected;
@@ -44,6 +45,21 @@ protected void onCreate(Bundle savedInstanceState) {
  Log.e("ShowActivity","CreatedServer");
  }
 
+ @Override
+ protected void onResume() {
+ super.onResume();
+ if(paused) {
+ myServer.onDestroy();
+ recreate();
+ }
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ paused = true;
+ }
+
  public static int getSelfPort() {
  return selfPort;
  }