Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

honor selected group when creating net and sms games too

Browse source
This commit is contained in:
Eric House 2013-10-22 07:40:46 -07:00
parent 9997c43298
commit 9ed1c21cf8
3 changed files with 68 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -46,6 +46,8 @@ public class GameUtils {
public static final String INTENT_KEY_ROWID = "rowid";
public static final String INTENT_FORRESULT_ROWID = "forresult";
private static final long GROUPID_UNSPEC = -1;
public static class NoSuchGameException extends RuntimeException {
public NoSuchGameException() {
super(); // superfluous
@ -320,12 +322,15 @@ public class GameUtils {
public static long saveNew( Context context, CurGameInfo gi )
{
long groupID = XWPrefs.getDefaultNewGameGroup( context );
return saveNew( context, gi, groupID );
return saveNew( context, gi, GROUPID_UNSPEC );
}
public static long saveNew( Context context, CurGameInfo gi, long groupID )
{
if ( GROUPID_UNSPEC == groupID ) {
groupID = XWPrefs.getDefaultNewGameGroup( context );
}
long rowid = DBUtils.ROWID_NOTFOUND;
byte[] bytes = XwJNI.gi_to_stream( gi );
if ( null != bytes ) {
@ -336,7 +341,8 @@ public class GameUtils {
return rowid;
}
private static long makeNewMultiGame( Context context, CommsAddrRec addr,
private static long makeNewMultiGame( Context context, long groupID,
CommsAddrRec addr,
int[] lang, String[] dict,
int nPlayersT, int nPlayersH,
String inviteID, int gameID,
@ -359,7 +365,7 @@ public class GameUtils {
// Will need to add a setNPlayers() method to gi to make this
// work
Assert.assertTrue( gi.nPlayers == nPlayersT );
rowid = saveNew( context, gi );
rowid = saveNew( context, gi, groupID );
if ( DBUtils.ROWID_NOTFOUND != rowid ) {
GameLock lock = new GameLock( rowid, true ).lock();
@ -370,8 +376,8 @@ public class GameUtils {
return rowid;
}
public static long makeNewNetGame( Context context, String room,
String inviteID, int[] lang,
public static long makeNewNetGame( Context context, long groupID,
String room, String inviteID, int[] lang,
String[] dict, int nPlayersT,
int nPlayersH )
{
@ -381,29 +387,38 @@ public class GameUtils {
CommsAddrRec addr = new CommsAddrRec( relayName, relayPort );
addr.ip_relay_invite = room;
return makeNewMultiGame( context, addr, lang, dict, nPlayersT,
nPlayersH, inviteID, 0, false );
return makeNewMultiGame( context, groupID, addr, lang, dict,
nPlayersT, nPlayersH, inviteID, 0, false );
}
public static long makeNewNetGame( Context context, String room,
String inviteID, int lang, String dict,
int nPlayers )
public static long makeNewNetGame( Context context, long groupID,
String room, String inviteID, int lang,
String dict, int nPlayers )
{
int[] langarr = { lang };
String[] dictArr = { dict };
return makeNewNetGame( context, room, inviteID, langarr, dictArr,
nPlayers, 1 );
return makeNewNetGame( context, groupID, room, inviteID, langarr,
dictArr, nPlayers, 1 );
}
public static long makeNewNetGame( Context context, NetLaunchInfo info )
{
return makeNewNetGame( context, info.room, info.inviteID, info.lang,
info.dict, info.nPlayersT );
return makeNewNetGame( context, GROUPID_UNSPEC, info.room,
info.inviteID, info.lang, info.dict,
info.nPlayersT );
}
public static long makeNewBTGame( Context context, int gameID,
CommsAddrRec addr, int lang,
int nPlayersT, int nPlayersH )
{
return makeNewBTGame( context, GROUPID_UNSPEC, gameID, addr, lang,
nPlayersT, nPlayersH );
}
public static long makeNewBTGame( Context context, long groupID,
int gameID, CommsAddrRec addr, int lang,
int nPlayersT, int nPlayersH )
{
long rowid = -1;
int[] langa = { lang };
@ -411,13 +426,22 @@ public class GameUtils {
if ( isHost ) {
addr = new CommsAddrRec( null, null );
}
return makeNewMultiGame( context, addr, langa, null, nPlayersT,
nPlayersH, null, gameID, isHost );
return makeNewMultiGame( context, groupID, addr, langa, null,
nPlayersT, nPlayersH, null, gameID, isHost );
}
public static long makeNewSMSGame( Context context, int gameID,
CommsAddrRec addr, int lang,
String dict, int nPlayersT,
CommsAddrRec addr,
int lang, String dict, int nPlayersT,
int nPlayersH )
{
return makeNewSMSGame( context, GROUPID_UNSPEC, gameID, addr,
lang, dict, nPlayersT, nPlayersH );
}
public static long makeNewSMSGame( Context context, long groupID,
int gameID, CommsAddrRec addr,
int lang, String dict, int nPlayersT,
int nPlayersH )
{
long rowid = -1;
@ -427,8 +451,8 @@ public class GameUtils {
if ( isHost ) {
addr = new CommsAddrRec(CommsAddrRec.CommsConnType.COMMS_CONN_SMS);
}
return makeNewMultiGame( context, addr, langa, dicta, nPlayersT,
nPlayersH, null, gameID, isHost );
return makeNewMultiGame( context, groupID, addr, langa, dicta,
nPlayersT, nPlayersH, null, gameID, isHost );
}
public static void launchInviteActivity( Context context,

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

@ -91,6 +91,7 @@ public class GamesList extends XWExpandableListActivity
DELETE_GROUPS,
OPEN_GAME
};
private static final int[] DEBUGITEMS = {
R.id.gamel_menu_loaddb,
R.id.gamel_menu_storedb,
@ -987,9 +988,6 @@ public class GamesList extends XWExpandableListActivity
private void startNewGameActivity( long groupID )
{
if ( 0 > groupID ) {
groupID = XWPrefs.getDefaultNewGameGroup( this );
}
NewGameActivity.startActivity( this, groupID );
}

42
xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
View file

@ -236,8 +236,8 @@ public class NewGameActivity extends XWActivity {
m_gameID, m_gameName,
m_lang, m_dict, 2, 1 );
long rowid = GameUtils.
makeNewSMSGame( thiz, m_gameID, null,
m_lang, m_dict, 2, 1 );
makeNewSMSGame( thiz, m_groupID, m_gameID,
null, m_lang, m_dict, 2, 1 );
DBUtils.setName( thiz, rowid, m_gameName );
GameUtils.launchGame( thiz, rowid, true );
finish();
@ -289,8 +289,8 @@ public class NewGameActivity extends XWActivity {
public void run() {
long rowid =
GameUtils.makeNewBTGame( NewGameActivity.this,
gameID, null, m_lang,
2, 1 );
m_groupID, gameID, null,
m_lang, 2, 1 );
DBUtils.setName( NewGameActivity.this,
rowid, m_gameName );
GameUtils.launchGame( NewGameActivity.this,
@ -328,8 +328,8 @@ public class NewGameActivity extends XWActivity {
if ( networked ) {
room = GameUtils.makeRandomID();
inviteID = GameUtils.makeRandomID();
rowid = GameUtils.makeNewNetGame( this, room, inviteID, lang,
dict, nPlayers, 1 );
rowid = GameUtils.makeNewNetGame( this, m_groupID, room, inviteID,
lang, dict, nPlayers, 1 );
} else {
rowid = GameUtils.saveNew( this, new CurGameInfo( this ), m_groupID );
}
@ -350,18 +350,20 @@ public class NewGameActivity extends XWActivity {
private void makeNewBTGame( boolean useDefaults )
{
int gameID = GameUtils.newGameID();
if ( !useDefaults ) {
m_newRowID = GameUtils.makeNewBTGame( NewGameActivity.this,
gameID, null, m_lang,
2, 1 ); // initial defaults
Intent intent = new Intent( this, GameConfig.class );
intent.setAction( Intent.ACTION_EDIT );
intent.putExtra( GameUtils.INTENT_KEY_ROWID, m_newRowID );
intent.putExtra( GameUtils.INTENT_FORRESULT_ROWID, true );
startActivityForResult( intent, CONFIG_FOR_BT );
} else {
BTInviteActivity.launchForResult( this, 1, INVITE_FOR_BT );
if ( XWApp.BTSUPPORTED ) {
int gameID = GameUtils.newGameID();
if ( !useDefaults ) {
m_newRowID = GameUtils.makeNewBTGame( NewGameActivity.this,
m_groupID, gameID, null,
m_lang, 2, 1 );
Intent intent = new Intent( this, GameConfig.class );
intent.setAction( Intent.ACTION_EDIT );
intent.putExtra( GameUtils.INTENT_KEY_ROWID, m_newRowID );
intent.putExtra( GameUtils.INTENT_FORRESULT_ROWID, true );
startActivityForResult( intent, CONFIG_FOR_BT );
} else {
BTInviteActivity.launchForResult( this, 1, INVITE_FOR_BT );
}
}
}
@ -370,8 +372,8 @@ public class NewGameActivity extends XWActivity {
int gameID = GameUtils.newGameID();
if ( !useDefaults ) {
m_newRowID = GameUtils.makeNewSMSGame( NewGameActivity.this,
gameID, null, m_lang,
m_dict, 2, 1 );
m_groupID, gameID, null,
m_lang, m_dict, 2, 1 );
String name = Utils.format( this, R.string.dft_sms_namef,
gameID & 0xFFFF );
DBUtils.setName( this, m_newRowID, name );