Skip to content

Commit 1690965

Browse files
committed
Print every line of data for TCP connection. This fixes dddpaul#7.
1 parent e061f23 commit 1690965

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

netcat/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
defaultConfig {
2121
minSdkVersion 15
2222
targetSdkVersion 19
23-
versionCode 7
24-
versionName "1.5.1"
23+
versionCode 8
24+
versionName "1.6"
2525
applicationId "com.github.dddpaul.netcat"
2626
}
2727

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,24 +143,27 @@ private void receiveFromSocket() throws IOException
143143
{
144144
BufferedReader reader = new BufferedReader( new InputStreamReader( socket.getInputStream() ) );
145145
PrintWriter writer = new PrintWriter( output );
146-
transferStreams( reader, writer );
146+
transferStreams( reader, writer, true );
147147
}
148148

149149
private void sendToSocket() throws IOException
150150
{
151151
BufferedReader reader = new BufferedReader( new InputStreamReader( input ) );
152152
PrintWriter writer = new PrintWriter( socket.getOutputStream() );
153-
transferStreams( reader, writer );
153+
transferStreams( reader, writer, false );
154154
}
155155

156-
private void transferStreams( BufferedReader reader, PrintWriter writer ) throws IOException
156+
private void transferStreams( BufferedReader reader, PrintWriter writer, boolean receive ) throws IOException
157157
{
158158
try {
159159
String line;
160160
while( ( line = reader.readLine() ) != null ) {
161161
writer.println( line );
162162
writer.flush();
163-
}
163+
if( receive ) {
164+
publishProgress( CONNECTED.toString(), output.toString() );
165+
}
166+
}
164167
} catch( AsynchronousCloseException e ) {
165168
// This exception is thrown when socket for receiver thread is closed by netcat
166169
Log.w( CLASS_NAME, e.toString() );

0 commit comments

Comments
 (0)