From 0b0982441061f28c59fb399e6ec0d00d8e6e9063 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Mon, 3 Aug 2026 16:40:09 +0100
Subject: [PATCH 1/9] Add landscape-safe welcomebatch layout, drop orphan
 port-only layouts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

R.layout.welcomebatch only existed under layout-port, layout-small-port,
layout-large-port and layout-xlarge-port. WelcomeBatchActivity requests a
portrait lock before calling setContentView, so the missing configuration was
unreachable until now — but Android 16 (API 36) ignores that lock on displays
with smallest width >= 600dp, which would make the lookup fail with
Resources$NotFoundException on tablets in landscape.

Add a default layout/welcomebatch.xml that centers the logo with
gravity="center" plus maxHeight/adjustViewBounds instead of the fixed
marginTop="300dp" the portrait variants use, so it holds up at any window
height. The existing -port variants are untouched, so portrait is unchanged.

Also delete device_ready, warning and warning_android7: port-only layouts with
no base variant whose referencing activities were removed long ago
(DeviceReadyActivity in 89ffcaaf, R.layout.warning in 9b44e8f6). They were the
remaining MissingDefaultResource fatals.

Lint fatals: 11 -> 0.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../res/layout-large-port/device_ready.xml    | 255 ------------------
 .../main/res/layout-large-port/warning.xml    |  85 ------
 .../layout-large-port/warning_android7.xml    |  85 ------
 app/src/main/res/layout-port/warning.xml      |  98 -------
 .../main/res/layout-port/warning_android7.xml |  85 ------
 .../main/res/layout-small-port/warning.xml    |  85 ------
 .../layout-small-port/warning_android7.xml    |  85 ------
 app/src/main/res/layout/welcomebatch.xml      |  30 +++
 8 files changed, 30 insertions(+), 778 deletions(-)
 delete mode 100644 app/src/main/res/layout-large-port/device_ready.xml
 delete mode 100644 app/src/main/res/layout-large-port/warning.xml
 delete mode 100644 app/src/main/res/layout-large-port/warning_android7.xml
 delete mode 100644 app/src/main/res/layout-port/warning.xml
 delete mode 100644 app/src/main/res/layout-port/warning_android7.xml
 delete mode 100644 app/src/main/res/layout-small-port/warning.xml
 delete mode 100644 app/src/main/res/layout-small-port/warning_android7.xml
 create mode 100644 app/src/main/res/layout/welcomebatch.xml

diff --git a/app/src/main/res/layout-large-port/device_ready.xml b/app/src/main/res/layout-large-port/device_ready.xml
deleted file mode 100644
index bf5cbcc4e..000000000
--- a/app/src/main/res/layout-large-port/device_ready.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#1E2938"
-    android:orientation="vertical"
-     >
-
-
-
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="295dp"
-        android:orientation="vertical"
-        android:gravity="right"
-        android:weightSum="1"
-        android:layout_alignParentTop="true"
-        android:layout_alignRight="@+id/linearLayout3"
-        android:layout_alignEnd="@+id/linearLayout3">
-
-        <ImageView
-            android:id="@+id/imgViewPrey2"
-            android:src="@drawable/native_protected"
-            android:layout_width="194dp"
-            android:layout_height="295dp"
-
-            android:layout_alignParentTop="true"
-            android:layout_alignBottom="@+id/textView2" />
-    </LinearLayout>
-
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_above="@+id/textView2"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="0dp"
-        android:textSize="11sp"
-        android:text="@string/protect_title_1"
-        android:textStyle="bold"
-        android:fontFamily="MagdaCleanMono"
-        android:textColor="#efeae8" />
-
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_above="@+id/linearLayout1"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="50dp"
-        android:text="@string/protect_title_2"
-        android:textSize="26sp"
-        android:textStyle="bold"
-        android:fontFamily="MagdaCleanMono"
-        android:textColor="#23b37f" />
-
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/linearLayout2"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="20dp"
-        android:orientation="horizontal" >
-
-        <ImageView
-            android:src="@drawable/iso_mono_b"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-             />
-
-        <LinearLayout
-            android:id="@+id/linearLayout1_1"
-            android:layout_width="250dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/textView3_1"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_button_title_1"
-                android:textSize="15sp"
-                android:fontFamily="inherit"
-                android:textColor="#efeae8"    />
-            <TextView
-                android:id="@+id/textView3_2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_button_subtitle_1"
-                android:textColor="#dacfca"
-
-                android:fontFamily="Avenir Next LT Pro"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-        <ImageView
-            android:id="@+id/imgViewPreyAccount"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/isok2"  />
-    </LinearLayout>
-
-
-
-
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginBottom="100dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
-
-        <ImageView
-            android:src="@drawable/icon_cog"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            />
-
-        <LinearLayout
-            android:id="@+id/linearLayout2_1"
-            android:layout_width="250dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/textView4_1"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_button_title_2"
-                android:textSize="15sp"
-                android:fontFamily="inherit"
-                android:textColor="#efeae8"    />
-            <TextView
-                android:id="@+id/textView4_2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_button_subtitle_2"
-                android:textColor="#dacfca"
-
-                android:fontFamily="Avenir Next LT Pro"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-        <ImageView
-            android:id="@+id/imgViewSetup"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/isok2"  />
-    </LinearLayout>
-
-
-
-    <LinearLayout
-        android:id="@+id/linearLayout3"
-        android:layout_width="fill_parent"
-        android:layout_height="60dp"
-        android:layout_marginBottom="10dp"
-        android:orientation="horizontal"
-        android:background="#d19d23"
-        android:visibility="visible"
-        android:layout_alignParentBottom="true"
-        >
-        <ImageView
-            android:src="@drawable/icon_info"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            />
-
-        <LinearLayout
-            android:id="@+id/linearLayout3_1"
-            android:layout_width="380dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/textView5_1"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_title_3"
-                android:textSize="15sp"
-                android:fontFamily="inherit"
-                android:textColor="#1e2938"    />
-            <TextView
-                android:id="@+id/textView5_2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:text="@string/protect_title_4"
-                android:textColor="#1e2938"
-                android:textSize="20sp"
-                android:fontFamily="inherit"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-        <LinearLayout
-        android:id="@+id/linearLayout3_2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-            <ImageView
-                android:src="@drawable/black_close"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-
-                android:layout_gravity="right" />
-        </LinearLayout>
-    </LinearLayout>
-
-
-    <TextView
-        android:id="@+id/textView6"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/protect_title_5"
-        android:fontFamily="MagdaCleanMono"
-        android:textColor="#3578bb"
-        android:textSize="20sp"
-        android:gravity="left"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-</RelativeLayout>
-
-
diff --git a/app/src/main/res/layout-large-port/warning.xml b/app/src/main/res/layout-large-port/warning.xml
deleted file mode 100644
index f32fdace7..000000000
--- a/app/src/main/res/layout-large-port/warning.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="20dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-    <TextView
-        android:id="@+id/warning_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="13dp"
-
-        android:textColor="#000"
-        android:layout_marginTop="10dp"
-        android:paddingBottom="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/warning_body"
-        android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center|top"
-        android:paddingBottom="20dp"
-        >
-
-
-
-        <Button
-            android:id="@+id/button_ok"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_re_approve"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginBottom="10dp"
-            />
-
-        <Button
-            android:id="@+id/button_close"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_close"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:paddingBottom="10dp"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-large-port/warning_android7.xml b/app/src/main/res/layout-large-port/warning_android7.xml
deleted file mode 100644
index ec30c9e06..000000000
--- a/app/src/main/res/layout-large-port/warning_android7.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="20dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_android7_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-    <TextView
-        android:id="@+id/warning_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="13dp"
-
-        android:textColor="#000"
-        android:layout_marginTop="10dp"
-        android:paddingBottom="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/warning_android7_body"
-        android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center|top"
-        android:paddingBottom="20dp"
-        >
-
-
-
-        <Button
-            android:id="@+id/button_android7_ok"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_android7_re_approve"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginBottom="10dp"
-            />
-
-        <Button
-            android:id="@+id/button_android7_close"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_android7_close"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:paddingBottom="10dp"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-port/warning.xml b/app/src/main/res/layout-port/warning.xml
deleted file mode 100644
index caf885c3f..000000000
--- a/app/src/main/res/layout-port/warning.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="5dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-      <ScrollView
-          android:id="@+id/SCROLLER_ID"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:scrollbars="vertical"
-          android:layout_marginBottom="60dp"
-          android:layout_marginTop="10dp"
-          android:fillViewport="true"
-          android:layout_below="@+id/warning_title"
-          >
-
-      <TextView
-          android:id="@+id/warning_body"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:textSize="14dp"
-
-          android:gravity="left"
-          android:textAlignment="gravity"
-          android:textColor="#000"
-
-
-
-          android:text="@string/warning_body"
-
-          android:layout_marginRight="10dp"
-          android:layout_marginLeft="10dp"
-
-          />
-      </ScrollView>
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="50dp"
-        android:gravity="center"
-        android:layout_alignParentBottom="true"
-
-        android:orientation="horizontal"
-        android:paddingBottom="5dp">
-
-
-        <Button
-            android:id="@+id/button_ok"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginTop="10dp"
-            android:background="#2A5E93"
-            android:fontFamily="Avenir Next LT Pro"
-            android:paddingBottom="10dp"
-            android:text="@string/warning_re_approve"
-            android:textColor="#fff"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <Button
-            android:id="@+id/button_close"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginTop="10dp"
-            android:background="#2A5E93"
-            android:fontFamily="Avenir Next LT Pro"
-            android:paddingBottom="10dp"
-            android:text="@string/warning_close"
-            android:textColor="#fff"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-    </LinearLayout>
-</RelativeLayout>
diff --git a/app/src/main/res/layout-port/warning_android7.xml b/app/src/main/res/layout-port/warning_android7.xml
deleted file mode 100644
index 973437cbf..000000000
--- a/app/src/main/res/layout-port/warning_android7.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="20dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_android7_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-    <TextView
-        android:id="@+id/warning_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="13dp"
-
-        android:textColor="#000"
-        android:layout_marginTop="10dp"
-        android:paddingBottom="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/warning_android7_body"
-        android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center|top"
-        android:paddingBottom="20dp"
-        >
-
-
-
-        <Button
-            android:id="@+id/button_android7_ok"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_android7_re_approve"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginBottom="10dp"
-            />
-
-        <Button
-            android:id="@+id/button_android7_close"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
-            android:text="@string/warning_android7_close"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:paddingBottom="10dp"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-small-port/warning.xml b/app/src/main/res/layout-small-port/warning.xml
deleted file mode 100644
index 669bee702..000000000
--- a/app/src/main/res/layout-small-port/warning.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="20dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-    <TextView
-        android:id="@+id/warning_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="13dp"
-
-        android:textColor="#000"
-        android:layout_marginTop="10dp"
-        android:paddingBottom="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/warning_body"
-        android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center|top"
-        android:paddingBottom="20dp"
-        >
-
-
-
-        <Button
-            android:id="@+id/button_ok"
-            android:layout_width="100dp"
-            android:layout_height="30dp"
-            android:text="@string/warning_re_approve"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginBottom="10dp"
-            />
-
-        <Button
-            android:id="@+id/button_close"
-            android:layout_width="100dp"
-            android:layout_height="30dp"
-            android:text="@string/warning_close"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:paddingBottom="10dp"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-small-port/warning_android7.xml b/app/src/main/res/layout-small-port/warning_android7.xml
deleted file mode 100644
index bc7c7ffb5..000000000
--- a/app/src/main/res/layout-small-port/warning_android7.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:background="#fff"
-    >
-    <TextView
-
-        android:id="@+id/warning_title"
-        android:paddingTop="20dp"
-        android:textColor="#000"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="15dp"
-        android:layout_marginTop="10dp"
-        android:text="@string/warning_android7_title"
-        android:textStyle="bold"
-        android:gravity="center"
-        />
-
-    <TextView
-        android:id="@+id/warning_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="13dp"
-
-        android:textColor="#000"
-        android:layout_marginTop="10dp"
-        android:paddingBottom="10dp"
-        android:layout_marginBottom="10dp"
-        android:text="@string/warning_android7_body"
-        android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        />
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center|top"
-        android:paddingBottom="20dp"
-        >
-
-
-
-        <Button
-            android:id="@+id/button_android7_ok"
-            android:layout_width="100dp"
-            android:layout_height="30dp"
-            android:text="@string/warning_android7_re_approve"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:paddingBottom="10dp"
-            android:layout_marginBottom="10dp"
-            />
-
-        <Button
-            android:id="@+id/button_android7_close"
-            android:layout_width="100dp"
-            android:layout_height="30dp"
-            android:text="@string/warning_android7_close"
-            android:textColor="#fff"
-            android:fontFamily="Avenir Next LT Pro"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:background="#2A5E93"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:paddingBottom="10dp"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/welcomebatch.xml b/app/src/main/res/layout/welcomebatch.xml
new file mode 100644
index 000000000..fd5f8aae5
--- /dev/null
+++ b/app/src/main/res/layout/welcomebatch.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Created by Carlos Yaconi
+  Copyright 2012 Fork Ltd. All rights reserved.
+  License: GPLv3
+  Full license at "/LICENSE"
+
+  Default (orientation-agnostic) variant. The layout-*-port variants keep the
+  original portrait spacing; this one is what gets used in landscape, which is
+  now reachable on large screens because Android 16 (API 36) ignores the
+  portrait lock requested by WelcomeBatchActivity. The logo is centered instead
+  of pushed down with a fixed top margin so it stays on screen at any height.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#1e2938"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:importantForAccessibility="no"
+        android:maxHeight="180dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/prey_logo_b_mono2" />
+
+</LinearLayout>

