Fixed umlauts problem - Changed PrintWriter to PrintStream

Author: Barofioso

src/main/java/com/github/theholywaffle/teamspeak3/SocketReader.java

@@ -55,7 +55,7 @@ public void run() {
 				&& ts3.getIn() != null && !stop) {
 			try {
 				if (ts3.getIn().ready()) {
-					final String line = StringUtil.convertFromUTF8(ts3.getIn().readLine());
+					final String line = ts3.getIn().readLine();
 					if (!line.isEmpty()) {
 						final Command c = ts3.getCommandList().peek();
 						if (line.startsWith("notify")) {

src/main/java/com/github/theholywaffle/teamspeak3/SocketWriter.java

@@ -50,8 +50,8 @@ public void run() {
 			final Command c = ts3.getCommandList().peek();
 			if (c != null && !c.isSent()) {
 				final String msg = c.toString();
-				TS3Query.log.info("> " + StringUtil.convertToUTF8(msg));
-				ts3.getOut().println(StringUtil.convertToUTF8(msg));
+				TS3Query.log.info("> " + msg);
+				ts3.getOut().println(msg);
 				lastCommand = System.currentTimeMillis();
 				c.setSent();
 			}

src/main/java/com/github/theholywaffle/teamspeak3/StringUtil.java

@@ -102,12 +102,5 @@ public static int getInt(String str) {
 		}
 		return Integer.parseInt(str);
 	}
-	
-	public static String convertToUTF8(String str){
-		return str.replace("ä", "ä").replace("ö", "ö").replace("ü", "ü").replace("Ä", "Ä").replace("Ö", "Ö").replace("Ü", "Ãœ").trim();
-	}
-	public static String convertFromUTF8(String str){
-		return str.replace("ä", "ä").replace("ö", "ö").replace("ü", "ü").replace("Ä", "Ä").replace("Ö", "Ö").replace("Ãœ", "Ü").trim();
-	}
 
 }

src/main/java/com/github/theholywaffle/teamspeak3/TS3Query.java

@@ -29,7 +29,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import java.io.PrintStream;
 import java.net.Socket;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Handler;
@@ -44,7 +44,7 @@
 public class TS3Query {
 
 	private Socket socket;
-	private PrintWriter out;
+	private PrintStream out;
 	private BufferedReader in;
 	private SocketReader socketReader;
 	private SocketWriter socketWriter;
@@ -85,9 +85,9 @@ public TS3Query connect() {
 		try {
 			socket = new Socket(config.getHost(), config.getQueryPort());
 			if (socket.isConnected()) {
-				out = new PrintWriter(socket.getOutputStream(), true);
+				out = new PrintStream(socket.getOutputStream(), true, "UTF-8");
 				in = new BufferedReader(new InputStreamReader(
-						socket.getInputStream()));
+						socket.getInputStream(), "UTF-8"));
 				socketReader = new SocketReader(this);
 				socketReader.start();
 				socketWriter = new SocketWriter(this, config.getFloodRate()
@@ -113,7 +113,7 @@ public Socket getSocket() {
 		return socket;
 	}
 
-	public PrintWriter getOut() {
+	public PrintStream getOut() {
 		return out;
 	}