diff --git a/src/io/github/norbipeti/chat/server/io/IOHelper.java b/src/io/github/norbipeti/chat/server/io/IOHelper.java index bab5635..f825aa6 100644 --- a/src/io/github/norbipeti/chat/server/io/IOHelper.java +++ b/src/io/github/norbipeti/chat/server/io/IOHelper.java @@ -31,9 +31,9 @@ import io.github.norbipeti.chat.server.page.Page; public class IOHelper { public static void SendResponse(int code, String content, HttpExchange exchange) throws IOException { - exchange.sendResponseHeaders(code, content.length()); try (BufferedOutputStream out = new BufferedOutputStream(exchange.getResponseBody())) { - try (ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes())) { + try (ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8))) { + exchange.sendResponseHeaders(code, bis.available()); byte[] buffer = new byte[512]; int count; while ((count = bis.read(buffer)) != -1) { @@ -62,8 +62,7 @@ public class IOHelper { } public static String ReadFile(File file) throws FileNotFoundException, IOException { - String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8); - LogManager.getLogger().debug(content); // TODO: FIx UTF-8 file reading + String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8); // TODO: FIx UTF-8 file reading return content; } @@ -71,7 +70,7 @@ public class IOHelper { try { if (exchange.getRequestBody().available() == 0) return ""; - String content = IOUtils.toString(exchange.getRequestBody(), StandardCharsets.ISO_8859_1); + String content = IOUtils.toString(exchange.getRequestBody(), StandardCharsets.UTF_8); return content; } catch (Exception e) { e.printStackTrace(); diff --git a/src/io/github/norbipeti/chat/server/page/IndexPage.java b/src/io/github/norbipeti/chat/server/page/IndexPage.java index e1f509e..6c73724 100644 --- a/src/io/github/norbipeti/chat/server/page/IndexPage.java +++ b/src/io/github/norbipeti/chat/server/page/IndexPage.java @@ -24,9 +24,6 @@ public class IndexPage extends Page { @Override public void handlePage(HttpExchange exchange) throws IOException { final User user = IOHelper.GetLoggedInUser(exchange); - /* - * final User user = new User(); user.setEmail("test@test.com"); user.setName("Norbi"); user.setId(3L); - */ LogManager.getLogger().debug("Logged in user: " + user); if (user == null) IOHelper.SendModifiedPage(200, this, (doc) -> { diff --git a/src/io/github/norbipeti/chat/server/page/SendMessageAjaxPage.java b/src/io/github/norbipeti/chat/server/page/SendMessageAjaxPage.java index 57c5ce8..1302a2d 100644 --- a/src/io/github/norbipeti/chat/server/page/SendMessageAjaxPage.java +++ b/src/io/github/norbipeti/chat/server/page/SendMessageAjaxPage.java @@ -32,9 +32,7 @@ public class SendMessageAjaxPage extends Page { } JsonObject obj = IOHelper.GetPOSTJSON(exchange); if (obj == null) { - IOHelper.SendResponse(400, - "

400 Bad request

Not a JSON string!

" + IOHelper.GetPOST(exchange) + "

", - exchange); + IOHelper.SendResponse(400, "JSONERROR: " + IOHelper.GetPOST(exchange), exchange); // IOHelper.SendResponse(400, "JSONERROR", exchange); return; } @@ -70,6 +68,7 @@ public class SendMessageAjaxPage extends Page { chunk.setConversation(conv); Message msg = new Message(); msg.setSender(user); + LogManager.getLogger().debug(message); msg.setMessage(message); msg.setTime(new Date()); msg.setMessageChunk(chunk); // TODO: Store relations at one side or both