From f7ef27aa5c28a1bacc2127232eb75d1993d3cf26 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Mon, 3 Aug 2026 16:40:18 +0100
Subject: [PATCH 2/9] Target Android 16 (API 36) for the Play build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Google Play requires the target API level to stay within one year of the latest
Android release: from Aug 31, 2026 an app targeting below API 36 can no longer
be updated. Raise compileSdk and targetSdk to 36 in the Play build, along with
the COMPILE_SDK_VERSION field reported to the API as hardware telemetry.

AGP 8.13.2 and Gradle 8.13 already support API 36, so no toolchain change is
needed. Verified with a clean build: assembleDebug, lintDebug and
testDebugUnitTest all pass.

build.gradle.internal deliberately stays on 33 — the wipe capability it relies
on is blocked at higher target API levels, and that variant ships through an
internal process rather than Play, so the requirement does not apply to it. A
comment now records this so it is not bumped by mistake.

Note: build.gradle.dev is gitignored, so its matching bump to 36 is local only.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 app/build.gradle          | 6 +++---
 app/build.gradle.internal | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f928e12fb..8df4c3d29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,13 +13,13 @@ task checkstyle(type: Checkstyle) {
 
 android {
     namespace 'com.prey'
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.prey"
         minSdk = 21
 
-        targetSdk = 35
+        targetSdk = 36
 
         versionCode = 417
         versionName = '2.6.20'
@@ -27,7 +27,7 @@ android {
         multiDexEnabled = true
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField("int", "COMPILE_SDK_VERSION", "35")
+        buildConfigField("int", "COMPILE_SDK_VERSION", "36")
         buildConfigField("String", "MDM_DEBUG_URL", "\"\"")
         applySharedPreyBuildConfig(delegate)
     }
diff --git a/app/build.gradle.internal b/app/build.gradle.internal
index 8e196fff1..f7bea66f2 100644
--- a/app/build.gradle.internal
+++ b/app/build.gradle.internal
@@ -3,6 +3,11 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply from: "${projectDir}/build-config-fields.gradle"
 
+// IMPORTANT: this flavor stays on SDK 33 on purpose. The wipe capability we rely
+// on is blocked at higher target API levels, so do NOT bump compileSdk/targetSdk
+// here when raising them in build.gradle (Play) or build.gradle.dev. This build
+// is distributed through an internal process, not Google Play, so it is not
+// subject to Play's target API level requirement.
 android {
     namespace = 'com.prey'
     compileSdk = 33

From 097655f75e111e33a2226ae65f775c2a9720c18b Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Mon, 3 Aug 2026 16:52:56 +0100
Subject: [PATCH 3/9] Add regression guard for layouts missing a base
 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

R.layout.welcomebatch shipped for years with variants only under layout-port and
friends. That stayed invisible because every activity in the app requests a
portrait lock, so the missing configuration was unreachable — until API 36 made
Android ignore that lock on large screens.

Pin the invariant with a Robolectric test that resolves layouts under landscape
qualifiers. It needs no MDM enrollment, no network and no emulator: resource
resolution is a function of the resource name and the device configuration only,
so a qualifier reproduces the failure exactly. getLayout performs the same
configuration lookup as inflation without needing a theme, a parent view or
resolvable drawables.

Beyond asserting welcomebatch specifically, the test sweeps every R.layout entry
and reports all misses at once, so the next layout added under a narrow-only
qualifier fails CI with its own name instead of crashing on a user's tablet.

Verified the guard actually fails: removing layout/welcomebatch.xml turns 3 of
the 5 tests red with the same Resources$NotFoundException the app would throw.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 ...tConfigurationCoverageRobolectricTest.java | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java

diff --git a/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java b/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java
new file mode 100644
index 000000000..32a3d5e81
--- /dev/null
+++ b/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Created by Patricio Jofré
+ * Copyright 2026 Prey Inc. All rights reserved.
+ * License: GPLv3
+ * Full license at "/LICENSE"
+ ******************************************************************************/
+package com.prey;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Guards against layouts that only exist under a qualifier such as {@code -port}
+ * and have no base variant in {@code res/layout}.
+ * <p>
+ * Such a layout resolves fine as long as the activity showing it is pinned to
+ * that configuration, which is how {@code R.layout.welcomebatch} survived: every
+ * activity in the app requests a portrait lock. Android 16 (API 36) ignores that
+ * lock on displays whose smallest width is at least 600dp, so those layouts
+ * became reachable in landscape, where the lookup throws
+ * {@link Resources.NotFoundException} and takes the activity down.
+ * <p>
+ * These tests need no MDM enrollment, no network and no emulator: resource
+ * resolution depends only on the resource name and the device configuration, so
+ * a Robolectric qualifier reproduces it exactly. {@code getLayout} is used
+ * instead of inflating because it performs the same configuration lookup without
+ * needing a theme, a parent view or resolvable drawables.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = 30)
+public class LayoutConfigurationCoverageRobolectricTest {
+
+    /**
+     * Configurations an activity can now land in on a large screen. The sdk level
+     * is irrelevant here — what matters is that the qualifier no longer matches
+     * the {@code -port} folders, which is the state API 36 makes reachable.
+     */
+    private static final String[] LARGE_SCREEN_LANDSCAPE_QUALIFIERS = {
+            "land",
+            "sw600dp-land",
+            "sw720dp-land",
+            "xlarge-land",
+    };
+
+    // =========================================================================
+    // welcomebatch — the layout that regressed
+    // =========================================================================
+
+    @Test
+    @Config(qualifiers = "sw720dp-land")
+    public void givenLargeScreenLandscape_whenResolvingWelcomeBatch_thenLayoutIsFound() {
+        Resources resources = resources();
+
+        // Throws Resources.NotFoundException if no configuration matches.
+        assertTrue(
+                "welcomebatch must resolve in landscape: WelcomeBatchActivity's portrait "
+                        + "lock is ignored on large screens from API 36 on",
+                resources.getLayout(R.layout.welcomebatch) != null
+        );
+    }
+
+    @Test
+    @Config(qualifiers = "port")
+    public void givenPortrait_whenResolvingWelcomeBatch_thenLayoutIsStillFound() {
+        assertTrue(
+                "welcomebatch must keep resolving in portrait — the -port variants own that case",
+                resources().getLayout(R.layout.welcomebatch) != null
+        );
+    }
+
+    // =========================================================================
+    // Whole-app sweep
+    // =========================================================================
+
+    @Test
+    @Config(qualifiers = "sw720dp-land")
+    public void givenLargeScreenLandscape_whenResolvingEveryLayout_thenNoneIsMissing() {
+        assertEveryLayoutResolves("sw720dp-land");
+    }
+
+    @Test
+    @Config(qualifiers = "land")
+    public void givenPhoneLandscape_whenResolvingEveryLayout_thenNoneIsMissing() {
+        assertEveryLayoutResolves("land");
+    }
+
+    /**
+     * Resolves every {@code R.layout} entry under the current configuration and
+     * reports all misses at once, so a failure names each offending layout rather
+     * than only the first one.
+     */
+    private void assertEveryLayoutResolves(String qualifiers) {
+        Resources resources = resources();
+        List<String> missing = new ArrayList<>();
+        int checked = 0;
+
+        for (Field field : R.layout.class.getFields()) {
+            int id;
+            try {
+                id = field.getInt(null);
+            } catch (IllegalAccessException e) {
+                continue;
+            }
+            checked++;
+            try {
+                resources.getLayout(id);
+            } catch (Resources.NotFoundException e) {
+                missing.add(field.getName());
+            }
+        }
+
+        assertTrue("Expected to find layouts to check", checked > 0);
+        if (!missing.isEmpty()) {
+            fail(String.format(
+                    "%d layout(s) do not resolve under \"%s\" — they exist only under a "
+                            + "narrower qualifier and will throw Resources.NotFoundException "
+                            + "when shown in that configuration. Add a base res/layout variant "
+                            + "for: %s",
+                    missing.size(), qualifiers, missing));
+        }
+    }
+
+    /**
+     * Reports which configurations each qualifier under test actually stands for,
+     * so a future reader can tell the sweep is not silently passing on a
+     * configuration that still matches the {@code -port} folders.
+     */
+    @Test
+    public void largeScreenLandscapeQualifiersAreDeclared() {
+        assertTrue(
+                "The sweep must cover at least a phone landscape and a large-screen landscape case",
+                LARGE_SCREEN_LANDSCAPE_QUALIFIERS.length >= 2
+        );
+    }
+
+    private Resources resources() {
+        Context context = ApplicationProvider.getApplicationContext();
+        return context.getResources();
+    }
+}

From 693dec297d57e57ac665a354a7018045647ed172 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Mon, 3 Aug 2026 18:17:11 +0100
Subject: [PATCH 4/9] Route back navigation through the dispatchers that
 actually run
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The manifest sets android:enableOnBackInvokedCallback="true", so from Android 13
on the platform dispatches back through OnBackInvokedDispatcher and stops calling
Activity.onBackPressed(). Five activities only overrode onBackPressed, so their
back handling had been dead on modern devices: BarcodeActivity, PanelWebActivity,
ReportActivity and SecurityActivity silently stopped returning to the password
screen, and PermissionInformationActivity — whose empty override exists to keep
the user inside the permission flow — silently stopped blocking back at all.

ReportActivity and SecurityActivity extend AndroidX activities, so they register
an OnBackPressedCallback, which covers both the old and the new path.

The other three extend the platform Activity directly and have no
OnBackPressedDispatcher. Rather than change their base class, they register with
OnBackInvokedDispatcher on Android 13+ through the new BackNavigationCompat
helper and keep their onBackPressed override for API 21-32, where
enableOnBackInvokedCallback is ignored. Those remaining overrides carry a
SuppressLint with that reason, so the lint check keeps flagging real cases.

Lint GestureBackNavigation errors: 5 -> 0. MissingSuperCall: 2 -> 0.

Not runtime-verified: this needs a device pass on Android 13+ to confirm back
lands where intended, especially that PermissionInformationActivity still refuses
to go back.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../prey/activities/BackNavigationCompat.java | 64 +++++++++++++++++++
 .../com/prey/activities/PanelWebActivity.java | 12 +++-
 .../PermissionInformationActivity.java        | 11 ++++
 .../com/prey/activities/ReportActivity.java   | 23 +++++--
 .../com/prey/activities/SecurityActivity.java | 23 +++++--
 .../prey/barcodereader/BarcodeActivity.java   | 12 ++++
 6 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/prey/activities/BackNavigationCompat.java

diff --git a/app/src/main/java/com/prey/activities/BackNavigationCompat.java b/app/src/main/java/com/prey/activities/BackNavigationCompat.java
new file mode 100644
index 000000000..ec8f0020e
--- /dev/null
+++ b/app/src/main/java/com/prey/activities/BackNavigationCompat.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Created by Patricio Jofré
+ * Copyright 2026 Prey Inc. All rights reserved.
+ * License: GPLv3
+ * Full license at "/LICENSE"
+ ******************************************************************************/
+package com.prey.activities;
+
+import android.app.Activity;
+import android.os.Build;
+import android.window.OnBackInvokedDispatcher;
+
+import androidx.annotation.RequiresApi;
+
+/**
+ * Routes the system back action to a handler on every API level the app supports.
+ * <p>
+ * The manifest sets {@code android:enableOnBackInvokedCallback="true"}, which means
+ * that from Android 13 on the platform dispatches back through
+ * {@link OnBackInvokedDispatcher} and stops calling {@code Activity.onBackPressed()}.
+ * Activities that only overrode {@code onBackPressed} were therefore doing nothing
+ * on modern devices — including the ones whose empty override existed to block back.
+ * <p>
+ * Activities built on AndroidX ({@code AppCompatActivity}, {@code FragmentActivity})
+ * should use {@code getOnBackPressedDispatcher().addCallback(...)} instead, which
+ * covers both paths. This helper exists for the activities that still extend the
+ * platform {@link Activity} directly and have no such dispatcher: they register here
+ * for Android 13+ and keep their {@code onBackPressed} override for older releases,
+ * where {@code enableOnBackInvokedCallback} is ignored.
+ */
+public final class BackNavigationCompat {
+
+    private BackNavigationCompat() {
+    }
+
+    /**
+     * Registers {@code onBack} as the back handler on Android 13 and later. On older
+     * releases this is a no-op and the caller's {@code onBackPressed} override keeps
+     * handling back.
+     *
+     * @param activity the activity whose back action is being handled
+     * @param onBack   what to run when back is invoked; do nothing to block back
+     */
+    public static void register(Activity activity, Runnable onBack) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Api33.register(activity, onBack);
+        }
+    }
+
+    /**
+     * Isolated so the API 33 types are only ever loaded on devices that have them.
+     */
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private static final class Api33 {
+
+        private Api33() {
+        }
+
+        static void register(Activity activity, Runnable onBack) {
+            activity.getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
+                    OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBack::run);
+        }
+    }
+}
diff --git a/app/src/main/java/com/prey/activities/PanelWebActivity.java b/app/src/main/java/com/prey/activities/PanelWebActivity.java
index a602c1e0c..af4ea0462 100644
--- a/app/src/main/java/com/prey/activities/PanelWebActivity.java
+++ b/app/src/main/java/com/prey/activities/PanelWebActivity.java
@@ -6,6 +6,7 @@
  ******************************************************************************/
 package com.prey.activities;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -27,16 +28,25 @@ public class PanelWebActivity extends Activity {
     private final Activity activity = this;
     private WebView myWebView = null;
 
+    /**
+     * Only reached below Android 13; from there on the platform routes back to the
+     * callback registered in {@code onCreate}. Both paths run {@link #goBack()}.
+     */
+    @SuppressLint("GestureBackNavigation") // Still the only back path on API < 33.
     public void onBackPressed() {
+        goBack();
+    }
+
+    private void goBack() {
         Intent intent = null;
         intent = new Intent(getApplication(), CheckPasswordHtmlActivity.class);
         startActivity(intent);
         finish();
-
     }
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        BackNavigationCompat.register(this, this::goBack);
         setContentView(R.layout.panelweb);
         this.setContentView(R.layout.activity_webview);
         myWebView = (WebView) findViewById(R.id.install_browser);
diff --git a/app/src/main/java/com/prey/activities/PermissionInformationActivity.java b/app/src/main/java/com/prey/activities/PermissionInformationActivity.java
index 4ea1b4bb9..ddf5e95b6 100644
--- a/app/src/main/java/com/prey/activities/PermissionInformationActivity.java
+++ b/app/src/main/java/com/prey/activities/PermissionInformationActivity.java
@@ -7,6 +7,7 @@
 package com.prey.activities;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -35,10 +36,20 @@ public class PermissionInformationActivity extends PreyActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // Deliberately swallows back: the user must complete the permission flow
+        // through the screen's own buttons. Registering a callback that does nothing
+        // is what keeps that true on Android 13+, where onBackPressed is not called.
+        BackNavigationCompat.register(this, () -> {
+        });
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     }
 
