Merge pull request #35 from bpmct/feature/showcase-mode

add showcase mode

Author: bpmct

AGENTS.md

@@ -84,9 +84,58 @@ docker exec <container_id> bash -c "<command>"
 
 ## Worktrees
 
-Active development happens in the worktree at `/home/coder/trmnl-nook-sleep` on branch `feature/tap-menu-sleep`. The main checkout is at `/home/coder/trmnl-nook-simple-touch`.
+Active development happens in the worktree at `/home/coder/trmnl-nook-showcase` on branch `feature/showcase-mode`. The main checkout is at `/home/coder/trmnl-nook-simple-touch`.
 
-> **CRITICAL for agents:** The devcontainer mounts `/home/coder/trmnl-nook-sleep` as `/workspace`.
-> All source edits MUST be made to files under `/home/coder/trmnl-nook-sleep/` (the worktree).
-> Editing `/home/coder/trmnl-nook-simple-touch/` (the main checkout) has NO effect on builds.
+> **CRITICAL for agents:** The devcontainer mounts `/home/coder/trmnl-nook` as `/workspace`.
+> All source edits MUST be made to files under the active worktree (e.g. `/home/coder/trmnl-nook-showcase/`).
+> Editing the main checkout directly has NO effect on builds.
 > Always verify with: `docker inspect <container_id> --format '{{range .Mounts}}{{.Source}} -> {{.Destination}}{{println}}{{end}}'`
+
+---
+
+## RotateLayout Coordinate Geometry
+
+The physical screen is **800px wide × 600px tall** (landscape, hardware mounted sideways). `RotateLayout` applies a 90° rotation to all UI content so it renders correctly.
+
+### Transform mechanics
+
+`dispatchDraw` applies:
+```java
+canvas.translate(getWidth(), 0);  // getWidth() = 800
+canvas.rotate(90);
+```
+
+A point at child coordinates `(cx, cy)` maps to physical coordinates:
+```
+physical_x = 800 - cy
+physical_y = cx
+```
+
+- **child-X axis → physical-Y axis** (vertical on screen)
+- **child-Y axis → physical-X axis** (horizontal on screen, inverted)
+
+### Root child dimensions
+
+`RotateLayout.onMeasure` swaps width/height specs for 90°, so the `root` FrameLayout child thinks it is **800px wide × 600px tall** even though it visually renders as 600px wide × 800px tall on the physical screen.
+
+| `root` field | Value | Physical meaning |
+|---|---|---|
+| `root.getWidth()` | 800 | physical height |
+| `root.getHeight()` | 600 | physical width |
+
+### Menu bar layout rules
+
+The menu is a **HORIZONTAL** `LinearLayout` inside `root`.
+
+- **Width**: fixed value less than 800 (currently `480`) with `Gravity.CENTER` — gives a floating centred bar. Do **not** use `MATCH_PARENT` (that gives 800px = full physical height). Do **not** use 600 (that is `root.getHeight()` = physical width).
+- **Height**: `WRAP_CONTENT` (~40px)
+- **Buttons**: `new LinearLayout.LayoutParams(0, 40, 1.0f)` — `width=0, weight=1` distributes evenly across child-X (= physical-Y); `height=40` sets bar thickness in child-Y (= physical-X).
+- `Button.setMinWidth(0)` + `Button.setMinimumWidth(0)` are **required** — Android's Button has a built-in minimum width that breaks weight distribution without them.
+
+### Re-show clipping fix
+
+After `menuLayout.setVisibility(GONE)` → `VISIBLE`, Android may skip re-measuring since params haven't changed. `requestLayout()` alone is unreliable. The fix: call `setLayoutParams()` with the desired params **every time the menu is shown** — this forces a re-measure and correct `Gravity.CENTER` positioning.
+
+### `dispatchDraw` canvas state
+
+`RotateLayout.dispatchDraw` must call `canvas.save()` / `canvas.restoreToCount()` around the transform. Without it the canvas state leaks to subsequent draw passes, causing right-side EPD ghosting.

AndroidManifest.xml

@@ -46,6 +46,16 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="Gift Mode Settings"
             android:theme="@style/FullscreenTheme" />
+        <activity
+            android:name=".ShowcaseSettingsActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="Showcase Settings"
+            android:theme="@style/FullscreenTheme" />
+        <activity
+            android:name=".ShowcaseActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="Showcase"
+            android:theme="@style/FullscreenTheme" />
     </application>
 
 </manifest>

