Server crash fix

KvizClient/app/src/main/java/onlab/kvizclient/LobbyActivity.java

@@ -156,6 +156,16 @@ public class LobbyActivity extends AppCompatActivity implements ServerConnection
             // When the network service is no longer available.
             // Internal bookkeeping code goes here.
             Log.e(TAG, "service lost" + service);
+            
+            //
+            for (ServerModel server: servers) {
+                if(server.getSocket().getInetAddress() == service.getHost())
+                {
+                    servers.remove(server);
+                    // TODO: 2018. 03. 16. //refresh list
+                }
+                
+            }
         }
 
         @Override
@@ -207,8 +217,6 @@ public class LobbyActivity extends AppCompatActivity implements ServerConnection
             hostAddress = serviceInfo.getHost();
 
 
-
-
             runOnUiThread(new Runnable() {
                 public void run() {
                     //txtip.setText(hostAddress.getHostAddress());

KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java

@@ -149,11 +149,12 @@ public class LobbyActivity extends AppCompatActivity {
 
         @Override
         public void onServiceUnregistered(NsdServiceInfo serviceInfo) {
-            // Service has been unregistered. This only happens when you
-            // call
-            // NsdManager.unregisterService() and pass in this listener.
             Log.d("TAG",
                     "Service Unregistered : " + serviceInfo.getServiceName());
+
+
+
+
         }
 
         @Override
@@ -212,13 +213,22 @@ public class LobbyActivity extends AppCompatActivity {
         public void run() {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
+                    if(clientSocket.isConnected()) {
+
                         String read = input.readLine();
                         PrintWriter out = new PrintWriter(new BufferedWriter(
                                 new OutputStreamWriter(clientSocket.getOutputStream())), true);
-                    String params[] = read.split("##");
 
-                    switch (params[0])
+                        String params[] = {"Unknown"};
+                        if (read != null) {
+                            params = read.split("##");
+                        }
+                        else
                         {
+                            params[0] = "Disconnect";
+                        }
+
+                        switch (params[0]) {
                             case "Hostname":
                                 out.println("Hostname##" + HOSTNAME);
                                 break;
@@ -254,6 +264,7 @@ public class LobbyActivity extends AppCompatActivity {
                                 }
                                 out.println("Disconnect##Ok!");
                                 // TODO: 2018. 03. 11. refresh lobby
+
                                 break;
 
                             default:
@@ -261,6 +272,16 @@ public class LobbyActivity extends AppCompatActivity {
 
                                 break;
                         }
+                    }
+                    else
+                    {
+                        for (ClientModel client : clients) {
+                            if (client.getClientsocket() == clientSocket) {
+                                clients.remove(client);
+                                break;
+                            }
+                        }
+                    }
 
 
                 } catch (IOException e) {