Merge branch 'dev'

Author: reicru

netcat/src/main/java/com/github/dddpaul/netcat/NetCat.java

@@ -222,8 +222,10 @@ protected Result doInBackground( String... params )
                             Log.d( CLASS_NAME, String.format( "Disconnecting from %s", getSocketRemoteString( socket )));
                             if( socket instanceof Socket ) {
                                 ( (Socket) socket).shutdownOutput();
+                                ( (Socket) socket).close();
+                            } else {
+                                ( (DatagramSocket) socket).close();
                             }
-                            socket.close();
                             socket = null;
                             publishProgress( IDLE.toString() );
                         }

netcat/src/main/java/com/github/dddpaul/netcat/ui/MainFragment.java

@@ -16,7 +16,6 @@
 import android.widget.EditText;
 
 import com.github.dddpaul.netcat.Constants;
-import com.github.dddpaul.netcat.NetCater;
 import com.github.dddpaul.netcat.R;
 import com.github.dddpaul.netcat.Utils;
 
@@ -48,7 +47,7 @@ public class MainFragment extends Fragment
     protected Button listenButton;
 
     @InjectView( R.id.c_tcp_udp )
-    protected CheckBox tcpUdpCheckbox;
+    protected CheckBox udpCheckbox;
 
     private SharedPreferences prefs;
     private Set<String> connectToSet;
@@ -99,15 +98,15 @@ protected void onConnectButtonClick()
         editor.putStringSet( Constants.CONNECT_TO_SET_KEY, connectToSet );
         editor.apply();
 
-        Proto proto = tcpUdpCheckbox.isChecked() ? Proto.TCP : Proto.UDP;
+        Proto proto = udpCheckbox.isChecked() ? Proto.UDP : Proto.TCP;
         connectTo = proto + ":" + connectTo;
         EventBus.getDefault().post( new FragmentEvent( CONNECT, connectTo ) );
     }
 
     @OnClick( R.id.b_listen )
     protected void onListenButtonClick()
     {
-        Proto proto = tcpUdpCheckbox.isChecked() ? Proto.TCP : Proto.UDP;
+        Proto proto = udpCheckbox.isChecked() ? Proto.UDP : Proto.TCP;
         String listenOn = proto + ":" + listenOnText.getText().toString();
         EventBus.getDefault().post( new FragmentEvent( LISTEN, listenOn ) );
     }

netcat/src/main/res/values/strings.xml

@@ -23,6 +23,6 @@
     <string name="error_port_format">Digits is expected</string>
     <string name="label_text_to_send">Text to send:</string>
     <string name="label_received_text">Received text:</string>
-    <string name="label_tcp_udp">Use UDP instead of the default TCP</string>
+    <string name="label_tcp_udp">Use UDP instead of TCP (experimental)</string>
 
 </resources>

netcat/src/test/java/com/github/dddpaul/netcat/NetCatTest.java

@@ -5,6 +5,7 @@
 
 import android.util.Log;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -61,6 +62,13 @@ public void setUp() throws Exception
         inputFromProcess = INPUT_NC;
     }
 
+    @After
+    public void tearDown() throws InterruptedException
+    {
+        disconnect();
+        process.destroy();
+    }
+
     @Test
     public void testTCPConnect() throws IOException, InterruptedException
     {
@@ -110,7 +118,6 @@ public void startConnectTest( Proto proto ) throws InterruptedException, IOExcep
 
         send();
         receive();
-        disconnect();
     }
 
     public void startListenTest( Proto proto ) throws InterruptedException, IOException
@@ -151,7 +158,6 @@ public void run()
             receive();
             send();
         }
-        disconnect();
     }
 
     @Override
@@ -243,21 +249,7 @@ public void receive() throws IOException, InterruptedException
         // Send string from external nc process
         process.getOutputStream().write( inputFromProcess.getBytes() );
         process.getOutputStream().flush();
-/*
-        new Thread( new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                try {
-                    Thread.sleep( 500 );
-                } catch( Exception e ) {
-                    e.printStackTrace();
-                }
-                process.destroy();
-            }
-        }).start();
-*/
+        process.getOutputStream().close();
 
         // Receive string from external nc process
         netCat.createOutput();