src/com/bpmct/trmnl_nook_simple_touch/ApiPrefs.java

@@ -22,6 +22,7 @@ public class ApiPrefs {
     private static final String KEY_AUTO_DISABLE_WIFI = "auto_disable_wifi";
     private static final String KEY_SUPER_SLEEP = "super_sleep";
     private static final String KEY_SCREENSAVER_WRITTEN = "screensaver_written_once";
+    private static final String KEY_SHOWCASE_MODE = "showcase_mode";
     private static final String SCREENSAVER_PATH = "/media/screensavers/TRMNL/display.png";
 
     public static boolean hasCredentials(Context context) {
@@ -226,6 +227,109 @@ public static void setAutoDisableWifi(Context context, boolean enabled) {
                 .putBoolean(KEY_AUTO_DISABLE_WIFI, enabled).commit();
     }
 
+    // ---------------------------------------------------------------------------
+    // Showcase cell credentials (4 independent cells)
+    // Each cell has its own token, optional device ID, and optional API base URL.
+    // Keys: showcase_cell_token_0..3, showcase_cell_id_0..3, showcase_cell_url_0..3
+    // ---------------------------------------------------------------------------
+
+    /** @deprecated Use getShowcaseCellToken(ctx, 0) — kept for SharedPrefs backwards compat */
+    public static String getShowcaseDeviceId(Context context, int index) {
+        // Old 2-device keys — map device 0→cell 0, device 1→cell 1 for backwards compat
+        return getShowcaseCellId(context, index);
+    }
+    /** @deprecated Use setShowcaseCellToken */
+    public static void setShowcaseDeviceId(Context context, int index, String id) {
+        setShowcaseCellId(context, index, id);
+    }
+    /** @deprecated Use getShowcaseCellToken */
+    public static String getShowcaseDeviceToken(Context context, int index) {
+        return getShowcaseCellToken(context, index);
+    }
+    /** @deprecated Use setShowcaseCellToken */
+    public static void setShowcaseDeviceToken(Context context, int index, String token) {
+        setShowcaseCellToken(context, index, token);
+    }
+
+    public static String getShowcaseCellId(Context context, int cellIdx) {
+        String key = "showcase_cell_id_" + cellIdx;
+        // Fall back to old key for cell 0 and 1 (migration)
+        if (cellIdx == 0 || cellIdx == 1) {
+            SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+            if (!prefs.contains(key)) {
+                String oldKey = "showcase_device_id_" + cellIdx;
+                String oldVal = prefs.getString(oldKey, "");
+                if (oldVal != null && oldVal.trim().length() > 0) return oldVal.trim();
+            }
+        }
+        String v = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).getString(key, "");
+        return (v != null) ? v.trim() : "";
+    }
+
+    public static void setShowcaseCellId(Context context, int cellIdx, String id) {
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit()
+                .putString("showcase_cell_id_" + cellIdx, id != null ? id.trim() : "").commit();
+    }
+
+    public static String getShowcaseCellToken(Context context, int cellIdx) {
+        String key = "showcase_cell_token_" + cellIdx;
+        // Fall back to old key for cell 0 and 1 (migration)
+        if (cellIdx == 0 || cellIdx == 1) {
+            SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+            if (!prefs.contains(key)) {
+                String oldKey = "showcase_device_token_" + cellIdx;
+                String oldVal = prefs.getString(oldKey, "");
+                if (oldVal != null && oldVal.trim().length() > 0) return oldVal.trim();
+            }
+        }
+        String v = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).getString(key, "");
+        return (v != null) ? v.trim() : "";
+    }
+
+    public static void setShowcaseCellToken(Context context, int cellIdx, String token) {
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit()
+                .putString("showcase_cell_token_" + cellIdx, token != null ? token.trim() : "").commit();
+    }
+
+    /** Per-cell API base URL. Empty string means use the global default (usetrmnl.com). */
+    public static String getShowcaseCellUrl(Context context, int cellIdx) {
+        String v = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+                .getString("showcase_cell_url_" + cellIdx, "");
+        return (v != null) ? v.trim() : "";
+    }
+
+    public static void setShowcaseCellUrl(Context context, int cellIdx, String url) {
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit()
+                .putString("showcase_cell_url_" + cellIdx, url != null ? url.trim() : "").commit();
+    }
+
+    // ---------------------------------------------------------------------------
+    // Showcase cell names (4 cells, one name each)
+    // ---------------------------------------------------------------------------
+
+    public static String getCellName(Context context, int cellIdx) {
+        String key = "showcase_cell_name_" + cellIdx;
+        String v = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).getString(key, "");
+        return (v != null) ? v.trim() : "";
+    }
+
+    public static void setCellName(Context context, int cellIdx, String name) {
+        String key = "showcase_cell_name_" + cellIdx;
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit()
+                .putString(key, name != null ? name.trim() : "").commit();
+    }
+
+    public static boolean isShowcaseModeEnabled(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        return prefs.getBoolean(KEY_SHOWCASE_MODE, false);
+    }
+
+    public static void setShowcaseModeEnabled(Context context, boolean enabled) {
+        context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit()
+                .putBoolean(KEY_SHOWCASE_MODE, enabled).commit();
+    }
+
+
     /** Whether to sleep immediately after a new image loads (timer/alarm fetches only). Default false. */
     public static boolean isSuperSleep(Context context) {
         SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);

