From 132d0179a3f68da765097482edacacc33f23cb7e Mon Sep 17 00:00:00 2001
From: fpeterfalvi <fpeterfalvi@gmail.com>
Date: Sat, 7 Apr 2018 22:11:01 +0200
Subject: [PATCH] CommunicationThread bugfix
Closing of the LobbyActivity's CommunicationThread with dummy messages sent by GameActivity.
---
.../app/src/main/java/onlab/kvizclient/GameActivity.java | 5 +++--
.../app/src/main/java/onlab/kvizserver/GameActivity.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/KvizClient/app/src/main/java/onlab/kvizclient/GameActivity.java b/KvizClient/app/src/main/java/onlab/kvizclient/GameActivity.java
index f7996b8..831898c 100644
--- a/KvizClient/app/src/main/java/onlab/kvizclient/GameActivity.java
+++ b/KvizClient/app/src/main/java/onlab/kvizclient/GameActivity.java
@@ -43,6 +43,7 @@ public class GameActivity extends AppCompatActivity {
input = new BufferedReader(new InputStreamReader(ServerHolder.getSocket().getInputStream()));
output = new PrintWriter(new BufferedWriter(
new OutputStreamWriter(ServerHolder.getSocket().getOutputStream())),true);
+ output.println("$$$$");
} catch (IOException e) {
e.printStackTrace();
}
@@ -65,10 +66,10 @@ public class GameActivity extends AppCompatActivity {
while (!Thread.currentThread().isInterrupted()) {
try {
String read = input.readLine();
- if (read != null) {
+ if (read != null && !read.equals("$$$$")) {
Log.d("GameActivity", "Szervertől kapott üzenet: " + read);
updateConversationHandler.post(new GameActivity.updateUIThread(read));
- String params[] = read.split("##");
+ //String params[] = read.split("##");
}
} catch (IOException e) {
Thread.currentThread().interrupt();
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
index 080308c..10753a6 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
@@ -89,6 +89,7 @@ public class GameActivity extends AppCompatActivity {
inputs.add(new BufferedReader(new InputStreamReader(ClientHolder.get(i).getClientsocket().getInputStream())));
PrintWriter output = new PrintWriter(new BufferedWriter(
new OutputStreamWriter(ClientHolder.get(i).getClientsocket().getOutputStream())), true);
+ output.println("$$$$");
outputs.add(output);
output.println("GameStarted");
}
@@ -141,7 +142,7 @@ public class GameActivity extends AppCompatActivity {
while (!Thread.currentThread().isInterrupted()) {
try {
String read = input.readLine();
- if (read != null) {
+ if (read != null && !read.equals("$$$$")) {
Log.d("GameActivity", "Klienstől kapott üzenet: " + read);
updateConversationHandler.post(new GameActivity.updateUIThread(index, read));
}
--
GitLab