Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix assertion: return a f*ing sink

Browse source 
Messed this up in February apparently.
This commit is contained in:
Eric House 2018-07-19 06:07:26 -07:00
parent b0cf3a795c
commit 7cb00b6266
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
View file

@ -1106,11 +1106,17 @@ public class BTService extends XWService {
postEvent( MultiEvent.BT_GAME_CREATED, rowid ); postEvent( MultiEvent.BT_GAME_CREATED, rowid );
} }
@Override
MultiMsgSink getSink( long rowid )
{
return m_btMsgSink;
}
private BTCmd makeOrNotify( NetLaunchInfo nli, String btName, private BTCmd makeOrNotify( NetLaunchInfo nli, String btName,
String btAddr ) String btAddr )
{ {
BTCmd result; BTCmd result;
if ( handleInvitation( nli, btName, DictFetchOwner.OWNER_BT ) ) { if ( handleInvitation( nli, btName, DictFetchOwner.OWNER_BT ) ) { // here
result = BTCmd.INVITE_ACCPT; result = BTCmd.INVITE_ACCPT;
} else { } else {
result = BTCmd.INVITE_DUP_INVITE; // dupe of rematch result = BTCmd.INVITE_DUP_INVITE; // dupe of rematch

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
View file

@ -774,6 +774,12 @@ public class WiDirService extends XWService {
Log.e( TAG, "postNotification() doing nothing" ); Log.e( TAG, "postNotification() doing nothing" );
} }
@Override
MultiMsgSink getSink( long rowid )
{
return m_sink;
}
private void handleGameGone( Intent intent ) private void handleGameGone( Intent intent )
{ {
int gameID = intent.getIntExtra( KEY_GAMEID, 0 ); int gameID = intent.getIntExtra( KEY_GAMEID, 0 );

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
View file

@ -130,7 +130,7 @@ abstract class XWService extends Service {
} }
// Meant to be overridden // Meant to be overridden
protected MultiMsgSink getSink( long rowid ) { Assert.fail(); return null; } abstract MultiMsgSink getSink( long rowid );
protected ReceiveResult receiveMessage( Context context, int gameID, protected ReceiveResult receiveMessage( Context context, int gameID,
MultiMsgSink sink, byte[] msg, MultiMsgSink sink, byte[] msg,