src/com/bpmct/trmnl_nook_simple_touch/BouncyCastleHttpClient.java

@@ -752,6 +752,12 @@ public ProtocolVersion getMinimumVersion() {
 
             public int[] getCipherSuites() {
                 return new int[] {
+                        // ECDSA certs (Cloudflare, Let's Encrypt ECDSA)
+                        CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+                        CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+                        CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+                        CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+                        // RSA certs (usetrmnl.com)
                         CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
                         CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
                 };
@@ -782,21 +788,18 @@ public void notifyServerCertificate(TlsServerCertificate serverCertificate) thro
                         if (allowSelfSigned) {
                             Log.d(TAG, "BC skipping certificate validation (self-signed allowed)");
                             return;
-                        }
-                        if (tm == null) {
-                            throw new TlsFatalAlert(AlertDescription.bad_certificate);
+
                         }
                         try {
                             X509Certificate[] chain = toX509Chain(serverCertificate);
                             if (chain == null || chain.length == 0) {
                                 throw new TlsFatalAlert(AlertDescription.bad_certificate);
                             }
-                            String authType = chain[0].getPublicKey().getAlgorithm();
-                            tm.checkServerTrusted(chain, authType);
-                            if (!verifyHostname(hostname, chain[0])) {
-                                Log.e(TAG, "BC hostname verification failed for " + hostname);
-                                throw new TlsFatalAlert(AlertDescription.bad_certificate);
-                            }
+                            // Android 2.1's TrustManagerImpl uses Harmony crypto which
+                            // doesn't support ECDSA signatures (NoSuchAlgorithmException for
+                            // OID 1.2.840.10045.4.3.x). Use spongycastle's PKIX validator
+                            // directly so all signature algorithms are handled correctly.
+                            validateChainWithSpongyCastle(chain, hostname);
                             Log.d(TAG, "BC server certificate validated against CA bundle");
                         } catch (TlsFatalAlert e) {
                             throw e;
@@ -814,6 +817,83 @@ public TlsCredentials getClientCredentials(CertificateRequest certificateRequest
         };
     }
 
+    /**
+     * Validate a server certificate chain using spongycastle's PKIX engine.
+     * Android 2.1's built-in TrustManagerImpl (Harmony) cannot verify ECDSA
+     * certificate signatures (NoSuchAlgorithmException for ecdsa-with-SHA384).
+     * We load the CA bundle and re-parse the server chain entirely through
+     * spongycastle so all crypto (including sig verification) uses BC.
+     */
+    private static void validateChainWithSpongyCastle(
+            X509Certificate[] chain, String hostname)
+            throws java.io.IOException {
+        try {
+            java.security.Provider bcProv = getBcProvider();
+            if (bcProv == null) {
+                throw new TlsFatalAlert(AlertDescription.internal_error);
+            }
+            CertificateFactory bcCf = CertificateFactory.getInstance("X.509", bcProv);
+
+            // Re-parse server chain through BC so sig verification uses BC crypto
+            java.util.List bcChain = new java.util.ArrayList();
+            for (int i = 0; i < chain.length; i++) {
+                ByteArrayInputStream bais = new ByteArrayInputStream(chain[i].getEncoded());
+                bcChain.add((X509Certificate) bcCf.generateCertificate(bais));
+            }
+
+            // Load CA bundle through BC
+            byte[] caBytes = getBcCaBundleBytes();
+            if (caBytes == null || caBytes.length == 0) {
+                throw new TlsFatalAlert(AlertDescription.bad_certificate);
+            }
+            Collection caCerts = bcCf.generateCertificates(new ByteArrayInputStream(caBytes));
+            java.util.Set anchors = new java.util.HashSet();
+            java.util.Iterator it = caCerts.iterator();
+            while (it.hasNext()) {
+                anchors.add(new java.security.cert.TrustAnchor(
+                        (X509Certificate) it.next(), null));
+            }
+
+            java.security.cert.CertPath cp = bcCf.generateCertPath(bcChain);
+            java.security.cert.PKIXParameters params =
+                    new java.security.cert.PKIXParameters(anchors);
+            params.setRevocationEnabled(false);
+            java.security.cert.CertPathValidator cpv =
+                    java.security.cert.CertPathValidator.getInstance("PKIX", bcProv);
+            cpv.validate(cp, params);
+        } catch (TlsFatalAlert e) {
+            throw e;
+        } catch (Throwable t) {
+            Log.e(TAG, "BC PKIX chain validation failed: " + t);
+            throw new TlsFatalAlert(AlertDescription.bad_certificate);
+        }
+        if (!verifyHostname(hostname, chain[0])) {
+            Log.e(TAG, "BC hostname verification failed for " + hostname);
+            throw new TlsFatalAlert(AlertDescription.bad_certificate);
+        }
+    }
+
+    /** Raw bytes of ca_bundle.pem, populated when the bundle is first loaded. */
+    private static byte[] bcCaBundleBytes = null;
+
+    private static synchronized byte[] getBcCaBundleBytes() {
+        return bcCaBundleBytes;
+    }
+
+    private static java.security.Provider bcProviderInstance = null;
+    private static synchronized java.security.Provider getBcProvider() {
+        if (bcProviderInstance == null) {
+            try {
+                bcProviderInstance = (java.security.Provider)
+                        Class.forName("org.spongycastle.jce.provider.BouncyCastleProvider")
+                             .newInstance();
+            } catch (Throwable t) {
+                Log.e(TAG, "Could not instantiate BouncyCastleProvider", t);
+            }
+        }
+        return bcProviderInstance;
+    }
+
     private static synchronized X509TrustManager getTrustManager(Context context) {
         if (trustManager != null) {
             return trustManager;
@@ -825,6 +905,18 @@ private static synchronized X509TrustManager getTrustManager(Context context) {
         InputStream is = null;
         try {
             is = context.getResources().openRawResource(R.raw.ca_bundle);
+            // Cache raw bytes for spongycastle PKIX validator (which needs to re-parse
+            // the bundle through BC's own CertificateFactory to support ECDSA)
+            if (bcCaBundleBytes == null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buf = new byte[4096];
+                int n;
+                while ((n = is.read(buf)) != -1) baos.write(buf, 0, n);
+                bcCaBundleBytes = baos.toByteArray();
+                Log.d(TAG, "BC CA bundle cached: " + bcCaBundleBytes.length + " bytes");
+                is.close();
+                is = new ByteArrayInputStream(bcCaBundleBytes);
+            }
             CertificateFactory cf = CertificateFactory.getInstance("X.509");
             Collection certs = cf.generateCertificates(is);
             if (certs == null || certs.size() == 0) {

src/com/bpmct/trmnl_nook_simple_touch/CredentialsActivity.java

@@ -191,8 +191,9 @@ public void onClick(View v) {
                 }
                 ApiPrefs.saveCredentials(CredentialsActivity.this, id, token);
                 ApiPrefs.saveApiBaseUrl(CredentialsActivity.this, baseUrl);
-                // Auto-disable gift mode when credentials are saved
+                // Auto-disable gift/showcase mode when credentials are saved
                 ApiPrefs.setGiftModeEnabled(CredentialsActivity.this, false);
+                ApiPrefs.setShowcaseModeEnabled(CredentialsActivity.this, false);
                 statusView.setText("Saved.");
                 android.content.Intent intent = new android.content.Intent(CredentialsActivity.this, DisplayActivity.class);
                 intent.putExtra(DisplayActivity.EXTRA_CLEAR_IMAGE, true);