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

cleanup

Browse source
This commit is contained in:
Eric House 2014-10-01 08:08:45 -07:00
parent 76fb527b11
commit aade0a9aae
4 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -347,7 +347,7 @@ public class BTService extends XWService {
nPlayersT = intent.getIntExtra( NTO_STR, -1 );
String btName = intent.getStringExtra( BT_NAME_STR );
btAddr = intent.getStringExtra( BT_ADDRESS_STR );
/*(void)*/makeOrInvite( this, gameID, null, lang, dict,
/*(void)*/makeOrNotify( this, gameID, null, lang, dict,
nPlayersT, 1, btName, btAddr );
break;
@ -505,7 +505,7 @@ public class BTService extends XWService {
BluetoothDevice host = socket.getRemoteDevice();
addAddr( host );
result = makeOrInvite( context, gameID, gameName, lang, dict,
result = makeOrNotify( context, gameID, gameName, lang, dict,
nPlayersT, nPlayersH, host.getName(),
host.getAddress() );
@ -1003,7 +1003,7 @@ public class BTService extends XWService {
m_sender = null;
}
private BTCmd makeOrInvite( Context context, int gameID, String gameName,
private BTCmd makeOrNotify( Context context, int gameID, String gameName,
int lang, String dict, int nPlayersT,
int nPlayersH, String btName, String btAddr )
{

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -1228,9 +1228,7 @@ public class DictsDelegate extends ListDelegateBase
}
}
if ( null != m_filterLang ) {
closedLangs.remove( m_filterLang );
}
closedLangs.remove( m_filterLang );
m_closedLangs.addAll( closedLangs );
success = true;

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
View file

@ -102,9 +102,6 @@ public class NetLaunchInfo extends AbsLaunchInfo {
init( intent );
room = intent.getStringExtra( MultiService.ROOM );
inviteID = intent.getStringExtra( MultiService.INVITEID );
// lang = intent.getIntExtra( LANG, -1 );
// dict = intent.getStringExtra( DICT );
// nPlayersT = intent.getIntExtra( NPLAYERST, -1 );
boolean valid = null != room
&& -1 != lang
&& -1 != nPlayersT;

23
xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
View file

@ -282,29 +282,6 @@ public class NewGameDelegate extends DelegateBase {
}
});
break;
// case NEWGAME_FAILURE:
// post( new Runnable() {
// public void run() {
// // stopProgress();
// DbgUtils.showf( m_activity,
// "Remote failed to create game" );
// }
// } );
// break;
// case NEWGAME_SUCCESS:
// final int gameID = (Integer)args[0];
// post( new Runnable() {
// public void run() {
// long rowid =
// GameUtils.makeNewBTGame( m_activity, m_groupID,
// gameID, null, m_lang,
// m_dict, 2, 1 );
// DBUtils.setName( m_activity, rowid, m_gameName );
// GameUtils.launchGame( m_activity, rowid, true );
// finish();
// }
// } );
// break;
default:
super.eventOccurred( event, args );
break;