From 63ef10ebb10a2635c969289986104a80dc1152be Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 6 Feb 2015 06:11:04 -0800 Subject: [PATCH] remove or change logging --- .../src/org/eehouse/android/xw4/DBUtils.java | 2 -- .../src/org/eehouse/android/xw4/RelayService.java | 14 +++++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java index ac244a487..55428a8f6 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java @@ -2117,7 +2117,6 @@ public class DBUtils { private static final int BIT_VECTOR_MASK = 0x8000; public static CommsConnTypeSet intToConnTypeSet( int asInt ) { - // DbgUtils.logf( "intToConnTypeSet(in: %s)", asInt ); CommsConnTypeSet result = new CommsConnTypeSet(); boolean isVector = 0 != (BIT_VECTOR_MASK & asInt); asInt &= ~BIT_VECTOR_MASK; @@ -2137,7 +2136,6 @@ public class DBUtils { public static int connTypeSetToInt( CommsConnTypeSet set ) { - DbgUtils.logf( "connTypeSetToInt(setSize: %d)", set.size() ); int result = BIT_VECTOR_MASK; for ( Iterator iter = set.iterator(); iter.hasNext(); ) { CommsConnType typ = iter.next(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java index 913f1ee7a..109cbc538 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java @@ -255,7 +255,7 @@ public class RelayService extends XWService m_handler = new Handler(); m_onInactivity = new Runnable() { public void run() { - DbgUtils.logf( "RelayService: m_onInactivity fired" ); + // DbgUtils.logf( "RelayService: m_onInactivity fired" ); if ( !shouldMaintainConnection() ) { NetStateCache.unregister( RelayService.this, RelayService.this ); @@ -353,8 +353,6 @@ public class RelayService extends XWService @Override public void onDestroy() { - DbgUtils.logf( "RelayService.onDestroy() called" ); - if ( shouldMaintainConnection() ) { long interval_millis = getMaxIntervalSeconds() * 1000; RelayReceiver.restartTimer( this, interval_millis ); @@ -526,7 +524,6 @@ public class RelayService extends XWService private void stopUDPThreadsIf() { - DbgUtils.logf( "stopUDPThreadsIf" ); if ( null != m_UDPWriteThread ) { // can't add null m_queue.add( new PacketData() ); @@ -552,7 +549,6 @@ public class RelayService extends XWService m_UDPReadThread = null; m_UDPSocket = null; } - DbgUtils.logf( "stopUDPThreadsIf DONE" ); } // MIGHT BE Running on reader thread @@ -566,7 +562,7 @@ public class RelayService extends XWService if ( !skipAck ) { sendAckIf( header ); } - DbgUtils.logf( "gotPacket: cmd=%s", header.m_cmd.toString() ); + DbgUtils.logf( "RelayService.gotPacket: cmd=%s", header.m_cmd.toString() ); switch ( header.m_cmd ) { case XWPDEV_UNAVAIL: int unavail = dis.readInt(); @@ -639,7 +635,7 @@ public class RelayService extends XWService int packetLen = packet.getLength(); byte[] data = new byte[packetLen]; System.arraycopy( packet.getData(), 0, data, 0, packetLen ); - DbgUtils.logf( "RelayService::gotPacket: %d bytes of data", packetLen ); + // DbgUtils.logf( "RelayService::gotPacket: %d bytes of data", packetLen ); gotPacket( data, false ); } // gotPacket @@ -651,7 +647,7 @@ public class RelayService extends XWService registered = XWPrefs .getPrefsBoolean( this, R.string.key_relay_regid_ackd, false ); } - DbgUtils.logf( "shouldRegister()=>%b", !registered ); + // DbgUtils.logf( "shouldRegister()=>%b", !registered ); return !registered; } @@ -792,7 +788,7 @@ public class RelayService extends XWService if ( XWPDevProto.XWPDEV_PROTO_VERSION_1.ordinal() == proto ) { int packetID = vli2un( dis ); if ( 0 != packetID ) { - DbgUtils.logf( "readHeader: got packetID %d", packetID ); + DbgUtils.logf( "RelayService.readHeader: got packetID %d", packetID ); } byte ordinal = dis.readByte(); XWRelayReg cmd = XWRelayReg.values()[ordinal];