From 1a513e8b0269090b1240666a2e28d1f5df107e65 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 28 Nov 2016 07:40:09 -0800 Subject: [PATCH] add a bit of logging --- .../src/org/eehouse/android/xw4/BiDiSockWrap.java | 6 ++++-- .../src/org/eehouse/android/xw4/WiDirService.java | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BiDiSockWrap.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BiDiSockWrap.java index feb7c2717..56aafd774 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BiDiSockWrap.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BiDiSockWrap.java @@ -97,7 +97,7 @@ public class BiDiSockWrap { public boolean isConnected() { return null != getSocket(); } - public void send( String packet ) + private void send( String packet ) { try { send( packet.getBytes( "UTF-8" ) ); @@ -114,7 +114,8 @@ public class BiDiSockWrap { public void send( byte[] packet ) { Assert.assertNotNull( packet ); - mQueue.add(packet); + Assert.assertTrue( packet.length > 0 ); + mQueue.add( packet ); } private void init( Socket socket ) @@ -126,6 +127,7 @@ public class BiDiSockWrap { private void closeSocket() { + DbgUtils.logd( TAG, "closeSocket()" ); mRunThreads = false; mActive = false; try { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java index 9714fdc6a..f25cbbf16 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java @@ -179,6 +179,7 @@ public class WiDirService extends XWService { public static void init( Context context ) { + DbgUtils.logd( TAG, "init()" ); ChannelListener listener = new ChannelListener() { @Override public void onChannelDisconnected() { @@ -344,9 +345,11 @@ public class WiDirService extends XWService { processPacket( socket, bytes ); } - public void connectStateChanged( BiDiSockWrap wrap, boolean nowConnected ) + public void connectStateChanged( BiDiSockWrap wrap, + boolean nowConnected ) { - DbgUtils.logd( TAG, "connectStateChanged(con=%b)", nowConnected ); + DbgUtils.logd( TAG, "connectStateChanged(connected=%b)", + nowConnected ); if ( nowConnected ) { try { wrap.send( new JSONObject() @@ -872,7 +875,7 @@ public class WiDirService extends XWService { } } catch ( IOException ioe ) { sAmServer = false; - DbgUtils.logex( ioe ); + DbgUtils.loge( TAG, ioe.toString() ); } DbgUtils.logd( TAG, "accept thread exiting" ); } @@ -882,6 +885,7 @@ public class WiDirService extends XWService { private static void stopAcceptThread() { + DbgUtils.logd( TAG, "stopAcceptThread()" ); if ( null != sAcceptThread ) { if ( null != sServerSock ) { try {