Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'

[fanfix.git] / src / be / nikiroo / utils / serial / server / ConnectActionClient.java

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClient.java b/src/be/nikiroo/utils/serial/server/ConnectActionClient.java
index f556cf64e43fb81bc5d5447891a4a5dcc708bed1..cb6bef3988c94e8f07d0306a8714ff85f3a9b1d8 100644 (file)
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClient.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClient.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import javax.net.ssl.SSLException;
-
 import be.nikiroo.utils.Version;
 
 /**
@@ -106,7 +104,6 @@ abstract class ConnectActionClient {
                action = new ConnectAction(s, false, key, clientVersion) {
                        @Override
                        protected void action(Version serverVersion) throws Exception {
-                               ConnectActionClient.this.clientHello();
                                ConnectActionClient.this.action(serverVersion);
                        }
 
@@ -124,25 +121,6 @@ abstract class ConnectActionClient {
                };
        }
 
-       /**
-        * Send the HELLO message (send a String "HELLO" to the server, to check I/O
-        * and encryption modes).
-        * <p>
-        * Will automatically handle the answer (the server must answer "HELLO" in
-        * kind).
-        * 
-        * @throws IOException
-        *             in case of I/O error
-        * @throws SSLException
-        *             in case of encryption error
-        */
-       protected void clientHello() throws IOException {
-               String HELLO = action.sendString("HELLO");
-               if (!"HELLO".equals(HELLO)) {
-                       throw new SSLException("Server did not accept the encryption key");
-               }
-       }
-
        /**
         * Actually start the process and call the action (synchronous).
         */