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

add new param

Browse source 
It's not the case that forcing send and showing UI go together.
This commit is contained in:
Eric House 2017-06-20 07:49:01 -07:00
parent 0b2920102b
commit e3a8bef3cb
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -405,7 +405,7 @@ public class BTService extends XWService {
postEvent( evt ); postEvent( evt );
if ( cameOn ) { if ( cameOn ) {
GameUtils.resendAllIf( this, CommsConnType.COMMS_CONN_BT, GameUtils.resendAllIf( this, CommsConnType.COMMS_CONN_BT,
false ); false, false );
} else { } else {
ConnStatusHandler.updateStatus( this, null, ConnStatusHandler.updateStatus( this, null,
CommsConnType.COMMS_CONN_BT, CommsConnType.COMMS_CONN_BT,

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

@ -434,9 +434,8 @@ public class GameUtils {
} }
public static void resendAllIf( Context context, CommsConnType filter, public static void resendAllIf( Context context, CommsConnType filter,
boolean force ) boolean force, boolean showUI )
{ {
boolean showUI = force;
long now = Utils.getCurSeconds(); long now = Utils.getCurSeconds();
if ( !force ) { if ( !force ) {

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

@ -1533,7 +1533,7 @@ public class GamesListDelegate extends ListDelegateBase
// There's no selection for these items, so nothing to clear // There's no selection for these items, so nothing to clear
case R.id.games_menu_resend: case R.id.games_menu_resend:
GameUtils.resendAllIf( m_activity, null, true ); GameUtils.resendAllIf( m_activity, null, true, true );
break; break;
case R.id.games_menu_newgame_solo: case R.id.games_menu_newgame_solo:
handleNewGame( true ); handleNewGame( true );

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

@ -252,7 +252,7 @@ public class NetStateCache {
if ( s_netAvail ) { if ( s_netAvail ) {
CommsConnType typ = CommsConnType CommsConnType typ = CommsConnType
.COMMS_CONN_RELAY; .COMMS_CONN_RELAY;
GameUtils.resendAllIf( context, typ, false ); GameUtils.resendAllIf( context, typ, false, false );
} }
} }
}; };

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

@ -265,7 +265,7 @@ public class Perms23 {
// Perm-by-Perm, but I'm in a hurry. // Perm-by-Perm, but I'm in a hurry.
if ( granted && perm == Perm.SEND_SMS ) { if ( granted && perm == Perm.SEND_SMS ) {
GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS, GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS,
true ); true, true );
} }
// Log.d( TAG, "calling %s.onPermissionResult(%s, %b)", // Log.d( TAG, "calling %s.onPermissionResult(%s, %b)",

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

@ -47,7 +47,8 @@ public class SMSResendReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive( Context context, Intent intent ) public void onReceive( Context context, Intent intent )
{ {
GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS, true ); GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS, true,
BuildConfig.DEBUG );
setTimer( context, true ); setTimer( context, true );
} }

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

@ -738,7 +738,7 @@ public class WiDirService extends XWService {
GameUtils.resendAllIf( XWApp.getContext(), GameUtils.resendAllIf( XWApp.getContext(),
CommsConnType.COMMS_CONN_P2P, CommsConnType.COMMS_CONN_P2P,
false ); false, false );
} }
} }