server: versions now negotiated again

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

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
index 8b5ec2af1bb56da102c9c80c5d431bef558f1049..17da668a6db7f5e737f683d270e9396509d35d4f 100644 (file)
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import be.nikiroo.utils.Version;
-
 /**
  * Class used for the client basic handling.
  * <p>
@@ -16,40 +14,16 @@ import be.nikiroo.utils.Version;
  */
 public class ConnectActionClientString extends ConnectActionClient {
        /**
-        * Create a new {@link ConnectActionClientString} with the current
-        * application version (see {@link Version#getCurrentVersion()}) as the
-        * client version.
+        * Create a new {@link ConnectActionClientString}.
         * 
         * @param s
         *            the socket to bind to
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         */
-       public ConnectActionClientString(Socket s) {
-               super(s);
-       }
-
-       /**
-        * Create a new {@link ConnectActionClientString} with the current
-        * application version (see {@link Version#getCurrentVersion()}) as the
-        * client version.
-        * 
-        * @param host
-        *            the host to bind to
-        * @param port
-        *            the port to bind to
-        * @param ssl
-        *            TRUE for an SSL connection, FALSE for plain text
-        * 
-        * @throws IOException
-        *             in case of I/O error
-        * @throws UnknownHostException
-        *             if the IP address of the host could not be determined
-        * @throws IllegalArgumentException
-        *             if the port parameter is outside the specified range of valid
-        *             port values, which is between 0 and 65535, inclusive
-        */
-       public ConnectActionClientString(String host, int port, boolean ssl)
-                       throws IOException {
-               super(host, port, ssl);
+       public ConnectActionClientString(Socket s, String key) {
+               super(s, key);
        }
 
        /**
@@ -59,10 +33,9 @@ public class ConnectActionClientString extends ConnectActionClient {
         *            the host to bind to
         * @param port
         *            the port to bind to
-        * @param ssl
-        *            TRUE for an SSL connection, FALSE for plain text
-        * @param version
-        *            the client version
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         * 
         * @throws IOException
         *             in case of I/O error
@@ -72,21 +45,9 @@ public class ConnectActionClientString extends ConnectActionClient {
         *             if the port parameter is outside the specified range of valid
         *             port values, which is between 0 and 65535, inclusive
         */
-       public ConnectActionClientString(String host, int port, boolean ssl,
-                       Version version) throws IOException {
-               super(host, port, ssl, version);
-       }
-
-       /**
-        * Create a new {@link ConnectActionClientString}.
-        * 
-        * @param s
-        *            the socket to bind to
-        * @param version
-        *            the client version
-        */
-       public ConnectActionClientString(Socket s, Version version) {
-               super(s, version);
+       public ConnectActionClientString(String host, int port, String key)
+                       throws IOException {
+               super(host, port, key);
        }
 
        /**