Finalize ChatGPT Codex auth widget build

Author: Mirochill

.github/workflows/build-codex-quota-apk.yml

@@ -3,7 +3,8 @@ name: Build Codex Quota APK
 on:
   push:
     branches:
-      - agent/codex-quota-apk
+      - agent/codex-quota-auth-v1
+  pull_request:
   workflow_dispatch:
 
 permissions:
@@ -36,12 +37,12 @@ jobs:
         with:
           gradle-version: '8.9'
 
-      - name: Build release APK
-        run: gradle --no-daemon assembleRelease
+      - name: Build installable debug APK
+        run: gradle --no-daemon assembleDebug
 
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: codex-quota-widget-release
-          path: codex-quota-widget/app/build/outputs/apk/release/app-release.apk
+          name: codex-quota-widget-debug
+          path: codex-quota-widget/app/build/outputs/apk/debug/app-debug.apk
           if-no-files-found: error

codex-quota-widget/app/src/main/java/com/mirochill/codexquota/ChatGptAuthClient.java

@@ -12,7 +12,6 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.Locale;
 
 /** Small client for the same ChatGPT auth/rate-limit flow used by Codex. */
 public final class ChatGptAuthClient {
@@ -108,7 +107,8 @@ public static QuotaSnapshot sync(Context context) throws Exception {
             }
             ChatGptAuthStore.Tokens refreshed = refresh(tokens);
             ChatGptAuthStore.save(context, refreshed);
-            return fetchQuota(refreshed);
+            ChatGptAuthStore.Tokens persisted = ChatGptAuthStore.load(context);
+            return fetchQuota(persisted == null ? refreshed : persisted);
         }
     }
 
@@ -176,8 +176,10 @@ private static JSONObject requestJson(String method, String endpoint, String bod
         InputStream stream = status >= 400 ? connection.getErrorStream() : connection.getInputStream();
         String responseBody = read(stream);
         connection.disconnect();
-        if (status < 200 || status >= 300) throw new HttpFailure(status,
-                "Réponse serveur " + status + (responseBody.isEmpty() ? "" : " : " + responseBody));
+        if (status < 200 || status >= 300) {
+            // Never surface an authenticated response body in the UI.
+            throw new HttpFailure(status, "Réponse serveur " + status);
+        }
         try {
             return new JSONObject(responseBody);
         } catch (Exception parseError) {

codex-quota-widget/app/src/main/java/com/mirochill/codexquota/QuotaSnapshot.java

@@ -57,13 +57,22 @@ public static QuotaSnapshot fromUsageJson(String raw) {
             JSONObject secondary = rateLimit == null ? null : rateLimit.optJSONObject("secondary_window");
 
             JSONArray additional = root.optJSONArray("additional_rate_limits");
-            if (secondary == null && additional != null && additional.length() > 0) {
-                JSONObject first = additional.optJSONObject(0);
-                JSONObject additionalLimit = first == null ? null : first.optJSONObject("rate_limit");
-                secondary = additionalLimit == null ? null : additionalLimit.optJSONObject("secondary_window");
-                if (secondary == null && additionalLimit != null) {
-                    secondary = additionalLimit.optJSONObject("primary_window");
+            if (secondary == null && additional != null) {
+                JSONObject fallback = null;
+                for (int i = 0; i < additional.length(); i++) {
+                    JSONObject entry = additional.optJSONObject(i);
+                    JSONObject additionalLimit = entry == null ? null : entry.optJSONObject("rate_limit");
+                    if (additionalLimit == null) continue;
+                    JSONObject candidate = additionalLimit.optJSONObject("secondary_window");
+                    if (candidate == null) candidate = additionalLimit.optJSONObject("primary_window");
+                    if (candidate == null) continue;
+                    if (fallback == null) fallback = candidate;
+                    if (candidate.optLong("limit_window_seconds", 0L) >= 2L * 24L * 60L * 60L) {
+                        secondary = candidate;
+                        break;
+                    }
                 }
+                if (secondary == null) secondary = fallback;
             }
 
             String primaryValue = remaining(primary);

codex-quota-widget/app/src/main/java/com/mirochill/codexquota/SyncActivity.java

@@ -18,7 +18,6 @@ public class SyncActivity extends Activity {
     private Button openAuth;
     private Button refresh;
     private ExecutorService executor;
-    private volatile ChatGptAuthClient.DeviceCode pendingDeviceCode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,7 +47,6 @@ private void startSync() {
             try {
                 if (!ChatGptAuthStore.hasTokens(this)) {
                     ChatGptAuthClient.DeviceCode deviceCode = ChatGptAuthClient.requestDeviceCode();
-                    pendingDeviceCode = deviceCode;
                     runOnUiThread(() -> showDeviceCode(deviceCode));
                     // Open the system browser, never a WebView, for the actual ChatGPT login.
                     runOnUiThread(this::openVerificationPage);