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

experimental change toward fixing networking stalls: when the cache

Browse source 
thinks the network isn't up, check anyway. Probably needs to be done
on a backoff timer so we aren't checking every few milliseconds....
This commit is contained in:
Eric House 2015-12-29 07:14:27 -08:00
parent 299b8ddc70
commit 2f5ae51d3f
1 changed files with 74 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetStateCache.java
View file

@ -48,7 +48,7 @@ public class NetStateCache {
private static boolean s_netAvail = false;
private static boolean s_isWifi;
private static PvtBroadcastReceiver s_receiver;
private static final boolean s_onSim = Build.PRODUCT.contains("sdk");
private static final boolean s_onSDKSim = Build.PRODUCT.contains("sdk"); // not genymotion
public static void register( Context context, StateChangedIf proc )
{
@ -69,7 +69,24 @@ public class NetStateCache {
public static boolean netAvail( Context context )
{
initIfNot( context );
return s_netAvail || s_onSim;
// Cache is returning false negatives. Don't trust it.
if ( !s_netAvail ) {
boolean netAvail = getIsConnected( context );
if ( netAvail ) {
String msg = "netAvail(): second-guessing successful!!!";
DbgUtils.logf( msg );
Utils.showToast( context, msg );
s_netAvail = true;
if ( null != s_receiver ) {
s_receiver.notifyStateChanged( context );
}
}
}
boolean result = s_netAvail || s_onSDKSim;
DbgUtils.logf( "netAvail() => %b", result );
return result;
}
public static boolean onWifi()
@ -89,6 +106,19 @@ public class NetStateCache {
}
}
private static boolean getIsConnected( Context context )
{
boolean result = false;
NetworkInfo ni = ((ConnectivityManager)
context.getSystemService( Context.CONNECTIVITY_SERVICE ))
.getActiveNetworkInfo();
if ( null != ni && ni.isConnectedOrConnecting() ) {
result = true;
}
DbgUtils.logf( "NetStateCache.getConnected() => %b", result );
return result;
}
private static void initIfNot( Context context )
{
synchronized( s_haveReceiver ) {
@ -130,7 +160,7 @@ public class NetStateCache {
}
@Override
public void onReceive( final Context context, Intent intent )
public void onReceive( Context context, Intent intent )
{
DbgUtils.assertOnUIThread();
@ -160,41 +190,7 @@ public class NetStateCache {
if ( s_netAvail != netAvail ) {
s_netAvail = netAvail; // keep current in case we're asked
// We want to wait for WAIT_STABLE_MILLIS of inactivity
// before informing listeners. So each time there's a
// change, kill any existing timer then set another, which
// will only fire if we go that long without coming
// through here again.
if ( null != mNotifyLater ) {
mHandler.removeCallbacks( mNotifyLater );
mNotifyLater = null;
}
if ( mLastStateSent != s_netAvail ) {
mNotifyLater = new Runnable() {
@Override
public void run() {
Assert.assertTrue( mLastStateSent != s_netAvail );
mLastStateSent = s_netAvail;
synchronized( s_ifs ) {
Iterator<StateChangedIf> iter = s_ifs.iterator();
while ( iter.hasNext() ) {
iter.next().netAvail( s_netAvail );
}
}
if ( s_netAvail ) {
CommsConnType typ = CommsConnType
.COMMS_CONN_RELAY;
GameUtils.resendAllIf( context, typ,
false );
}
}
};
mHandler.postDelayed( mNotifyLater, WAIT_STABLE_MILLIS );
}
notifyStateChanged( context );
} else {
DbgUtils.logdf( "NetStateCache.PvtBroadcastReceiver.onReceive:"
+ " no change; doing nothing; s_netAvail=%b",
@ -202,6 +198,46 @@ public class NetStateCache {
}
}
}
public void notifyStateChanged( final Context context )
{
// We want to wait for WAIT_STABLE_MILLIS of inactivity
// before informing listeners. So each time there's a
// change, kill any existing timer then set another, which
// will only fire if we go that long without coming
// through here again.
if ( null != mNotifyLater ) {
mHandler.removeCallbacks( mNotifyLater );
mNotifyLater = null;
}
if ( mLastStateSent != s_netAvail ) {
mNotifyLater = new Runnable() {
@Override
public void run() {
Assert.assertTrue( mLastStateSent != s_netAvail );
mLastStateSent = s_netAvail;
DbgUtils.logf( "NetStateCache.notifyStateChanged(%b)",
s_netAvail );
synchronized( s_ifs ) {
Iterator<StateChangedIf> iter = s_ifs.iterator();
while ( iter.hasNext() ) {
iter.next().netAvail( s_netAvail );
}
}
if ( s_netAvail ) {
CommsConnType typ = CommsConnType
.COMMS_CONN_RELAY;
GameUtils.resendAllIf( context, typ, false );
}
}
};
mHandler.postDelayed( mNotifyLater, WAIT_STABLE_MILLIS );
}
}
} // class PvtBroadcastReceiver
}