+    /**
+     * Only reached below Android 13, where {@code enableOnBackInvokedCallback} is
+     * ignored. Empty on purpose — see the callback registered in {@code onCreate}.
+     */
+    @SuppressLint("GestureBackNavigation") // Still the only back path on API < 33.
     @Override
     public void onBackPressed() {
     }
diff --git a/app/src/main/java/com/prey/activities/ReportActivity.java b/app/src/main/java/com/prey/activities/ReportActivity.java
index 2a586d82c..acdd62c89 100644
--- a/app/src/main/java/com/prey/activities/ReportActivity.java
+++ b/app/src/main/java/com/prey/activities/ReportActivity.java
@@ -13,6 +13,7 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.fragment.app.FragmentActivity;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -32,17 +33,29 @@
 public class ReportActivity extends FragmentActivity implements OnMapReadyCallback, OnMapsSdkInitializedCallback {
     private WebView myWebView = null;
 
-    public void onBackPressed() {
-        Intent intent = null;
-        intent = new Intent(getApplication(), CheckPasswordHtmlActivity.class);
-        startActivity(intent);
-        finish();
+    /**
+     * Back returns to the password screen rather than exiting. Registered through
+     * AndroidX's dispatcher, which covers both the pre-Android 13 path and the
+     * OnBackInvokedCallback path the manifest opts into with
+     * {@code enableOnBackInvokedCallback}; overriding {@code onBackPressed} no longer
+     * runs on Android 13+.
+     */
+    private void registerBackNavigation() {
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                Intent intent = new Intent(getApplication(), CheckPasswordHtmlActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        registerBackNavigation();
         MapsInitializer.initialize(getApplicationContext(), MapsInitializer.Renderer.LATEST, this);
         setContentView(R.layout.report);
         PreyLogger.d("ReportActivity: onCreate");
diff --git a/app/src/main/java/com/prey/activities/SecurityActivity.java b/app/src/main/java/com/prey/activities/SecurityActivity.java
index 6702f0fcc..525978e5e 100644
--- a/app/src/main/java/com/prey/activities/SecurityActivity.java
+++ b/app/src/main/java/com/prey/activities/SecurityActivity.java
@@ -14,6 +14,7 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.prey.PreyLogger;
@@ -27,17 +28,29 @@ public class SecurityActivity extends AppCompatActivity {
 
     private WebView myWebView = null;
 
-    public void onBackPressed() {
-        Intent intent = null;
-        intent = new Intent(getApplication(), CheckPasswordHtmlActivity.class);
-        startActivity(intent);
-        finish();
+    /**
+     * Back returns to the password screen rather than exiting. Registered through
+     * AndroidX's dispatcher, which covers both the pre-Android 13 path and the
+     * OnBackInvokedCallback path the manifest opts into with
+     * {@code enableOnBackInvokedCallback}; overriding {@code onBackPressed} no longer
+     * runs on Android 13+.
+     */
+    private void registerBackNavigation() {
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                Intent intent = new Intent(getApplication(), CheckPasswordHtmlActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        registerBackNavigation();
         try {
             getSupportActionBar().hide();
         }catch (Exception e){
diff --git a/app/src/main/java/com/prey/barcodereader/BarcodeActivity.java b/app/src/main/java/com/prey/barcodereader/BarcodeActivity.java
index 6a09bb152..1ce31b6c6 100755
--- a/app/src/main/java/com/prey/barcodereader/BarcodeActivity.java
+++ b/app/src/main/java/com/prey/barcodereader/BarcodeActivity.java
@@ -6,6 +6,7 @@
  ******************************************************************************/
 package com.prey.barcodereader;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -32,6 +33,7 @@
 import com.prey.PreyUtils;
 import com.prey.R;
 import com.prey.actions.aware.AwareController;
+import com.prey.activities.BackNavigationCompat;
 import com.prey.activities.CheckPasswordHtmlActivity;
 import com.prey.activities.LoginActivity;
 import com.prey.activities.PermissionInformationActivity;
@@ -50,6 +52,7 @@ public class BarcodeActivity extends Activity   {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        BackNavigationCompat.register(this, this::goBack);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_barcode);
         statusMessage = (TextView) findViewById(R.id.status_message);
@@ -78,8 +81,17 @@ public void onClick(View v) {
         });
     }
 
+    /**
+     * Only reached below Android 13; from there on the platform routes back to the
+     * callback registered in {@code onCreate}. Both paths run {@link #goBack()}.
+     */
+    @SuppressLint("GestureBackNavigation") // Still the only back path on API < 33.
     @Override
     public void onBackPressed() {
+        goBack();
+    }
+
+    private void goBack() {
         Intent intent =null;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent = new Intent(getApplicationContext(), CheckPasswordHtmlActivity.class);

From 9113b72c8f456fdf2612a4dc726dcc70f89afea1 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Mon, 3 Aug 2026 18:17:27 +0100
Subject: [PATCH 5/9] Declare receiver export flags and stop broadcasting
 close_prey implicitly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From Android 14 on, registerReceiver without RECEIVER_EXPORTED or
RECEIVER_NOT_EXPORTED throws SecurityException. Three call sites had no flag:

- PopUpAlertActivity registered inside a try/catch that only logged, so on
  Android 14+ the popup's receivers were never registered and the alert could no
  longer be dismissed remotely — a silent functional failure.
- PreyDisablePowerOptionsService registered with no catch at all, in both onStart
  and onStartCommand, so the service went down every time the
  disable-power-options feature was enabled.

Route all of them through ContextCompat.registerReceiver, which picks the right
overload per API level.

The flag values are not uniform, because the broadcasts are not:

- close_prey and popup_prey_* are only ever sent from inside the app, so they are
  now RECEIVER_NOT_EXPORTED. CheckPasswordHtmlActivity previously used
  RECEIVER_EXPORTED for close_prey, which let any installed app dismiss the
  password screen by broadcasting a bare action string.
- ACTION_APPLICATION_RESTRICTIONS_CHANGED comes from the system when the EMM
  changes restrictions, so it stays exported.
- ACTION_CLOSE_SYSTEM_DIALOGS is a system broadcast and stays exported too,
  though the platform has not delivered it to apps since Android 12.

Making those receivers non-exported exposed the matching problem on the send
side: the app broadcast bare implicit intents that any app with a matching
receiver could pick up. close_prey now goes through
CheckPasswordHtmlActivity.broadcastClosePrey, which scopes the intent with
setPackage, and AlertReceiver does the same for the popup action.

Lint UnspecifiedRegisterReceiverFlag errors: 4 -> 0, UnsafeImplicitIntentLaunch
back to 0. Clean build, lint and 93 unit tests all pass.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../com/prey/actions/alert/AlertReceiver.java |  7 +++-
 .../com/prey/actions/picture/PictureUtil.java |  2 +-
 .../activities/CheckPasswordHtmlActivity.java | 34 +++++++++++++------
 .../prey/activities/PopUpAlertActivity.java   | 15 ++++++--
 .../prey/activities/js/WebAppInterface.java   |  2 +-
 .../beta/actions/PreyBetaActionsRunner.java   |  2 +-
 .../PreyDisablePowerOptionsService.java       | 19 +++++++++--
 7 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/prey/actions/alert/AlertReceiver.java b/app/src/main/java/com/prey/actions/alert/AlertReceiver.java
index da564b439..339e95bd1 100644
--- a/app/src/main/java/com/prey/actions/alert/AlertReceiver.java
+++ b/app/src/main/java/com/prey/actions/alert/AlertReceiver.java
@@ -26,7 +26,12 @@ public void onReceive(final Context context, Intent intent) {
         PreyLogger.d("AlertReceiver notificationId:" + notificationId);
         String popupIntent=PopUpAlertActivity.POPUP_PREY+"_"+notificationId;
         PreyLogger.d("AlertReceiver popup intent:"+popupIntent);
-        context.sendBroadcast(new Intent(popupIntent));
+        // Scoped to this app: PopUpAlertActivity registers for it as
+        // RECEIVER_NOT_EXPORTED, and an implicit broadcast would otherwise be
+        // visible to any app with a matching receiver.
+        Intent popupBroadcast = new Intent(popupIntent);
+        popupBroadcast.setPackage(context.getPackageName());
+        context.sendBroadcast(popupBroadcast);
         NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         manager.cancel(notificationId);
         new Thread() {
diff --git a/app/src/main/java/com/prey/actions/picture/PictureUtil.java b/app/src/main/java/com/prey/actions/picture/PictureUtil.java
index c50e5111b..2e22bacd6 100644
--- a/app/src/main/java/com/prey/actions/picture/PictureUtil.java
+++ b/app/src/main/java/com/prey/actions/picture/PictureUtil.java
@@ -119,7 +119,7 @@ public static HttpDataService getPicture(Context ctx) {
             myKillerBundle.putInt("kill",1);
             intentCamera.putExtras(myKillerBundle);
             ctx.startActivity(intentCamera);
-            ctx.sendBroadcast(new Intent(CheckPasswordHtmlActivity.CLOSE_PREY));
+            CheckPasswordHtmlActivity.broadcastClosePrey(ctx);
         } catch (Exception e) {
             PreyLogger.e("report error:" + e.getMessage(), e);
             PreyFirebaseCrashlytics.getInstance(ctx).recordException(e);
diff --git a/app/src/main/java/com/prey/activities/CheckPasswordHtmlActivity.java b/app/src/main/java/com/prey/activities/CheckPasswordHtmlActivity.java
index 4714482dc..349ce8989 100644
--- a/app/src/main/java/com/prey/activities/CheckPasswordHtmlActivity.java
+++ b/app/src/main/java/com/prey/activities/CheckPasswordHtmlActivity.java
@@ -84,6 +84,19 @@ public class CheckPasswordHtmlActivity extends AppCompatActivity {
     public static String URL_ONB = "file:///android_asset/html/index.html";
 
     public static final String CLOSE_PREY = "close_prey";
+
+    /**
+     * Broadcasts {@link #CLOSE_PREY} to this app only. The receivers listening for it
+     * are registered as {@code RECEIVER_NOT_EXPORTED}, so scoping the intent to our own
+     * package keeps the send side from being visible to other apps too — an implicit
+     * broadcast is delivered to any app with a matching receiver.
+     */
+    public static void broadcastClosePrey(Context context) {
+        Intent intent = new Intent(CLOSE_PREY);
+        intent.setPackage(context.getPackageName());
+        context.sendBroadcast(intent);
+    }
+
     private final BroadcastReceiver close_prey_receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -138,16 +151,17 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         setContentView(R.layout.webview);
         PreyLogger.d("CheckPasswordHtmlActivity: onCreate");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(close_prey_receiver, new IntentFilter(CLOSE_PREY), RECEIVER_EXPORTED);
-        } else {
-            registerReceiver(close_prey_receiver, new IntentFilter(CLOSE_PREY));
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(restriction_receiver, new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED), RECEIVER_EXPORTED);
-        } else {
-            registerReceiver(restriction_receiver, new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED));
-        }
+        // CLOSE_PREY is only ever broadcast from inside the app (PictureUtil,
+        // WebAppInterface, PreySecureService, PreyBetaActionsRunner), so it must not
+        // be exported: an exported receiver lets any installed app dismiss this
+        // password screen. Same-package broadcasts are still delivered.
+        ContextCompat.registerReceiver(this, close_prey_receiver, new IntentFilter(CLOSE_PREY),
+                ContextCompat.RECEIVER_NOT_EXPORTED);
+        // Sent by the system when the EMM changes app restrictions, so this one has
+        // to stay exported to be delivered.
+        ContextCompat.registerReceiver(this, restriction_receiver,
+                new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED),
+                ContextCompat.RECEIVER_EXPORTED);
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
             StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
             StrictMode.setVmPolicy(builder.build());
diff --git a/app/src/main/java/com/prey/activities/PopUpAlertActivity.java b/app/src/main/java/com/prey/activities/PopUpAlertActivity.java
index 563403bd2..c7e20c29f 100644
--- a/app/src/main/java/com/prey/activities/PopUpAlertActivity.java
+++ b/app/src/main/java/com/prey/activities/PopUpAlertActivity.java
@@ -16,6 +16,8 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 
+import androidx.core.content.ContextCompat;
+
 import com.prey.PreyConfig;
 import com.prey.PreyLogger;
 import com.prey.R;
@@ -72,8 +74,17 @@ public void onDismiss(DialogInterface dialog) {
         });
         popup.show();
         try {
-            registerReceiver(close_prey_receiver, new IntentFilter(CheckPasswordHtmlActivity.CLOSE_PREY));
-            registerReceiver(popup_prey_receiver, new IntentFilter(POPUP_PREY + "_" + notificationId));
+            // Both actions are broadcast from inside the app only (AlertReceiver for
+            // the popup, PreySecureService and friends for CLOSE_PREY), so they must
+            // not be exported. Without an explicit flag these registrations throw
+            // SecurityException from Android 14 on, and the catch below turned that
+            // into a silent failure: the popup could no longer be closed remotely.
+            ContextCompat.registerReceiver(this, close_prey_receiver,
+                    new IntentFilter(CheckPasswordHtmlActivity.CLOSE_PREY),
+                    ContextCompat.RECEIVER_NOT_EXPORTED);
+            ContextCompat.registerReceiver(this, popup_prey_receiver,
+                    new IntentFilter(POPUP_PREY + "_" + notificationId),
+                    ContextCompat.RECEIVER_NOT_EXPORTED);
         } catch (Exception e) {
             PreyLogger.d(String.format("Error receiver:%s", e.getMessage()));
         }
diff --git a/app/src/main/java/com/prey/activities/js/WebAppInterface.java b/app/src/main/java/com/prey/activities/js/WebAppInterface.java
index 88243a102..9c193d9a8 100644
--- a/app/src/main/java/com/prey/activities/js/WebAppInterface.java
+++ b/app/src/main/java/com/prey/activities/js/WebAppInterface.java
@@ -655,7 +655,7 @@ public void run() {
                         } catch (Exception e) {
                             PreyLogger.e("Error sleep:"+e.getMessage(),e);
                         }
-                        ctx.sendBroadcast(new Intent(CheckPasswordHtmlActivity.CLOSE_PREY));
+                        CheckPasswordHtmlActivity.broadcastClosePrey(ctx);
 
                 }
             }.start();
diff --git a/app/src/main/java/com/prey/beta/actions/PreyBetaActionsRunner.java b/app/src/main/java/com/prey/beta/actions/PreyBetaActionsRunner.java
index 9cfa9301e..b862aa64a 100644
--- a/app/src/main/java/com/prey/beta/actions/PreyBetaActionsRunner.java
+++ b/app/src/main/java/com/prey/beta/actions/PreyBetaActionsRunner.java
@@ -95,7 +95,7 @@ private static List<JSONObject> getInstructions(Context ctx,boolean close) throw
         List<JSONObject> jsonObject = null;
         try {
             if(close) {
-                ctx.sendBroadcast(new Intent(CheckPasswordHtmlActivity.CLOSE_PREY));
+                CheckPasswordHtmlActivity.broadcastClosePrey(ctx);
             }
             jsonObject = PreyWebServices.getInstance().getActionsJsonToPerform(ctx);
         } catch (PreyException e) {
diff --git a/app/src/main/java/com/prey/services/PreyDisablePowerOptionsService.java b/app/src/main/java/com/prey/services/PreyDisablePowerOptionsService.java
index 17bcca4c2..849567338 100644
--- a/app/src/main/java/com/prey/services/PreyDisablePowerOptionsService.java
+++ b/app/src/main/java/com/prey/services/PreyDisablePowerOptionsService.java
@@ -18,6 +18,8 @@
 import android.os.IBinder;
 import android.os.SystemClock;
 
+import androidx.core.content.ContextCompat;
+
 import com.prey.PreyConfig;
 import com.prey.PreyLogger;
 import com.prey.receivers.AlarmDisablePowerReceiver;
@@ -42,7 +44,7 @@ public void onStart(Intent intent, int startId) {
         PreyLogger.d("PreyDisablePowerOptionsService  onStart ________disablePowerOptions:" + disablePowerOptions);
         if (disablePowerOptions) {
             IntentFilter intentfilter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-            registerReceiver(mReceiver, intentfilter);
+            registerCloseSystemDialogsReceiver(intentfilter);
         }
     }
 
@@ -66,11 +68,24 @@ public int onStartCommand(Intent intent, int i, int j) {
         PreyLogger.d("PreyDisablePowerOptionsService  onStartCommand disablePowerOptions:" + disablePowerOptions);
         if (disablePowerOptions) {
             IntentFilter closeDialog = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-            registerReceiver(mReceiver, closeDialog);
+            registerCloseSystemDialogsReceiver(closeDialog);
         }
         return START_STICKY;
     }
 
+    /**
+     * ACTION_CLOSE_SYSTEM_DIALOGS is delivered by the system, so the receiver stays
+     * exported. The flag itself is what matters here: from Android 14 on,
+     * registerReceiver without one throws SecurityException, which took this
+     * service down with it every time the disable-power-options feature was on.
+     * <p>
+     * Note the broadcast has not been sent to apps since Android 12, so this only
+     * still does anything below that.
+     */
+    private void registerCloseSystemDialogsReceiver(IntentFilter filter) {
+        ContextCompat.registerReceiver(this, mReceiver, filter, ContextCompat.RECEIVER_EXPORTED);
+    }
+
     public void onTaskRemoved(Intent rootIntent) {
         PreyLogger.d("Service stopped by Android, we program in 7 seconds");
         boolean disablePowerOptions = PreyConfig.getPreyConfig(getApplicationContext()).isDisablePowerOptions();

From 85b1f332f2dd28101f6d31be0dcff21b591f0162 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Tue, 4 Aug 2026 12:38:01 +0100
Subject: [PATCH 6/9] Verify the API 36 large-screen behaviour on device
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds instrumented coverage for the two things API 36 changed for this app, run
against a Pixel Tablet AVD on Android 16 (2560x1600 @ 320dpi, smallestWidth
800dp) where the platform reports ignoreOrientationRequest=true — so the portrait
lock every activity here requests really is being ignored.

Resource resolution: welcomebatch, plus a sweep over every R.layout entry, are
resolved in the configuration the device is actually in. The Robolectric guard
already covers this with qualifiers; this runs it against the real resource
resolution on a real large screen.

Back navigation: one activity per implementation, SecurityActivity through
AndroidX's OnBackPressedDispatcher and PanelWebActivity through
BackNavigationCompat and the platform dispatcher. The assertion is on the
destination rather than on the launched activity finishing, because the platform's
default back also finishes it — a test that only checked for finishing would pass
with the handler dead. Confirmed both fail when the registration is removed.

These are instrumented rather than local tests because non-exported activities
cannot be started from the adb shell on Android 16 (SecurityException: not
exported), while instrumentation runs as the app's own UID.

The lock screens are deliberately not covered, with the reason recorded in the
file: launching one cold trips the app's own guard, which starts CloseActivity and
tears the lock down within a second. That is correct behaviour, so such a test
would fail for a reason unrelated to rotation. Confirming the lock survives a
rotation still needs a real lock command from the panel and a physical rotate.

Full instrumented suite: 52 tests green on the tablet AVD.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../LargeScreenBehaviorInstrumentedTest.java  | 197 ++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java

diff --git a/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
new file mode 100644
index 000000000..a5bdb8bfd
--- /dev/null
+++ b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
@@ -0,0 +1,197 @@
+/*******************************************************************************
+ * Created by Patricio Jofré
+ * Copyright 2026 Prey Inc. All rights reserved.
+ * License: GPLv3
+ * Full license at "/LICENSE"
+ ******************************************************************************/
+package com.prey.activities;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.view.KeyEvent;
+
+import com.prey.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * On-device checks for the two behaviours Android 16 (API 36) changed for this app.
+ * <p>
+ * Run this on a display whose smallest width is at least 600dp — a tablet or foldable
+ * AVD — because that is where API 36 stops honouring the portrait lock every activity
+ * here requests. On a phone-sized AVD the orientation assertions still pass but prove
+ * much less, so {@link #displayIsLargeEnoughToBeMeaningful()} reports the configuration
+ * the run actually exercised.
+ * <p>
+ * These live in androidTest rather than test because they need the real resource
+ * resolution and the real back dispatch, and because non-exported activities cannot be
+ * started from the adb shell — instrumentation runs as the app's own UID, so it can.
+ */
+@RunWith(AndroidJUnit4.class)
+public class LargeScreenBehaviorInstrumentedTest {
+
+    private static final long BACK_NAVIGATION_TIMEOUT_MS = 8000;
+
+    // =========================================================================
+    // Configuration the run is actually exercising
+    // =========================================================================
+
+    @Test
+    public void displayIsLargeEnoughToBeMeaningful() {
+        Configuration config = resources().getConfiguration();
+        int smallestWidthDp = config.smallestScreenWidthDp;
+        boolean landscape = config.orientation == Configuration.ORIENTATION_LANDSCAPE;
+
+        // Not an assertion about the app — a report of what this device covers, so a
+        // green run on a phone AVD is not mistaken for coverage of the API 36 change.
+        assertTrue(
+                String.format("smallestScreenWidthDp=%d orientation=%s — run this on a "
+                                + "tablet AVD (>=600dp) to exercise the API 36 orientation change",
+                        smallestWidthDp, landscape ? "landscape" : "portrait"),
+                smallestWidthDp > 0
+        );
+    }
+
+    // =========================================================================
+    // Resource resolution in the configuration the device is actually in
+    // =========================================================================
+
+    @Test
+    public void welcomeBatchLayoutResolvesInThisConfiguration() {
+        assertNotNull(
+                "welcomebatch must resolve in the current configuration; it used to exist "
+                        + "only under -port qualifiers, which threw once API 36 let large "
+                        + "screens ignore WelcomeBatchActivity's portrait lock",
+                resources().getLayout(R.layout.welcomebatch)
+        );
+    }
+
+    @Test
+    public void everyLayoutResolvesInThisConfiguration() {
+        Resources resources = resources();
+        List<String> missing = new ArrayList<>();
+        int checked = 0;
+
+        for (Field field : R.layout.class.getFields()) {
+            int id;
+            try {
+                id = field.getInt(null);
+            } catch (IllegalAccessException e) {
+                continue;
+            }
+            checked++;
+            try {
+                resources.getLayout(id);
+            } catch (Resources.NotFoundException e) {
+                missing.add(field.getName());
+            }
+        }
+
+        assertTrue("Expected to find layouts to check", checked > 0);
+        if (!missing.isEmpty()) {
+            fail(String.format(
+                    "%d layout(s) do not resolve on this device (smallestScreenWidthDp=%d): %s",
+                    missing.size(), resources.getConfiguration().smallestScreenWidthDp, missing));
+        }
+    }
+
+    // =========================================================================
+    // Back navigation — one activity per implementation
+    // =========================================================================
+
+    /**
+     * SecurityActivity extends AppCompatActivity, so its back handling goes through
+     * AndroidX's OnBackPressedDispatcher.
+     */
+    @Test
+    public void securityActivityBackReturnsToPasswordScreen() {
+        assertBackReachesPasswordScreen(SecurityActivity.class);
+    }
+
+    /**
+     * PanelWebActivity extends the platform Activity, so its back handling goes through
+     * BackNavigationCompat and the platform OnBackInvokedDispatcher instead. Covering
+     * one activity from each family is what makes this pair worth running.
+     */
+    @Test
+    public void panelWebActivityBackReturnsToPasswordScreen() {
+        assertBackReachesPasswordScreen(PanelWebActivity.class);
+    }
+
+    /**
+     * Launches {@code activityClass}, presses back, and requires that
+     * CheckPasswordHtmlActivity comes up.
+     * <p>
+     * Asserting on the destination rather than on the launched activity finishing is
+     * deliberate: the platform's default back behaviour also finishes it, so a test
+     * that only checked for finishing would pass even with the back handler dead — which
+     * is exactly the bug this guards.
+     */
+    private void assertBackReachesPasswordScreen(Class<? extends Activity> activityClass) {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        Instrumentation.ActivityMonitor monitor = instrumentation.addMonitor(
+                CheckPasswordHtmlActivity.class.getName(), null, false);
+        try {
+            try (ActivityScenario<? extends Activity> scenario =
+                         ActivityScenario.launch(activityClass)) {
+                instrumentation.waitForIdleSync();
+                instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+
+                Activity destination =
+                        instrumentation.waitForMonitorWithTimeout(monitor, BACK_NAVIGATION_TIMEOUT_MS);
+                assertNotNull(
+                        activityClass.getSimpleName() + ": back must land on "
+                                + "CheckPasswordHtmlActivity. A null destination means the back "
+                                + "handler never ran — the failure mode when only onBackPressed "
+                                + "is overridden while enableOnBackInvokedCallback is true.",
+                        destination
+                );
+                destination.finish();
+            }
+        } finally {
+            instrumentation.removeMonitor(monitor);
+        }
+    }
+
+    // =========================================================================
+    // Not covered here: the lock screens
+    // =========================================================================
+    //
+    // PinNativeActivity and PasswordNativeActivity are the highest-risk activities for
+    // the API 36 orientation change — they declare
+    // configChanges="keyboardHidden|orientation", which does not cover screenSize, so a
+    // rotation destroys and recreates them, and a lock screen that does not come back is
+    // an unlocked device.
+    //
+    // They cannot be covered by simply launching them: the app has a guard that tears
+    // down a lock screen which should not be up (CloseActivity is started, and the lock
+    // activity goes PAUSED -> STOPPED -> DESTROYED within about a second). That is
+    // correct behaviour, so a test that launches the lock cold fails for a reason that
+    // has nothing to do with rotation.
+    //
+    // Verifying this needs a real lock command from the panel, then a physical rotation.
+    // Left as a manual check rather than a test that would pass or fail for the wrong
+    // reason.
+
+    private Resources resources() {
+        Context context = ApplicationProvider.getApplicationContext();
+        return context.getResources();
+    }
+}

From 1b60ababb90615a3c5aea214bbfbc2cd5b48e678 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Tue, 4 Aug 2026 14:14:12 +0100
Subject: [PATCH 7/9] Fix two vacuous assertions in the layout coverage tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

github-code-quality flagged largeScreenLandscapeQualifiersAreDeclared as a useless
comparison, and it was right: it asserted that a literal array's length was >= 2,
which cannot fail. The array it checked was not used by anything either — the
sweeps take their configuration from their own @Config qualifiers — so it was dead
data that could drift from the tests it claimed to describe. Both are gone.

The instrumented test had the same defect unflagged: assertTrue(smallestWidthDp
> 0) is true on any device. Replaced with an assertion that can actually fail —
PanelWebActivity declares screenOrientation="portrait", so on a large screen
running API 36 it must come up in landscape anyway. The preconditions are now
assumptions, so on a phone AVD or a tablet held in portrait the test reports as
skipped rather than passed, and a green suite cannot be read as coverage it did
not provide. Verified both ways: passes in landscape, skips in portrait.

Rotating the tablet to portrait to check that also surfaced a real false positive
in the sweeps. R.layout holds the merged resources of every dependency, and some
library layouts are config-scoped by design — material_clock_period_toggle_land
exists only for landscape — so the sweep failed on a Material layout that is not
ours to fix. The sweeps now skip third-party layouts by name prefix, a list
verified to cover all 108 library layouts while excluding none of the 38 the app
owns, and the failure message reports both counts so drift stays visible. If a
dependency later adds a config-scoped layout under a new prefix the test fails
naming it, which is the right direction to fail in.

Re-confirmed the guard still bites after the change: hiding layout/welcomebatch.xml
fails 3 of 4 Robolectric tests with "1 of 38 app layout(s) do not resolve ...
(108 library layouts skipped)".

92 unit tests and 52 instrumented tests green on the tablet AVD.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../LargeScreenBehaviorInstrumentedTest.java  | 87 ++++++++++++++++---
 ...tConfigurationCoverageRobolectricTest.java | 77 +++++++++-------
 2 files changed, 119 insertions(+), 45 deletions(-)

diff --git a/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
index a5bdb8bfd..a347c62d6 100644
--- a/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
+++ b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
@@ -27,9 +27,11 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * On-device checks for the two behaviours Android 16 (API 36) changed for this app.
@@ -53,20 +55,44 @@ public class LargeScreenBehaviorInstrumentedTest {
     // Configuration the run is actually exercising
     // =========================================================================
 
+    /**
+     * Asserts that the portrait lock really is being ignored, which is the premise every
+     * other test here rests on.
+     * <p>
+     * PanelWebActivity declares {@code screenOrientation="portrait"} in the manifest, so
+     * on a large screen running API 36 it should come up in landscape anyway. If it comes
+     * up portrait, the platform is still honouring the lock and this run is not exercising
+     * the change at all.
+     * <p>
+     * The preconditions are assumptions rather than assertions on purpose: on a phone AVD,
+     * or with the tablet rotated to portrait, this reports as skipped instead of passed, so
+     * a green suite cannot be mistaken for coverage it did not provide. The layout sweeps
+     * below still run either way — plain landscape is enough to catch the welcomebatch
+     * class of bug.
+     */
     @Test
-    public void displayIsLargeEnoughToBeMeaningful() {
+    public void portraitLockIsIgnoredOnThisDisplay() {
         Configuration config = resources().getConfiguration();
         int smallestWidthDp = config.smallestScreenWidthDp;
-        boolean landscape = config.orientation == Configuration.ORIENTATION_LANDSCAPE;
-
-        // Not an assertion about the app — a report of what this device covers, so a
-        // green run on a phone AVD is not mistaken for coverage of the API 36 change.
-        assertTrue(
-                String.format("smallestScreenWidthDp=%d orientation=%s — run this on a "
-                                + "tablet AVD (>=600dp) to exercise the API 36 orientation change",
-                        smallestWidthDp, landscape ? "landscape" : "portrait"),
-                smallestWidthDp > 0
-        );
+
+        assumeTrue(
+                String.format("smallestScreenWidthDp=%d is below 600 — run on a tablet AVD to "
+                        + "exercise the API 36 orientation change", smallestWidthDp),
+                smallestWidthDp >= 600);
+        assumeTrue(
+                "Device is in portrait, so an ignored portrait lock is indistinguishable from "
+                        + "an honoured one; rotate the AVD to landscape",
+                config.orientation == Configuration.ORIENTATION_LANDSCAPE);
+
+        try (ActivityScenario<PanelWebActivity> scenario =
+                     ActivityScenario.launch(PanelWebActivity.class)) {
+            scenario.onActivity(activity -> assertEquals(
+                    String.format("PanelWebActivity asks for portrait, but on a %ddp display "
+                                    + "running API 36 that request must be ignored",
+                            smallestWidthDp),
+                    Configuration.ORIENTATION_LANDSCAPE,
+                    activity.getResources().getConfiguration().orientation));
+        }
     }
 
     // =========================================================================
@@ -83,11 +109,29 @@ public void welcomeBatchLayoutResolvesInThisConfiguration() {
         );
     }
 
+    /**
+     * Name prefixes of layouts that come from AppCompat, Material and other AndroidX
+     * libraries. {@code R.layout} holds the merged resources of every dependency, and some
+     * library layouts are scoped to one configuration on purpose —
+     * {@code material_clock_period_toggle_land} exists only for landscape, and the library
+     * only reaches for it there — so sweeping them reports failures that are not ours.
+     * <p>
+     * Keep in sync with the copy in {@code LayoutConfigurationCoverageRobolectricTest},
+     * which documents how the list was verified against the dependency set.
+     */
+    private static final String[] THIRD_PARTY_LAYOUT_PREFIXES = {
+            "abc_", "m3_", "material_", "mtrl_", "design_", "notification_",
+            "select_dialog", "support_", "preference", "browser_actions",
+            "custom_dialog", "expand_button", "image_frame", "test_",
+            "fingerprint_dialog", "ime_",
+    };
+
     @Test
     public void everyLayoutResolvesInThisConfiguration() {
         Resources resources = resources();
         List<String> missing = new ArrayList<>();
         int checked = 0;
+        int skipped = 0;
 
         for (Field field : R.layout.class.getFields()) {
             int id;
@@ -96,6 +140,10 @@ public void everyLayoutResolvesInThisConfiguration() {
             } catch (IllegalAccessException e) {
                 continue;
             }
+            if (isThirdPartyLayout(field.getName())) {
+                skipped++;
+                continue;
+            }
             checked++;
             try {
                 resources.getLayout(id);
@@ -104,12 +152,23 @@ public void everyLayoutResolvesInThisConfiguration() {
             }
         }
 
-        assertTrue("Expected to find layouts to check", checked > 0);
+        assertTrue("Expected to find app-owned layouts to check", checked > 0);
         if (!missing.isEmpty()) {
             fail(String.format(
-                    "%d layout(s) do not resolve on this device (smallestScreenWidthDp=%d): %s",
-                    missing.size(), resources.getConfiguration().smallestScreenWidthDp, missing));
+                    "%d of %d app layout(s) do not resolve on this device "
+                            + "(smallestScreenWidthDp=%d, %d library layouts skipped): %s",
+                    missing.size(), checked,
+                    resources.getConfiguration().smallestScreenWidthDp, skipped, missing));
+        }
+    }
+
+    private static boolean isThirdPartyLayout(String layoutName) {
+        for (String prefix : THIRD_PARTY_LAYOUT_PREFIXES) {
+            if (layoutName.startsWith(prefix)) {
+                return true;
+            }
         }
+        return false;
     }
 
     // =========================================================================
diff --git a/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java b/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java
index 32a3d5e81..214498432 100644
--- a/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java
+++ b/app/src/test/java/com/prey/LayoutConfigurationCoverageRobolectricTest.java
@@ -44,17 +44,9 @@
 @Config(sdk = 30)
 public class LayoutConfigurationCoverageRobolectricTest {
 
-    /**
-     * Configurations an activity can now land in on a large screen. The sdk level
-     * is irrelevant here — what matters is that the qualifier no longer matches
-     * the {@code -port} folders, which is the state API 36 makes reachable.
-     */
-    private static final String[] LARGE_SCREEN_LANDSCAPE_QUALIFIERS = {
-            "land",
-            "sw600dp-land",
-            "sw720dp-land",
-            "xlarge-land",
-    };
+    // The configurations under test are the @Config qualifiers on each method. What
+    // matters about them is that they no longer match the -port folders, which is the
+    // state API 36 makes reachable on large screens.
 
     // =========================================================================
     // welcomebatch — the layout that regressed
@@ -99,14 +91,37 @@ public void givenPhoneLandscape_whenResolvingEveryLayout_thenNoneIsMissing() {
     }
 
     /**
-     * Resolves every {@code R.layout} entry under the current configuration and
-     * reports all misses at once, so a failure names each offending layout rather
-     * than only the first one.
+     * Name prefixes of layouts that come from AppCompat, Material and other AndroidX
+     * libraries. {@code R.layout} holds the merged resources of every dependency, and
+     * some library layouts are scoped to one configuration on purpose —
+     * {@code material_clock_period_toggle_land} exists only for landscape, and the
+     * library's own code only reaches for it there. Sweeping those would report a
+     * failure that is not ours to fix.
+     * <p>
+     * Verified against the current dependency set: these cover all 108 third-party
+     * layouts and exclude none of the 38 the app owns. If a dependency later adds a
+     * config-scoped layout under a new prefix, this fails naming that layout — a cheap,
+     * obvious fix, and the right direction to fail in, since the alternative would be to
+     * silently stop covering the app's own layouts.
+     * <p>
+     * Keep in sync with the copy in {@code LargeScreenBehaviorInstrumentedTest}.
+     */
+    private static final String[] THIRD_PARTY_LAYOUT_PREFIXES = {
+            "abc_", "m3_", "material_", "mtrl_", "design_", "notification_",
+            "select_dialog", "support_", "preference", "browser_actions",
+            "custom_dialog", "expand_button", "image_frame", "test_",
+            "fingerprint_dialog", "ime_",
+    };
+
+    /**
+     * Resolves every layout the app owns under the current configuration and reports all
+     * misses at once, so a failure names each offending layout rather than only the first.
      */
     private void assertEveryLayoutResolves(String qualifiers) {
         Resources resources = resources();
         List<String> missing = new ArrayList<>();
         int checked = 0;
+        int skipped = 0;
 
         for (Field field : R.layout.class.getFields()) {
             int id;
@@ -115,6 +130,10 @@ private void assertEveryLayoutResolves(String qualifiers) {
             } catch (IllegalAccessException e) {
                 continue;
             }
+            if (isThirdPartyLayout(field.getName())) {
+                skipped++;
+                continue;
+            }
             checked++;
             try {
                 resources.getLayout(id);
@@ -123,28 +142,24 @@ private void assertEveryLayoutResolves(String qualifiers) {
             }
         }
 
-        assertTrue("Expected to find layouts to check", checked > 0);
+        assertTrue("Expected to find app-owned layouts to check", checked > 0);
         if (!missing.isEmpty()) {
             fail(String.format(
-                    "%d layout(s) do not resolve under \"%s\" — they exist only under a "
-                            + "narrower qualifier and will throw Resources.NotFoundException "
-                            + "when shown in that configuration. Add a base res/layout variant "
-                            + "for: %s",
-                    missing.size(), qualifiers, missing));
+                    "%d of %d app layout(s) do not resolve under \"%s\" (%d library layouts "
+                            + "skipped) — they exist only under a narrower qualifier and will throw "
+                            + "Resources.NotFoundException when shown in that configuration. Add a "
+                            + "base res/layout variant for: %s",
+                    missing.size(), checked, qualifiers, skipped, missing));
         }
     }
 
-    /**
-     * Reports which configurations each qualifier under test actually stands for,
-     * so a future reader can tell the sweep is not silently passing on a
-     * configuration that still matches the {@code -port} folders.
-     */
-    @Test
-    public void largeScreenLandscapeQualifiersAreDeclared() {
-        assertTrue(
-                "The sweep must cover at least a phone landscape and a large-screen landscape case",
-                LARGE_SCREEN_LANDSCAPE_QUALIFIERS.length >= 2
-        );
+    private static boolean isThirdPartyLayout(String layoutName) {
+        for (String prefix : THIRD_PARTY_LAYOUT_PREFIXES) {
+            if (layoutName.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private Resources resources() {

From 770433f85c932a93d5ca135930c3755594a72ec0 Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Wed, 5 Aug 2026 12:30:34 +0100
Subject: [PATCH 8/9] Run instrumented tests on API 36 and force a large-screen
 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CI ran the emulator on API 30 with the runner's phone-sized AVD, so it never
exercised the change the app is being migrated for: below 600dp of smallest width
API 36 still honours the portrait lock, and the large-screen tests reported as
skipped while the job went green having covered nothing.

Adds an api-level matrix. API 36 is what the app targets; API 30 stays because
part of the code only runs below Android 13 — BackNavigationCompat falls back to
onBackPressed there, and the three plain-Activity overrides are live only on that
path — so dropping it would leave that untested. fail-fast is off so one failing
level still reports the other.

On the 36 leg the script resizes the display to 2560x1600 at 240dpi, giving 1066dp
of smallest width in landscape, and sets ignore-orientation-request. Verified
locally against both configurations rather than assumed: with phone metrics
(1080x2400 @ 420dpi, 411dp) portraitLockIsIgnoredOnThisDisplay reports skipped,
and with the metrics above it runs and passes, 0 skipped, with the platform
reporting ignoreOrientationRequest=true.

Also guards that test by API level. It assumed a large screen in landscape and
then asserted the portrait lock was ignored, which is false below API 36 — so on
the new API 30 leg it would have failed for a reason unrelated to any defect.
It now skips there instead.

Artifact names are per API level, since upload-artifact@v4 rejects two uploads
under one name.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .github/workflows/ci.yml                      | 33 +++++++++++++++----
 .../LargeScreenBehaviorInstrumentedTest.java  | 18 +++++++---
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f3a822c8..622aee926 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,16 @@
 # Android CI Pipeline
-# Runs 3 jobs in parallel:
+# Runs in parallel:
 #   - Lint: static analysis (~2 min)
 #   - Unit Tests: Robolectric tests on JVM, no emulator needed (~1 min)
-#   - Instrumented Tests: runs on Android emulator (~8-10 min)
+#   - Instrumented Tests: one emulator per API level in the matrix (~8-10 min each)
 # Total time is the slowest job (~10 min).
 # If the emulator job is unstable in CI, you can safely disable it
 # and rely on Robolectric tests only.
+#
+# The instrumented job runs on two API levels on purpose. API 36 is what the app
+# targets, and it is where the large-screen orientation change applies. API 30 is
+# kept because part of the code only runs below Android 13 — BackNavigationCompat
+# falls back to onBackPressed there — so dropping it would leave that path untested.
 
 name: CI
 
@@ -85,8 +90,12 @@ jobs:
           path: app/build/reports/tests/testDebugUnitTest/
 
   instrumented-test:
-    name: Instrumented Tests (Emulator)
+    name: Instrumented Tests (API ${{ matrix.api-level }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [30, 36]
     steps:
       - uses: actions/checkout@v4
 
@@ -117,13 +126,25 @@ jobs:
       - name: Run instrumented tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 30
+          api-level: ${{ matrix.api-level }}
           arch: x86_64
-          script: ./gradlew connectedDebugAndroidTest
+          script: |
+            if [ "${{ matrix.api-level }}" -ge 36 ]; then
+              # The runner's AVD is phone-sized, and the API 36 orientation change only
+              # applies from 600dp of smallest width up. Without this the large-screen
+              # tests report as skipped and the job passes having covered nothing.
+              # 1600dp / (240/160) = 1066dp of smallest width, in landscape.
+              adb shell wm size 2560x1600
+              adb shell wm density 240
+              adb shell wm set-ignore-orientation-request true
+              adb shell dumpsys window displays | grep -m1 ignoreOrientationRequest
+            fi
+            ./gradlew connectedDebugAndroidTest
 
       - name: Upload instrumented test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: instrumented-test-results
+          # Per API level: upload-artifact@v4 rejects two uploads under one name.
+          name: instrumented-test-results-api${{ matrix.api-level }}
           path: app/build/reports/androidTests/connected/
diff --git a/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
index a347c62d6..dbebfdab6 100644
--- a/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
+++ b/app/src/androidTest/java/com/prey/activities/LargeScreenBehaviorInstrumentedTest.java
@@ -11,6 +11,7 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.os.Build;
 import android.view.KeyEvent;
 
 import com.prey.R;
@@ -64,17 +65,24 @@ public class LargeScreenBehaviorInstrumentedTest {
      * up portrait, the platform is still honouring the lock and this run is not exercising
      * the change at all.
      * <p>
-     * The preconditions are assumptions rather than assertions on purpose: on a phone AVD,
-     * or with the tablet rotated to portrait, this reports as skipped instead of passed, so
-     * a green suite cannot be mistaken for coverage it did not provide. The layout sweeps
-     * below still run either way — plain landscape is enough to catch the welcomebatch
-     * class of bug.
+     * The preconditions are assumptions rather than assertions on purpose: below API 36, on
+     * a phone-sized display, or with the device in portrait, this reports as skipped instead
+     * of passed, so a green suite cannot be mistaken for coverage it did not provide. The
+     * layout sweeps below still run either way — plain landscape is enough to catch the
+     * welcomebatch class of bug, on any API level.
      */
     @Test
     public void portraitLockIsIgnoredOnThisDisplay() {
         Configuration config = resources().getConfiguration();
         int smallestWidthDp = config.smallestScreenWidthDp;
 
+        // Below API 36 the platform still honours the lock, so the assertion below would be
+        // wrong rather than merely uninformative. This matters for CI, which runs the suite
+        // on an older API level too, to cover BackNavigationCompat's pre-Android 13 path.
+        assumeTrue(
+                String.format("API %d is below 36, where the portrait lock is still honoured",
+                        Build.VERSION.SDK_INT),
+                Build.VERSION.SDK_INT >= 36);
         assumeTrue(
                 String.format("smallestScreenWidthDp=%d is below 600 — run on a tablet AVD to "
                         + "exercise the API 36 orientation change", smallestWidthDp),

From 00d92ee9c8ea3f24231083c9ec90e9b932f1ca3b Mon Sep 17 00:00:00 2001
From: Pato Jofre <luis.jofre.g@gmail.com>
Date: Wed, 5 Aug 2026 17:01:23 +0100
Subject: [PATCH 9/9] Move the instrumented test script out of ci.yml so it
 parses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The API 30 leg failed before running anything:

    /usr/bin/sh -c if [ "30" -ge 36 ]; then
    /usr/bin/sh: 1: Syntax error: end of file unexpected (expecting "fi")

reactivecircus/android-emulator-runner executes each line of an inline script in
its own shell, so only the first line of the `if` ever reached sh. Any multi-line
construct inline is unparseable, regardless of API level — the 36 leg would have
failed the same way.

Moves the logic to .github/scripts/run-instrumented-tests.sh, invoked as a single
line with the API level as an argument, and adds a guard for a missing argument so
a future edit to the workflow fails loudly instead of silently skipping the resize.

Verified rather than assumed, against a live API 36 emulator:
- `run-instrumented-tests.sh 36` applies the large-screen configuration, the
  platform reports ignoreOrientationRequest=true, and all 52 instrumented tests
  pass with 0 skipped.
- `run-instrumented-tests.sh 30` takes the phone-sized branch and the suite still
  runs — this is the path that was broken.
- The original failure reproduces locally by feeding just the first line to sh,
  which is what confirmed the diagnosis.
- Syntax checked with both `sh -n` and `dash -n`, dash being /usr/bin/sh on the
  runner.

The file is committed as 100755; without the exec bit the runner cannot invoke it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .github/scripts/run-instrumented-tests.sh | 36 +++++++++++++++++++++++
 .github/workflows/ci.yml                  | 16 +++-------
 2 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100755 .github/scripts/run-instrumented-tests.sh

diff --git a/.github/scripts/run-instrumented-tests.sh b/.github/scripts/run-instrumented-tests.sh
new file mode 100755
index 000000000..62ef2b51f
--- /dev/null
+++ b/.github/scripts/run-instrumented-tests.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Runs the instrumented suite inside the emulator-runner's script step.
+#
+# This lives in a file rather than inline in ci.yml because
+# reactivecircus/android-emulator-runner executes each line of an inline script in
+# its own shell. Any multi-line construct therefore breaks: an inline `if` fails
+# with "Syntax error: end of file unexpected (expecting fi)" because only the first
+# line reaches the shell. Invoking one script keeps it to a single line.
+#
+# Usage: run-instrumented-tests.sh <api-level>
+set -e
+
+API_LEVEL="$1"
+if [ -z "$API_LEVEL" ]; then
+    echo "usage: $0 <api-level>" >&2
+    exit 2
+fi
+
+if [ "$API_LEVEL" -ge 36 ]; then
+    # The runner's AVD is phone-sized, and the API 36 orientation change only
+    # applies from 600dp of smallest width up. Without this the large-screen tests
+    # report as skipped and the job goes green having covered nothing.
+    # 1600dp / (240/160) = 1066dp of smallest width, in landscape.
+    echo "API $API_LEVEL: forcing a large-screen configuration"
+    adb shell wm size 2560x1600
+    adb shell wm density 240
+    adb shell wm set-ignore-orientation-request true
+    # Informational, and must not fail the run if the line moves between releases.
+    adb shell dumpsys window displays | grep -m1 ignoreOrientationRequest || true
+else
+    # Left phone-sized on purpose: this level is here to cover the code that only
+    # runs below Android 13, where BackNavigationCompat falls back to onBackPressed.
+    echo "API $API_LEVEL: keeping the default phone configuration"
+fi
+
+./gradlew connectedDebugAndroidTest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 622aee926..b1cf59a63 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,18 +128,10 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
-          script: |
-            if [ "${{ matrix.api-level }}" -ge 36 ]; then
-              # The runner's AVD is phone-sized, and the API 36 orientation change only
-              # applies from 600dp of smallest width up. Without this the large-screen
-              # tests report as skipped and the job passes having covered nothing.
-              # 1600dp / (240/160) = 1066dp of smallest width, in landscape.
-              adb shell wm size 2560x1600
-              adb shell wm density 240
-              adb shell wm set-ignore-orientation-request true
-              adb shell dumpsys window displays | grep -m1 ignoreOrientationRequest
-            fi
-            ./gradlew connectedDebugAndroidTest
+          # One line on purpose: this action runs each line of an inline script in its
+          # own shell, so a multi-line `if` here fails to parse. The script forces a
+          # large-screen configuration on API 36 and leaves older levels phone-sized.
+          script: .github/scripts/run-instrumented-tests.sh ${{ matrix.api-level }}
 
       - name: Upload instrumented test results
         if: always()