fix(socket): add optional param charset to connect api

src/android/Connection.java

@@ -75,6 +75,14 @@ public boolean isConnected() {
 		return result;
 	}
 
+	/**
+	 * Get the charset name used in OutputStreamWriter
+	 * @return String return charset name if socket was instantiated with that charset
+	 */
+	public String getCharset() {
+		return this.charset;
+	}
+
 	/**
 	 * Set the charset name for create an OutputStreamWriter that uses that charset
 	 * 

src/android/SocketPlugin.java

@@ -78,6 +78,7 @@ private void connect (JSONArray args, CallbackContext callbackContext) {
 		String key;
 		String host;
 		int port;
+		String charset = null;
 		Connection socket;
 
 		// validating parameters
@@ -93,9 +94,18 @@ private void connect (JSONArray args, CallbackContext callbackContext) {
 				port = args.getInt(1);
 				key = this.buildKey(host, port);
 
+				if (!args.isNull(2)) {
+					charset = args.getString(2);
+				}
+
 				// creating connection
 				if (this.pool.get(key) == null) {
 					socket = new Connection(this, host, port);
+
+					if (charset != null && charset.equals("cp1252")) {
+						socket.setCharset("Windows-1252");
+					}
+
 					socket.start();
 					this.pool.put(key, socket);
 				}
@@ -127,7 +137,6 @@ private void send(JSONArray args, CallbackContext callbackContext) {
 				String key = args.getString(0);
 				String data = args.getString(1);
 				String format = args.getString(2);
-				String charset = args.getString(3);
 
 				// getting socket
 				socket = this.pool.get(key);
@@ -144,15 +153,14 @@ private void send(JSONArray args, CallbackContext callbackContext) {
 
 				} else {
 					if (format.equals("base64")) {
-						String _charset = "UTF-8";
+						String charset = socket.getCharset();
 
-						if (charset.equals("cp1252")) {
-							_charset = "Windows-1252";
-							socket.setCharset(_charset);
+						if (charset == null) {
+							charset = "UTF-8";
 						}
 
 						byte[] decodedData = Base64.decode(data, Base64.DEFAULT);
-						CharBuffer charBuffer = Charset.forName(_charset).decode(ByteBuffer.wrap(decodedData));
+						CharBuffer charBuffer = Charset.forName(charset).decode(ByteBuffer.wrap(decodedData));
 						data = String.valueOf(charBuffer);
 					}
 

www/socket.js

@@ -10,9 +10,9 @@ function Socket(){
 }
 
 //
-Socket.prototype.connect = function (successCallback, errorCallback, host, port) {
+Socket.prototype.connect = function (successCallback, errorCallback, host, port, charset) {
     'use strict';
-    exec(successCallback, errorCallback, this.pluginRef, 'connect', [host, port]);
+    exec(successCallback, errorCallback, this.pluginRef, 'connect', [host, port, charset]);
 };
 
 //