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

use rowid for invitation notifications so they'll be replaced by

Browse source 
subsequent notifications for the same game and removed when the game's
opened.
This commit is contained in:
Eric House 2015-07-16 06:57:30 -07:00
parent c9e8655eea
commit ac34250bf3
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1089,7 +1089,8 @@ public class BTService extends XWService {
R.string.new_bt_body_fmt, R.string.new_bt_body_fmt,
sender ); sender );
GameUtils.postInvitedNotification( this, nli.gameID(), body ); GameUtils.postInvitedNotification( this, nli.gameID(), body,
rowid );
sendResult( MultiEvent.BT_GAME_CREATED, rowid ); sendResult( MultiEvent.BT_GAME_CREATED, rowid );
} }

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

@ -1066,11 +1066,11 @@ public class GameUtils {
} }
public static void postInvitedNotification( Context context, int gameID, public static void postInvitedNotification( Context context, int gameID,
String body ) String body, long rowid )
{ {
Intent intent = GamesListDelegate.makeGameIDIntent( context, gameID ); Intent intent = GamesListDelegate.makeGameIDIntent( context, gameID );
Utils.postNotification( context, intent, R.string.invite_notice_title, Utils.postNotification( context, intent, R.string.invite_notice_title,
body, gameID ); body, (int)rowid );
} }
private static void tellDied( Context context, GameLock lock, private static void tellDied( Context context, GameLock lock,

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

@ -260,7 +260,8 @@ public class RelayService extends XWService
} }
String body = LocUtils.getString( this, String body = LocUtils.getString( this,
R.string.new_relay_body ); R.string.new_relay_body );
GameUtils.postInvitedNotification( this, nli.gameID(), body ); GameUtils.postInvitedNotification( this, nli.gameID(), body,
rowid );
} }
} }
} }

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
View file

@ -619,19 +619,19 @@ public class SMSService extends XWService {
} }
} }
private void postNotification( String phone, int gameID ) private void postNotification( String phone, int gameID, long rowid )
{ {
String owner = Utils.phoneToContact( this, phone, true ); String owner = Utils.phoneToContact( this, phone, true );
String body = LocUtils.getString( this, R.string.new_name_body_fmt, String body = LocUtils.getString( this, R.string.new_name_body_fmt,
owner ); owner );
GameUtils.postInvitedNotification( this, gameID, body ); GameUtils.postInvitedNotification( this, gameID, body, rowid );
} }
private void makeForInvite( String phone, NetLaunchInfo nli ) private void makeForInvite( String phone, NetLaunchInfo nli )
{ {
SMSMsgSink sink = new SMSMsgSink( this ); SMSMsgSink sink = new SMSMsgSink( this );
long rowid = GameUtils.makeNewMultiGame( this, nli, sink, null ); long rowid = GameUtils.makeNewMultiGame( this, nli, sink, null );
postNotification( phone, nli.gameID() ); postNotification( phone, nli.gameID(), rowid );
ackInvite( phone, nli.gameID() ); ackInvite( phone, nli.gameID() );
} }
@ -643,7 +643,7 @@ public class SMSService extends XWService {
GameUtils.makeNewGame( this, gameID, new CommsAddrRec( phone ), GameUtils.makeNewGame( this, gameID, new CommsAddrRec( phone ),
lang, dict, nPlayersT, nPlayersH, lang, dict, nPlayersT, nPlayersH,
forceChannel, gameName ); forceChannel, gameName );
postNotification( phone, gameID ); postNotification( phone, gameID, rowid );
ackInvite( phone, gameID ); ackInvite( phone, gameID );
} }