Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-12 08:47:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove or change logging

Browse source
This commit is contained in:
Eric House 2015-02-06 06:11:04 -08:00
parent 1b8389c6b1
commit 63ef10ebb1
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -2117,7 +2117,6 @@ public class DBUtils {
private static final int BIT_VECTOR_MASK = 0x8000; private static final int BIT_VECTOR_MASK = 0x8000;
public static CommsConnTypeSet intToConnTypeSet( int asInt ) public static CommsConnTypeSet intToConnTypeSet( int asInt )
{ {
// DbgUtils.logf( "intToConnTypeSet(in: %s)", asInt );
CommsConnTypeSet result = new CommsConnTypeSet(); CommsConnTypeSet result = new CommsConnTypeSet();
boolean isVector = 0 != (BIT_VECTOR_MASK & asInt); boolean isVector = 0 != (BIT_VECTOR_MASK & asInt);
asInt &= ~BIT_VECTOR_MASK; asInt &= ~BIT_VECTOR_MASK;
@ -2137,7 +2136,6 @@ public class DBUtils {
public static int connTypeSetToInt( CommsConnTypeSet set ) public static int connTypeSetToInt( CommsConnTypeSet set )
{ {
DbgUtils.logf( "connTypeSetToInt(setSize: %d)", set.size() );
int result = BIT_VECTOR_MASK; int result = BIT_VECTOR_MASK;
for ( Iterator<CommsConnType> iter = set.iterator(); iter.hasNext(); ) { for ( Iterator<CommsConnType> iter = set.iterator(); iter.hasNext(); ) {
CommsConnType typ = iter.next(); CommsConnType typ = iter.next();

14
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
View file

@ -255,7 +255,7 @@ public class RelayService extends XWService
m_handler = new Handler(); m_handler = new Handler();
m_onInactivity = new Runnable() { m_onInactivity = new Runnable() {
public void run() { public void run() {
DbgUtils.logf( "RelayService: m_onInactivity fired" ); // DbgUtils.logf( "RelayService: m_onInactivity fired" );
if ( !shouldMaintainConnection() ) { if ( !shouldMaintainConnection() ) {
NetStateCache.unregister( RelayService.this, NetStateCache.unregister( RelayService.this,
RelayService.this ); RelayService.this );
@ -353,8 +353,6 @@ public class RelayService extends XWService
@Override @Override
public void onDestroy() public void onDestroy()
{ {
DbgUtils.logf( "RelayService.onDestroy() called" );
if ( shouldMaintainConnection() ) { if ( shouldMaintainConnection() ) {
long interval_millis = getMaxIntervalSeconds() * 1000; long interval_millis = getMaxIntervalSeconds() * 1000;
RelayReceiver.restartTimer( this, interval_millis ); RelayReceiver.restartTimer( this, interval_millis );
@ -526,7 +524,6 @@ public class RelayService extends XWService
private void stopUDPThreadsIf() private void stopUDPThreadsIf()
{ {
DbgUtils.logf( "stopUDPThreadsIf" );
if ( null != m_UDPWriteThread ) { if ( null != m_UDPWriteThread ) {
// can't add null // can't add null
m_queue.add( new PacketData() ); m_queue.add( new PacketData() );
@ -552,7 +549,6 @@ public class RelayService extends XWService
m_UDPReadThread = null; m_UDPReadThread = null;
m_UDPSocket = null; m_UDPSocket = null;
} }
DbgUtils.logf( "stopUDPThreadsIf DONE" );
} }
// MIGHT BE Running on reader thread // MIGHT BE Running on reader thread
@ -566,7 +562,7 @@ public class RelayService extends XWService
if ( !skipAck ) { if ( !skipAck ) {
sendAckIf( header ); 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 ) { switch ( header.m_cmd ) {
case XWPDEV_UNAVAIL: case XWPDEV_UNAVAIL:
int unavail = dis.readInt(); int unavail = dis.readInt();
@ -639,7 +635,7 @@ public class RelayService extends XWService
int packetLen = packet.getLength(); int packetLen = packet.getLength();
byte[] data = new byte[packetLen]; byte[] data = new byte[packetLen];
System.arraycopy( packet.getData(), 0, data, 0, 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( data, false );
} // gotPacket } // gotPacket
@ -651,7 +647,7 @@ public class RelayService extends XWService
registered = XWPrefs registered = XWPrefs
.getPrefsBoolean( this, R.string.key_relay_regid_ackd, false ); .getPrefsBoolean( this, R.string.key_relay_regid_ackd, false );
} }
DbgUtils.logf( "shouldRegister()=>%b", !registered ); // DbgUtils.logf( "shouldRegister()=>%b", !registered );
return !registered; return !registered;
} }
@ -792,7 +788,7 @@ public class RelayService extends XWService
if ( XWPDevProto.XWPDEV_PROTO_VERSION_1.ordinal() == proto ) { if ( XWPDevProto.XWPDEV_PROTO_VERSION_1.ordinal() == proto ) {
int packetID = vli2un( dis ); int packetID = vli2un( dis );
if ( 0 != packetID ) { if ( 0 != packetID ) {
DbgUtils.logf( "readHeader: got packetID %d", packetID ); DbgUtils.logf( "RelayService.readHeader: got packetID %d", packetID );
} }
byte ordinal = dis.readByte(); byte ordinal = dis.readByte();
XWRelayReg cmd = XWRelayReg.values()[ordinal]; XWRelayReg cmd = XWRelayReg.values()[ordinal];