diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java index ce1db43fd..b7e923f1e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java @@ -586,7 +586,7 @@ public class BTService extends XWService { for ( long rowid : rowids ) { boolean consumed = - BoardDelegate.feedMessage( gameID, buffer, addr ); + BoardDelegate.feedMessage( rowid, buffer, addr ); if ( !consumed && haveGame ) { LastMoveInfo lmi = new LastMoveInfo(); if ( GameUtils.feedMessage( BTService.this, rowid, diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java index d46a060bf..b9422f7c3 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java @@ -144,35 +144,6 @@ public class BoardDelegate extends DelegateBase private static Set s_this = new HashSet(); - public static boolean feedMessage( int gameID, byte[] msg, - CommsAddrRec retAddr ) - { - boolean delivered = false; - int size; - synchronized( s_this ) { - size = s_this.size(); - if ( 1 == size ) { - BoardDelegate self = s_this.iterator().next(); - Assert.assertNotNull( self.m_gi ); - Assert.assertNotNull( self.m_gameLock ); - if ( gameID == self.m_gi.gameID ) { - if ( null != self.m_jniThread ) { - self.m_jniThread.handle( JNICmd.CMD_RECEIVE, msg, retAddr ); - delivered = true; - } else { - DbgUtils.logf( "BoardDelegate.feedMessage(): race condition lost; " - + "dropping message" ); - } - } - } - } - - if ( 1 < s_this.size() ) { - noteSkip(); - } - return delivered; - } - public static boolean feedMessage( long rowid, byte[] msg, CommsAddrRec ret ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java index fbb3f488e..10645eeac 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java @@ -654,7 +654,7 @@ public class SMSService extends XWService { sendDiedPacket( addr.sms_phone, gameID ); } else { for ( long rowid : rowids ) { - if ( BoardDelegate.feedMessage( gameID, msg, addr ) ) { + if ( BoardDelegate.feedMessage( rowid, msg, addr ) ) { // do nothing } else { SMSMsgSink sink = new SMSMsgSink( this );