Merge branch 'feature/task_4' into dev. This closes dddpaul#4.

Author: reicru

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

@@ -48,12 +48,6 @@ public void closeOutput()
         output = null;
     }
 
-    @Override
-    public OutputStream getOutput()
-    {
-        return output;
-    }
-
     /**
      * Strip last CR+LF
      */

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

@@ -20,7 +20,6 @@ enum Proto { TCP, UDP }
     public void setInput( InputStream input );
     public void createOutput();
     public void closeOutput();
-    public OutputStream getOutput();
     public String getOutputString();
     public boolean isConnected();
     public boolean isListening();

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

@@ -14,6 +14,8 @@
 
 public class UdpNetCat extends NetCat
 {
+    public static final String DISCONNECT_SEQUENCE = "~.";
+
     private final String CLASS_NAME = getClass().getSimpleName();
 
     private NetCatTask task;
@@ -127,7 +129,11 @@ private void receiveFromChannel() throws Exception
                         bytesReceived = channel.read( buf );
                     }
                     if( bytesReceived > 0 ) {
-                        Log.d( CLASS_NAME, String.format( "%d bytes was received from %s", bytesReceived, remoteSocketAddress ));
+                        Log.d( CLASS_NAME, String.format( "%d bytes was received from %s (UDP)", bytesReceived, remoteSocketAddress ) );
+                        if( DISCONNECT_SEQUENCE.equals( new String( buf.array(), 0, buf.position() ).trim() ) ) {
+                            Log.d( CLASS_NAME, String.format( "Disconnect sequence was received from %s (UDP)", remoteSocketAddress ) );
+                            break;
+                        }
                         output.write( buf.array(), 0, buf.position() );
                         publishProgress( CONNECTED.toString(), output.toString() );
                         buf.clear();

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

@@ -14,6 +14,8 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.github.dddpaul.netcat.Constants;
 import com.github.dddpaul.netcat.R;
@@ -25,6 +27,7 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 import de.greenrobot.event.EventBus;
 import events.FragmentEvent;
@@ -49,6 +52,9 @@ public class MainFragment extends Fragment
     @InjectView( R.id.c_tcp_udp )
     protected CheckBox udpCheckbox;
 
+    @InjectView( R.id.tv_udp_tooltip )
+    protected TextView udpTooltip;
+
     private SharedPreferences prefs;
     private Set<String> connectToSet;
     private ArrayAdapter<String> connectToArrayAdapter;
@@ -111,6 +117,16 @@ protected void onListenButtonClick()
         EventBus.getDefault().post( new FragmentEvent( LISTEN, listenOn ) );
     }
 
+    @OnCheckedChanged( R.id.c_tcp_udp )
+    protected void onUdpChecked( boolean checked )
+    {
+        if( checked ) {
+            udpTooltip.setVisibility( View.VISIBLE );
+        } else {
+            udpTooltip.setVisibility( View.INVISIBLE );
+        }
+    }
+
     @Override
     public void onResume()
     {

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

@@ -127,11 +127,7 @@ public void netCatIsCompleted( Result result )
                 EventBus.getDefault().post( new ActivityEvent( state ) );
                 break;
             case RECEIVE:
-                // Strip last CR+LF
-                String s = netCat.getOutput().toString();
-                if( s.length() > 0 ) {
-                    outputView.setText( s.substring( 0, s.length() - 1 ) );
-                }
+                outputView.setText( netCat.getOutputString() );
                 netCat.closeOutput();
                 if( netCat.isConnected() ) {
                     disconnect();

netcat/src/main/res/layout/fragment_main.xml

@@ -106,4 +106,18 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         />
 
+    <TextView
+        android:id="@+id/tv_udp_tooltip"
+        android:text="@string/label_udp_tooltip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_below="@+id/c_tcp_udp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:visibility="invisible"
+        />
+
 </RelativeLayout>

netcat/src/main/res/layout/fragment_result.xml

@@ -85,6 +85,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"

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

@@ -23,6 +23,7 @@
     <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 TCP (experimental)</string>
+    <string name="label_tcp_udp">Use UDP instead of TCP</string>
+    <string name="label_udp_tooltip">Send \"~.\" from remote side to disconnect</string>
 
 </resources>

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

@@ -123,9 +123,23 @@ public void receive() throws IOException, InterruptedException
         }
 
         // Send string from external nc process
-        process.getOutputStream().write( inputFromProcess.getBytes() );
-        process.getOutputStream().flush();
-        process.getOutputStream().close();
+        new Thread( new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                try {
+                    process.getOutputStream().write( inputFromProcess.getBytes() );
+                    process.getOutputStream().flush();
+                    Thread.sleep( 500 );
+                    process.getOutputStream().write( UdpNetCat.DISCONNECT_SEQUENCE.getBytes() );
+                    process.getOutputStream().flush();
+                    process.getOutputStream().close();
+                } catch( Exception e ) {
+                    e.printStackTrace();
+                }
+            }
+        } ).start();
 
         // Receive string from external nc process
         netCat.createOutput();
@@ -136,6 +150,6 @@ public void receive() throws IOException, InterruptedException
         assertThat( result.op, is( RECEIVE ));
         String line = netCat.getOutputString();
         Log.i( CLASS_NAME, line  );
-        assertThat( line, is( INPUT_NC ));
+        assertThat( line, is( inputFromProcess + UdpNetCat.DISCONNECT_SEQUENCE ));
     }
 }

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

@@ -77,21 +77,6 @@ public void run()
         // Start NetCat listener
         listen( port );
 
-        // Stop receiving after some delay required for NetCat to receive test data
-        new Thread( new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                try {
-                    Thread.sleep( 1000 );
-                    netCat.cancel();
-                } catch( Exception e ) {
-                    e.printStackTrace();
-                }
-            }
-        } ).start();
-
         receive();
         send();
     }