v1.7: fix widget losing data after screen lock/reboot

Two root causes:
- Alarms don't survive reboot — BootReceiver now restarts alarm + triggers
  an immediate fetch on BOOT_COMPLETED
- onUpdate() drew from cached prefs but never fetched fresh data — now
  triggers an immediate refresh so the widget is live on every launcher redraw

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "me.khodak.claudeusage"
         minSdk = 26
         targetSdk = 34
-        versionCode = 3
+        versionCode = 8
-        versionName = "1.2"
+        versionName = "1.7"
     }
 
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -43,6 +43,14 @@
             android:name=".AlarmReceiver"
             android:exported="false" />
 
+        <receiver
+            android:name=".BootReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver"
             android:exported="false"

app/src/main/java/me/khodak/claudeusage/BootReceiver.kt

@@ -0,0 +1,15 @@
+package me.khodak.claudeusage
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import me.khodak.claudeusage.data.PreferencesManager
+
+class BootReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action != Intent.ACTION_BOOT_COMPLETED) return
+        if (!PreferencesManager(context).isLoggedIn()) return
+        UsageUpdateWorker.schedulePeriodicRefresh(context)
+        UsageUpdateWorker.triggerImmediateRefresh(context)
+    }
+}

app/src/main/java/me/khodak/claudeusage/ClaudeUsageWidget.kt

@@ -20,6 +20,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
         ids.forEach { updateWidget(context, manager, it) }
         if (PreferencesManager(context).isLoggedIn()) {
             UsageUpdateWorker.schedulePeriodicRefresh(context)
+            UsageUpdateWorker.triggerImmediateRefresh(context)
         }
     }
 
@@ -39,6 +40,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
     companion object {
         const val ACTION_REFRESH = "me.khodak.claudeusage.ACTION_REFRESH"
         @Volatile internal var isRefreshing = false
+        @Volatile internal var currentRotation = 0f
 
         fun updateWidget(context: Context, manager: AppWidgetManager, widgetId: Int) {
             val prefs = PreferencesManager(context)
@@ -149,7 +151,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
                 if (status.isNotBlank()) status else if (updatedMs > 0) formatTime(updatedMs) else "")
             v.setInt(R.id.btn_refresh, "setColorFilter",
                 if (isRefreshing) 0xFFCC785C.toInt() else 0xFF999999.toInt())
-            v.setFloat(R.id.btn_refresh, "setRotation", 0f)
+            v.setFloat(R.id.btn_refresh, "setRotation", currentRotation)
             return v
         }
 
@@ -231,7 +233,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             )
             v.setInt(R.id.btn_refresh, "setColorFilter",
                 if (isRefreshing) 0xFFCC785C.toInt() else 0xFF999999.toInt())
-            v.setFloat(R.id.btn_refresh, "setRotation", 0f)
+            v.setFloat(R.id.btn_refresh, "setRotation", currentRotation)
 
             return v
         }

app/src/main/java/me/khodak/claudeusage/UsageUpdateWorker.kt

@@ -6,16 +6,14 @@ import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.SystemClock
-import android.util.SizeF
-import android.widget.RemoteViews
 import androidx.work.*
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import me.khodak.claudeusage.data.PreferencesManager
-import java.util.concurrent.TimeUnit
 
 class UsageUpdateWorker(
     private val context: Context,
@@ -35,6 +33,7 @@ class UsageUpdateWorker(
                 prefs.saveUsageData(data)
             } catch (_: Exception) {}
             animJob.cancel()
+            animJob.join()
         }
 
         pushWidgetUpdate()
