Merge pull request #284 from pusher/dev-fix-set-ssl-parameters-2

Fix websocket issue with pre android sdk 24 devices

Author: daniellevass

src/main/java/com/pusher/client/channel/impl/PrivateEncryptedChannelImpl.java

@@ -185,7 +185,7 @@ private PusherEvent decryptMessage(String message) {
                 encryptedReceivedData.getCiphertext(),
                 encryptedReceivedData.getNonce());
 
-        receivedMessage.replace("data", decryptedData);
+        receivedMessage.put("data", decryptedData);
 
         return new PusherEvent(receivedMessage);
     }

src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java

@@ -8,6 +8,7 @@
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.java_websocket.client.WebSocketClient;
@@ -89,4 +90,14 @@ public void onError(final Exception ex) {
     public void removeWebSocketListener() {
         webSocketListener = null;
     }
+
+    @Override
+    protected void onSetSSLParameters(SSLParameters sslParameters) {
+        // https://github.com/TooTallNate/Java-WebSocket/wiki/No-such-method-error-setEndpointIdentificationAlgorithm
+        try {
+            super.onSetSSLParameters(sslParameters);
+        } catch (NoSuchMethodError error) {
+            // if this is being called on an android device pre-24 this api isn't available
+        }
+    }
 }