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

cleanup: remove unnecessary params

Browse source
This commit is contained in:
Eric House 2024-01-17 11:33:44 -08:00
parent db07661a44
commit 6f0bfe2c82
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -2930,10 +2930,9 @@ public class BoardDelegate extends DelegateBase
GameSummary summary, CurGameInfo gi, GameSummary summary, CurGameInfo gi,
GamePtr jniGamePtr, boolean deleteAfter ) GamePtr jniGamePtr, boolean deleteAfter )
{ {
String newName = summary.getRematchName( activity );
Intent intent = GamesListDelegate Intent intent = GamesListDelegate
.makeRematchIntent( activity, rowid, groupID, gi, .makeRematchIntent( activity, rowid, groupID, gi,
summary.conTypes, newName, deleteAfter ); summary.conTypes, deleteAfter );
if ( null != intent ) { if ( null != intent ) {
activity.startActivity( intent ); activity.startActivity( intent );
} }

7
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -3213,11 +3213,11 @@ public class GamesListDelegate extends ListDelegateBase
return intent; return intent;
} }
private void launchLikeRematch( CommsAddrRec hostAddr, String name ) private void launchLikeRematch( CommsAddrRec hostAddr, String gameName )
{ {
Intent intent = makeSelfIntent( m_activity ) Intent intent = makeSelfIntent( m_activity )
.putExtra( INVITEE_REC_EXTRA, (Serializable)hostAddr ) .putExtra( INVITEE_REC_EXTRA, (Serializable)hostAddr )
.putExtra( REMATCH_NEWNAME_EXTRA, name ) .putExtra( REMATCH_NEWNAME_EXTRA, gameName )
; ;
startActivity( intent ); startActivity( intent );
} }
@ -3225,7 +3225,7 @@ public class GamesListDelegate extends ListDelegateBase
public static Intent makeRematchIntent( Context context, long rowid, public static Intent makeRematchIntent( Context context, long rowid,
long groupID, CurGameInfo gi, long groupID, CurGameInfo gi,
CommsConnTypeSet addrTypes, CommsConnTypeSet addrTypes,
String newName, boolean deleteAfter ) boolean deleteAfter )
{ {
Intent intent = null; Intent intent = null;
boolean isSolo = gi.serverRole == CurGameInfo.DeviceRole.SERVER_STANDALONE; boolean isSolo = gi.serverRole == CurGameInfo.DeviceRole.SERVER_STANDALONE;
@ -3233,7 +3233,6 @@ public class GamesListDelegate extends ListDelegateBase
.putExtra( REMATCH_ROWID_EXTRA, rowid ) .putExtra( REMATCH_ROWID_EXTRA, rowid )
.putExtra( REMATCH_GROUPID_EXTRA, groupID ) .putExtra( REMATCH_GROUPID_EXTRA, groupID )
.putExtra( REMATCH_IS_SOLO, isSolo ) .putExtra( REMATCH_IS_SOLO, isSolo )
.putExtra( REMATCH_NEWNAME_EXTRA, newName )
.putExtra( REMATCH_DELAFTER_EXTRA, deleteAfter ); .putExtra( REMATCH_DELAFTER_EXTRA, deleteAfter );
if ( null != addrTypes ) { if ( null != addrTypes ) {

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

@ -181,12 +181,6 @@ public class GameSummary implements Serializable {
return result; return result;
} }
public String getRematchName( Context context )
{
return LocUtils.getString( context, R.string.rematch_name_fmt,
playerNames( context ) );
}
public void setRemoteDevs( Context context, CommsConnType typ, String str ) public void setRemoteDevs( Context context, CommsConnType typ, String str )
{ {
if ( null != str && 0 < str.length() ) { if ( null != str && 0 < str.length() ) {

1
xwords4/common/nli.c
View file

@ -138,6 +138,7 @@ void
nli_setGameName( NetLaunchInfo* nli, const XP_UCHAR* gameName ) nli_setGameName( NetLaunchInfo* nli, const XP_UCHAR* gameName )
{ {
XP_SNPRINTF( nli->gameName, sizeof(nli->gameName), "%s", gameName ); XP_SNPRINTF( nli->gameName, sizeof(nli->gameName), "%s", gameName );
nli->gameName[sizeof(nli->gameName)-1] = '\0';
} }
void void