Change Charset encoding to use method compatible with JRE < 6 and Android < 9

Author: stellaraccident

android/net/rcode/wsclient/AndroidWebSocket.java

@@ -42,7 +42,7 @@ public void run() {
 	 */
 	public AndroidWebSocket(Handler handler, String url, String... requestedProtocols) {
 		super(url, requestedProtocols);
-		handler=new Handler();
+		this.handler=new Handler();
 	}
 
 	@Override

android/net/rcode/wsclient/UtilTest.java

@@ -0,0 +1,16 @@
+package net.rcode.wsclient;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class UtilTest {
+
+	@Test
+	public void testGetUTF8Bytes() {
+		byte[] buffer=Util.getUTF8Bytes("123");
+		assertEquals(3, buffer.length);
+		assertEquals((byte)'1', buffer[0]);
+		assertEquals((byte)'2', buffer[1]);
+		assertEquals((byte)'3', buffer[2]);
+	}
+}

src/net/rcode/wsclient/Message.java

@@ -1,10 +1,8 @@
 package net.rcode.wsclient;
 
-import java.nio.charset.Charset;
 
 public class Message {
 	private static final byte[] EMPTY_BYTES=new byte[0];
-	private static final Charset UTF8=Charset.forName("UTF8");
 
 	// -- message opcodes
 	public static final int OPCODE_CONTINUATION=0;
@@ -26,7 +24,7 @@ public Message(int opcode, byte[] messageData, boolean userMessage) {
 	}
 
 	public Message(String textMessage) {
-		this(OPCODE_TEXT, textMessage.getBytes(UTF8), true);
+		this(OPCODE_TEXT, Util.getUTF8Bytes(textMessage), true);
 	}
 
 	public Message(byte[] binaryMessage) {
@@ -52,8 +50,8 @@ public boolean isText() {
 		return opcode==OPCODE_TEXT;
 	}
 
-	public String getMessageText() {
-		if (isText()) return new String(messageData, UTF8);
+	public CharSequence getMessageText() {
+		if (isText()) return Util.fromUTF8Bytes(messageData);
 		else throw new IllegalStateException("Not text based message");
 	}
 
@@ -67,7 +65,7 @@ public byte[] getMessageData() {
 
 	@Override
 	public String toString() {
-		if (opcode==OPCODE_TEXT) return getMessageText();
+		if (opcode==OPCODE_TEXT) return getMessageText().toString();
 		else if (messageData!=null ){
 			StringBuilder ret=new StringBuilder();
 			for (byte b: messageData) {

src/net/rcode/wsclient/Util.java

@@ -0,0 +1,25 @@
+package net.rcode.wsclient;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+
+public class Util {
+	public static final Charset UTF8=Charset.forName("UTF8");
+
+	public static byte[] getUTF8Bytes(CharSequence s) {
+		// The String.getBytes(Charset) method was not implemented until Java 6/Android 9
+		// For compatibility with older runtimes, implement it here in terms of its
+		// primitives
+		ByteBuffer bb=UTF8.encode(CharBuffer.wrap(s));
+		byte[] ret=new byte[bb.remaining()];
+		bb.get(ret);
+		return ret;
+	}
+	
+	public static CharSequence fromUTF8Bytes(byte[] bytes) {
+		ByteBuffer bb=ByteBuffer.wrap(bytes);
+		CharBuffer charBuffer=UTF8.decode(bb);
+		return charBuffer;
+	}
+}

src/net/rcode/wsclient/WireProtocol.java

@@ -8,7 +8,6 @@
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -24,7 +23,6 @@
  *
  */
 public class WireProtocol {
-	protected static final Charset UTF8=Charset.forName("UTF8");
 	protected static final Random random=new Random();
 	protected static final Pattern VERIFY_STATUSLINE_PATTERN=Pattern.compile("^HTTP\\/[^ ]+ 101 ");
 
@@ -82,7 +80,7 @@ public void performHandshake(WebSocket socket, URI uri, DataInputStream in, Data
 		request.append("\r\n");
 
 		//System.out.println("Sending request \n'" + request + "'");
-		out.write(request.toString().getBytes(UTF8));
+		out.write(Util.getUTF8Bytes(request));
 		//out.flush();	// Give proxys a better chance of dealing with what follows
 		out.write(quad);
 		out.flush();
@@ -220,7 +218,7 @@ protected String readLine(InputStream in) throws IOException {
 		StringBuilder ret=new StringBuilder(256);
 
 		boolean verifyLf=false;
-		CharsetDecoder decoder=UTF8.newDecoder();
+		CharsetDecoder decoder=Util.UTF8.newDecoder();
 		byte[] source=new byte[256];
 		char[] dest=new char[256];
 		ByteBuffer sourceBuffer=ByteBuffer.wrap(source);

src/net/rcode/wsclient/WireProtocolDraft03.java

@@ -33,7 +33,7 @@ public void performHandshake(WebSocket socket, URI uri, DataInputStream in,
 	@Override
 	public void initiateClose(WebSocket socket) {
 		synchronized (socket) {
-			byte[] cookie="clientclose".getBytes(UTF8);
+			byte[] cookie=Util.getUTF8Bytes("clientclose");
 
 			if (socket.getReadyState()==WebSocket.OPEN) {
 				socket.setReadyState(WebSocket.CLOSING);

test/net/rcode/wsclient/TestEchoServerDraft76.java

@@ -26,10 +26,10 @@ public void handleEvent(Event event) {
 				if (event.getType()==WebSocket.EVENT_MESSAGE) {
 					Message msg=event.getMessage();
 					if (msg.isText()) {
-						String text=msg.getMessageText();
+						CharSequence text=msg.getMessageText();
 						System.out.println("Received message: " + text);
 						synchronized (messages) {
-							messages.add(text);
+							messages.add(text.toString());
 							messages.notify();
 						}
 					}