Merge pull request #34 from bpmct/fix/connectivity-race-no-sleep

Fix/connectivity race no sleep

Author: bpmct

src/com/bpmct/trmnl_nook_simple_touch/DisplayActivity.java

@@ -106,6 +106,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Initialize file logging from saved preference
         FileLogger.setEnabled(ApiPrefs.isFileLoggingEnabled(this));
+        logD("onCreate pid=" + android.os.Process.myPid()
+                + " allow_sleep=" + ApiPrefs.isAllowSleep(this)
+                + " super_sleep=" + ApiPrefs.isSuperSleep(this)
+                + " auto_disable_wifi=" + ApiPrefs.isAutoDisableWifi(this)
+                + " allow_http=" + ApiPrefs.isAllowHttp(this));
 
         // Write the generic screensaver on first-ever launch so NOOK shows something
         // branded if it sleeps before any API image has been displayed.
@@ -372,6 +377,9 @@ public void onReceive(Context context, Intent intent) {
     @Override
     protected void onResume() {
         super.onResume();
+        logD("onResume pid=" + android.os.Process.myPid()
+                + " fetchInProgress=" + fetchInProgress
+                + " wifi=" + getWifiStateString());
         getWindow().setFlags(
                 WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
@@ -399,6 +407,8 @@ protected void onResume() {
                 } else {
                     startFetch();
                 }
+            } else {
+                logD("onResume: fetch already in progress, skipping");
             }
             // Don't schedule here - fetch completion will schedule the next refresh
         }
@@ -460,7 +470,14 @@ public void run() {
             @Override
             public void run() {
                 pendingConnectivityTimeoutRunnable = null;
-                logD("connectivity wait timed out");
+                WifiManager wm = (WifiManager) a.getSystemService(Context.WIFI_SERVICE);
+                String wifiDetail = "unknown";
+                if (wm != null) {
+                    wifiDetail = "enabled=" + wm.isWifiEnabled();
+                    WifiInfo wi = wm.getConnectionInfo();
+                    if (wi != null) wifiDetail += " ip=" + wi.getIpAddress() + " rssi=" + wi.getRssi();
+                }
+                logD("connectivity wait timed out after " + (CONNECTIVITY_MAX_WAIT_MS / 1000L) + "s wifi=" + wifiDetail);
                 logD("Ensure you are connected to WiFi. Press the home button and go into settings to configure.");
                 cancelConnectivityWait();
                 if (showErrorInMenu) {
@@ -551,6 +568,7 @@ private void applyIntentState(Intent intent) {
     @Override
     protected void onPause() {
         super.onPause();
+        logD("onPause pid=" + android.os.Process.myPid() + " fetchInProgress=" + fetchInProgress);
         // Restore screen timeout whenever we leave — user is navigating around the device.
         try {
             android.provider.Settings.System.putInt(
@@ -560,6 +578,7 @@ protected void onPause() {
         } catch (Throwable t) { /* ignore */ }
         if (refreshRunnable != null) {
             refreshHandler.removeCallbacks(refreshRunnable);
+            logD("onPause: refresh timer cancelled (fetchInProgress=" + fetchInProgress + ")");
         }
         if (pendingSleepRunnable != null) {
             refreshHandler.removeCallbacks(pendingSleepRunnable);
@@ -582,6 +601,7 @@ protected void onPause() {
 
     @Override
     protected void onDestroy() {
+        logD("onDestroy pid=" + android.os.Process.myPid());
         cancelConnectivityWait();
         // Safety net: always restore screen timeout in case the app dies before onResume
         try {
@@ -718,6 +738,23 @@ private static boolean isConnectedToNetwork(Context context) {
         return mobile != null && mobile.isConnected();
     }
 
+    /**
+     * Returns true if it is safe to attempt a fetch immediately:
+     * - ConnectivityManager reports connected (normal case), OR
+     * - WiFi is enabled and already has an IP address (handles the Android 2.1
+     *   race where isConnected() lags behind actual DHCP/association state).
+     *
+     * Only returns false if WiFi is off or has no IP — i.e. we genuinely need
+     * to wait before the network is usable.
+     */
+    private static boolean isWifiReadyOrConnected(Context context) {
+        if (isConnectedToNetwork(context)) return true;
+        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        if (wm == null || !wm.isWifiEnabled()) return false;
+        WifiInfo info = wm.getConnectionInfo();
+        return info != null && info.getIpAddress() != 0;
+    }
+
     /** Write bundled generic_display.jpg to screensaver path. Used as fallback when no API image has been displayed yet. */
     private void writeGenericScreensaver() {
         Bitmap b = null;
@@ -738,7 +775,14 @@ private void writeScreenshotToScreensaver(Bitmap bitmap) {
         int lastSlash = dirPath.lastIndexOf('/');
         if (lastSlash >= 0) dirPath = dirPath.substring(0, lastSlash);
         try {
-            new File(dirPath).mkdirs();
+            File dir = new File(dirPath);
+            if (!dir.exists()) {
+                boolean created = dir.mkdirs();
+                if (!created) {
+                    logW("screensaver mkdir failed (skipping write): " + dirPath);
+                    return;
+                }
+            }
         } catch (Throwable t) {
             logW("screensaver mkdir: " + t);
         }
@@ -749,7 +793,8 @@ private void writeScreenshotToScreensaver(Bitmap bitmap) {
             out.close();
             logD("screensaver written: " + path);
         } catch (Throwable t) {
-            logW("screensaver write failed: " + t);
+            logW("screensaver write failed: " + path + " — " + t
+                    + " (dir exists=" + new File(dirPath).exists() + ")");
         }
     }
 
@@ -788,14 +833,20 @@ private void startFetch() {
             refreshHandler.removeCallbacks(pendingSleepRunnable);
             pendingSleepRunnable = null;
         }
-        // Always wait for WiFi before attempting fetch
-        if (!isConnectedToNetwork(this)) {
+        // Only wait for WiFi if it's actually off or has no IP yet.
+        // If WiFi is enabled and has an IP, proceed directly — isConnectedToNetwork()
+        // can return false momentarily on Android 2.1 (DHCP state lag) even when the
+        // radio is fully associated, which would incorrectly send us into the 30s
+        // connectivity wait and trigger "Couldn't connect" for no real reason.
+        if (!isWifiReadyOrConnected(this)) {
             WifiManager wifi = (WifiManager) getSystemService(Context.WIFI_SERVICE);
             if (wifi != null && !wifi.isWifiEnabled()) {
                 wifi.setWifiEnabled(true);
             }
             waitForWifiThenFetch();
             return;
+        } else if (!isConnectedToNetwork(this)) {
+            logD("wifi has IP but ConnectivityManager not yet connected — proceeding anyway");
         }
         if (!ensureCredentials()) {
             return;
@@ -858,7 +909,8 @@ public void run() {
             };
         }
         refreshHandler.removeCallbacks(refreshRunnable);
-        logD("next display in " + (refreshMs / 1000L) + "s");
+        long wakeAt = System.currentTimeMillis() + refreshMs;
+        logD("next display in " + (refreshMs / 1000L) + "s (at " + new java.util.Date(wakeAt) + ")");
         refreshHandler.postDelayed(refreshRunnable, refreshMs);
     }