Fixed the Umlauts problem

Author: Barofioso

.gitignore

@@ -12,3 +12,4 @@
 
 # Eclise Files
 .settings
+/.apt_generated

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 = ts3.getIn().readLine();
+					final String line = StringUtil.convertFromUTF8(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

@@ -44,15 +44,14 @@ public SocketWriter(TS3Query ts3, int floodRate) {
 		}
 	}
 
-	@Override
 	public void run() {
 		while (ts3.getSocket() != null && ts3.getSocket().isConnected()
 				&& ts3.getOut() != null && !stop) {
 			final Command c = ts3.getCommandList().peek();
 			if (c != null && !c.isSent()) {
 				final String msg = c.toString();
-				TS3Query.log.info("> " + msg);
-				ts3.getOut().println(msg);
+				TS3Query.log.info("> " + StringUtil.convertToUTF8(msg));
+				ts3.getOut().println(StringUtil.convertToUTF8(msg));
 				lastCommand = System.currentTimeMillis();
 				c.setSent();
 			}

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

@@ -102,5 +102,12 @@ 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/TS3Api.java

@@ -1173,7 +1173,13 @@ public boolean selectVirtualServerByPort(int port) {
 	public boolean selectVirtualServer(VirtualServer server) {
 		return selectVirtualServerById(server.getId());
 	}
-
+	/**
+	 * Sends an offline message to a Client
+	 * @param clientUId The Unique string
+	 * @param subject header
+	 * @param message your message to send
+	 * @return true if the message was send
+	 */
 	public boolean sendOfflineMessage(String clientUId, String subject,
 			String message) {
 		final CMessageAdd add = new CMessageAdd(clientUId, subject, message);
@@ -1182,7 +1188,13 @@ public boolean sendOfflineMessage(String clientUId, String subject,
 		}
 		return false;
 	}
-
+	/**
+	 * Sends a TextMessage
+	 * @param targetMode The targetmode (Server, channel or private)
+	 * @param targetId The recipient of this message
+	 * @param message Yout text message to send
+	 * @return true if the message was send
+	 */
 	public boolean sendTextMessage(TextMessageTargetMode targetMode,
 			int targetId, String message) {
 		final CSendTextMessage msg = new CSendTextMessage(
@@ -1192,7 +1204,12 @@ public boolean sendTextMessage(TextMessageTargetMode targetMode,
 		}
 		return false;
 	}
-
+	/**
+	 * Sends a ChannelMessage
+	 * @param channelId The channelID which receive your message
+	 * @param message Your message which you would send
+	 * @return true if the message was succesfully send
+	 */
 	public boolean sendChannelMessage(int channelId, String message) {
 		return sendTextMessage(TextMessageTargetMode.CHANNEL, channelId,
 				message);

src/main/java/com/github/theholywaffle/teamspeak3/api/event/ChannelPasswordChangedEvent.java

@@ -1,4 +1,31 @@
-package com.github.theholywaffle.teamspeak3.api.event;
+package com.github.theholywaffle.teamspeak3.api.event;
+
+/*
+ * #%L
+ * TeamSpeak 3 Java API
+ * %%
+ * Copyright (C) 2014 Bert De Geyter
+ * %%
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * #L%
+ */
+
 
 import java.util.HashMap;
 

src/main/java/com/github/theholywaffle/teamspeak3/commands/Command.java

@@ -105,8 +105,7 @@ public void setAnswered() {
 	public void setSent() {
 		sent = true;
 	}
-
-	@Override
+	
 	public String toString() {
 		String str = command;
 		for (final Parameter p : params) {

src/main/java/com/github/theholywaffle/teamspeak3/commands/response/DefaultArrayResponse.java

@@ -67,7 +67,6 @@ public List<HashMap<String, String>> getArray() {
 		return array;
 	}
 
-	@Override
 	public String toString() {
 		String str = "";
 		for (final HashMap<String, String> opt : array) {

src/main/java/com/github/theholywaffle/teamspeak3/example/ChatBotExample.java

@@ -36,6 +36,8 @@
  * #L%
  */
 
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.logging.Level;
 
 import com.github.theholywaffle.teamspeak3.TS3Api;
@@ -63,9 +65,9 @@ public static void main(String[] args) {
 
 	public ChatBotExample() {
 		final TS3Config config = new TS3Config();
-		config.setHost("77.77.77.77");
+		config.setHost("188.40.60.18");
 		config.setDebugLevel(Level.ALL);
-		config.setLoginCredentials("serveradmin", "serveradminpassword");
+		config.setLoginCredentials("chronicbot", "phdaHBBD");
 
 		final TS3Query query = new TS3Query(config);
 		query.connect();
@@ -86,6 +88,21 @@ public void onTextMessage(TextMessageEvent e) {
 					if(e.getMessage().toLowerCase().contains("hello")){
 						api.sendChannelMessage("Hello "+e.getInvokerName());
 					}
+					if(e.getMessage().toLowerCase().contains("!test")){
+						char a = 'ä';
+						char o = 'ö';
+						char u = 'ü';
+						api.sendChannelMessage("Umlaute: \u00e4 \u00f6 \u00fc \u00c4 \u00d6 \u00dc \u00df");
+						api.sendChannelMessage("Umlaute: ä ö ü Ä Ö Ü");
+						api.sendChannelMessage("Umlaute: " + a + " " + o + " " + u);
+						api.sendChannelMessage(new String("Umlaute: ä ö ü Ä Ö Ü".getBytes(), Charset.forName("UTF8")));
+						byte[] m = "Umlaute: ä ö ü Ä Ö Ü".getBytes(Charset.forName("UTF8"));
+						api.sendChannelMessage(m.toString());
+						//Hallo\s& #228;\s& #246;\s& #252;\s& #223;
+						api.sendChannelMessage("Umlaute: ä ö ü &#223");
+						api.sendChannelMessage(Charset.forName("UTF8").decode(ByteBuffer.wrap(m)).toString());
+						api.sendChannelMessage("äöüÄÖÜ");
+					}
 				}
 			}