@@ -44,30 +43,33 @@ class UsageUpdateWorker(
     private suspend fun rotateRefreshIcon() {
         val manager = AppWidgetManager.getInstance(context)
         val ids = manager.getAppWidgetIds(ComponentName(context, ClaudeUsageWidget::class.java))
-        var angle = 0f
+        val startMs = System.currentTimeMillis()
-        while (true) {
+        val msPerRotation = 800L // one full rotation every 0.8 seconds
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+
-                val small = RemoteViews(context.packageName, R.layout.widget_layout_small)
+        fun angleAt(now: Long) = ((now - startMs) % msPerRotation) * 360f / msPerRotation
-                small.setFloat(R.id.btn_refresh, "setRotation", angle)
+
-                val large = RemoteViews(context.packageName, R.layout.widget_layout)
+        try {
-                large.setFloat(R.id.btn_refresh, "setRotation", angle)
+            while (true) {
-                val rv = RemoteViews(mapOf(
+                ClaudeUsageWidget.currentRotation = angleAt(System.currentTimeMillis())
-                    SizeF(50f, 50f)  to small,
+                ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
-                    SizeF(50f, 120f) to large
+                delay(16) // aim for ~60fps; IPC speed sets the real ceiling
-                ))
+            }
-                ids.forEach { id -> manager.partiallyUpdateAppWidget(id, rv) }
+        } finally {
-            } else {
+            // Finish the current rotation cleanly — run until at least one full spin
-                val rv = RemoteViews(context.packageName, R.layout.widget_layout)
+            withContext(NonCancellable) {
-                rv.setFloat(R.id.btn_refresh, "setRotation", angle)
+                val minEndMs = startMs + msPerRotation
-                ids.forEach { id -> manager.partiallyUpdateAppWidget(id, rv) }
+                while (System.currentTimeMillis() < minEndMs) {
+                    ClaudeUsageWidget.currentRotation = angleAt(System.currentTimeMillis())
+                    ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
+                    delay(16)
+                }
             }
-            angle = (angle + 30f) % 360f
-            delay(83) // ~12 fps, one full rotation per second
         }
     }
 
     private fun pushWidgetUpdate() {
         ClaudeUsageWidget.isRefreshing = false
+        ClaudeUsageWidget.currentRotation = 0f
         val manager = AppWidgetManager.getInstance(context)
         val ids = manager.getAppWidgetIds(ComponentName(context, ClaudeUsageWidget::class.java))
         ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
@@ -88,7 +90,8 @@ class UsageUpdateWorker(
         }
 
         fun cancelPeriodicRefresh(context: Context) =
-            (context.getSystemService(Context.ALARM_SERVICE) as AlarmManager)                .cancel(alarmIntent(context))
+            (context.getSystemService(Context.ALARM_SERVICE) as AlarmManager)
+                .cancel(alarmIntent(context))
 
         fun triggerImmediateRefresh(context: Context) {
             WorkManager.getInstance(context).enqueueUniqueWork(

app/src/main/java/me/khodak/claudeusage/data/PreferencesManager.kt

@@ -27,18 +27,13 @@ class PreferencesManager(context: Context) {
 
     fun saveCookies(cookies: String) {
         securePrefs.edit().putString(KEY_COOKIES, cookies).apply()
-        // Plaintext backup — survives EncryptedSharedPreferences key rotation on reinstall
-        prefs.edit().putString(KEY_COOKIES_BACKUP, cookies).apply()
     }
 
-    fun getCookies(): String? =
+    fun getCookies(): String? = securePrefs.getString(KEY_COOKIES, null)
-        securePrefs.getString(KEY_COOKIES, null)
-            ?: prefs.getString(KEY_COOKIES_BACKUP, null)
 
     fun clearSession() {
         securePrefs.edit().clear().apply()
-        prefs.edit().remove(KEY_ORG_ID).remove(KEY_SESSION_START)
+        prefs.edit().remove(KEY_ORG_ID).remove(KEY_SESSION_START).apply()
-            .remove(KEY_COOKIES_BACKUP).apply()
     }
 
     fun saveOrgId(id: String) = prefs.edit().putString(KEY_ORG_ID, id).apply()
@@ -84,7 +79,6 @@ class PreferencesManager(context: Context) {
 
     companion object {
         private const val KEY_COOKIES = "session_cookies"
-        private const val KEY_COOKIES_BACKUP = "session_cookies_backup"
         private const val KEY_ORG_ID = "org_id"
         private const val KEY_SESSION_START = "session_start"
         private const val KEY_USAGE_DATA = "usage_data"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,13 +1,34 @@
-#!/bin/sh
+#!/usr/bin/env sh
-#
+
-# Gradle start up script for UN*X
+##############################################################################
-#
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -48,16 +69,23 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
         JAVACMD="$JAVA_HOME/jre/sh/java"
     else
         JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME"
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
     fi
 else
     JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH."
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -81,14 +109,68 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
+# For Cygwin, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$@"
+if $JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then
+    DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $DEFAULT_JVM_OPTS"
+fi
+
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega