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

resend all unacked messages each time we regain network, but only up to four times/hour.

Browse source
This commit is contained in:
Eric House 2014-03-04 18:36:46 -08:00
parent 431b24409f
commit 3c0b4a899f
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,11 @@ public class GameUtils {
public static final String INTENT_FORRESULT_ROWID = "forresult";
private static Integer s_minScreen;
// Used to determine whether to resend all messages on networking coming
// back up. The length of the array determines the number of times in the
// interval we'll do a send.
private static long[] s_sendTimes = {0,0,0,0};
private static final long RESEND_INTERVAL_SECS = 60 * 60; // 1 hour
public static class NoSuchGameException extends RuntimeException {
public NoSuchGameException() {
@ -367,10 +372,26 @@ public class GameUtils {
return thumb;
}
public static void resendAll( Context context )
public static void resendAllIf( Context context, boolean force )
{
HashMap<Long,CommsConnType> games = DBUtils.getGamesWithSendsPending( context );
new ResendTask( context, games ).execute();
final boolean showUI = force;
if ( !force ) {
long now = Utils.getCurSeconds();
long oldest = s_sendTimes[s_sendTimes.length - 1];
if ( RESEND_INTERVAL_SECS < (now - oldest) ) {
System.arraycopy( s_sendTimes, 0, /* src */
s_sendTimes, 1, /* dest */
s_sendTimes.length - 1 );
s_sendTimes[0] = now;
force = true;
}
}
if ( force ) {
HashMap<Long,CommsConnType> games = DBUtils.getGamesWithSendsPending( context );
new ResendTask( context, games, showUI ).execute();
}
}
public static long saveGame( Context context, int gamePtr,
@ -982,12 +1003,15 @@ public class GameUtils {
private static class ResendTask extends AsyncTask<Void, Void, Void> {
private Context m_context;
private HashMap<Long,CommsConnType> m_games;
private boolean m_showUI;
private int m_nSent = 0;
public ResendTask( Context context, HashMap<Long,CommsConnType> games )
public ResendTask( Context context, HashMap<Long,CommsConnType> games,
boolean showUI )
{
m_context = context;
m_games = games;
m_showUI = showUI;
}
@Override
@ -1013,7 +1037,9 @@ public class GameUtils {
@Override
protected void onPostExecute( Void unused )
{
DbgUtils.showf( m_context, R.string.resend_finishedf, m_nSent );
if ( m_showUI ) {
DbgUtils.showf( m_context, R.string.resend_finishedf, m_nSent );
}
}
private class MsgSink extends MultiMsgSink {

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

@ -98,7 +98,6 @@ public class GamesList extends XWExpandableListActivity
// R.id.games_menu_loaddb,
R.id.games_menu_storedb,
R.id.games_menu_checkupdates,
R.id.games_menu_resend,
};
private static final int[] NOSEL_ITEMS = {
R.id.games_menu_newgroup,
@ -107,6 +106,7 @@ public class GamesList extends XWExpandableListActivity
R.id.games_menu_about,
R.id.games_menu_email,
R.id.games_menu_checkmoves,
R.id.games_menu_resend,
};
private static final int[] ONEGAME_ITEMS = {
R.id.games_game_config,
@ -764,7 +764,7 @@ public class GamesList extends XWExpandableListActivity
// There's no selection for these items, so nothing to clear
case R.id.games_menu_resend:
GameUtils.resendAll( this );
GameUtils.resendAllIf( this, true );
break;
case R.id.games_menu_newgame:
startNewGameActivity( groupID );
@ -969,6 +969,7 @@ public class GamesList extends XWExpandableListActivity
Utils.showToast( this, id );
DbgUtils.logf( "GamesList.netAvail(%s)", getString( id ) );
}
GameUtils.resendAllIf( this, false );
}
}