From 346e222906c2cbfd6c05926316443f9faba1ff54 Mon Sep 17 00:00:00 2001 From: Jungwoon Date: Tue, 22 Jan 2019 10:32:06 +0900 Subject: [PATCH] refactor: Kotlin Converting #2 Kotlin Converting #2 --- .../socket/{DataConst.java => DataConst.kt} | 6 ++-- .../toyshark/socket/IProtectSocket.java | 12 ------- .../toyshark/socket/IProtectSocket.kt | 12 +++++++ .../toyshark/socket/IReceivePacket.java | 5 --- .../toyshark/socket/IReceivePacket.kt | 5 +++ .../lipisoft/toyshark/socket/SocketData.java | 33 ++++++++++--------- ...xception.java => PacketHeaderException.kt} | 10 +++--- 7 files changed, 41 insertions(+), 42 deletions(-) rename app/src/main/java/com/lipisoft/toyshark/socket/{DataConst.java => DataConst.kt} (83%) delete mode 100755 app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.java create mode 100755 app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.kt delete mode 100755 app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.java create mode 100755 app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.kt rename app/src/main/java/com/lipisoft/toyshark/transport/tcp/{PacketHeaderException.java => PacketHeaderException.kt} (73%) diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/DataConst.java b/app/src/main/java/com/lipisoft/toyshark/socket/DataConst.kt similarity index 83% rename from app/src/main/java/com/lipisoft/toyshark/socket/DataConst.java rename to app/src/main/java/com/lipisoft/toyshark/socket/DataConst.kt index 7f90cf3..fab3d81 100755 --- a/app/src/main/java/com/lipisoft/toyshark/socket/DataConst.java +++ b/app/src/main/java/com/lipisoft/toyshark/socket/DataConst.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lipisoft.toyshark.socket; +package com.lipisoft.toyshark.socket /** * @author Borey Sao * Date: June 2, 2014 */ -public class DataConst { - public static final int MAX_RECEIVE_BUFFER_SIZE = 65535; +object DataConst { + const val MAX_RECEIVE_BUFFER_SIZE = 65535 } diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.java b/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.java deleted file mode 100755 index 9224b38..0000000 --- a/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.lipisoft.toyshark.socket; - -import java.net.DatagramSocket; -import java.net.Socket; - -public interface IProtectSocket { - void protectSocket(Socket socket); - - void protectSocket(int socket); - - void protectSocket(DatagramSocket socket); -} diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.kt b/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.kt new file mode 100755 index 0000000..d60291c --- /dev/null +++ b/app/src/main/java/com/lipisoft/toyshark/socket/IProtectSocket.kt @@ -0,0 +1,12 @@ +package com.lipisoft.toyshark.socket + +import java.net.DatagramSocket +import java.net.Socket + +interface IProtectSocket { + fun protectSocket(socket: Socket) + + fun protectSocket(socket: Int) + + fun protectSocket(socket: DatagramSocket) +} diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.java b/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.java deleted file mode 100755 index 9479a01..0000000 --- a/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.lipisoft.toyshark.socket; - -public interface IReceivePacket { - void receive(byte[] packet); -} diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.kt b/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.kt new file mode 100755 index 0000000..13c898b --- /dev/null +++ b/app/src/main/java/com/lipisoft/toyshark/socket/IReceivePacket.kt @@ -0,0 +1,5 @@ +package com.lipisoft.toyshark.socket + +interface IReceivePacket { + fun receive(packet: ByteArray) +} diff --git a/app/src/main/java/com/lipisoft/toyshark/socket/SocketData.java b/app/src/main/java/com/lipisoft/toyshark/socket/SocketData.java index d720f40..efa5a3b 100755 --- a/app/src/main/java/com/lipisoft/toyshark/socket/SocketData.java +++ b/app/src/main/java/com/lipisoft/toyshark/socket/SocketData.java @@ -12,35 +12,36 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package com.lipisoft.toyshark.socket; import java.util.LinkedList; import java.util.Queue; /** - * Singleton data structure for storing packet data in queue. Data is pushed into this queue from + * Singleton data structure for storing packet data in queue. Data is pushed into this queue from * VpnService as well as background worker that pull data from remote socket. + * * @author Borey Sao * Date: May 12, 2014 */ public class SocketData { - private static final SocketData instance = new SocketData(); - private Queue data; + private static final SocketData instance = new SocketData(); + private Queue data; - public static SocketData getInstance(){ - return instance; - } + public static SocketData getInstance() { + return instance; + } - private SocketData() { - data = new LinkedList<>(); - } + private SocketData() { + data = new LinkedList<>(); + } - public synchronized void addData(byte[] packet) { - data.add(packet); - } + public synchronized void addData(byte[] packet) { + data.add(packet); + } - public synchronized byte[] getData() { - return data.poll(); - } + public synchronized byte[] getData() { + return data.poll(); + } } diff --git a/app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.java b/app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.kt similarity index 73% rename from app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.java rename to app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.kt index 4f2412c..bbc15a9 100755 --- a/app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.java +++ b/app/src/main/java/com/lipisoft/toyshark/transport/tcp/PacketHeaderException.kt @@ -14,16 +14,14 @@ * limitations under the License. */ -package com.lipisoft.toyshark.transport.tcp; +package com.lipisoft.toyshark.transport.tcp /** * @author Borey Sao * Date: May 7, 2014 */ -public class PacketHeaderException extends Exception { - private static final long serialVersionUID = 1L; - - public PacketHeaderException(String message) { - super(message); +class PacketHeaderException(message: String) : Exception(message) { + companion object { + private const val serialVersionUID = 1L } }