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

when resending messages, be willing to do it more frequently, and

Browse source 
don't count toward quota unless a send actually happens.
This commit is contained in:
Eric House 2016-02-02 07:32:41 -08:00
parent d3e521ca6e
commit 5ddb4da466
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ public class GameUtils {
// back up. The length of the array determines the number of times in the // back up. The length of the array determines the number of times in the
// interval we'll do a send. // interval we'll do a send.
private static long[] s_sendTimes = {0,0,0,0}; private static long[] s_sendTimes = {0,0,0,0};
private static final long RESEND_INTERVAL_SECS = 60 * 60; // 1 hour private static final long RESEND_INTERVAL_SECS = 60 * 5; // 5 minutes
public static class NoSuchGameException extends RuntimeException { public static class NoSuchGameException extends RuntimeException {
public NoSuchGameException() { public NoSuchGameException() {
@ -379,17 +379,14 @@ public class GameUtils {
boolean force ) boolean force )
{ {
final boolean showUI = force; final boolean showUI = force;
long now = Utils.getCurSeconds();
if ( !force ) { if ( !force ) {
long now = Utils.getCurSeconds();
long oldest = s_sendTimes[s_sendTimes.length - 1]; long oldest = s_sendTimes[s_sendTimes.length - 1];
if ( RESEND_INTERVAL_SECS < (now - oldest) ) { long age = now - oldest;
System.arraycopy( s_sendTimes, 0, /* src */ force = RESEND_INTERVAL_SECS < age;
s_sendTimes, 1, /* dest */ DbgUtils.logdf( "resendAllIf(): based on last send age of %d sec, doit = %b",
s_sendTimes.length - 1 ); age, force );
s_sendTimes[0] = now;
force = true;
}
} }
if ( force ) { if ( force ) {
@ -397,6 +394,11 @@ public class GameUtils {
DBUtils.getGamesWithSendsPending( context ); DBUtils.getGamesWithSendsPending( context );
if ( 0 < games.size() ) { if ( 0 < games.size() ) {
new ResendTask( context, games, filter, showUI ).execute(); new ResendTask( context, games, filter, showUI ).execute();
System.arraycopy( s_sendTimes, 0, /* src */
s_sendTimes, 1, /* dest */
s_sendTimes.length - 1 );
s_sendTimes[0] = now;
} }
} }
} }
@ -1205,6 +1207,8 @@ public class GameUtils {
Iterator<Long> iter = m_games.keySet().iterator(); Iterator<Long> iter = m_games.keySet().iterator();
while ( iter.hasNext() ) { while ( iter.hasNext() ) {
long rowid = iter.next(); long rowid = iter.next();
// If we're looking for a specific type, check
if ( null != m_filter ) { if ( null != m_filter ) {
CommsConnTypeSet gameSet = m_games.get( rowid ); CommsConnTypeSet gameSet = m_games.get( rowid );
if ( gameSet != null && ! gameSet.contains( m_filter ) ) { if ( gameSet != null && ! gameSet.contains( m_filter ) ) {
@ -1218,8 +1222,14 @@ public class GameUtils {
m_sink = new MultiMsgSink( m_context, rowid ); m_sink = new MultiMsgSink( m_context, rowid );
GamePtr gamePtr = loadMakeGame( m_context, gi, m_sink, lock ); GamePtr gamePtr = loadMakeGame( m_context, gi, m_sink, lock );
if ( null != gamePtr ) { if ( null != gamePtr ) {
XwJNI.comms_resendAll( gamePtr.ptr(), true, m_filter, false ); int nSent = XwJNI.comms_resendAll( gamePtr.ptr(), true,
m_filter, false );
gamePtr.release(); gamePtr.release();
DbgUtils.logdf( "ResendTask.doInBackground(): sent %d "
+ "messages for rowid %d", nSent, rowid );
} else {
DbgUtils.logdf( "ResendTask.doInBackground(): loadMakeGame()"
+ " failed for rowid %d", rowid );
} }
lock.unlock(); lock.unlock();
} else { } else {