From 00376f32e32645eeb324de1979858c65eb64af52 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 10:39:50 +0300
Subject: [PATCH 01/51] Upgrade targetSdk and compileSdk to 37

---
 app/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bb959ad15..b57b75cb7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,8 +38,8 @@ android {
         }
     }
 
-    compileSdk = 36
-    buildToolsVersion = "36.1.0"
+    compileSdk = 37
+    buildToolsVersion = "37.0.0"
     ndkVersion = "29.0.14206865"
 
     namespace = "app.grapheneos.camera"
@@ -47,7 +47,7 @@ android {
     defaultConfig {
         applicationId = "app.grapheneos.camera"
         minSdk = 29
-        targetSdk = 35
+        targetSdk = 37
         versionCode = 90
         versionName = versionCode.toString()
     }

From 53580a3bdb16cad5dcf5a3e86dcc0e8fb319e83c Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 10:39:57 +0300
Subject: [PATCH 02/51] Update .gitignore

---
 .gitignore                   |  5 +++++
 .idea/codeStyles/Project.xml | 39 +++++++++++++++++++++++++++++++-----
 .idea/gradle.xml             |  5 ++---
 .idea/misc.xml               |  3 ++-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 185bfbc61..8550a39e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,11 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/AndroidProjectSystem.xml
+.idea/deploymentTargetSelector.xml
+.idea/markdown.xml
+.idea/migrations.xml
+.idea/runConfigurations.xml
 
 # Keystore files
 *.jks
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 292f92856..6f7718bcf 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
       </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
       <option name="PACKAGES_IMPORT_LAYOUT">
         <value>
           <package name="" alias="false" withSubpackages="true" />
@@ -13,8 +44,6 @@
           <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a33cee777..639c779c3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c3324f59b..84db41232 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -119,7 +119,8 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

From f2514d31f0135861d77a84b92741b400d8d06872 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 10:56:10 +0300
Subject: [PATCH 03/51] Migrate to Gradle Version Catalog

---
 app/build.gradle.kts      | 24 +++++++++--------------
 build.gradle.kts          |  6 +++---
 gradle/libs.versions.toml | 41 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b57b75cb7..586ee39f9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,7 +9,7 @@ if (useKeystoreProperties) {
 }
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
 }
 
 java {
@@ -90,18 +90,12 @@ android {
 }
 
 dependencies {
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("com.google.android.material:material:1.13.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.core:core-ktx:1.17.0")
-
-    val cameraVersion = "1.6.0-alpha01"
-    implementation("androidx.camera:camera-core:$cameraVersion")
-    implementation("androidx.camera:camera-camera2:$cameraVersion")
-    implementation("androidx.camera:camera-lifecycle:$cameraVersion")
-    implementation("androidx.camera:camera-video:$cameraVersion")
-    implementation("androidx.camera:camera-view:$cameraVersion")
-    implementation("androidx.camera:camera-extensions:$cameraVersion")
-
-    implementation("com.google.zxing:core:3.5.3")
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.core.ktx)
+
+    implementation(libs.bundles.camerax)
+
+    implementation(libs.zxing.core)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index c0a236bc7..3d33ced36 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    id("com.android.application") version "9.0.0" apply false
+    alias(libs.plugins.android.application) apply false
 }
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
-        classpath("com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.5")
+        classpath(libs.kotlin.gradle.plugin)
+        classpath(libs.ksp.gradle.plugin)
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..0f009aeec
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,41 @@
+[versions]
+agp = "9.0.0"
+kotlin = "2.3.0"
+ksp = "2.3.5"
+
+appcompat = "1.7.1"
+camerax = "1.6.0-alpha01"
+constraintlayout = "2.2.1"
+coreKtx = "1.17.0"
+material = "1.13.0"
+zxing = "3.5.3"
+
+[libraries]
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+zxing-core = { module = "com.google.zxing:core", version.ref = "zxing" }
+
+androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "camerax" }
+androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camerax" }
+androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camerax" }
+androidx-camera-video = { module = "androidx.camera:camera-video", version.ref = "camerax" }
+androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "camerax" }
+androidx-camera-extensions = { module = "androidx.camera:camera-extensions", version.ref = "camerax" }
+
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+ksp-gradle-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
+
+[bundles]
+camerax = [
+    "androidx-camera-core",
+    "androidx-camera-camera2",
+    "androidx-camera-lifecycle",
+    "androidx-camera-video",
+    "androidx-camera-view",
+    "androidx-camera-extensions",
+]
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }

From c220a5dd52766bf302ac8a0205d672ce3a446477 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:42:10 +0300
Subject: [PATCH 04/51] Sync the androidxc forks with upstream, keeping our
 changes

---
 .../camera/core/impl/utils/Exif.java          |   33 +-
 .../exifinterface/media/ExifInterface.java    | 1316 +++++++++++------
 .../media/ExifInterfaceUtils.java             |   36 +-
 3 files changed, 843 insertions(+), 542 deletions(-)

diff --git a/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java b/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
index c4627d4e5..99cc153e6 100644
--- a/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
+++ b/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
@@ -18,13 +18,14 @@
 
 import android.location.Location;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.ImageProxy;
 import androidx.camera.core.Logger;
 import androidxc.exifinterface.media.ExifInterface;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -111,8 +112,7 @@ private Exif(ExifInterface exifInterface) {
      *
      * @param file the file to read exif data from
      */
-    @NonNull
-    public static Exif createFromFile(@NonNull File file) throws IOException {
+    public static @NonNull Exif createFromFile(@NonNull File file) throws IOException {
         return createFromFileString(file.toString());
     }
 
@@ -121,8 +121,8 @@ public static Exif createFromFile(@NonNull File file) throws IOException {
      *
      * <p> This method rewinds and reads the given buffer.
      */
-    @NonNull
-    public static Exif createFromImageProxy(@NonNull ImageProxy imageProxy) throws IOException {
+    public static @NonNull Exif createFromImageProxy(@NonNull ImageProxy imageProxy)
+            throws IOException {
         ByteBuffer buffer = imageProxy.getPlanes()[0].getBuffer();
         // Rewind to make sure it is at the beginning of the buffer
         buffer.rewind();
@@ -138,8 +138,7 @@ public static Exif createFromImageProxy(@NonNull ImageProxy imageProxy) throws I
      *
      * @param filePath the path to the file to read exif data from
      */
-    @NonNull
-    public static Exif createFromFileString(@NonNull String filePath) throws IOException {
+    public static @NonNull Exif createFromFileString(@NonNull String filePath) throws IOException {
         return new Exif(new ExifInterface(filePath));
     }
 
@@ -148,8 +147,7 @@ public static Exif createFromFileString(@NonNull String filePath) throws IOExcep
      *
      * @param is the input stream to read exif data from
      */
-    @NonNull
-    public static Exif createFromInputStream(@NonNull InputStream is) throws IOException {
+    public static @NonNull Exif createFromInputStream(@NonNull InputStream is) throws IOException {
         return new Exif(new ExifInterface(is));
     }
 
@@ -232,8 +230,7 @@ public int getHeight() {
         return mExifInterface.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, 0);
     }
 
-    @Nullable
-    public String getDescription() {
+    public @Nullable String getDescription() {
         return mExifInterface.getAttribute(ExifInterface.TAG_IMAGE_DESCRIPTION);
     }
 
@@ -387,8 +384,7 @@ public long getTimestamp() {
     }
 
     /** @return The location this picture was taken, or null if no location is available. */
-    @Nullable
-    public Location getLocation() {
+    public @Nullable Location getLocation() {
         String provider = mExifInterface.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD);
         double[] latlng = mExifInterface.getLatLong();
         double altitude = mExifInterface.getAltitude(0);
@@ -606,13 +602,11 @@ public void flipHorizontally() {
     }
 
     @VisibleForTesting
-    @Nullable
-    public String getMetadata() {
+    public @Nullable String getMetadata() {
         return mExifInterface.getAttribute(ExifInterface.TAG_XMP);
     }
 
-    @NonNull
-    public ExifInterface getExifInterface() {
+    public @NonNull ExifInterface getExifInterface() {
         return mExifInterface;
     }
 
@@ -729,8 +723,7 @@ static final class Converter {
      *
      * <p> Deprecated tags are not included.
      */
-    @NonNull
-    public static List<String> getAllExifTags() {
+    public static @NonNull List<String> getAllExifTags() {
         return Arrays.asList(
                 ExifInterface.TAG_IMAGE_WIDTH,
                 ExifInterface.TAG_IMAGE_LENGTH,
diff --git a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
index ecb8d1788..a1328eb25 100644
--- a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
+++ b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
@@ -23,8 +23,10 @@
 import static androidxc.exifinterface.media.ExifInterfaceUtils.parseSubSeconds;
 import static androidxc.exifinterface.media.ExifInterfaceUtils.startsWith;
 
+import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import android.annotation.SuppressLint;
 import android.content.res.AssetManager;
@@ -34,23 +36,26 @@
 import android.media.MediaDataSource;
 import android.media.MediaMetadataRetriever;
 import android.os.Build;
+import android.system.Os;
 import android.system.OsConstants;
 import android.util.Log;
 import android.util.Pair;
 
 import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
-import androidxc.exifinterface.media.ExifInterfaceUtils.Api21Impl;
+import androidx.annotation.VisibleForTesting;
 import androidxc.exifinterface.media.ExifInterfaceUtils.Api23Impl;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileDescriptor;
@@ -63,15 +68,18 @@
 import java.io.OutputStream;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -84,14 +92,41 @@
 
 /**
  * This is a class for reading and writing Exif tags in various image file formats.
+ *
+ * <p>Supported for reading: JPEG, PNG, WebP, HEIC, DNG, CR2, NEF, NRW, ARW, RW2, ORF, PEF, SRW,
+ * RAF, AVIF (on API 31+).
+ *
+ * <p>Supported for writing: JPEG, PNG, WebP.
+ *
  * <p>
- * Supported for reading: JPEG, PNG, WebP, HEIF, DNG, CR2, NEF, NRW, ARW, RW2, ORF, PEF, SRW, RAF.
- * <p>
- * Supported for writing: JPEG, PNG, WebP.
- * <p>
- * Note: JPEG and HEIF files may contain XMP data either inside the Exif data chunk or outside of
- * it. This class will search both locations for XMP data, but if XMP data exist both inside and
- * outside Exif, will favor the XMP data inside Exif over the one outside.
+ *
+ * <h3>XMP Support</h3>
+ *
+ * This class can read raw XMP data from the supported image file formats.
+ *
+ * <p>XMP data can be stored within Exif data (under tag 700), but many of the formats also define a
+ * separate storage location for XMP. ExifInterface handles this ambiguity as follows:
+ *
+ * <ul>
+ *   <li><b>JPEG</b>
+ *       <ul>
+ *         <li>The XMP spec part 3 section 3.3.2 forbids the XMP tag (700) being present in the Exif
+ *             segment of JPEG files (i.e. XMP should always be in a separate APP1 segment).
+ *         <li>If XMP is present in both Exif and separate segments, the XMP from the Exif segment
+ *             is returned from {@link #getAttributeBytes} and modifications to the XMP with {@link
+ *             #setAttribute} are written back to the XMP in the Exif segment, the XMP in the
+ *             separate segment is preserved unmodified. This is contrary to the spec described
+ *             above (which suggests the standalone XMP should be preferred over the XMP in the Exif
+ *             segment).
+ *         <li>If XMP is not present in either location, and is added with {@link #setAttribute}, it
+ *             is written as a standalone segment, in line with the spec described above.
+ *       </ul>
+ *   <li><b>HEIC & AVIF</b>
+ *       <ul>
+ *         <li>If XMP is present in both Exif and separate segments, the XMP from the separate
+ *             segment is returned from {@link #getAttributeBytes}.
+ *       </ul>
+ * </ul>
  */
 public class ExifInterface {
     private static final String TAG = "ExifInterface";
@@ -874,29 +909,43 @@ public class ExifInterface {
 
     // G. Tags related to picture-taking condition
     /**
-     *  <p>Exposure time, given in seconds.</p>
+     * Exposure time, given in seconds.
      *
-     *  <ul>
-     *      <li>Tag = 33434</li>
-     *      <li>Type = Unsigned rational</li>
-     *      <li>Count = 1</li>
-     *      <li>Default = None</li>
-     *  </ul>
+     * <p>Note: For backwards compatibility this attribute is returned from {@link
+     * #getAttribute(String)} in decimal form (i.e. the format produced by {@link
+     * Double#toString(double)}). It is accepted into {@link #setAttribute(String, String)} in both
+     * rational (e.g. {@code "1/3"}) and decimal forms. The decimal format is anything accepted by
+     * {@link Double#parseDouble(String)}, e.g. {@code "0.125"}.
+     *
+     * <ul>
+     *   <li>Tag = 33434
+     *   <li>Type = Unsigned rational
+     *   <li>Count = 1
+     *   <li>Default = None
+     * </ul>
      */
     public static final String TAG_EXPOSURE_TIME = "ExposureTime";
+
     /**
-     *  <p>The F number.</p>
+     * The F number.
      *
-     *  <ul>
-     *      <li>Tag = 33437</li>
-     *      <li>Type = Unsigned rational</li>
-     *      <li>Count = 1</li>
-     *      <li>Default = None</li>
-     *  </ul>
+     * <p>Note: For backwards compatibility this attribute is returned from {@link
+     * #getAttribute(String)} in decimal form (i.e. the format produced by {@link
+     * Double#toString(double)}). It is accepted into {@link #setAttribute(String, String)} in both
+     * rational (e.g. {@code "1/3"}) and decimal forms. The decimal format is anything accepted by
+     * {@link Double#parseDouble(String)}, e.g. {@code "0.125"}.
+     *
+     * <ul>
+     *   <li>Tag = 33437
+     *   <li>Type = Unsigned rational
+     *   <li>Count = 1
+     *   <li>Default = None
+     * </ul>
      */
     public static final String TAG_F_NUMBER = "FNumber";
+
     /**
-     *  <p>TThe class of the program used by the camera to set exposure when the picture is taken.
+     *  <p>The class of the program used by the camera to set exposure when the picture is taken.
      *  The tag values are as follows.</p>
      *
      *  <ul>
@@ -1108,19 +1157,28 @@ public class ExifInterface {
      *  </ul>
      */
     public static final String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
+
     /**
-     *  <p>The distance to the subject, given in meters. Note that if the numerator of the recorded
-     *  value is 0xFFFFFFFF, Infinity shall be indicated; and if the numerator is 0, Distance
-     *  unknown shall be indicated.</p>
+     * The distance to the subject, given in meters.
      *
-     *  <ul>
-     *      <li>Tag = 37382</li>
-     *      <li>Type = Unsigned rational</li>
-     *      <li>Count = 1</li>
-     *      <li>Default = None</li>
-     *  </ul>
+     * <p>Note that if the numerator of the recorded value is 0xFFFFFFFF, Infinity shall be
+     * indicated; and if the numerator is 0, Distance unknown shall be indicated.
+     *
+     * <p>Note: For backwards compatibility this attribute is returned from {@link
+     * #getAttribute(String)} in decimal form (i.e. the format produced by {@link
+     * Double#toString(double)}). It is accepted into {@link #setAttribute(String, String)} in both
+     * rational (e.g. {@code "1/3"}) and decimal forms. The decimal format is anything accepted by
+     * {@link Double#parseDouble(String)}, e.g. {@code "0.125"}.
+     *
+     * <ul>
+     *   <li>Tag = 37382
+     *   <li>Type = Unsigned rational
+     *   <li>Count = 1
+     *   <li>Default = None
+     * </ul>
      */
     public static final String TAG_SUBJECT_DISTANCE = "SubjectDistance";
+
     /**
      *  <p>The metering mode.</p>
      *
@@ -1442,18 +1500,26 @@ public class ExifInterface {
      *  @see #WHITEBALANCE_MANUAL
      */
     public static final String TAG_WHITE_BALANCE = "WhiteBalance";
+
     /**
-     *  <p>This tag indicates the digital zoom ratio when the image was shot. If the numerator of
-     *  the recorded value is 0, this indicates that digital zoom was not used.</p>
+     * This tag indicates the digital zoom ratio when the image was shot. If the numerator of the
+     * recorded value is 0, this indicates that digital zoom was not used.
      *
-     *  <ul>
-     *      <li>Tag = 41988</li>
-     *      <li>Type = Unsigned rational</li>
-     *      <li>Count = 1</li>
-     *      <li>Default = None</li>
-     *  </ul>
+     * <p>Note: For backwards compatibility this attribute is returned from {@link
+     * #getAttribute(String)} in decimal form (i.e. the format produced by {@link
+     * Double#toString(double)}). It is accepted into {@link #setAttribute(String, String)} in both
+     * rational (e.g. {@code "1/3"}) and decimal forms. The decimal format is anything accepted by
+     * {@link Double#parseDouble(String)}, e.g. {@code "0.125"}.
+     *
+     * <ul>
+     *   <li>Tag = 41988
+     *   <li>Type = Unsigned rational
+     *   <li>Count = 1
+     *   <li>Default = None
+     * </ul>
      */
     public static final String TAG_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";
+
     /**
      *  <p>This tag indicates the equivalent focal length assuming a 35mm film camera, in mm.
      *  A value of 0 means the focal length is unknown. Note that this tag differs from
@@ -1783,18 +1849,24 @@ public class ExifInterface {
      *  </ul>
      */
     public static final String TAG_GPS_ALTITUDE = "GPSAltitude";
+
     /**
-     *  <p>Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three
-     *  unsigned rational values giving the hour, minute, and second.</p>
+     * Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three
+     * unsigned rational values giving the hour, minute, and second.
      *
-     *  <ul>
-     *      <li>Tag = 7</li>
-     *      <li>Type = Unsigned rational</li>
-     *      <li>Count = 3</li>
-     *      <li>Default = None</li>
-     *  </ul>
+     * <p>Note: This attribute is returned from {@link #getAttribute(String)} and accepted into
+     * {@link #setAttribute(String, String)} as 3 colon-separated integers, e.g. {@code "11:05:32"}.
+     * Decimal or rational hours, minutes or seconds parts are not supported.
+     *
+     * <ul>
+     *   <li>Tag = 7
+     *   <li>Type = Unsigned rational
+     *   <li>Count = 3
+     *   <li>Default = None
+     * </ul>
      */
     public static final String TAG_GPS_TIMESTAMP = "GPSTimeStamp";
+
     /**
      *  <p>Indicates the GPS satellites used for measurements. This tag may be used to describe
      *  the number of satellites, their ID number, angle of elevation, azimuth, SNR and other
@@ -1867,7 +1939,8 @@ public class ExifInterface {
      */
     public static final String TAG_GPS_SPEED_REF = "GPSSpeedRef";
     /**
-     *  <p>Indicates the speed of GPS receiver movement.</p>
+     * Indicates the speed of GPS receiver movement. The units are indicated by {@link
+     * #TAG_GPS_SPEED_REF}.
      *
      *  <ul>
      *      <li>Tag = 13</li>
@@ -2146,7 +2219,6 @@ public class ExifInterface {
     // TODO: Unhide this when it can be public.
     /**
      * @see #TAG_ORIENTATION
-     * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     public static final String TAG_THUMBNAIL_ORIENTATION = "ThumbnailOrientation";
@@ -2194,8 +2266,11 @@ public class ExifInterface {
     public static final String TAG_RW2_JPG_FROM_RAW = "JpgFromRaw";
     /**
      * Type is byte[]. See <a href=
-     * "https://en.wikipedia.org/wiki/Extensible_Metadata_Platform">Extensible
-     * Metadata Platform (XMP)</a> for details on contents.
+     * "https://en.wikipedia.org/wiki/Extensible_Metadata_Platform">Extensible Metadata Platform
+     * (XMP)</a> for details on contents.
+     *
+     * <p>See also notes about XMP handling in different containers in the class-level javadoc of
+     * this class.
      */
     public static final String TAG_XMP = "Xmp";
     /** Type is int. See JEITA CP-3451C Spec Section 3: Bilevel Images. */
@@ -2952,12 +3027,41 @@ public class ExifInterface {
      */
     public static final int STREAM_TYPE_EXIF_DATA_ONLY = 1;
 
-    /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({STREAM_TYPE_FULL_IMAGE_DATA, STREAM_TYPE_EXIF_DATA_ONLY})
     public @interface ExifStreamType {}
 
+    @Retention(RetentionPolicy.SOURCE)
+    @Target(TYPE_USE)
+    @IntDef({
+        XMP_HANDLING_TIFF_700_ONLY,
+        XMP_HANDLING_PREFER_SEPARATE,
+        XMP_HANDLING_PREFER_TIFF_700_IF_PRESENT
+    })
+    private @interface XmpHandling {}
+
+    /**
+     * The format only supports XMP data stored in the TIFF/Exif 700 tag (or it supports storing XMP
+     * in a separate segment but this should never be used).
+     */
+    private static final int XMP_HANDLING_TIFF_700_ONLY = 1;
+
+    /**
+     * The format supports XMP data stored in a separate segment, and this should always be
+     * preferred if present.
+     *
+     * <p>If XMP data is only present in the TIFF/Exif 700 tag it will be read and written from
+     * there.
+     */
+    private static final int XMP_HANDLING_PREFER_SEPARATE = 2;
+
+    /**
+     * The format supports XMP data stored in a separate segment, and this should be preferred
+     * unless XMP is also present in the TIFF/Exif 700 tag.
+     */
+    private static final int XMP_HANDLING_PREFER_TIFF_700_IF_PRESENT = 3;
+
     // Maximum size for checking file type signature (see image_type_recognition_lite.cc)
     private static final int SIGNATURE_CHECK_SIZE = 5000;
 
@@ -2968,6 +3072,8 @@ public class ExifInterface {
     private static final byte[] HEIF_TYPE_FTYP = new byte[] {'f', 't', 'y', 'p'};
     private static final byte[] HEIF_BRAND_MIF1 = new byte[] {'m', 'i', 'f', '1'};
     private static final byte[] HEIF_BRAND_HEIC = new byte[] {'h', 'e', 'i', 'c'};
+    private static final byte[] HEIF_BRAND_AVIF = new byte[] {'a', 'v', 'i', 'f'};
+    private static final byte[] HEIF_BRAND_AVIS = new byte[] {'a', 'v', 'i', 's'};
 
     // See http://fileformats.archiveteam.org/wiki/Olympus_ORF
     private static final short ORF_SIGNATURE_1 = 0x4f52;
@@ -2995,17 +3101,19 @@ public class ExifInterface {
     // 3.1. PNG file signature
     private static final byte[] PNG_SIGNATURE = new byte[] {(byte) 0x89, (byte) 0x50, (byte) 0x4e,
             (byte) 0x47, (byte) 0x0d, (byte) 0x0a, (byte) 0x1a, (byte) 0x0a};
-    // See PNG (Portable Network Graphics) Specification, Version 1.2,
+    // See "Extensions to the PNG 1.2 Specification, Version 1.5.0",
     // 3.7. eXIf Exchangeable Image File (Exif) Profile
-    private static final byte[] PNG_CHUNK_TYPE_EXIF = new byte[]{(byte) 0x65, (byte) 0x58,
-            (byte) 0x49, (byte) 0x66};
-    private static final byte[] PNG_CHUNK_TYPE_IHDR = new byte[]{(byte) 0x49, (byte) 0x48,
-            (byte) 0x44, (byte) 0x52};
-    private static final byte[] PNG_CHUNK_TYPE_IEND = new byte[]{(byte) 0x49, (byte) 0x45,
-            (byte) 0x4e, (byte) 0x44};
-    private static final int PNG_CHUNK_TYPE_BYTE_LENGTH = 4;
+    private static final int PNG_CHUNK_TYPE_EXIF = 'e' << 24 | 'X' << 16 | 'I' << 8 | 'f';
+    // See "XMP Specification Part 3: Storage in Files" section 1.1.5
+    private static final int PNG_CHUNK_TYPE_ITXT = 'i' << 24 | 'T' << 16 | 'X' << 8 | 't';
+    private static final int PNG_CHUNK_TYPE_IHDR = 'I' << 24 | 'H' << 16 | 'D' << 8 | 'R';
+    private static final int PNG_CHUNK_TYPE_IEND = 'I' << 24 | 'E' << 16 | 'N' << 8 | 'D';
     private static final int PNG_CHUNK_CRC_BYTE_LENGTH = 4;
 
+    /** The keyword and 5 null bytes defined by XMP spec part 3 table 9 (section 1.1.5). */
+    @VisibleForTesting
+    static final byte[] PNG_ITXT_XMP_KEYWORD = "XML:com.adobe.xmp\0\0\0\0\0".getBytes(UTF_8);
+
     // See https://developers.google.com/speed/webp/docs/riff_container, Section "WebP File Header"
     private static final byte[] WEBP_SIGNATURE_1 = new byte[] {'R', 'I', 'F', 'F'};
     private static final byte[] WEBP_SIGNATURE_2 = new byte[] {'W', 'E', 'B', 'P'};
@@ -3024,8 +3132,8 @@ public class ExifInterface {
     private static final int WEBP_CHUNK_TYPE_BYTE_LENGTH = 4;
     private static final int WEBP_CHUNK_SIZE_BYTE_LENGTH = 4;
 
-    private static SimpleDateFormat sFormatterPrimary;
-    private static SimpleDateFormat sFormatterSecondary;
+    private static final SimpleDateFormat sFormatterPrimary;
+    private static final SimpleDateFormat sFormatterSecondary;
 
     // See Exchangeable image file format for digital still cameras: Exif version 2.2.
     // The following values are for parsing EXIF data area. There are tag groups in EXIF data area.
@@ -3059,32 +3167,27 @@ public class ExifInterface {
     private static final int SKIP_BUFFER_SIZE = 8192;
 
     // Names for the data formats for debugging purpose.
-    static final String[] IFD_FORMAT_NAMES = new String[] {
+    private static final String[] IFD_FORMAT_NAMES = new String[] {
             "", "BYTE", "STRING", "USHORT", "ULONG", "URATIONAL", "SBYTE", "UNDEFINED", "SSHORT",
             "SLONG", "SRATIONAL", "SINGLE", "DOUBLE", "IFD"
     };
     // Sizes of the components of each IFD value format
-    static final int[] IFD_FORMAT_BYTES_PER_FORMAT = new int[] {
+    private static final int[] IFD_FORMAT_BYTES_PER_FORMAT = new int[] {
             0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 1
     };
 
-    @SuppressWarnings("WeakerAccess") /* synthetic access */
-    static final byte[] EXIF_ASCII_PREFIX = new byte[] {
+    private static final byte[] EXIF_ASCII_PREFIX = new byte[] {
             0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0
     };
 
     // A class for indicating EXIF rational type.
-    private static class Rational {
+    // TODO: b/308978831 - Migrate to android.util.Rational when the min API is 21.
+    @VisibleForTesting
+    static class Rational {
         public final long numerator;
         public final long denominator;
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
-        Rational(double value) {
-            this((long) (value * 10000), 10000);
-        }
-
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
-        Rational(long numerator, long denominator) {
+        private Rational(long numerator, long denominator) {
             // Handle erroneous case
             if (denominator == 0) {
                 this.numerator = 0;
@@ -3095,8 +3198,44 @@ private static class Rational {
             this.denominator = denominator;
         }
 
+        /**
+         * Creates a new {@code Rational} which approximates the provided {@code double} value by
+         * using <a href="https://en.wikipedia.org/wiki/Continued_fraction">continued fractions</a>.
+         */
+        public static @NonNull Rational createFromDouble(double value) {
+            if (value >= Long.MAX_VALUE || value <= Long.MIN_VALUE) {
+                // value is too large to represent as a long, so just return the max/min value.
+                return new Rational(
+                        /* numerator= */ value > 0 ? Long.MAX_VALUE : Long.MIN_VALUE,
+                        /* denominator= */ 1);
+            }
+
+            double absoluteValue = Math.abs(value);
+            double threshold = 0.00000001 * absoluteValue;
+            double remainingValue = absoluteValue;
+            long numerator = 1;
+            long previousNumerator = 0;
+            long denominator = 0;
+            long previousDenominator = 1;
+            do {
+                double remainder = remainingValue % 1;
+                long wholePart = (long) (remainingValue - remainder);
+                long tmp = numerator;
+                numerator = wholePart * numerator + previousNumerator;
+                previousNumerator = tmp;
+
+                tmp = denominator;
+                denominator = wholePart * denominator + previousDenominator;
+                previousDenominator = tmp;
+
+                remainingValue = 1 / remainder;
+            } while ((Math.abs(absoluteValue - numerator / (double) denominator) > threshold));
+
+            return new Rational(value < 0 ? -numerator : numerator, denominator);
+        }
+
         @Override
-        public String toString() {
+        public @NonNull String toString() {
             return numerator + "/" + denominator;
         }
 
@@ -3114,12 +3253,10 @@ private static class ExifAttribute {
         public final long bytesOffset;
         public final byte[] bytes;
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         ExifAttribute(int format, int numberOfComponents, byte[] bytes) {
             this(format, numberOfComponents, BYTES_OFFSET_UNKNOWN, bytes);
         }
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         ExifAttribute(int format, int numberOfComponents, long bytesOffset, byte[] bytes) {
             this.format = format;
             this.numberOfComponents = numberOfComponents;
@@ -3165,10 +3302,6 @@ public static ExifAttribute createSLong(int[] values, ByteOrder byteOrder) {
             return new ExifAttribute(IFD_FORMAT_SLONG, values.length, buffer.array());
         }
 
-        public static ExifAttribute createSLong(int value, ByteOrder byteOrder) {
-            return createSLong(new int[] {value}, byteOrder);
-        }
-
         public static ExifAttribute createByte(String value) {
             // Exception for GPSAltitudeRef tag
             if (value.length() == 1 && value.charAt(0) >= '0' && value.charAt(0) <= '1') {
@@ -3210,10 +3343,6 @@ public static ExifAttribute createSRational(Rational[] values, ByteOrder byteOrd
             return new ExifAttribute(IFD_FORMAT_SRATIONAL, values.length, buffer.array());
         }
 
-        public static ExifAttribute createSRational(Rational value, ByteOrder byteOrder) {
-            return createSRational(new Rational[] {value}, byteOrder);
-        }
-
         public static ExifAttribute createDouble(double[] values, ByteOrder byteOrder) {
             final ByteBuffer buffer = ByteBuffer.wrap(
                     new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_DOUBLE] * values.length]);
@@ -3224,16 +3353,11 @@ public static ExifAttribute createDouble(double[] values, ByteOrder byteOrder) {
             return new ExifAttribute(IFD_FORMAT_DOUBLE, values.length, buffer.array());
         }
 
-        public static ExifAttribute createDouble(double value, ByteOrder byteOrder) {
-            return createDouble(new double[] {value}, byteOrder);
-        }
-
         @Override
-        public String toString() {
+        public @NonNull String toString() {
             return "(" + IFD_FORMAT_NAMES[format] + ", data length:" + bytes.length + ")";
         }
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         Object getValue(ByteOrder byteOrder) {
             ByteOrderedDataInputStream inputStream = null;
             try {
@@ -3481,13 +3605,12 @@ public int size() {
     }
 
     // A class for indicating EXIF tag.
-    static class ExifTag {
+    private static class ExifTag {
         public final int number;
         public final String name;
         public final int primaryFormat;
         public final int secondaryFormat;
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         ExifTag(String name, int number, int format) {
             this.name = name;
             this.number = number;
@@ -3495,7 +3618,6 @@ static class ExifTag {
             this.secondaryFormat = -1;
         }
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         ExifTag(String name, int number, int primaryFormat, int secondaryFormat) {
             this.name = name;
             this.number = number;
@@ -3503,7 +3625,6 @@ static class ExifTag {
             this.secondaryFormat = secondaryFormat;
         }
 
-        @SuppressWarnings("WeakerAccess") /* synthetic access */
         boolean isFormatCompatible(int format) {
             if (primaryFormat == IFD_FORMAT_UNDEFINED || format == IFD_FORMAT_UNDEFINED) {
                 return true;
@@ -3761,7 +3882,6 @@ boolean isFormatCompatible(int format) {
     // The following values are used for indicating pointers to the other Image File Directories.
 
     // Indices of Exif Ifd tag groups
-    /** @hide */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({IFD_TYPE_PRIMARY, IFD_TYPE_EXIF, IFD_TYPE_GPS, IFD_TYPE_INTEROPERABILITY,
@@ -3769,23 +3889,24 @@ boolean isFormatCompatible(int format) {
             IFD_TYPE_ORF_CAMERA_SETTINGS, IFD_TYPE_ORF_IMAGE_PROCESSING, IFD_TYPE_PEF})
     public @interface IfdType {}
 
-    static final int IFD_TYPE_PRIMARY = 0;
+    private static final int IFD_TYPE_PRIMARY = 0;
     private static final int IFD_TYPE_EXIF = 1;
     private static final int IFD_TYPE_GPS = 2;
     private static final int IFD_TYPE_INTEROPERABILITY = 3;
-    static final int IFD_TYPE_THUMBNAIL = 4;
-    static final int IFD_TYPE_PREVIEW = 5;
+    private static final int IFD_TYPE_THUMBNAIL = 4;
+    private static final int IFD_TYPE_PREVIEW = 5;
     private static final int IFD_TYPE_ORF_MAKER_NOTE = 6;
     private static final int IFD_TYPE_ORF_CAMERA_SETTINGS = 7;
     private static final int IFD_TYPE_ORF_IMAGE_PROCESSING = 8;
     private static final int IFD_TYPE_PEF = 9;
 
-    // List of Exif tag groups
-    static final ExifTag[][] EXIF_TAGS = new ExifTag[][] {
-            IFD_TIFF_TAGS, IFD_EXIF_TAGS, IFD_GPS_TAGS, IFD_INTEROPERABILITY_TAGS,
-            IFD_THUMBNAIL_TAGS, IFD_TIFF_TAGS, ORF_MAKER_NOTE_TAGS, ORF_CAMERA_SETTINGS_TAGS,
-            ORF_IMAGE_PROCESSING_TAGS, PEF_TAGS
-    };
+    // List of Exif tag groups, indexed by the IDF_TYPE_* constants above.
+    static final ExifTag[][] EXIF_TAGS =
+            new ExifTag[][] {
+                IFD_TIFF_TAGS, IFD_EXIF_TAGS, IFD_GPS_TAGS, IFD_INTEROPERABILITY_TAGS,
+                IFD_THUMBNAIL_TAGS, IFD_TIFF_TAGS, ORF_MAKER_NOTE_TAGS, ORF_CAMERA_SETTINGS_TAGS,
+                ORF_IMAGE_PROCESSING_TAGS, PEF_TAGS
+            };
     // List of tags for pointing to the other image file directory offset.
     private static final ExifTag[] EXIF_POINTER_TAGS = new ExifTag[] {
             new ExifTag(TAG_SUB_IFD_POINTER, 330, IFD_FORMAT_ULONG),
@@ -3804,28 +3925,47 @@ boolean isFormatCompatible(int format) {
     @SuppressWarnings("unchecked")
     private static final HashMap<String, ExifTag>[] sExifTagMapsForWriting =
             new HashMap[EXIF_TAGS.length];
-    private static final HashSet<String> sTagSetForCompatibility = new HashSet<>(Arrays.asList(
-            TAG_F_NUMBER, TAG_DIGITAL_ZOOM_RATIO, TAG_EXPOSURE_TIME, TAG_SUBJECT_DISTANCE,
-            TAG_GPS_TIMESTAMP));
+
+    /**
+     * These are tags of type 'Unsigned rational' but which are handled in decimal form.
+     *
+     * <p>This means they are output from {@link #getAttribute(String)}, and accepted into {@link
+     * #setAttribute(String, String)}, as strings in decimal form (e.g. {@code "0.125"}, {@code
+     * "6.25E-4"}).
+     *
+     * <p>This is to maintain backwards compatibility with a previous implementation of the {@link
+     * android.media.ExifInterface} (the platform variant of this class).
+     *
+     * <p>See <a
+     * href="http://ag/c/platform/frameworks/base/+/909922/2..9/api/current.txt#b20093">this
+     * internal code review comment from 2016</a> for more details.
+     */
+    private static final Set<String> RATIONAL_TAGS_HANDLED_AS_DECIMALS_FOR_COMPATIBILITY =
+            Collections.unmodifiableSet(
+                    new HashSet<>(
+                            Arrays.asList(
+                                    TAG_F_NUMBER,
+                                    TAG_DIGITAL_ZOOM_RATIO,
+                                    TAG_EXPOSURE_TIME,
+                                    TAG_SUBJECT_DISTANCE)));
+
     // Mappings from tag number to IFD type for pointer tags.
-    @SuppressWarnings("unchecked")
-    private static final HashMap<Integer, Integer> sExifPointerTagMap = new HashMap();
+    private static final HashMap<Integer, Integer> sExifPointerTagMap = new HashMap<>();
 
     // See JPEG File Interchange Format Version 1.02.
     // The following values are defined for handling JPEG streams. In this implementation, we are
     // not only getting information from EXIF but also from some JPEG special segments such as
     // MARKER_COM for user comment and MARKER_SOFx for image width and height.
-    @SuppressWarnings("WeakerAccess") /* synthetic access */
-    static final Charset ASCII = Charset.forName("US-ASCII");
+    private static final Charset ASCII = Charset.forName("US-ASCII");
     // Identifier for EXIF APP1 segment in JPEG
-    static final byte[] IDENTIFIER_EXIF_APP1 = "Exif\0\0".getBytes(ASCII);
+    @VisibleForTesting static final byte[] IDENTIFIER_EXIF_APP1 = "Exif\0\0".getBytes(ASCII);
     // Identifier for XMP APP1 segment in JPEG
     private static final byte[] IDENTIFIER_XMP_APP1 =
             "http://ns.adobe.com/xap/1.0/\0".getBytes(ASCII);
     // JPEG segment markers, that each marker consumes two bytes beginning with 0xff and ending with
     // the indicator. There is no SOF4, SOF8, SOF16 markers in JPEG and SOFx markers indicates start
     // of frame(baseline DCT) and the image size info exists in its beginning part.
-    static final byte MARKER = (byte) 0xff;
+    private static final byte MARKER = (byte) 0xff;
     private static final byte MARKER_SOI = (byte) 0xd8;
     private static final byte MARKER_SOF0 = (byte) 0xc0;
     private static final byte MARKER_SOF1 = (byte) 0xc1;
@@ -3841,26 +3981,22 @@ boolean isFormatCompatible(int format) {
     private static final byte MARKER_SOF14 = (byte) 0xce;
     private static final byte MARKER_SOF15 = (byte) 0xcf;
     private static final byte MARKER_SOS = (byte) 0xda;
-    static final byte MARKER_APP1 = (byte) 0xe1;
+    @VisibleForTesting static final byte MARKER_APP1 = (byte) 0xe1;
     private static final byte MARKER_COM = (byte) 0xfe;
-    static final byte MARKER_EOI = (byte) 0xd9;
+    private static final byte MARKER_EOI = (byte) 0xd9;
 
     // Supported Image File Types
-    static final int IMAGE_TYPE_UNKNOWN = 0;
-    static final int IMAGE_TYPE_ARW = 1;
-    static final int IMAGE_TYPE_CR2 = 2;
-    static final int IMAGE_TYPE_DNG = 3;
-    static final int IMAGE_TYPE_JPEG = 4;
-    static final int IMAGE_TYPE_NEF = 5;
-    static final int IMAGE_TYPE_NRW = 6;
-    static final int IMAGE_TYPE_ORF = 7;
-    static final int IMAGE_TYPE_PEF = 8;
-    static final int IMAGE_TYPE_RAF = 9;
-    static final int IMAGE_TYPE_RW2 = 10;
-    static final int IMAGE_TYPE_SRW = 11;
-    static final int IMAGE_TYPE_HEIF = 12;
-    static final int IMAGE_TYPE_PNG = 13;
-    static final int IMAGE_TYPE_WEBP = 14;
+    private static final int IMAGE_TYPE_UNKNOWN = 0;
+    private static final int IMAGE_TYPE_DNG = 3;
+    private static final int IMAGE_TYPE_JPEG = 4;
+    private static final int IMAGE_TYPE_ORF = 7;
+    private static final int IMAGE_TYPE_PEF = 8;
+    private static final int IMAGE_TYPE_RAF = 9;
+    private static final int IMAGE_TYPE_RW2 = 10;
+    private static final int IMAGE_TYPE_HEIC = 12;
+    private static final int IMAGE_TYPE_PNG = 13;
+    private static final int IMAGE_TYPE_WEBP = 14;
+    private static final int IMAGE_TYPE_AVIF = 15;
 
     static {
         sFormatterPrimary = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss", Locale.US);
@@ -3907,12 +4043,29 @@ boolean isFormatCompatible(int format) {
     // Used to indicate offset from the start of the original input stream to EXIF data
     private int mOffsetToExifData;
     private int mOrfMakerNoteOffset;
+
+    /** The position of the thumbnail within the Exif data (from {@link #mOffsetToExifData}). */
     private int mOrfThumbnailOffset;
+
     private int mOrfThumbnailLength;
     private boolean mModified;
-    // XMP data can be contained as either part of the EXIF data (tag number 700), or as a
-    // separate data marker (a separate MARKER_APP1).
-    private boolean mXmpIsFromSeparateMarker;
+
+    /**
+     * XMP data can occur as either part of the TIFF/Exif data (tag number 700), or as a separate
+     * section of the file (e.g. a separate APP1 segment in JPEG, or an iTXt chunk in PNG). XMP read
+     * from within the TIFF/Exif data is stored in {@link #mAttributes}, while XMP read from a
+     * separate section is here. If both are present, the disambiguation rules vary per file format,
+     * see {@link #getXmpHandlingForImageType(int)}.
+     */
+    @Nullable private ExifAttribute mXmpFromSeparateMarker;
+
+    /**
+     * True if the file on disk contains XMP in a separate section.
+     *
+     * <p>This means the file the instance was loaded with, or the file created by the last call to
+     * {@link #saveAttributes()}.
+     */
+    private boolean mFileOnDiskContainsSeparateXmpMarker;
 
     // Pattern to check non zero timestamp
     private static final Pattern NON_ZERO_TIME_PATTERN = Pattern.compile(".*[1-9].*");
@@ -3974,13 +4127,13 @@ public ExifInterface(@NonNull FileDescriptor fileDescriptor) throws IOException
         mFilename = null;
 
         boolean isFdDuped = false;
-        if (Build.VERSION.SDK_INT >= 21 && isSeekableFD(fileDescriptor)) {
+        if (isSeekableFD(fileDescriptor)) {
             mSeekableFileDescriptor = fileDescriptor;
             // Keep the original file descriptor in order to save attributes when it's seekable.
             // Otherwise, just close the given file descriptor after reading it because the save
             // feature won't be working.
             try {
-                fileDescriptor = Api21Impl.dup(fileDescriptor);
+                fileDescriptor = Os.dup(fileDescriptor);
                 isFdDuped = true;
             } catch (Exception e) {
                 throw new IOException("Failed to duplicate file descriptor", e);
@@ -4032,14 +4185,8 @@ public ExifInterface(@NonNull InputStream inputStream, @ExifStreamType int strea
         }
         mFilename = null;
 
-        boolean shouldBeExifDataOnly = (streamType == STREAM_TYPE_EXIF_DATA_ONLY);
-        if (shouldBeExifDataOnly) {
-            inputStream = new BufferedInputStream(inputStream, IDENTIFIER_EXIF_APP1.length);
-            if (!isExifDataOnly((BufferedInputStream) inputStream)) {
-                Log.w(TAG, "Given data does not follow the structure of an Exif-only data.");
-                return;
-            }
-            mIsExifDataOnly = true;
+        mIsExifDataOnly = streamType == STREAM_TYPE_EXIF_DATA_ONLY;
+        if (mIsExifDataOnly) {
             mAssetInputStream = null;
             mSeekableFileDescriptor = null;
         } else {
@@ -4097,9 +4244,7 @@ public static boolean isSupportedMimeType(@NonNull String mimeType) {
      *
      * @param tag the name of the tag.
      */
-    @SuppressWarnings("deprecation")
-    @Nullable
-    private ExifAttribute getExifAttribute(@NonNull String tag) {
+    private @Nullable ExifAttribute getExifAttribute(@NonNull String tag) {
         if (tag == null) {
             throw new NullPointerException("tag shouldn't be null");
         }
@@ -4111,6 +4256,11 @@ private ExifAttribute getExifAttribute(@NonNull String tag) {
             }
             tag = TAG_PHOTOGRAPHIC_SENSITIVITY;
         }
+        if (TAG_XMP.equals(tag)
+                && getXmpHandlingForImageType(mMimeType) == XMP_HANDLING_PREFER_SEPARATE
+                && mXmpFromSeparateMarker != null) {
+            return mXmpFromSeparateMarker;
+        }
         // Retrieves all tag groups. The value from primary image tag group has a higher priority
         // than the value from the thumbnail tag group if there are more than one candidates.
         for (int i = 0; i < EXIF_TAGS.length; ++i) {
@@ -4119,49 +4269,79 @@ private ExifAttribute getExifAttribute(@NonNull String tag) {
                 return value;
             }
         }
+        if (TAG_XMP.equals(tag) && mXmpFromSeparateMarker != null) {
+            return mXmpFromSeparateMarker;
+        }
         return null;
     }
 
+    private static @XmpHandling int getXmpHandlingForImageType(int imageType) {
+        switch (imageType) {
+            // ExifInterface has a documented (but spec-violating) preference for reading and
+            // writing JPEG XMP data from Exif/TIFF tag 700 instead of a separate XMP APP1 segment
+            // if both are present.
+            case IMAGE_TYPE_JPEG:
+                return XMP_HANDLING_PREFER_TIFF_700_IF_PRESENT;
+            case IMAGE_TYPE_AVIF:
+            case IMAGE_TYPE_HEIC:
+            case IMAGE_TYPE_PNG:
+            // RAF stores XMP/Exif in JPEG, but we have no documented backwards-compat obligations
+            // so we can implement the spec to store XMP in a separate APP1 segment.
+            case IMAGE_TYPE_RAF:
+                return XMP_HANDLING_PREFER_SEPARATE;
+            case IMAGE_TYPE_DNG:
+            case IMAGE_TYPE_ORF:
+            case IMAGE_TYPE_PEF:
+            case IMAGE_TYPE_RW2:
+            case IMAGE_TYPE_UNKNOWN:
+            // WebP supports a separate XMP chunk (so should be XMP_HANDLING_PREFER_SEPARATE), but
+            // ExifInterface doesn't currently read or write it.
+            case IMAGE_TYPE_WEBP:
+            default:
+                return XMP_HANDLING_TIFF_700_ONLY;
+        }
+    }
+
     /**
      * Returns the value of the specified tag or {@code null} if there
      * is no such tag in the image file.
      *
      * @param tag the name of the tag.
      */
-    @Nullable
-    public String getAttribute(@NonNull String tag) {
+    public @Nullable String getAttribute(@NonNull String tag) {
         if (tag == null) {
             throw new NullPointerException("tag shouldn't be null");
         }
         ExifAttribute attribute = getExifAttribute(tag);
-        if (attribute != null) {
-            if (!sTagSetForCompatibility.contains(tag)) {
-                return attribute.getStringValue(mExifByteOrder);
-            }
-            if (tag.equals(TAG_GPS_TIMESTAMP)) {
-                // Convert the rational values to the custom formats for backwards compatibility.
-                if (attribute.format != IFD_FORMAT_URATIONAL
-                        && attribute.format != IFD_FORMAT_SRATIONAL) {
-                    Log.w(TAG, "GPS Timestamp format is not rational. format=" + attribute.format);
-                    return null;
-                }
-                Rational[] array = (Rational[]) attribute.getValue(mExifByteOrder);
-                if (array == null || array.length != 3) {
-                    Log.w(TAG, "Invalid GPS Timestamp array. array=" + Arrays.toString(array));
-                    return null;
-                }
-                return String.format("%02d:%02d:%02d",
-                        (int) ((float) array[0].numerator / array[0].denominator),
-                        (int) ((float) array[1].numerator / array[1].denominator),
-                        (int) ((float) array[2].numerator / array[2].denominator));
+        if (attribute == null) {
+            return null;
+        }
+        if (tag.equals(TAG_GPS_TIMESTAMP)) {
+            // Convert GPS timestamp value to a custom format for backwards compatibility.
+            if (attribute.format != IFD_FORMAT_URATIONAL
+                    && attribute.format != IFD_FORMAT_SRATIONAL) {
+                Log.w(TAG, "GPS Timestamp format is not rational. format=" + attribute.format);
+                return null;
             }
+            Rational[] array = (Rational[]) attribute.getValue(mExifByteOrder);
+            if (array == null || array.length != 3) {
+                Log.w(TAG, "Invalid GPS Timestamp array. array=" + Arrays.toString(array));
+                return null;
+            }
+            return String.format("%02d:%02d:%02d",
+                    (int) ((float) array[0].numerator / array[0].denominator),
+                    (int) ((float) array[1].numerator / array[1].denominator),
+                    (int) ((float) array[2].numerator / array[2].denominator));
+        } else if (RATIONAL_TAGS_HANDLED_AS_DECIMALS_FOR_COMPATIBILITY.contains(tag)) {
+            // Convert the rational values to the custom formats for backwards compatibility.
             try {
                 return Double.toString(attribute.getDoubleValue(mExifByteOrder));
             } catch (NumberFormatException e) {
                 return null;
             }
+        } else {
+            return attribute.getStringValue(mExifByteOrder);
         }
-        return null;
     }
 
     /**
@@ -4223,28 +4403,7 @@ public void setAttribute(@NonNull String tag, @Nullable String value) {
         if (tag == null) {
             throw new NullPointerException("tag shouldn't be null");
         }
-        // Validate and convert if necessary.
-        if (TAG_DATETIME.equals(tag) || TAG_DATETIME_ORIGINAL.equals(tag)
-                || TAG_DATETIME_DIGITIZED.equals(tag)) {
-            if (value != null) {
-                boolean isPrimaryFormat = DATETIME_PRIMARY_FORMAT_PATTERN.matcher(value).find();
-                boolean isSecondaryFormat = DATETIME_SECONDARY_FORMAT_PATTERN.matcher(value).find();
-                // Validate
-                if (value.length() != DATETIME_VALUE_STRING_LENGTH
-                        || (!isPrimaryFormat && !isSecondaryFormat)) {
-                    Log.w(TAG, "Invalid value for " + tag + " : " + value);
-                    return;
-                }
-                // If datetime value has secondary format (e.g. 2020-01-01 00:00:00), convert it to
-                // primary format (e.g. 2020:01:01 00:00:00) since it is the format in the
-                // official documentation.
-                // See JEITA CP-3451C Section 4.6.4. D. Other Tags, DateTime
-                if (isSecondaryFormat) {
-                    // Replace "-" with ":" to match the primary format.
-                    value = value.replaceAll("-", ":");
-                }
-            }
-        }
+
         // Maintain compatibility.
         if (TAG_ISO_SPEED_RATINGS.equals(tag)) {
             if (DEBUG) {
@@ -4253,28 +4412,70 @@ public void setAttribute(@NonNull String tag, @Nullable String value) {
             }
             tag = TAG_PHOTOGRAPHIC_SENSITIVITY;
         }
-        // Convert the given value to rational values for backwards compatibility.
-        if (value != null && sTagSetForCompatibility.contains(tag)) {
-            if (tag.equals(TAG_GPS_TIMESTAMP)) {
+        // Maybe convert the given value for backwards compatibility.
+        if (value != null) {
+            if (RATIONAL_TAGS_HANDLED_AS_DECIMALS_FOR_COMPATIBILITY.contains(tag)
+                    && !value.contains("/")) {
+                // Convert floating point values to rational for rational tags that are emitted and
+                // consumed as floating point values for backwards compatibility.
+                try {
+                    double doubleValue = Double.parseDouble(value);
+                    value = Rational.createFromDouble(doubleValue).toString();
+                } catch (NumberFormatException e) {
+                    Log.w(TAG, "Invalid value for " + tag + " : " + value);
+                    return;
+                }
+            } else if (tag.equals(TAG_GPS_TIMESTAMP)) {
                 Matcher m = GPS_TIMESTAMP_PATTERN.matcher(value);
                 if (!m.find()) {
                     Log.w(TAG, "Invalid value for " + tag + " : " + value);
                     return;
                 }
-                value = Integer.parseInt(m.group(1)) + "/1," + Integer.parseInt(m.group(2)) + "/1,"
-                        + Integer.parseInt(m.group(3)) + "/1";
-            } else {
-                try {
-                    double doubleValue = Double.parseDouble(value);
-                    value = new Rational(doubleValue).toString();
-                } catch (NumberFormatException e) {
+                value =
+                        Integer.parseInt(m.group(1))
+                                + "/1,"
+                                + Integer.parseInt(m.group(2))
+                                + "/1,"
+                                + Integer.parseInt(m.group(3))
+                                + "/1";
+            } else if (TAG_DATETIME.equals(tag)
+                    || TAG_DATETIME_ORIGINAL.equals(tag)
+                    || TAG_DATETIME_DIGITIZED.equals(tag)) {
+                // Validate and convert datetime values if necessary.
+                boolean isPrimaryFormat = DATETIME_PRIMARY_FORMAT_PATTERN.matcher(value).find();
+                boolean isSecondaryFormat = DATETIME_SECONDARY_FORMAT_PATTERN.matcher(value).find();
+                // Validate
+                if (value.length() != DATETIME_VALUE_STRING_LENGTH
+                        || (!isPrimaryFormat && !isSecondaryFormat)) {
                     Log.w(TAG, "Invalid value for " + tag + " : " + value);
                     return;
                 }
+                // If datetime value has secondary format (e.g. 2020-01-01 00:00:00), convert it to
+                // primary format (e.g. 2020:01:01 00:00:00) since it is the format in the official
+                // documentation.
+                // See JEITA CP-3451C Section 4.6.4. D. Other Tags, DateTime
+                if (isSecondaryFormat) {
+                    // Replace "-" with ":" to match the primary format.
+                    value = value.replaceAll("-", ":");
+                }
             }
         }
 
-        for (int i = 0 ; i < EXIF_TAGS.length; ++i) {
+        if (TAG_XMP.equals(tag)) {
+            boolean containsTiff700Xmp =
+                    mAttributes[IFD_TYPE_PRIMARY].containsKey(TAG_XMP)
+                            || mAttributes[IFD_TYPE_PREVIEW].containsKey(TAG_XMP);
+            @XmpHandling int xmpHandling = getXmpHandlingForImageType(mMimeType);
+            if ((xmpHandling == XMP_HANDLING_PREFER_SEPARATE
+                            && (mXmpFromSeparateMarker != null || !containsTiff700Xmp))
+                    || (xmpHandling == XMP_HANDLING_PREFER_TIFF_700_IF_PRESENT
+                            && !containsTiff700Xmp)) {
+                mXmpFromSeparateMarker = value != null ? ExifAttribute.createByte(value) : null;
+                return;
+            }
+        }
+
+        for (int i = 0; i < EXIF_TAGS.length; ++i) {
             if (i == IFD_TYPE_THUMBNAIL && !mHasThumbnail) {
                 continue;
             }
@@ -4572,9 +4773,6 @@ private void removeAttribute(String tag) {
      * type and the content of the input stream.
      */
     private void loadAttributes(@NonNull InputStream in) {
-        if (in == null) {
-            throw new NullPointerException("inputstream shouldn't be null");
-        }
         try {
             // Initialize mAttributes.
             for (int i = 0; i < EXIF_TAGS.length; ++i) {
@@ -4591,10 +4789,12 @@ private void loadAttributes(@NonNull InputStream in) {
                 SeekableByteOrderedDataInputStream inputStream =
                         new SeekableByteOrderedDataInputStream(in);
                 if (mIsExifDataOnly) {
-                    getStandaloneAttributes(inputStream);
+                    if (!getStandaloneAttributes(inputStream)) {
+                        return;
+                    }
                 } else {
-                    if (mMimeType == IMAGE_TYPE_HEIF) {
-                        getHeifAttributes(inputStream);
+                    if (mMimeType == IMAGE_TYPE_HEIC || mMimeType == IMAGE_TYPE_AVIF) {
+                        getHeifAttributes(inputStream, mMimeType);
                     } else if (mMimeType == IMAGE_TYPE_ORF) {
                         getOrfAttributes(inputStream);
                     } else if (mMimeType == IMAGE_TYPE_RW2) {
@@ -4623,7 +4823,7 @@ private void loadAttributes(@NonNull InputStream in) {
             // Ignore exceptions in order to keep the compatibility with the old versions of
             // ExifInterface.
             if (DEBUG) {
-                Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
+                Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file "
                         + "(ExifInterface supports JPEG and some RAW image formats only) "
                         + "or a corrupted JPEG file to ExifInterface.", e);
             }
@@ -4637,18 +4837,15 @@ private void loadAttributes(@NonNull InputStream in) {
     }
 
     private static boolean isSeekableFD(FileDescriptor fd) {
-        if (Build.VERSION.SDK_INT >= 21) {
-            try {
-                Api21Impl.lseek(fd, 0, OsConstants.SEEK_CUR);
-                return true;
-            } catch (Exception e) {
-                if (DEBUG) {
-                    Log.d(TAG, "The file descriptor for the given input is not seekable");
-                }
-                return false;
+        try {
+            Os.lseek(fd, /* offset= */ 0, /* whence= */ OsConstants.SEEK_CUR);
+            return true;
+        } catch (Exception e) {
+            if (DEBUG) {
+                Log.d(TAG, "The file descriptor for the given input is not seekable");
             }
+            return false;
         }
-        return false;
     }
 
     // Prints out attributes for debugging.
@@ -4678,7 +4875,9 @@ private void printAttributes() {
      * <p>
      * For WebP format, the Exif data will be stored as an Extended File Format, and it may not be
      * supported for older readers.
-     * </p>
+     * <p>
+     * For PNG format, the Exif data will be stored as an "eXIf" chunk as per
+     * "Extensions to the PNG 1.2 Specification, Version 1.5.0".
      */
     public void saveAttributes() throws IOException {
         if (!isSupportedFormatForSavingAttributes(mMimeType)) {
@@ -4703,19 +4902,18 @@ public void saveAttributes() throws IOException {
 
         FileInputStream in = null;
         FileOutputStream out = null;
-        File tempFile = null;
+        File tempFile;
         try {
             // Copy the original file to temporary file.
             tempFile = File.createTempFile("temp", "tmp");
             if (mFilename != null) {
                 in = new FileInputStream(mFilename);
             } else {
-                // mSeekableFileDescriptor will be non-null only for SDK_INT >= 21, but this check
-                // is needed to prevent calling Os.lseek at runtime for SDK < 21.
-                if (Build.VERSION.SDK_INT >= 21) {
-                    Api21Impl.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);
-                    in = new FileInputStream(mSeekableFileDescriptor);
-                }
+                Os.lseek(
+                        mSeekableFileDescriptor,
+                        /* offset= */ 0,
+                        /* whence= */ OsConstants.SEEK_SET);
+                in = new FileInputStream(mSeekableFileDescriptor);
             }
             out = new FileOutputStream(tempFile);
             copy(in, out);
@@ -4737,12 +4935,9 @@ public void saveAttributes() throws IOException {
             if (mFilename != null) {
                 out = new FileOutputStream(mFilename);
             } else {
-                // mSeekableFileDescriptor will be non-null only for SDK_INT >= 21, but this check
-                // is needed to prevent calling Os.lseek at runtime for SDK < 21.
-                if (Build.VERSION.SDK_INT >= 21) {
-                    Api21Impl.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);
-                    out = new FileOutputStream(mSeekableFileDescriptor);
-                }
+                FileDescriptor fd = mSeekableFileDescriptor;
+                Os.lseek(fd, /* offset= */ 0, /* whence= */ OsConstants.SEEK_SET);
+                out = new FileOutputStream(mSeekableFileDescriptor);
             }
             bufferedIn = new BufferedInputStream(in);
             bufferedOut = new BufferedOutputStream(out);
@@ -4760,12 +4955,11 @@ public void saveAttributes() throws IOException {
                 if (mFilename != null) {
                     out = new FileOutputStream(mFilename);
                 } else {
-                    // mSeekableFileDescriptor will be non-null only for SDK_INT >= 21, but this
-                    // check is needed to prevent calling Os.lseek at runtime for SDK < 21.
-                    if (Build.VERSION.SDK_INT >= 21) {
-                        Api21Impl.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET);
-                        out = new FileOutputStream(mSeekableFileDescriptor);
-                    }
+                    Os.lseek(
+                            mSeekableFileDescriptor,
+                            /* offset= */ 0,
+                            /* whence= */ OsConstants.SEEK_SET);
+                    out = new FileOutputStream(mSeekableFileDescriptor);
                 }
                 copy(in, out);
             } catch (Exception exception) {
@@ -4841,8 +5035,7 @@ public boolean hasAttribute(@NonNull String tag) {
      * The returned data can be decoded using
      * {@link BitmapFactory#decodeByteArray(byte[],int,int)}
      */
-    @Nullable
-    public byte[] getThumbnail() {
+    public byte @Nullable [] getThumbnail() {
         if (mThumbnailCompression == DATA_JPEG || mThumbnailCompression == DATA_JPEG_COMPRESSED) {
             return getThumbnailBytes();
         }
@@ -4853,8 +5046,7 @@ public byte[] getThumbnail() {
      * Returns the thumbnail bytes inside the image file, regardless of the compression type of the
      * thumbnail image.
      */
-    @Nullable
-    public byte[] getThumbnailBytes() {
+    public byte @Nullable [] getThumbnailBytes() {
         if (!mHasThumbnail) {
             return null;
         }
@@ -4877,13 +5069,9 @@ public byte[] getThumbnailBytes() {
             } else if (mFilename != null) {
                 in = new FileInputStream(mFilename);
             } else {
-                // mSeekableFileDescriptor will be non-null only for SDK_INT >= 21, but this check
-                // is needed to prevent calling Os.lseek and Os.dup at runtime for SDK < 21.
-                if (Build.VERSION.SDK_INT >= 21) {
-                    newFileDescriptor = Api21Impl.dup(mSeekableFileDescriptor);
-                    Api21Impl.lseek(newFileDescriptor, 0, OsConstants.SEEK_SET);
-                    in = new FileInputStream(newFileDescriptor);
-                }
+                newFileDescriptor = Os.dup(mSeekableFileDescriptor);
+                Os.lseek(newFileDescriptor, /* offset= */ 0, /* whence= */ OsConstants.SEEK_SET);
+                in = new FileInputStream(newFileDescriptor);
             }
             if (in == null) {
                 // Should not be reached this.
@@ -4913,8 +5101,7 @@ public byte[] getThumbnailBytes() {
      * Creates and returns a Bitmap object of the thumbnail image based on the byte array and the
      * thumbnail compression value, or {@code null} if the compression type is unsupported.
      */
-    @Nullable
-    public Bitmap getThumbnailBitmap() {
+    public @Nullable Bitmap getThumbnailBitmap() {
         if (!mHasThumbnail) {
             return null;
         } else if (mThumbnailBytes == null) {
@@ -4971,8 +5158,7 @@ public boolean isThumbnailCompressed() {
      *             called since the underlying file was initially parsed, since
      *             that means offsets may have changed.
      */
-    @Nullable
-    public long[] getThumbnailRange() {
+    public long @Nullable [] getThumbnailRange() {
         if (mModified) {
             throw new IllegalStateException(
                     "The underlying file has been modified since being parsed");
@@ -4988,17 +5174,20 @@ public long[] getThumbnailRange() {
     }
 
     /**
-     * Returns the offset and length of the requested tag inside the image file,
-     * or {@code null} if the tag is not contained.
+     * Returns the offset and length of the requested tag inside the image file, or {@code null} if
+     * the tag is not contained.
      *
-     * @return two-element array, the offset in the first value, and length in
-     *         the second, or {@code null} if no tag was found.
-     * @throws IllegalStateException if {@link #saveAttributes()} has been
-     *             called since the underlying file was initially parsed, since
-     *             that means offsets may have changed.
+     * <p>If the attribute has been modified with {@link #setAttribute(String, String)} but not yet
+     * written to disk with {@link #saveAttributes()}, the returned range will have the correct
+     * length for the modified value, but an offset of {@code -1} to indicate its position in the
+     * file isn't known.
+     *
+     * @return two-element array, the offset in the first value, and length in the second, or {@code
+     *     null} if no tag was found.
+     * @throws IllegalStateException if {@link #saveAttributes()} has been called since the
+     *     underlying file was initially parsed, since that means offsets may have changed.
      */
-    @Nullable
-    public long[] getAttributeRange(@NonNull String tag) {
+    public long @Nullable [] getAttributeRange(@NonNull String tag) {
         if (tag == null) {
             throw new NullPointerException("tag shouldn't be null");
         }
@@ -5022,8 +5211,7 @@ public long[] getAttributeRange(@NonNull String tag) {
      * @return raw bytes for the value of the requested tag, or {@code null} if
      *         no tag was found.
      */
-    @Nullable
-    public byte[] getAttributeBytes(@NonNull String tag) {
+    public byte @Nullable [] getAttributeBytes(@NonNull String tag) {
         if (tag == null) {
             throw new NullPointerException("tag shouldn't be null");
         }
@@ -5060,8 +5248,7 @@ public boolean getLatLong(float output[]) {
      * array where the first element is the latitude and the second element is the longitude.
      * Otherwise, it returns null.
      */
-    @Nullable
-    public double[] getLatLong() {
+    public double @Nullable [] getLatLong() {
         String latValue = getAttribute(TAG_GPS_LATITUDE);
         String latRef = getAttribute(TAG_GPS_LATITUDE_REF);
         String lngValue = getAttribute(TAG_GPS_LONGITUDE);
@@ -5085,9 +5272,11 @@ public double[] getLatLong() {
      * Sets the GPS-related information. It will set GPS processing method, latitude and longitude
      * values, GPS timestamp, and speed information at the same time.
      *
+     * This method is a No-Op if the location parameter is null.
+     *
      * @param location the {@link Location} object returned by GPS service.
      */
-    public void setGpsInfo(Location location) {
+    public void setGpsInfo(@Nullable Location location) {
         if (location == null) {
             return;
         }
@@ -5096,8 +5285,10 @@ public void setGpsInfo(Location location) {
         setAltitude(location.getAltitude());
         // Location objects store speeds in m/sec. Translates it to km/hr here.
         setAttribute(TAG_GPS_SPEED_REF, "K");
-        setAttribute(TAG_GPS_SPEED, new Rational(location.getSpeed()
-                * TimeUnit.HOURS.toSeconds(1) / 1000).toString());
+        setAttribute(
+                TAG_GPS_SPEED,
+                Rational.createFromDouble(location.getSpeed() * TimeUnit.HOURS.toSeconds(1) / 1000)
+                        .toString());
         String[] dateTime = sFormatterPrimary.format(
                 new Date(location.getTime())).split("\\s+", -1);
         setAttribute(ExifInterface.TAG_GPS_DATESTAMP, dateTime[0]);
@@ -5149,7 +5340,7 @@ public double getAltitude(double defaultValue) {
      */
     public void setAltitude(double altitude) {
         String ref = altitude >= 0 ? "0" : "1";
-        setAttribute(TAG_GPS_ALTITUDE, new Rational(Math.abs(altitude)).toString());
+        setAttribute(TAG_GPS_ALTITUDE, Rational.createFromDouble(Math.abs(altitude)).toString());
         setAttribute(TAG_GPS_ALTITUDE_REF, ref);
     }
 
@@ -5157,7 +5348,6 @@ public void setAltitude(double altitude) {
      * Set the date time value.
      *
      * @param timeStamp number of milliseconds since Jan. 1, 1970, midnight local time.
-     * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     public void setDateTime(@NonNull Long timeStamp) {
@@ -5187,11 +5377,9 @@ public void setDateTime(@NonNull Long timeStamp) {
      *
      * @return null if date time information is unavailable or invalid.
      *
-     * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
-    @Nullable
-    public Long getDateTime() {
+    public @Nullable Long getDateTime() {
         return parseDateTime(getAttribute(TAG_DATETIME),
                 getAttribute(TAG_SUBSEC_TIME),
                 getAttribute(TAG_OFFSET_TIME));
@@ -5206,11 +5394,9 @@ public Long getDateTime() {
      *
      * @return null if digitized date time information is unavailable or invalid.
      *
-     * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
-    @Nullable
-    public Long getDateTimeDigitized() {
+    public @Nullable Long getDateTimeDigitized() {
         return parseDateTime(getAttribute(TAG_DATETIME_DIGITIZED),
                 getAttribute(TAG_SUBSEC_TIME_DIGITIZED),
                 getAttribute(TAG_OFFSET_TIME_DIGITIZED));
@@ -5225,11 +5411,9 @@ public Long getDateTimeDigitized() {
      *
      * @return null if original date time information is unavailable or invalid.
      *
-     * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
-    @Nullable
-    public Long getDateTimeOriginal() {
+    public @Nullable Long getDateTimeOriginal() {
         return parseDateTime(getAttribute(TAG_DATETIME_ORIGINAL),
                 getAttribute(TAG_SUBSEC_TIME_ORIGINAL),
                 getAttribute(TAG_OFFSET_TIME_ORIGINAL));
@@ -5274,12 +5458,12 @@ private static Long parseDateTime(@Nullable String dateTimeString, @Nullable Str
     }
 
     /**
-     * Returns number of milliseconds since Jan. 1, 1970, midnight UTC.
+     * Returns number of milliseconds since 1970-01-01 00:00:00 UTC.
+     *
      * @return null if the date time information is not available.
      */
     @SuppressLint("AutoBoxing") /* Not a performance-critical call, thus not a big concern. */
-    @Nullable
-    public Long getGpsDateTime() {
+    public @Nullable Long getGpsDateTime() {
         String date = getAttribute(TAG_GPS_DATESTAMP);
         String time = getAttribute(TAG_GPS_TIMESTAMP);
         if (date == null || time == null
@@ -5353,7 +5537,7 @@ private static double convertRationalLatLonToDouble(String rationalString, Strin
             }
         } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
             // Not valid
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException(e);
         }
     }
 
@@ -5372,17 +5556,24 @@ private int getMimeType(BufferedInputStream in) throws IOException {
         in.reset();
         if (isJpegFormat(signatureCheckBytes)) {
             return IMAGE_TYPE_JPEG;
-        } else if (isRafFormat(signatureCheckBytes)) {
+        }
+        if (isRafFormat(signatureCheckBytes)) {
             return IMAGE_TYPE_RAF;
-        } else if (isHeifFormat(signatureCheckBytes)) {
-            return IMAGE_TYPE_HEIF;
-        } else if (isOrfFormat(signatureCheckBytes)) {
+        }
+        int heicOrAvifImageType = isHeicOrAvifFormat(signatureCheckBytes);
+        if (heicOrAvifImageType != IMAGE_TYPE_UNKNOWN) {
+            return heicOrAvifImageType;
+        }
+        if (isOrfFormat(signatureCheckBytes)) {
             return IMAGE_TYPE_ORF;
-        } else if (isRw2Format(signatureCheckBytes)) {
+        }
+        if (isRw2Format(signatureCheckBytes)) {
             return IMAGE_TYPE_RW2;
-        } else if (isPngFormat(signatureCheckBytes)) {
+        }
+        if (isPngFormat(signatureCheckBytes)) {
             return IMAGE_TYPE_PNG;
-        } else if (isWebpFormat(signatureCheckBytes)) {
+        }
+        if (isWebpFormat(signatureCheckBytes)) {
             return IMAGE_TYPE_WEBP;
         }
         // Certain file formats (PEF) are identified in readImageFileDirectory()
@@ -5418,7 +5609,7 @@ private boolean isRafFormat(byte[] signatureCheckBytes) throws IOException {
         return true;
     }
 
-    private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
+    private int isHeicOrAvifFormat(byte[] signatureCheckBytes) throws IOException {
         ByteOrderedDataInputStream signatureInputStream = null;
         try {
             signatureInputStream = new ByteOrderedDataInputStream(signatureCheckBytes);
@@ -5428,7 +5619,7 @@ private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
             signatureInputStream.readFully(chunkType);
 
             if (!Arrays.equals(chunkType, HEIF_TYPE_FTYP)) {
-                return false;
+                return IMAGE_TYPE_UNKNOWN;
             }
 
             long chunkDataOffset = 8;
@@ -5438,7 +5629,7 @@ private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
                 chunkSize = signatureInputStream.readLong();
                 if (chunkSize < 16) {
                     // The smallest valid chunk is 16 bytes long in this case.
-                    return false;
+                    return IMAGE_TYPE_UNKNOWN;
                 }
                 chunkDataOffset += 8;
             }
@@ -5453,17 +5644,18 @@ private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
             // It should at least have major brand (4-byte) and minor version (4-byte).
             // The rest of the chunk (if any) is a list of (4-byte) compatible brands.
             if (chunkDataSize < 8) {
-                return false;
+                return IMAGE_TYPE_UNKNOWN;
             }
 
             byte[] brand = new byte[4];
             boolean isMif1 = false;
             boolean isHeic = false;
+            boolean isAvif = false;
             for (long i = 0; i < chunkDataSize / 4;  ++i) {
                 try {
                     signatureInputStream.readFully(brand);
                 } catch (EOFException e) {
-                    return false;
+                    return IMAGE_TYPE_UNKNOWN;
                 }
                 if (i == 1) {
                     // Skip this index, it refers to the minorVersion, not a brand.
@@ -5473,9 +5665,16 @@ private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
                     isMif1 = true;
                 } else if (Arrays.equals(brand, HEIF_BRAND_HEIC)) {
                     isHeic = true;
+                } else if (Arrays.equals(brand, HEIF_BRAND_AVIF)
+                        || Arrays.equals(brand, HEIF_BRAND_AVIS)) {
+                    isAvif = true;
                 }
-                if (isMif1 && isHeic) {
-                    return true;
+                if (isMif1) {
+                    if (isHeic) {
+                        return IMAGE_TYPE_HEIC;
+                    } else if (isAvif) {
+                        return IMAGE_TYPE_AVIF;
+                    }
                 }
             }
         } catch (Exception e) {
@@ -5488,7 +5687,7 @@ private boolean isHeifFormat(byte[] signatureCheckBytes) throws IOException {
                 signatureInputStream = null;
             }
         }
-        return false;
+        return IMAGE_TYPE_UNKNOWN;
     }
 
     /**
@@ -5582,19 +5781,6 @@ private boolean isWebpFormat(byte[] signatureCheckBytes) throws IOException {
         return true;
     }
 
-    private static boolean isExifDataOnly(BufferedInputStream in) throws IOException {
-        in.mark(IDENTIFIER_EXIF_APP1.length);
-        byte[] signatureCheckBytes = new byte[IDENTIFIER_EXIF_APP1.length];
-        in.read(signatureCheckBytes);
-        in.reset();
-        for (int i = 0; i < IDENTIFIER_EXIF_APP1.length; i++) {
-            if (signatureCheckBytes[i] != IDENTIFIER_EXIF_APP1[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     /**
      * Loads EXIF attributes from a JPEG input stream.
      *
@@ -5630,8 +5816,13 @@ private void getJpegAttributes(ByteOrderedDataInputStream in, int offsetToJpeg,
             if (marker != MARKER) {
                 throw new IOException("Invalid marker:" + Integer.toHexString(marker & 0xff));
             }
-            ++bytesRead;
-            marker = in.readByte();
+
+            // JPEG spec permits padding with 0xFF fill bytes before any marker.
+            do {
+                ++bytesRead;
+                marker = in.readByte();
+            } while(marker == MARKER);
+
             if (DEBUG) {
                 Log.d(TAG, "Found JPEG segment indicator: " + Integer.toHexString(marker & 0xff));
             }
@@ -5674,13 +5865,9 @@ private void getJpegAttributes(ByteOrderedDataInputStream in, int offsetToJpeg,
                         final int offset = start + IDENTIFIER_XMP_APP1.length;
                         final byte[] value = Arrays.copyOfRange(bytes,
                                 IDENTIFIER_XMP_APP1.length, bytes.length);
-                        // TODO: check if ignoring separate XMP data when tag 700 already exists is
-                        //  valid.
-                        if (getAttribute(TAG_XMP) == null) {
-                            mAttributes[IFD_TYPE_PRIMARY].put(TAG_XMP, new ExifAttribute(
-                                    IFD_FORMAT_BYTE, value.length, offset, value));
-                            mXmpIsFromSeparateMarker = true;
-                        }
+                        mXmpFromSeparateMarker =
+                                new ExifAttribute(IFD_FORMAT_BYTE, value.length, offset, value);
+                        mFileOnDiskContainsSeparateXmpMarker = true;
                     }
                     break;
                 }
@@ -5753,7 +5940,7 @@ private void getRawAttributes(SeekableByteOrderedDataInputStream in) throws IOEx
             // PEF files contain a MakerNote data, which contains the data for ColorSpace tag.
             // See http://lclevy.free.fr/raw/ and piex.cc PefGetPreviewData()
             ExifAttribute makerNoteAttribute =
-                    (ExifAttribute) mAttributes[IFD_TYPE_EXIF].get(TAG_MAKER_NOTE);
+                    mAttributes[IFD_TYPE_EXIF].get(TAG_MAKER_NOTE);
             if (makerNoteAttribute != null) {
                 // Create an ordered DataInputStream for MakerNote
                 SeekableByteOrderedDataInputStream makerNoteDataInputStream =
@@ -5768,7 +5955,7 @@ private void getRawAttributes(SeekableByteOrderedDataInputStream in) throws IOEx
 
                 // Update ColorSpace tag
                 ExifAttribute colorSpaceAttribute =
-                        (ExifAttribute) mAttributes[IFD_TYPE_PEF].get(TAG_COLOR_SPACE);
+                        mAttributes[IFD_TYPE_PEF].get(TAG_COLOR_SPACE);
                 if (colorSpaceAttribute != null) {
                     mAttributes[IFD_TYPE_EXIF].put(TAG_COLOR_SPACE, colorSpaceAttribute);
                 }
@@ -5843,9 +6030,15 @@ private void getRafAttributes(ByteOrderedDataInputStream in) throws IOException
     }
 
     // Support for getting MediaMetadataRetriever.METADATA_KEY_EXIF_OFFSET and
-    // MediaMetadataRetriever.METADATA_KEY_EXIF_LENGTH was added SDK 28.
-    private void getHeifAttributes(final SeekableByteOrderedDataInputStream in) throws IOException {
+    // MediaMetadataRetriever.METADATA_KEY_EXIF_LENGTH was added in SDK 28 for HEIC and in SDK 31
+    // for AVIF.
+    private void getHeifAttributes(final SeekableByteOrderedDataInputStream in, int imageType)
+            throws IOException {
         if (Build.VERSION.SDK_INT >= 28) {
+            if (imageType == IMAGE_TYPE_AVIF && Build.VERSION.SDK_INT < 31) {
+                throw new UnsupportedOperationException("Reading EXIF from AVIF files "
+                        + "is supported from SDK 31 and above");
+            }
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
             try {
                 Api23Impl.setDataSource(retriever, new MediaDataSource() {
@@ -5985,29 +6178,56 @@ public long getSize() throws IOException {
                     mOffsetToExifData = offset;
                     readExifSegment(bytes, IFD_TYPE_PRIMARY);
                 }
+
+                String xmpOffsetStr = retriever.extractMetadata(
+                        MediaMetadataRetriever.METADATA_KEY_XMP_OFFSET);
+                String xmpLengthStr = retriever.extractMetadata(
+                        MediaMetadataRetriever.METADATA_KEY_XMP_LENGTH);
+                if (xmpOffsetStr != null && xmpLengthStr != null) {
+                    int offset = Integer.parseInt(xmpOffsetStr);
+                    int length = Integer.parseInt(xmpLengthStr);
+                    in.seek(offset);
+                    byte[] xmpBytes = new byte[length];
+                    in.readFully(xmpBytes);
+                    mXmpFromSeparateMarker =
+                            new ExifAttribute(IFD_FORMAT_BYTE, xmpBytes.length, offset, xmpBytes);
+                    mFileOnDiskContainsSeparateXmpMarker = true;
+                }
+
                 if (DEBUG) {
                     Log.d(TAG, "Heif meta: " + width + "x" + height + ", rotation " + rotation);
                 }
             } catch (RuntimeException e) {
                 throw new UnsupportedOperationException("Failed to read EXIF from HEIF file. "
-                        + "Given stream is either malformed or unsupported.");
+                        + "Given stream is either malformed or unsupported.", e);
             } finally {
-                retriever.release();
+                try {
+                    retriever.release();
+                } catch (IOException e) {
+                    // Nothing we can  do about it.
+                }
             }
         } else {
-            throw new UnsupportedOperationException("Reading EXIF from HEIF files "
+            throw new UnsupportedOperationException("Reading EXIF from HEIC files "
                     + "is supported from SDK 28 and above");
         }
     }
 
-    private void getStandaloneAttributes(SeekableByteOrderedDataInputStream in) throws IOException {
-        in.skipFully(IDENTIFIER_EXIF_APP1.length);
+    /** Reads standalone EXIF data, returning whether the data was read successfully. */
+    private boolean getStandaloneAttributes(SeekableByteOrderedDataInputStream in)
+            throws IOException {
+        byte[] signatureCheckBytes = new byte[IDENTIFIER_EXIF_APP1.length];
+        in.readFully(signatureCheckBytes);
+        if (!Arrays.equals(signatureCheckBytes, IDENTIFIER_EXIF_APP1)) {
+            Log.w(TAG, "Given data is not EXIF-only.");
+            return false;
+        }
         // TODO: Need to handle potential OutOfMemoryError
-        byte[] data = new byte[in.available()];
-        in.readFully(data);
+        byte[] data = in.readToEnd();
         // Save offset to EXIF data for handling thumbnail and attribute offsets.
         mOffsetToExifData = IDENTIFIER_EXIF_APP1.length;
         readExifSegment(data, IFD_TYPE_PRIMARY);
+        return true;
     }
 
     /**
@@ -6029,7 +6249,7 @@ private void getOrfAttributes(SeekableByteOrderedDataInputStream in) throws IOEx
         // proprietary tags and therefore does not have offical documentation
         // See GetOlympusPreviewImage() in piex.cc & http://www.exiv2.org/tags-olympus.html
         ExifAttribute makerNoteAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_EXIF].get(TAG_MAKER_NOTE);
+                mAttributes[IFD_TYPE_EXIF].get(TAG_MAKER_NOTE);
         if (makerNoteAttribute != null) {
             // Create an ordered DataInputStream for MakerNote
             SeekableByteOrderedDataInputStream makerNoteDataInputStream =
@@ -6054,9 +6274,9 @@ private void getOrfAttributes(SeekableByteOrderedDataInputStream in) throws IOEx
             readImageFileDirectory(makerNoteDataInputStream, IFD_TYPE_ORF_MAKER_NOTE);
 
             // Retrieve & update preview image offset & length values
-            ExifAttribute imageStartAttribute = (ExifAttribute)
+            ExifAttribute imageStartAttribute =
                     mAttributes[IFD_TYPE_ORF_CAMERA_SETTINGS].get(TAG_ORF_PREVIEW_IMAGE_START);
-            ExifAttribute imageLengthAttribute = (ExifAttribute)
+            ExifAttribute imageLengthAttribute =
                     mAttributes[IFD_TYPE_ORF_CAMERA_SETTINGS].get(TAG_ORF_PREVIEW_IMAGE_LENGTH);
 
             if (imageStartAttribute != null && imageLengthAttribute != null) {
@@ -6069,7 +6289,7 @@ private void getOrfAttributes(SeekableByteOrderedDataInputStream in) throws IOEx
             // TODO: Check this behavior in other ORF files
             // Retrieve primary image length & width values
             // See piex.cc GetOlympusPreviewImage()
-            ExifAttribute aspectFrameAttribute = (ExifAttribute)
+            ExifAttribute aspectFrameAttribute =
                     mAttributes[IFD_TYPE_ORF_IMAGE_PROCESSING].get(TAG_ORF_ASPECT_FRAME);
             if (aspectFrameAttribute != null) {
                 int[] aspectFrameValues = (int[]) aspectFrameAttribute.getValue(mExifByteOrder);
@@ -6112,7 +6332,7 @@ private void getRw2Attributes(SeekableByteOrderedDataInputStream in) throws IOEx
 
         // Retrieve preview and/or thumbnail image data
         ExifAttribute jpgFromRawAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_PRIMARY].get(TAG_RW2_JPG_FROM_RAW);
+                mAttributes[IFD_TYPE_PRIMARY].get(TAG_RW2_JPG_FROM_RAW);
         if (jpgFromRawAttribute != null) {
             ByteOrderedDataInputStream jpegInputStream =
                     new ByteOrderedDataInputStream(jpgFromRawAttribute.bytes);
@@ -6122,9 +6342,9 @@ private void getRw2Attributes(SeekableByteOrderedDataInputStream in) throws IOEx
 
         // Set ISO tag value if necessary
         ExifAttribute rw2IsoAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_PRIMARY].get(TAG_RW2_ISO);
+                mAttributes[IFD_TYPE_PRIMARY].get(TAG_RW2_ISO);
         ExifAttribute exifIsoAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_EXIF].get(TAG_PHOTOGRAPHIC_SENSITIVITY);
+                mAttributes[IFD_TYPE_EXIF].get(TAG_PHOTOGRAPHIC_SENSITIVITY);
         if (rw2IsoAttribute != null && exifIsoAttribute == null) {
             // Place this attribute only if it doesn't exist
             mAttributes[IFD_TYPE_EXIF].put(TAG_PHOTOGRAPHIC_SENSITIVITY, rw2IsoAttribute);
@@ -6141,11 +6361,10 @@ private void getPngAttributes(ByteOrderedDataInputStream in) throws IOException
         // 2.1. Integers and byte order
         in.setByteOrder(BIG_ENDIAN);
 
-        int bytesRead = 0;
+        int startPosition = in.position();
 
         // Skip the signature bytes
         in.skipFully(PNG_SIGNATURE.length);
-        bytesRead += PNG_SIGNATURE.length;
 
         // Each chunk is made up of four parts:
         //   1) Length: 4-byte unsigned integer indicating the number of bytes in the
@@ -6158,58 +6377,86 @@ private void getPngAttributes(ByteOrderedDataInputStream in) throws IOException
         // See PNG (Portable Network Graphics) Specification, Version 1.2,
         // 3.2. Chunk layout
         try {
-            while (true) {
+            boolean foundExif = false;
+            boolean foundXmpItxt = false;
+            while (!foundExif || !foundXmpItxt) {
                 int length = in.readInt();
-                bytesRead += 4;
-
-                byte[] type = new byte[PNG_CHUNK_TYPE_BYTE_LENGTH];
-                in.readFully(type);
-                bytesRead += PNG_CHUNK_TYPE_BYTE_LENGTH;
+                int type = in.readInt();
+                int startOfNextChunk = in.position() + length + PNG_CHUNK_CRC_BYTE_LENGTH;
 
                 // The first chunk must be the IHDR chunk
-                if (bytesRead == 16 && !Arrays.equals(type, PNG_CHUNK_TYPE_IHDR)) {
-                    throw new IOException("Encountered invalid PNG file--IHDR chunk should appear"
-                            + "as the first chunk");
+                if (in.position() - startPosition == 16 && type != PNG_CHUNK_TYPE_IHDR) {
+                    throw new IOException(
+                            "Encountered invalid PNG file--IHDR chunk should appear as the first "
+                                    + "chunk");
                 }
 
-                if (Arrays.equals(type, PNG_CHUNK_TYPE_IEND)) {
+                if (type == PNG_CHUNK_TYPE_IEND) {
                     // IEND marks the end of the image.
                     break;
-                } else if (Arrays.equals(type, PNG_CHUNK_TYPE_EXIF)) {
+                } else if (type == PNG_CHUNK_TYPE_EXIF && !foundExif) {
+                    // Save offset to EXIF data for handling thumbnail and attribute offsets.
+                    mOffsetToExifData = in.position() - startPosition;
+
                     // TODO: Need to handle potential OutOfMemoryError
                     byte[] data = new byte[length];
                     in.readFully(data);
+
                     // Compare CRC values for potential data corruption.
                     int dataCrcValue = in.readInt();
                     // Cyclic Redundancy Code used to check for corruption of the data
                     CRC32 crc = new CRC32();
-                    crc.update(type);
+                    updateCrcWithInt(crc, type);
                     crc.update(data);
                     if ((int) crc.getValue() != dataCrcValue) {
-                        throw new IOException("Encountered invalid CRC value for PNG-EXIF chunk."
-                                + "\n recorded CRC value: " + dataCrcValue + ", calculated CRC "
-                                + "value: " + crc.getValue());
+                        throw new IOException(
+                                "Encountered invalid CRC value for PNG-EXIF chunk."
+                                        + "\n recorded CRC value: "
+                                        + dataCrcValue
+                                        + ", calculated CRC "
+                                        + "value: "
+                                        + crc.getValue());
                     }
-                    // Save offset to EXIF data for handling thumbnail and attribute offsets.
-                    mOffsetToExifData = bytesRead;
                     readExifSegment(data, IFD_TYPE_PRIMARY);
                     validateImages();
 
                     setThumbnailData(new ByteOrderedDataInputStream(data));
-                    break;
-                } else {
-                    // Skip to next chunk
-                    in.skipFully(length + PNG_CHUNK_CRC_BYTE_LENGTH);
-                    bytesRead += length + PNG_CHUNK_CRC_BYTE_LENGTH;
+                    foundExif = true;
+                } else if (type == PNG_CHUNK_TYPE_ITXT
+                        && !foundXmpItxt
+                        && length >= PNG_ITXT_XMP_KEYWORD.length) {
+                    // Read the 17 byte keyword and 5 expected null bytes.
+                    byte[] keyword = new byte[PNG_ITXT_XMP_KEYWORD.length];
+                    in.readFully(keyword);
+                    if (Arrays.equals(keyword, PNG_ITXT_XMP_KEYWORD)) {
+                        int xmpDataOffset = in.position() - startPosition;
+                        int xmpLength = length - keyword.length;
+                        byte[] xmpData = new byte[xmpLength];
+                        in.readFully(xmpData);
+                        mXmpFromSeparateMarker =
+                                new ExifAttribute(
+                                        IFD_FORMAT_BYTE, xmpLength, xmpDataOffset, xmpData);
+                        foundXmpItxt = true;
+                    }
                 }
+                // Skip to next chunk
+                in.skipFully(startOfNextChunk - in.position());
             }
+            mFileOnDiskContainsSeparateXmpMarker = foundXmpItxt;
         } catch (EOFException e) {
             // Should not reach here. Will only reach here if the file is corrupted or
             // does not follow the PNG specifications
-            throw new IOException("Encountered corrupt PNG file.");
+            throw new IOException("Encountered corrupt PNG file.", e);
         }
     }
 
+    private static void updateCrcWithInt(CRC32 crc, int value) {
+        crc.update(value >>> 24);
+        crc.update(value >>> 16);
+        crc.update(value >>> 8);
+        crc.update(value);
+    }
+
     // WebP contains EXIF data as a RIFF File Format Chunk
     // All references below can be found in the following link.
     // https://developers.google.com/speed/webp/docs/riff_container
@@ -6253,6 +6500,16 @@ private void getWebpAttributes(ByteOrderedDataInputStream in) throws IOException
                     // TODO: Need to handle potential OutOfMemoryError
                     byte[] payload = new byte[chunkSize];
                     in.readFully(payload);
+
+                    // Skip a JPEG APP1 marker that some image libraries incorrectly include in the
+                    // Exif data in WebP images (e.g.
+                    // https://github.com/ImageMagick/ImageMagick/issues/3140)
+                    if (startsWith(payload, IDENTIFIER_EXIF_APP1)) {
+                        payload =
+                                Arrays.copyOfRange(
+                                        payload, IDENTIFIER_EXIF_APP1.length, payload.length);
+                    }
+
                     // Save offset to EXIF data for handling thumbnail and attribute offsets.
                     mOffsetToExifData = bytesRead;
                     readExifSegment(payload, IFD_TYPE_PRIMARY);
@@ -6279,7 +6536,7 @@ private void getWebpAttributes(ByteOrderedDataInputStream in) throws IOException
         } catch (EOFException e) {
             // Should not reach here. Will only reach here if the file is corrupted or
             // does not follow the WebP specifications
-            throw new IOException("Encountered corrupt WebP file.");
+            throw new IOException("Encountered corrupt WebP file.", e);
         }
     }
 
@@ -6303,22 +6560,21 @@ private void saveJpegAttributes(InputStream inputStream, OutputStream outputStre
         }
         dataOutputStream.writeByte(MARKER_SOI);
 
-        // Remove XMP data if it is from a separate marker (IDENTIFIER_XMP_APP1, not
-        // IDENTIFIER_EXIF_APP1)
-        // Will re-add it later after the rest of the file is written
-        ExifAttribute xmpAttribute = null;
-        if (getAttribute(TAG_XMP) != null && mXmpIsFromSeparateMarker) {
-            xmpAttribute = mAttributes[IFD_TYPE_PRIMARY].remove(TAG_XMP);
-        }
-
         // Write EXIF APP1 segment
         dataOutputStream.writeByte(MARKER);
         dataOutputStream.writeByte(MARKER_APP1);
-        writeExifSegment(dataOutputStream);
+        mOffsetToExifData = writeExifSegment(dataOutputStream);
 
-        // Re-add previously removed XMP data.
-        if (xmpAttribute != null) {
-            mAttributes[IFD_TYPE_PRIMARY].put(TAG_XMP, xmpAttribute);
+        if (mXmpFromSeparateMarker != null) {
+            // Write XMP APP1 segment. The XMP spec (part 3, section 1.1.3) recommends for this to
+            // directly follow the Exif APP1 segment.
+            dataOutputStream.write(MARKER);
+            dataOutputStream.writeByte(MARKER_APP1);
+            int length = 2 + IDENTIFIER_XMP_APP1.length + mXmpFromSeparateMarker.bytes.length;
+            dataOutputStream.writeUnsignedShort(length);
+            dataOutputStream.write(IDENTIFIER_XMP_APP1);
+            dataOutputStream.write(mXmpFromSeparateMarker.bytes);
+            mFileOnDiskContainsSeparateXmpMarker = true;
         }
 
         byte[] bytes = new byte[4096];
@@ -6328,19 +6584,32 @@ private void saveJpegAttributes(InputStream inputStream, OutputStream outputStre
             if (marker != MARKER) {
                 throw new IOException("Invalid marker");
             }
-            marker = dataInputStream.readByte();
+            // Skip 0xFF fill bytes
+            do {
+                marker = dataInputStream.readByte();
+            } while (marker == MARKER);
             switch (marker) {
                 case MARKER_APP1: {
                     int length = dataInputStream.readUnsignedShort() - 2;
                     if (length < 0) {
                         throw new IOException("Invalid length");
                     }
-                    byte[] identifier = new byte[6];
-                    if (length >= 6) {
+                    // If the length is long enough, we read enough bytes for the XMP identifier,
+                    // because it's longer than the EXIF one.
+                    byte[] identifier;
+                    if (length >= IDENTIFIER_XMP_APP1.length) {
+                        identifier = new byte[IDENTIFIER_XMP_APP1.length];
+                    } else if (length >= IDENTIFIER_EXIF_APP1.length) {
+                        identifier = new byte[IDENTIFIER_EXIF_APP1.length];
+                    } else {
+                        identifier = null;
+                    }
+                    if (identifier != null) {
                         dataInputStream.readFully(identifier);
-                        if (Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
-                            // Skip the original EXIF APP1 segment.
-                            dataInputStream.skipFully(length - 6);
+                        if (startsWith(identifier, IDENTIFIER_EXIF_APP1)
+                                || startsWith(identifier, IDENTIFIER_XMP_APP1)) {
+                            // Skip the original EXIF or XMP APP1 segment.
+                            dataInputStream.skipFully(length - identifier.length);
                             break;
                         }
                     }
@@ -6348,8 +6617,8 @@ private void saveJpegAttributes(InputStream inputStream, OutputStream outputStre
                     dataOutputStream.writeByte(MARKER);
                     dataOutputStream.writeByte(marker);
                     dataOutputStream.writeUnsignedShort(length + 2);
-                    if (length >= 6) {
-                        length -= 6;
+                    if (identifier != null) {
+                        length -= identifier.length;
                         dataOutputStream.write(identifier);
                     }
                     int read;
@@ -6403,60 +6672,94 @@ private void savePngAttributes(InputStream inputStream, OutputStream outputStrea
         // Copy PNG signature bytes
         copy(dataInputStream, dataOutputStream, PNG_SIGNATURE.length);
 
-        // EXIF chunk can appear anywhere between the first (IHDR) and last (IEND) chunks, except
-        // between IDAT chunks.
-        // Adhering to these rules,
-        //   1) if EXIF chunk did not exist in the original file, it will be stored right after the
-        //      first chunk,
-        //   2) if EXIF chunk existed in the original file, it will be stored in the same location.
-        if (mOffsetToExifData == 0) {
-            // Copy IHDR chunk bytes
-            int ihdrChunkLength = dataInputStream.readInt();
-            dataOutputStream.writeInt(ihdrChunkLength);
-            copy(dataInputStream, dataOutputStream, PNG_CHUNK_TYPE_BYTE_LENGTH
-                    + ihdrChunkLength + PNG_CHUNK_CRC_BYTE_LENGTH);
-        } else {
-            // Copy up until the point where EXIF chunk length information is stored.
-            int copyLength = mOffsetToExifData - PNG_SIGNATURE.length
-                    - 4 /* PNG EXIF chunk length bytes */
-                    - PNG_CHUNK_TYPE_BYTE_LENGTH;
-            copy(dataInputStream, dataOutputStream, copyLength);
-
-            // Skip to the start of the chunk after the EXIF chunk
-            int exifChunkLength = dataInputStream.readInt();
-            dataInputStream.skipFully(PNG_CHUNK_TYPE_BYTE_LENGTH + exifChunkLength
-                    + PNG_CHUNK_CRC_BYTE_LENGTH);
-        }
-
-        // Write EXIF data
-        ByteArrayOutputStream exifByteArrayOutputStream = null;
-        try {
-            // A byte array is needed to calculate the CRC value of this chunk which requires
-            // the chunk type bytes and the chunk data bytes.
-            exifByteArrayOutputStream = new ByteArrayOutputStream();
-            ByteOrderedDataOutputStream exifDataOutputStream =
-                    new ByteOrderedDataOutputStream(exifByteArrayOutputStream, BIG_ENDIAN);
-
-            // Store Exif data in separate byte array
-            writeExifSegment(exifDataOutputStream);
-            byte[] exifBytes =
-                    ((ByteArrayOutputStream) exifDataOutputStream.mOutputStream).toByteArray();
-
-            // Write EXIF chunk data
-            dataOutputStream.write(exifBytes);
-
-            // Write EXIF chunk CRC
-            CRC32 crc = new CRC32();
-            crc.update(exifBytes, 4 /* skip length bytes */, exifBytes.length - 4);
-            dataOutputStream.writeInt((int) crc.getValue());
-        } finally {
-            closeQuietly(exifByteArrayOutputStream);
+        boolean needToWriteExif = true;
+        // Either there's some XMP data to write, or it has been cleared locally but was present in
+        // the file when it was read (and so needs to be removed).
+        boolean needToHandleXmpChunk =
+                mXmpFromSeparateMarker != null || mFileOnDiskContainsSeparateXmpMarker;
+        while (needToWriteExif || needToHandleXmpChunk) {
+            int chunkLength = dataInputStream.readInt();
+            int chunkType = dataInputStream.readInt();
+            if (chunkType == PNG_CHUNK_TYPE_IHDR) {
+                dataOutputStream.writeInt(chunkLength);
+                dataOutputStream.writeInt(chunkType);
+                copy(dataInputStream, dataOutputStream, chunkLength + PNG_CHUNK_CRC_BYTE_LENGTH);
+                if (mOffsetToExifData == 0) {
+                    // There was no Exif segment in the original file, so we put it directly
+                    // after the IHDR chunk.
+                    writePngExifChunk(dataOutputStream);
+                    needToWriteExif = false;
+                }
+                if (mXmpFromSeparateMarker != null && !mFileOnDiskContainsSeparateXmpMarker) {
+                    writePngXmpItxtChunk(dataOutputStream);
+                    needToHandleXmpChunk = false;
+                }
+                continue;
+            } else if (chunkType == PNG_CHUNK_TYPE_EXIF && needToWriteExif) {
+                writePngExifChunk(dataOutputStream);
+                dataInputStream.skipFully(chunkLength + PNG_CHUNK_CRC_BYTE_LENGTH);
+                needToWriteExif = false;
+                continue;
+            } else if (chunkType == PNG_CHUNK_TYPE_ITXT
+                    && chunkLength >= PNG_ITXT_XMP_KEYWORD.length) {
+                // Read the 17 byte keyword and 5 expected null bytes.
+                byte[] keyword = new byte[PNG_ITXT_XMP_KEYWORD.length];
+                dataInputStream.readFully(keyword);
+                int remainingChunkBytes = chunkLength - keyword.length + PNG_CHUNK_CRC_BYTE_LENGTH;
+                if (Arrays.equals(keyword, PNG_ITXT_XMP_KEYWORD)) {
+                    if (mXmpFromSeparateMarker != null) {
+                        writePngXmpItxtChunk(dataOutputStream);
+                    }
+                    dataInputStream.skipFully(remainingChunkBytes);
+                    needToHandleXmpChunk = false;
+                } else {
+                    // This is a non-XMP iTXt chunk, so just copy it to the output and continue.
+                    dataOutputStream.writeInt(chunkLength);
+                    dataOutputStream.writeInt(chunkType);
+                    dataOutputStream.write(keyword);
+                    copy(dataInputStream, dataOutputStream, remainingChunkBytes);
+                }
+                continue;
+            }
+            dataOutputStream.writeInt(chunkLength);
+            dataOutputStream.writeInt(chunkType);
+            copy(dataInputStream, dataOutputStream, chunkLength + PNG_CHUNK_CRC_BYTE_LENGTH);
         }
 
         // Copy the rest of the file
         copy(dataInputStream, dataOutputStream);
     }
 
+    private void writePngExifChunk(ByteOrderedDataOutputStream dataOutputStream)
+            throws IOException {
+        // Write the eXIF chunk out to an intermediate byte array so we can calculate the CRC value.
+        ByteArrayOutputStream exifByteArrayOutputStream = new ByteArrayOutputStream();
+        // Write eXIF chunk data (including chunk type & length).
+        int exifOffset =
+                writeExifSegment(
+                        new ByteOrderedDataOutputStream(exifByteArrayOutputStream, BIG_ENDIAN));
+        mOffsetToExifData = dataOutputStream.mOutputStream.size() + exifOffset;
+        byte[] exifBytes = exifByteArrayOutputStream.toByteArray();
+        dataOutputStream.write(exifBytes);
+        CRC32 crc = new CRC32();
+        crc.update(exifBytes, 4 /* skip length bytes */, exifBytes.length - 4);
+        dataOutputStream.writeInt((int) crc.getValue());
+    }
+
+    private void writePngXmpItxtChunk(ByteOrderedDataOutputStream dataOutputStream)
+            throws IOException {
+        dataOutputStream.writeInt(mXmpFromSeparateMarker.bytes.length + 22);
+        CRC32 crc = new CRC32();
+        dataOutputStream.writeInt(PNG_CHUNK_TYPE_ITXT);
+        updateCrcWithInt(crc, PNG_CHUNK_TYPE_ITXT);
+        dataOutputStream.write(PNG_ITXT_XMP_KEYWORD);
+        crc.update(PNG_ITXT_XMP_KEYWORD);
+        dataOutputStream.write(mXmpFromSeparateMarker.bytes);
+        crc.update(mXmpFromSeparateMarker.bytes);
+        dataOutputStream.writeInt((int) crc.getValue());
+        mFileOnDiskContainsSeparateXmpMarker = true;
+    }
+
     // A WebP file has a header and a series of chunks.
     // The header is composed of:
     //   "RIFF" + File Size + "WEBP"
@@ -6502,11 +6805,12 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
 
         // WebP signature
         copy(totalInputStream, totalOutputStream, WEBP_SIGNATURE_1.length);
-        // File length will be written after all the chunks have been written
-        totalInputStream.skipFully(WEBP_FILE_SIZE_BYTE_LENGTH + WEBP_SIGNATURE_2.length);
+        int riffLength = totalInputStream.readInt();
+        totalInputStream.skipFully(WEBP_SIGNATURE_2.length);
 
         // Create a separate byte array to calculate file length
         ByteArrayOutputStream nonHeaderByteArrayOutputStream = null;
+        int exifOffset = -1;
         try {
             nonHeaderByteArrayOutputStream = new ByteArrayOutputStream();
             ByteOrderedDataOutputStream nonHeaderOutputStream =
@@ -6532,7 +6836,7 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
                 totalInputStream.skipFully(exifChunkLength);
 
                 // Write new EXIF chunk to output stream
-                writeExifSegment(nonHeaderOutputStream);
+                exifOffset = writeExifSegment(nonHeaderOutputStream);
             } else {
                 // EXIF chunk does not exist in the original file
                 byte[] firstChunkType = new byte[WEBP_CHUNK_TYPE_BYTE_LENGTH];
@@ -6577,7 +6881,7 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
                                 animationFinished = true;
                             }
                             if (animationFinished) {
-                                writeExifSegment(nonHeaderOutputStream);
+                                exifOffset = writeExifSegment(nonHeaderOutputStream);
                                 break;
                             }
                             copyWebPChunk(totalInputStream, nonHeaderOutputStream, type);
@@ -6586,7 +6890,7 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
                         // Skip until we find the VP8 or VP8L chunk
                         copyChunksUpToGivenChunkType(totalInputStream, nonHeaderOutputStream,
                                 WEBP_CHUNK_TYPE_VP8, WEBP_CHUNK_TYPE_VP8L);
-                        writeExifSegment(nonHeaderOutputStream);
+                        exifOffset = writeExifSegment(nonHeaderOutputStream);
                     }
                 } else if (Arrays.equals(firstChunkType, WEBP_CHUNK_TYPE_VP8)
                         || Arrays.equals(firstChunkType, WEBP_CHUNK_TYPE_VP8L)) {
@@ -6617,8 +6921,8 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
 
                         // Retrieve image width/height
                         widthAndHeight = totalInputStream.readInt();
-                        width = (widthAndHeight << 18) >> 18;
-                        height = (widthAndHeight << 2) >> 18;
+                        width = widthAndHeight & 0x3FFF;
+                        height = (widthAndHeight >> 16) & 0x3FFF;
                         bytesToRead -= (vp8Frame.length + vp8Signature.length + 4);
                     } else if (Arrays.equals(firstChunkType, WEBP_CHUNK_TYPE_VP8L)) {
                         // Check signature
@@ -6673,18 +6977,24 @@ private void saveWebpAttributes(InputStream inputStream, OutputStream outputStre
                     copy(totalInputStream, nonHeaderOutputStream, bytesToRead);
 
                     // Write EXIF chunk
-                    writeExifSegment(nonHeaderOutputStream);
+                    exifOffset = writeExifSegment(nonHeaderOutputStream);
                 }
             }
 
-            // Copy the rest of the file
-            copy(totalInputStream, nonHeaderOutputStream);
+            // Copy the rest of the RIFF part of the file
+            int remainingRiffBytes = riffLength + 8 - totalInputStream.position();
+            copy(totalInputStream, nonHeaderOutputStream, remainingRiffBytes);
 
             // Write file length + second signature
             totalOutputStream.writeInt(nonHeaderByteArrayOutputStream.size()
                     + WEBP_SIGNATURE_2.length);
             totalOutputStream.write(WEBP_SIGNATURE_2);
+            if (exifOffset != -1) {
+                mOffsetToExifData = totalOutputStream.mOutputStream.size() + exifOffset;
+            }
             nonHeaderByteArrayOutputStream.writeTo(totalOutputStream);
+            // Copy any non-RIFF trailing data
+            copy(totalInputStream, totalOutputStream);
         } catch (Exception e) {
             throw new IOException("Failed to save WebP file", e);
         } finally {
@@ -6822,7 +7132,7 @@ private void readImageFileDirectory(SeekableByteOrderedDataInputStream dataInput
             long nextEntryOffset = dataInputStream.position() + 4L;
 
             // Look up a corresponding tag from tag number
-            ExifTag tag = (ExifTag) sExifTagMapsForReading[ifdType].get(tagNumber);
+            ExifTag tag = sExifTagMapsForReading[ifdType].get(tagNumber);
 
             if (DEBUG) {
                 Log.d(TAG, String.format("ifdType: %d, tagNumber: %d, tagName: %s, dataFormat: %d, "
@@ -7035,16 +7345,16 @@ private void retrieveJpegImageSize(SeekableByteOrderedDataInputStream in, int im
             throws IOException {
         // Check if image already has IMAGE_LENGTH & IMAGE_WIDTH values
         ExifAttribute imageLengthAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_IMAGE_LENGTH);
+                mAttributes[imageType].get(TAG_IMAGE_LENGTH);
         ExifAttribute imageWidthAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_IMAGE_WIDTH);
+                mAttributes[imageType].get(TAG_IMAGE_WIDTH);
 
         if (imageLengthAttribute == null || imageWidthAttribute == null) {
             // Find if offset for JPEG data exists
             ExifAttribute jpegInterchangeFormatAttribute =
-                    (ExifAttribute) mAttributes[imageType].get(TAG_JPEG_INTERCHANGE_FORMAT);
+                    mAttributes[imageType].get(TAG_JPEG_INTERCHANGE_FORMAT);
             ExifAttribute jpegInterchangeFormatLengthAttribute =
-                    (ExifAttribute) mAttributes[imageType].get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+                    mAttributes[imageType].get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
             if (jpegInterchangeFormatAttribute != null
                     && jpegInterchangeFormatLengthAttribute != null) {
                 int jpegInterchangeFormat =
@@ -7064,10 +7374,10 @@ private void retrieveJpegImageSize(SeekableByteOrderedDataInputStream in, int im
 
     // Sets thumbnail offset & length attributes based on JpegInterchangeFormat or StripOffsets tags
     private void setThumbnailData(ByteOrderedDataInputStream in) throws IOException {
-        HashMap thumbnailData = mAttributes[IFD_TYPE_THUMBNAIL];
+        HashMap<String, ExifAttribute> thumbnailData = mAttributes[IFD_TYPE_THUMBNAIL];
 
         ExifAttribute compressionAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_COMPRESSION);
+                thumbnailData.get(TAG_COMPRESSION);
         if (compressionAttribute != null) {
             mThumbnailCompression = compressionAttribute.getIntValue(mExifByteOrder);
             switch (mThumbnailCompression) {
@@ -7092,12 +7402,12 @@ private void setThumbnailData(ByteOrderedDataInputStream in) throws IOException
 
     // Check JpegInterchangeFormat(JFIF) tags to retrieve thumbnail offset & length values
     // and reads the corresponding bytes if stream does not support seek function
-    private void handleThumbnailFromJfif(ByteOrderedDataInputStream in, HashMap thumbnailData)
-            throws IOException {
+    private void handleThumbnailFromJfif(ByteOrderedDataInputStream in,
+            HashMap<String, ExifAttribute> thumbnailData) throws IOException {
         ExifAttribute jpegInterchangeFormatAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT);
+                thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT);
         ExifAttribute jpegInterchangeFormatLengthAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+                thumbnailData.get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
         if (jpegInterchangeFormatAttribute != null
                 && jpegInterchangeFormatLengthAttribute != null) {
             int thumbnailOffset = jpegInterchangeFormatAttribute.getIntValue(mExifByteOrder);
@@ -7130,12 +7440,12 @@ private void handleThumbnailFromJfif(ByteOrderedDataInputStream in, HashMap thum
     }
 
     // Check StripOffsets & StripByteCounts tags to retrieve thumbnail offset & length values
-    private void handleThumbnailFromStrips(ByteOrderedDataInputStream in, HashMap thumbnailData)
-            throws IOException {
+    private void handleThumbnailFromStrips(ByteOrderedDataInputStream in,
+            HashMap<String, ExifAttribute> thumbnailData) throws IOException {
         ExifAttribute stripOffsetsAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_STRIP_OFFSETS);
+                thumbnailData.get(TAG_STRIP_OFFSETS);
         ExifAttribute stripByteCountsAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_STRIP_BYTE_COUNTS);
+                thumbnailData.get(TAG_STRIP_BYTE_COUNTS);
 
         if (stripOffsetsAttribute != null && stripByteCountsAttribute != null) {
             long[] stripOffsets =
@@ -7217,9 +7527,9 @@ private void handleThumbnailFromStrips(ByteOrderedDataInputStream in, HashMap th
     }
 
     // Check if thumbnail data type is currently supported or not
-    private boolean isSupportedDataType(HashMap thumbnailData) throws IOException {
+    private boolean isSupportedDataType(HashMap<String, ExifAttribute> thumbnailData) {
         ExifAttribute bitsPerSampleAttribute =
-                (ExifAttribute) thumbnailData.get(TAG_BITS_PER_SAMPLE);
+                thumbnailData.get(TAG_BITS_PER_SAMPLE);
         if (bitsPerSampleAttribute != null) {
             int[] bitsPerSampleValue = (int[]) bitsPerSampleAttribute.getValue(mExifByteOrder);
 
@@ -7230,7 +7540,7 @@ private boolean isSupportedDataType(HashMap thumbnailData) throws IOException {
             // See DNG Specification 1.4.0.0. Section 3, Compression.
             if (mMimeType == IMAGE_TYPE_DNG) {
                 ExifAttribute photometricInterpretationAttribute =
-                        (ExifAttribute) thumbnailData.get(TAG_PHOTOMETRIC_INTERPRETATION);
+                        thumbnailData.get(TAG_PHOTOMETRIC_INTERPRETATION);
                 if (photometricInterpretationAttribute != null) {
                     int photometricInterpretationValue
                             = photometricInterpretationAttribute.getIntValue(mExifByteOrder);
@@ -7253,9 +7563,9 @@ private boolean isSupportedDataType(HashMap thumbnailData) throws IOException {
 
     // Returns true if the image length and width values are <= 512.
     // See Section 4.8 of http://standardsproposals.bsigroup.com/Home/getPDF/567
-    private boolean isThumbnail(HashMap map) throws IOException {
-        ExifAttribute imageLengthAttribute = (ExifAttribute) map.get(TAG_IMAGE_LENGTH);
-        ExifAttribute imageWidthAttribute = (ExifAttribute) map.get(TAG_IMAGE_WIDTH);
+    private boolean isThumbnail(HashMap<String, ExifAttribute> map) {
+        ExifAttribute imageLengthAttribute = map.get(TAG_IMAGE_LENGTH);
+        ExifAttribute imageWidthAttribute = map.get(TAG_IMAGE_WIDTH);
 
         if (imageLengthAttribute != null && imageWidthAttribute != null) {
             int imageLengthValue = imageLengthAttribute.getIntValue(mExifByteOrder);
@@ -7279,9 +7589,9 @@ private void validateImages() throws IOException {
         // sizes, excluding padding at the right end or bottom end of the image to make sure that
         // the values are multiples of 64. See JEITA CP-3451C Table 5 and Section 4.8.1. B.
         ExifAttribute pixelXDimAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_EXIF].get(TAG_PIXEL_X_DIMENSION);
+                mAttributes[IFD_TYPE_EXIF].get(TAG_PIXEL_X_DIMENSION);
         ExifAttribute pixelYDimAttribute =
-                (ExifAttribute) mAttributes[IFD_TYPE_EXIF].get(TAG_PIXEL_Y_DIMENSION);
+                mAttributes[IFD_TYPE_EXIF].get(TAG_PIXEL_Y_DIMENSION);
         if (pixelXDimAttribute != null && pixelYDimAttribute != null) {
             mAttributes[IFD_TYPE_PRIMARY].put(TAG_IMAGE_WIDTH, pixelXDimAttribute);
             mAttributes[IFD_TYPE_PRIMARY].put(TAG_IMAGE_LENGTH, pixelYDimAttribute);
@@ -7327,16 +7637,16 @@ private void updateImageSizeValues(SeekableByteOrderedDataInputStream in, int im
             throws IOException {
         // Uncompressed image valid image size values
         ExifAttribute defaultCropSizeAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_DEFAULT_CROP_SIZE);
+                mAttributes[imageType].get(TAG_DEFAULT_CROP_SIZE);
         // RW2 image valid image size values
         ExifAttribute topBorderAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_RW2_SENSOR_TOP_BORDER);
+                mAttributes[imageType].get(TAG_RW2_SENSOR_TOP_BORDER);
         ExifAttribute leftBorderAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_RW2_SENSOR_LEFT_BORDER);
+                mAttributes[imageType].get(TAG_RW2_SENSOR_LEFT_BORDER);
         ExifAttribute bottomBorderAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_RW2_SENSOR_BOTTOM_BORDER);
+                mAttributes[imageType].get(TAG_RW2_SENSOR_BOTTOM_BORDER);
         ExifAttribute rightBorderAttribute =
-                (ExifAttribute) mAttributes[imageType].get(TAG_RW2_SENSOR_RIGHT_BORDER);
+                mAttributes[imageType].get(TAG_RW2_SENSOR_RIGHT_BORDER);
 
         if (defaultCropSizeAttribute != null) {
             // Update for uncompressed image
@@ -7390,7 +7700,12 @@ private void updateImageSizeValues(SeekableByteOrderedDataInputStream in, int im
         }
     }
 
-    // Writes an Exif segment into the given output stream.
+    /**
+     * Writes an Exif segment into the given output stream.
+     *
+     * @return The offset of the start of the Exif data (the byte-order marker) written into {@code
+     *     dataOutputStream}.
+     */
     private int writeExifSegment(ByteOrderedDataOutputStream dataOutputStream) throws IOException {
         // The following variables are for calculating each IFD tag group size in bytes.
         int[] ifdOffsets = new int[EXIF_TAGS.length];
@@ -7413,10 +7728,12 @@ private int writeExifSegment(ByteOrderedDataOutputStream dataOutputStream) throw
 
         // Remove null value tags.
         for (int ifdType = 0; ifdType < EXIF_TAGS.length; ++ifdType) {
-            for (Object obj : mAttributes[ifdType].entrySet().toArray()) {
-                final Map.Entry entry = (Map.Entry) obj;
+            Iterator<Map.Entry<String, ExifAttribute>> entrySetIterator =
+                    mAttributes[ifdType].entrySet().iterator();
+            while (entrySetIterator.hasNext()) {
+                Map.Entry<String, ExifAttribute> entry = entrySetIterator.next();
                 if (entry.getValue() == null) {
-                    mAttributes[ifdType].remove(entry.getKey());
+                    entrySetIterator.remove();
                 }
             }
         }
@@ -7527,7 +7844,7 @@ private int writeExifSegment(ByteOrderedDataOutputStream dataOutputStream) throw
             case IMAGE_TYPE_PNG:
                 // Write PNG specific data (chunk size, chunk type)
                 dataOutputStream.writeInt(totalSize);
-                dataOutputStream.write(PNG_CHUNK_TYPE_EXIF);
+                dataOutputStream.writeInt(PNG_CHUNK_TYPE_EXIF);
                 break;
             case IMAGE_TYPE_WEBP:
                 // Write WebP specific data (chunk type, chunk size)
@@ -7536,6 +7853,8 @@ private int writeExifSegment(ByteOrderedDataOutputStream dataOutputStream) throw
                 break;
         }
 
+        int offsetToExifData = dataOutputStream.mOutputStream.size();
+
         // Write TIFF Headers. See JEITA CP-3451C Section 4.5.2. Table 1.
         dataOutputStream.writeShort(mExifByteOrder == BIG_ENDIAN ? BYTE_ALIGN_MM : BYTE_ALIGN_II);
         dataOutputStream.setByteOrder(mExifByteOrder);
@@ -7608,7 +7927,7 @@ private int writeExifSegment(ByteOrderedDataOutputStream dataOutputStream) throw
         // Reset the byte order to big endian in order to write remaining parts of the JPEG file.
         dataOutputStream.setByteOrder(BIG_ENDIAN);
 
-        return totalSize;
+        return offsetToExifData;
     }
 
     /**
@@ -7755,7 +8074,7 @@ private static class ByteOrderedDataInputStream extends InputStream implements D
             this(in, BIG_ENDIAN);
         }
 
-        ByteOrderedDataInputStream(InputStream in, ByteOrder byteOrder) throws IOException {
+        ByteOrderedDataInputStream(InputStream in, ByteOrder byteOrder) {
             mDataInputStream = new DataInputStream(in);
             mDataInputStream.mark(0);
             mPosition = 0;
@@ -7773,6 +8092,25 @@ public int position() {
             return mPosition;
         }
 
+        /** Reads all remaining data. */
+        public byte[] readToEnd() throws IOException {
+            byte[] data = new byte[1024];
+            int bytesRead = 0;
+            while (true) {
+                if (bytesRead == data.length) {
+                    data = Arrays.copyOf(data, data.length * 2);
+                }
+                int readResult = mDataInputStream.read(data, bytesRead, data.length - bytesRead);
+                if (readResult != -1) {
+                    bytesRead += readResult;
+                    mPosition += readResult;
+                } else {
+                    break;
+                }
+            }
+            return Arrays.copyOf(data, bytesRead);
+        }
+
         @Override
         public int available() throws IOException {
             return mDataInputStream.available();
@@ -7981,12 +8319,12 @@ public int length() {
     // An output stream to write EXIF data area, which can be written in either little or big endian
     // order.
     private static class ByteOrderedDataOutputStream extends FilterOutputStream {
-        final OutputStream mOutputStream;
+        final DataOutputStream mOutputStream;
         private ByteOrder mByteOrder;
 
         public ByteOrderedDataOutputStream(OutputStream out, ByteOrder byteOrder) {
             super(out);
-            mOutputStream = out;
+            mOutputStream = new DataOutputStream(out);
             mByteOrder = byteOrder;
         }
 
@@ -8060,13 +8398,13 @@ private void swapBasedOnImageSize(@IfdType int firstIfdType, @IfdType int second
         }
 
         ExifAttribute firstImageLengthAttribute =
-                (ExifAttribute) mAttributes[firstIfdType].get(TAG_IMAGE_LENGTH);
+                mAttributes[firstIfdType].get(TAG_IMAGE_LENGTH);
         ExifAttribute firstImageWidthAttribute =
-                (ExifAttribute) mAttributes[firstIfdType].get(TAG_IMAGE_WIDTH);
+                mAttributes[firstIfdType].get(TAG_IMAGE_WIDTH);
         ExifAttribute secondImageLengthAttribute =
-                (ExifAttribute) mAttributes[secondIfdType].get(TAG_IMAGE_LENGTH);
+                mAttributes[secondIfdType].get(TAG_IMAGE_LENGTH);
         ExifAttribute secondImageWidthAttribute =
-                (ExifAttribute) mAttributes[secondIfdType].get(TAG_IMAGE_WIDTH);
+                mAttributes[secondIfdType].get(TAG_IMAGE_WIDTH);
 
         if (firstImageLengthAttribute == null || firstImageWidthAttribute == null) {
             if (DEBUG) {
diff --git a/app/src/main/java/androidxc/exifinterface/media/ExifInterfaceUtils.java b/app/src/main/java/androidxc/exifinterface/media/ExifInterfaceUtils.java
index 8f382efdc..8296c3a83 100644
--- a/app/src/main/java/androidxc/exifinterface/media/ExifInterfaceUtils.java
+++ b/app/src/main/java/androidxc/exifinterface/media/ExifInterfaceUtils.java
@@ -18,12 +18,10 @@
 
 import android.media.MediaDataSource;
 import android.media.MediaMetadataRetriever;
-import android.os.Build;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.util.Log;
 
-import androidx.annotation.DoNotInline;
 import androidx.annotation.RequiresApi;
 
 import java.io.Closeable;
@@ -146,37 +144,10 @@ static void closeQuietly(Closeable closeable) {
      * Closes a file descriptor that has been duplicated.
      */
     static void closeFileDescriptor(FileDescriptor fd) {
-        // Os.dup and Os.close was introduced in API 21 so this method shouldn't be called
-        // in API < 21.
-        if (Build.VERSION.SDK_INT >= 21) {
-            try {
-                Api21Impl.close(fd);
-                // Catching ErrnoException will raise error in API < 21
-            } catch (Exception ex) {
-                Log.e(TAG, "Error closing fd.");
-            }
-        } else {
-            Log.e(TAG, "closeFileDescriptor is called in API < 21, which must be wrong.");
-        }
-    }
-
-    @RequiresApi(21)
-    static class Api21Impl {
-        private Api21Impl() {}
-
-        @DoNotInline
-        static FileDescriptor dup(FileDescriptor fileDescriptor) throws ErrnoException {
-            return Os.dup(fileDescriptor);
-        }
-
-        @DoNotInline
-        static long lseek(FileDescriptor fd, long offset, int whence) throws ErrnoException {
-            return Os.lseek(fd, offset, whence);
-        }
-
-        @DoNotInline
-        static void close(FileDescriptor fd) throws ErrnoException {
+        try {
             Os.close(fd);
+        } catch (ErrnoException ex) {
+            Log.e(TAG, "Error closing fd.", ex);
         }
     }
 
@@ -184,7 +155,6 @@ static void close(FileDescriptor fd) throws ErrnoException {
     static class Api23Impl {
         private Api23Impl() {}
 
-        @DoNotInline
         static void setDataSource(MediaMetadataRetriever retriever, MediaDataSource dataSource) {
             retriever.setDataSource(dataSource);
         }

From 74bc70fa04e8737cd1c0753685ef634815ad9e70 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:48:47 +0300
Subject: [PATCH 05/51] Update dependencies and adapt to the CameraX 1.6 APIs

---
 .../java/app/grapheneos/camera/CamConfig.kt   |  704 ++++-
 .../grapheneos/camera/ui/SettingsDialog.kt    |    3 +-
 .../camera/ui/activities/CaptureActivity.kt   |    3 +-
 app/src/main/res/values/strings.xml           |   13 +
 gradle/libs.versions.toml                     |   14 +-
 gradle/verification-metadata.xml              | 2756 +++++++++--------
 6 files changed, 2187 insertions(+), 1306 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index ccb4f081d..98943b3d0 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -3,6 +3,7 @@ package app.grapheneos.camera
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import android.hardware.camera2.CameraCharacteristics
 import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
@@ -16,11 +17,12 @@ import android.view.animation.LinearInterpolator
 import android.widget.Button
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.camera.camera2.interop.Camera2CameraInfo
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.Camera
 import androidx.camera.core.CameraInfo
 import androidx.camera.core.CameraSelector
-import androidx.camera.core.ExperimentalSessionConfig
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.MirrorMode
@@ -35,6 +37,8 @@ import androidx.camera.core.resolutionselector.ResolutionStrategy
 import androidx.camera.extensions.ExtensionMode
 import androidx.camera.extensions.ExtensionsManager
 import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.core.DynamicRange
+import androidx.camera.video.GroupableFeatures
 import androidx.camera.video.Quality
 import androidx.camera.video.QualitySelector
 import androidx.camera.video.Recorder
@@ -56,6 +60,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.BarcodeFormat
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
+import kotlin.concurrent.thread
 
 // note that enum constant name is used as a name of a SharedPreferences instance
 enum class CameraMode(val extensionMode: Int, val uiName: Int) {
@@ -569,8 +574,24 @@ class CamConfig(private val mActivity: MainActivity) {
         camera!!.cameraInfo.isZslSupported
     }
 
-    fun isVideoStabilizationSupported() : Boolean {
-        return isRecorderStabilizationSupported()
+    // Whether the EIS toggle has anything to act on. Stabilization is only ever requested through
+    // the feature group (see startCamera), which in turn needs the platform to be able to verify
+    // feature combinations, so a camera that can stabilize is not on its own enough: where the
+    // group cannot be used nothing applies EIS, and offering the toggle there is offering a
+    // control that does nothing.
+    fun canApplyVideoStabilization() : Boolean {
+        return canVerifyFeatureCombinations() && isVideoStabilizationSupported()
+    }
+
+    private fun isVideoStabilizationSupported() : Boolean {
+        // The toggle asks for both kinds of stabilization (see the preferred feature group in
+        // startCamera), preferring the preview kind and falling back to the recording-only kind,
+        // so it is meaningful whenever either one is available. Testing only the recorder
+        // capability both hid the toggle on cameras that can stabilize the preview but not the
+        // recording, and offered it on cameras where only the recorder can stabilize - where
+        // the bind used to ask exclusively for preview stabilization, leaving the toggle with
+        // nothing to do.
+        return isPreviewStabilizationSupported() || isRecorderStabilizationSupported()
     }
 
     private fun isPreviewStabilizationSupported() : Boolean {
@@ -1032,13 +1053,22 @@ class CamConfig(private val mActivity: MainActivity) {
         val cameraProviderFuture = ProcessCameraProvider.getInstance(mActivity)
 
         cameraProviderFuture.addListener(fun() {
+            val provider: ProcessCameraProvider
             try {
-                cameraProvider = cameraProviderFuture.get()
+                provider = cameraProviderFuture.get()
             } catch (e: ExecutionException) {
                 mActivity.showMessage(mActivity.getString(R.string.camera_provider_init_failure))
                 return
             }
 
+            if (provider !== cameraProvider) {
+                // A different provider instance means the camera stack was reinitialized:
+                // extension verdicts probed through the previous instance (including bind-time
+                // blacklists, see startCamera) describe vendor state that no longer exists.
+                extensionUsability.clear()
+            }
+            cameraProvider = provider
+
             // Manually switch to the other lens facing (if the default lens facing isn't
             // supported for the current device)
             if (!isLensFacingSupported(lensFacing)) {
@@ -1049,21 +1079,281 @@ class CamConfig(private val mActivity: MainActivity) {
                 }
             }
 
-            val extensionsManagerFuture =
-                ExtensionsManager.getInstanceAsync(mActivity, cameraProvider!!)
-
-            extensionsManagerFuture.addListener({
+            // Despite the name, getInstanceAsync() runs its one-time initialization body
+            // synchronously on the calling thread, and that body asks the vendor's extensions
+            // proxy service for each camera's advertised extensions until it finds one that has
+            // any -- measured at a handful of binder round trips on the main thread during
+            // startup on a Pixel 7 Pro. Call it from a short-lived thread instead; only the
+            // listener has to run on the main thread, for the field write and startCamera().
+            thread {
                 try {
-                    extensionsManager = extensionsManagerFuture.get()
-                } catch (e: ExecutionException) {
-                    mActivity.showMessage(mActivity.getString(R.string.extensions_manager_init_failure))
+                    val extensionsManagerFuture = ExtensionsManager.getInstanceAsync(mActivity, provider)
+
+                    extensionsManagerFuture.addListener({
+                        try {
+                            extensionsManager = extensionsManagerFuture.get()
+                        } catch (e: ExecutionException) {
+                            mActivity.showMessage(mActivity.getString(R.string.extensions_manager_init_failure))
+                        }
+                        startCamera(forced = forced)
+                    }, ContextCompat.getMainExecutor(mActivity))
+                } catch (e: Exception) {
+                    // getInstanceAsync() runs its initialization synchronously (see above), so it
+                    // -- or addListener -- can throw right here on this background thread, where an
+                    // escaping exception would crash the process and, worse, leave the camera never
+                    // started because the listener never runs. Recover exactly as the future-failure
+                    // path does: report it and start the camera without extensions, on the main
+                    // thread.
+                    Log.e(TAG, "Extensions manager initialization failed", e)
+                    ContextCompat.getMainExecutor(mActivity).execute {
+                        mActivity.showMessage(mActivity.getString(R.string.extensions_manager_init_failure))
+                        startCamera(forced = forced)
+                    }
                 }
-                startCamera(forced = forced)
-            }, ContextCompat.getMainExecutor(mActivity))
+            }
 
         }, ContextCompat.getMainExecutor(mActivity))
     }
 
+    // ExtensionsManager.isExtensionAvailable() answers from CameraExtensionCharacteristics'
+    // static advertisement data. Actually *binding* an advertised extension additionally makes
+    // CameraX initialize a Camera2ExtensionsVendorExtender, which calls into the vendor's
+    // advanced extender over binder. Some vendors advertise a mode there and then throw from
+    // that init - Pixels raise "Framework size list map not supported in pixel path"
+    // - which used to kill the process from inside bindToLifecycle(). CameraX 1.6 removed the
+    // legacy OEM extender path, so there is no longer a working fallback on those devices and the
+    // only safe option is to stop offering the mode.
+    //
+    // getCameraInfo() performs exactly the same vendor init that bindToLifecycle() does, so it is
+    // a faithful probe. Verdicts are cached because every step of the probe -- including the
+    // availability query, see probeExtension -- costs a binder round trip. A negative verdict is
+    // only cached when the failure is known to be persistent: caching a transient probe failure
+    // would make the mode's tab vanish for the rest of the process lifetime over a condition
+    // that clears seconds later.
+    //
+    // The cache is read and written on the main thread only. probeExtension() itself also runs
+    // on the probe thread that loadTabs() spawns, but its results come back through the main
+    // executor, which keeps the provider-change invalidation in initializeCamera() and these
+    // writes free of cross-thread races.
+    private val extensionUsability = HashMap<Pair<Int, Int>, Boolean>()
+
+    // true/false is a verdict that is safe to cache; null is a failure that may be transient
+    // and must not be (see extensionUsability above). The provider and manager are parameters
+    // rather than the fields because this also runs off the main thread, where the fields could
+    // be swapped out mid-probe.
+    private fun probeExtension(
+        provider: ProcessCameraProvider,
+        em: ExtensionsManager,
+        selector: CameraSelector,
+        extensionMode: Int,
+    ): Boolean? {
+        // What the vendor advertises is as static as the vendor init verdict below, so a
+        // negative answer is cached the same way -- notably, isExtensionAvailable() is *not*
+        // the cheap in-process lookup it appears to be: on Android 17 every call costs a round
+        // trip to the vendor's extensions proxy service, which is exactly the kind of work this
+        // probe exists to keep off the main thread (see loadTabs). It sits inside the try below so
+        // that a transient failure of that round trip is treated like any other -- returning null
+        // to retry later -- rather than propagating out: on the background probe thread an escaping
+        // exception would strand the round with extensionProbesInFlight still set, blocking every
+        // later tab refresh.
+        return try {
+            when {
+                !em.isExtensionAvailable(selector, extensionMode) -> false
+                else -> {
+                    provider.getCameraInfo(
+                        em.getExtensionEnabledCameraSelector(selector, extensionMode)
+                    )
+                    true
+                }
+            }
+        } catch (e: UnsupportedOperationException) {
+            // The signature of a vendor extender that advertises the mode and then throws from
+            // its own init (Pixels: "Framework size list map not supported in pixel path").
+            // Nothing about it changes within a process lifetime, so this verdict is safe to
+            // remember.
+            Log.w(TAG, "Extension mode $extensionMode is advertised but unusable here", e)
+            false
+        } catch (e: Exception) {
+            // Anything else may be transient — the camera service restarting, the camera briefly
+            // held by another process. Fail this probe but leave the cache alone so the mode is
+            // offered again once the underlying condition clears.
+            Log.w(TAG, "Probing extension mode $extensionMode failed, will retry later", e)
+            null
+        }
+    }
+
+    private fun isExtensionUsable(
+        selector: CameraSelector,
+        lensFacing: Int,
+        extensionMode: Int,
+        probeOnMiss: Boolean = true,
+    ): Boolean {
+        if (extensionMode == ExtensionMode.NONE) return true
+
+        val em = extensionsManager ?: return false
+        val provider = cameraProvider ?: return false
+
+        val key = lensFacing to extensionMode
+        extensionUsability[key]?.let { return it }
+
+        if (!probeOnMiss) return false
+
+        // A background probe round (loadTabs) may already be asking the vendor about this very
+        // key. Probing inline here would run a second synchronous vendor round trip on the main
+        // thread and race that round's verdict write. While a round is in flight, treat the miss
+        // as "unusable for now"; the round fills the cache and the next rebind/tab refresh picks
+        // up the real verdict. The inline probe stays for the not-in-flight cold case, where it is
+        // the only path to a verdict.
+        if (extensionProbesInFlight) return false
+
+        val verdict = probeExtension(provider, em, selector, extensionMode) ?: return false
+        extensionUsability[key] = verdict
+        return verdict
+    }
+
+    // Whether CameraX's feature-group resolution can actually *verify* feature combinations on
+    // the current camera. The resolver (DefaultFeatureGroupResolver) keeps a candidate
+    // combination only when the platform confirms it, and it treats "could not check" exactly
+    // like "verified unsupported": below API 35 CameraX substitutes a no-op feature-combination
+    // query whose isSupported() is unconditionally false (CameraSurfaceAdapter), and on API 35+
+    // a HAL that does not implement the session-configuration query answers UNKNOWN, which is
+    // folded into false as well (camera-pipe ConfigQueryResult). On such a camera, combinations
+    // the device records fine every day resolve down to little or nothing: the stored video
+    // quality is silently ignored (setQualitySelector must not be called while a feature group
+    // is in use, see startCamera) and the divergence notice asserts unsupportedness that was
+    // never actually verified. So the feature-group path is only taken when the platform can
+    // genuinely answer, and startCamera otherwise falls back to the pre-1.6 configuration APIs,
+    // which never drop the chosen quality.
+    //
+    // The per-camera INFO_SESSION_CONFIGURATION_QUERY_VERSION characteristic is what the
+    // platform's answers ultimately hinge on (CameraDeviceSetup exists only for cameras
+    // reporting >= 35 there), so it is checked in addition to the API level. This deliberately
+    // mirrors CameraX's own SDK_INT >= 35 gate — which upstream may still move, see b/417839748
+    // — plus the HAL capability that gate cannot see; re-check both on CameraX updates.
+    @androidx.annotation.OptIn(ExperimentalCamera2Interop::class)
+    private fun canVerifyFeatureCombinations(): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) return false
+
+        val cameraInfo = try {
+            cameraProvider?.getCameraInfo(cameraSelector) ?: return false
+        } catch (exception: IllegalArgumentException) {
+            Log.w(TAG, "Unable to resolve camera info for feature combination gate", exception)
+            return false
+        }
+
+        val queryVersion = try {
+            Camera2CameraInfo.from(cameraInfo).getCameraCharacteristic(
+                CameraCharacteristics.INFO_SESSION_CONFIGURATION_QUERY_VERSION
+            )
+        } catch (exception: IllegalArgumentException) {
+            Log.w(TAG, "Camera info carries no camera2 characteristics", exception)
+            null
+        }
+
+        return (queryVersion ?: 0) >= Build.VERSION_CODES.VANILLA_ICE_CREAM
+    }
+
+    // Maps the user-chosen video quality to the equivalent groupable feature, for use when a
+    // feature group is passed to SessionConfig (see startCamera). Quality.HIGHEST has no
+    // groupable equivalent and is resolved to the highest quality the current camera supports,
+    // mirroring what QualitySelector.from(Quality.HIGHEST) would have selected.
+    private fun videoQualityAsGroupableFeature(): GroupableFeature? {
+        val quality = if (videoQuality == Quality.HIGHEST) {
+            val cameraInfo = try {
+                cameraProvider?.getCameraInfo(cameraSelector) ?: return null
+            } catch (exception: IllegalArgumentException) {
+                Log.w(TAG, "Unable to resolve camera info for quality lookup", exception)
+                return null
+            }
+            Recorder.getVideoCapabilities(cameraInfo)
+                .getSupportedQualities(DynamicRange.SDR)
+                .firstOrNull() ?: return null
+        } else {
+            videoQuality
+        }
+
+        return when (quality) {
+            Quality.UHD -> GroupableFeatures.UHD_RECORDING
+            Quality.FHD -> GroupableFeatures.FHD_RECORDING
+            Quality.HD -> GroupableFeatures.HD_RECORDING
+            Quality.SD -> GroupableFeatures.SD_RECORDING
+            else -> {
+                // Not fatal: startCamera() then requests no quality feature at all and the
+                // quality is left to Recorder's default selector. Worth a log because it means
+                // the user's explicit choice is silently not being asked for.
+                Log.w(TAG, "No groupable feature equivalent for video quality $quality")
+                null
+            }
+        }
+    }
+
+    // The quality labels shown in the settings spinner, so that a message about a quality can
+    // name it exactly the way the user picked it (see SettingsDialog.getTitleFor).
+    private fun describeQualityFeature(feature: GroupableFeature): String? = when (feature) {
+        GroupableFeatures.UHD_RECORDING -> "2160p (UHD)"
+        GroupableFeatures.FHD_RECORDING -> "1080p (FHD)"
+        GroupableFeatures.HD_RECORDING -> "720p (HD)"
+        GroupableFeatures.SD_RECORDING -> "480p (SD)"
+        else -> null
+    }
+
+    // Avoids repeating an unchanged notice: startCamera() runs again on every tab switch,
+    // settings change, camera flip and resume, and the outcome is usually the same each time.
+    // Keyed by lens facing so that alternating between a fully-supported camera and a limited
+    // one doesn't re-announce the limited camera's unchanged hardware fact on every flip: a
+    // fully-satisfied bind clears only its own camera's entry, so the next divergence on that
+    // camera is genuinely new information while the other camera's stays remembered.
+    private val lastReportedDivergence = HashMap<Int, String>()
+
+    // CameraX resolves a preferred feature group by dropping features until what is left is a
+    // combination the camera actually supports, and it does so silently. This app only ever asks
+    // for the video quality and the stabilization that the user selected, so a dropped feature
+    // means a setting the UI still displays is not in effect. Say so rather than letting the
+    // recording quietly disagree with the settings screen.
+    //
+    // What was asked for -- including which camera it was asked of -- is passed in rather than
+    // read back from a field: the callback is delivered asynchronously, so a field could already
+    // describe a later bind by the time this runs, and the message would then name settings (or
+    // dedup against a camera) that this result never involved.
+    private fun onFeaturesSelected(
+        boundLensFacing: Int,
+        requested: List<GroupableFeature>,
+        qualityFeature: GroupableFeature?,
+        selected: Set<GroupableFeature>,
+    ) {
+        // The full request-vs-result picture (including which stabilization feature, if any,
+        // survived) is only ever logged, never shown: the lead wants EIS left silently in its
+        // known state -- 4K keeps priority and stabilization is given up without a notice.
+        Log.i(TAG, "Requested $requested but got $selected")
+
+        val qualityLabel = qualityFeature?.let { describeQualityFeature(it) }
+        // Only report a dropped quality that can be named: a message that can't say which
+        // quality it means would be worse than the log line above.
+        val droppedQuality = qualityLabel?.takeIf { qualityFeature !in selected }
+
+        // A dropped quality is the only outcome worth a toast, and it is a genuine one: CameraX
+        // tries the quality on its own before it tries either stabilization, and the preflight in
+        // startCamera already gave up in-video snapshots wherever that would let the quality bind,
+        // so a quality reported dropped here is one this camera cannot record at in the minimal
+        // configuration either. Stabilization losses are deliberately not surfaced -- besides the
+        // lead's no-EIS-messaging wish, a "stabilization unsupported" message would misattribute
+        // the loss, because stabilization can be crowded out by the in-video snapshot stream
+        // rather than by the quality.
+        val message = droppedQuality?.let {
+            mActivity.getString(R.string.quality_unsupported, it)
+        }
+
+        if (message == null) {
+            lastReportedDivergence.remove(boundLensFacing)
+            return
+        }
+
+        if (message != lastReportedDivergence[boundLensFacing]) {
+            lastReportedDivergence[boundLensFacing] = message
+            mActivity.showMessage(message)
+        }
+    }
+
     private fun isLensFacingSupported(lensFacing : Int) : Boolean {
         var tCameraSelector = CameraSelector.Builder()
             .requireLensFacing(lensFacing)
@@ -1071,7 +1361,7 @@ class CamConfig(private val mActivity: MainActivity) {
 
         if (currentMode.extensionMode != ExtensionMode.NONE) {
             extensionsManager?.let { em ->
-                if (!em.isExtensionAvailable(tCameraSelector, currentMode.extensionMode))
+                if (!isExtensionUsable(tCameraSelector, lensFacing, currentMode.extensionMode))
                     return false
 
                 try {
@@ -1086,7 +1376,6 @@ class CamConfig(private val mActivity: MainActivity) {
     }
 
     // Start the camera with latest hard configuration
-    @OptIn(ExperimentalSessionConfig::class)
     @SuppressLint("RestrictedApi")
     fun startCamera(forced: Boolean = false) {
         if ((!forced && camera != null) || cameraProvider == null) return
@@ -1139,9 +1428,11 @@ class CamConfig(private val mActivity: MainActivity) {
         cameraProvider?.unbindAll()
 
         val extMode = currentMode.extensionMode
+        var appliedExtension: Pair<Int, Int>? = null
         if (extMode != ExtensionMode.NONE) {
             val em = extensionsManager
-            if (em != null && em.isExtensionAvailable(cameraSelector, extMode)) {
+            if (em != null && isExtensionUsable(cameraSelector, lensFacing, extMode)) {
+                appliedExtension = lensFacing to extMode
                 cameraSelector = em.getExtensionEnabledCameraSelector(cameraSelector, extMode)
             } else {
                 Log.e(TAG, "Mode $currentMode isn't available for this device")
@@ -1154,10 +1445,40 @@ class CamConfig(private val mActivity: MainActivity) {
             aspectRatio, AspectRatioStrategy.FALLBACK_RULE_AUTO
         )
 
+        // CameraX 1.6.0's SessionConfig throws an IllegalArgumentException at construction time
+        // if any use case configures a groupable feature through a non-groupable API while a
+        // feature group is in use. Recorder.Builder.setQualitySelector() is such an API since
+        // 1.6.0 introduced GroupableFeatures.*_RECORDING, so when EIS is requested through
+        // GroupableFeature.PREVIEW_STABILIZATION (the only case where this app uses a feature
+        // group), the video quality has to be requested through the feature group as well.
+        //
+        // The validation triggers on setQualitySelector() having been called at all, not on the
+        // quality it was given, so this flag -- not the resolved feature below -- is what decides
+        // whether that setter may be used. videoQualityAsGroupableFeature() can legitimately fail
+        // to map the current quality, and falling back to setQualitySelector() in that case would
+        // reintroduce the very exception this works around.
+        //
+        // Both halves of canApplyVideoStabilization() gate the group. The platform has to be able
+        // to verify feature combinations: where it cannot, the resolver would conflate "could not
+        // check" with "unsupported", quietly discard the stored video quality and produce
+        // untruthful notices. Cameras behind that gate use the pre-1.6 non-groupable setters
+        // below instead, which are legal exactly because no feature group is in use then. And the
+        // group exists solely to negotiate stabilization against the quality, so a camera that
+        // supports no stabilization at all has nothing to negotiate: it takes the plain fallback
+        // path directly, which produces the identical output without a needless feature-group
+        // round.
+        val usesFeatureGroup = isVideoMode && enableEIS && canApplyVideoStabilization()
+        val videoQualityFeature: GroupableFeature? = when {
+            usesFeatureGroup -> videoQualityAsGroupableFeature()
+            else -> null
+        }
+
         if (isQRMode) {
             val analyzer = QRAnalyzer(mActivity)
-            val strategy = ResolutionStrategy(Size(960, 960),
-                ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER)
+            val strategy = ResolutionStrategy(
+                Size(960, 960),
+                ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+            )
             val mIAnalyzer = ImageAnalysis.Builder()
                 .setResolutionSelector(
                     ResolutionSelector.Builder().setResolutionStrategy(strategy).build())
@@ -1181,21 +1502,33 @@ class CamConfig(private val mActivity: MainActivity) {
         } else {
             if (isVideoMode) {
 
-                mActivity.micOffIcon.visibility =
-                    if (includeAudio) {
-                        View.GONE
-                    } else {
-                        View.VISIBLE
-                    }
+                mActivity.micOffIcon.visibility = when {
+                    includeAudio -> View.GONE
+                    else -> View.VISIBLE
+                }
 
-                val videoCaptureBuilder = VideoCapture.Builder(
-                    Recorder.Builder()
-                    .setQualitySelector(QualitySelector.from(videoQuality))
-                    .build()
-                )
+                val recorderBuilder = Recorder.Builder()
 
-                if (mActivity.camConfig.saveVideoAsPreviewed)
+                if (!usesFeatureGroup) {
+                    recorderBuilder.setQualitySelector(QualitySelector.from(videoQuality))
+                }
+
+                val videoCaptureBuilder = VideoCapture.Builder(recorderBuilder.build())
+
+                // On cameras where the feature group is not used (see canApplyVideoStabilization)
+                // EIS is deliberately left off. The pre-1.6 stabilization setters cannot be applied
+                // on top of the recorder's higher qualities -- UHD in particular is in none of the
+                // stabilization-guaranteed configurations -- so requesting them would either kill
+                // the preview or force the quality down. We keep the selected quality (4K by
+                // default) and simply do not stabilize. This is the app's long-standing behavior
+                // (EIS regressed here when it moved off the Camera2 API); the toggle is hidden
+                // rather than left inert on these cameras, and implementing EIS for them -- the
+                // pre-1.6 setters, restricted to the qualities that permit them -- is a separate
+                // change that needs a device the feature group cannot serve to test on.
+
+                if (mActivity.camConfig.saveVideoAsPreviewed) {
                     videoCaptureBuilder.setMirrorMode(MirrorMode.MIRROR_MODE_ON_FRONT_ONLY)
+                }
 
                 videoCapture = videoCaptureBuilder.build()
 
@@ -1222,7 +1555,7 @@ class CamConfig(private val mActivity: MainActivity) {
                             ?: rotation
                     )
 
-                    var resolutionSelectorBuilder = ResolutionSelector.Builder()
+                    val resolutionSelectorBuilder = ResolutionSelector.Builder()
                         .setAspectRatioStrategy(aspectRatioStrategy)
 
                     if (selectHighestResolution) {
@@ -1252,71 +1585,181 @@ class CamConfig(private val mActivity: MainActivity) {
             )
 
         // Pixels and potentially other devices enable EIS by default, which reduces the field of
-        // view and image quality for image capture if it's not explicitly disabled
-        if (!enableEIS || !isVideoMode) {
-            previewBuilder.setPreviewStabilizationEnabled(false)
+        // view and image quality for image capture if it's not explicitly disabled.
+        //
+        // setPreviewStabilizationEnabled() is one of the non-groupable setters that SessionConfig
+        // rejects outright once a feature group is in use, so it must not be called at all --
+        // with either value -- when stabilization is being requested through the feature group
+        // below. On every other path it is explicitly disabled: EIS is not applied off the feature
+        // group (see the VideoCapture builder above), and leaving it unset would let a device
+        // default preview stabilization cost photo capture its field of view.
+        when {
+            usesFeatureGroup -> {}
+
+            else -> previewBuilder.setPreviewStabilizationEnabled(false)
         }
 
         preview = previewBuilder.build().also {
             useCasesList.add(it)
-            it.setSurfaceProvider(mActivity.previewView.surfaceProvider)
+            it.surfaceProvider = mActivity.previewView.surfaceProvider
         }
 
         mActivity.forceUpdateOrientationSensor()
 
-        try {
-            try {
-                val preferredFeatures = arrayListOf<GroupableFeature>()
+        // The list ordering encodes priority (highest priority first): CameraX walks the subsets
+        // of this list in order and binds the first one the camera supports, so trailing features
+        // are the ones given up first.
+        //
+        // The video quality leads because it is an explicit, deliberate choice from a spinner,
+        // whereas stabilization is a toggle that defaults to on and that most users never touch;
+        // an explicit choice should not lose to a default. This inverts the CameraX 1.5.x
+        // behaviour, where asking for 2160p on a Pixel silently recorded at 1080p because
+        // stabilization won. Whatever is given up is now reported by onFeaturesSelected().
+        //
+        // Both stabilization features are listed because the EIS toggle is offered whenever
+        // either kind is supported (see canApplyVideoStabilization). They share one feature
+        // type, so CameraX never selects both and skips the subsets containing the pair; the
+        // effective order is quality+preview-stabilization, quality+video-stabilization, quality
+        // alone, then the same three without the quality. Preview stabilization is preferred
+        // because it stabilizes the preview and the recording alike, making the framing that is
+        // shown the framing that is recorded, while video stabilization only stabilizes the file.
+        //
+        // If the quality feature is dropped the quality follows Recorder's default quality
+        // selector (FHD, HD, SD in that order).
+        val preferredFeatures = arrayListOf<GroupableFeature>()
+
+        if (usesFeatureGroup) {
+            videoQualityFeature?.let { preferredFeatures.add(it) }
+            preferredFeatures.add(GroupableFeature.PREVIEW_STABILIZATION)
+            preferredFeatures.add(GroupableFeatures.VIDEO_STABILIZATION)
+        }
+
+        // Not every camera can run video, photo and preview at once. Ask before binding rather
+        // than binding and retrying without the photo use case when it throws: an
+        // IllegalArgumentException from bindToLifecycle() carries no indication of which
+        // constraint was violated, so the retry could not tell "this camera can't do video plus
+        // photo" apart from any other misconfiguration, and would answer both by silently
+        // dropping in-video snapshots. A genuine bug then looked like a missing feature. This
+        // asks the specific question, and leaves unexpected exceptions to surface as failures.
+        val snapshotUseCase = imageCapture
+        if (isVideoMode && snapshotUseCase != null) {
+            val cameraInfo = try {
+                cameraProvider?.getCameraInfo(cameraSelector)
+            } catch (exception: IllegalArgumentException) {
+                Log.e(TAG, "Failed to query camera info", exception)
+                mActivity.showMessage(mActivity.getString(R.string.bind_failure))
+                return
+            }
 
-                if (enableEIS && isVideoMode) {
-                    preferredFeatures.add(
-                        GroupableFeature.PREVIEW_STABILIZATION
-                    )
+            fun isSupported(useCases: List<UseCase>, features: Set<GroupableFeature>) =
+                cameraInfo?.isSessionConfigSupported(
+                    SessionConfig(useCases = useCases, requiredFeatureGroup = features)
+                ) == true
+
+            // When a quality feature is about to be requested, the probe has to require that
+            // quality too: a camera can be able to run the three plain streams yet not at the
+            // chosen quality, and a probe without it would keep the snapshot use case and leave
+            // the conflict to the feature-group resolver -- which resolves it by dropping the
+            // *quality*, with a notice blaming the camera for a quality it does support. The
+            // quality wins the conflict because it is an explicit choice from the settings while
+            // in-video snapshots are an implicit capability (the same reasoning as the preferred
+            // feature ordering above), and giving up the snapshots is already the established
+            // answer when they can't be bound at all. The second isSupported(useCasesList,
+            // emptySet()) arm keeps the snapshots when the quality is unreachable even without
+            // them: dropping them would buy nothing, and the resolver's "unsupported quality"
+            // notice is genuinely true then.
+            val dropReason = when {
+                videoQualityFeature == null -> when {
+                    isSupported(useCasesList, emptySet()) -> null
+                    else -> "Video, photo and preview can't be bound together on this camera"
                 }
+                isSupported(useCasesList, setOf(videoQualityFeature)) -> null
+                isSupported(useCasesList - snapshotUseCase, setOf(videoQualityFeature)) ->
+                    "This camera can't record at the selected video quality with in-video " +
+                            "snapshots enabled"
+                isSupported(useCasesList, emptySet()) -> null
+                else -> "Video, photo and preview can't be bound together on this camera"
+            }
 
-                val sessionConfig = SessionConfig(
-                    useCases = useCasesList,
-                    preferredFeatureGroup = preferredFeatures
-                )
+            if (dropReason != null) {
+                Log.i(TAG, "$dropReason; disabling snapshots while recording")
+                useCasesList.remove(snapshotUseCase)
+                imageCapture = null
+            }
+        }
 
-                camera = cameraProvider!!.bindToLifecycle(
-                    mActivity, cameraSelector,
-                    sessionConfig
-                )
-            } catch (exception: IllegalArgumentException) {
-                if (isVideoMode) {
-                    val newUseCaseList = arrayListOf<UseCase>()
-                    val newPreferredFeatures = arrayListOf<GroupableFeature>()
-
-                    if (enableEIS && isVideoMode) {
-                        newPreferredFeatures.add(
-                            GroupableFeature.PREVIEW_STABILIZATION
-                        )
-                    }
+        try {
+            val sessionConfig = SessionConfig(
+                useCases = useCasesList,
+                preferredFeatureGroup = preferredFeatures
+            )
 
-                    videoCapture?.let {
-                        newUseCaseList.add(it)
-                    }
-                    preview?.let {
-                        newUseCaseList.add(it)
-                    }
-                    imageCapture = null
+            if (preferredFeatures.isNotEmpty()) {
+                val requested = preferredFeatures.toList()
+                val boundLensFacing = lensFacing
+                sessionConfig.setFeatureSelectionListener(
+                    ContextCompat.getMainExecutor(mActivity)
+                ) { selected ->
+                    onFeaturesSelected(boundLensFacing, requested, videoQualityFeature, selected)
+                }
+            }
 
-                    val sessionConfig = SessionConfig(
-                        useCases = newUseCaseList,
-                        preferredFeatureGroup = newPreferredFeatures
-                    )
+            camera = cameraProvider!!.bindToLifecycle(
+                mActivity, cameraSelector,
+                sessionConfig
+            )
+        } catch (exception: RuntimeException) {
+            // A vendor extension can still fail to initialize at bind time even though the
+            // pre-flight probe in isExtensionUsable() passed. When one was applied, record the
+            // failure so the mode stops being offered, rather than letting the exception kill the
+            // process or -- equally bad -- retrying the same doomed bind on every resume.
+            val key = appliedExtension
+            if (key == null) {
+                // No extension in play: an IllegalArgumentException is a plain unsupported
+                // configuration (reported and swallowed); anything else is a real bug that must
+                // stay visible.
+                if (exception is IllegalArgumentException) {
+                    Log.e(TAG, "Failed to bind use cases", exception)
+                    mActivity.showMessage(mActivity.getString(R.string.bind_failure))
+                    return
+                }
+                throw exception
+            }
 
-                    camera = cameraProvider!!.bindToLifecycle(
-                        mActivity, cameraSelector,
-                        sessionConfig
-                    )
-                } else {
-                    throw exception
+            // With an extension applied, only the vendor's known-permanent signatures mean "this
+            // mode is unusable here": UnsupportedOperationException (a vendor extender that
+            // advertised the mode and then threw from its own init -- Pixels: "Framework size list
+            // map not supported in pixel path") and IllegalArgumentException (an extension bind
+            // always uses the same fixed pair of use cases, so an invalid configuration is as
+            // permanent as any other vendor failure). Anything else is a real bug and is rethrown
+            // rather than hidden behind a silent mode switch.
+            if (exception !is UnsupportedOperationException && exception !is IllegalArgumentException) {
+                throw exception
+            }
+
+            Log.e(TAG, "Extension mode $extMode failed to bind; disabling it", exception)
+            extensionUsability[key] = false
+            mActivity.showMessage(mActivity.getString(R.string.extension_mode_unavailable))
+
+            // The bind never completed: currentMode still names the mode that was just disabled
+            // and nothing is rendering into the preview. Refreshing the tabs alone would only
+            // *visually* select the default tab, leaving a frozen preview behind a lying tab
+            // bar. Switch for real -- switchMode() rebinds and its startCamera() refreshes the
+            // tabs -- and then align the visible selection for the case where the failed mode
+            // survives on the other lens, which keeps availableModes() unchanged so loadTabs()
+            // rebuilds nothing. Recursion stops because the default mode uses no extension.
+            switchMode(DEFAULT_CAMERA_MODE)
+            if (mActivity.shouldShowCameraModeTabs()) {
+                val tabLayout = mActivity.tabLayout
+                for (i in 0 until tabLayout.tabCount) {
+                    val tab = tabLayout.getTabAt(i) ?: continue
+                    if (tab.tag == DEFAULT_CAMERA_MODE) {
+                        tabLayout.selectTab(tab)
+                        tabLayout.centerTab(tab)
+                        break
+                    }
                 }
             }
-        } catch (exception: IllegalArgumentException) {
-            mActivity.showMessage(mActivity.getString(R.string.bind_failure))
             return
         }
 
@@ -1409,6 +1852,9 @@ class CamConfig(private val mActivity: MainActivity) {
         }
     }
 
+    // probeOnMiss is false because tab refreshes must never pay for a vendor probe on the main
+    // thread (see loadTabs); an unprobed mode is left out of the tabs for now, exactly like a
+    // transiently-failed probe always was, and comes back on the refresh that follows its probe.
     private fun availableModes(): Set<CameraMode> {
         return CameraMode.entries.filter {
             when (it) {
@@ -1416,23 +1862,103 @@ class CamConfig(private val mActivity: MainActivity) {
                 CameraMode.QR_SCAN -> mActivity !is SecureMainActivity
                 else -> {
                     check(it.extensionMode != ExtensionMode.NONE)
-                    val em = extensionsManager
-                    if (em != null) {
-                        em.isExtensionAvailable(FRONT_CAMERA_SELECTOR, it.extensionMode) || em.isExtensionAvailable(REAR_CAMERA_SELECTOR, it.extensionMode)
-                    } else {
-                        false
-                    }
+                    isExtensionUsable(
+                        FRONT_CAMERA_SELECTOR, CameraSelector.LENS_FACING_FRONT,
+                        it.extensionMode, probeOnMiss = false
+                    ) || isExtensionUsable(
+                        REAR_CAMERA_SELECTOR, CameraSelector.LENS_FACING_BACK,
+                        it.extensionMode, probeOnMiss = false
+                    )
                 }
             }
         }.toSet()
     }
 
-    @SuppressLint("ClickableViewAccessibility")
+    // The (selector, cache key) pairs availableModes() needs a verdict for that only a vendor
+    // probe can answer. Deliberately a pure cache check: even asking whether a mode is
+    // advertised costs a vendor proxy round trip (see probeExtension), so the probe round has
+    // to answer that too.
+    private fun unprobedExtensions(): List<Pair<CameraSelector, Pair<Int, Int>>> {
+        if (extensionsManager == null || cameraProvider == null) return emptyList()
+
+        val result = arrayListOf<Pair<CameraSelector, Pair<Int, Int>>>()
+        for (mode in CameraMode.entries) {
+            if (mode.extensionMode == ExtensionMode.NONE) continue
+            for ((selector, lensFacing) in arrayOf(
+                FRONT_CAMERA_SELECTOR to CameraSelector.LENS_FACING_FRONT,
+                REAR_CAMERA_SELECTOR to CameraSelector.LENS_FACING_BACK,
+            )) {
+                val key = lensFacing to mode.extensionMode
+                if (extensionUsability[key] == null) {
+                    result.add(selector to key)
+                }
+            }
+        }
+        return result
+    }
+
+    private var extensionProbesInFlight = false
+
     private fun loadTabs() {
         if (!mActivity.shouldShowCameraModeTabs()) {
             return
         }
 
+        // Refreshing the tabs must not run extension probes on the calling (main) thread: the
+        // first refresh after process start needs one vendor-extender init round trip over
+        // binder per advertised mode per lens, which measures at over half a second of blocked
+        // main thread -- more than a hundred dropped frames -- during startup on a Pixel 7 Pro.
+        // The probes run on their own short-lived thread instead (not cameraExecutor, which the
+        // QR analyzer may be draining) and the tabs are built once every verdict is in, so the
+        // tab bar still appears exactly once, fully formed, at the same time it used to; until
+        // then swipes and taps resolve to no tab and the app simply stays in the current mode.
+        // Later refreshes find the cache warm and rebuild synchronously, exactly as before.
+        val pending = unprobedExtensions()
+        if (pending.isEmpty()) {
+            buildTabs()
+            return
+        }
+
+        if (extensionProbesInFlight) return
+        val provider = cameraProvider ?: return
+        val em = extensionsManager ?: return
+        extensionProbesInFlight = true
+
+        thread {
+            val verdicts = HashMap<Pair<Int, Int>, Boolean?>()
+            for ((selector, key) in pending) {
+                verdicts[key] = probeExtension(provider, em, selector, key.second)
+            }
+
+            ContextCompat.getMainExecutor(mActivity).execute {
+                extensionProbesInFlight = false
+                if (mActivity.isDestroyed || mActivity.isFinishing) return@execute
+
+                if (cameraProvider !== provider) {
+                    // The camera stack was reinitialized while probing: these verdicts describe
+                    // vendor state that no longer exists (the same reasoning as the cache clear
+                    // in initializeCamera). Any refresh that ran for the new provider found this
+                    // round still in flight and skipped scheduling, so start over for it.
+                    loadTabs()
+                    return@execute
+                }
+
+                for ((key, verdict) in verdicts) {
+                    // Only fill in keys that are still unprobed. A bind failure that ran while this
+                    // round was in flight may have blacklisted the mode (extensionUsability[key] =
+                    // false); that verdict is fresher than this probe's and must not be overwritten
+                    // -- otherwise a mode that just failed to bind would be offered again.
+                    if (verdict != null && extensionUsability[key] == null) {
+                        extensionUsability[key] = verdict
+                    }
+                }
+                buildTabs()
+            }
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun buildTabs() {
         val tabLayout = mActivity.tabLayout
         val availableModes = availableModes()
 
@@ -1530,7 +2056,7 @@ class CamConfig(private val mActivity: MainActivity) {
         val optionNames = arrayListOf<String>()
         val optionValues = arrayListOf<Boolean>()
 
-        for (format in BarcodeFormat.values()) {
+        for (format in BarcodeFormat.entries) {
 
             if (format in commonFormats) continue
 
@@ -1575,9 +2101,9 @@ class CamConfig(private val mActivity: MainActivity) {
             }
 
             commonPref.edit {
-                for (index in 0 until optionNames.size) {
+                for ((index, element) in optionNames.withIndex()) {
 
-                    val optionName = optionNames[index]
+                    val optionName = element
                     val optionValue = optionValues[index]
 
                     val formatSRep = "${SettingValues.Key.SCAN}_$optionName"
diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index 067c81fa3..28c7d9d52 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -441,9 +441,8 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
     fun showOnlyRelevantSettings() {
         if (camConfig.isVideoMode) {
             includeAudioSetting.visibility = View.VISIBLE
-            enableEISSetting.visibility = View.GONE
             videoQualitySetting.visibility = View.VISIBLE
-            enableEISSetting.visibility = if (camConfig.isVideoStabilizationSupported()) {
+            enableEISSetting.visibility = if (camConfig.canApplyVideoStabilization()) {
                 View.VISIBLE
             } else {
                 View.GONE
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
index 00a2d7686..37281c945 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
@@ -23,6 +23,7 @@ import app.grapheneos.camera.util.getParcelableExtra
 import java.io.ByteArrayOutputStream
 import java.lang.Exception
 import java.nio.ByteBuffer
+import androidx.core.graphics.scale
 
 open class CaptureActivity : MainActivity() {
 
@@ -243,7 +244,7 @@ open class CaptureActivity : MainActivity() {
         if (image.byteCount <= 1000000)
             return image
 
-        return Bitmap.createScaledBitmap(image, scaleWidth, scaleHeight, false)
+        return image.scale(scaleWidth, scaleHeight, false)
     }
 
     private fun Bitmap.rotate(degrees: Float): Bitmap {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46b266ed7..4c8ae8d30 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,6 +124,19 @@
     <string name="empty_gallery">Captured photos/videos not found</string>
 
     <string name="bind_failure">Failed to open camera due to an OS or hardware issue. Try rebooting.</string>
+    <!-- Shown after a camera-extension mode (e.g. Night) is applied but its vendor implementation
+         fails to bind: the mode is disabled and the camera falls back to a normal mode. Unlike
+         bind_failure this is a handled, mode-specific recovery, not an OS/hardware failure, so it
+         does not suggest rebooting. -->
+    <string name="extension_mode_unavailable">This mode is unavailable on this device.</string>
+
+    <!-- Shown when the camera can't record at the video quality the settings currently ask for,
+         so that the settings screen doesn't keep claiming a quality that isn't actually in effect.
+         %1$s is a quality such as "2160p (UHD)". A dropped quality is described as "a different
+         quality" rather than a lower one because the fallback is Recorder's default order (1080p,
+         then 720p, then 480p), which is higher than the requested quality if 480p was what got
+         dropped. Stabilization outcomes are deliberately never surfaced (see onFeaturesSelected). -->
+    <string name="quality_unsupported">%1$s isn\'t supported on this camera. Recording at a different quality.</string>
     <string name="camera_provider_init_failure">Failed to load camera provider due to OS or hardware issue. Try rebooting.</string>
     <string name="extensions_manager_init_failure">Failed to load extensions manager due to OS or hardware issue. Extensions modes are unavailable. Try rebooting.</string>
     <string name="unsupported_taking_picture_while_recording">Your device doesn\'t support taking pictures while recording video with the current settings.</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0f009aeec..ebd0c0b11 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-agp = "9.0.0"
-kotlin = "2.3.0"
-ksp = "2.3.5"
+agp = "9.3.0"
+kotlin = "2.4.10"
+ksp = "2.3.10"
 
 appcompat = "1.7.1"
-camerax = "1.6.0-alpha01"
+camerax = "1.6.1"
 constraintlayout = "2.2.1"
-coreKtx = "1.17.0"
-material = "1.13.0"
-zxing = "3.5.3"
+coreKtx = "1.19.0"
+material = "1.14.0"
+zxing = "3.5.4"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 2e8384d68..cc1394c37 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -63,6 +63,20 @@
             <sha512 value="b5f675d4105c9a03d0c219eb855299afdebaf2dee377b08c2b490e63e222e1eca1fa020faea031a21ab2110048dcc0aa37505179db02b36bb96dbe00d8c15a77" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation" version="1.10.0">
+         <artifact name="annotation-1.10.0-multiplatform-sources.jar">
+            <sha512 value="ea28c6dd29a161eb9d0acd0ef652882b1532a4fed51d873d93225f4192d2f4ef54c2b6099b45e2017990b0b663b9d511da3d8880220e43127d254b20d5ee6278" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-1.10.0-sources.jar">
+            <sha512 value="68c2aef7d591f8399587111c4a0a71b45653886f816e08eba59ded1718299be01cbdb5563ce5c25e04153a184e97e6dd928eb0d406fb5953959b57fa95e6e133" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-1.10.0.module">
+            <sha512 value="c5c5314a6be3728ad0272a524b2e4b0eaa602c1c7d847b2b04eb2e60d81fd592b63be74c489967ccfeed93e5e9b0867b8776c1fba552cdfcc911de9ed5db4c08" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-1.10.0.pom">
+            <sha512 value="db10f0f71b86060467e00ef5d4a7c462094365e4d91e15896c5110ca639605c1d93d144f28528a700790bf7a36ac6eee28aae52872dd46acd8bc562f4f17de49" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation" version="1.2.0">
          <artifact name="annotation-1.2.0-sources.jar">
             <sha512 value="465ac8468a1f8f2eb0f9e2fa92e516e76781cb4ea776430c5ff94b0d33fe6f123ad8efb83935b25c3d67e6b9231761488d57f87a3c696b02ebe007ec2bc30734" origin="Generated by Gradle"/>
@@ -157,6 +171,17 @@
             <sha512 value="417c77acc8e179da3e3e37cdc618a87180a0724a3702f448f0de5f91d6678723baac5fd006ae3be6fef89c58dbe2d17d94f9aeb56ea7db9c86670c2784005a14" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation-experimental" version="1.3.1">
+         <artifact name="annotation-experimental-1.3.1-sources.jar">
+            <sha512 value="2a1f6920dd9ab709f0770acb4fde26b8c012eb44f7b7894ad9c023c3bffb346748b89cd163b18b88fcf94e77806c4d99bb0071aa818451448b7b5359831ba743" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-experimental-1.3.1.module">
+            <sha512 value="5027916a604b1e36f60cf563b46ec9b7e7b3a1623d89c1af54750a165b470e007e834220fb39ef66d457bc22f2943423b92608bdeddabd0eb9034501f3499bae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-experimental-1.3.1.pom">
+            <sha512 value="0f83a9983cc37f4be81d81f7f9a0a377437d28a3502ae659eb19182ea89a612e6be13ed4cfa862a2855363e86081842a7c01493890a092f8a4eb46887faf5ae2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.4.0">
          <artifact name="annotation-experimental-1.4.0-sources.jar">
             <sha512 value="142d1caf755add0406c9529971d06d59ab450af75274649b9969cb30c3bfe6e0390adc05df96117b90c16fda1de4769c417f44652170581c73ea6ffe4b733fdf" origin="Generated by Gradle"/>
@@ -182,18 +207,18 @@
             <sha512 value="884fa65a433f36da8dcef197150e5a7c61605753bf9bff7b6fbc3b29f8e4f18f4ad4ab364870a04cd064e47ccf8e7d78a6fc8907351bddff507e5ddbef6139c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.annotation" name="annotation-jvm" version="1.8.1">
-         <artifact name="annotation-jvm-1.8.1-sources.jar">
-            <sha512 value="85b857efa269008a90da2f8a0659c34b61465f671edc069f02a31f01b53255adf67923b0956cf5edb0aa219b359f26b8ce2b49a6468cb7a25480a2efdcc528a4" origin="Generated by Gradle"/>
+      <component group="androidx.annotation" name="annotation-jvm" version="1.10.0">
+         <artifact name="annotation-jvm-1.10.0-sources.jar">
+            <sha512 value="a5251db0593d4b109d2896cd0b2747f4cd8d4b2f65856f234be6ca086ff4571865c4ad837138c8382ea53b97ebffe63669aa8b9b20fb622f561c18f902b15935" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotation-jvm-1.8.1.jar">
-            <sha512 value="f064484bd941e147ec0e91c10be3b42f9fd8edcb3941d425a3c0814c23d939ee6f2eb413756dcce21c8d3f0780434db0bf271200644ae28a8a5b973e1ddbedaa" origin="Generated by Gradle"/>
+         <artifact name="annotation-jvm-1.10.0.jar">
+            <sha512 value="07c3d87a7643270cf9279ad0c9526947b5e8ab8f92360c2d5441645de4a004b73420b7e223ce4c226fcc8a1377d357d6fc45f10f285b21742b417e0d60f20798" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotation-jvm-1.8.1.module">
-            <sha512 value="8c82954ae57cfbdfea310d64015165f96f1044a96a41b10530e242c25e7f0320453895596568b827fbf9209495c09514f0f0d1742c94cfd212c5d7ff30dd0884" origin="Generated by Gradle"/>
+         <artifact name="annotation-jvm-1.10.0.module">
+            <sha512 value="8c300391effad8fdcbd228cd5f25a763d1219b976bd3c5cdccb3c2a5c9476b9b126710ce9c9d7acfc197d1afa6a1a7166541f6e465fe578214be7dd704e6ae8c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotation-jvm-1.8.1.pom">
-            <sha512 value="048fc61899b2ac0cadf2cdee43dc1aa732394e98432e64fc279530249c6297923dd2e6e85f0dd9f30b8aae5ba6256d51d7e157d23bab249cf4394695789f3bd6" origin="Generated by Gradle"/>
+         <artifact name="annotation-jvm-1.10.0.pom">
+            <sha512 value="467c26ff27b35710b698b3c6edcd0b134c548fd1599eac6fbd67898e8b523b2f263236267b7e36fbf3de56c59ff6c36563548b3a26e27db8888e85a9d1bdd8fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.appcompat" name="appcompat" version="1.1.0">
@@ -323,125 +348,145 @@
             <sha512 value="42b3a073e9bb6f8d6a6a06b10d459aecd331cbae495a437e6c03d14b1b81d382ea9697bbec5be25b689708e40c3dc4eb72b04e8efb3d265cd90151635ef74d53" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-camera2" version="1.6.0-alpha01">
-         <artifact name="camera-camera2-1.6.0-alpha01-sources.jar">
-            <sha512 value="5e07bfdaaa7aaed8e2db7047f5894b2c1bf810dc3d04164f3fa147a3103bff4dbf80d1be705a4993b6a76338a1a7a594717b46ed0be80e6fb6f87bbcb38e9332" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-camera2" version="1.6.1">
+         <artifact name="camera-camera2-1.6.1-sources.jar">
+            <sha512 value="b59c4a3ec7a2d22698d64d648d57f462432ddd2852ba71538386728b8164c94bfc21e44b161196a3ad3453eabcb167eb79f281154876dfaa33dc73090fc5f1b5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-1.6.0-alpha01.aar">
-            <sha512 value="6ed1099b2422b81c9246024fa38d53e773f678bfacf8cb9aa1d1e65490dce590b265718ea94259de3c4cd59f8fdcba9a590bde8e19466f66215e34856931b1f0" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-1.6.1.aar">
+            <sha512 value="84849efd7ae6696d748b175c3139ce00e3a869b8ce1733094930b79894e448da5d1bbc201793266cba046d30cac41a30ef03ae2e4be66be3c79a627e72f194a7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-1.6.0-alpha01.module">
-            <sha512 value="1d3be9f1032b7620f6f8ddfa999809c891c910c3b3cb81392f89929d4c030a9f8eb95b01301a1ee3045299fe85740240b6172d5e611e9c238bc8c05b09783e92" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-1.6.1.module">
+            <sha512 value="c2cde379972caeeb06b1825f63b770c78ccc1b45ccdb7a0e2cbc80753633c37d33a325f0dde517cd13e1e07fb4d8cc15af4689918229a64a27a47aa4de236d05" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-1.6.0-alpha01.pom">
-            <sha512 value="798c1e817b1601afcf036e23d629c682107835ce6869693279aabee8cc9d80712174346eef3d4289c1ca8f117ad00bcac828e3f6851a2ce8d3bd9550375d4cb2" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-1.6.1.pom">
+            <sha512 value="aea36da7e6c1e5cdcb292407d0788631d42887e6dcd9c2d66f45107ef95d51310a94c9b11494bde56f6b86b1e51f1287b600f6ae347749c05481c90c430dca72" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-camera2-pipe" version="1.6.0-alpha01">
-         <artifact name="camera-camera2-pipe-1.6.0-alpha01-sources.jar">
-            <sha512 value="dfe5360728ece5e138b593b6ec0158bf5cccfc7cc1e535a79b168a7b52b6b2f7a4ed67cda9120bdf91149c192be4ffc2ff0707b2d249d32bc5f6bf45ce543618" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-camera2-pipe" version="1.6.1">
+         <artifact name="camera-camera2-pipe-1.6.1-sources.jar">
+            <sha512 value="95915fe56c8f5cbbc542591e6641fe0b2e128372e0b33c37393e4a8463564786baa302e2b705c0c54950a0197fd0d07776d87123d960825bceba3f94f471265f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-pipe-1.6.0-alpha01.aar">
-            <sha512 value="1aed545a47ed4d5db545cdcd7331ba6c15ab869f7475ec4bddb28b77d21b1ad5ad629006e4ca8a4a34e66fad767de8168e6427a036d6c253281b47cbfb237c73" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-pipe-1.6.1.aar">
+            <sha512 value="b2ed4dab29632a8b722ee7d49244e5acc599f763a5c444b59fcbd4aee66332e57a521a11beafcf25237242e2120b44a71326e932ace694cfe31122232f55ac5b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-pipe-1.6.0-alpha01.module">
-            <sha512 value="db08726655498d1f51f0d1751da383515849c980906711f2995bc0eeed75176637e0b618a122ae4a9ea5ec9abbde1ae03c21889a31df43d02445a2c681b66953" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-pipe-1.6.1.module">
+            <sha512 value="735b93298f77a26b4bb002d7f1c46e497e8a770b1f7257114337d481a8ada316615a29e5db3c5e3707263a706f1ec201878796834241fce76d12cb9f36b86712" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-pipe-1.6.0-alpha01.pom">
-            <sha512 value="7f2cbf19a8b55404472085a7413e0d107091ab56cc9e42dbf38f52230e95ad933a9b348ddef4d718614be36b34f8b8c4a75a3f5a2bd364c2cf9defe98b4bb69a" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-pipe-1.6.1.pom">
+            <sha512 value="7314c1c6b5ce3ff00624d95282f7e3f9895fa9e81182afc67a18cb203d7e67400d601c716253d6070683fc0c914d8bbf815dd1f4b65cdb397c14e05c3bf8eb7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-core" version="1.6.0-alpha01">
-         <artifact name="camera-core-1.6.0-alpha01-samples-sources.jar">
-            <sha512 value="a498761cf2754310fec0bcdeed0111edafbd2a366f2b13e717ee59b6cfa36a6d4d4f7f87ce304c5aafaa60dfc4c660d490ca70ac08c8f2db3686f7fbc7e96cae" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-core" version="1.6.1">
+         <artifact name="camera-core-1.6.1-samples-sources.jar">
+            <sha512 value="b930ad4e1071b44c7fec30c8aa5302c27a276776c4a8d2354d7fa73acd9a26177e823bc2e5ad257d3920c78bfe284d4ca5fb01787a2abdbe19a5bdf494dfda63" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-core-1.6.0-alpha01-sources.jar">
-            <sha512 value="f4e9c20db91bcc8834a2873133974492d55f571da9c325dcfd9b2d3dd3a0d0071577b0137e0ffb8071ce6c5c272edb21db7dc68a2c21cc2bacf5202a12804fb3" origin="Generated by Gradle"/>
+         <artifact name="camera-core-1.6.1-sources.jar">
+            <sha512 value="1b980416c3f96ab52be71f78c28bdc5610ac23ba319c9dbb721dcc763f0ca9a5e7afee86aee9e693acafa1a005d4210c6f2e557fe523e9faf359ecfbc5c476f5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-core-1.6.0-alpha01.aar">
-            <sha512 value="80550bed86f22d60e60c18c6a461f8e19fdf2cfd498eadc1a7d06106f50162b9cff05bdfbb1257965eba20c817940d28a9a5a2c184dfcf32ba119b3412297d79" origin="Generated by Gradle"/>
+         <artifact name="camera-core-1.6.1.aar">
+            <sha512 value="125ba33f9d3dc2e54aa0bd9755ca7f166c1476048a95c1e459c606c6f7c37f1cc6a09cbe6832365698c322640e539531d1b0f1298311979c13a0e4f028d3016e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-core-1.6.0-alpha01.module">
-            <sha512 value="43e6d0d9ce3142dbc3f0d1fff6780681e207081085f133c4d6b1adc8fb80cd8b5a88d488f5441664457646d0d59e4b2d06fe597d743690c3fc2e9c439a803767" origin="Generated by Gradle"/>
+         <artifact name="camera-core-1.6.1.module">
+            <sha512 value="e6d87cb9d414a01c0d622b5a30bcb9a437901eed46c7bbe4eb1de49f98c9aade4dde8fc611d5b1d944cdc7b38d4170e5ff10b98a86d4165be12fc7041ca5e170" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-core-1.6.0-alpha01.pom">
-            <sha512 value="f430f541bff778be893218af6eb99b1ebfc74539a2f73f6fd7fe349a2e371ce3db96db47e85d9fb088f33479613219be41e8c720404ac6ec5af27d51cf2640ab" origin="Generated by Gradle"/>
+         <artifact name="camera-core-1.6.1.pom">
+            <sha512 value="a47e91c9ce7062c71b14d7fc72f6db98a0178c1dc6a7f0fe6d841a724f24cf34af256fe61a4042e39816dab035d978d20fb5ef49a0445e9daf297d88275b148c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-extensions" version="1.6.0-alpha01">
-         <artifact name="camera-extensions-1.6.0-alpha01-sources.jar">
-            <sha512 value="d910a7ae47d208c49abe69b1b4fe0ee058a8a12f17a01299f741c28360c2a426062646d6ef745bdd30a18e8ebf2cd4bb5e7fd964ff495d22688ee657c81bdfad" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-extensions" version="1.6.1">
+         <artifact name="camera-extensions-1.6.1-samples-sources.jar">
+            <sha512 value="18e44ae83640df8ddb9f31ef7feff5b4ed7af0fa38e02ad831bbbd11d2d57ad511c2c396f3a1aac2f7e23394acb003a803c5cd997ef38f084633dd8be458832a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-extensions-1.6.1-sources.jar">
+            <sha512 value="45afcea6ab114dff887943e80395532358cf160b81b55abf51fb852b632b88865638c4b331cd538ada578e59e60cf75d373cda75883ba0cf126eed8b62f07430" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-extensions-1.6.0-alpha01.aar">
-            <sha512 value="09a96bae610eb3aec6751c37c894a05a519145fc299733a9fe90f053c71255cc9cef4f4ecedebe8bc2fb155311ff71ad88714017a96dadd4a3d549854ceff890" origin="Generated by Gradle"/>
+         <artifact name="camera-extensions-1.6.1.aar">
+            <sha512 value="d5ee58dcab731bf3aa63d7a3b47513848311f5b33d5163ff1aa1b0b5545973b367435e309dfef76a6e39b1dca4db5d1c05f4a65bdd50b14cc9fb89f871c64e39" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-extensions-1.6.0-alpha01.module">
-            <sha512 value="53ba191e0efeb87faa5b138b5e41a506620f89a5e167b6d26c4aca2d8148f5ecb2bc8cb8d092e42398c8ae3fb3fb443444230c1902c03456044e56a898083035" origin="Generated by Gradle"/>
+         <artifact name="camera-extensions-1.6.1.module">
+            <sha512 value="87bee0b03e877c8d297ba084a60efea25a0c03a809a504df9c44e48bc5e7c6c92b6ea4c87a9297f21ac70a05b5eb4943fff77a57a56c0e25649c76a6533ded0d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-extensions-1.6.0-alpha01.pom">
-            <sha512 value="3d50e78f7a59b9d608e127e355c94a26fd7546c3113205f4ea5830bf0c0f5bab8acef2ecfb60065f00d5e423aa243a2261636002ae557387ff2c61f4402f8d94" origin="Generated by Gradle"/>
+         <artifact name="camera-extensions-1.6.1.pom">
+            <sha512 value="b6232e1578e5b4b83e4b5fae72964372ec0e1036f501fb97d7b36360b5d2618d920fee31839d31297b5d070d62040edd11939662ccb6c8b34c5acff7d1dfde4f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-lifecycle" version="1.6.0-alpha01">
-         <artifact name="camera-lifecycle-1.6.0-alpha01-samples-sources.jar">
-            <sha512 value="9886edeec5c41e3f643af6d5bd264090de6153bbc62097a55dad44327dc8fe13b54fc108042b9d5866ceb789ee2bafdcb587258fbaa742faf55a7ed691e158c7" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-lifecycle" version="1.6.1">
+         <artifact name="camera-lifecycle-1.6.1-samples-sources.jar">
+            <sha512 value="c9d563a2e5b6887f014afb76927abc7da41dff3c4db1b30cb578c1171c158639fd6954194a6e97059d1845bf007db3d3690b162a81ffa99ced6509edf7760193" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-lifecycle-1.6.0-alpha01-sources.jar">
-            <sha512 value="0c907394125a0ae996cadf887f96eedf6e73eba0a76e2f989bb8e6a7bf7df066820e3b15168d3157fc64d0911a54bfe2965533b2effcda0cee5db34d10a24b65" origin="Generated by Gradle"/>
+         <artifact name="camera-lifecycle-1.6.1-sources.jar">
+            <sha512 value="e0eb810cd55767c894815c6a5fc8c7f37f66513b7f8f8b9869126ff2b9f9aabd4c37d158771ad9a714488da87f6fa27cdeb9a5708f8b9b228acb65633858a295" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-lifecycle-1.6.0-alpha01.aar">
-            <sha512 value="4881bee7853db6dae03578cb58ddfe05c4cf303d67368ae77e5df29237a8fac9fc6ab5d96d01be75273e1f022072ca78ebcf29fd1b9cfff011e58686d34d73f3" origin="Generated by Gradle"/>
+         <artifact name="camera-lifecycle-1.6.1.aar">
+            <sha512 value="25e964f87ba3c01d2bdcc755b1477049af4fda8a90faa86cd5954fcd7fb080b1a6685425f754be282e0113319c337eb30d81c5c7dce0fb8a1560dc3880405be7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-lifecycle-1.6.0-alpha01.module">
-            <sha512 value="ec89d602ea6db6c9e9b36c616571d46a4453f51c2c1f96fd2537650711ce7352aa6191a61ae28850c14fe18ba252e5dc21649cf0ab8431747b5251675b098cd6" origin="Generated by Gradle"/>
+         <artifact name="camera-lifecycle-1.6.1.module">
+            <sha512 value="d46676ae4153eeeb6a0c72cc7a989c30e68303e688720baf8f7d41a374636fd01826ff7216b5f8a3ef5787df7743dddec4c5cf9a1ae5758ea7656a9515dc1370" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-lifecycle-1.6.0-alpha01.pom">
-            <sha512 value="83ba233700c216889f0d29f9aeb6687abe95f8956bd9cf4a3b1533124c74d964837b3796c34b867c1db388bf30a6d2070dfbb96b4ce4438003dcb4e1e2b6966b" origin="Generated by Gradle"/>
+         <artifact name="camera-lifecycle-1.6.1.pom">
+            <sha512 value="a24175e2ef8fe03465d7cc13f043ac5e7b09a93e508c97ca429157643bff9a494fed7d70cd910a0cc735160984c9f49353b500aaad0ec91c68e0c5683a95a5f5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-video" version="1.6.0-alpha01">
-         <artifact name="camera-video-1.6.0-alpha01-samples-sources.jar">
-            <sha512 value="1a5c82751c07edd999afb5f366ab71040c630d9d5e3c08fcae3630e45b911b6f462486afa9e699fde9b9b0022dab2192ecad3bfdb07e0154454cbd04591b4212" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-video" version="1.6.1">
+         <artifact name="camera-video-1.6.1-samples-sources.jar">
+            <sha512 value="02b312929d82f0476125eeafb559a762649e81bfda5ff8341f14e2ef5711c8b0de8febcdbbb2e740a93b929b71ec0400489442278de7b408a9c25ed0c8de4c22" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-video-1.6.0-alpha01-sources.jar">
-            <sha512 value="bceb1b0d078b0e309088ca2b3ce52eccee669e5b48654efcb9911f2439e008f31b8c3b91181c04aa9d1a30b48e40d0f114b40b4fab9483f9c65d82ad03b74827" origin="Generated by Gradle"/>
+         <artifact name="camera-video-1.6.1-sources.jar">
+            <sha512 value="2db33a07b2806425abc632c4e59f5239a6726add712d9c8b369066a4db9e5dd4d033ffb4e0a8c9d0ad937715d3a1c9b457347ec9ba7d1c75083e79d2337fd4ba" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-video-1.6.0-alpha01.aar">
-            <sha512 value="b85231cfdc6d0a3215b5a2a5f7ebc8257578de5935c3fe7e2a160905e5e772080db81becbfd26df301450ac01f03f6fd0b2e59d2288a6be4f9094184b5903c6a" origin="Generated by Gradle"/>
+         <artifact name="camera-video-1.6.1.aar">
+            <sha512 value="d29bc37ff64665e7e602df47d8e78abc5c279360c22bd6f01d108860b0374a7efa73556076170ffc42ad54f0b610f21c39486c740b0a62e5aff4e861cced0f44" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-video-1.6.0-alpha01.module">
-            <sha512 value="bae16ef618db999c5ed04c9c68b081f33e71bad412f249c8e97f6c748be17f4940d6f64c0b158fc1191d95d741e7343a0e7a9898a6f5689c968b2e59348d786f" origin="Generated by Gradle"/>
+         <artifact name="camera-video-1.6.1.module">
+            <sha512 value="63f4feb14457b468e0a5d335747d67d2fdaaccf3bd652b1229b7574daba42ba97e5a3f0734957e262875561f198a51910be9fe88348c1c8fcd5164cf6ede4205" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-video-1.6.0-alpha01.pom">
-            <sha512 value="f5c722f2431b2b577453f95f12c103372af45b94b9ed22050590ddc74040f7cf1fdea72728b95f6db9bb818edd2ec750b41c44fa1d7834144a448531708b820d" origin="Generated by Gradle"/>
+         <artifact name="camera-video-1.6.1.pom">
+            <sha512 value="4432966964dc7f37d2084c85a51be3e06656846e4ec140e18ae8481cd72d4fe9faf725a3f8435ee64106c131e387ddbaeda6a7947b8664c1f05bdeaef54cf3c5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-view" version="1.6.0-alpha01">
-         <artifact name="camera-view-1.6.0-alpha01-sources.jar">
-            <sha512 value="42039093969795c616ce084d59ec957f8ffdbfe72f5768e1452e50f5d22cf14d4610276f01a67f9094eae01a47c2e470536c7d1b25cfeca42ad13307703f8c05" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-view" version="1.6.1">
+         <artifact name="camera-view-1.6.1-sources.jar">
+            <sha512 value="b84bbefc3d2fde28a847ffb9faefa2ad30496d1b465a3db4076e0b5e2f6aa1da8ccd51a98dbd232d2c96b1bb47d8b83e566aef548f823411b0ebdeef094715d2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-view-1.6.0-alpha01.aar">
-            <sha512 value="2f4013f5ec8094283d44934f1d6224e5c8ad4939182274426db74253e7ee8846a3b2d7aaee44b284db359a370dabba5720dfd0d45906642efaf574ee6e024c65" origin="Generated by Gradle"/>
+         <artifact name="camera-view-1.6.1.aar">
+            <sha512 value="f812261e3dcb9154a9277e424959f7af2ab79a9b1a62ab173f99558b11b5fecbc7bde6bc79042bedd4ddf9e519d949a7af9c20453e5c7c22460b098ce26d3561" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-view-1.6.0-alpha01.module">
-            <sha512 value="818366855bb3add7c902a2518068c75b2eeb7a82278d0d41b034a8c5776a9dd692c81eb7bf5e50a843185e207d153a2ca0cc2f8e4ed24c1e3541ac9cfb77b839" origin="Generated by Gradle"/>
+         <artifact name="camera-view-1.6.1.module">
+            <sha512 value="aa7aacc2b703dc08f0c2a2faf79091b86253bb31a592cffa9caa939a92bce0119037120ed7f46dbcb9b648a8200485935b4b510c258231a0ef2b1e985f09bfe5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-view-1.6.0-alpha01.pom">
-            <sha512 value="a2bc005fcc3ac8a6867dc9ce889c5085f700c44a12b41c7f457da272338ec0c192d926f4fca85e97353e5c073e6aa992f8f736d46cbe93192679434c8623c0a1" origin="Generated by Gradle"/>
+         <artifact name="camera-view-1.6.1.pom">
+            <sha512 value="97ff104853b98128466ef1d8f875cde1d9106707bdef3037dc4c8dc61cebb543811d85e9e3e3a59ca77fe01801f42857d1b9da7856b94b7bfc623ff184e8cb22" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera.featurecombinationquery" name="featurecombinationquery" version="1.6.0-alpha01">
-         <artifact name="featurecombinationquery-1.6.0-alpha01-sources.jar">
+      <component group="androidx.camera.featurecombinationquery" name="featurecombinationquery" version="1.6.1">
+         <artifact name="featurecombinationquery-1.6.1-sources.jar">
             <sha512 value="52cee52f2f29fda30222f512fb4f5c326704213efa65d8a084adfcd771d1de1e11ddd60eee2f6fd096a93a3bf5071b15d1c2fde9c57deeb2d07c791b487927bc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="featurecombinationquery-1.6.0-alpha01.aar">
-            <sha512 value="7d285ceae913effc67aaa7342e1a11af96bbac57d4deb58bdec624efc6cffda46b12ba58e453f944305de76a2771bb3590d9e854541daf54efd9a9ea57639c40" origin="Generated by Gradle"/>
+         <artifact name="featurecombinationquery-1.6.1.aar">
+            <sha512 value="ecac6c7f7752eb2e514fd5f369ce577d41ef2ce5f8ce87460c982fcb4b716149f60969240681be7d4d19863692dcadc66084f36975b3706af183268f54d5358f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="featurecombinationquery-1.6.1.module">
+            <sha512 value="133688c669d600f7f62bdacda5750fdc9ea33a82272ef974eecd10ed7e18fb5a490133c844322d89f697100d846683cd0bc22051bcc5b5b620533ae944ec2fa8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="featurecombinationquery-1.6.1.pom">
+            <sha512 value="d0cf25ad8ec7951adae45844f2bc5820322ce53257d2b643a453d769a5dbc6703a7bdf15afbdba6bce35992db665563f78ab99eeda1d0ee80b8859c51bb2771c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.camera.viewfinder" name="viewfinder-core" version="1.5.1">
+         <artifact name="viewfinder-core-1.5.1-samples-sources.jar">
+            <sha512 value="0836a0974d4c1ad8fefd0315101087ad387fd2ca6b08b67fdb8fdf06858f1b008de2fbd7e01e8f33176b7a03730b007bc13ce0a4a866b6a94674ff23cdd48a11" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewfinder-core-1.5.1-sources.jar">
+            <sha512 value="b3098c0515abed801f52657fbeadad168a268c02b0d514dafca5d3c31ed81b913f1a13d79b982c18dd7e82152b6f77624bd8f5e46d0c446f9665221e1bbe3038" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewfinder-core-1.5.1.aar">
+            <sha512 value="7f756c769e278f67c76fa9aa7f8c478257c4c63ef82d33897b99f230e7cf568c4207b45c765b55207b98e56549ff83dea91639e14ccb33c51c2fc1efc2e44882" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="featurecombinationquery-1.6.0-alpha01.module">
-            <sha512 value="ebe7edbe7593db60190c8c2d02b53e5afb78851c57c868edf08c67b0bfcedff36d447f541c8791cd078268c1991dd05526612bfc3abcf0efa67e16e2c742f139" origin="Generated by Gradle"/>
+         <artifact name="viewfinder-core-1.5.1.module">
+            <sha512 value="677291bbe7f5eaf7aca47b42a95255617b380ebe7e49dd8fdda542ed99c5a7d8508009399ea736af198066e6a5d74e29c15aa11f9f8982754e8e8679d12fc83d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="featurecombinationquery-1.6.0-alpha01.pom">
-            <sha512 value="3de6ea32b00daf46def43c1c111319f0b7905699bd4d05208001ee6bdaa8c2c6205fb5adfd5e5c091c5893e759fa00428c916e6a7a3f2a1ff74d3c0276fc794d" origin="Generated by Gradle"/>
+         <artifact name="viewfinder-core-1.5.1.pom">
+            <sha512 value="854dc78a72a65cb15cea678a135dd1246b4b28be549cfc107ffc07b48a596b5e988953274bd55831a62183127de0c6104748b2f7d6e5d02d716c186378106252" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.cardview" name="cardview" version="1.0.0">
@@ -538,14 +583,6 @@
             <sha512 value="6f33e9ea3e98fbbd54c9956bb0ad225a035798b2cb302570425eea5927506afd662bc1f3690615312e437d04c359f1ebcf626129ea9bc5cea96314367c994b4d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.constraintlayout" name="constraintlayout" version="2.1.0">
-         <artifact name="constraintlayout-2.1.0.module">
-            <sha512 value="339b479aad80018af9d417502dbefb210ff862fe85311f52a6a5cafb7ce1675db5767ccc536979ece9c21fc38498bf05a4c704b2bbb6a6c75fa019dd31c07380" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="constraintlayout-2.1.0.pom">
-            <sha512 value="43ada63275e7a734cead86c6fe828b9e8bf4c075bf5fb210ac7b79cfd336b1aaeef29a9ba55f5dfbdcf4162ad0342dc144542c3f23ecab54cec522fe73c044b8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.constraintlayout" name="constraintlayout" version="2.2.1">
          <artifact name="constraintlayout-2.2.1-sources.jar">
             <sha512 value="088ade51f172ff493a2a024eb41c2222f5c38b6a9e63035a5a30f3700afa5895ad87237b7a295392d618b7f73133f67be600e7aae179a97721cd3d45b6043683" origin="Generated by Gradle"/>
@@ -560,20 +597,6 @@
             <sha512 value="60916e3ad6c04a29fa215e8e681376e5d3a6243ef542eb2ddec64b52654e6b5ce70f7ac1acd24ed39820a557ecc721c7b47407737ce02ea6ea276aadab566e49" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.constraintlayout" name="constraintlayout-core" version="1.0.0">
-         <artifact name="constraintlayout-core-1.0.0-javadoc.jar">
-            <sha512 value="3c0c31716383c305812145fe6dae1e0978ab5df962cbaa996a5f6cc75beb0175b43b758ca76f2696674ccd8db1f5e8a62f8d46baede11efdd9dcc08007007195" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="constraintlayout-core-1.0.0-sources.jar">
-            <sha512 value="9952ba8ecfcdf0d7d6592c31c48b340191370e6b6d3f9e41dc20c29caf8ccccb61681b760a675f71304f554234e97b284c923af80b7ded2420863222cd2fcb9c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="constraintlayout-core-1.0.0.module">
-            <sha512 value="58c670334306ef4d7404ba73ffd8cf53e72b18c205896350c1e0b705f613ad0bb3c55b28f88ccda3066f232236cd65781bb9ead3b131fb617608f10fc0decfea" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="constraintlayout-core-1.0.0.pom">
-            <sha512 value="fc3cc99e674bebed42acae0854fa5241c626a5809c0b9bbab2156791c62d8a9a32c57733e2bab48690d906a4b65cec4d03683258049a5cef0601e5f7615b5510" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.constraintlayout" name="constraintlayout-core" version="1.1.1">
          <artifact name="constraintlayout-core-1.1.1-sources.jar">
             <sha512 value="643afe42fe9fe82b54775ef88d0649b9989ac10ad25a0d9d66b8a7973f01a1e7cc2e47278c41dc214e87df3a23a9e4a019fbc8cee4723be5c27dd178f72c5858" origin="Generated by Gradle"/>
@@ -645,21 +668,35 @@
             <sha512 value="e0d9257fad18addd715cfc1763e753911fb8b906f907bb7af9af51b06d47d3d2e5af9f5c34ea52309601affb044b026c53251301a9fa8245e377a2b3e523b213" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core" version="1.17.0">
-         <artifact name="core-1.17.0-samples-sources.jar">
+      <component group="androidx.core" name="core" version="1.16.0">
+         <artifact name="core-1.16.0-samples-sources.jar">
+            <sha512 value="924ae5a6b8388f097b80b00a2bb7e094f5c4bcbb08df69cdc15770e97b575e6ec8bc77dd4ac50d927fbad2bd22bf9d73622984b4a761d94ef86839c3e28f2a70" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.16.0-sources.jar">
+            <sha512 value="d52c732aa785d51d20faf8edbb8f0e5b8fd9f3a42528a4cbf8a937a7c2503acaa0c658274806032c5c967f8c179c1e4ea8cd859c7b78a0691f4eba9fe5169f6d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.16.0.module">
+            <sha512 value="0df5d861e778a2987ed972b591d82baa53451a40c5e6fdc34570fa9b330f15751cf98876ad9a53ad31c8486a5fbc033793d934e8cb645f039011913df8225748" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.16.0.pom">
+            <sha512 value="e77f7d9f0dbe3c44e55c7185b9761ddb47d99c9e9eff82300b078a4dc4e7f3fded6aa304e1e2f48b8a7423c72eac6cbdc609dc0b4bdd0b135f5be72274263015" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.core" name="core" version="1.19.0">
+         <artifact name="core-1.19.0-samples-sources.jar">
             <sha512 value="a9246de87cc8f33a38346139c37243099d11256100fe035083f43341e6aefea350781a64679c00436d2539a6c65de2a8e0152eb40f07234005f46d98cef4e723" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-1.17.0-sources.jar">
-            <sha512 value="3ed09f7eee221549366634da1621ed8c725bcf10337360c2b0f05e7bea6c9e2b6440456e2dd71b5b5b2c9239e051329b3fa62ec44f57a89a12803978ad5b7b6d" origin="Generated by Gradle"/>
+         <artifact name="core-1.19.0-sources.jar">
+            <sha512 value="0c88d2a6720df01d6d8b213136d6562ab6b6e3dcd30d3addf5c38f5d6c0c5fdbf5f4bb091cbd29353f2456e15b108bbd34ffeaa7627bb16ffb652eef58131477" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-1.17.0.aar">
-            <sha512 value="7d394378e157a8050da5ce94029c065191736ecff37d528a02de704fb30d064566dd7b6bf662b5b1fc1e63b98bf24654fe181ef2f25078b9f60e86648484cc7a" origin="Generated by Gradle"/>
+         <artifact name="core-1.19.0.aar">
+            <sha512 value="e1635897f120a5f7f290797e6f595233ac65f597fd0d7ee4240505fa83e2e4f1eeb622c053e92bc8b133d8a6dad3749f37a09801e487b21d5205c90dc0c403b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-1.17.0.module">
-            <sha512 value="ebe5738cfded287e31773c8f2ddb2efe57ac373fa3f4898ba836ee9f18d2e8d12e7df38e19b6716193cc3cc86e9ca64c519ab4e459ac0a41f61db27212a38864" origin="Generated by Gradle"/>
+         <artifact name="core-1.19.0.module">
+            <sha512 value="5ec27b41d79f0d3659f1eb27e12fac15e1e5688b4a773ffc410f8484e0bcae8f8cd6f1dc0911906b86382ed24fd58993d8f508f3e9e72af7a3080436216f0e11" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-1.17.0.pom">
-            <sha512 value="28fa6854f03608ba28d7945e47ac8727949bb7c03f657e261094a014cf0406748d69fcb5b2cf44f5abe46d2267fe3a5a3261170dc00e8c691f5323a1b2e666c4" origin="Generated by Gradle"/>
+         <artifact name="core-1.19.0.pom">
+            <sha512 value="47a2f25f0762787f8d8bd400c5684fe90124a715e81ba20a9f15a1acae6cea0b18cd226a2ee35dd74d27074e123121af69da72c51d241dbb9e03acdd5771befa" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.core" name="core" version="1.2.0">
@@ -697,6 +734,17 @@
             <sha512 value="499ccc1432c7a86cfa711a23aba82f0f39213052944e36f9b89e1c7c6275b0b0e7a6db8b159e72b3d9d48dac90ef28640b839ac6bed0218b06c1771bcc9147e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core" version="1.7.0">
+         <artifact name="core-1.7.0-sources.jar">
+            <sha512 value="b92889a38f604f52c1cc94ec0fe368e138244ac4715e9b13c464c980ec799b830c3e25140c395297c4d19970e9dcb6051d12b817f8c4306a4e1ff06a3e5a5111" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.7.0.module">
+            <sha512 value="81bcf2bf0c69dfed1ca2e7940ae5062d3da2352f1e61acfec1f5d5078bda6c05ec969220937bff9e384e3c8bad145c65b0a67c894babcca65e2ee9cddef4e780" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.7.0.pom">
+            <sha512 value="b9709be7a8b7a2a39e17322841b6870b926ba47036ba54d199414b99e7e59992bb617a383b992c45aeb9781b5a44405c73366c437a19959f5263c689c85b6e22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core" version="1.8.0">
          <artifact name="core-1.8.0-sources.jar">
             <sha512 value="0e1dd3dde363e1696d7f4fafa6fe6c3eabfe3a4015474372bf573c1536a483f5d69eaf7a3d6ec922b912fe00301033fd107c984f6c225b050349625163eb38fc" origin="Generated by Gradle"/>
@@ -708,6 +756,23 @@
             <sha512 value="4c04527fe27989ec38f7001937fcf7edab1a304e6f65410fcacdbbd370b0cb254e66d0b6f66565a6783ed39ea27b8cd714ce90f91b6490ed6f2d7dbf3dc63e54" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core-backported-fixes" version="1.0.0">
+         <artifact name="core-backported-fixes-1.0.0-samples-sources.jar">
+            <sha512 value="04a5b4bdd05f162d9c76e2fdba14075e5ef48249f2d44514137785bfd3b1cbfb098f1e54a4a7a755edd51ef0e79d011ef17a370e0402418f7287b353312ed647" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-backported-fixes-1.0.0-sources.jar">
+            <sha512 value="0ff0b7f50a9fef37339ba3f3104185c7da94e3a15a07e1ac76f2e89df1bf048af71d7d496cff11bd50f77f4a26a43273db8dd8aa8779840b161c5fb0f91cec52" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-backported-fixes-1.0.0.aar">
+            <sha512 value="ed2e41087ec92848c3cee20fe90895d74d05d60036f483f3ee8a0b777bbedae9b1ef1c3ed375a715bc5865610b0b3351f16da419c51d26908b7915960a5779cf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-backported-fixes-1.0.0.module">
+            <sha512 value="ad1675f3c2c213e2723963aa823af2004f0d4fe71b09d7199178c8bb9daba4bcbe731217af415904e2efba3d179a298f1536cd1972cfd24eff7b720fe65d3e52" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-backported-fixes-1.0.0.pom">
+            <sha512 value="0f0a99c2015a87ef924210772ad966c51566775048b1c64687357a227d8c39f55bf4190a3f4783a7322c5edb3753094c8795eea00c2bccb1a57a62723d730dd4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core-ktx" version="1.10.0">
          <artifact name="core-ktx-1.10.0-sources.jar">
             <sha512 value="c65ecac78e51d8ae6257e81393261179b82021046ca451fe1206a3d1862651f3e3f8453e8df8a4d690d993d412f3aa0ff7ea6f542131489a8d93cefe3002c442" origin="Generated by Gradle"/>
@@ -730,18 +795,18 @@
             <sha512 value="924aa9426c5ad18eddfb87cafa69729a81461ebeba4f990043eb7b2f8a136ad152db1b0268f543c9fe84efbbff8dba2a57212907e400ee8cb784f1f73edee1e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core-ktx" version="1.17.0">
-         <artifact name="core-ktx-1.17.0-sources.jar">
-            <sha512 value="d39588f277be2cf4202bbfd96d43e602a7a9dd19c53eacf9edd55f10a5aaee58a6530e244a6f9cf18992749e8822b4556982edc4873a274731293d4a37816a67" origin="Generated by Gradle"/>
+      <component group="androidx.core" name="core-ktx" version="1.19.0">
+         <artifact name="core-ktx-1.19.0-sources.jar">
+            <sha512 value="dd4d3db7ec1b0faa9da1bda5b29d238ed0f7c838f84baa1fbad18c91e0e3c83643b87cbfad6e88675fc7a9168ccca6f7d2bd44c0337e3231ea4cc246ee2388bc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-ktx-1.17.0.aar">
-            <sha512 value="8554f7eeb262d7fd64cf33f5b82c4462a47b54d8aa347a9e7516739ae8823147f5158bd3d87c10f94fc0f25a2a2b1da42a46876716c06aedde1d759de3bb7913" origin="Generated by Gradle"/>
+         <artifact name="core-ktx-1.19.0.aar">
+            <sha512 value="40562f24bbac5a4cf7d440fbf17caa806ddb5863d7964c4a6760db07f45ad53dd46f01b221e29130e0b4d6d277791e91d9a7893b2bcc26248d1ddd9fb504b2f7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-ktx-1.17.0.module">
-            <sha512 value="eb30d8fa101cb780efd230bc7a7f43f5f80f81526fcc46b1d11a1e08b21d258a8d6e485cc3a3eb1c365e41735dbc03888e799445c99bfcf25cc446d781cdb537" origin="Generated by Gradle"/>
+         <artifact name="core-ktx-1.19.0.module">
+            <sha512 value="7bb66dafce76ce723b386793c458106e7e8e255872e1609f8efc3e2d14c66be2e15f89bae0a80f60187f805e4f994b7c349126a1df9cba1fac513a09212379e4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-ktx-1.17.0.pom">
-            <sha512 value="f4ae8b9850e147a2899ca175b1ef7cf1bfe9c8b99015c34ab596a120aac71c79c23b9a631d10b57c4ff9fa48e27895d4453cc2ca30787166faac0411ccb2b3c7" origin="Generated by Gradle"/>
+         <artifact name="core-ktx-1.19.0.pom">
+            <sha512 value="1a22113f058bacc173d62478e1ecb3b519f757d711111670dadaaec04f64a6ce7423108d68f20961477a4d8f01e6cf8e03d4a36a481c23d240325e4586c10923" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.core" name="core-ktx" version="1.2.0">
@@ -789,44 +854,55 @@
          <artifact name="customview-1.1.0-sources.jar">
             <sha512 value="fb128093281e477efd4d454f15ef376abdb210ef03c76025e582c2193c4958999ab2ad06e78bfaac229ef08a4be9d768cdf740159a6bb6412056cede55691d1c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="customview-1.1.0.aar">
-            <sha512 value="7d6059b7d3aa26f9b8a98412f51ac6e9974cc0aff5c53c71fb8213f429b7511bf6650c7e8889cc1ecdc6f9a05c47025fe1450a7429d27309e7b302f300848465" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="customview-1.1.0.pom">
             <sha512 value="89931af6c4d5eb7290fc1e370d30ef1e0961583df83ff4db1a8aa4ab66edf383c5b7e5f12a8db1c8d5b2d5a00dbe7c81af4dc0aa39760312d5bb61444dafa554" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="9.0.0">
-         <artifact name="databinding-common-9.0.0-sources.jar">
+      <component group="androidx.customview" name="customview" version="1.2.0">
+         <artifact name="customview-1.2.0-sources.jar">
+            <sha512 value="613d52b8df351ab35e78eb1009b08341a01503f6b13879074ee1eb6e4c49cea21b52ae9040df1d529f04e812a8cd0b9364f783a8ff51566d07aefeae8a5fce85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="customview-1.2.0.aar">
+            <sha512 value="9c946d759e13eade7a7a26d97a5a582a1c54a4821d8712fa0c8860b90d535fde37923d1a27c59258107d8ba02b224a9ba3ce81e4a79f87c9cdb239c87a11f65c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="customview-1.2.0.module">
+            <sha512 value="9a55e7ae4c1f41752cd45928161ac940c7f3664f66d249b57dc1cf9fc2bc27f35cda2e5cca077b6bc4c3788218417d278dfc1b0a28a219008e6bfa08c0cd42c8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="customview-1.2.0.pom">
+            <sha512 value="5ea9a7b751c4e3d6256ea3bb83c478e0e7c0cc2dad419ff3372d6b3f56ffb7cd5d34fd5b30adcf3e6dceb0e6cdd89e2346645e3d645f8bc6191fdf1cb02c9f3d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.databinding" name="databinding-common" version="9.3.0">
+         <artifact name="databinding-common-9.3.0-sources.jar">
             <sha512 value="d9421f75c07ec12a6407e9381f350684f150800b40aabc9600d6e36ad6ee4195603b9e7063de3d1f0a69f926c75873db69b982944633ad016533ebf154eee72e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-common-9.0.0.jar">
-            <sha512 value="5d7539ba242138ae5ed2f0ddc9da6b0c3700bdf67c763196dc26e3557172f1a97284a3bb9592d3049bf96cab89602d0e65df95c7e3cb73f7c4632b166bae6ebd" origin="Generated by Gradle"/>
+         <artifact name="databinding-common-9.3.0.jar">
+            <sha512 value="3cf384bb55c5d545c736dd4a5526295cd119db0c0c08320190dbe52a32d37acdf41ca2675cf2674322d60e9bf0e798bb3ced08c6f4cd3ec0fb54d4357dc38a9f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-common-9.0.0.pom">
-            <sha512 value="9a2f58552b0bf205f353c7a2be2a9af0bbc94a89a9c53848c8cee117714a21271d1aecc1c7823abc8dd8912134d70116bbf0f91e22b2b22af6f33e0ab7642b97" origin="Generated by Gradle"/>
+         <artifact name="databinding-common-9.3.0.pom">
+            <sha512 value="d2df8fefc84214d47fd0b73481191d3311821a49267fae6478097cddd3f3a910237acfcb4bb02044c3efb8c4f08757b492a2896178cd6ac426d79268facc5b63" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="9.0.0">
-         <artifact name="databinding-compiler-common-9.0.0-sources.jar">
-            <sha512 value="0bdc14b1908a76a2959b2b90e24096c540eb469bb2fcae0007ddc5780d44569dd9b4befdf18544bfba59e73d2056e08e2ab588b4bd8cfbda81d6f98609be3222" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="9.3.0">
+         <artifact name="databinding-compiler-common-9.3.0-sources.jar">
+            <sha512 value="8a640e923f12599020473e2101dc8f61d04979523c57c069997f2c07a1dce01394bfafc6b73f67b80a8042f656f2503d3da4bd810d3dfcb50447f2da6b770571" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-compiler-common-9.0.0.jar">
-            <sha512 value="dd1b52dc13eb30d50822e010ef9f9ac008f9279a75bcb1b300c6255a113b8948dfb909e5de8071d6e08e9c505e169384de13a7c0dfde5b3ce70bd7b6dc8ae5a2" origin="Generated by Gradle"/>
+         <artifact name="databinding-compiler-common-9.3.0.jar">
+            <sha512 value="20933aca1792cfff7bf6edc055300bdbc1b583f1a6aa5a59df0d81a39ed76b15142fccd6279e20fc22e42f2e438fc63a3b9e56fd557ab4bc25d502ab661a78da" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-compiler-common-9.0.0.pom">
-            <sha512 value="33c9658f87d9bfbb8b27b27aae57c0ae1ef4f2d4954a22f58e8abfe3fa46273858712bd6308afb30f810fe15883ae2e69545223fd194b62439d5dc3880213be9" origin="Generated by Gradle"/>
+         <artifact name="databinding-compiler-common-9.3.0.pom">
+            <sha512 value="be84431db674ba9c8fe5ea8e76029e2c450c69963ab6246c3727ea1befc7c3143d8fd211a5468181184e8cbc449fb777780e6208170513eca35818368c8ba935" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="viewbinding" version="9.0.0">
-         <artifact name="viewbinding-9.0.0.aar">
-            <sha512 value="c57292c4e097978ab9282dded74c90a8d519318447a10698f8558d829c9c09cbd25753795c8ee8ac874a1b5182a9ce7092e5792f39fed8f8f13cb0ba9942ec7e" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="viewbinding" version="9.3.0">
+         <artifact name="viewbinding-9.3.0.aar">
+            <sha512 value="d9203958fe33ede19812ef963195cf8d5e14003ac34d17d32f1b632ef1a3864f94918587e7a3208ba295b08c4a4f08e99ebabde14258ab5dd0788300f78ae3ae" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="viewbinding-9.0.0.module">
-            <sha512 value="8352476e0f4c987a91a95590ea6e541d287a38c1c6e370eadf1c92cae2402c9832581f629af1d61869ce74e7474fa376744ac933667e0e6158c1545a2b508b35" origin="Generated by Gradle"/>
+         <artifact name="viewbinding-9.3.0.module">
+            <sha512 value="d2e79111b7085c3caddabcc784785cab03b528f654d8f4e64328e5d576a0c993da2311e78e40de996d7ab6388b63e97ccf001f36ba0c62fade86f26dd5146a1b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="viewbinding-9.0.0.pom">
-            <sha512 value="f997aad896422ace845c2238214eca3f998f6eee5a5551b91832073ea3873142a49283215d07d94ed34e850d451a822de4c871decd299b212c5833b038911c02" origin="Generated by Gradle"/>
+         <artifact name="viewbinding-9.3.0.pom">
+            <sha512 value="3da31d68063cda8f53c34c9ebb3f297dcc00b9d2bc207eadf629d6673de2d2158827ae201dd465ed58b2b66e7b1ec319d3a62c0330d5ad5f0bc78d063ec1b246" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
@@ -920,18 +996,18 @@
             <sha512 value="970b5b68ef09635d4fa0392d17ede88ad78727fd9c4873f8c4db9a8b450e80f6e7ac5f384c055bc355e26168b846a31cfe74bd2366307ac710accd519a457720" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.exifinterface" name="exifinterface" version="1.3.2">
-         <artifact name="exifinterface-1.3.2-sources.jar">
-            <sha512 value="51c78dd9090a3b1d930fb2b9f43e26e6f8148ae759b74a235d42c2c49cd1e6242ca6b2b2b558ae94e3081a1c1fe0f2c1ee85f26dace39659f210bbdb160c699f" origin="Generated by Gradle"/>
+      <component group="androidx.exifinterface" name="exifinterface" version="1.4.2">
+         <artifact name="exifinterface-1.4.2-sources.jar">
+            <sha512 value="c7fe282d20c4807aedc4e544745f384f8ea738d4a0dfad0da11f8936899cd01109f59c8665bc9538f5c6e88f0c22bbcfcf072c551b215858e9d0f1825177752c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="exifinterface-1.3.2.aar">
-            <sha512 value="2803d8e64d99cde48a07b5795197ebc8e7fc501d6a031c1d8c1dc8d3b6063a9ef224d8569553ff7cf60a589483a8a0ee4cb75a9c1394c94a9f27b775dcba5bcd" origin="Generated by Gradle"/>
+         <artifact name="exifinterface-1.4.2.aar">
+            <sha512 value="5bc8e4c325e5571b9a8d40d2901081734f8ca8210f3b16e52f3b8a5e352f2170edf859e03b6929a417da4664c3b325039b02ed1269eccac4edf3985774872431" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="exifinterface-1.3.2.module">
-            <sha512 value="b7ae6aa5fd5405f751210be34e308478f824c15c9634645f4ae5d2b3e16138e9f900d62aef9dd59e3c90cd3c684c1cea8ccc884fd765cd2b172ca02b80000900" origin="Generated by Gradle"/>
+         <artifact name="exifinterface-1.4.2.module">
+            <sha512 value="5266566ec5561cce5247dd3f890782489e043b0e976083e9191607363d7614e3bf345f8e2576f33ae3fa64f5b890d7700648d180001705fa8796bba0a5717e4e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="exifinterface-1.3.2.pom">
-            <sha512 value="c530ba939fea64f296e42567d526d8176a17d39d6af9bd260f3778627b1708e2c5a7d7a231c56384d16ac295a78d68a05da1d142ed8d796db70aa2453ba568b2" origin="Generated by Gradle"/>
+         <artifact name="exifinterface-1.4.2.pom">
+            <sha512 value="c1a524f5f220e18eb53c9a4f59aac51e7e7a19903db867da4a89d7e45b9bd2671861f76b08e625687d97de83adb531db0f9b39105d6541e81581bb1b46cb7744" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.fragment" name="fragment" version="1.1.0">
@@ -1390,6 +1466,48 @@
             <sha512 value="2031645a88920d84a7be75d1f6677d416f67ebc433495e549d4489e2ca6dab3ca9592f03803b50f4c3e4caf46f5a3188651fdf8e763cb3b55acaebe9d58ffe89" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.media3" name="media3-common" version="1.9.0">
+         <artifact name="media3-common-1.9.0-sources.jar">
+            <sha512 value="d302b3478f7cce19e70b7a90a8a09672ecb75b25b8776e93041c16b2b8dab753781028181e4c2f6aec2727f48bb1c4e56dd96fffad1aec25f44380325776c594" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-common-1.9.0.aar">
+            <sha512 value="a2a51e5e9e3be8f294ea1c66f4ec10db08f38f9b6191ac39e9d83e832cf1d71d7fff446c764e64592492282892e70f6541487c43319e3c2bf8ff9281511f473a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-common-1.9.0.module">
+            <sha512 value="07d06b0b8dc5e7b007617eeecb6f14025d09fa38410f28ad38306356701a8558310d7080464d4dccf9182d2c89807a4793d5f445f94e4591895a8e8c8b75481a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-common-1.9.0.pom">
+            <sha512 value="6536a9a1a8a465f721cbc574d442e019408d9f157be3eec3cb3c58be96c99ed2c180d4957bfb2df87b224556f60466a8eda326100e1b145632e43f9709b16401" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.media3" name="media3-container" version="1.9.0">
+         <artifact name="media3-container-1.9.0-sources.jar">
+            <sha512 value="19faaf3f463434246153808a9af97f47d76008b218c98797af4f8492ec975903953f227e0158b4d48706e495193f55a32acf6788d7fd41b5c0c71cfdff18236a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-container-1.9.0.aar">
+            <sha512 value="0724a0fc58a35bc8e42ea5ba10e32ac627f16d0bb386881c1c49f84f35ba63cd060da7ceffd02516cf30ad992b59b828d80fb8cef2bc688d21b47294533a00ac" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-container-1.9.0.module">
+            <sha512 value="c418d0ed637289b2efb5494c52351e49a9feeab48b1aa6c09eaa99a7a3dbc21555f7273082e8b37c83f595c845abca66b34d19177b77e5d87d6964508b535c06" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-container-1.9.0.pom">
+            <sha512 value="8ea262742e1db4674abe8a3c5de42d3bc2f20d47c0e38a0b7951eb184b28bf3438da470b9fae049a26f2d3811ed01ff0c0be438508ab178b924099697a4d180a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.media3" name="media3-muxer" version="1.9.0">
+         <artifact name="media3-muxer-1.9.0-sources.jar">
+            <sha512 value="05198840ad6c5869866b053904910df583511df804e568ad9d483bc58a8d3044c240e6c69b6356d8d0278ce38dde17e09a63ab015b341a71e38d8a1fe7eb0fc1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-muxer-1.9.0.aar">
+            <sha512 value="d656f9faed6cde045e1c4d756a03349543e104a0b685612403ce0ca71902f61e4103d446fa844e473805ddb4da10606adfd9804ffb14af1137166512c83144df" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-muxer-1.9.0.module">
+            <sha512 value="1ac72c8ef1eabdbbbde51f1e93e46df34d2e6a3bf30063eaf0ff935012f77cefcd8c2dfc9535cb9fa1dcf732f3160a1730d8012bb9eab7de2d09d8b25a71ed22" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-muxer-1.9.0.pom">
+            <sha512 value="d1c4d58e60cd95dcd6cce5890698e365d295c1ae1877498467900ea8370f46f5858a93b228a212fe1e1417583028ff569da43f3e82b770b7912d6f704290a311" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.profileinstaller" name="profileinstaller" version="1.3.0">
          <artifact name="profileinstaller-1.3.0-sources.jar">
             <sha512 value="19daf008ce2e01e54e65e5c1ed61be3873b5c3b150d668da72a96c36e7c6736ee4be42319986c78a72dec67ec32194cf5131e5e8123b7de9ac10b81a786524e6" origin="Generated by Gradle"/>
@@ -1656,163 +1774,163 @@
             <sha512 value="35a25ca5385e9b53c396257d9781f24e0058d718f8bf56b36e583430e3d4872383b6221c93b077d312028b56dc2c9f8b0f77d7a645407d2388a453d4b0533e3c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="9.0.0">
-         <artifact name="signflinger-9.0.0-sources.jar">
+      <component group="com.android" name="signflinger" version="9.3.0">
+         <artifact name="signflinger-9.3.0-sources.jar">
             <sha512 value="eeb581fffdeb44d5ba3e359986c2ef983689ea0efa8cdc4f9a1d02ed7eff233b7a2924b67753f657c9f18d2a84829ecb5bc194201fbe6594a8086050cc4dbd75" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="signflinger-9.0.0.jar">
-            <sha512 value="a301b05e1d86ed1c26a3faf798f3f768bbf63917cc092c3bb090a13bca6c349f4f74ab57ea8c8a33edc946a62305e263569ea891352b8d945a81323f6b9eb01f" origin="Generated by Gradle"/>
+         <artifact name="signflinger-9.3.0.jar">
+            <sha512 value="593c91a5c742c3b5ce2e44835eefaa6ab6aed81a6ce3457ca4106bcae47f952cce19587e3bf37bc4355da5a063ef1aed7af906d2e93e052ca70f89f0f3af7a78" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="signflinger-9.0.0.pom">
-            <sha512 value="322c0c483296d46e3545186658d9f9800eb217dfc2dbf9cb521290f517f0279eeed060d84ff862d4d9227da352eb5ae7bf494e6281e121c9eaf6cb1dfb1ddfd4" origin="Generated by Gradle"/>
+         <artifact name="signflinger-9.3.0.pom">
+            <sha512 value="6ed299e5426b978e15901efaba0fc7769dad756053cbc6347fa35e2e92071d4f5f242ffc50ddf88373ab96d880f31ec52491c0107af7512398a1223204d0dbfe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="9.0.0">
-         <artifact name="zipflinger-9.0.0-sources.jar">
-            <sha512 value="742425ea0a3a1b0fa98c015ba776f013f887b6850a18cdb3a445ca3104762195a16d633eb63a977cccabb5daf666bd8413dc5191012ee0681279c9f2147f2264" origin="Generated by Gradle"/>
+      <component group="com.android" name="zipflinger" version="9.3.0">
+         <artifact name="zipflinger-9.3.0-sources.jar">
+            <sha512 value="1b578e7b258259b1bb796e4c9dd4bd147fe8cd08d379b9e2d7d3c77398de08fcaabbf58f854a5617ccc6842926d3c089f4bb63dc874bc86813bcc77c3a34b10c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="zipflinger-9.0.0.jar">
-            <sha512 value="809b16d45f317403acc3ba5c6d575b7d68e7c37a644b1e8afca94590e29b87a0d8078f2f72312fe3358ec969582769df553711b1bc1c18a0cf468102291d4ca0" origin="Generated by Gradle"/>
+         <artifact name="zipflinger-9.3.0.jar">
+            <sha512 value="9214cb07a9836e07ba0a9abc1954aff797b1c796e3aeebb8a86277beab4f5ccba5934b43c1050afcbd617ce4296b30d861542b212b80fa9806a7a2b4019bd200" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="zipflinger-9.0.0.pom">
-            <sha512 value="16fc89a6cd84b27867ba0c4479090a4da6799b79c8c05af97c01585f4fdee46e9c94a99cbe8c89e2da07cc4033844cf6a7ff75cc2d38bc30c5bca72d39318148" origin="Generated by Gradle"/>
+         <artifact name="zipflinger-9.3.0.pom">
+            <sha512 value="706c2c769ecefb8a3372f10cadbb7a8084eaa21ce80c636f2359ede1eb4fc4106702fa4e723bf68e9f1d6bbfa03fc84da168dd1d4420b2010db1cb1066757a36" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.application" name="com.android.application.gradle.plugin" version="9.0.0">
-         <artifact name="com.android.application.gradle.plugin-9.0.0.pom">
-            <sha512 value="6df8c8ef0bc25fd43a708b9e8c04c8333a684d38d204b1826920cb7bf9010819a08db44f8d25901617b48231fa22b6d00f27d75d3af323cd0312b98b225dcf7d" origin="Generated by Gradle"/>
+      <component group="com.android.application" name="com.android.application.gradle.plugin" version="9.3.0">
+         <artifact name="com.android.application.gradle.plugin-9.3.0.pom">
+            <sha512 value="46be78f0beb2407b52b0e2a2eddc87c0512fd7f0d2e9d5d3e166f5c4f3aa9ff73c6f592311269fbfb3f3a612e1ee821bb73ddca62ec9bcc284cc11f3153b9f51" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="9.0.0">
-         <artifact name="baseLibrary-9.0.0-sources.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="9.3.0">
+         <artifact name="baseLibrary-9.3.0-sources.jar">
             <sha512 value="7c84913ee31bc8de89e04d0c7bd13b1878c2520950c79b463a96cba77c8a329b8e9a5adda1ba33c8f12421b1f7bb33923031d561ec4e39e8b803ded08aef9d44" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="baseLibrary-9.0.0.jar">
-            <sha512 value="c1f350e35e37c065c887b52a4720186f96dfe87436791a61ea6424c094edd0d41435925f26b8433388608e197fe1c82a9596be0d366f28f3d3373f2c8bd2693a" origin="Generated by Gradle"/>
+         <artifact name="baseLibrary-9.3.0.jar">
+            <sha512 value="ee15334d9ebbbc41926adf558018270fee26795d9509215629b0aba97503e0cb48f2db9ce8b79a9117b3ab385e635409b659831bb4c5cda09e2f57c5290726b0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="baseLibrary-9.0.0.pom">
-            <sha512 value="efd3ba293c9a17680b1afd88b93e415c155245559e96488243430501a47c175a2a12a05cf36f6ac26acc419b71d31baa9540aae59bffde61fc5b5e424ebbf94d" origin="Generated by Gradle"/>
+         <artifact name="baseLibrary-9.3.0.pom">
+            <sha512 value="f8830108e0bf770774f2b18af9353c806b6bb7b1e5fca8a50434a8881e31810440fdf5b9668de5cfbba94579be6e3692ab86bd48997d803af6d59a157ec8db1e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="32.0.0">
-         <artifact name="annotations-32.0.0-sources.jar">
+      <component group="com.android.tools" name="annotations" version="32.3.0">
+         <artifact name="annotations-32.3.0-sources.jar">
             <sha512 value="a835971a2b055c41b1aa4a2e29d80cc93757722194f860e0f4e997d32521825711419c0cb04aec570ab87876a95475722c17b3320249ee1a088c71d0da999f46" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-32.0.0.jar">
-            <sha512 value="a6ea020912ec68b3bfc20c3ca5df0627d5a3cf6cae544e7d8a25a7b71e7fbd6af722883ef3085a25d9669de47373a27fb281a4e677725ced788dabbfea6c8c77" origin="Generated by Gradle"/>
+         <artifact name="annotations-32.3.0.jar">
+            <sha512 value="4694dbc31e5b8c7ed4b941a252cb828b789f5dd90b1cc38526ccabf42005a8ce0600dfc951e3fb08c3f60b905002cf5ecb26e46a4e77e3f9e730a74a87e22788" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-32.0.0.pom">
-            <sha512 value="dea9ea079aa3d49b8e902f06fa8307c0eaed4de135bfd2a57c26d6ac0d0a733e753aaca3f1749b2f4502189243ec319051696d26de5c03c2a73c88f7faa821ff" origin="Generated by Gradle"/>
+         <artifact name="annotations-32.3.0.pom">
+            <sha512 value="8423794e7ac9faf931245e3072454c3df7b4e125836aef214a43de4f31c04905ac5e26374913c04706d75c5beaaa426a7e56e36383eecb680123fb30342eb70c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="32.0.0">
-         <artifact name="common-32.0.0-sources.jar">
-            <sha512 value="e7ccb926260c75819330c681d27074a802ebfb06bd4d7fb2b160993b3a7cd3853b0bc0858ba0a4783666b304fcff6d997c34bea020f485c097ca5013ef58b9e9" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="common" version="32.3.0">
+         <artifact name="common-32.3.0-sources.jar">
+            <sha512 value="5b09d52dac2cd58b67fabc0973607250bab99707ff95a183475e068dd75f7274d8592cebd3b4192d037ce0d81eafc9f847592ede0cd25145717ddbf4fce2b21d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="common-32.0.0.jar">
-            <sha512 value="dc0cb7d6bf1da40b186610f116be6c955e88e871209125bf96b19c425a64d54c2cfc99e9acf5010d9cbb5787a1315b7faf681b24899c2e8f009a0fa7e7a3a7f0" origin="Generated by Gradle"/>
+         <artifact name="common-32.3.0.jar">
+            <sha512 value="c7b42285224941d6eac884d97dc9d5e9fef47b49537992782813e78f886121431c0515ed3409c662432279482395b7c3d11e1dfa57231f517c0668f03f178441" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="common-32.0.0.pom">
-            <sha512 value="f35b03f14d420eb22cdc56118a3201dacb4db215bcf6dd27016870498e7a9730c10d87570d5d7547b701ac25fd523eba00c99758fd96ab051ee25bade6fe87ba" origin="Generated by Gradle"/>
+         <artifact name="common-32.3.0.pom">
+            <sha512 value="bb896a754e4934f364c8efbadcf08a17708396af59b6da778d802ad3c11ae777ce0b357ef3a42d6b333f5c02343a63d13f127f796e92df0f2602b4255435586e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="32.0.0">
-         <artifact name="dvlib-32.0.0-sources.jar">
-            <sha512 value="cbbf4ac13162c88706afd4313de9f8e1a5bcc7f094372d7f9384614e6103e019475b40b2b8b661b3e582a33e7baa7bc8d8387af220357d6ee9390b2219989a86" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="dvlib" version="32.3.0">
+         <artifact name="dvlib-32.3.0-sources.jar">
+            <sha512 value="98e927fe7b5d128c6072fb41c02e78b245000cf89921a3349df3d7968aed976719de2b73390bdaf9b021720f7c37818e4cf7e2dd34c97b070b2e2f90cd5d878a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dvlib-32.0.0.jar">
-            <sha512 value="f196fa7ae6c12ab831b5b92fe43e4a544bf00c9c9a8133b999d0cefd5c5439f75c782100d6f19285ebbdbf1482cd32c523eb6a07f011c1487043f58d9cd306f5" origin="Generated by Gradle"/>
+         <artifact name="dvlib-32.3.0.jar">
+            <sha512 value="b78e269e7b22b72b5e24b8768fbcb4f98ad6f8c939c8e9723810084d6ae689840e8c878fdb8fcef38c1075fa22995abb3fc2487f8240ea1beb0f08c0fec70ccb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dvlib-32.0.0.pom">
-            <sha512 value="aa2017a796e6d09bd8077d61a1271e7a8d931f09eb4736d9a6b716e9258ffb01fee5cbf6ebf5152fbbc78e2d6612a25421aedb7bb9ecbf5c9c181d0139e34b8b" origin="Generated by Gradle"/>
+         <artifact name="dvlib-32.3.0.pom">
+            <sha512 value="cc82953509646c8cab9e72d1c7ef41cabbe3fcec6c56705322ed9c73201e784c5d126d5d73859529e51ca2d8671d4b98ec2db2c5c4faa6a395abdfe510975f15" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="play-sdk-proto" version="32.0.0">
-         <artifact name="play-sdk-proto-32.0.0-sources.jar">
+      <component group="com.android.tools" name="play-sdk-proto" version="32.3.0">
+         <artifact name="play-sdk-proto-32.3.0-sources.jar">
             <sha512 value="b8bb85d6dcaab94feb63255ad7588bb9fd27c5b6a3431d0ce61dc0fed2bfd5a606caea1ccd5402c74c26e13266752210f94928bc19cb194bd1e641e0f9bd7749" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="play-sdk-proto-32.0.0.jar">
-            <sha512 value="4f8aa6bb790de944ec9de5a2920ad82275f352b37e4a113583a87647fad198f9ac5ff311a86dc93bafb6e692b92403ac0cf625752e965a9064baf42c3968b65c" origin="Generated by Gradle"/>
+         <artifact name="play-sdk-proto-32.3.0.jar">
+            <sha512 value="f4fa74a4f580edf9a88c184e6ccb9d6574a5f4697ae49fc0efb3e4d717d9256ed6e5eb563d56eca6ce5922d899c4edab2a5b6ce285a3533edf7ec964f038560a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="play-sdk-proto-32.0.0.pom">
-            <sha512 value="b13e83f963123d93843e99589feb4b37b651712cd775f5ebb12ec4de49d198110e320a4f3c284d53bf4097aef48e9fa519f94a6af902929712862b8396d143e2" origin="Generated by Gradle"/>
+         <artifact name="play-sdk-proto-32.3.0.pom">
+            <sha512 value="5565adeb0c5f531dfc7a8a386c2481aff4f49e616a3e23cbfa63a49aed201abc3cd3c56ba78fa68b055e6dd5f3625eb4ef8883601030cabb269ad1bebb01a996" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="32.0.0">
-         <artifact name="repository-32.0.0-sources.jar">
-            <sha512 value="8777cbd3f49c60d8bc526485c54f6dd5e37afab10e7dffb498ff2bdcdeccb45b38181f2a5222d343f52ff28f30c6c3eadba1da5a8e75724280dada4f828c5708" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="repository" version="32.3.0">
+         <artifact name="repository-32.3.0-sources.jar">
+            <sha512 value="f44ec69cac85fb445783a0ba6d5e12e61b7447186558182e02425b222e5938f592d6719e4bb0742ca3e8e25a06c0db7baddcbebbc4a695b400a6b445f8587308" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="repository-32.0.0.jar">
-            <sha512 value="bcba5bc028d8b649bb33693f486b37fa7661ba21147bc12aed5270d95a1f9661fbee3b6f9d915c43e69dd4366fac51a177f814f23a7861ec4464b3f5ace7c14b" origin="Generated by Gradle"/>
+         <artifact name="repository-32.3.0.jar">
+            <sha512 value="b41b763c7f7bc8e3371e585a5e731719c2307adfff6ed7709bf64ac28d3c67b495e3ddce22c6b38f3706b078a38de50284a29b7fa7a07de4ac940640b42e259f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="repository-32.0.0.pom">
-            <sha512 value="2be71bbd42b0e2b7c0960639371378b5af5f12c7e6187657adf43446508b088a198bffc57797315072e8fe0fd75baae9aa64bed1a92cb5837d65dae19a147a20" origin="Generated by Gradle"/>
+         <artifact name="repository-32.3.0.pom">
+            <sha512 value="dd76b8da05cbcaac0c9f710ed181db9623e04eef8de8ddaf0f4e55fc392bd7c590299f50def696309a429e007d3cc0ff6fb3f4a5779519a9cb14edbb69710f75" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="32.0.0">
-         <artifact name="sdk-common-32.0.0-sources.jar">
-            <sha512 value="e5eae36e5df7c1775d55c70516ba1d4c2fcb643c69ddd52ebf0802ea81640c7572d6143f675691026db240612a8d98eccad636cfe787d9fbe909ebac15c77c13" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdk-common" version="32.3.0">
+         <artifact name="sdk-common-32.3.0-sources.jar">
+            <sha512 value="5cf8b9c64c37dccc5f98a3f805af9d379734c1bedf9a971ae6df65d5c5124a296ce37600558a38266e545972256c50a06d0cf9c79047743cbc69baa7a5a19354" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdk-common-32.0.0.jar">
-            <sha512 value="28e69902b28947700a045ed0ba2445afdfdde500344471b789b0721f683787f705f68594909325d25a8eacd055a0637fb553ed4463c2d16624cc74ee558be4dc" origin="Generated by Gradle"/>
+         <artifact name="sdk-common-32.3.0.jar">
+            <sha512 value="53a2220d073aedbb2eb0635f2c4fe06be415c28320cd8e4194406281e421cec9796e91c7c50ae3f262e5a3c801dee79e64fffc74db1d72ce12c53f5d793c032a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdk-common-32.0.0.pom">
-            <sha512 value="d08cc94c9a05afdfaaa28b0f5d9836e7b913a819aa05935b2d584a7ec9d317685c3d1785cdb2fc7659a1ac86480884677f971c5573c9f5afaff077e270b2aa38" origin="Generated by Gradle"/>
+         <artifact name="sdk-common-32.3.0.pom">
+            <sha512 value="ac294f5f142a0fbaa3479d9e059ece4ee7564077a6463a5117f502f1bafd8533e0aa15493a3e886721c4825a309d790c39774135f94ba1e27cd131752f5c88b6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="32.0.0">
-         <artifact name="sdklib-32.0.0-sources.jar">
-            <sha512 value="91bbc03ce4fdeaef74cd5cc3d48b2b63002caeb6538f9fa3ca335ab919b564cd25c08ed757d389a61f3029e7074e62ebe0354def65052c378ca78647e0990ac0" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdklib" version="32.3.0">
+         <artifact name="sdklib-32.3.0-sources.jar">
+            <sha512 value="8d87b0bc96f946c91f13b188ca67140c1d28e45069f826513040d45887b970c5ce91aabb68b3750b1c9bfec5444518160ac3caf6af5db32e1e4ee5e4c17fa0d3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdklib-32.0.0.jar">
-            <sha512 value="d615b6c58ffe16298ba7266026f2e3b1ff104fc0b06debaca2bac3254098ad8904a9a68ad9308f87f718caa95881df547363cd8a2c2d3ece6c4243d90f104cdc" origin="Generated by Gradle"/>
+         <artifact name="sdklib-32.3.0.jar">
+            <sha512 value="ae42246036e2a340237e46ac10172e26f6365de2ef63f4087f70f3a62a12643150a4b056bd30d20021b00362a8a2339935e001988c742753bb984a33b185ec52" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdklib-32.0.0.pom">
-            <sha512 value="accb79018a5e2f4c72836604d79c32fee438a301a8be6173239c09533ce424c5eb01f9c1260ae84a598413d6f2a7b7506cc64802c1a8c1c012d2931fc46ead48" origin="Generated by Gradle"/>
+         <artifact name="sdklib-32.3.0.pom">
+            <sha512 value="5ba913a4a82032d04ce03d385b08035220094dadd4a2b330aa532efbb43cd6c117af1a1d1c1997078f6eaf49cb1b86b43834227954921991a1eb77577d89b49b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="32.0.0">
-         <artifact name="crash-32.0.0-sources.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="32.3.0">
+         <artifact name="crash-32.3.0-sources.jar">
             <sha512 value="5f9ee5f66bedecc2ed60807933e07c4f24714304db528e29cb17b9e8e5b984ab55abe0b717c43bf9f7b9b6d2b185b27bd2f11dbd25c8ece429afefdffef6f85f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="crash-32.0.0.jar">
-            <sha512 value="88ede5999ec069d8181714bc2d38866bdd2a94c5897f655f6d8996596d9f281453d278eb9b59adb35122f950949a47040def24ae902099674687a02024e2c458" origin="Generated by Gradle"/>
+         <artifact name="crash-32.3.0.jar">
+            <sha512 value="86dd08cd575b6f029c407280639fc5499cef1a89a9b744980cd79262fed2998afe0b440edc33968bbd8ece0226f44996ca2bc214592a6be74edc203f31db0d29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="crash-32.0.0.pom">
-            <sha512 value="e753777d684b4a52e1db365e4a3accb9f67b81765b6d4e828f1507a2364fa34541241b9cbcc5d7d19ea1beb87569e1dba8bae0c4db7cbff23c8c8911a1a6a02b" origin="Generated by Gradle"/>
+         <artifact name="crash-32.3.0.pom">
+            <sha512 value="8c4a5660a0154ed3aefbd1aabab6c0d113941633e352569391108c3025b82c806827041b4fc5e84e936d0cde8c8fa756f047eac90a97bb7a29600b82ff2ed9d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="32.0.0">
-         <artifact name="protos-32.0.0-sources.jar">
-            <sha512 value="a7e0e2995c235746b0e702500011236e234106f5bbcc1e6a34f1ac31d53c038eedd2b77196531b246c82de3278894093be71a9cfc881424cf32f5531d13da801" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="protos" version="32.3.0">
+         <artifact name="protos-32.3.0-sources.jar">
+            <sha512 value="90048ece8a558d18d85d38984ea8fd9b3612295dbb2377ac2abc437e8219e680455f2a017615b7f889fc2af7c234ebe4ae80aca8d0f5777435a1ea7c0c4bf2ca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protos-32.0.0.jar">
-            <sha512 value="8ad917ec04a3c8660258447c0379f2e679d74f70e24f3031dcb068bfe7d6e214407ceac1e82e7d6b53a20ad391910b90bccc74ba50dc8af770163f7d194e04e8" origin="Generated by Gradle"/>
+         <artifact name="protos-32.3.0.jar">
+            <sha512 value="5c93e5faabe2f4a13f40dece4f42d6ffb0ddb754737809be9f140fd0cd2b388448384d50c1c224bada9de1505906cd23ef6192fd9b8803223ff5bd2aabc00422" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protos-32.0.0.pom">
-            <sha512 value="a165e22f1e9f7961fe52dcba97e3d03f174457f67f24449c9dc8fdcf8ee5e173a5cfc0ed13f0ea60ed934cad9b5c2dac729c2c9baef3f5d0bb135c7b057f5fb1" origin="Generated by Gradle"/>
+         <artifact name="protos-32.3.0.pom">
+            <sha512 value="b7e8b97ad926d967714a953726ac50f1f297574bc4c8e1b3a5d4ff91220d97427935f7a7700bf0ca4957253c163b78f7b7b891359b1d2304763be763ae4717d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="32.0.0">
-         <artifact name="shared-32.0.0-sources.jar">
-            <sha512 value="934f9a6932e24aa5700abbc02a91376b9e58af61774bc51abaa80e4b46319ce912e9a728421a5db4e44988ada24b855a47650b01219d58ef040a2af18727dd33" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="shared" version="32.3.0">
+         <artifact name="shared-32.3.0-sources.jar">
+            <sha512 value="dab55268c61f09a36d4913c388a76e6402c11dbf3ddefad1d3b64c8de967a811da36c28f93821852e96da0b33eacef992eea24ecdcd16729164d90fd144a86fb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="shared-32.0.0.jar">
-            <sha512 value="a65cd3df41b8ff7689ea0a4a8fe46d39fa71dcbde91e27143e1aeec10a60613d2c5532c2ed6ad7b0a83be6e28a6ca8ce5ed167a7b4a66beba5ad8e42a47cd27b" origin="Generated by Gradle"/>
+         <artifact name="shared-32.3.0.jar">
+            <sha512 value="3ef3b51394a333e039f2146796a9210639a2eb385b861b4b2d3e08c7fa883207dc9be1d404232e71d88a261c47eb7a25021dfca9119a261d95541e945266a951" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="shared-32.0.0.pom">
-            <sha512 value="f666f9e49726f4899b9430aa89eb342ac39d985d5ecc2947461f20c7262733beac6c196e045f9172455a18dd5f393a38c1a220cc4e551194c29ac4a0ad6b4c95" origin="Generated by Gradle"/>
+         <artifact name="shared-32.3.0.pom">
+            <sha512 value="b38f4a948020685a61e1cd5f22a07c38f98f69ecdd556722e58906dfed2aad36e352eb11e09c6f60c666319bdc2cd99444de86b78b7a981dd23892bcfd6afa24" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="32.0.0">
-         <artifact name="tracker-32.0.0-sources.jar">
-            <sha512 value="bb0b499798c68fc06e64c15ba666739a2791f097a353435c127437155210c0053c1178af6a6dbea560ad25048ea7206eaed828021fd3fc76bf457edc5aaf5643" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="tracker" version="32.3.0">
+         <artifact name="tracker-32.3.0-sources.jar">
+            <sha512 value="3521fcb077f27264c4c58b5d62ab990cca5f969b959dfb479324680ab901e11093204af52997e2901b2b30505a2783b1ee4cb4ceaee829ed49f5d142af60c3a7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="tracker-32.0.0.jar">
-            <sha512 value="79577344179b7c2c21484be00c652e38d1bf2608fb67e354d7b5c4ac554108e30294496de6d2a9c4c8bcac0cd914d71968cace12cc28d973b492fe6942dc02b5" origin="Generated by Gradle"/>
+         <artifact name="tracker-32.3.0.jar">
+            <sha512 value="878d6c33a4737397ac3b8726f5baaa10d84da7681b259423770d59a4ceb4371c55c579a1b89b434e181fbdb8b6701ea63f5a22d9ec48eee708e765c473db4032" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="tracker-32.0.0.pom">
-            <sha512 value="ca9e3a3ca5df884fc8cce0463c5d01c57b72276e75c3c3f4a34545f75632b572f5d3e5fd1724ddb2d2ae77069c17efde7b9273242dd00a0a9695bc346fac719c" origin="Generated by Gradle"/>
+         <artifact name="tracker-32.3.0.pom">
+            <sha512 value="370dd5264fe920eeaa738576dda04583621c7923796b326705f455eecd8af18bcda56bf3cf46ca4d1ff9292b2db87cdda617c1e9bd307cfb5347a89e264a143c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2" version="7.3.0-alpha07-8248216">
@@ -1829,18 +1947,18 @@
             <sha512 value="797ec83a3c1f51f8f63ba890f6cd836ebd8b5bf75da2d71ff36c8b86c36246ef48610e3dd92d438806c893a74617e48c819afb5289a6a971d72ce8218ee53f45" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2" version="9.0.0-14304508">
-         <artifact name="aapt2-9.0.0-14304508-linux.jar">
-            <sha512 value="4d28b7e4805533467e5700894ffe5063789e2942c3591845ee9d520639494f483445d6090f12f901e02dbd83c56a363a75f21d582fc6141ce3533e5cdedff7df" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2" version="9.3.0-15703166">
+         <artifact name="aapt2-9.3.0-15703166-linux.jar">
+            <sha512 value="4021309ee4fb0e49192314b608d7d747a6b41bbd0873b0fd14e55bbf8e352abaf34f365b5c3a163e9498e954f123f8912acfd5e2fe4d8a06f4063acc4f463bed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.0.0-14304508-osx.jar">
-            <sha512 value="cbe3474244a6b8d1e8a9384e82d3cb61dc57a81ecccc16b0edf500dd210fbeff0ca3402728eb93c6db614f6001d4e071dbb526dbe147e5505d5c93116469fca4" origin="Generated by Gradle"/>
+         <artifact name="aapt2-9.3.0-15703166-osx.jar">
+            <sha512 value="cc7f408124038334b67389d95b8abc2223a389df19f8db75366bda7672f32c2c07b07b0f0a408bee6d69a239f40c65f667564edba66539ce0814c72bdd8c21a5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.0.0-14304508-windows.jar">
-            <sha512 value="2c9cde58e327cb763299a0c62c65a337467696519c4d2d64c520c696e031e850d29a2f5521dc92090095738f14a610d3dae0dc4d8bea4db245eadee0005d19ff" origin="Generated by Gradle"/>
+         <artifact name="aapt2-9.3.0-15703166-windows.jar">
+            <sha512 value="7c68bf59e0df958702bce6f00f291dc79374ffd4b2db177cca2831656d1b8349d9da44e9aa251c918c733f88220de23bf86395081002968ad559d05bbd64c45f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.0.0-14304508.pom">
-            <sha512 value="68d7da926426682c539e9bc539ea07ae0ee53cd32c2c930e6630dd71fc4d510b7e8384cf077bdb7811cdf063355643600ce130cd26e613b28230666f79e9c3f3" origin="Generated by Gradle"/>
+         <artifact name="aapt2-9.3.0-15703166.pom">
+            <sha512 value="06793d18c8713ab8c20b18537b8f8685ba0f6cfda047a5edb4e56d8b6333a99c2cc810bd0f8dbe74109cc97256bd0be6d7d04f090ecaed8217321d5e91ed485c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.3.0-alpha07-8248216">
@@ -1857,111 +1975,111 @@
             <sha512 value="3b15ec18908e442bf0e317c3bcfc14bc45eadf89b853cd9efa3970b0cae97c62d6c0125b74535ecbe02c7696fa8f3faf24d86184516580fbe9fc88c5dcb2388c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="9.0.0-14304508">
-         <artifact name="aapt2-proto-9.0.0-14304508-javadoc.jar">
-            <sha512 value="0cc83d1505af3d19fc297f8b748a2b69e96eecd6890a3b9beba7bcede6cd3abdfebd1efb49dec47cf7fa6a5617ff72711f1ee9b819dbff65fb6728a61123c2d5" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2-proto" version="9.3.0-15703166">
+         <artifact name="aapt2-proto-9.3.0-15703166-javadoc.jar">
+            <sha512 value="415bc0caa8ea49f29a185b6fe05f9483a098f000a95d04ea5fc7187dcb205b2831eb34f9b10272db25123d76bba72301e44684cf4e5f05ec90f75c6a58cc3a57" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.0.0-14304508-sources.jar">
-            <sha512 value="7a4ed56ebdcaaaa8a742e488a021a8e7e2b80cf2d3fcf44e3a173305b35bb32f73f7c564ee3b8add13e7ae50eaa6f18c126d5640ac3bd9bc6d7b5f5807f2943e" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.0-15703166-sources.jar">
+            <sha512 value="92259897e27fe49641d45bf41abccf80b2be83bcc915aa387990376344b63536be1b7a558b73537d76134307bce940a04fa6f2f8c8986d424754156067ac35cf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.0.0-14304508.jar">
-            <sha512 value="8287f9436f93b37cdbadb0f4ccb6ec0b89ff62b9d20411c36ebf30de7f9675ee17f9b9e0345efe67135bd159d13f8f538095d3c16d1003df050bc8edb490f7ac" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.0-15703166.jar">
+            <sha512 value="b3fdcf5e77dcc81dd7025b3e8cc81c74d12b0d8e2775c8e6dd2cc382299535bb14affc99f3b9480dbe7e18758ec4d03bd82b310d4f8f43f819a057ee777fe9d8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.0.0-14304508.module">
-            <sha512 value="cef79784d935a9b4068f5217dfc77ad458a805cff008d3bb6c65ee5df9a9edd8222e68a42b174ce3c7b2f359d7b53029f5129750b36397f89d8f6ce33804ffee" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.0-15703166.module">
+            <sha512 value="772d859dccb104b4f083b8d3bf6e39e9a082b8c64469c5ba4499f2abd0d3ec9eac27322610dee6b736ab210aebafb53386c5a900ea27ad4e01f91d6eaef1ceec" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.0.0-14304508.pom">
-            <sha512 value="b1573e1abf6e20e7bc4d03d0eecbb99beedbe3f585fd3395825f36c1fedca68dabfa082cb17bdc54b978a6439138b49b6c5de66d4e3e518221043316b3b6033f" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.0-15703166.pom">
+            <sha512 value="8bb5691f3ec7906111f9cf5f86c1085932c06f7c67cc5c726a7ab4513dfbadc5735fc72b8db23c2be7ba531dafbfb16c71bb4f6d3a97c7bc3691a5aec2ef6b91" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="9.0.0">
-         <artifact name="aaptcompiler-9.0.0-javadoc.jar">
+      <component group="com.android.tools.build" name="aaptcompiler" version="9.3.0">
+         <artifact name="aaptcompiler-9.3.0-javadoc.jar">
             <sha512 value="50b2a55c05905cfce9f4d49cab238bd811f2c976ceabb8c5c9980d3a4445a9da09fea2c1ca3b726ea163f612412eceef07aaa7de45881269ce6417ecce715f46" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.0.0-sources.jar">
-            <sha512 value="0a91a6186fd5aca9296064ba70daee4370cfa281ba159aa497c7f8ec241015c0bf12abca1529435562e204274227b39ac17af925a551320ecbfc7950751b10a6" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.0-sources.jar">
+            <sha512 value="a2ae0ad4bc6f4d23679ea08b0c5a8fd825bf1a781a9221f995bf363422c1d83d52e8c9b8a036dd9bc253271c4e474c516c982bbe817d51e9ffc4b8c8afc78d81" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.0.0.jar">
-            <sha512 value="63c9783199c561ab736af3a84c7f1042eda2aa7a0e387a2f379fa1f888f3d31fe5b309e0c7d98a9d475002cf5280dfa06e2c9aa49374f284c6762e2e067fab3e" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.0.jar">
+            <sha512 value="38981f87e2d432bcd6890a262cb817994a638cde066e50a03cf375074db9d2dece76409b0bbf37f1c78882da4cea9d935b540401113130540bd9da72c3716329" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.0.0.module">
-            <sha512 value="45c96543d9d5f1f708ac76054c86138a00266add30b364f54d0f6c1e590cc47a88e600513aa699453f77884788504f32e5c7dfa7b525d9bd2c9222e9e1458ee8" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.0.module">
+            <sha512 value="9ab909a2a1f28d1e7b0e87f1e71e49f5babe67285ad1e524091af6d8596ec7c33808c252dc82494b31800265f2268dcf40e086443cf04ae25108e8b79a3b0585" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.0.0.pom">
-            <sha512 value="f296ba8bc5c73d459bd5f74db5ec3001631891c1c08704b8e1c9296f565befe52d2166ecf46be827889a77fbd12f131b6a1b9e2a4483bd47f3b2aebed6d78f08" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.0.pom">
+            <sha512 value="572dac0cee473d9968b920b80b7f5d91856bfd687248f7c906764e71ab59b7757d234769add1d310badb3cf64ca7f33984f0de32b0ca8623b0b12eca2a8fb528" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="9.0.0">
-         <artifact name="apksig-9.0.0-sources.jar">
+      <component group="com.android.tools.build" name="apksig" version="9.3.0">
+         <artifact name="apksig-9.3.0-sources.jar">
             <sha512 value="6b5047abac85b4f6400e818a50a2c01a82e5c624ae98ff7dc94b84d564f26f9b9d3119eed43838f0482490e7e49d1cf79500a16d18eaf6de7955f5cd862787a8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apksig-9.0.0.jar">
+         <artifact name="apksig-9.3.0.jar">
             <sha512 value="75f4613b20ed254f1cbc34f5a3f54cf87dc6deb101bbcd12b256394a6878cffb9b3a91c29989709673e27f54a70d2c80db63f572f1f0ffb3254f102d89edae91" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apksig-9.0.0.pom">
-            <sha512 value="4c9ce504167c170bdaca5432ca8db2f5f91ca040b9d598077d04be7a9c2900a20e67f1202cb84d28cca8d865329972787e1af7f76b4bda6399ccd5153999e4b8" origin="Generated by Gradle"/>
+         <artifact name="apksig-9.3.0.pom">
+            <sha512 value="507797343e4dd0aed1650058e04d93a0cbdfa6a70f80b7275fd30183676f9ff1b3586b78f6fee11fdf3694b80d67bfae791cd9fcbcbdb51d84d53057072f0405" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="9.0.0">
-         <artifact name="apkzlib-9.0.0-sources.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="9.3.0">
+         <artifact name="apkzlib-9.3.0-sources.jar">
             <sha512 value="93401a9ca8f9049a2a49615d0cd76898ee1b48cf26a74ad327f8766bca101a15423b7d8dcaa9279ef11111e3e6641ea26c2a2a073ca248c0307544d5ac42c91b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apkzlib-9.0.0.jar">
-            <sha512 value="1308bd00fa4c9847f9d841acf430f2df6c48faf9ce4ba6b3277103e6725b81ab1af521a0e4e22be832bebd784b670123a753d36b6a0b5ada88f8a5812c0940ca" origin="Generated by Gradle"/>
+         <artifact name="apkzlib-9.3.0.jar">
+            <sha512 value="8eeeff02940b72f796750bcddbcb347405dc985fc3ec37af5eeb6ff185afab31f2680832aa0bd07a0d348ceb0f09206b91bc36ff108652c04636e804ed29d303" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apkzlib-9.0.0.pom">
-            <sha512 value="2263c14452cc75ceed6509cb44735e775a55c9269390270e00ec4d812406cf084207d9ea9f159ed339f86fd89de8d43d90bbe223ff4825f2d37eb9c8f998aea2" origin="Generated by Gradle"/>
+         <artifact name="apkzlib-9.3.0.pom">
+            <sha512 value="4cb81ad60c1e951eccaa8832b67afdb61957edaa5a81e84356d1d03901577322421b9bc34720675a18deb36130a3b02165b076d38f90e912ea36cea69234c2e3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="9.0.0">
-         <artifact name="builder-9.0.0-javadoc.jar">
-            <sha512 value="98102f3d567ddc36f06e160fd9ba71fdf51fe24a0752ed47598ac530c6eb2072e6cc4ada132431f863eacae582192b806b4ff9bd5ac1956c1ea7e13077a68485" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder" version="9.3.0">
+         <artifact name="builder-9.3.0-javadoc.jar">
+            <sha512 value="fda72d70323012c03fe3038f34e67bd09999e4ace19eaf4c88fbc54ef0e70d32f8633a1aaa9766ddffc8503a2ed5e5bffd34ef5566411e5da58d8b93b8089abc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.0.0-sources.jar">
-            <sha512 value="7bc3a17be0f4c97d78d5ddb085b08d565019826bf44c1021077615efd501c7e0230f683c508399ad0ca0b4b783f6f9d3923d31d0b6a0b88db3841b6a9e188ce2" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.0-sources.jar">
+            <sha512 value="a8ed53359bbbee302fd8856e09d89e71cdc7950a88501582a6c4867b8f191b57f2e17cc503db7f1bc14ba43d398d12f61649f24724aada5895151b2851ee9534" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.0.0.jar">
-            <sha512 value="9735f632bc3b60b9601fee437b3f73f01fd50b61be10bc5adc9c875bbf4252d2833ba2d5427a7413efcf005a0d5633f28610d36d435caa58241a51f3b7865be0" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.0.jar">
+            <sha512 value="9980e76ffe9070ac13035222048340a05f07ebb6f0e5633974e91bd674a2dfb5d1141cccc9b9d77d67e0f7b6d42b7b0e78a6ba5ab2804d8b3776ed6a0f9fe0ee" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.0.0.module">
-            <sha512 value="348a535710166928a653c44bb09a919e0393b459a98f6d0f57b1cf34e32294210e61eb8a5185b4c67abc4340890301bf3f8b146c6306984b5a5eaeabb631593f" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.0.module">
+            <sha512 value="ff19711b1810c20e319d21d209e8706586b57d43e9be0f12b5d1769d381fa96981fca4b4b826015d795ce7857aa3630526463344bc2a9b8aa1b0c27fbdd48fe5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.0.0.pom">
-            <sha512 value="6b788bd922e956e409fdc5045901b69245e2fd49e293cf34dbb2154a685df2beb7025afa54f65956b990cfe7ce8b98b3de3e073ded2c364674d2cc0a8c498c47" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.0.pom">
+            <sha512 value="04bcb89923c07f40e3dc086c73da2ac9b395778eabb36cbe288b5b74a5efc1b2220fbf26eb0aba480b84822f89041d5574e8436ee5d281ed167f1c0d7ca778a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="9.0.0">
-         <artifact name="builder-model-9.0.0-javadoc.jar">
-            <sha512 value="30a10564ce735e2a50f8d7e1d6a604a73dd0ad57790021177c70a85a4d7cc1384cb4924f16737664615cae3e8011a2f681ebaeef888b147166330695b86812fe" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-model" version="9.3.0">
+         <artifact name="builder-model-9.3.0-javadoc.jar">
+            <sha512 value="fa699a2e5957bb1a04b14210533112d3b60eff4a6e6e5d6bad5eb47f098f417456667dec7fe8bd13f8f4a5091895eb4ee84aea1d662301228979e91873e5a7ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.0.0-sources.jar">
-            <sha512 value="06bf02b7f7b73c7918f1e882de277a5a7de9b6ded44451026e4cc3ab60a786cef216204faeee58470449d2f6e6808410f92639dfe6ba92bf836c6ae545cac23a" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.0-sources.jar">
+            <sha512 value="cc71e8a8d2e403cb90a3d881105648394257aa8a0ec0ee61dbec428e1bd4dfcaeb26523a8558cbd200dab920494d7355d1bd205a77edc8acfbf01f607007d65e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.0.0.jar">
-            <sha512 value="564ae223417c3b25b3f0c9ae543d78cce468027b7141073acfd795fed1f9b21175ab8a878abf3ece155d2ed9aeb2f31c75f970cbc85d5301d651a34691001e20" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.0.jar">
+            <sha512 value="2e56de8a6ac7ec5a382e7942b9bc4c20627848b005131269819ee07bbd3477878d7f88ba72a9799418744b2795eaace858d16f1de54ed1d7c1ddf4ec0bc38d5a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.0.0.module">
-            <sha512 value="e511a1d71e1741b4550743687331a164b324556d63e89967f4cd06e3c2d347dabe7d38df3ae10fcc77eae856f7c315aaf3fbc69991c2b18052d2d59223224cd7" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.0.module">
+            <sha512 value="150861335714c4ffdf2e75f191212d049acb5c8bcf5af74b0e0658a946be18fef5194a406fdc07cc24dc34afd0164308e8dbf325a8eca0a55977e5cc8e445509" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.0.0.pom">
-            <sha512 value="0bdce46d5a9705ca93d2edecab32933bed6d8bc3dbf684a46f3abb2a356b3682215134f08e474da512fcbf16f7d946b955811eff87717d6d6defba7ef8d51130" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.0.pom">
+            <sha512 value="7e8b94e210eb578dfde104625791cf9309266348aebb3e167786e07846e8306d90c86c006d0422fa8eac2774817378433d0ce9597d10303ff9cd04f40b6d43bc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="9.0.0">
-         <artifact name="builder-test-api-9.0.0-javadoc.jar">
-            <sha512 value="106733c9e230f9d30818dc9dc56dccee922e7e33594dccc6a2117049e2392e88f834915d5e1fe3de60e7f4863069858ef56785888701afa21204d0058d79e369" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-test-api" version="9.3.0">
+         <artifact name="builder-test-api-9.3.0-javadoc.jar">
+            <sha512 value="54336e3d9c229e98180c264e0dde2b3ba6be8d4072194db3d7e3ec0b518e30db6ce5772411d3fc73ec79bc18df0f930c0b3b92eb90b1c1a351a2d34fa474f7e9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.0.0-sources.jar">
-            <sha512 value="7e317f808291ea69e6db63170eb171a424d163afc34c3752ddea5aa314aa756cee0b4630eefd251bdd3a478df016ecb6222cca21909e34436b5fb2c0a0e3171f" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.0-sources.jar">
+            <sha512 value="56d26267138e4f53579caa948ad64a02d6dfc206832a6ff952d436d16d141f706d53978d286fb50b29a3803a9054b89038953c30aea71c24c263b01b8237c34c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.0.0.jar">
-            <sha512 value="d71493b3e77176faa4de22c733ec48fe996a1fffaddc7a6f4ede98c4ba0d76bcb28198f2f39f3ca6d2b1956900079665c6916a42619a610481d3105fee6bb43e" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.0.jar">
+            <sha512 value="72e7b7fe0795e5c9f003698c0fe03c837258c93e0029a569d25dadfdbce9aee25a7863ed5bef74dcf854ca8b9f7f895aceb85b51abaaa4659227ee20706b7866" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.0.0.module">
-            <sha512 value="fb954c5e3c109b894183babb5fd7bbda00d632e9cf1630fcaddb09cb990dd63965777e54dc7365bafa75722f40f7274add4db5f44dfc442a2c992ae3a12b9ef3" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.0.module">
+            <sha512 value="7b2d38f6a12defac74c8cd605980809d1c96ae7bdb1207de8639b61a2e08d569f2353054b1d549e521a5301a49d89fc5ab7d7b0f27315e3c45096f6d6a684800" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.0.0.pom">
-            <sha512 value="6fcae8e8252a96bcb3ee195388a40611d037601cd335d2e077f6172f15cbbf95be900b24e6f64aeec0b4a54a143984b478a6f9e44ca50c913fa9d9a835993bea" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.0.pom">
+            <sha512 value="a1ed20ae9b98dd6d44472c1d715b1aa1e333097baf2bacbcf006def59723baeede0ce846bfd8e7744a5f11b0138104f7a1d538be25dfce2eb54e023d99ad7b7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="bundletool" version="1.18.3">
@@ -1972,89 +2090,89 @@
             <sha512 value="30a1d39559319505d65dc7427c0bdeb60f8c464e761af9cfa26cc0a2a41b86c4e0479f813a98bf8313959b25b6b57e47c0a28e4bde4d5b7035d13871b3f4ee43" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="9.0.0">
-         <artifact name="gradle-9.0.0-javadoc.jar">
-            <sha512 value="2662c26a3a93d9ebb593290b44b9241c193766ecc95600de2029f461994f399449e7ce9e76546721f1e5846e869b974def626632b2bb4c6e3f4fb9e4402985da" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle" version="9.3.0">
+         <artifact name="gradle-9.3.0-javadoc.jar">
+            <sha512 value="0976aea3e5c4135b5daeb668f5c52c7a6a4bdc6dd3b57c0f32eb1c9def51a7091bdd85119c62c83ed1bce0b58101cc42e982aa0390a049b18597c8a97c2ab5da" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.0.0-sources.jar">
-            <sha512 value="85e0a15c2e3c107fc9ce1022cceb505a299382275e2ce3aa3e830f07d12838f98ad51598a5aaaa2137bdadfb4dca9981587777fffdf927d44e3f53f4ab9616ff" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.0-sources.jar">
+            <sha512 value="fc9014a759b14ae5be0f3a36c09caeaa607349b1a3433a31c02b58762fe302d979cd0f1be25b024ace1bdf363cb231f2d3b2d8eb2d309353cf6da4891d5b97cc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.0.0.jar">
-            <sha512 value="e9f8b1c7c50d7183cad47b985ed6c696ec1f96bf3863054ef702841d774fd97a79e7549b34a548278a723d5932745cc4365b44ecc3787ae850916c8e5373f70b" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.0.jar">
+            <sha512 value="437aa9b3db2c1606dbf50b817e4a763290a30a31cc93471b41d25dcf81944fd8d9b374b586112035262d6bc1677bbb954c5ee9e1cfdcbe161caddf21b2fd1781" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.0.0.module">
-            <sha512 value="41c2e1ba9160f494e344d4a0d766685b5d4db8b7e62621e2504ea1e5934268489afa7b8671e9a80194cc4265f55107c9c41e3d15197bf45f595d3461c76a3484" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.0.module">
+            <sha512 value="88cec9c87891363655c9e3e9cb52aba57cf5cbbc8c349cf156e4f527d3fe1aa56d041ad1c1eb095021f730af9af7b6f1d83117d4cede63a07e705f78d14ed9b9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.0.0.pom">
-            <sha512 value="306457c8a7a2c92cf2a27b599b2bc68ce0710acc61d1cbe4332810d31fe49421f33b430c7de7f83e09fcd8a12b0737d8c273a113d691b06b9a28c575a8a9ced3" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.0.pom">
+            <sha512 value="37a657e676775686f103ca20cf0400b6c185e04ea8860e66e2f844590de515d854b868257577276fbc817cd66b20ba708da9f984ab80e99e950e64416567d276" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="9.0.0">
-         <artifact name="gradle-api-9.0.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-api" version="9.3.0">
+         <artifact name="gradle-api-9.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.0.0-sources.jar">
-            <sha512 value="0bc0ad60997fcca730cbd83d794637b5f045d26485d273751f81f0ebcc797faf185ec99b1803adab02acbc9db36f33c620076eed07241d237c5010c61e05c9b3" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.0-sources.jar">
+            <sha512 value="a997f0b5988bd2e9d1da89eab0612924fa306ed20b8a9e0ac3cbeef778f6bf7b58015816de3b5a3aaf2d594b76f0c06dfd7f19f6f48b8796d59f8a502864018b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.0.0.jar">
-            <sha512 value="717433b3a370389a522f5e87adb8477140a19c9fdcd55b296cea2c78aade2b8aaa3467fbfac52fc6a48a14481952b1fddf1cf9ee9db39307428feb6f3c921623" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.0.jar">
+            <sha512 value="2ace87d9f1a7de72f3d0cda926fc9dcd3d479570e2add0e178ffb012dea463015b8ed2ec50558fc045773defde6c75c63a9348aed0a94a3d8df352900cd662a5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.0.0.module">
-            <sha512 value="229ce7010eccb12f301fb7c7b8fd922e56490721a46834442bc2f2cb2630339799857d18d57c3117e7e717b41defc79d2084fa4442d50611d11b2727aa71f29f" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.0.module">
+            <sha512 value="6171c434f8b5af248f74eab674d5f4c04846a0cc85de5ade75b8bcf724b1721c5ebf022009069533138e478593edb83357ceb96809c294cf3f9ac2cc0eda95d6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.0.0.pom">
-            <sha512 value="964a5f4a9c3b628614036aa8f719b2ce7845305b15ad2786861804580203b12f781abe4ed1b4709ac2a71023cffc0e49285ea8a9cf3b57f2cca61f5ee3c2dc10" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.0.pom">
+            <sha512 value="542e7d58ab51080418c0c59aaa4b1383581da25f2081cf223d10392c56effc4b8fb9d07ac415a963c79f8b0491de82c6d83214c47ed3d8ef7be11d1a07cdd08d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-common-api" version="9.0.0">
-         <artifact name="gradle-common-api-9.0.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-common-api" version="9.3.0">
+         <artifact name="gradle-common-api-9.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.0.0-sources.jar">
-            <sha512 value="d910cf7530db2096f0cb6d2eb6f8f910f2b9627e6539431a34c5ea3edc91bbf2d0c088a3b298eda812dcace1e865a23c5a2e0421410917c22892a996a1c4d6b0" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.0-sources.jar">
+            <sha512 value="3641940207f1479f9000e278cb2c1b19c1ced8cb981dff11d14f3ef9a24fde9fd07938444fc36fcbeffc86c26fe11a769832b031dbc0839dc1fade891ea26f0f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.0.0.jar">
-            <sha512 value="0bc21cbd88003ab83085fbf5cc8090ce8e3d74d7a18cca99d36e2f26c6f0deff2cf28580ff4fbaa109f5a1d9282b57798ec8b5a8977009fdf7b5492075611fbe" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.0.jar">
+            <sha512 value="dd6a44c7946544932d5474a90b32fa595862179138308ba3c90dc675d168ce5c6422bda6e7cc167090a5a94878027230ceab1391e6d7a6d887b4cef233452130" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.0.0.module">
-            <sha512 value="b7a465127b3180a60147fa955ba95fffb5908aa1b05ca11e7598d054ea1e18c6102a321c50d14877b2e40dae9485ef6c345b645c09a4518d01fbe3e9246bc220" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.0.module">
+            <sha512 value="ec8e2938a693b8db64d3117ae4cc1d0b44031a02e34bbe1ce4e9d463f158f5f58d440bf148a02b85ef7d553a4df0c9d5ef29be63daee0ea7a350b94fbea94c88" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.0.0.pom">
-            <sha512 value="6a1921735b4a8f99760250d5c6cd555a321ec02cb660378acd0af270a98740f1ea4189748ac76ee7168baed1bfc36e75cb0ea2b57d678f350d2d8f4238d9d349" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.0.pom">
+            <sha512 value="e2cc87a2edbd3ce97ff991b500beb4ceb7e7090f4be295cb8d0fc188dd14456e14719f5bc84c741f4e4907586379b4bcd95034469a206332c03afc0499ef5ee9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="9.0.0">
-         <artifact name="gradle-settings-api-9.0.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-settings-api" version="9.3.0">
+         <artifact name="gradle-settings-api-9.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.0.0-sources.jar">
-            <sha512 value="596fa6b345f3b70cf385e44ab82a2ca2fe34bb150ad018c871d857e8d0b32d6be5920a2effca8422621c01a17e9dc4840e875105ecfa3af061f78ecacd489084" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.0-sources.jar">
+            <sha512 value="dffc0369b9febee07283f2c6b3f32624a1868dac6930f3fc3bb58ce980cfd62f39815891be6ad491c92dd4d0e3b8c2c27b33bd568ec29ed46011d377c55dae03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.0.0.jar">
-            <sha512 value="2c1cd27560b7c6980d0fb952c5a49b00b4a157c6cb7805fb493786cdd31cdc98fae5db6d5a9b799e9167517a418b40c443e0bbe10d0684becf6b0f5473023207" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.0.jar">
+            <sha512 value="b0ad64bd1f97d0e5c3af6ea5177f17335026f4dd899fdb707d1682a3517897f66e91786e32a9f4e47907a671cb42ab09e9764afc35d29bc979178674303f42ac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.0.0.module">
-            <sha512 value="6c8d59cab30c7e7bbc0653f7bba9e6931eb28f9e1320a9e9b524fa1ce7d126f86c13483a473ef0cdf366a274f8ebd69253eaaf91c92f9b4a03c6d72b88514e24" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.0.module">
+            <sha512 value="b29254708e9a87f36b9bd8a91f5dbbab0d132767b4847b46aff0ae1de44748796ac6be2056f0c9a075d1481439948ae54ce6a8ca944711906965f90084128040" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.0.0.pom">
-            <sha512 value="cfa0bab53bd33a30f2aa589922dc7607b4b615541177cf9e5bffe31cda0b5e14bd660e19c174ceee4dde7833ed870b782b43144985303baeee20300fe085ef40" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.0.pom">
+            <sha512 value="da4ecb652c03314a74dd0aa97cd73a83758ebf71dde2b46cca199349b898a18be51aec008ec9c857d9dd78a4aab32b82647cc196a4d0e3129ddd57a4529b4268" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="32.0.0">
-         <artifact name="manifest-merger-32.0.0-javadoc.jar">
-            <sha512 value="488a6c28a9bfbfb2ba9bf9d0b45d1103c7bc0ea1fea0f03a401296c760c2207a3628e6e614b13efdbbe956212b022ad103b165cfbaf4c5c484f07bf687a387e6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="manifest-merger" version="32.3.0">
+         <artifact name="manifest-merger-32.3.0-javadoc.jar">
+            <sha512 value="5a3d9ae02ca2c2f79d6d8fde43330e37e6f91c5a77332d76926644c39229068628a2f13d3e51a12d9faf7cd3dc8f1d5be783f01aff3ee5b710da1cae71b1022f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.0.0-sources.jar">
-            <sha512 value="d1d3932e1c2abcdff45c90a065ae7df1510062d3a365659f0fab84faff46f181b35b7086f9b327f1bd41bcb3e0cc5340ebd444335fd508e974a0586c880dc5c3" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.0-sources.jar">
+            <sha512 value="d7406c7b07c9abd37091ce83f46b0e17f177241a49d1ca2f55c63730e6e19c0ab43b1e35da210b1f6282ff50bf1cc1fa3d3812a064d30a91657bad4d054a5617" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.0.0.jar">
-            <sha512 value="924f0fbef8c43433e56dc261cdbb960fd2e609d8fb62299205fd9d752ae2b4f35062f860049643934012827382e8dd9c9b96fe8a3eecaa7db9f0f593576143a5" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.0.jar">
+            <sha512 value="14976ab8dbec640590cd5b06ef606c31c6ed224ece48ef361d33e21c20fa1df06aa30d9a2d072597ded3a4e4443ea1c972f9b43a0a90c47cba2193f540a88cda" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.0.0.module">
-            <sha512 value="af405b4c417f16fc26b08b529b6ba25484340281dd1c116c8ef36c9433eb29fab425022421bd470e3fae50d7d541ded9374a092cd737f291fc6959010ccb3019" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.0.module">
+            <sha512 value="4e2fab2c1ea964c65164f6f473509cbeca88c3bc2004c4e48d6fc2f13d5823b6347e4b9516cc32ff10aa13f145e137e45dcd9b82325a5b170e9a3d122015083b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.0.0.pom">
-            <sha512 value="ad6a50486f0a7b3b4113ce6234198ef1397fbe8f183a6bd4cfeccc2c1e7dacbef68fd926331e9c76678b44a1d140197a1315eb468252af50115f1a387761a0b3" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.0.pom">
+            <sha512 value="027948a14f64323303b19093d3084215abe8db571c5a7e5629e1b199eab1af76dcb2b7af33d487f3352bee5f2eb1700e3b248a4b1d191408cfbad9d4c84a34c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build.jetifier" name="jetifier-core" version="1.0.0-beta10">
@@ -2085,411 +2203,411 @@
             <sha512 value="7969cb4ccc5c767cb17af91911d6169a43017b2f352ee4bf02de25abcd882a4617386916d2218dae52769e02a38704616ace9f1f5b34fa5ff6f48142f9fa00ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="32.0.0">
-         <artifact name="ddmlib-32.0.0-sources.jar">
-            <sha512 value="0e503666f57e977642bb0d9fd2c52454127aaecc4e8eae7dc75c4d1ffc3fbb2fa75a6d3eb13d195ffda50f2e7000ae22d315da767f281501e3c0eef04ff69dcf" origin="Generated by Gradle"/>
+      <component group="com.android.tools.ddms" name="ddmlib" version="32.3.0">
+         <artifact name="ddmlib-32.3.0-sources.jar">
+            <sha512 value="7596aeb2d184a55d209c9eddbc8311e78426e78cd4e25cb2624c1d136e9d34f983157f9ce04618de1a89ce7925d547b1acc5b1a13e2f650d935ce8fe72e5e9aa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ddmlib-32.0.0.jar">
-            <sha512 value="586233372f439723db73486a5f740b158b07958f9636203cb390502304d7807bea139c05bdf715853e93bb5dc9b9c0de10f8d38b96517dfb256ae5b95df51685" origin="Generated by Gradle"/>
+         <artifact name="ddmlib-32.3.0.jar">
+            <sha512 value="d7e36fb5beddbc6be39dfbe7d8dcd672c6ecbfde25d0273306aed8289bc49603220b49060476b877a9dab612f96e97a775691a9d4ff62538706f8e64d6aa9876" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ddmlib-32.0.0.pom">
-            <sha512 value="a2870f5d3a84cdca085b351c66a111b5e633d32e877917197c7b03ca50d309b50468e3b893be7a269d6cf6844cf42f27a85883961afd12aeee35ae2701913c90" origin="Generated by Gradle"/>
+         <artifact name="ddmlib-32.3.0.pom">
+            <sha512 value="797d82ee671edb34ad1ca280da1d89aba08e7a7b465e109b5e4b7fc7bd0ed8e4ef9ad5c720c926d2b00b185eabc8f30c9e2c968787ca2f149da2a4d0bd2e77ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.emulator" name="proto" version="32.0.0">
-         <artifact name="proto-32.0.0-sources.jar">
-            <sha512 value="143c4ff8e07faf7ca80259e1ab3708af3ab4a86b431d6c6be9f3b78cfe9f5033c24186af54635ddd5a9ea8a6e373fe225170f8fde045069b007c445aeedb119a" origin="Generated by Gradle"/>
+      <component group="com.android.tools.emulator" name="proto" version="32.3.0">
+         <artifact name="proto-32.3.0-sources.jar">
+            <sha512 value="10365c080ba5aa35b5b6aee5fe3f759550372b51d6a1e9efbf8fcb5a91e2290f3f72b427ef4936f65dc5285cc0adb728fa4284e2f3fb1f183a5862381e1e5267" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="proto-32.0.0.jar">
-            <sha512 value="a3ca67edc90b37336bb80e75e35588023790844f6162e2976181f05715061de319f991bc4b4bb99dfa83f3c8c613fc66b814b824c7766939ff56c496061455a0" origin="Generated by Gradle"/>
+         <artifact name="proto-32.3.0.jar">
+            <sha512 value="5a34fed7ecc4ad1dd7bc3b40b6bfed3ba161d56c983be6857205d405914648bd1ee165bd11b5a767d62b9c5b726289d9e91a0b302a5f0fd5ca02de7497784ff8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="proto-32.0.0.pom">
-            <sha512 value="1858458a33a8d44a574288b15325ea19e78c17df586029b3a5ddfc0c5bfaa7bfc4f76eadd13a52c3f09a1af2342db0249c957650221806ba4bd737be9fe02d95" origin="Generated by Gradle"/>
+         <artifact name="proto-32.3.0.pom">
+            <sha512 value="c343d21f58872870ec7f7f7172d20e61405a9cdd72148dc12ef16648d9ce62ade19c32c6bec100553265ba986f647786fef277d554f45b785290e48a699b3036" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="32.0.0">
-         <artifact name="intellij-core-32.0.0-sources.jar">
-            <sha512 value="68f834f88d2726c0178fb4a779d27d2e031f78a8f8b4c39a37345b1f2e86005741941b0877c96548af688e15166951e34c67307742553bd5fd6cf605dd039a66" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="32.3.0">
+         <artifact name="intellij-core-32.3.0-sources.jar">
+            <sha512 value="3743647a2e8eb1c641833ae2e25afc90580a1c9e510d683aa6c3330b66ce4b5fb9fd2fffb579fec9378e7bf6f883a99fd8ca2da6ec93c4ea28d651971967bbda" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="intellij-core-32.0.0.jar">
-            <sha512 value="5d36c2ca9f32c5484ae04698eaf37b4e778b1aede7a4f3718b32c0c8f4bc7e8b49b960be1ffd639e9f6b9814b52ae87552f45d3ba1a904056d02cbe604578cfa" origin="Generated by Gradle"/>
+         <artifact name="intellij-core-32.3.0.jar">
+            <sha512 value="c9653cfe455276ed4064e1882ecff7d5c8edd765e6811fb1dba14243118c10f62aca728c415cfbed86515f85c9a7c532dd5bae14f20336bed82915cb514d9f0c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="intellij-core-32.0.0.pom">
-            <sha512 value="ee90c8f3dfee9e20d5eb58c12f2aab6a09d625de9dde1b2230564256be954f18bf843c867d923ebf70dc03e6891c77c1561b0470afae7c2da1582ac14308b18a" origin="Generated by Gradle"/>
+         <artifact name="intellij-core-32.3.0.pom">
+            <sha512 value="ff7b7de3c8b8549b1dad08b458581f7623dc03d4716cb51f4de1005a4ac8572d61279b5746dce92254361542d8e7a096a21130060f087f01ae37fabaed5e1c93" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="32.0.0">
-         <artifact name="kotlin-compiler-32.0.0-sources.jar">
-            <sha512 value="b059c140dc44e507b70c8aefbc3aea290ed977a5ddbef380728deb75b0c67a912b14bd00dcef9d032799fef403170bdefa4cde0a3f8838aef97cba18bce3a9ca" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="32.3.0">
+         <artifact name="kotlin-compiler-32.3.0-sources.jar">
+            <sha512 value="e5b6bf208616c0dc817efb5cfe3fc97e0384be518a0143f855a3e38b2ab71fefa7ea28978e6d90dfa12ad79cfa42716088513316b24a72721d1dd153a86663d2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-32.0.0.jar">
-            <sha512 value="5e19fcdbe2ff20d4e2b16a603fa5a37d70c4f456f60b35bab1573d00db41d523654366639de26bd434c9e91ae74d8d961a581e12b224e7ed219550c4041e5e42" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-32.3.0.jar">
+            <sha512 value="cbb781ef7412936cebcf8079b08ea392b95bf552d6190c3f75b4f46f564b19a5ebadc05da7424edd29e56503952fe46216a37a31b488ecac8d0de5fcae245499" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-32.0.0.pom">
-            <sha512 value="8c44f176d315b5b623c7c560df3d0ead30b78bfdded90fe78d9a038c59bc4077de66abf57d5cc87bfe48aab3ea1b3f8e2fd8c01eea09be4aba657124036d3555" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-32.3.0.pom">
+            <sha512 value="bdae6bdf037e69f35f2f298364eaead78fc9de6828eab9e5c68dcc7e2b34b9f57745bc3609b3b31c95ea0e60895aab39f3ba54eabac0068da548de26362ad414" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="32.0.0">
-         <artifact name="uast-32.0.0-sources.jar">
-            <sha512 value="7de1c3bcbfc4dddf1ba3aee3a90be2109d845b6f2694594586a6f77a8c45225ef41e0177754b54f5a084388f88894cbba7cb5f8e864e61ad3b679b4042889a1c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="32.3.0">
+         <artifact name="uast-32.3.0-sources.jar">
+            <sha512 value="b1a8b3b25f6367e1ee299a9f91c2b286aebd09d9ac2d627a2ff3e36ad27e037891d1e6b8e3a3cb5584951f0dc5a74c5d80dc47f5c387f9a07ee7b6c08ad3cc03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uast-32.0.0.jar">
-            <sha512 value="4b1bf03e58a6d3054f3cb9bfbc9d928dc1e39a30d10b3e3bd68353fbdab05306644735ceb0353800f7e184d093094096f7fc38f48d8bd16a405dd44bb87c4ed8" origin="Generated by Gradle"/>
+         <artifact name="uast-32.3.0.jar">
+            <sha512 value="6e1f6c6b3db2af2ebe17500e84d3393826240a321f301734c1c7f8d07070f2245a22fee69d9de6f04d45f780abd63fdd5b41838e5617e33b8a6b2a5ec3fda3f6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uast-32.0.0.pom">
-            <sha512 value="d1687331c755c81bac32c75c55e6659e5c2a25ef11b730c3d5bf49e5d4521b24e33335f884590c99c34b145dcf87a88067094462251d31aa95075bf36ff09d13" origin="Generated by Gradle"/>
+         <artifact name="uast-32.3.0.pom">
+            <sha512 value="884df785dd977d9807972fb372d8a7e0941b7229762180229c869ea49935bf8e6a579701ed679caf3e51304c881b77e51ff0f6e2214868381162cc38738535ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="32.0.0">
-         <artifact name="layoutlib-api-32.0.0-sources.jar">
-            <sha512 value="dcf9af5028ac1a1c20dd78c481298b3980713a11fd14f1610bc723d9b31d178a823895e49bc936645bbe0893da0504916799e9b2bf333d944a6d608a3546fcaf" origin="Generated by Gradle"/>
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="32.3.0">
+         <artifact name="layoutlib-api-32.3.0-sources.jar">
+            <sha512 value="492ab14b4793c13ba2fd2033a7f5942b4c48493a6952eb141c2823aee445ae328d03f6fc428b0a1a0d867434ec624c8d14b21ab3b8e0416020f5c295ef112f11" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="layoutlib-api-32.0.0.jar">
-            <sha512 value="945b3cca6f2d113387b97103717a58243b593247bc5dc581841bcfac4034f402bb547d8a61ee18707b978b75f336d2205ecbb2dd65e06ceafd549e6bab808eca" origin="Generated by Gradle"/>
+         <artifact name="layoutlib-api-32.3.0.jar">
+            <sha512 value="1e6cc95d9ce6fd3c9f32ad499d5bcfeb1f61ce4319358a582f5dd9e9a2ee6e2bf8f4bafb6de4a7319e58f3ce51c9e5a9c1cc80ce70f84d0b390af947ee505c39" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="layoutlib-api-32.0.0.pom">
-            <sha512 value="2c0612443e585dd41d75f40378af32b00006f0cbd3ccd5d86f63133a74650ce4f4860d1ed9ccda6120e16d8fcd61c74f8516502c9cd33476a6345876cd3fefd8" origin="Generated by Gradle"/>
+         <artifact name="layoutlib-api-32.3.0.pom">
+            <sha512 value="292a726fde1a8e4f6a4f50a71e13bfc4f8bcad922c269b9aaece56e8fa58d93021e0b7f086ec4e9bdf3b10a09cf938b502fb3c41e3faac012bbe21f5c7513748" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="32.0.0">
-         <artifact name="lint-32.0.0-sources.jar">
-            <sha512 value="1d80a03448260fe5abac8aefdc78d4e2396facb77fba0ed310b928786b68cd2dc7f5f51927833e7d45a992c127c3f94fb5dbe18d0eee91b734fa81c7dadca1ee" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint" version="32.3.0">
+         <artifact name="lint-32.3.0-sources.jar">
+            <sha512 value="fa073bbd3908b35ab448fc192cc44c81f7b2c74242f1e5204aaed232a28fb79ded8f2d9c55856cb8318885c67e6786155a58425c809b810bb9c5f59aa3e537ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-32.0.0.jar">
-            <sha512 value="01c319cd0e9e3c006f5debbc8f0f5abc1898edc11f0c10257970155a7c11da40b41106af61b6bb7ff6ad11c9c31253f4b7662c87674e05c48227c29d5642f313" origin="Generated by Gradle"/>
+         <artifact name="lint-32.3.0.jar">
+            <sha512 value="7ca98f820299ae4746856b440bd51753c15b8c2edccbd8ede47456a55e7233f54eaeb5ed5be70ceab588a9c181a35e92b82fd5383179273431e4ec1b61016cc3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-32.0.0.pom">
-            <sha512 value="3158188566b3f8366801cddc8abdeaf0c729eeef58b13ba638017719c889dae3ac2195ff654519e5ef16cb0103d879176d4e29779ce9acaddf649685920e2a83" origin="Generated by Gradle"/>
+         <artifact name="lint-32.3.0.pom">
+            <sha512 value="ddb5e8dd4eb754d35d3a98d6a3252228de31975dd11d50f05916414e2c98a832bb58dcbfbff980436a8e3bda64685ffb584337fbdf11d30dbceaf3ec4611ccdb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="32.0.0">
-         <artifact name="lint-api-32.0.0-sources.jar">
-            <sha512 value="baef39dd0831c7e6a30573064a8ac5057b9a2c2df0efd2e4167bf4b43c7a17283f9794dc68474fe5eeefb192c93acf96a8f242bbcc8142d52b16fbe4ba1a2414" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-api" version="32.3.0">
+         <artifact name="lint-api-32.3.0-sources.jar">
+            <sha512 value="f7dd26e03f12d23819316ddedb95f3e281833f4d5368f3a990a3b01bbe60cc21db7413e773a896fd72c933f09763c5ae326865f59c1b868c3755b1c2985c1cd4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-api-32.0.0.jar">
-            <sha512 value="ed5652a6d41fc3e811aac3534afd3b8e3ef1a940442afac6ebeb33a4691c342c4e96ecfa528af40f70cc97a74fa77e866f86717973fc15f0ae115e0fa3b12a0a" origin="Generated by Gradle"/>
+         <artifact name="lint-api-32.3.0.jar">
+            <sha512 value="19c6f951989d6ba01a49ab5325a4b424e332a5dd4e4067f829b292fe252c2837cd226931296a1a9608cc6e5b6b556d0cb2c9cf6d4ba4f4889232e57a23ee184c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-api-32.0.0.pom">
-            <sha512 value="b9eb72ff85ed48ac2b1ea398b2bde4cd05bd2dae8ca1fab136eb0d6c6d38ece16423d7b6fb0e140992ea43cdbbc27005d79a66df327ff07a804cf2f46e72182a" origin="Generated by Gradle"/>
+         <artifact name="lint-api-32.3.0.pom">
+            <sha512 value="7c80d13de7854ad174d4abae047d86210e4c18cb28eebe80c57a46bc57213cef893cbeb0243c9c87849c75223f17e0581581c4f526843fadd0316a6506c47101" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="32.0.0">
-         <artifact name="lint-checks-32.0.0-sources.jar">
-            <sha512 value="775c57752fdd4a975f336e3e33b2ad475155e14bc0feddd7bee0afeefd678a3843f5a7179c40a9d56c93782b86c37d12d58863a42c2c6f857c6c8e973f9e0f62" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-checks" version="32.3.0">
+         <artifact name="lint-checks-32.3.0-sources.jar">
+            <sha512 value="9dd0ee9826e797802ddbe8bb5d0d595d6e3d7bbc8dfbc51d2598a6168a7bd80547e0eb12e435a1b9b49fcfeb67c5f12fb447edd90ab9e310b3d1f8c3e4651949" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-checks-32.0.0.jar">
-            <sha512 value="c91b2b69cc304515b72775d4464562e80cae635ae9be49198906c37a59f1d0ff9a3226b9509fd3c5d17cc6793f54f3fb483cc49dc8521a70c7e1db064ff7dfd3" origin="Generated by Gradle"/>
+         <artifact name="lint-checks-32.3.0.jar">
+            <sha512 value="f6af1c0e8a9e69d7b3fff1591fef713550f39aab7670725dd2e4423afd3f453b5d88b2b0dcc70239f18f1265e9e3c96beba92c696fe4ea543b161b0f965aae8e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-checks-32.0.0.pom">
-            <sha512 value="556a2207122b1f62b250cf4b353a95aa64ff8860222e4342d74eca40c617a85a53bd3818a248bdb05834035878971bcc0599a3f8cd2c3548e5558277d9cb4440" origin="Generated by Gradle"/>
+         <artifact name="lint-checks-32.3.0.pom">
+            <sha512 value="808490b96209ebab9c3cfe26be16eb176c3effaabbbdd0430d4475cc4499450cfbe94525e35c036f7d23e98c04cff780458b0b3c3f2a64d196121881b639cfbe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="32.0.0">
-         <artifact name="lint-gradle-32.0.0-sources.jar">
-            <sha512 value="3cae032c73bc307553f84a0fe4ce3ed39290b887b9dd6309183427323536cfb1096002438551353fb53ec41ac27ac5b40dbd85ed1f54e5146b9e96b884ac323b" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-gradle" version="32.3.0">
+         <artifact name="lint-gradle-32.3.0-sources.jar">
+            <sha512 value="9823dff56bb54b4bea6e886e49a84d24ed85e057962eb1e1c12aae522c674f3352d3699e783610be6601eda634ce73888f0f4eb0ef950968fd58a88a984d3331" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-gradle-32.0.0.jar">
-            <sha512 value="648649f48be1f50b0ab8adf6ee9324ff858bbd0903c9914ec2c1115c1af8452209de5c3bc57a46dcb44bca5cc2ee93c6074de7f7fbfc85a751a1c8832d6e763e" origin="Generated by Gradle"/>
+         <artifact name="lint-gradle-32.3.0.jar">
+            <sha512 value="b72cb5501190c57b8d2ae0005e11df0556eaac26ce9d5f89fd5308fb12e912a629283509f20854652d98bfc53fe12f6f3eeb96f97726d1caa5097b6436d75a14" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-gradle-32.0.0.pom">
-            <sha512 value="757602b5c272a5b12942c5cc879bff81cf1535c5fcada9d7d59e3665f0f3ccb618ee3e54b8e76397cd7d061b3d2fb189a32da319f8b7480dd16e873799d86378" origin="Generated by Gradle"/>
+         <artifact name="lint-gradle-32.3.0.pom">
+            <sha512 value="6ebf504c73f83dff99124e6011bfa6ee081957916b4a439cedd5bf7a5c86c306be6c49f0213d22b7fcd41ca09dc48d57d41dc4171fc33e486ca4e8854b19793f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="32.0.0">
-         <artifact name="lint-model-32.0.0-sources.jar">
-            <sha512 value="939b1c7b6bfb364961062deac3b36d8372e39b8b790c7fe952ae734b17872c31357647b51da3aaf848c9e0770214bc12b04844c1e7182bf90a5ae271e93d8c4c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-model" version="32.3.0">
+         <artifact name="lint-model-32.3.0-sources.jar">
+            <sha512 value="3b25168d263557c29bed401a84ad85c0edf71450c1cbc61dda42b7da8cd5097689a8ea9e4aa6c0ae68a9f10e04e289a0b243b2a53f822413b06e00bc20504343" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-model-32.0.0.jar">
-            <sha512 value="037fd7ef8a52774f1cc544b53a1ab23b0081f28a121139238816440a59fb1b3aa375627f814adc04572126ac9d7a92768f85a3b6a30a588926fb7a13189841e0" origin="Generated by Gradle"/>
+         <artifact name="lint-model-32.3.0.jar">
+            <sha512 value="7219de486c75ec6a57b7b338c3f96911e8521312f5292b34624e8db05c82b0558be1a10a39bf85774078b2ae10787ed63deb63c271570369529dd562a68fb230" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-model-32.0.0.pom">
-            <sha512 value="fdde55585d550d86b35e95335975b6235f987b056323fa0fc79d97b60ad5bb1ae20d8120f49413d37fa29da0299520cc8e9455133ffe2ddc5a2ca674d7971cc7" origin="Generated by Gradle"/>
+         <artifact name="lint-model-32.3.0.pom">
+            <sha512 value="45fe817dd9aff5a9a84ca550ec1a0e9809ab13a484183fa8d144f4a584cdc244642058cf0641a5981ebeb9a55072e37eac1927405f6a334413674ebecf06c160" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="32.0.0">
-         <artifact name="lint-typedef-remover-32.0.0-sources.jar">
-            <sha512 value="194088bed1b2899ef5aabafd0a4b018f15d21b566b03a6d123b3b314c50df0fbbe2beefdc82c432cb00a7db5219f75dfb3968ee2d3ac19fafc98b4e2bc8937ca" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="32.3.0">
+         <artifact name="lint-typedef-remover-32.3.0-sources.jar">
+            <sha512 value="5a924443347672f75e09b1f9658a89279c22577ca25a3ed2d94983865d6820463b80718f289a346650094edead02bc93e22d8585bc8534450004d788da630088" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-typedef-remover-32.0.0.jar">
-            <sha512 value="48529436c42269656e44240577b0b9e09ec8d4608f1ca7dad8f6fd8fc9e5fe41080a8447e8e8d81ee1a1edc7da9c0726e57edef79841a9785d9b729310fbb9be" origin="Generated by Gradle"/>
+         <artifact name="lint-typedef-remover-32.3.0.jar">
+            <sha512 value="64bff95763f13bd351038f570b5f6e1905386a0fcb63901f6c887b13a129f250387c2c7c325067e1b8b05f3ea569ce1e0cc8009a03b90e9a680228a10d54d866" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-typedef-remover-32.0.0.pom">
-            <sha512 value="a3217e520320ee952bde16749816a7473fb5a5909323035a4137baa8bba6e2ad30ad9b2e98bfad98b28cde9ba3b079215eb929862d37bb123e564ce48cfaabad" origin="Generated by Gradle"/>
+         <artifact name="lint-typedef-remover-32.3.0.pom">
+            <sha512 value="74d730dbc59979675ba57ca74f8b36e172b16dae19fc663d9e2c83bc6ae1544950c361d5280e0b2bf0e135742b29df5e2cbf0a5d9e5b416e41dc05dad8afee81" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="32.0.0">
-         <artifact name="android-device-provider-ddmlib-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="32.3.0">
+         <artifact name="android-device-provider-ddmlib-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.0.0-sources.jar">
-            <sha512 value="121d7ae4258137722f6d4181bae609f0c45e9680c425033762c9562da861ac2b2fb83ff8ebd979de1ae00acf94eba680c81ab7d65ff66b6737cad00f4dda5923" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.0-sources.jar">
+            <sha512 value="84c6bce169be168c2c8ad2e2ea67410bac6fd60392d02e788915e8ff5bd87cb1e5ea01529f818103179ab091bee214d418ac952d6c7f5ca0c077b250da4b9a6d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.0.0.jar">
-            <sha512 value="bd17def6f83d234049aca29b8cc6d6a670e0750ce5452755fa0e724bb856988b0fd44a873465aa29b812e2413b02b69e034b592a3f38e7074e4f046c05460fc7" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.0.jar">
+            <sha512 value="1ceef9c029f885b500edbc2431e4a7c8dd52d49b1165b8ea67f3b8035664b14afcd0b2c94d67dedda5574f790c66089a583149b74bac6018ca0cb35c7450e8c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.0.0.module">
-            <sha512 value="bed73b671e07b8be343124657b0ad6d73eaba761a7508368ef77129874cdd9732e9bfd21889e16cb7699918d49914c3ee08368b689a2de3619327c5079e31a88" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.0.module">
+            <sha512 value="5ee9e629100783e855815897791227ba272c3ffb21adcede1fe8f82b0e096a8f1cd7d1c6959cdc5a31810141f377f301dba65e972592937ac4d38f296af48751" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.0.0.pom">
-            <sha512 value="18fc6e53d2421d6853667bad6d6a048d9b331e329dd929ec16859f84ed5f15f18ae223537f42c2d243e73f846ecb4567bde22b196c497b42e571fc570211736c" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.0.pom">
+            <sha512 value="34eeac212acf611cb84c9ffa645f0b62e95711453915ba626fcad0ff33682dc203787b86c891950f3fcd28fc4faf2194e4af0ba011c192e824c3b505a1cc821c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="32.0.0">
-         <artifact name="android-device-provider-ddmlib-proto-32.0.0-sources.jar">
-            <sha512 value="ac7c0a02424e7138de295c53e2ce43ecc463c48577f90f50e992ceb685ce8680ee4c1245dea246f8447fda58abf5b0bf5a6b1475d43421ff85558e1db0137790" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="32.3.0">
+         <artifact name="android-device-provider-ddmlib-proto-32.3.0-sources.jar">
+            <sha512 value="3dd7098062303ee1064682fd7586156abaea170ec197dc0b9b609a5a06312459a4f3219562520160c250c6bc4a0eec4b7b7fb891cc4382df6c731fdb6595760e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-proto-32.0.0.jar">
-            <sha512 value="1ccf5d72b1137a2e1fd76363d5dff75821fab87bb83db1ce19e8052a453aa0594666e3ae858d0c720a22483ee8b2f0971dba45e22f7907de22468a35997090a6" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-proto-32.3.0.jar">
+            <sha512 value="32b7b4a0cc52c10643bcd4f6ca718bc60b3b300ad255a691f71f28d3f52054deb3808eaa4dd8366fd113ec1252344b5a07ec8ce59793b7a6101daffceb0e26e5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-proto-32.0.0.pom">
-            <sha512 value="71f77ddfee09b8b6b23c52926a9230774eeeeb926d5f1d4153785cb3bc8aa20e9a6a9836751bda12a2e2bdfeba59145157cab43d03bb260599b335da13e066fa" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-proto-32.3.0.pom">
+            <sha512 value="cf02094df5f671e4691f0db95185b0ac34fa30f0d7f7f3b898a4251e49ed69cb09c2a9066cf47fb8db069ae8bd14a2970c410d9bd9a3127a6248058d328798e8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="32.0.0">
-         <artifact name="android-test-plugin-host-additional-test-output-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="32.3.0">
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.0.0-sources.jar">
-            <sha512 value="d8d4d24ae5a1fb462b03f72f3ba37e0e8149360d65fe016bee12cd8fde6ec75a95eb4b9a3630cf6274b2e209c048bc9a69e93ee027764ad2e1f87e5042cc92c1" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.0-sources.jar">
+            <sha512 value="1536bf14e99ce5a425dacb72ad937981c2e7194f33471633e4842f20fcb4878a62bb744a94269def50f13269253bd228cc8653e9eacf982b5d3ac04d34feb0d3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.0.0.jar">
-            <sha512 value="abd906645c1d6282d2e1e2e5b411cc5fc3d0a8575a63f55425161bd1d371f23ff075cf36288e74fd09b049c6ca6b279907b9f911bdc5891cb3bc1d66fd9aab29" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.jar">
+            <sha512 value="4f8491f061bb391aa8f89331bdb1de03ca7081d86887d65ba724dde2af839eaf50b0f61828ce3f35962f39d29e1953d1f52f6d99f4713575fbc9849e01dc4af8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.0.0.module">
-            <sha512 value="714e6e78e90b3e37666e4fc62d37a033e51bb8b1b3c13a019cec5e772c3d7cbb07bce7238bcfbc9ab6203aef6bb774525422de3a95e66bad34ec014288ea6925" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.module">
+            <sha512 value="e1cbd5410e2cb75a8e8a0ec6fdb7e66150e5b78d53b1fdae67b749a20b741c0f69a1468542e39ae5349a961185579921632e3abe3abf5c64e7a1f2a6e38ca5ad" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.0.0.pom">
-            <sha512 value="1a355b7bc88d6620d88599c1ae72a9a09ca918cc48cee0dd4d757229e898fc714a2ac9b142f978c09a989155e390df2a9eccb5d373bb8ec12eea8231d1d600e7" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.pom">
+            <sha512 value="a4b6b04214687546d4972fedf892ae8b1d721cb5bab026f8f161f7421c2370ffb768190c0ac86a4fe545d7f833bd9284e2a40797a872c0e4837ca20ab308f02b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.0.0-sources.jar">
-            <sha512 value="0de3d37af7c2bd210dbf2e00d18b0236296afcc52ade83d887094ae47338a32d7c19f1b6592eed55c033323beaefe2289bb1a5c1d7fc1ab08e29ef1d76693634" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0-sources.jar">
+            <sha512 value="e956e293a8664fbc5ae7c4192ae3a04532c8caa944f7aca91e79fcdf536a2d9e5deb534e70f5c922025f5ca898664af5aa0a47cd9275a227fb2c95aa7ea7f42e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.0.0.jar">
-            <sha512 value="27057dd8cf1af00835f478ed518d3ce0ec1e94080879464996bf2e718ad640177c68a6ab542f5df6b3c8ef86de4e3d3cc7a150b090f06516758c20f9e564177b" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0.jar">
+            <sha512 value="a54f9ffa72a2e97f432fae8493cebe8f7a954da663cc4b2c150a6f9cb90c80b6220f77b45998d636a651791321cf9d72a1c798197896a9ab48b606145505d8de" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.0.0.pom">
-            <sha512 value="b6c0597e602289402ecc46826458dd154ffb419d1e14a2c24f86b71fe554cb1ec9b5c13a37e3f529c0699efda72f54992f37a1c781a8227f7160ce68e34f75eb" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0.pom">
+            <sha512 value="3795e450ea67162f6b7601be0e88316d53e3b1ec894c72a4d3bee8d98b6773842316cba68527a8067c55c597d60c29b16b2db0accdeaf41e0006f04a4ef7ffe3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="32.0.0">
-         <artifact name="android-test-plugin-host-apk-installer-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="32.3.0">
+         <artifact name="android-test-plugin-host-apk-installer-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.0.0-sources.jar">
-            <sha512 value="73b28bdac370f3f4b3b95146a933d2c69c506dcb10b6cc56258f950cc3a5b26b099e53635f3139dfaecd95864389a9f16898c3d2cbeddd2d384e81928f0ba31e" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.0-sources.jar">
+            <sha512 value="c055671fe38ac9fabf90852a09e55fa468364bbd717d5552d39deb00ff61c8c563eed0d5916dde6d809e435ada22e8995b9bb4212ac2404da8200103ee7b60b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.0.0.jar">
-            <sha512 value="e08e7646bf905bd1ef46d8370d91a830b1815e1f0ce0e9da9b824f6e766ad970519bb4a8b1647947653323518a2174ae15b181ef2254014eaabf5e38002c5172" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.0.jar">
+            <sha512 value="35a021c1b083f99139529cd10e39799db46de5e60f0fcb0adce2bb8def5e362d946ff1533de32cffdb5825cfde108b826b5ef3a638b3dd07954de741241c68fe" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.0.0.module">
-            <sha512 value="21a4abdbb5260117f3de5faa08d1149c6c7f3ddb3f7e2f97bce9f37ff6e60d00c92ea2565cbff970c76a4c2b49c3a66d9124be6a5db39c50de7334b6abdb4226" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.0.module">
+            <sha512 value="207f285ffcf2d255b72ff651cff1a6ccd6eb629ea5dd19115305d7f7efadc591175077ba2b4bc353938f4137d6b6fc65bfb9d0c78fc2f04e79da0ef1958f0e80" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.0.0.pom">
-            <sha512 value="67b8534612c1d14a3c369722769d1c12ed4161bba09bde2450112bbf9a25cfac75411ed4e7b3c1f84e086509f801fa68db5b64e63a6e58f0c9c39b1a655e5373" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.0.pom">
+            <sha512 value="79a01efe329ece969d2b74e01d4e21218fc273a1e7f38b89ae5344544698b94dc010201dff3ec0f0c694ef1cd25df4a6e50e16c995d69a4f755b0b32d3189b28" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.0.0-sources.jar">
-            <sha512 value="0872b01f525591e85fbf5c50bbca493f94f801991c1b0661ac990a5b8dd05f1a725ec5aba622f96cdd709ff376f70c43fef2ace8716d2c557110f4f3ba6ba6ec" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0-sources.jar">
+            <sha512 value="4afe1468a02266b513aa516b94f1f79ce1d119b6e53fb04b33c545c8b82a67ea6cb5fea41581af78dac021f6cf12490d7f7c32b2c7548747e7638496fab4dc24" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.0.0.jar">
-            <sha512 value="f35fd33863255e76c59a205d2b2ca418026ea1a9627b9879647a3648ff00ad51e03c10cafd484da0446f169ff31f280ab544c45ced308d26d3b95ff34b53c7fc" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0.jar">
+            <sha512 value="2ce0439e54134812713fe08091b4c93ee858a9ac9344f1d67fbd7545079d8dcf11727382123a3e738c184b1237afed3496622e18b9fcbfe5cc6244b5c40392fb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.0.0.pom">
-            <sha512 value="d721ff8937489a49d6162de1b50538edc2b9afa3a606e87f03fa95ea7c9a5f2a1d3ea05f0b0a7e885643838c56a2be7b2328779b573b7cba73439477f0a2bad1" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0.pom">
+            <sha512 value="1d863b84e34bbf4d1bc4a37180cb1404fdbe5b523c8de7d3851bf9b2af837cf2c1dc1971143325a68a9d9f79f9cbd688d4af972f8e740fdd9658bd58426c0566" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="32.0.0">
-         <artifact name="android-test-plugin-host-coverage-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="32.3.0">
+         <artifact name="android-test-plugin-host-coverage-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.0.0-sources.jar">
-            <sha512 value="3e94579e258e6d652311976af812852a338ad82f43d889ba5f97a27072a4541b3d02b4ed710595a5465d713dc5a5ec049de191a06c5733dbcbca833804f22ad5" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.0-sources.jar">
+            <sha512 value="a94fc1ff80c3d9b2913b4e937e423c604d4365f64a6733e52faf8125c348fd5297d814132ae374683b2fb0307a7d8e1bd609b3f7d95de4b6a96dd8263bae9efd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.0.0.jar">
-            <sha512 value="86ea6c301f47fe71dd48bf0701c2d0652e2480551235a263e16d8267267294cd0ae8d0db57c727d62e6a1f79b53f063c69adb1e417b3ef36e8b356994863ca25" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.0.jar">
+            <sha512 value="bc10611fdf6fa02425fcdd626e668afa1f0076fc57b57636c01b8e7721c31375e42559f3bd6cd68147d74dca968a83fcd6161bdf24ad5367333213d7a2386827" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.0.0.module">
-            <sha512 value="996fb5309ddbc0b1e384ba486b112ace15f05e6b071ca771380fabf4929c88044958fca06d23f1eeafa8a92f7191da3a3b4b386cb385d9eee6ae63efdab6dbbb" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.0.module">
+            <sha512 value="003f242aec858d81a77b60c7a0553ce59b54c0c059483a4b859ceff03e88c07418d5d3efb20ce2a3e77bd3b8de6faa38d43f556e74d7650bdc52e42ce2f2f08d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.0.0.pom">
-            <sha512 value="a1b09882a776758a6aaf2a7f4399a6f8ce24a59e573301c1b8b8b9ff80c5afa751959d3c59ecbb9dc9f307673af6e49ab5ae09746c0e913a617a4257baa03d43" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.0.pom">
+            <sha512 value="d8d41a0757d70deffdef6a7ea5f60c0cebce017601315c0fc7dc9cfa1b8dd84bd9dec806f9c7716a6c210a29584782b751c2c291c73b7e4fc0b6836c74e4c4cc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-coverage-proto-32.0.0-sources.jar">
-            <sha512 value="36b945cfa34a0854ff321f5a30f23b3daaf3aecb074f3b4005b917b642a29313f878f5cb863fa17eec58a67488072fc9857f6d6430b59a7b1f6b9b36418bc2b1" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.0-sources.jar">
+            <sha512 value="9ff2e13ed602f60c79db10424cadf7f393ef799f456c06c784cb8f61a880181cc35ac949a778079d5d64efdad1b725994c268370369cbc00695fb01d6bd16638" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-proto-32.0.0.jar">
-            <sha512 value="f99a3ec14e715cb920ac00d13b555a8f149d9c850fbf2abd3c988e1ae3e8a9f1403dfdef1675f9844a09a579fa6fcc57ada055f975302e9e1286446aba22541c" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.0.jar">
+            <sha512 value="749e0001d659e845b9490bcff1939514f06b86ce99456bc102df8d0864d50f5c2f122249cc2c454d5062d65611302a0da712c1535b413caf1c4516526b0bafcd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-proto-32.0.0.pom">
-            <sha512 value="c5f5fa310314e378f58bd665b5f4e3c2a546e326ad449341c58e38e134190edb1b1e13b868979234148063324a7d489cbd6afe47d1825324847b5de1f130ad85" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.0.pom">
+            <sha512 value="8b77145c7b0fc0c050cb6feda298ee5187df50e40e56aa490d514a769a1a8461d7ca4b7a3ff7bc64c40bba85533679d869808c56ce9ad892219772f8d933021d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="32.0.0">
-         <artifact name="android-test-plugin-host-device-info-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="32.3.0">
+         <artifact name="android-test-plugin-host-device-info-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.0.0-sources.jar">
-            <sha512 value="e1edbbd696aa2c498ce454d812c88356b17f8997cb6a7f7680a8d18d1809481bafe0ebe9a0c17ebe0eb5889a374865ea0b8cb9d2be2814bf150807990f46e25c" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.0-sources.jar">
+            <sha512 value="98781bf0507e5ccff7addbc218b9df8626dcc1b3052a9e2a2453f8e5642ac2be1f79bb16f1f7058a2750654fdb2f28ffcfc8484e92d62eaf3d1b637fdfa8f842" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.0.0.jar">
-            <sha512 value="6be09f09f51c71157da35ac2b86514bf94810a4772e691206a70b7fcdbb1e01ef500196ceefdeca3e0ea75e4108974704355ac764fb779da6ae955c745b303ff" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.0.jar">
+            <sha512 value="a4401141ab67157397ac5d92166abf4d12f1da8554aeb0b9317e24ba72ad82e3202b1e9d839f9e348d39ea1600659af033aa32a0785653d00d9a3022b2cf87ac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.0.0.module">
-            <sha512 value="b184f5db1baf04fce9fd3480b6a0d6ec5f56117d159bf805a033e97df17bf6a213db8e1de6caf395bcd4708bf9839544d0d13f8f2e9771fd4ffa87f3e97dd23f" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.0.module">
+            <sha512 value="07f00c1d702e17331a2486f564324429523c09036054e3e5b9b4b33de36393facd452f9eca19e29b5ba6539a986ad4fdd8da94ca8a2da45c1d680eccdd74eb89" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.0.0.pom">
-            <sha512 value="4b032bc9cfa77754e1f9eb545e958fe3c8074f0368dcb124e19fc1163bd34069949440079d1d3d6ca31c926b6095f5a110d59bf6ff25dfc385aebdd2c402fb00" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.0.pom">
+            <sha512 value="41158dc650334fa8d12de1af82cd25e1e55fa557f1e2f791f242b9fcecba7493c2013ed39218b7b5d41d1031d2dd77a10dce921584be910a58dcc291910bd6f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-device-info-proto-32.0.0-sources.jar">
-            <sha512 value="440719aca8011880844671a749e8d1d6d0e26387e5a7f8fbcdb533a10ecce07236047dbfd71da0f1a62d01de4c8de49448ae3c56d65c1d9eaccd78514d6e297f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.0-sources.jar">
+            <sha512 value="1b24c26502310d385e83447fbc77345cf800496a1b58dc22656a38aaa8f921c0276ff9ff9d0108a1f4d94a8870a5852ef04278f5b110070d9ada7d8c4a5d8d29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-proto-32.0.0.jar">
-            <sha512 value="a9ebd38068e511ac341bb03bfc51722280696deb113ad62482b3d608a872e7afca838de2ffd633f30f7ae8444597ca9da3adc82cd01bd13f73d502c2802d62c4" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.0.jar">
+            <sha512 value="15ffd77d5425751fdd857a663543cdac3f7106cf235b062d08483cf0729f196ea7cf7323208c460be73ae74103f19f8cf2b7abc6aaeb489ce9c23caf7731d1db" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-proto-32.0.0.pom">
-            <sha512 value="edeaac02d059f0dfffae26ba40a43c4a519ab293a9650bf1e03ab46997033326a2fb129cce7d4198b3a1019754d07c8d6071770a850eb1d79f6826753613203f" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.0.pom">
+            <sha512 value="59b10687c24c43868051336fe023e67d7114de679ba651863e3ba518e8e3c040af528784fb1310ed2a5965e347cea4cccfdd14c89a5e80462677322a3f88eb54" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="32.0.0">
-         <artifact name="android-test-plugin-host-emulator-control-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="32.3.0">
+         <artifact name="android-test-plugin-host-emulator-control-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.0.0-sources.jar">
-            <sha512 value="cadeb785f04bee6c32c106ff2ec1f6f05264f7f23d1c5e9ca0a0d5b7a85234189b4fb6981ec2a45113f588658ceccf065abbd674df6e9f379b0173a4357c60f8" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.0-sources.jar">
+            <sha512 value="e5ab3867af74ed830bf70ab879274d3e51c7475da3b0d346e296699f618d67fd5a2bb313d19760104215d3018783291fb7090b3f9952251600b7c12509006c71" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.0.0.jar">
-            <sha512 value="38057c86fc9656b46269ee69c657797893a19774c8aaffe72cd1eccb234172696583d0505bcab179075ff7121b51784985844e91a2c1f7f433eac5eb13dbc56e" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.0.jar">
+            <sha512 value="51f883d25cba963fe934c2962bb5734a92068e05188171d4d1af5ff3e44d471087d520ba879f29fe47f1137e3001803b9d0c4a28b856c404f1169240fac36742" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.0.0.module">
-            <sha512 value="f5878af0f61e405c9a1326d4a57526e80dc1b608ddfc12c746810c393dcd1918b6f2f44022502d42ddc80eca927e2fd1da805e0f24712e63fb85509679c8e537" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.0.module">
+            <sha512 value="c024081f73e98df3c33e393615c0269cbc7f5fa50e4012a988474265a681f1794016e70a0801d443e109c61181a7611fac9a04e3ce5e6166b62cfd5da6864882" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.0.0.pom">
-            <sha512 value="ca0a6459a1cf6945e92f9c98cb40da0d9aa22c977a44db7ae668fc70cdca0e11f8247f686aa83c93b6e7e29ef9833b01cab0188672baddd29894b26f9cca40eb" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.0.pom">
+            <sha512 value="df4c5a22d6e0ac777a7008fd0a96e22d6c735474175e2c2cc7332c056cbbc869df990d74c1d0416f33be48c2519ce3bff39999eb4de430d32d3d5d16e969cd32" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.0.0-sources.jar">
-            <sha512 value="c6294ad9ebd6ad0cd3341c9f3415cd361751d7ae1380f333ea500675fd8bdfbb32dc07980946bfa3e11d73e91021a08409124a3e58a85c1853b4697d094c4d57" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0-sources.jar">
+            <sha512 value="e40acd0d90b23060dc28b61827cecec5309266c082c7063c786545d795cca08366efe5f3dd8229abcd8d13277282829b4db3ba70ed07dc374ed7631d89121ddf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.0.0.jar">
-            <sha512 value="4bd83e6601e25786a2743ca865a533a727bb7db5f36500e52b28266763270103f387ec4f5d6ffbbb8cd1b16d7a41284d17d0104d9c0489b1fbd7280dc867dbd5" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0.jar">
+            <sha512 value="f9bb4c6b2c250f1fd5dc653fcf2796085f41c6edde329cce666b1ef4b4ee0b66efe4d003a5eb04428a6357d8f3db5d72df312f46ac3b3c18916d51ca6b4c68c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.0.0.pom">
-            <sha512 value="1ba4e9aba3c7a9cea9186ba7388328824b899bacfad8bf2d419cc015082b99ebe6b029633ca33fe153dd51a1c1f417f2fedca3e3e35e765bf61382c6762a3174" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0.pom">
+            <sha512 value="dd7e622102f0a655d0e9d188be0b6eabbeff2745ba084ce5bf251b675464cc5448f3cb2bde86a72ec0f360cab202b4bf546e6c12a1540522f2bedd30fcccced8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="32.0.0">
-         <artifact name="android-test-plugin-host-logcat-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="32.3.0">
+         <artifact name="android-test-plugin-host-logcat-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.0.0-sources.jar">
-            <sha512 value="71a55a84be23bcbebffee8493d4e8ad32a462f3882e3bbcda81ef9d232cefea8526896623f1428716338300516bfce48c5b2fc4094a0aa711684d09e396ead11" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.0-sources.jar">
+            <sha512 value="0be5c6da2c4ab9331bd1a54f79352e36c1ed33c043887c19feb2b30908b5717dccc7dd065f30cb393bbd23c43c255ffbf7d8ca02e09896386f08ae70c01b01c3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.0.0.jar">
-            <sha512 value="cd92fbfd380329763d26741a919b011bafaecaa0a40a2af71194fb2f70038715f070803d609e211c0e878083f01061c5750b8d5885cc1cc8c5fffa58ffed1955" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.0.jar">
+            <sha512 value="b13abaa06b3eae1ba25aa26f409d3e3a8883de979d4a5e5b26616d345fe3f81421e39e4d282ff3a576e52d637fad71745bf4d24e3dec0bb778387ab4fbe4d6c1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.0.0.module">
-            <sha512 value="dc5f4df715b0f084e8322cebe446ffb06a16a61063849c9cc1ae8dacc96fd0c882026c9f24d5f249900c809d5bc47ae167b6e16fa5483ab95345d7dc6eb9e9ca" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.0.module">
+            <sha512 value="da7cec762506e192d22d0d801bdef0599f58809f271e146aa1d128c34097d3f4bafa881574794afdd2bd29275001af4dcc9a00db989adcbf3e1bca3af766d633" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.0.0.pom">
-            <sha512 value="2f591e8934a3fc20bfdc592454298b0c8237c8488e7d52fac4077deb9bca7c524310254e16282786d10522bbd1c64045d123a9568e2cebe60230f19dd3796683" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.0.pom">
+            <sha512 value="5fbf61a56d7ce634cf4472963f31b45b96b73c9abff8c094032a9cfb4e240e9bfbf5c63a2f79200c246c9e737b453d7c62badc4392c2f82de1a44e06a05c56ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="32.0.0">
-         <artifact name="android-test-plugin-host-logcat-proto-32.0.0-sources.jar">
-            <sha512 value="612cbdd65c35558a770969727f67d4c9f3fd3a1cfdcbb0e9eb90ffaf1aacf460493a0027d652ca3b4339331ec7ef8be9156062571ad8825b7212daeeea04cb15" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="32.3.0">
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.0-sources.jar">
+            <sha512 value="bbf5b5dc5ab5e5542ea42adb9d3b4fe2d4efbff7211e57df42fc442168960ae8f5014a625e164d452c3521d24c5c860dd715e4fdb56d50fddf14c6e8b38c4832" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-proto-32.0.0.jar">
-            <sha512 value="1d2161091825c9841a99b38970314f932fa8c0e0a3f132afb0e2290700388a5487564ebadb42a1c4bb20a71c138058dfff6fe50dfd026172f7337f45ea46d466" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.0.jar">
+            <sha512 value="e956af51c69e0c36ec27f5e8eb3c87430bc618b99baa5f1ac4a058947824ed2e515dcf1209515cdf7211af35100d6fbeadbddc84adfc0c937fa2f3544c048fd3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-proto-32.0.0.pom">
-            <sha512 value="95e9c047f6a682cab0789ead660d5a0da707ba7df4c5d3b3d2c42dcd70f9b78a5709fd345422d93662054ddcbba10e5713695e1e66c8cce207ddc207b3606e70" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.0.pom">
+            <sha512 value="feb2edee57b7f90e0ead2f00b79debf99fe8656afbc68f9a1ba0980b74177392c74f58b49a5be010f62c92ff1cd9037993b6deeee3745d77c121568e2abda6fb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="32.0.0">
-         <artifact name="android-test-plugin-result-listener-gradle-32.0.0-javadoc.jar">
-            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="32.3.0">
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.0-javadoc.jar">
+            <sha512 value="e17d2175ee80e4a52cfdf0561efae8ce98b56bf915c05b2773fc194da7570d1c68a8030edfe6fd64d5605e4756775111b27eedf8828af4b41e76955a0cba6f7d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.0.0-sources.jar">
-            <sha512 value="ee1d7ff3af0a378443001aa5829f4153dcf15492e295463ff37c2a5eb858cd117b852b0d1de19e05f89195ddb0b7ecbbf69454eade926a9e65bdaff36024d0b8" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.0-sources.jar">
+            <sha512 value="be6c4e2a740c5396de933d5e5563a633a1b5a4325f3dc03e4582b43684b61e762b6f8058a0954f34127d1fa54f7cd4de243dd239d532ff538a4d0d1c483e3ebf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.0.0.jar">
-            <sha512 value="51525b1830be3d35f490890e4178a7b3bb9aa26fffbc1c49e937f1463f57bb7ec53372d3d3b8ff75c71640f17bbf373cc2ec83eb6f18b576658415d4d20b4ee2" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.jar">
+            <sha512 value="bb961dcb452a1a60827c881eda8c9252fb2bb9d524df8c23a908b04f4cfd29ebd1c65dd7ea55ba9ad3be4f3d23fc65e0ee526f888e0c1e4743bd26e7c56a5f36" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.0.0.module">
-            <sha512 value="89d64def1bf49051068af511f87ac9db298fb8b7fc4b47a314b2c6d3c4e18f1ad07ebf747f38c1fe0f1159dda753bad9f799953c3065e0d803b4ed1b8fdfef02" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.module">
+            <sha512 value="e2416c0d46c8342b6dc1743a3228a16246b4304515bcb7a9f7d67206c3a4e476e22690c8f5336f8117d703050a2aee8eb9d99d850357dd4ca92c314110fec198" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.0.0.pom">
-            <sha512 value="fdf0b623a8ee7e22c4ddb07024d0b6a424d52bf99f3b7446d27bc6a730cd5d28744ddddc342efb7f2f5c89ccff6a3884745bbff2c09ebbe840732e5a27305ed3" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.pom">
+            <sha512 value="60c899d3ed5fc3a3d599d1f1501ae402fa97e5242150254af5272042e83ff8d4ecf685cfbbf239d5e1700654dfdbcd2e812e1c1920066763a13c84ce2c3dc84e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="32.0.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.0.0-sources.jar">
-            <sha512 value="413509f1f868f5f622749b18a66c33c7d3c21c19d00e0dccf40bee5bca17f7ae8854848df29a880212e5cc9ace38b28a75f87b36c745634b4da837d1ae50d1a6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="32.3.0">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0-sources.jar">
+            <sha512 value="1af8c3c548796080e79f3606c9d20d3e234f537f2b17cd57da1348e52172e4c0114099e1eb2aaa77c7ece4186c79be60ade364e49cc72980d59148112f7a4edb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.0.0.jar">
-            <sha512 value="9282b680e254f2c0dad39cdf28843698959c9198485b892fe7606184358715b0950a506a75f83e582588af5ba46c3bf9ab162422521648f3827ed6200045c254" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0.jar">
+            <sha512 value="9d90f441b8e80e86abd3991c00f88d77be6b90cdad22d7f92c27dc00a4c6efb47f8a67e76f34e99afe91052828d6c2bf82eba6f5b1d6ca633a9b25efe501bc6d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.0.0.pom">
-            <sha512 value="fbb0d9f2657f8631c7fb960119accaa893ee2f79f9a3d624d6a1e1d312db5b42105ee4213c41f8ff1fb3504a657277aac6609def117a5d67668d6c49adf0fe68" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0.pom">
+            <sha512 value="9588ff0beeb3995529bb3c03260cc35964e5fbefbe15c55774368dad43ba3481f55f5410a85b92a6eed6979c8d6ecffc0471267d2c7438f5f933eaf8a900f3bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="gradle-work-action" version="32.0.0">
-         <artifact name="gradle-work-action-32.0.0-javadoc.jar">
-            <sha512 value="eb7a55efd95ef25791001e1d5e67758d7282b1a0833cffb272030eb4642b33f56998f93e1558743cc6eafe8b54933b67fa39aaa2007cfbea374e8022334e3a30" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="gradle-work-action" version="32.3.0">
+         <artifact name="gradle-work-action-32.3.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.0.0-sources.jar">
-            <sha512 value="6c4d903f94a633701da41284b17071be2ccc1ec9569197d7aa10d2e7ff3ed65976fa253a3c98bc699a92dcabca913385028bb331606e959820800c7281dae313" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.0-sources.jar">
+            <sha512 value="8a052962418f9159edf20fe862a967866d200ef9e828840500538cd08ec54788aea2f34f0ff27ff7e6e2cc42a308dfc152cd4dda49738e3b6504b0254032bfb2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.0.0.jar">
-            <sha512 value="6cc881d092b7db6a357ec99d9b740f5bf3e4319c63dd68330fdc962e27f6c26c860dc94fd1a3c2fa9c6166b0015c723f8ee5c07bf19ed386841f002a523d2ecb" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.0.jar">
+            <sha512 value="e11eb4261b0d768859a8b63bf3a0bb07ecc7e4655c45eb0595fccbcc230723d47d5127c03328c0e56e9e4258ea48be79ef6b3b0d7e65afa75731d1985540c694" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.0.0.module">
-            <sha512 value="bfbdeda016ddaeadce90580e7ea39ca8aa2fdf7a000eb757d351e2a922bad5aa08c7ddbf7d576e433640b29baa754bbc214b01e95c447f919907591ed9af8bf6" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.0.module">
+            <sha512 value="928abd36da87e01501427496dfe66bf9801ee334e2400c29fbfbcc21cd774fb902eeec699e01d50c2d8533fc5d9554c683698881e407d8f4ba7dc5d2360dcfc0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.0.0.pom">
-            <sha512 value="566d84466869a89191b362b8e0d4c4a8952a2aeb6d6297965e91538aed13537dcbb6bbca455615aa295f44e33368222971dde9ae9fa2f8f0cdb493b046116975" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.0.pom">
+            <sha512 value="bdd94aa88825811f1dd91dfd93bb7b1cf501dd63848641867baefeea2cdaa44f16a6e0e2f74fdcca9bb7208d5a66f70347ae6817e228168cb8ba9acf6362e5c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="gradle-work-action-api" version="32.0.0">
-         <artifact name="gradle-work-action-api-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="gradle-work-action-api" version="32.3.0">
+         <artifact name="gradle-work-action-api-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.0.0-sources.jar">
-            <sha512 value="ded4e09d7ad7fd7a3609eb66a99ff0e692c6569985d185291794cf54f2bf32650672e3bc94819365eab8a2b3832a0715a955fb0a407ba336bbeba8fefd07768d" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.0-sources.jar">
+            <sha512 value="e84d62defdf0e5f0c2f6b9e1af3ebb53305036295244cdfa67df7a76bbaf42e0975be7d81c0254d7324e9a92be7570f7dcdccb9c2e12518b3a22ae90460e3765" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.0.0.jar">
-            <sha512 value="a5a0cf16fbc291499dbc81210aab819ee7107ab12a9bfaa4e407c9bc1b4ff73f5e01bf446a39411474da18b0536fdb1a27a3fd3baaeac6be95d1520fc45fbe8c" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.0.jar">
+            <sha512 value="4fbd0f42609bd8680c7398c5380add5161111c23b2f4ceac587309ed41da7783a632548dd88a37ef4763d122e92692822c81039761aff4e5f11ac77a20f7d858" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.0.0.module">
-            <sha512 value="0f68498a0b266910944254482b120753df1e9e341bfdddaba33f0eea10d6975d55258c4538b2b122ee81842847e4b858ceb5077ed37d3bde2280983cffc82dfd" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.0.module">
+            <sha512 value="e31c8f49230e48cd156390f65cbe90c522ca7610de827e8262c64b84336c7dd68fcc5ee74941c3b7759ee1ea03b0676b023ebc9a7a498df732308c4b8a872294" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.0.0.pom">
-            <sha512 value="c100233bf4ff88797660be7be365971dafc47799c70e423f83bdf47fc9fbb66461a6de4f99eff8c77b2eb8306a079f9863b79ebf0ecf41f72c83bfb3c578ad04" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.0.pom">
+            <sha512 value="c8f0572fa9de536388d243f436b9fd495cddee95214c9b581dba17f14e06b92aa3c1c69fff4efd6b6767bb499601f1993f88ffd8030c3eaefe102b5171b5dfd2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="utp-common" version="32.0.0">
-         <artifact name="utp-common-32.0.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="utp-common" version="32.3.0">
+         <artifact name="utp-common-32.3.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.0.0-sources.jar">
-            <sha512 value="5de84621c9d6bee02968349d7af4f8b7751ef8c61b8198c3053f9830b3ddb20c56fad57a57af9ada6d35a91201d4d2c9afb81f2420de33e8305fbe23afcffa09" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.0-sources.jar">
+            <sha512 value="67ec93e2771d2c4e1a2743d2618b6ef7749346febd25cd5b0c4fdb9b3fba1f4b9684a2b07961dd064b2891e63544d30f3f543ba237c28a59d5ab9ac93020351e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.0.0.jar">
-            <sha512 value="d63fe534daf2608c1dfaeef3ebe6bec1b89e1d9aa77f605798aa4d26e02c373c2a9793c724bd308069f11cbd25936a2f421aef952259321dcea0b230f54d4790" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.0.jar">
+            <sha512 value="3002b53476b211ebd56673e4c6e7ba050294bfa4382a40c7f3ba16f84b892bd90f666f999545ec78f3c2ea3331a295689aac1fd62d7588116f3194dd67382f1a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.0.0.module">
-            <sha512 value="dae0b0e9c76ea707ef9b010430d5de864e9e172502ca679e7728a0e581edec694ae6756dcc17896b4973978bd47577f4fb99bec3ef6799e88bcebcc80c0ef1e1" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.0.module">
+            <sha512 value="5eb6f8f81655fad5d43c9258e847b8dbcffbdba330eec99e6fed2f5f4a275c2897d4455e070495d8b8d17f1e8734754bc92480c006d2a0e96e78f34f03555c3a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.0.0.pom">
-            <sha512 value="f06e9005be7dbb34006c967d976cd995a47e8be69f167ef4ea3f2f38d0279058575887fb53cb28c1c3abc0b0fec55055a1ebb0ec09f8aad4921e5a1ee31420ca" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.0.pom">
+            <sha512 value="3a3875416b9b98e7288463fb577a517fd15eeb03505e3c61097d509bd97479cda3ac33d14019c40ff133c58e91cf805f7a9bfdcfbaded70499527172b284cb5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google" name="google" version="1">
@@ -2511,15 +2629,15 @@
             <sha512 value="6727ecc1bc63112555f4ff8013d0b136f44641d73673e03e89ccb45d6b918c05717ff32065088d72e94b7b6600e9536b83e96faa842bcb837cb34aff7eebe88e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.material" name="material" version="1.13.0">
-         <artifact name="material-1.13.0.aar">
-            <sha512 value="77ac6a176697378895942a3a5e5a3e14716bf3c93072e372dc0022988448ee6460ef004c40598407ec4544ef6b05928d2a9905d4f70af397e238312606bcdb83" origin="Generated by Gradle"/>
+      <component group="com.google.android.material" name="material" version="1.14.0">
+         <artifact name="material-1.14.0.aar">
+            <sha512 value="9106cc584cab1c2be3d5c2082f17ced29eca390a510342abd7de3f1a7098b69308443ac002e4ca18caaae24b83f3d3b4370071fdaf4893c7cc60e956adb40ef3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-1.13.0.module">
-            <sha512 value="8a09fb177aa78bedf7c0e1f0cf57881606b6ea48a948efd9a0c9b55ecf725f7fd3a8939e27ad1ea6f3fe06d0150f7c12fa4b0421f62105efb05770f3ccebaf39" origin="Generated by Gradle"/>
+         <artifact name="material-1.14.0.module">
+            <sha512 value="11bd752fd800a541f2fdd33ef1da1a07e1eddb9df2e6a78e47c2e4b9f94e623c5708f1ad115289efca66802e38f67de8871e233631ce85360399af07f0e86d49" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-1.13.0.pom">
-            <sha512 value="04cfc67269120bd99a5b1ab397312a0ddfa9f24d2cf26dd1200b854d5103e9e3a9531149809dd2ab9e45246acf6a5f7e1b4ed00ec457162d5f79509125e02ce1" origin="Generated by Gradle"/>
+         <artifact name="material-1.14.0.pom">
+            <sha512 value="d64a30a92bc85764a49429464a132c6241603c77243eba2bf02fd12e36c408cc334952caf64096eb4eea75c81642507431bd3069f1edce0e3a34f1dbf17bfa44" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.api.grpc" name="proto-google-common-protos" version="2.17.0">
@@ -2732,6 +2850,20 @@
             <sha512 value="921e2ffed05e5dc8ec622d2546641f351f0189c275578b7cd7e5e291244545980c5c946cd90b87402bb0eb03ee4a7c0e2257a9d3af3fbd00cfa2c53ae2ae05aa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.crypto.tink" name="tink" version="1.18.0">
+         <artifact name="tink-1.18.0-javadoc.jar">
+            <sha512 value="e05321d61ffe28c753b5862e1989778caeae5d8ca1c41ec73e86d5aeb9f2709aaea8b8ec593f43ca14cc3bfb3957b761331c4260ae29ae6a114aa32584903950" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tink-1.18.0-sources.jar">
+            <sha512 value="01c4d67d0739bc322506f8e16608a5fa035c867736abc29bc8a1f54a6e2821287a6e18d6d2ff7e5a704b03dc06e9df33c1d0260ace2f1e69e7dc16f3aeaa892b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tink-1.18.0.jar">
+            <sha512 value="be367940a2cf5cf414be20948950de53d8bc6894905012368d20634da3ef313029d41601d97e7b4e8a219f3bcb854f1ce18457dbe1bdf3197c2eb4bd2f9dcb42" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tink-1.18.0.pom">
+            <sha512 value="8f33eaaf570947c04ebae53a7279262ee25eb085c67a38e357e14d152d5ddb26f94713555c1ded226b7711a5588502f0a964948fd5662447b916f822e1d858a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.crypto.tink" name="tink" version="1.7.0">
          <artifact name="tink-1.7.0-javadoc.jar">
             <sha512 value="1cedd62e28ed67936fa5646b9ab0e306d2c94c28137122a0047e33df3d2d97a9ea894c31b0cb3348a321a2c7deab788b3af877b402c1083f038d9003c3f64b6f" origin="Generated by Gradle"/>
@@ -2774,18 +2906,18 @@
             <sha512 value="a5e937b21973fb3f2219a84483a400d985c15d261310440b3ac1a59475ac04cf16a20380a371171ba77ffaf4ce2a10effbc4d9c5ac76f19c4cb99a3afdb0f51d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.dagger" name="dagger" version="2.57.1">
-         <artifact name="dagger-2.57.1-javadoc.jar">
-            <sha512 value="0b24700062e15a50bbfabcc2351be45d8650ab8da8d59dc76c18c2f6b03a64f907f717e0074d68ccb979cc54b356745f2d81946c0b2d9bf79d6b20a8daaf6d8b" origin="Generated by Gradle"/>
+      <component group="com.google.dagger" name="dagger" version="2.59">
+         <artifact name="dagger-2.59-javadoc.jar">
+            <sha512 value="9f86226b7afca37691b99eb1a47e638ec75204c8008f0f20e152718c9f299025b047b6219ea0557f85f863ac2488f305dcb13aa682758a069a249edd6901fd08" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dagger-2.57.1-sources.jar">
-            <sha512 value="709293158bd20e4be4d964f0c3d71d871ca8805474509741f97ded88ab2f40f19c44ca77ba2a12d10f7f2b93e37fe841b17c9d79e30e551b4666a1312a79220c" origin="Generated by Gradle"/>
+         <artifact name="dagger-2.59-sources.jar">
+            <sha512 value="8d327b6af23f994815a7cb98f1f44c32711d76cb226e7519ec599d25915fcd9a2be7883c7155c9c22de696ca2f074410e62f91386dc068835866ead1230ecca0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dagger-2.57.1.jar">
-            <sha512 value="98f90cad53841cf9b57b8fc61249d4114b92aab7fc9676c843b764cee0685832e4ba119e373c4788274e16dfd05f7eea80b971d6e0052078fdb2cfbd1d05f1fb" origin="Generated by Gradle"/>
+         <artifact name="dagger-2.59.jar">
+            <sha512 value="670eaf086c079fc7e91a43e869d79818b4ec1219be209c1feb2c5e1553547aa4eea169ae241fea918e33d726a20eafb4a31e0d7bb0be3f2ee36fa647b86bc505" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dagger-2.57.1.pom">
-            <sha512 value="1e38373be33dc1ef50309b99da732ac12e24027181449dd009ad7d90c21acb2f27fec7ccb7fddbe08f94d6e934cb7d094a5fd24c5326e659927be20fe85a0251" origin="Generated by Gradle"/>
+         <artifact name="dagger-2.59.pom">
+            <sha512 value="e1f2f39577fe953e2b1a09c4e1ac2293536f1773414e834227d63e67582250b905bb02c9fd78cc393a28765873b568c09ccb80eac0a6f341daeffe7a91d1ad2d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.2.10-2.0.2">
@@ -2802,18 +2934,18 @@
             <sha512 value="260cc22be8f39ed8f863c77fc5ce3f5d0c48030066415a7f487691468d76b9a5731c5caf47c7c035b6980567d6c386ad4cb2593f47513bd3ae9c845a06ac3fee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.3.5">
-         <artifact name="symbol-processing-aa-embeddable-2.3.5-javadoc.jar">
-            <sha512 value="96732586eb0013348caa0ee1061f90df84d3f61a87d371b13fb32eaee2cd7b4f6822cee2955601b88457705cb95d9e4509c495407c64559f59e101f94de2bf09" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.3.10">
+         <artifact name="symbol-processing-aa-embeddable-2.3.10-javadoc.jar">
+            <sha512 value="4ecf6ba46c903cf7bc49b445209bcd654fd1fca162098da77f22343ed6a2f4f3bf5e23ccd1e51adfbf168a9331fe9265e815caecdad17a0deb0f750660642592" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-aa-embeddable-2.3.5-sources.jar">
-            <sha512 value="7cfc0400c810af62542c22625cfe28f2f32c207447cefe1a9438ac4053f486828537014bb0d5f66a8494e4f20bc60d35a8fbe822b5540624a5beac7bd8c1aef6" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-aa-embeddable-2.3.10-sources.jar">
+            <sha512 value="c0a089cc9c442255eeeab534957954e2d0dd18a86597bbb62ff5e9d5c9d5cba5960875a523352024f81e4891385565d93ae8695a7b73784c6061813bf9386654" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-aa-embeddable-2.3.5.jar">
-            <sha512 value="f28079a49741360b3e12bd8ab8dffb59daf141bdf28d0ac4c61dfe764f643eed8e9f58ee9dba05962dfce36428114f183190f739ffc5a7c4180c4fec5d4f48a6" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-aa-embeddable-2.3.10.jar">
+            <sha512 value="2b04e39ee39e3e24001494924223d6cd3985bb2fd4e7dcdb9640d585a8138a0480b11554df73e64dd8688683beac3c124b1e50bc3e4279bd9675ba9d6993ac43" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-aa-embeddable-2.3.5.pom">
-            <sha512 value="d5c354567de5ed2d8adaa3696bca72d8ccab632a636aa3783d7ef06cd34afef51bd9ef2bb24e6934839c074e522a01782f276fa0c439029d8914ca7628d4c49f" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-aa-embeddable-2.3.10.pom">
+            <sha512 value="f7faa150a977bb415225d3874b1fa12a76b1d6478a4323c7107bc30e2adb80d125b99d49237d2fa95d92e258e00653608aaaa6d6991f0c2f1291f5934eeb3b4e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.2.10-2.0.2">
@@ -2827,21 +2959,21 @@
             <sha512 value="3ecf4963c76f828d5fd310dc9b32504c22fac544524d5305c6764f24f85817a358735e403038f1187110da219b5934c05440f68ad4d9de2cd86cd5f025855131" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.3.5">
-         <artifact name="symbol-processing-api-2.3.5-javadoc.jar">
-            <sha512 value="bbffb746512cb024017144a2a585257ed919876a209e3d564f47c7248b843e76201bf47dfd092cd71eb1d4c795b63a6abb57dca0fba0843b1621b73b036b642d" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.3.10">
+         <artifact name="symbol-processing-api-2.3.10-javadoc.jar">
+            <sha512 value="e26135eac28814997afcc624202f6ffdf314b5f4b548fd671671dbb8f6eff0d6d57bd1bfb62afaa76f25742078eda4a4d51feaabbd14172d560556a7472352d7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-api-2.3.5-sources.jar">
-            <sha512 value="673a6af34b9d1915e867833a44e79d70c79d4bda8d5796c8a755147fad9477d7205d3711ef9049e7aca025d8be89e590188c4987ba0107311f7619308dfb9b40" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-api-2.3.10-sources.jar">
+            <sha512 value="ea2486b866a3c6e1affd885d7e69fbc83ac7b876fa1c84bc0f410c288daa9241ca7bbfd49486389055baff1e6064ccc9e20af3eb2c40eae48a4dcea1a8e9efe9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-api-2.3.5.jar">
-            <sha512 value="c72ae0d465aa7b931b8e778205eb73a05df12c9fc0658ecbf74fee0a5b14f5aa1c0db8ed61a400d21e171898a0aa75540c2e75367e831c30939aa4a2a7999226" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-api-2.3.10.jar">
+            <sha512 value="4e7054bab4c74c8e801ab77f2eaf8a5a18d1ce5dcb4a4909f318360e14655cc27fedc881fa7916bb0e44c75bc4574a3d0e5f6c793d61e06011a2282e2a00f730" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-api-2.3.5.module">
-            <sha512 value="8d021789a6999a0cb782120276b482167f4c6954902558f13a099f762c65a5c43c2b68b412991fdbc462b427f688e5315c41647c90bbf1f422f01b3b609ec70c" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-api-2.3.10.module">
+            <sha512 value="63f4f196760776fc90f474af08b21ada8a6f9aeb0ffc2ea92938858b7b779f7775f17f6a719b7a6d35df9e3bb80ed0fc178426b28da70e16c585d9efe6c3be3c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-api-2.3.5.pom">
-            <sha512 value="add5ae3eb926f825ab2897e3e1cc14bbc71ea5907dc73c3701c189a2cd7b4c9afc8f8d9afb88cd6346122975841cd7a5c502042c4ef2f509fc0212b85615f3f8" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-api-2.3.10.pom">
+            <sha512 value="4af009f436a897954c3fb1250744d88e819f4852f393f4435349834af89d05ae182008deaabbf2e4ba6a6b1333aee0e07606768ea69ff7617f7b37845bbc6611" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.2.10-2.0.2">
@@ -2855,21 +2987,21 @@
             <sha512 value="a00a1ce60e7db289a9604d37fd74d7b7fe2d20671d1da35d6835befa3eb73d52df488b1b329e2161691953cc493e9e4f79df243df2aeb8085dbe3af47e57ea6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.3.5">
-         <artifact name="symbol-processing-common-deps-2.3.5-javadoc.jar">
-            <sha512 value="42ac4922fa72a33c6f594ff44be32410f774be77bba14e094ac467785e4e004c071256a1e40b60e502f11acd27e053e89db69a7a16d87045c5820a02622c09b7" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.3.10">
+         <artifact name="symbol-processing-common-deps-2.3.10-javadoc.jar">
+            <sha512 value="b506b933a509ccd9005a493639106a9c7fc0272833a3204bf93ddad9a1d6952870b1a62bacdfe78204d6113497a0af39cbf5476bcd557898543b5d52d50bcc99" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.3.5-sources.jar">
-            <sha512 value="0712a7ad75f22d8933d8b9a98105459e203e723b354950c18fe21ebc7511866e71fab5ef119b99c141762c1d272a05e324997f47e609361de11f8266af81b853" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.3.10-sources.jar">
+            <sha512 value="cc62f3421c0d19968474ac19a85c095f5e699f57c60ee9b7dfb096112778802f5b9776564b7db6c7940cdc9177b0d201787359c1b4626c0355b2f1149d341094" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.3.5.jar">
-            <sha512 value="d689128336ee69d8361b4c7532c9b6944d99a12ff20c78b86f8270ce9a5973196b1bddab93b8c5ed89dc92211a800f5827adaa3435b8ea1d11b67977a59d4114" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.3.10.jar">
+            <sha512 value="a434678420fc84e89e921b76498589c06af8ecaf40ea18c9dcc00b3aa214a2a2a5522c6521d55284b29e582f1a99a6c13447b7f9318029e7c657ed313b7dd69f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.3.5.module">
-            <sha512 value="78b8df83649dfa077485476cefcc36931e91c4dc61c7047d0918421525cd9e1adabf14cfaf5d17a2cb8c9239e72b835525784e2d142bc8a037fb3568ad465103" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.3.10.module">
+            <sha512 value="e1711de4715745417bdeb44bff0639018cfb204c8c93332a465d088a2fb44f3457357aec5bdb0ee5fdfbb6dfb23c16a67ca58553ef580f7caaf6b0cd06726e2b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.3.5.pom">
-            <sha512 value="c05835ab63fd7d34c3cf3066ebfa7da5b5887e35e607dd8ee4d6fb395860bef8bacdadd2ca15c684f769a3da4fdf245b7a55a1943591235b44b7fbfc44f03f1c" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.3.10.pom">
+            <sha512 value="653960427f14f6ad641aaeb1d54154a090665df78ff4c8b44255d3dcd92bdb17641fa1e43f30947f3171f6e19e952e2a8c8b57e1633f7716cb75e1052fa4f048" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.2.10-2.0.2">
@@ -2886,21 +3018,21 @@
             <sha512 value="afd796587db41c81ffbf0a96b9b65e088c08cb65015469b9e2e9efd5425c96aa0be1c30e60c3029ccbb3e1e68da634a6b5376755120cc6936833b04bb6e952c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.3.5">
-         <artifact name="symbol-processing-gradle-plugin-2.3.5-javadoc.jar">
-            <sha512 value="d3203875f9f78b46c1de3e1d4ec78234b21528b367e2e6e5a14d3eb987569e1ea0b7d38de8b59f4f6968ab9127baa2c217c7a84ab7f204caafd28eb696af9bff" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.3.10">
+         <artifact name="symbol-processing-gradle-plugin-2.3.10-javadoc.jar">
+            <sha512 value="20c32256a1f49647a238cf653fef71e00f8969655459c6f46ba07c2edc324b037074a3c8639b7042eba11ec7313ca2efb403b421fd918198a7124a57b66d92c2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.3.5-sources.jar">
-            <sha512 value="f3dbfecf97e0d10e81cece7ef8744aaea958e1b6a57374a8a92049d1367b2af1bd69c4f9bf39be405c787d7a56e50afa3c0c4ff8a280bb30b47ab3fcb21ffff3" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.3.10-sources.jar">
+            <sha512 value="13ded0d2a81187007f2a564b30a00be1be0b784f2417153413e8dd742976c47c4dd48dafd5ea2d8924b2e2b22505d53f5f8e4d7834a21567113b0dd336ca9447" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.3.5.jar">
-            <sha512 value="e86a80253588a025e6e297e5a5f3c5ee32ea567b99ea997d11e7953f87048fa63edaa950b0f192e3ea2450c14973672fd0ee32779e022308afdf4433a94abeff" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.3.10.jar">
+            <sha512 value="2d8c93ee73aeff260b64b7c8dba49a7e69877ab9fc649b34119cc80ef79dc3bfc8ea83433871c1f3c1178d7e13f6931b9611f0a342b8560b97f1bcb9cd48407c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.3.5.module">
-            <sha512 value="8b202cdf60d1bbf8b22afac91e1f8987ec2337753e46941b6c8ca0019e56e5c34d3be2baeb70f93ac7c816f7e5f43defb443d2747fdc29f0751e3223c98b38d0" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.3.10.module">
+            <sha512 value="59f81f250d504f801f883d956f1dc7bdba610f7ad951d17b169e3b48e4d3c7ab3543cbff7e008df1d717b53dfd0c6d0cad64ab7c702a204a0a0f2c09d275a99d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.3.5.pom">
-            <sha512 value="b9c4d3211cf76694e3a3e5f44b9ee13fbf9481d8ff26f0a72036a031a4bd9dce5d6e760387a9ca7bce5f58e9dd5d8cb55dcc0d2701e402e8102d432d54a058c8" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.3.10.pom">
+            <sha512 value="3523992a40c0502e52974fd1392bca7e1fe874112acbb887fae1ad1f459fae66307cbef69acc33bc26159a5f5989ac433e17072f53e162e335420251632a4316" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.11.0">
@@ -2921,9 +3053,6 @@
          <artifact name="error_prone_annotations-2.15.0-sources.jar">
             <sha512 value="d6eba97cccee07507836ce5492856ecbd2b8c4d360ed256bb320e94f8fcd593fdb0baf7c5e55d68ae3a8630d3d2d1ffe987394ca96b381e90cfdbbb51ef7fcbc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="error_prone_annotations-2.15.0.jar">
-            <sha512 value="f057932e84e8a7ef0683cc7d0e08607bafc4cfb3cd4ab910345c2e42dbd26b511808a357dcda5f5ae44d2d77bac34adf51317e9b608525d56a83228dea56e236" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="error_prone_annotations-2.15.0.pom">
             <sha512 value="30989652831673095a2c43e12d66e4adbfa4472656ce009dc0152daf07ecbafc06ed2bfe9ba10989e699a7a1bfef0e256f6de5d9493c8d82b5d95bf87af8e345" origin="Generated by Gradle"/>
          </artifact>
@@ -2935,10 +3064,24 @@
          <artifact name="error_prone_annotations-2.18.0-sources.jar">
             <sha512 value="e54fdd0d7f8ed0eba33ff25dcf9e3d312bd9cebed89198e8b79fbbc9658a009255ee509cc016d638b156f774efb4e3022f03f17c4824b970eb67ad37fae42328" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="error_prone_annotations-2.18.0.jar">
+            <sha512 value="3cea86be94bb8ae40d21ad4bf7d7f6b2233e89593b7b741ad84c78840cd3837bb5136f52e62fe9ae0953d7b190c46ad3edc102dfa97b4c7ea472a80206bf5db7" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="error_prone_annotations-2.18.0.pom">
             <sha512 value="983b1ec72f755a77bbc35dd326952d62e8ab8978810637e741f0173c008b552577e76fcabfacf3c01569bd36f09434364bab690d1e62e2bf99117bf0f5acf124" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.22.0">
+         <artifact name="error_prone_annotations-2.22.0-javadoc.jar">
+            <sha512 value="87245ba53ffc3448a433f65c572b148be7300eaba38997eaef35c5fa920501bfe617fd465187323c45f2f187c306ac1e75cc27e019dd1006c8ca757e88a727f4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.22.0-sources.jar">
+            <sha512 value="3bea4625293e3cf454f2b2f0f3525bb72a49b5d689bf786446020e6529320aa91c509d179b129c2afec2e3e1b976ea6f87713857ff8e4f1f3ff455024a11e916" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.22.0.pom">
+            <sha512 value="72b2da5124718b8e3e8e0b4b00e0d5133422387239dc5471338c80224c1c888bf239d402060d329ecade424d06a67d2f9613d4d883a8039d772c422cfd1fcc27" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.23.0">
          <artifact name="error_prone_annotations-2.23.0-javadoc.jar">
             <sha512 value="f4f91bb31c39593ab8308942f1349cff5edf5c497a88cff1e069fad9328a4717e8309aa3fde6b34086c753e7c09f0226d20af035981217ccbc9400f4d6d99241" origin="Generated by Gradle"/>
@@ -2996,13 +3139,24 @@
          <artifact name="error_prone_annotations-2.30.0-sources.jar">
             <sha512 value="8450d9b2be2bb7317cd97f2bc95905cecb2c9515177a7e45c9c6b3ab8c6a0effe7b8fe0e35935fbf50ee941972771b94410f5490611dccf02fe409aa85733624" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="error_prone_annotations-2.30.0.jar">
-            <sha512 value="61956e255b8e26b574dd04a89c9e91652981d3121508fb1de39af155165892de694954aaced670b975a600edf19e0077eceae5d3e0a7cc4eef0cfe301521e201" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="error_prone_annotations-2.30.0.pom">
             <sha512 value="02ce374b7f83915a0483549e7d8fdd9f735f8293e8f0dc5a42fa358ba2a270a74729815606fe769f881ac4dfcec24303c8d22bdecd701520e9c756ae0edff820" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.36.0">
+         <artifact name="error_prone_annotations-2.36.0-javadoc.jar">
+            <sha512 value="1e8cfaad057a9c8f40e6774b2c1963c47b28f56128575f3a12eebcfbbd17099f6ad8b2a10c2367ef2122175d6b86933213911068fb56091db862a59df7d8263b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.36.0-sources.jar">
+            <sha512 value="152f2dcc7b12c0d4e77e3ec7c9ac7caa9907964e1fa738715187341d1b275e6d3c784a41786749e2b5a7422328232a35c91fd39682a9413a8704f53841306c24" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.36.0.jar">
+            <sha512 value="bd6f5650902526d3db06aa1cc7bd36723658166acfabb823aca27d0b2c3814e83ae24a8217ce915c3e194c2c696a102580b4c21ef5dba61f7610bcb8d580f566" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.36.0.pom">
+            <sha512 value="0c1d663f70a1bec083cdd007b1ee673df144bbfbd4d065c7cad0edba8410bcd1f578902133155a534a1506a82d6a6aa211b4e6c907c4df25b0da4c781caa9008" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_parent" version="2.11.0">
          <artifact name="error_prone_parent-2.11.0.pom">
             <sha512 value="bb503122c0418a898a2f1466457d84cf88f8b141b315723e3a0130153793b61688b29392031af1260cded009cae41be5ff05623b485bbed7e8369d404c54612d" origin="Generated by Gradle"/>
@@ -3018,6 +3172,11 @@
             <sha512 value="64d02f706f330b5e2c3a8a14e9a4b41104eb561c04a9c7a885bd49e785a1de1cbf3afbee920625cfcb4f08897edd38fcb0df22846199413c7a88b45d8c664ec4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.22.0">
+         <artifact name="error_prone_parent-2.22.0.pom">
+            <sha512 value="75c047661556d82e74458fff4c3e72eafc945756b24e311f6619a07ff28988c062c8f742c1c76cd1923f3e279426078a46bbf0472ea63802900f24963471ab8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_parent" version="2.23.0">
          <artifact name="error_prone_parent-2.23.0.pom">
             <sha512 value="b478da1b657a34de737810c78c0972d22200fc93bf9877fb9663860306362103e92f5c337eb3b9a01f07ad4ca53bc10308855a98f9bc02aaef25d8ca8ce586e3" origin="Generated by Gradle"/>
@@ -3043,6 +3202,11 @@
             <sha512 value="8da4d1308a13a954f121af724fa4e3d3ed9215f23dd6a46f271674c746d7d992c0ec979383b27cab001dc9b1223563fb6aa44954917b0a355fcc75d19abab1c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.36.0">
+         <artifact name="error_prone_parent-2.36.0.pom">
+            <sha512 value="8157ba706ab6932cb428ebd295693477491a7439341c95994f492a10cc3b3222b30a3777e61a9f208fcd1623fc613a3a7fd3cc22c95c56c64e3dbb9d3ca5aeed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0">
          <artifact name="flatbuffers-java-1.12.0-javadoc.jar">
             <sha512 value="387ba20d07726fe84f4b3eab082ded15d70433eb49d16195ba03a984ff8989891f4f4bab5a2c6b53f4395b325b90ac3f2fee9b70e5f97a362b8a7114ace23ef4" origin="Generated by Gradle"/>
@@ -3125,6 +3289,9 @@
          <artifact name="guava-32.0.1-android-sources.jar">
             <sha512 value="260faee7608dee85940b1c12fb023f007101cc898b3f67c208104f32cc690175e8b936b3a0cf466b743ef81c074ee10632e63c349f8e28d9543dc3a2fe9f70d7" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="guava-32.0.1-android.jar">
+            <sha512 value="6b834f3c939efbb88dfa46d32246e0db968bb52b9fd47fe9f89fa3fbef4bebd42be8ed08fc3c4310f7a397f82a1f40ddfe9fdfb15d30ed7a704865eba47b0bfe" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="guava-32.0.1-android.pom">
             <sha512 value="cd85f39861c7ed9b739ec87804c3257e9c708e55b6bc64fcd84581067d3d0f2fa35317174446ad87ba60f89babc075ebb77e36359337d5c20b28551b815b6149" origin="Generated by Gradle"/>
          </artifact>
@@ -3150,6 +3317,9 @@
          <artifact name="guava-33.3.1-android-sources.jar">
             <sha512 value="9f068228e43d8a1840c550146617edc7fb53fe941146824a19e3f3febee9f1c7d0e2e914b9749f4b0cbb7bd926cc57304ad1e3440878de0b4facc2d8ffbb24cb" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="guava-33.3.1-android.jar">
+            <sha512 value="f552f01c63fe797c4a91908bf76e1739463c6d5ff2765689d5072e94f2aff513bf1ef575acaec83a284e440b5bfa9e7e4612af38f6db4df2587f131ea3b0f252" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="guava-33.3.1-android.module">
             <sha512 value="da61f1e741260591b23700b81bf455169ab1da39b3915c96a7830c6d057921966aaa5df3d7c2f9a1cd1c967db8e4e589bbe41bc3e4d346515a169f1b1b1f6799" origin="Generated by Gradle"/>
          </artifact>
@@ -3164,9 +3334,6 @@
          <artifact name="guava-33.3.1-jre-sources.jar">
             <sha512 value="38c6e66f2288757569c7ae7f7727b03cae95ddde2db6be107c1de724608bde352527c6d928264f2c083d143c87422020d6355a7599d5842e7bf3bd8a68a08fa7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="guava-33.3.1-jre.jar">
-            <sha512 value="5fdb406eeafbb7b409bae82924b7c26bdcdea06c7edbb673901814c3d35010bc91139e5139663af0b66f8fa47f54e0e96dd86fdff1797c9ae497c10a466b02e3" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="guava-33.3.1-jre.module">
             <sha512 value="9ba76c1e924406aefe5e3a37e536fa4301a038fc671605eb7d2ffde7723e25fdbe6e26b6a297d5fe74cee8790fc0776789865254a30a1c87c7c00c499a2c4aae" origin="Generated by Gradle"/>
          </artifact>
@@ -3174,6 +3341,23 @@
             <sha512 value="edc26505ae9ec67ea167996de4ca09a095bd341d19a004241332c59992dca53e21c07814d0dd5f33ba7934659e7ae1ac85ec74ef7da248074dfe35aa55ba14e8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="33.4.0-jre">
+         <artifact name="guava-33.4.0-jre-javadoc.jar">
+            <sha512 value="1c77094db8d2b33bf065e30351ddcfce4e0404def67ae14dfd6c19450f7e3b0d03cd52b81878a185e62da7a4bc81d198aad0fe3cd1b92f3af3191fd22dd89527" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-33.4.0-jre-sources.jar">
+            <sha512 value="346fd1c27f61961c2d8e9219ba18abde7a0a941e29fc6ed39079bc02d6818f4dd8d212464b41331ced7fe1fc38a81a2c672149d4e55703ddd54e17d53b8b8879" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-33.4.0-jre.jar">
+            <sha512 value="778bd20c3ad83dd17d742368814cf97f28f3ec5723ef952a634290dbe0b4ced8c2a8f878d710fed10223d4393c510df39583c78921c592f605a0bb7003d98f84" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-33.4.0-jre.module">
+            <sha512 value="435bb752f9daa0c25c8e3a8e5c87313c47cd7e2c6a6cb859a6d642f5ca9ec97e3b3a4dd62260fe022011d2b71e1866263e61b830317aaa8fcafd1af81457972f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-33.4.0-jre.pom">
+            <sha512 value="7117b4c5001f3bee46475748299c19f3df4a0645f875770a1468261ee49705d2bb889efad52e8594e7c8bea5377cbc82fd404efe5c7a2911c3f1f06818da630d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava-parent" version="18.0">
          <artifact name="guava-parent-18.0.pom">
             <sha512 value="a786950cd13c9be1828518bdf967043890d87478cb4705ce489627d08195f9575453f3ef0301c35b13b4fde07ec05b1cce4be59dc6465b551847510871716226" origin="Generated by Gradle"/>
@@ -3214,6 +3398,11 @@
             <sha512 value="3927dd059c1f983b7a390b08f93f49931231a20a5c77b6b94eca6e536df1a5c1d8f2248ed9e906e3fc621f2c44421c5dee9e82f8a722d9cea1e35a86cfc28a66" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava-parent" version="33.4.0-jre">
+         <artifact name="guava-parent-33.4.0-jre.pom">
+            <sha512 value="0182ac06632a0d7e9329d101b1e2a18b27f34eae0f83f24c195d76d4a9ffc6fcc3ba0a74d1abfae630a399d956135a02777832782d0b7b292565801554927dba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="listenablefuture" version="1.0">
          <artifact name="listenablefuture-1.0-javadoc.jar">
             <sha512 value="7e4cc5816360c0595ecd6689a63a92580b3a25a3b560d65f8d1888917b046f6332e8472ec4b320fba6e32dd913ad86b4e3cf139ddea348a9f739376f3736ae96" origin="Generated by Gradle"/>
@@ -3221,9 +3410,6 @@
          <artifact name="listenablefuture-1.0-sources.jar">
             <sha512 value="fca2e45000491509debcade35c1f3a04e436616e7cef287659c8df300ccea8b92aff470020de07e1e91b22210ce76f578da24c8cbbb02ee8101712f0469e562c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="listenablefuture-1.0.jar">
-            <sha512 value="22eec60e16983b6d52ef77a77dc7005c0100ac04b88104503c477d2fe8de967b0d543ee8c8a084fd32e0501571732dab0543b144bd025b4eb1c50481fac284ff" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="listenablefuture-1.0.pom">
             <sha512 value="ef829d960e54aeed864cfd020b292a59c0b55efd5aa3faa470773696c743eb5b04b3837214b7144c9c282791a1c15e016d1a54014dc4388b0c531eb74755ebfe" origin="Generated by Gradle"/>
          </artifact>
@@ -3314,16 +3500,21 @@
             <sha512 value="ca3b1460f671353510c042507b3baa7150fd5d4902b0645dab9bc0c53017b07d229ed5984ca557726c1660b1812aab4ff8d80ad4ecd6d9d9db769815f876baef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-bom" version="3.24.4">
-         <artifact name="protobuf-bom-3.24.4.pom">
-            <sha512 value="0c6073d86dfba3b9bb81f9b17e76036118e8584b86ea94076d7641440073001f22de0d37acfc3098552a3d391f95708bb83e29497d1f754fc7f70da8d7643bd4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.protobuf" name="protobuf-bom" version="3.25.5">
          <artifact name="protobuf-bom-3.25.5.pom">
             <sha512 value="b900a81cfd33a1e85c903ef0eeea375a1e5d85cc6ccb3470b7bbbcceaf928e9e8670405a546aafe2cd0e7e9ed565628eb0990bcb1ae643e0c394f2745cd84007" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="4.28.2">
+         <artifact name="protobuf-bom-4.28.2.pom">
+            <sha512 value="9acaef56393ad4e2f9d78f0a80595cdf02441fc3ca3b63608d31552158c77416038ddc2354514b85d5dd6551bc61e5584d5471a496d6cedfd32bdbddeeec7f96" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="4.28.3">
+         <artifact name="protobuf-bom-4.28.3.pom">
+            <sha512 value="e63c82ea89720f5353fa2cd809dacfaa10e527835b170e2a5809189e306218abf8c37917eb4f88d9dd45dabd69c1076f7b00501fd66ba5eb52da08e143ddc444" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.protobuf" name="protobuf-java" version="3.10.0">
          <artifact name="protobuf-java-3.10.0-javadoc.jar">
             <sha512 value="e49bb95455727039e3a436c0953d64e500f1bd82492d474a7ed76a5a29f3bd32f2dbd67ccbe1972f806695f8a1d08e917951c3f19670957c89c009ecb50d6f98" origin="Generated by Gradle"/>
@@ -3368,20 +3559,6 @@
             <sha512 value="d0ea6ae6694b9c21ce5e27749a22f4db5d474b91b5538c42fde5a92f144dfca4f5b67c3e76e8c247288a65ad316706d73f70be55cb2716c99388f9957a41854f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-java" version="3.24.4">
-         <artifact name="protobuf-java-3.24.4-javadoc.jar">
-            <sha512 value="5123ef30167932a4d24b0d4093b741a2ad60834e264959fcfdfdc5b14d62403463847d5f61841ee9b172675f9cb1c482ca68962499aaafacf9c0fdbbffde1b74" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-3.24.4-sources.jar">
-            <sha512 value="5c46bfcbb73135a34c72d0c1c55195730f935d6e69105767d74ba67339004b24a96fef177b0faae9a003fcebca6010bf9b900cd4a29a04d23b1e90ef3968c621" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-3.24.4.jar">
-            <sha512 value="727734a1bab35aeab44fbe37ac2698b52750351cd0573502599934a2baaf7ea5bf63dfeefbe2c697a5648532a04992705554f060819ad0379653f89f2eed9fb5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-3.24.4.pom">
-            <sha512 value="5eba3e479993801fc298883e7890a86f7e5ad1019f28f4a7340ee10847aea32bfd0f1e3c76513e4af5489b3b03e5d5665591281f1f3c0854b38dfee8954de1d0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.protobuf" name="protobuf-java" version="3.25.5">
          <artifact name="protobuf-java-3.25.5-javadoc.jar">
             <sha512 value="2646dbfe40dbb8df0b154bc5efd7cca754085f08dbee4e0c700d8e9c89891dbc67dc53fd1cfeb0e548bdde344478e18ce3db9b22dceda85526a38a6ece1c2195" origin="Generated by Gradle"/>
@@ -3407,6 +3584,31 @@
             <sha512 value="551fd4a6c8c341278e96dfd6a56927f4c7e59da83d1ff46ee0b63fc7bf30da1498c8f35c9173498461bf4df50c6a34df9e89160dac519a03ef9b29a760939799" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="4.28.2">
+         <artifact name="protobuf-java-4.28.2-javadoc.jar">
+            <sha512 value="bb253ba258351f3808d846d62aae5797368c365b6fbb44bff81d5aaa15d07dc8b6cc01fa541a6099d0b326aa9cb3908651caff83824cf11a0040e18948700665" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-4.28.2-sources.jar">
+            <sha512 value="1e10fa47c98797d8a8b24ad3e3ebffbfd39991c9b34c8145d5ac4ace3bcfccdde81e184ccccd80b6efc9fe91f7c76203fad101317dd16791cb3cf2a00972992c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-4.28.2.pom">
+            <sha512 value="d0ba226824c6721dc4cee15c49fa68aa67c8ab3f49b12a1e24bb12c302140c375b1365d45b61d822b14053198d53ec3e1857d417455c2007fd2b41daaa65ea07" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="4.28.3">
+         <artifact name="protobuf-java-4.28.3-javadoc.jar">
+            <sha512 value="37f1f6468e0eaf63e9945fd7934b673462a61566baf40a314615d5e4794011eed62b943a16746f7bac6c5054d7e2913a6cd8bb94b4088f09bd21779d21b4106c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-4.28.3-sources.jar">
+            <sha512 value="685ae1b8ca01eae7c872a787ae4ac65dea0d13768da3b6945dce4dc11e2a24e36ac05abc4cea6cc051236a0f937af5960a0c7a2a28739e66d5626efc401e4efb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-4.28.3.jar">
+            <sha512 value="5684750333816c0ff74bacdbd37e0206677cad04a974884385af1e8713863344686173d2d5bf90871bb30aa7f7326e646eb09b0a3040f4322190ff9a57e15274" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-4.28.3.pom">
+            <sha512 value="e3f2ae6e78f90fac98295f8c0dcb81be4369a4ad2843ebce70a27d33d7cbf2b5f43da5c91be306cac6a45d0462190ba454d0c56523a165e6e2eb06775b0fdc87" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.protobuf" name="protobuf-java-util" version="3.22.3">
          <artifact name="protobuf-java-util-3.22.3-javadoc.jar">
             <sha512 value="38daa0f332b84889cd00a9b5752cfd049578e2359ee3bad0175660a366d9ac259e3660870b84205e38a0a21dc4a74e3c89262582ed7bf08eecb6a8536e7e507b" origin="Generated by Gradle"/>
@@ -3421,20 +3623,6 @@
             <sha512 value="c44bf0fcfad725e8e44bee719e5f742a4a51abee5d9040f8ae5faf5c2e1cc63e09bffe6c38126807415215fd5df4380a1e7229c80d26f601cd5c329a1515ca50" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-java-util" version="3.24.4">
-         <artifact name="protobuf-java-util-3.24.4-javadoc.jar">
-            <sha512 value="23631df865b1857a41deba948696099fe91154ffe5ff44c4283981b3b72a4c436d8ef10fad81a8aff0640ed6218135984937b764093596c3fc9bf7dba6fc3411" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-util-3.24.4-sources.jar">
-            <sha512 value="a11e411367bd670de00128ab1a2c26a6e72f61b60b8a95d2b7748fd085a1300566e40e679b8ca03f9ffb4db5933dd56782f811050138a91e4a3f107b95d750da" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-util-3.24.4.jar">
-            <sha512 value="688c4f4461b36fa5f7617c20bdfdf814e5846b6736b3e03a621345e7679646450176e6d6dbc24b0494daa3bc06ba32da8ff1cf11e59c8586f91b44430d632d6f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protobuf-java-util-3.24.4.pom">
-            <sha512 value="068f993cfaea2b3aeef082638c182cd50be0cbf631eaf7501848c5848e8637edca60c4ddfb1ae6fc11436bf6e38cb6bfe125727043887e40da4d1d15c9915f97" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.protobuf" name="protobuf-java-util" version="3.25.5">
          <artifact name="protobuf-java-util-3.25.5-javadoc.jar">
             <sha512 value="58f5be5af169f6b8dcc3ac974094d1de76abb7b4ff38ea5a456e97b5b0359cb022f50581a65a09b94d6cdbe473d82d347a6eacdf8b549d22288074571e331ed1" origin="Generated by Gradle"/>
@@ -3449,18 +3637,32 @@
             <sha512 value="7af1dda607c8d3102670c2dc2d130a5a38dc3da4c54d8111e63137fcba924e206333baedb14cdef5a37cf5dbff0e99db92951419837ae676d0ebbdbcc9400acc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-kotlin" version="3.24.4">
-         <artifact name="protobuf-kotlin-3.24.4-javadoc.jar">
-            <sha512 value="1a01829e24316c12b2f1b80f17074dee821c848d365722a72f4155bfdc6ebf02ef403481b653279117ac55f6d987f96c9e7837ac1ca87a7a9cc8188e815288bc" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-java-util" version="4.28.3">
+         <artifact name="protobuf-java-util-4.28.3-javadoc.jar">
+            <sha512 value="c46b8c7732da1f364d142f917f8b51d3b302d1ebb5f6cfc31f81c27e7163ef658c84f020e6f2f8512d1bdb4cda22de3e2c869ef44d2913af1392459dc84122a1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protobuf-kotlin-3.24.4-sources.jar">
-            <sha512 value="bab7d87c7e52d6493b10240639a0334f70714b8dade1ad9f03d760b5e5e509b1c4d4df4536928bb4812ad24794084bf72f26b035fce31c77d4ba9aae0617bb59" origin="Generated by Gradle"/>
+         <artifact name="protobuf-java-util-4.28.3-sources.jar">
+            <sha512 value="8cbe7ce58db9d127ed9f75187b98368a53df3a900fcc5a865b13f4669a88e5e06fee497f151bbefe356c3f3656b4556d4bc190e512c30618966ecf452b953399" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protobuf-kotlin-3.24.4.jar">
-            <sha512 value="a61815dd3d4701d8e71a9fab35a662d9e64d17a320299636590036843ac1d011b1ee2e6dcf39f0cdab5ae70ed5ce3c53d09b427587c734e2ba669e976a4497dc" origin="Generated by Gradle"/>
+         <artifact name="protobuf-java-util-4.28.3.jar">
+            <sha512 value="1c363c85a8e3812004a43a6b8c928b5ff2f1913b70d6065df9dda69d4d44b42f06e3bc44e7e54582dbc1e783ea438d79927803a7003ebc9f1329d996cb0c13d1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protobuf-kotlin-3.24.4.pom">
-            <sha512 value="e379a99afabc15f64e766eced0fb5bcd85e18e0bb6c5d6afc0d86623e22f444231ba4975afe161b0d728fbb633b67a042a91f932f91e5b17c1f4f1e3ec3d6802" origin="Generated by Gradle"/>
+         <artifact name="protobuf-java-util-4.28.3.pom">
+            <sha512 value="9dbceef9fab5365756346fc46faee2c342377c56133378c51a0867eb4595dad3f7a73f1924629af1b838b1e72926fb05d6355473f07066967f104cec1e15512c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-kotlin" version="4.28.3">
+         <artifact name="protobuf-kotlin-4.28.3-javadoc.jar">
+            <sha512 value="ed7aa7ba8e1b226043a26eae4d8ed1f639acf027bb86f34e200b4380a17cb8d964d9fed6095c22e11b6108d59d5d07077e07e4a6efa74a225dcb8b2b4908d135" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-kotlin-4.28.3-sources.jar">
+            <sha512 value="838a371b562292109fe4c20fea276bf567e9ff9fb71bd395d8522b2383411d76e34a525706f8360832705462fec18814601747563d028717705fc023896c0176" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-kotlin-4.28.3.jar">
+            <sha512 value="7ca406d49a175167b71c512de80271f9d17359d28ce92c5983743c4cf758427c2faac0047501261f9485892f9905841d89fcbab380f2507fa63a77ce82ec7241" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-kotlin-4.28.3.pom">
+            <sha512 value="597810d15deef5077d4f06ec3ee32a4ef2c828ec4f47531ffdd17cd7df223bcd1348ca8a244023de79161262e022231014b6c91599b9e50522b35503ecfbf317" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.protobuf" name="protobuf-parent" version="3.10.0">
@@ -3483,11 +3685,6 @@
             <sha512 value="7a9e4b50cb6d49dfb82141e85dd5209283c53e6cb702f7b0434e8338380700c1b30e32d8bbd81782a9e068b59f4e6ea3c0d3627114eef59e216f1e373a893163" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-parent" version="3.24.4">
-         <artifact name="protobuf-parent-3.24.4.pom">
-            <sha512 value="7301cfecea55bd2e6192f9b144e50d69d8a3fa9cd5b3a873cd2a23b7a0ee6c4083203c0d6cc615783c7e06fc43d26edb962569a8c8107909ff3c7b8084dc4fb6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.protobuf" name="protobuf-parent" version="3.25.5">
          <artifact name="protobuf-parent-3.25.5.pom">
             <sha512 value="7470211ceeff2ee79ac892d9f1ed22e698a0f9e07ac1546943bd5abd20e0133de075ec00a5bb230d16ffe900995ef028ff950c7395887ba3108c59ecf1074456" origin="Generated by Gradle"/>
@@ -3498,89 +3695,99 @@
             <sha512 value="f4a5e45600ea198fc2484b093b34d2d146e41a1c538d36b0f00af824092c1b92675ce70f89b0dafde5b63d3de3e4638d578941dbabc5bbf2f3069cf4f58e148e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha03">
-         <artifact name="android-device-provider-local-0.0.9-alpha03-sources.jar">
-            <sha512 value="9ec5ced09e94770434f0240616272da03cb877f9f549f2a472989091c1500c410f05b434c0570798ba7a02b225a701506798790e4479ec1c9c38296b357997c4" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-parent" version="4.28.2">
+         <artifact name="protobuf-parent-4.28.2.pom">
+            <sha512 value="487c7fa9710f95ba5254eaf51ae30d46864f7b3b101730da64163039e62fe09e4a31d2391a71307e266fa423902a6b0f37e2951d3201df1f0bc5eae96d7698ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-parent" version="4.28.3">
+         <artifact name="protobuf-parent-4.28.3.pom">
+            <sha512 value="15c7746a6425d6f9607ec0e93519b69831f3d05b584ce6576f2003bfd5a9f1f61bf46d7cde37c82598ee070f16b193024996a17dc7f343c134c5a80016a9fa30" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha04">
+         <artifact name="android-device-provider-local-0.0.9-alpha04-sources.jar">
+            <sha512 value="87d08fe2191d76dca6cc71107d86fd599d143c92e5537ee7313954715021b1fc8d29159f77289032cdd2c8f6cc900c3006ec93e20156475277e2fd0259dca2ca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-local-0.0.9-alpha03.jar">
-            <sha512 value="3bb0a96dbd82be69d93ba219f41ec1cc92a9d093b5e0f2032961fe96cac91c7c9850a460a36e08b59284be3dc106f6e6fdf012ad764c22c3562906f81a1aa643" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-local-0.0.9-alpha04.jar">
+            <sha512 value="0141777db3bf7b8ec4c8c1de4e330cf9d592a036d70a81cd7ed24914cbaacd5eee52e20cbe5f1206389974f6e595e0cecbb41069bd2f2390859d16b9bfffe4bf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-local-0.0.9-alpha03.pom">
-            <sha512 value="9dc1e4e4b8afce592ee47c9ff1a958773e2d0642af13b9c7409c67cf80a57083ad71e7412520b0fb5b44262cac35b7dd0a7656051be6c92515d4b8d666939d44" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-local-0.0.9-alpha04.pom">
+            <sha512 value="d352c439b57e650e1b6c15bc75467fab6210ca6396ebe54a30c2310b278eb333efd6ebfe40d8efbd6cfcf3564093030df746f7423cfe247804bfff757ccb0c0f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.9-alpha03">
-         <artifact name="android-driver-instrumentation-0.0.9-alpha03-sources.jar">
-            <sha512 value="498a0e97e3acc4fb5cb61dff6f7d7d97e8307e357c77a7ba39fcc5285660b9015ed256c742544e897e4b12a568c3dc1f2dbd423662acc6b6bd08e1f8ebb74d87" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.9-alpha04">
+         <artifact name="android-driver-instrumentation-0.0.9-alpha04-sources.jar">
+            <sha512 value="b9312699d10e5d1d74c9b537d6af7e2e04219779f52729131187b19863364b204a2fdf4a15e72996a8bed39545fc665ec58d0d37bcef2cbfe3ebf0a19743a991" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-driver-instrumentation-0.0.9-alpha03.jar">
-            <sha512 value="89b12f2a306e66b5032d0b6abde7c3340d7f4dfcbec932e757edd5b0b5f2e3c2575c7dc0933d6922635a7c080467ef08d7894d5d36952847c290c05fec962731" origin="Generated by Gradle"/>
+         <artifact name="android-driver-instrumentation-0.0.9-alpha04.jar">
+            <sha512 value="f5de73e8f3adea91ccfc4307cefa18831487118d6654be3c5370368299d1f86c143010deba17d43933826879b3d46253c26899a836eb53deca26451fbd1973d5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-driver-instrumentation-0.0.9-alpha03.pom">
-            <sha512 value="0670267e3c12f79024cdf32cd6fbb49d0b0fa4158967aae5c82dc88e9a7caae4257ead428b25c25e29dc0c4ea95f90e6ab1af7e86939af9ed095456ad09575df" origin="Generated by Gradle"/>
+         <artifact name="android-driver-instrumentation-0.0.9-alpha04.pom">
+            <sha512 value="6c2fabd606f6b5f0a01592f31c950bd83390c19d7e171ab7acaaff9135227e33e949f21fdcaf07de58403189eba97acd6a0915f876fe9d934d46eaed5c277114" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="android-test-plugin" version="0.0.9-alpha03">
-         <artifact name="android-test-plugin-0.0.9-alpha03-sources.jar">
-            <sha512 value="b1667314958da0466fba1af966fa9e0d4bc63145554ab6cdd49f8e732a69405e7a21bce0eb25edafe2ed3da74fb5ca295f821e3d7fb2a144058ae1dba9c068db" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="android-test-plugin" version="0.0.9-alpha04">
+         <artifact name="android-test-plugin-0.0.9-alpha04-sources.jar">
+            <sha512 value="b724a4eb4dfd0db1e9da5728539633fd423b85f59a7c180921c1155466ed81fca23a9d82ea965637da3295aa040c710b0d4ccad0eb084c06b796df10430850ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-0.0.9-alpha03.jar">
-            <sha512 value="e1407bf98168172cd15d9f50ee51e1406df378d1797969133e0fb06b090bedffa5f12a3aeca3487631e5c13dfff72224dd064d350eb0622f4a02d9702fcf498c" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-0.0.9-alpha04.jar">
+            <sha512 value="64365b5d2322a492ca43ca5012fcd151196f2b6c01bef26b836f4c9bfa704e31d2c0df1241ca992b362907f86edd1e26f53a1cf44cf2b8f2b755c939d0985af0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-0.0.9-alpha03.pom">
-            <sha512 value="5ad685eb78e641ef8c15966ae34d7a7cc4db9890ecccea416b4f8b25d99ca6dd75b875d353b21ec6987a5b436cbe9d6b9607518bc15ca70b411014c1b1d56952" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-0.0.9-alpha04.pom">
+            <sha512 value="bf2e230cb4cf309bcf69dce936cceef155d859b2b128d2ebb9d82630177c55ad2a326c9c06d8484b4896d9193384b3a7f8f5f7752c5a9036484f97bcc0d2793d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="core" version="0.0.9-alpha03">
-         <artifact name="core-0.0.9-alpha03-sources.jar">
-            <sha512 value="c0d747443a19fda848721ecc61d01545c4c7ab0e5476db92d695a13ed6082d45cf018af5a879816627e59245b3de4144ab6824b16595afdc819c3505baa3c75a" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="core" version="0.0.9-alpha04">
+         <artifact name="core-0.0.9-alpha04-sources.jar">
+            <sha512 value="4801d63fc07e00f1df5ce52c64fa6defd287914cc182efc9d78f0ba94900385888dc7758ecb8a9cedda126928c2f22f272422da3e789981c713b07548dd14c0d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-0.0.9-alpha03.jar">
-            <sha512 value="f9f8e4bcda1e992179bbc7d63d849e809b8f8d3249bf9e0ece4e8aacffee464a5a0a256fe5097b5b19981543cb8ad578f5f043948a5cb6128d4c230807a8532d" origin="Generated by Gradle"/>
+         <artifact name="core-0.0.9-alpha04.jar">
+            <sha512 value="a57be61573f900eb69ba0f0675ce424d4a0a0119a6a64c74cb471422849e4537fb3b3551bd62df7fd944881bd6230c8d96efc683d45c24c8b58e2c98f6739f14" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-0.0.9-alpha03.pom">
-            <sha512 value="62efd5cbcceb49bfac7b1f5fcc9d4ba76a839040ce6280ea992f0171a5ab3c7a56588cf7740257e99b14adf3161382c99a3c7333dc8f26d676ead2267a8040f2" origin="Generated by Gradle"/>
+         <artifact name="core-0.0.9-alpha04.pom">
+            <sha512 value="eedd7cb2ba837cb364e317de3906652e246d70a78aa322737451ad3228e1815e0a0170aa84a9159c67a5540545a2a1deead2a888a00558096bd70e861d3e2cf1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="core-proto" version="0.0.9-alpha03">
-         <artifact name="core-proto-0.0.9-alpha03-sources.jar">
-            <sha512 value="355c8211ab739af767850c105f6f595da3b9a2c67a0a62397cb96e5f68d248e12780c48fb9f72576d9807ce84d734cd19d4a5abb5c25e2f9d96a5ac1165597f9" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="core-proto" version="0.0.9-alpha04">
+         <artifact name="core-proto-0.0.9-alpha04-sources.jar">
+            <sha512 value="a96896a6c5aa284cd963522469be803d484b1faa2013b2f3318e79cd85bd5f03df2a45cfdd1f04d3bd158972c593f8d1ce99f0243dd525b3e9a4fc724318c358" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-proto-0.0.9-alpha03.jar">
-            <sha512 value="39f974779b3a8ab5359c0f499cabd0dd021bdf67e1c5fddf4c2838589e9984b812f52eb095d8b6da749a98ac29400a873ca7f6ffef5063b76fc181a75e129b26" origin="Generated by Gradle"/>
+         <artifact name="core-proto-0.0.9-alpha04.jar">
+            <sha512 value="7f761ac60320c05ad5f4475e8ad9582608b18345f97ebd1dc1fd22b53095c77de1c3830e9a492e1e85e1c4b3b829f5cb5f0a5ff97c09e718ab8ce136aac24642" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-proto-0.0.9-alpha03.pom">
-            <sha512 value="55d689847fcb5c4cfe724232491948f26f7790aaabfbf5a2d72e5ad093b8310ba956bd5830b004592fd24df08e6af629f7746d3ce427635e51e5577ee5b7214a" origin="Generated by Gradle"/>
+         <artifact name="core-proto-0.0.9-alpha04.pom">
+            <sha512 value="89928c17c858dc5fc81f1e2e6752b5cecb7eb50fd3cae0e58ab1416c998c9871f27011b42d558f0711448ff707a31d80eb208d67977ee4aa06704fcc05cd4f12" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="launcher" version="0.0.9-alpha03">
-         <artifact name="launcher-0.0.9-alpha03-sources.jar">
-            <sha512 value="b6eda5e07096c9e2e929f971eb92b253acd2fffef328027ed97d84b3601d5e4caebc72dcf6a424a64cbdcf6dfd11dfb2db56d2edd4be38838ac36cac33628ae7" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="launcher" version="0.0.9-alpha04">
+         <artifact name="launcher-0.0.9-alpha04-sources.jar">
+            <sha512 value="39b785f571d26b7332c145ca5cc24b8e0315c1882a07991c833932ba2f2e29da849a9f9f6f14b66e2827735de2d59c201fd6e19e93c0b95475c858cfea6830e2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="launcher-0.0.9-alpha03.jar">
-            <sha512 value="79555ad640603de4854f2760bde75b852085cc33ceb0ea026d81edd42682622e7eebdc67674cc91fb335daf3611a95abdb1c7c5195e806951e349eae49df3f97" origin="Generated by Gradle"/>
+         <artifact name="launcher-0.0.9-alpha04.jar">
+            <sha512 value="b23a3ea31d332294f7abf329db4ad3f9079f16909653739e7aefa7f4f53c134f4e4c13a6fb59d46f9c9b14661013ffc247806d10e8adac38ab4c08b048907db5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="launcher-0.0.9-alpha03.pom">
-            <sha512 value="f987eba736f80ec3e8757a71215ca28dea07e644508b59fe9d986feb962397c9fa235b5482251ca4c107aaf0d3f5c7e3264212a9f39af30bb7d5f76149d2ace8" origin="Generated by Gradle"/>
+         <artifact name="launcher-0.0.9-alpha04.pom">
+            <sha512 value="98a8f9d1c41c821b6b294fb879a32959845eb3069eab2fd0b1f5024e6812bb4e14872e0d48756f51ad26708ba4e22607bedc9a0247f6f9c0400867b50e6d236f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.zxing" name="core" version="3.5.3">
-         <artifact name="core-3.5.3-javadoc.jar">
-            <sha512 value="0cf9d817b7cfafa72a95d53a25407660dc4cbc135e0da7d48a87ecba89afbbd043a124092ff6f4aa9241f6fa318e250308789456e3032affba2e2cca58571241" origin="Generated by Gradle"/>
+      <component group="com.google.zxing" name="core" version="3.5.4">
+         <artifact name="core-3.5.4-javadoc.jar">
+            <sha512 value="25171cf57452d07eb3c42b1d24f4d7b09b361d1407a7b642dc1f8647f683404e25f1bfd96c9bbb32b9da91249d4d6579c09657769378e6a7bfe3fe00eb513882" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-3.5.3-sources.jar">
-            <sha512 value="c61829945ff70f57a700d59d85237dfc83e36b93cf3bd2b8b07a9a627caf2104459b0de341e9663dc041cc2e7aa098515ad7483c41020ff28b63b0c6e69f036e" origin="Generated by Gradle"/>
+         <artifact name="core-3.5.4-sources.jar">
+            <sha512 value="4de1017768316cbe517c926a51b7263aadd3e63848e7f1ad5bb27210e939dac2800432b2441c2e42382ddd48e3c651f265de271b3b2f7ec18d8d673abbc0108c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-3.5.3.jar">
-            <sha512 value="0b5f04f1c17c2686a709bfbd217a3bcd8c9e143139305986b062a6cfc4050d0de43debbc8a0cea15dfc0f8c009b62b0c99207228c17530ef05a465cf9d68b959" origin="Generated by Gradle"/>
+         <artifact name="core-3.5.4.jar">
+            <sha512 value="967023e2aa3268cfde113b658c6dae70188d5e24e43fc8bcd414592225d66d5c2203045a32f7b185bab884990ec66dcb1ce93b7f61906f666c7ccd0646c8a764" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-3.5.3.pom">
-            <sha512 value="d7cf0b34848ee87693976cc1751f44438bd57b7255e0dc58c517ed6ff320649bc8110c9661a707b2ac264ce0626e60a3e0aa87e797704f9bb0342ffe808df884" origin="Generated by Gradle"/>
+         <artifact name="core-3.5.4.pom">
+            <sha512 value="d8cfad82a0b2431f8b3e63d21f10c4b2edc02bafd247341be5e8911bc9e33b00c43a90ff4c4849bc567a575d5f04000ecb7f64b6acf6cf0d538be5c1703d68ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.zxing" name="zxing-parent" version="3.5.3">
-         <artifact name="zxing-parent-3.5.3.pom">
-            <sha512 value="f508de41cf1549d2e2d729d434f22f79f9828967c39859e831fefb4e80e921d5ab21e0d84c6ef586c175b7700ac6ec319a75871ea20d314587911f430c86ed32" origin="Generated by Gradle"/>
+      <component group="com.google.zxing" name="zxing-parent" version="3.5.4">
+         <artifact name="zxing-parent-3.5.4.pom">
+            <sha512 value="a0da56f83ce6b52d0fc5405215d75947a5c70ecf274f4a17b0fefd24c4bdd9488ca8e8cc2a182197efe751c0eb22fb221c8663f9cc3aec3076463f733778dad6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.googlecode.juniversalchardet" name="juniversalchardet" version="1.0.3">
@@ -3852,20 +4059,6 @@
             <sha512 value="921ddda33077e5310162f33b2864a90438c77ecf33f4d0ac5ac9f2d75ca7e8b1f29c5fa60f8b27944977bc27e2000dfc3f74c57174884d9c18329e99f51f80f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-inprocess" version="1.69.1">
-         <artifact name="grpc-inprocess-1.69.1-javadoc.jar">
-            <sha512 value="98a086b07fe149e03d66c7b5503044743d162917fdb787995c81bc0b407cd7925ec45627483350bfb75a9d0e252f856ab9a7c13b98c6dff345cf436b8b037e88" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="grpc-inprocess-1.69.1-sources.jar">
-            <sha512 value="b0563824bb017fc4e0fdef9deda0277888d0cfba291675820ede7252df7574fdc57ea8bd79f865757a8cc8077624e8a1e28d6b7e26ebc27f72bb7458dcb5045d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="grpc-inprocess-1.69.1.jar">
-            <sha512 value="dd625d8132229b7dbc677057921017ce2578bf11aff60201f9be4435dc78459651fa8ffd1d7688ab876f1742b521b73acd83ecb35d4b23c3ca68c10a2e37d2c0" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="grpc-inprocess-1.69.1.pom">
-            <sha512 value="d5f1ff28a9238a3921a0163c33131fb1aabd1b6f81c027042d21fbdf24bf5c3c53de9420c609b5311e931290acd6f81880eaa82a9ce83d4f10ade94ddd242d8d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.grpc" name="grpc-netty" version="1.57.2">
          <artifact name="grpc-netty-1.57.2-javadoc.jar">
             <sha512 value="9cb8e1e7309d370409e3e6a0a9cb6a9372c2bc73afce36687f8bc78090d60de0c4a51abf47fe7f1547976b15c1a6402a9635ea2f22d4be330ed73777caa499cb" origin="Generated by Gradle"/>
@@ -5141,25 +5334,6 @@
             <sha512 value="ae58d75b40e44cb0d8e3bb701c7afefa8cbf96066ae52fc3d57c69b7a7e819fd9b3b01971376da6ea94ee010b9ee59ba05a331b93a65e94c047b095131efd6c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.intellij.deps.kotlinx" name="kotlinx-coroutines-bom" version="1.8.0-intellij-14">
-         <artifact name="kotlinx-coroutines-bom-1.8.0-intellij-14.pom">
-            <sha512 value="5e9e884c94fb9b8209d246c2d14ccaaac79b3e560fe5ed8a54a44d9e64cb067e12451fe2016bf3a312d01e489407c2848989c089392eeae41fc3cff319c0ce07" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.intellij.deps.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.8.0-intellij-14">
-         <artifact name="kotlinx-coroutines-core-jvm-1.8.0-intellij-14-sources.jar">
-            <sha512 value="b4a36b2d5997edb315f1b87bb7d37e9db9a8e36d1ec9e80927078a2f98b56489f7258b5fc6fd6786aa5ded35a94f784a7e62a20ebc0660360557ae9c3a0a42fb" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-jvm-1.8.0-intellij-14.jar">
-            <sha512 value="107c3b45de84e4b34bc0a636bac86739fccbbe924f54b1d4819fae925f38dca5942608a32d48e685072c1d8e30c38b8789c36c3757388dccdcbe906fa9680043" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-jvm-1.8.0-intellij-14.module">
-            <sha512 value="0a1fc0e504261e40059d411b657bab76eccb9f2f5ab424027c0db3da9cb14722119c24e33ef8effb84f528a88ecace10ba779c5ca67e37c008842df780a14105" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinx-coroutines-core-jvm-1.8.0-intellij-14.pom">
-            <sha512 value="8b7e589c44a80c789c888bb74096a1a9a4af330b69394966f7685dbd29e7285452700e3bb86b68c6b975a686dd592493b64a8eeb3529fd5f4861a6387adf9eaa" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.2.10">
          <artifact name="abi-tools-api-2.2.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
@@ -5171,20 +5345,6 @@
             <sha512 value="4fde5e0295710268e0c0727d29859a285d1c9609b1d0bbca93396670d316a6ab9e3185a6bbfceb35cd33461ab87c207b35853c4fff9db463dbcce6d276c19db1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.3.0">
-         <artifact name="abi-tools-api-2.3.0-javadoc.jar">
-            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="abi-tools-api-2.3.0-sources.jar">
-            <sha512 value="de93811d063cde2f5a043a76b7c4982ecdd98cedad1043bd5640c6e94fe2e720386b73259cfda69870bbe77e261bc4021998729bbcaf6cb92f9761315115f772" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="abi-tools-api-2.3.0.jar">
-            <sha512 value="2eacffd2a1555562e897b9150f58c22e504f42cd0345619e3704118e3236e1d17df4a870dc2a4706e691f6611eefefb99fae1ea337ec1f1faf9010c8c69056f8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="abi-tools-api-2.3.0.pom">
-            <sha512 value="3417f38cc5d3d699a6714f475e016409f8955b556784b93f05232ecd2c5007b962fd9a3028de409942f52a5350c408ed86a82721313b0a0879edd91960dfc3c9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.2.10">
          <artifact name="fus-statistics-gradle-plugin-2.2.10-gradle80-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
@@ -5247,69 +5407,74 @@
             <sha512 value="31767a511463ea3533a0ccaaf5efa19a778cc3a7ae128a22bf0dc3aa30d6fb4f37265d7f49cbb17d7f0a59d6ff54b76ef11f3c553fc0bf10789099f9bcab6b58" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.3.0">
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle80-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.4.10">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle80-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle80-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle80-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle81-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle81-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle81-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle81-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle811-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle811-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle811-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle811-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle813-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle813-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle813-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle813-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle813.jar">
-            <sha512 value="b98ad33462d005fd3c82fd382272bf8a7029b9ce05e2044480c779398f5e209fdc041d0afc5961dabe5c6fac64b47afc8e52152303be7725a02e16eba62dc4b4" origin="Generated by Gradle"/>
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle813.jar">
+            <sha512 value="4c2f8323c03845d36b33f2d60c1d5c4d16ed848365d1de03cbf286271e9dfad67be8120fabcc5742c643ffc0f16fe0024f542bc4bc51ac9c71a01f079224aa32" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle82-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle82-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle82-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle82-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle85-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle85-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle85-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle85-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle86-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle86-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle86-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle86-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle88-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle88-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle88-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-gradle88-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-javadoc.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0-sources.jar">
+         <artifact name="fus-statistics-gradle-plugin-2.4.10-sources.jar">
             <sha512 value="7fd55f39c0073a280d14e89a97bc9e9df34cf3bf21c56e54f35b7d51dc26a073020ace5e2d6b150e76536a8af6c16481462cbeebed1a01bde6ebaf1096bdccab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0.module">
-            <sha512 value="3933a8d924a6ed4c4412b0712eb0c2590830c6547cbeb843849b7765e1212bdac82b5a83d73b72eb31e1b491e7ee739dd6e8077751aa5c0fe95c2801ea313c8a" origin="Generated by Gradle"/>
+         <artifact name="fus-statistics-gradle-plugin-2.4.10.module">
+            <sha512 value="8741c4c2f575e4b43edbbc7c9d2c200e957d674f596617565703233d95570f2b91005def3af0c40039100f6526511d101ef7ecb4f82c4b90924e3db05e05cb57" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fus-statistics-gradle-plugin-2.4.10.pom">
+            <sha512 value="1e24ec8c3dad451ee297e5fffac55bb4f4b47bc189db2fba599afc1fe8f44eca3a6ce77add9a9aa8e22ece2b23da767a8fed601b7a8ed7d139b49cafb118816e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.3.0.pom">
-            <sha512 value="08e6ace9c44cf6521e15ce30c89397a0048a57292ca2fbb9c328f13a6f76bfa4cafd7fdfd8e80e8d3b06d2d0140b6829861afce976de67a5108139ca97d1a970" origin="Generated by Gradle"/>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-bom" version="1.8.0">
+         <artifact name="kotlin-bom-1.8.0.pom">
+            <sha512 value="2667b5d7274bdcd0bd674dec68acac9b45091048bed733a42328001d62304aa28ec552286d18b6b475c472ae39dec6bd5932fe2dc5b0f6a3a0eff23584d771e5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-bom" version="1.8.22">
@@ -5328,18 +5493,18 @@
             <sha512 value="8b9468387fb82c027e84af68758434024490e9b4896b0bc78c91f97f6531f192418fbe9659ac4bf178c52a860b29dea0d0f2609a9b1aefc0102e9d34d5b2ef88" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-statistics" version="2.3.0">
-         <artifact name="kotlin-build-statistics-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-build-statistics" version="2.4.10">
+         <artifact name="kotlin-build-statistics-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-statistics-2.3.0-sources.jar">
-            <sha512 value="e5ceaeaccd94cc4e7c79cb63c660129c85019b11d24371966d5fee7f1b998686cbe88a182a35ef70443b4b6c988ba63cefc8abf260efb036bcd3700e20510460" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-statistics-2.4.10-sources.jar">
+            <sha512 value="e63b65e249579ea0777da5c543d9942b096c1bde7280cdb87f102925de227e9b85b0de7646bbffb1843020b9445d6548dbf67c360c45c9c2928e334a2d63322e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-statistics-2.3.0.jar">
-            <sha512 value="5c1bd0c8813bbb44ada6967549e72d2b9a96629f282b3ff704885d2fca883e44ecff1da279bbb128c97595d13db44545ff18c9976fb99dcf0879153d4fd3b716" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-statistics-2.4.10.jar">
+            <sha512 value="0900f71673407b7f86cc63facf221d1e80f07185e130e85074769b29df81d09cb6cada1e8a71544f85f1c9415d69438bd9c42d0a1fd4412edf345e075b77461f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-statistics-2.3.0.pom">
-            <sha512 value="7ce561e7d27fa0022d81d1a956da0d9b14d2535d543c34bc5ac18f04e0f5b83503a074bbc0e1ab298df3dcb8136798b572b893ce860b31b861d418e4cb8c33b4" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-statistics-2.4.10.pom">
+            <sha512 value="888bd72fbde79315d39a0e5574254b0ec14f0e16485dacf951ded559e7bc476be3092e69331d970d2155d331bb65fc3c833a767593815c1cc699ab94094fec47" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.2.10">
@@ -5353,60 +5518,130 @@
             <sha512 value="bf0bd416f823191e54dee888d873c1d07c093e1586f0d0441c84867452cb247db7a560ac90af295f69bd221736dcfe3849dd05bcc952d8da8f3a878fa8047b85" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.3.0">
-         <artifact name="kotlin-build-tools-api-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.4.0">
+         <artifact name="kotlin-build-tools-api-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-api-2.4.0-sources.jar">
+            <sha512 value="bcd8c7cadfc167af5fd6696cf04bfcfb8ed1f7e3255e3f41afeb3032fdb1ebdc0e9ffce317c4d71e77fd8aed821c4b24a6cc4f8ad7a40f779e0db09434295d66" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-api-2.4.0.jar">
+            <sha512 value="e78eed46c18fce4a193aecb91930d08ddfb0e0f7c09ee89f4cea95ca3717555e6e2ce027ee6a8cc17ddc00e147bf890e21b5cdecc91e4a814e829753c5ddc440" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-api-2.4.0.pom">
+            <sha512 value="7f7f82143e51c30ca822cfa058195174c9e908f1390492461f6fa18442632f572059271ed441e22af914efd86c05700b21faacc0a5823959623b869a027273b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.4.10">
+         <artifact name="kotlin-build-tools-api-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-api-2.3.0-sources.jar">
-            <sha512 value="8a51e60f9ee3c6c74b249afb9f048f7790735a982f19b51c16fb062c094a1a0ae54a29c1c6bf0bff7a823c089ffbac38f1997b0342a5fe14d0c97e512ad4cfbb" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-api-2.4.10-sources.jar">
+            <sha512 value="bcd8c7cadfc167af5fd6696cf04bfcfb8ed1f7e3255e3f41afeb3032fdb1ebdc0e9ffce317c4d71e77fd8aed821c4b24a6cc4f8ad7a40f779e0db09434295d66" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-api-2.3.0.jar">
-            <sha512 value="e6ab7cdb3d762ea101fb5469bb58c3b946289721b8c24b5bcdf5e728d9d5b5a58381cf8a0d61c8419e50ec764dd35597a3611b4fe843b2059a385b802695d7d5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-api-2.4.10.jar">
+            <sha512 value="30cd81a17616ad7fa724e1c05ada276195f846cd05cc2814b37ae84caabdb20db22a21fce55d4f8a9f7df92ae8ce3afc21845e816839595a26a6520dea49442d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-api-2.3.0.pom">
-            <sha512 value="9630756f66195f855d72f7afb14700fc2724ecdc199418ea1c0b91ddf746c9bada7b5f5e848e75d2014f3b15018c4707e105c3df5459fe286d1b517e83c86a6a" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-api-2.4.10.pom">
+            <sha512 value="80db8724a4cffadf5d2a82d1982f8f1069658d415f3ec306c045f4e73df4ffa63b419218f4eb651a85678dfdca4db10d9173f5fc93b594f63a9d9f1babddd4c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-compat" version="2.3.0">
-         <artifact name="kotlin-build-tools-compat-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-compat" version="2.4.10">
+         <artifact name="kotlin-build-tools-compat-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-compat-2.3.0-sources.jar">
-            <sha512 value="4845c50455d61c01ad9d04e5b9038032fdd0fb6b84f3517dbf339806005202a3fee01750c466d2ced7a2298aba1feaadc3850ccf83f994976578b077d9f47ca1" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-compat-2.4.10-sources.jar">
+            <sha512 value="16728b1209cdd69ec42176282b259bf42d745fe438c09fb44a38536fe8e529aad47eca44589a42773125a2abd68e1d85e822167d3616d21005b0f5c5facbce57" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-compat-2.3.0.jar">
-            <sha512 value="1148225dab7329969dd4062cf7523ff01494cd388ccfaee145f512f87c488183007822f177af3dba1cddb03305487efeae43c2385659c0cc2573da45d760cafa" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-compat-2.4.10.jar">
+            <sha512 value="4769c8507ab917a2bdfb4f86a41d4396a042f419bed26d5b4db1637c5aa3a667d8c7427fe82c6007a6e2e148cb42859c835eb359a70690a916e1f556e3fb789c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-compat-2.3.0.pom">
-            <sha512 value="45267db21f75dead562eafaf2503b42a9a9476c7994dae97afc662e18d521742a3a73b4105e8a6e539e8a0f68ce1589ddf7184c0fde111eafc8285c30e749cfb" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-compat-2.4.10.pom">
+            <sha512 value="a0983c3324770b67460b8d31a604be5af59daac3ad34190fabd47ac3b2c011ed280837f89c19e523eb96f4f7c4e57f7d40f501a236e2e679543592f6388626a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.3.0">
-         <artifact name="kotlin-build-tools-impl-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-cri-impl" version="2.4.0">
+         <artifact name="kotlin-build-tools-cri-impl-2.4.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-impl-2.3.0-sources.jar">
-            <sha512 value="33d043a39997a514fdb62b17c4f6897ab2f655d2385934ff33234d9c0fc1cb51be27e8021c9c273299658a4b1424011ceb4b2740cbfba3aaab673555d2affc31" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.0-sources.jar">
+            <sha512 value="09f199ae373cb500ac71727cf884b2fbcf7cc298073feed0f64726b79697eb535033f65212cda82991f49a5e49c576f4c14d1d900a6f2c6600ffcdf78cd0a4de" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-impl-2.3.0.jar">
-            <sha512 value="825056f96906c6c5e0ba1c4dc7369e4208c2de867d4a418a6e0224bba236115ffd4a19fd7058f3558fb2841a00b2620d76d41eae5be35275a9ad064ae95812bf" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.0.jar">
+            <sha512 value="40846dc3a50e03dfe114b5732f75aae16c8be6646dab98347ab3cb2d7da9b2e5426c49e11f036e5530d5bc9778e31d4bd60ccb95060e390d45932ee958afc435" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-build-tools-impl-2.3.0.pom">
-            <sha512 value="c614baab70c0936382d690830d5916aadd06c38e534ac93283d498d9c7765252e9e85adce982bf1d7a1d7d9d49399fabb7c7c48b8d349d086746dbdfe82b3268" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.0.pom">
+            <sha512 value="cf0ebfefd6f113db34b714eff40aac00e0e2046d8f423e18e787db2afd7c77f1d23d31be7185aa88fb86a48811663ae224f95225b2a93266e0fc42d00fb7b0c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.3.0">
-         <artifact name="kotlin-compiler-embeddable-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-cri-impl" version="2.4.10">
+         <artifact name="kotlin-build-tools-cri-impl-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-embeddable-2.3.0-sources.jar">
-            <sha512 value="c7e2631b783d0f5eb037fa69364c4cb487686dbe46233dcb55ae805e08a003e10f0bb375f991a1aeef0d28cd20823cfde853267467b15bda40e96934214bccf2" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.10-sources.jar">
+            <sha512 value="09f199ae373cb500ac71727cf884b2fbcf7cc298073feed0f64726b79697eb535033f65212cda82991f49a5e49c576f4c14d1d900a6f2c6600ffcdf78cd0a4de" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-embeddable-2.3.0.jar">
-            <sha512 value="7fee82ea8c74a14531f176b4836f0c42a80032271750b95ec2970bcc6de5b7669fd09e27c9bc6bac31a73d4ab6b460a307092981aa5501267c6c077b11bcc0be" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.10.jar">
+            <sha512 value="db9d7583aafaa8258dfdcc47281bf67d49330f1f47dba0b4dc49852060a7e122424acba5ae00d3d2b2863c4a88cf3e25907c3ef624f1da4fa6ca780daf82673a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-embeddable-2.3.0.pom">
-            <sha512 value="4295dba018e64a81ae67e73a5da09b33b6fca9da0e64790c797d6700ffbf8665efb307886a591f3ff2a558ea276df3d478b7735bcc9e1daf2a14065c26d0b82c" origin="Generated by Gradle"/>
+         <artifact name="kotlin-build-tools-cri-impl-2.4.10.pom">
+            <sha512 value="1a99a0f76d32e14e4886fba5c292b186548bf8e27536c4ed0fcf80e64293dce70a6f054864f08ad1837d3d9bd2355f7feca9cd975a6433dcdab562983beae198" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.4.0">
+         <artifact name="kotlin-build-tools-impl-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.0-sources.jar">
+            <sha512 value="da8df254079d510b238ddba70e7f051649f63dfd2b9a147690f8c22172733a169ae1d3023390d0c430b97c2be294a4af1da0863a71d256d1aeaf2e7b8d1e2eef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.0.jar">
+            <sha512 value="6604d3b797056bf8ef3717de35ed6ab8c37682309516ecef6088a38ed3554df28a925ead642e9b699d07ed5efad60f7040900e434fc1db8e7bfaa5c32b9373e5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.0.pom">
+            <sha512 value="2fd3f6b9aad327f7adc4203972171b4dd80b5ef0af1ced7a9dba787f59edc10ea41734260a307cb063f58d19a2638306b96863504003d2cd176b450102b8678e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.4.10">
+         <artifact name="kotlin-build-tools-impl-2.4.10-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.10-sources.jar">
+            <sha512 value="da8df254079d510b238ddba70e7f051649f63dfd2b9a147690f8c22172733a169ae1d3023390d0c430b97c2be294a4af1da0863a71d256d1aeaf2e7b8d1e2eef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.10.jar">
+            <sha512 value="5985a48a9a59571303e5d98fa2cee1e28e9f96d7f004fcf0b4d603793c18a6489f114974d166ff9102559302876b7c0dede1d6b806a99f81532d1dff391585d6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-build-tools-impl-2.4.10.pom">
+            <sha512 value="68a82b3c6c7fa58055f56e1cabc5ab4d9e179eb3e932d26b6d1519b9c364c14d6e30e0bb152b72db4806bf6719a1ea30387db2539448e38b1a3a8abf67a5165d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.4.0">
+         <artifact name="kotlin-compiler-embeddable-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.0-sources.jar">
+            <sha512 value="25332c1c169c6287ba6b9b4fe0ded4d8f8561c0efb258eb282000be2a25f023858adedab151d66c0ce07da2e981b87c05e11b1f4b4d9b891545e0c8925e956ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.0.jar">
+            <sha512 value="28cd52ea0df2fe34bc30516106d522a331c13dfab05458954e49f4a4430cb6292586282fbd0d278b17ec0ce97dc866691c10359506b6ebc9a53f0db8247c3d87" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.0.pom">
+            <sha512 value="6d35085a15b81fca006037aeab0c03cd54b421f02bcf5ba10fb5b2df2cd2915a590b3fa09668100446f8c7662e2fd01cf19c8c9a4534d3db35def2e9f799361a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.4.10">
+         <artifact name="kotlin-compiler-embeddable-2.4.10-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.10-sources.jar">
+            <sha512 value="194283aa0463c4ffd4e7ec5600480d6c17cd577f74248744447a5ad268d519f9162e0fe09abdefdfff52c891fc22266787807d951f858eb1e34e088a66d0ead3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.10.jar">
+            <sha512 value="bcedbd5c394651b64e20a9f50f20dcfe2ff019385dc91935e499acd0538c2190e2dd75cac116fae5eac0eba929a4c294741e0fc6cbdfa5cec4b276dc77d211e9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-compiler-embeddable-2.4.10.pom">
+            <sha512 value="55158ec816dd5f183699c87ea39c660dac74d54b04d23b48041c2b0e7b8a9172f3ba65981b1956cf3519de3cbdf0b115d20e7fac389dbe834f8ec2b60edc2271" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.10">
@@ -5420,46 +5655,88 @@
             <sha512 value="790fb059f83b82d74f4ef70c02da7a57172a34f93ce4e2a56f549580b6ec86427970dfab87292885c10b9119421647ca719be5442e0b3d5425d43caeb55a0b1c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.3.0">
-         <artifact name="kotlin-compiler-runner-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.4.0">
+         <artifact name="kotlin-compiler-runner-2.4.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-runner-2.3.0-sources.jar">
-            <sha512 value="0677411405196cc1a927cc1d52572fdf3d271b119a999a91715be3db7980c168dafcf0e573a68c68e78ea3619c975417c70aad9c5a61ffa13a82612b8eb529dd" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.0-sources.jar">
+            <sha512 value="e7be58dd040afaf050443f756acdeff4e661841d89525640ce9b63203ce09505e35bf9d5cea7ddfcdbd7cd9ea7698372e76715dd9b21a15dbc4abdcf0c8f709f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-runner-2.3.0.jar">
-            <sha512 value="300ee10871ef0b6c6774c5b40347efa1804b2363abb8f10902f1c618f153e5158e2d6a34c284695c148b41d09861a8843ab1413a47395baf0836288c32b4f4ec" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.0.jar">
+            <sha512 value="3edc036410548e3b1a564ae73e615376c275338a2a3355c4827a9d9d60855ad8fdab01bd0a7bcb85fcc51e961f0a1d0599f575e96b20aab9c40a36b0a5e7bc35" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-runner-2.3.0.pom">
-            <sha512 value="51263e32560594076f0ddbafa6455b2196f455a5e05d0d77e9e670e1e88203fc5c41f2b6b49c1be7b94c60beadad3360358b6e0e3e6b6725ac4b785711033f24" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.0.pom">
+            <sha512 value="31317e97d25a621b562e72819179a80853a62c528d7a01f79bda898a57524370dd725a5a6f0b770e5116f9a3d26593807382e5d7700fb931c0747a438503d1b6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.3.0">
-         <artifact name="kotlin-daemon-client-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.4.10">
+         <artifact name="kotlin-compiler-runner-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-client-2.3.0-sources.jar">
-            <sha512 value="3a43ff456683d1f1af28dd72c0dae7f5288493754aed024b15c9d46ab437b566498a003a9aa824ad3090c4c18bff3fc1ddb2e267e11c5808ca53e42e349b5f60" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.10-sources.jar">
+            <sha512 value="e7be58dd040afaf050443f756acdeff4e661841d89525640ce9b63203ce09505e35bf9d5cea7ddfcdbd7cd9ea7698372e76715dd9b21a15dbc4abdcf0c8f709f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-client-2.3.0.jar">
-            <sha512 value="fccee49d083a87e37ae547030e0d6d3dac7bc5e27104a442a21e1588094b55ea3e1335339b36df1e8b6bd9d371ab4d1bf2514c8baf94c0323fe3a741da4ccdaa" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.10.jar">
+            <sha512 value="0e7b4a79961a47b98a9352b5b5436470f3b94de1a852fe0edac84061ae83bc9d3a659327b3c2a43649f3e3363adc437ce523e2eca6d98949506ea7a2d3a3d3ef" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-client-2.3.0.pom">
-            <sha512 value="3aa6987195d5ac23f8a840b214265b3db371b66f99b3341c7f13b1d1fde0a209e97425cfac648c7751dd084f2039eb41f0536eca37672759cf219547738d8e47" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-runner-2.4.10.pom">
+            <sha512 value="8553a4c46411c5fa64fd0036bbe5e1343c17caaa797d1c01ba517578ed40b04c3accbfa9785f01a95de8f6d7c2bea821614a254f9313bd0f857b76610a98c805" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.3.0">
-         <artifact name="kotlin-daemon-embeddable-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.4.0">
+         <artifact name="kotlin-daemon-client-2.4.0-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-embeddable-2.3.0-sources.jar">
-            <sha512 value="843a08148f808a5751bf1e8d5da6209acc112e154d757f9ad58d01dd5494803193fc0395289fea16e8bd74884e646908e30273091839c5b27af1b030d2875c59" origin="Generated by Gradle"/>
+         <artifact name="kotlin-daemon-client-2.4.0-sources.jar">
+            <sha512 value="528d4b6f92bdcfcbf98538e62781abbcec839904c97fdedfe9132210a34029220b49df61d9c3d192ce54dfbb3df4f313512714f596453363ccb573fdf379392b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-embeddable-2.3.0.jar">
-            <sha512 value="984f8d294ac8ee0033578689965b7f9c4618680f63e9f97b8f9ee8084d17740c7fcae521ffafe0bcd9bacdab9dcfd04864a26a10ad02787c818a129c41bfee0c" origin="Generated by Gradle"/>
+         <artifact name="kotlin-daemon-client-2.4.0.jar">
+            <sha512 value="46aaba5a5e260031cb88615e627e487f103595b62d0dbce0990e38abc3830318006ca35a18fb052c6cfad0c1971c0c4b68c001d4e651982d1d740e4eac53d349" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-daemon-embeddable-2.3.0.pom">
-            <sha512 value="a128a2261512294ca298e617f960636181cfcc599f6d754e204bbfd37ba3cedaf64f9010262c429decf03600a21d212a6e1867b3803ade7a5cc7e399be0588ee" origin="Generated by Gradle"/>
+         <artifact name="kotlin-daemon-client-2.4.0.pom">
+            <sha512 value="e732183118c1ede809fe642466e84d4e5d171b209d25a0b50ec8ef85f144e160bb4b83da94f6faeada6d1a8de380174350ac8202ca143ae630890a4bd3123f08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.4.10">
+         <artifact name="kotlin-daemon-client-2.4.10-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-client-2.4.10-sources.jar">
+            <sha512 value="528d4b6f92bdcfcbf98538e62781abbcec839904c97fdedfe9132210a34029220b49df61d9c3d192ce54dfbb3df4f313512714f596453363ccb573fdf379392b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-client-2.4.10.jar">
+            <sha512 value="491e1dfab9d9dcb79423ff1bda6f4f71e51a59fcc5c7375fcf3d6ea2b1e37d7094b85c02beaa2ffd6f1a2c6d87d9f0d2133e0db1ab744d7d449642b7bf5a5fdd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-client-2.4.10.pom">
+            <sha512 value="11dcd087977f5a04a3057fd95cd7594781cde10fac1ccb7663ff690e07dc3982a065e078255784bc13a75ed7156cddcebefcf1e41d892e4b607e09aa6aea6bba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.4.0">
+         <artifact name="kotlin-daemon-embeddable-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.0-sources.jar">
+            <sha512 value="54104c037ddf17c4326ca8dbc6d0995ff39f564dad800376b2b01a45cf4c1a653e9ea406585a73516ed2b345e433dbf65ea4e8f7319831c5d7d53970d1234bc3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.0.jar">
+            <sha512 value="f3f3c7a3256d19928b7edf41061c34a0d0242c664b5ca9547ba45f7940ff15a7d146c065aa436ee302e7a9e0cc3376cd88575ec9bf343b45b100cfded8cd4753" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.0.pom">
+            <sha512 value="6846846d6eabb0ba30944477c900f668dab4c302f11d4d4b06619b5dd517a94c185d27b3e77424ced6a309fd08c94eacd8eff505e4044340b8ade3891b5985bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.4.10">
+         <artifact name="kotlin-daemon-embeddable-2.4.10-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.10-sources.jar">
+            <sha512 value="54104c037ddf17c4326ca8dbc6d0995ff39f564dad800376b2b01a45cf4c1a653e9ea406585a73516ed2b345e433dbf65ea4e8f7319831c5d7d53970d1234bc3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.10.jar">
+            <sha512 value="258cd7b2303481146dbdec7745475e13cde6e09007e19d54b95563233540b08b60afd93495dacb463649c2f001b7112c26634f2ecb564390a903b8048ba41ea8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-daemon-embeddable-2.4.10.pom">
+            <sha512 value="0677815829c2936c095b8350ea809976e623e60ed94e88d896de139db71e5918ffafcdf2995a180fdf9ca385214c794bf27eb7bfe72da17bd37d826216704528" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.2.10">
@@ -5524,69 +5801,69 @@
             <sha512 value="736e14e9caea69c261eb6e6be12d0418798c8ff43f371a812e843b9d79190287912f4266a538a33196813a94ab859d07155218342944a0a7d25b4877b4371eee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.3.0">
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle80-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.4.10">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle80-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle80-sources.jar">
-            <sha512 value="1d5349e423bfa0d11a5443bdeeb2436554e2fa18caf84e8aeb2599a40bb14e49e586c976e1d6461fc38623de740fc49231110faa54be1cc6584bdf5e4b463d4e" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle80-sources.jar">
+            <sha512 value="e74f545a67c512c5478026ddd2ae9b8d2007ea2f73672090f28c0bd745f2d3450be002c34d30f91b3e75244887fd00ece452c6df22749a9981a3f2beb80a03c7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle81-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle81-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle81-sources.jar">
-            <sha512 value="c3e81cb913291a7cf2f03f16b973d72b77afe7022225ec2c777a0f2fb7c30c82de6524eef59a01292da3e3fc44f17794eb9888c9cb99abe7c6c1f78c13c25111" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle81-sources.jar">
+            <sha512 value="bbca6032fb15d0b48ee366558520921f6926ae9b406f7d69fb918f55d347e66a30dd3de0842c72846750ba786c2688335153106f712815a6d0c980a51f2706f4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle811-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle811-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle811-sources.jar">
-            <sha512 value="3dceae60813dd4cb3317badf49bdf723d4354cd1ef4e0d1ccb4ede71557e315a228f39ab3df48129e34075cf26dbce4c59298175a3eaf82655c9c7ccf49fd076" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle811-sources.jar">
+            <sha512 value="c93393dbb80727562fd059113f250271312fd8d094e47d456a54dd8dec2deaa172962402443fad8614202481594ee0e58a5ad6e717f1528df6d5b3bef8a2162f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle813-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle813-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle813-sources.jar">
-            <sha512 value="130d31cb818edfdd6000b18bf82a492b38478f485f30c547f7fba3bc826ecc6be4c173eef7d8eab448683f92b585061acdf54d05b05f008d27898d052a3c49f9" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle813-sources.jar">
+            <sha512 value="e0191de3d2bee37131f58dff7e1ef5dcf575c55dc70cdad52e3bf5d0574ee6c9efa1e4f7670bd7e2c50867f5d4b6506e482541cd6a42f8e8581822e733b593c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle813.jar">
-            <sha512 value="4a9782de7a9da16308545829cca69677a2e266690a2d81448028768b3b1cfc13b675fcd65abb9fa4d8bd882d4846a2ef60c5be8166c484b3e29f15f1595d7707" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle813.jar">
+            <sha512 value="5781e4557e2dac4d95c9ddb0ea8e6ed7ba29afb754a56a8e894d360915ced30242369daf74851fe8d1162f45e78a187f88d0f50ecc87bdcae3a6b907d3dbf145" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle82-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle82-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle82-sources.jar">
-            <sha512 value="280430718f7f48a239a2d3c431a930bfe1cd0e80158a24ee5efa2a0060d8d1712c52da0c587ef806798b1284d088d589cf6672aaf98c7e95859a5ba6c438a346" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle82-sources.jar">
+            <sha512 value="68086a2472c3842e4f70c230a2f5899d82bb956d0a6dad11b9a47cece81115a6eccc315cd31b0e86803d35f0ebfc9bd04a830ab93cb4ed813b6d0c1b0e1a3c34" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle85-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle85-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle85-sources.jar">
-            <sha512 value="3de5aa040a049c14175bea9b495d5561a3cb579fd8df68e9cfadfcc20ff83e58f9c047528f2673ac689d4f0fd4b6eec59553dc38b1c9bffd9278107f2cb4db7f" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle85-sources.jar">
+            <sha512 value="2acc7fdc5359d0d25ac7adeb42436d23ea7dcbe95f627034ce2b2ab74006e3640a31868d98e0dd27739b0936e673cc62f6534016fd83f11386162e57acd400cb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle86-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle86-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle86-sources.jar">
-            <sha512 value="f001375d5f4a9c569374d9ae536d9122674efe3be3d07578444fb8e94398075279fd6727d22b307989f9b2a21f2c92c3d4e407323911f4ef400b337cacec0677" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle86-sources.jar">
+            <sha512 value="2b744d27de1f623a6d66ffb73c806ffcd6fdd643df01d837b7f09704d6611bbf2982c81340511515e2501ee07b89c1e42097a747ebcdc6e164c706e357f4eba2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle88-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle88-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-gradle88-sources.jar">
-            <sha512 value="c247513a892d02a8d3640a69f107bf5f3cb00fd4f469a1c20feb345eeeff28dd365c29c8c65111c665db68ee8144b232ae72655a8af226bcbde1cc2cb514a5f4" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-gradle88-sources.jar">
+            <sha512 value="f3da4b55deb271491d1b90369119f88360b02ae1051acb2d21f30ed08ea126b5a939c2ecc30d84f9042450760c97eea087a8aa4f63ffd8ed9f4d7ad7b5f590a9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-javadoc.jar">
+         <artifact name="kotlin-gradle-plugin-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0-sources.jar">
-            <sha512 value="b92e2e08054d72cad646ab2837419ca5c814e4be8801db5671df46536562bd30d555582498d2f0418f3d50e3a57eb8488309f8badae274e16b356fef472d7d6e" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10-sources.jar">
+            <sha512 value="ed9df0e1dedc6a36a99f40478a4183cacb8c513a9b029f57c1305d0e534b63f0407622c6b0b2bbf4bde4f7ea79f651a2e784b8aaf7bdfdf6a6b660ffcbb1d5ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0.module">
-            <sha512 value="7b2d330e01fd3901af4b775ebb3c145c76dbe1ad16270f823f5bd3220b160ede1ccfe48d50568dc6933adcdaefcf040cd92a42b0558d4c0c8465f7df9590013c" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10.module">
+            <sha512 value="1fbe602b7772cf797d2e044b78bf1497e192bc0bb255443227f8def1c1cb425989387de315e8aa844c0217fd4a6661b3ce24d454a515ec3b9f41592ac722b1c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.3.0.pom">
-            <sha512 value="febe965a0aee0d7c84a1828183652a00f91f76197338cf03ab2d9f794409372e388262e772260db03bc25cc9ed2de9516ff8ae70b3f45092a01792aacd53af1e" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.4.10.pom">
+            <sha512 value="c3f07a20950b98385e2632afefbe10185909f9e63e1ddba359472ee0ef6cbcb34e5bf271c8432c232f81369b85ea0520d9e09dde014e15bbb6c9223cbc3a4d9f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.2.10">
@@ -5600,18 +5877,18 @@
             <sha512 value="b3d41deec5f0ad3d6ba04e2e158d81d327dee58133deaee8b8d3f2f71848edc75209be32dc2a0b50ff6a8d3b2e1d967a2db8076fbafa38dead9c2f81c02774ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.3.0">
-         <artifact name="kotlin-gradle-plugin-annotations-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.4.10">
+         <artifact name="kotlin-gradle-plugin-annotations-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-annotations-2.3.0-sources.jar">
+         <artifact name="kotlin-gradle-plugin-annotations-2.4.10-sources.jar">
             <sha512 value="3cc024c5f3dc413e2b2e62409baec8df150916663ae945dd8daeb0c51a96397cef8f72b11f323d660248ce52425eb278826766e29cb1d3e3bc7084773ab0f74e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-annotations-2.3.0.jar">
-            <sha512 value="443a4225c0c3d35f11db20f1a9696551acae0730489a66c5c81b6e8e4c28a845b61f1186a49a1c01f9345639670f6fb5a83252874e6c1c2b570ca90f145f5cb1" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-annotations-2.4.10.jar">
+            <sha512 value="18fc7405614fffcd0bde28cbb2b6a0e700b65a5cdb27166717fe6e74724c9163deb874f46bd21e4be1d7b1d4ba85197833b94d7e721839cce776a2b886988448" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-annotations-2.3.0.pom">
-            <sha512 value="102fe63b982e99b63d70062df2b2d5dbfee5903e73e2f336f5eb480d5fe2c5ed503eec3fc9c2976c57f8e35488ea0bf5553ee15191eac43e296cb6c80a84d014" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-annotations-2.4.10.pom">
+            <sha512 value="b635a9c621815fba855e06aabbc20adceed18b997fe0910d6a423682617e8ab317d22bdb05a27cb95606b3b66633aaf67492f0b047de1d21ebc8c3b2c5829ce3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.2.10">
@@ -5676,69 +5953,69 @@
             <sha512 value="5ebe43aeaa0a953b93ec2a2e4dc44c4624a1c48eea2fa72fe81d668c5448f983c69bfa381d6e77e8fb874d7f00034856df936724acedf70a6cf85fca80c78826" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.3.0">
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle80-javadoc.jar">
-            <sha512 value="a4575b7642547557403055532f14d90cec865030ec729aafa5aaa58755f66994aabc45ea4e3fecd4f287515c280ca88be4f9a8ed91c4b91d445f1258668bfbe1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.4.10">
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle80-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle80-sources.jar">
-            <sha512 value="c1dc8cc0265384e5000199811362153c56f4b388f999371c04594009b1fcbc50d317345f1b76a84c6a17ca581489e1442835b26c9454e0855a286111328935f5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle80-sources.jar">
+            <sha512 value="55641881da74390433750c8d98182c934e8b7e2e029fee9b85a421e6cfbf20bad949f32ab7c3819c419208c961d6a495bd005a51339407803b79ae93994ca0f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle81-javadoc.jar">
-            <sha512 value="1e5dd173ea088b5033e2663cc7e080cd44eecc1e21740c3ecdfca0ab9f6d5702b414587030163a45f9f3f822190c81b9dba72339e510108d56abf362892fc289" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle81-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle81-sources.jar">
-            <sha512 value="c1dc8cc0265384e5000199811362153c56f4b388f999371c04594009b1fcbc50d317345f1b76a84c6a17ca581489e1442835b26c9454e0855a286111328935f5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle81-sources.jar">
+            <sha512 value="55641881da74390433750c8d98182c934e8b7e2e029fee9b85a421e6cfbf20bad949f32ab7c3819c419208c961d6a495bd005a51339407803b79ae93994ca0f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle811-javadoc.jar">
-            <sha512 value="7e2b50a04601a8f6463e78acae9dacd2fb9c63fe2b2720da85ff7cb52371e63edc9d29c5a9ee758d67745010c3f42925cb7267563a7f12d2d9e03803a0f6ab13" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle811-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle811-sources.jar">
-            <sha512 value="62791d80bcf20541182f505c8e206babac346426b4ad1be3ceb37f4c3918a5c8f10cb3c320f9d72d878fee05cc503021b02f081ba1e05d1ee2040845c54470a2" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle811-sources.jar">
+            <sha512 value="7494619def1946dac3d20c14f0eb03dd35ceae7a890f41789cf109c28d456d8dbb88103ec5109ad62f074a3932959cb58a1030ff3a414da5f71165892a67a82c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle813-javadoc.jar">
-            <sha512 value="097bbd5d32421bc10e23e018d5335ec5c06d37ae8508933307aee12ae9c9d264a405644655deeb8127dad4eddfa1e7b6db90b2421cbf85bedf19be6211f37db0" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle813-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle813-sources.jar">
-            <sha512 value="62791d80bcf20541182f505c8e206babac346426b4ad1be3ceb37f4c3918a5c8f10cb3c320f9d72d878fee05cc503021b02f081ba1e05d1ee2040845c54470a2" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle813-sources.jar">
+            <sha512 value="7494619def1946dac3d20c14f0eb03dd35ceae7a890f41789cf109c28d456d8dbb88103ec5109ad62f074a3932959cb58a1030ff3a414da5f71165892a67a82c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle813.jar">
-            <sha512 value="3595c441805d0b3c3eb0efa06fcd9f641c691b6faf7de272edfe3f651863818f853e4251d63c3b4ad1d303b068940edf9fcac026f7ac2827aa42102895dd5009" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle813.jar">
+            <sha512 value="4cab060903079bdd106a0189112168356c2271eb6ee1c57cb51e8b2d4bf3896910bec89ff9f5fc796ccfd05a6f4c62ae37d141242af30b2d96cb2dddfce368b0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle82-javadoc.jar">
-            <sha512 value="28dad32c53415409b9d6ac3801491c3136d0c5ab6ad97c194f009c144e9490b0fc5ebfa6e1815104dacce73197715ff0c60a9d93e97fc92deca0f52ce610388f" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle82-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle82-sources.jar">
-            <sha512 value="c1dc8cc0265384e5000199811362153c56f4b388f999371c04594009b1fcbc50d317345f1b76a84c6a17ca581489e1442835b26c9454e0855a286111328935f5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle82-sources.jar">
+            <sha512 value="55641881da74390433750c8d98182c934e8b7e2e029fee9b85a421e6cfbf20bad949f32ab7c3819c419208c961d6a495bd005a51339407803b79ae93994ca0f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle85-javadoc.jar">
-            <sha512 value="613bf4dcc75b038901aebca9221e64a8b10af45ac26dbe41776fc3800a15b7a5823881d92678edc2784bbbc5e3416f61435cb6e31bed5bc67158ed989d5a8959" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle85-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle85-sources.jar">
-            <sha512 value="c1dc8cc0265384e5000199811362153c56f4b388f999371c04594009b1fcbc50d317345f1b76a84c6a17ca581489e1442835b26c9454e0855a286111328935f5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle85-sources.jar">
+            <sha512 value="55641881da74390433750c8d98182c934e8b7e2e029fee9b85a421e6cfbf20bad949f32ab7c3819c419208c961d6a495bd005a51339407803b79ae93994ca0f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle86-javadoc.jar">
-            <sha512 value="dfe77ec86263e1e36686f69c9744ddcfcd25c95c718907e2e248a3912a0075f13092c21b2a6de2c418713056e412209d2789f514546df5438f8692e343c0ce52" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle86-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle86-sources.jar">
-            <sha512 value="c1dc8cc0265384e5000199811362153c56f4b388f999371c04594009b1fcbc50d317345f1b76a84c6a17ca581489e1442835b26c9454e0855a286111328935f5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle86-sources.jar">
+            <sha512 value="55641881da74390433750c8d98182c934e8b7e2e029fee9b85a421e6cfbf20bad949f32ab7c3819c419208c961d6a495bd005a51339407803b79ae93994ca0f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle88-javadoc.jar">
-            <sha512 value="ffa1c261af8bc0c4a5e0fef5932c3732372f4a9b333765cef4aecfdd33ee844c9da573e33804b6ee40db80ff81b29b0576462e68a5ca8c8639efc3d9e7b62acf" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle88-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle88-sources.jar">
-            <sha512 value="62791d80bcf20541182f505c8e206babac346426b4ad1be3ceb37f4c3918a5c8f10cb3c320f9d72d878fee05cc503021b02f081ba1e05d1ee2040845c54470a2" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-gradle88-sources.jar">
+            <sha512 value="7494619def1946dac3d20c14f0eb03dd35ceae7a890f41789cf109c28d456d8dbb88103ec5109ad62f074a3932959cb58a1030ff3a414da5f71165892a67a82c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-javadoc.jar">
-            <sha512 value="593859d21cbf7693a39e4ef978f244c848165a5ff1034ff08005d3599161c53004bfd1ee0c8c0dc161120df49aa69b18a6533713df430da9e1ae898d1ce28d05" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-javadoc.jar">
+            <sha512 value="e69c680c49bbb27c5083124b6f14f84fffe53d8f0cac16fa76ed04dcf9981c5f28d5638cc40b512bfbfdef7d9f100a00d2469f681d23a1763bca9475e1be1783" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0-sources.jar">
-            <sha512 value="7ba8a5cf1d49f247f372d1693f5f5048b1641ac93e877c233005125123eedebef04416ac7a65be9f56afb51bb48732cca6728575c9858ea788215f509686bbb4" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10-sources.jar">
+            <sha512 value="64a35fccf5a2d55b6287712054d13011558c8d86fb6451ba1dca114ad3e7d6c1c739d83c54eaac4b997d8a0ade15417a9b61f3a55120e9fffb42a9e36dfca3b3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0.module">
-            <sha512 value="f7cc0da8cf42431f179d4fc713194645a74e8b71722e09c560450d6df3895fd70bac986aa24731ee62b43e02a99a6d172b41dce0b03b1378ef358d78d3d1763a" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10.module">
+            <sha512 value="4be873ae8b7467b0c6a5d8a271966b15f809a788fd86ec2f40ac8c4e3278efa1dab59659956a515152f8bbeb9a106a76aee82db52ca023346a8093a29380d6dc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.3.0.pom">
-            <sha512 value="ab7da93207ce8e7454b15cba93a32aa4d2615f423595b64f9f9b7449d7078dbdaa2c9cf11f8bea162ed94cb22bd9d31827c8a9b71dde4b4e42afe105b1fd20ad" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.4.10.pom">
+            <sha512 value="425feedacd337b6004a8f2c0b949b405b323d8ce5a0e8c655bc22b9c5351742f49f6a765a16baef52ffc7090a3b59ad4126ac221f7ae16398b66f35717eb968d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.2.10">
@@ -5755,21 +6032,21 @@
             <sha512 value="e66a8435c0f8a1c92b930f94f171d66bc66d01ab4a5b8de5a541b5a619161de487710c8e42b31077be788a1e5bdc148dfa880a9bd6ad34887661df4f41bc4e84" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.3.0">
-         <artifact name="kotlin-gradle-plugin-idea-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.4.10">
+         <artifact name="kotlin-gradle-plugin-idea-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-2.3.0-sources.jar">
+         <artifact name="kotlin-gradle-plugin-idea-2.4.10-sources.jar">
             <sha512 value="df4792d6c50e3e0692e1807dcf2e71003b0e1f5cde85f211168798323d69d1016d5a5a3fd73ffeb51253f1a1da33645e06aaf3a2918393f8f80df33ab3e16d50" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-2.3.0.jar">
-            <sha512 value="82a20b477b6105fa99e83cfeee8ba7a5ca41c34e78ccdffc18405c21a405c865e8c0bd4af246d1604e5c62ac4ff6be16fad8bc2f7f48bc41996203c96fd95ece" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-2.4.10.jar">
+            <sha512 value="faa395f08613f5bcbcc4f17faeedbb2ba10967d5aa47377631f0d497533d5db9a2ea631d43e89ad237b8e84b13bdae44dadd7ed43765f4e7d376e5b8a475db8e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-2.3.0.module">
-            <sha512 value="128463afc0fbb59f5f9e04429d3a5d4ee7d5db4ae32b63433902fb7ed0bf2682bad249647fd2c19f6bdc58cbf116dcd96308afe37a4b9d6796171fd92689145b" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-2.4.10.module">
+            <sha512 value="0d277e830bacf25c7678005e6d8d7bac52e6e48fc40b23a03de00b9594bf3ab0f2667f4c26e4f30c04b0ccc3046935d4876560f3b2d60f90946bb4bc2ed0bd2f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-2.3.0.pom">
-            <sha512 value="685182172ab4b92f2bd0b24bcf8c9a26c3981463d985e4a0731388ad781f5a3e445724a29acb0399a8c088a4fec8d7cd5a32fd789e5f5e27167de3ece8f0a7a2" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-2.4.10.pom">
+            <sha512 value="ab2bc05176b2da9f3cfd6f43e3ee181e1de86802a342e81a319c2b2c55b6da383db5987ae03beeedbea6a07cc7c7aeabbdf0988d856f991fd18008a13b27d430" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.2.10">
@@ -5783,18 +6060,18 @@
             <sha512 value="b37c592cf5e28b7b42aa1c54e80804e086af416a9207d232247334c78079ac1db1f8ff324c429d0f032214b26766a194ecd6182ea163fb5ab94a51979e1b38c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.3.0">
-         <artifact name="kotlin-gradle-plugin-idea-proto-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.4.10">
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-proto-2.3.0-sources.jar">
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.4.10-sources.jar">
             <sha512 value="23bca369506a846b3996400940240b4a2a5da0090332dcbaea8a27296700beb84b2711616ae9ebd05f5f73072e6b23fe4611fffdafe26915d796233d3128104a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-proto-2.3.0.jar">
-            <sha512 value="2083e686090664ca793936f91940db75171aa275584db1823afb9fb46b1380e0b004b17b0d64b4a615ad8d3d910531c13b704dd4a97734c7527fa8c7d75fce32" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.4.10.jar">
+            <sha512 value="ecce84e58086b2b856fcf69156c070d62367717bf3a9fcecb4fec8dc20a79c0cdd716412fb6888b252d0618e17d4271516a541bd5443ca9f846d5108ac6e406d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-proto-2.3.0.pom">
-            <sha512 value="2ef6a2fdd67e11755a06cc17dc7e6ee9e024d50e6477efd9731076fc882bbdd38f66d7c21ec199d424e686151bc8517440fd1c8896c9a3bc7ee117b5c9e8fcad" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.4.10.pom">
+            <sha512 value="1c467f4afcd38eb7cda6601fb4e6ca2411a30fefde05fdabbb75fd110abf1d82c589b3ffdc61a24dfc997ea69496fc5e575ff34e1832779d4e5eb8d6ae3c963a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="2.2.10">
@@ -5867,12 +6144,12 @@
             <sha512 value="88e50a48711bfa85ec1a87ddb1d22026cb075a0da37b68c893c5e8e21b322caeed7885eecf5aae53579d4974bb2d490e3647407dca6c9b61cfe4e9a83e345d06" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.3.0">
-         <artifact name="kotlin-gradle-plugins-bom-2.3.0.module">
-            <sha512 value="431018f36712ee66c63be1da837fcacf24bb57c02f5557e8a95628ff24c55864746c556011514be4bea9c8f825715ae795ab1e39a55ca2de809af385906a94da" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.4.10">
+         <artifact name="kotlin-gradle-plugins-bom-2.4.10.module">
+            <sha512 value="ba1cc0b35e1e8f28174cc80972a20e00c4d28679cfd6752ef2dc3a6b9822796d71832c1bd70244ebd91d74ef98887a7ef69bd8f3488d837d7a383c8650c0cffb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugins-bom-2.3.0.pom">
-            <sha512 value="8a4d7823e1e47130fb52aaa43c1085ad0a6e20b43e5a9036e69ca36aed812d67426c498b18ef4c763ff5e7a0c695f4c079350bc30fb25b8d9f8cfcabe6add6d6" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugins-bom-2.4.10.pom">
+            <sha512 value="10881058482136ebb879237fc6675349bdd4c7a5005fc487289080a022e8f94f5dcb3dc508af26e20821a35811968b20641d80bb8b0db677241b196b304ec6be" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.2.10">
@@ -5886,18 +6163,18 @@
             <sha512 value="91b2e7069267348691865c98e3a8ef2e822c86c0a2752467a8e8f3c62957a4a90ba1aa9c810a8c6d6c2fbe5594c0bb848946fc21a919df9499d0ce88e5833e93" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.3.0">
-         <artifact name="kotlin-klib-commonizer-api-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.4.10">
+         <artifact name="kotlin-klib-commonizer-api-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-klib-commonizer-api-2.3.0-sources.jar">
+         <artifact name="kotlin-klib-commonizer-api-2.4.10-sources.jar">
             <sha512 value="68af5ea29d8fbd7add9f141b9b577d1ba1879e0948c9650bba28ce745d401881438e3cb3bf31d9e013ff8fd11d5214ca7d23ee3f00aceb77429e97c86a685c1d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-klib-commonizer-api-2.3.0.jar">
-            <sha512 value="d42eb2955a2e7803860f0f72d2107c1954a2eca199d69770b5a66a2d81492af3fa5b84f67c28c197592a996b43352db0449d6111112d54f3ec46602a024ee8d6" origin="Generated by Gradle"/>
+         <artifact name="kotlin-klib-commonizer-api-2.4.10.jar">
+            <sha512 value="93f9978fe65a9c3883b40d2903d6330da92b10e8c8cc2998190fa6358cbee3c048a712263478d123ca2abda25aa898455b2ba0ed63b26ca26141428b3e269b28" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-klib-commonizer-api-2.3.0.pom">
-            <sha512 value="51ad3e7a0e15eeb12e914f5ecee5837d50499b5d4397312d8541721bb941175ad35bb8471936ad81640e6fb00ff3cdb946aeb83de4f1dde21c3d1eadd8f45005" origin="Generated by Gradle"/>
+         <artifact name="kotlin-klib-commonizer-api-2.4.10.pom">
+            <sha512 value="8389e0fd622587a9ec387cef91f6660a986e282472ed9b99eb75389a70bbc27b69cb08e331c917dbb33fa70c5181511f44e0042de03c6961c0d7b2113955ea09" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.2.10">
@@ -5911,18 +6188,18 @@
             <sha512 value="969c9117b9440dfce5329c9ced1f5435c5b52da7e6d17e62eb4efa6393d54ab4d1f552ac923a3d298a65425713159d1cb8ed6ff77ba876be6c6625f6e3664326" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.3.0">
-         <artifact name="kotlin-native-utils-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.4.10">
+         <artifact name="kotlin-native-utils-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-utils-2.3.0-sources.jar">
-            <sha512 value="de8b706395995b5d93d787c40ad3a12e3287824949729b6c84c09c0a41b9197c638d5ef3fbbcfbd7d69e072e99eb710f5b6b1e04f6556a110e9366f5a4d91439" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-utils-2.4.10-sources.jar">
+            <sha512 value="f434d27f29473658d50cb390235897971abb09a90ed21b4ccc4305c833b82ed7e6110f1b6d9993d0f005e09d484140e372daf25c0d78b40380a9c560f8a417d5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-utils-2.3.0.jar">
-            <sha512 value="8b5181a862d86e51e369c9e07567cfd7f968d25835a66a71feeeb467a514d35f21a3ec4025e44fa967011fc852af8369b0a6d2dc7af616a3f924361170472097" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-utils-2.4.10.jar">
+            <sha512 value="e5fc6b14c936c559755da10ea79153437cf40c8bfa37a763c135b3ec5b0c1837f3962f6d12d18017246ddd4ccd5ee8b316e354637d02939117ebbb28985dc230" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-utils-2.3.0.pom">
-            <sha512 value="e221f68e25ec032a976bfd751791cbbd70ec71d3334ee46a4d1fb000c00c38d2bb2910927a5ad42258caaa08d103e733f9b68ff135bd1388f8efac9eaee1b228" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-utils-2.4.10.pom">
+            <sha512 value="bc7df7eacba1bb09da08ec963a49568e5498b0cf46bc130dca4ee9726630cd7c4a67bbeb8e098d65653d9eda3cd26b471128a7ecc93429d40ac7d1c290173940" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.6.10">
@@ -5981,18 +6258,32 @@
             <sha512 value="73c58bce8ca98d5a84665ca18e3aecf25f76fe2857023b4964b8bee0127763bfc10fa8618ebc147d94b7e0b14c396d4e207c09c9b9ce9b3335a2a9c16a3fcbe8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.3.0">
-         <artifact name="kotlin-script-runtime-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.4.0">
+         <artifact name="kotlin-script-runtime-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-script-runtime-2.4.0-sources.jar">
+            <sha512 value="26aa73e969aab6bee2710ee3e898f3221a89b715e50430893c61fc7f1adf088fcc6add599df28912f35ccfc9033d462ada9e7cb22464756dea4f1f6a16743b47" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-script-runtime-2.4.0.jar">
+            <sha512 value="8e94e25c455ca0f9b02c0217dfbfb43ceac3d9bc5a199263396cb044b5072d8cc382f7666b16027476067401b42644786ee5bb6c758c6b755d7c02c11c32d492" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-script-runtime-2.4.0.pom">
+            <sha512 value="f848d1dbb617fb297abe5831c12b22c2debb61e674c352672b44cf454f5a24e7ea0f8d285d1a20a84df59f7f628befcb54350cf9304a492ef42bd7d4cb599516" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.4.10">
+         <artifact name="kotlin-script-runtime-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-script-runtime-2.3.0-sources.jar">
-            <sha512 value="4525eb82ef89bdc8ba74e4ce669bca20c7dbf2a7af718b16a992b046d7b403b97cf0b0ad205daad5e20dddcfcd469362a300475b0bdc2cb2163191d8715a2013" origin="Generated by Gradle"/>
+         <artifact name="kotlin-script-runtime-2.4.10-sources.jar">
+            <sha512 value="26aa73e969aab6bee2710ee3e898f3221a89b715e50430893c61fc7f1adf088fcc6add599df28912f35ccfc9033d462ada9e7cb22464756dea4f1f6a16743b47" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-script-runtime-2.3.0.jar">
-            <sha512 value="7755ceb376e7e8df7d96899dd0c38dde88b2ae225f238c203c63ef3b65a2a8cb14297d551448b08a4ab4e5dc08377741344692f41d6617d2ccfdb335a129f3f7" origin="Generated by Gradle"/>
+         <artifact name="kotlin-script-runtime-2.4.10.jar">
+            <sha512 value="2cc1a7060533a7c25620bc788d7005d1c1bc3860164d5bae9213fb2cf8ef009d72002d1b95a7961f84f55fcfa112401e4de8414300debb71189483520e006864" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-script-runtime-2.3.0.pom">
-            <sha512 value="8a5a574b65df5ca7b976ca43e10f7ff5cc610e922138547e9979d10d6a87f3b583d0da3fb439b8d343da1604ddbc6ca9958854a773099bd3c3459acad1c78798" origin="Generated by Gradle"/>
+         <artifact name="kotlin-script-runtime-2.4.10.pom">
+            <sha512 value="28e185a64389ef96c70c2e8236eb0cf91680942a9d04cf5ec63d4112544f4e8c02207f7f7d6b34a45cad227b58888e05203f25a4e1f63201920146da0dfa4a28" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.3.71">
@@ -6191,6 +6482,9 @@
          <artifact name="kotlin-stdlib-2.1.20-common-sources.jar">
             <sha512 value="e177d110bd48c456aabdc4ffc516084b1522c0a26662a7283ca25e64f639068c8fdf3524955f0cbced5a73763b1c0e9cf980a5b5b1f5d15d63fd97d5d2cbb8cb" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="kotlin-stdlib-2.1.20-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="kotlin-stdlib-2.1.20-sources.jar">
             <sha512 value="d5e69c52ccdaf114f1ad78eb00a99e4bcf5efb9385f932c055640ff1f90c21cd6918a47554c79c0a827a9f6d1117ba6e16c40555ad0120936d377236c1272e27" origin="Generated by Gradle"/>
          </artifact>
@@ -6201,23 +6495,6 @@
             <sha512 value="d403a3e294b962d553158d24838914d3249addd96f9638598c57d23170f71efb441196575d59346ae67478b31b1d04044f5a83e3391516b481aad66541b8fede" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.1.21">
-         <artifact name="kotlin-stdlib-2.1.21-common-sources.jar">
-            <sha512 value="c3e70d4737441a030938427210dc8a029f9ef0cd7eb91602d5a8e18e9f56f65bdc3089cab9d5a3947e7af189948c39090c441392edf967068d310b47bde459e8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.21-javadoc.jar">
-            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.21-sources.jar">
-            <sha512 value="d99d2f22385fa5fda389aa0b32a7fc08d0ce16703e3ea303dff10937a17471bbadcd43fb9887063d7e0dd20221b41800e77e70c3b355c31ed4d54948341c2ff1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.21.module">
-            <sha512 value="d7a7348d93147e66218a304bfb6928b95da9a1f67527ad70850a58c94ddb00e21f1724ba2598e622ce2de3f1bc70cd7e3aa2d51c1f5e298f21d9493bf4c10907" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.21.pom">
-            <sha512 value="2f821f6abdaa894bd2d62b4e33dc4e54c8ed80fbc69a1be639bdb11a86254aceac88dd66e9802bf9767fe9bdec33854437248185d2cc1c8fc6b26e91f99bc3fd" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.2.10">
          <artifact name="kotlin-stdlib-2.2.10-common-sources.jar">
             <sha512 value="b6e398df45635071fed431c55dbbea1e6605dcece9d670bfdc681f205f7012ccc228f73f7a85dcc015f054f70f0d0bbd95f00b946f1598844bf3b9bc0b842023" origin="Generated by Gradle"/>
@@ -6238,41 +6515,41 @@
             <sha512 value="3ab4c957626e6b751fc159b5637270789e620e41078026e53ae761e657e6c0053ca9a141ba031f23f8868868d5696e479c19660a70f55a0da7dbff135c995bca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.0">
-         <artifact name="kotlin-stdlib-2.3.0-common-sources.jar">
-            <sha512 value="b333bc95501af78621688c99ceab13adf69c2883d14094eb566cb50dc843b3cc0eb64d548e7b4a7ea5bd88be284f30aaa0553273408902d53cc48e49fb1b09ac" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.2.21">
+         <artifact name="kotlin-stdlib-2.2.21-common-sources.jar">
+            <sha512 value="c07d8cf6ed3dd08e76547c397dff115d42fd62d758168358da6c24d7100e82421742bc072ea63bdb8e3f37179f4a1c7cd28fd20d003322e8aad4bc97bde0b13c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-javadoc.jar">
+         <artifact name="kotlin-stdlib-2.2.21-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-sources.jar">
-            <sha512 value="ef5fdb5f007bf0fa63b2dfd42567298f1325c588d88b64d206650b00d6e3d23d8c04223e5eb9967b1374c9c5397b98d9e9c8aeae903d6313efe3ac5408c17145" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.3.0.jar">
-            <sha512 value="2d19829e49ce79b8587ffc1620f95c4773ec85780f45c609017fa411064c0edbd76fc7c1333775814693258cd9c932d82bc94d18d2c545fc90198fdd3087d6a8" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.2.21-sources.jar">
+            <sha512 value="dfa788a8be3c6db9a8ea9c46129b976e479d167fd26de8b0574859002095ebee4acf8399f7040340cf3b75d1f1c496d1416c9727b1ffa9379035acf76f6ba068" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0.module">
-            <sha512 value="04bc39c3d5650bc8b212f995fb81e872fe563ce3ecb2ff5355ca33bd1b73b6c44e02fbe9492f2222bfe000a8646bb7e02761d543bd7f4cdb4e49266e01a350d3" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.2.21.module">
+            <sha512 value="4c44e2226dc8baf91685545d49db558de088241c87ac54d0f4a83af9b641d7d8c1f3ece654e41f3953690b81274e75fd57baffc51f74cd6da4787219ecfeaa99" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0.pom">
-            <sha512 value="a19afd768945fd94d9a3167b390a6088cd33fdeba5bbd3817e8bf3946f88b9ba3fb370bbe9441347b4d78e60acd3e0fa3e1a4f0f9ec89dd87e3acd60ef2d0305" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.2.21.pom">
+            <sha512 value="713bba2f5a0e0c320ae5e8446ede182212151f283f66355333c5f427829a655a22d8f3139b86094aed23f1cf5aecfab36a02da780785ad42a31236eef191fae0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.0-RC">
-         <artifact name="kotlin-stdlib-2.3.0-RC-common-sources.jar">
-            <sha512 value="1f8d651395f29f508b8320caafc45dcc3a8c5dcfeb2113ae6f6e4c9596a0f629648a2fb0b9522da97ed919d2411e1a2b6baca65ae16d3e81ca3dcb85b8153564" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.20">
+         <artifact name="kotlin-stdlib-2.3.20-common-sources.jar">
+            <sha512 value="ddae6f51da121cf04f8f57aac179c5fc87eb20b5e1d5a8144a363d149d895adaa9b9d3552055fa42d8235e7ca2705a40cb8dada3b4ef8fb2afc4ba99e169c6cf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.3.20-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-RC-sources.jar">
-            <sha512 value="ca6dcaaf1b0226e913555fd90d5e557eb363549497483b31b2a6aa1fc080fe78741bf23cf03af9e606a2caa7dbde52b4189900a1159ad404ebaa1bc4d51a6c6e" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.3.20-sources.jar">
+            <sha512 value="1c0f325c690619f6daeea0adbd1e9e38ea94c5a4b0862dfb646075375bba8ac1aaf8044072c3119dcb0b8fdf62ac543e21ab6ba096dac970c14351b962391d5c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-RC.jar">
-            <sha512 value="cfd9a7bb995c04cf5fcb2c028600da02e4901f603d9e40a6b8420707c9b3e9731f727eec61819549217e49a600299f5dacda6ffe4d00ab1ae9a6186801b2d21c" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.3.20.jar">
+            <sha512 value="d509e541f7d2cbb9036060644fc0bb0b7afb1f34aca54c6712b05dad5f356b0cd74840d7709798ddf7e19f90ec9e317c4e58fc54959db1c4468cfe7baf36291b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-RC.module">
-            <sha512 value="8d15bf5bcb2e563260e0b2724f91dd2daaa1a8daf1ad0f27fe46355c411c706fff77c0e1103e64cf380955828edf3949f4549d2d0ceeaee69d131629f114980f" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.3.20.module">
+            <sha512 value="1d4c51cd11bb4a4ddcebb803686cbe3eda6761153048651dcfe2561c1e1dedabb55cb8cbbd122d3cfc111eb3d3ebf07bfd0d3525ae80ecc23cc34016e648e308" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.3.0-RC.pom">
-            <sha512 value="e6478755621ad9ef595749d6c675e67ba851c9a869ca58802b8d65135a86ecf5dced9e79b52818e6528e714124f7c20f78aaeb9950352defe580c27263e95fc9" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.3.20.pom">
+            <sha512 value="03ae5ea4dd9ce9e72427fcc630524defaf51fdc9a84a275af4b84c5c387a96e7b4dc5ccad9c86f8dbf3a7f2d3ef76230658223ebc9fbd36cf33386501e32a726" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.21">
@@ -6295,6 +6572,46 @@
             <sha512 value="aa709ce4ae3117e23019eae3ec54faa06157972fdfadceccff1186e61c91391970e9b922b2f0b1009a9b01ee05fa2ae4c4fcd3bbfa011859527299cf4f75048f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.4.0">
+         <artifact name="kotlin-stdlib-2.4.0-common-sources.jar">
+            <sha512 value="902efdf3ad4f98281fdf9b8e21bf2af087fae749a96821a07cd84913eaef654c7a1850d785d5da85236b9e1a5706bde8bcbd78ac6b98bf9e19d12a2fc0934a26" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.0-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.0-sources.jar">
+            <sha512 value="99ac19710f1dd6a5ebc852d186d1127355807abe9af55a6d140252d217929930afcb5dc103971cbc4048ddbe7dd38384e67f13fe8f5598baf9a0c7f471a8a888" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.0.jar">
+            <sha512 value="2bac8b87409ae19aa9d91f8e3faabe9090549d05811249d30dd1811112e37f8650ace8cdcb1f21c96552edecd7d700c448b3ddf80cd4db9f61a3bc7ee3435627" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.0.module">
+            <sha512 value="c8b8970e1ccf8000b962e1d7aa68d49b50ae2a7d3fb324c532ea798c43d6be65e2f04820778f0edbf00660afcda43d7b660bd6c1d3d620bb3f92284b04fb378c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.0.pom">
+            <sha512 value="ce37bd679da72a793e1e2c717a1ad792ddf59832e02120c9d358db543916de2991ec2d3a574c05bd08e06afba0b082e5637bb2c2b8f8b3a043d2104e508fc9e1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.4.10">
+         <artifact name="kotlin-stdlib-2.4.10-common-sources.jar">
+            <sha512 value="61ebf2e8f24cfe241d31dc0dff7d6ccf3c19987f946ba408467afa00a3ace33facf34f5ebf17825b3cb8a2f7ce3756a1d0ab8c2e073a84535179e117d789976b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.10-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.10-sources.jar">
+            <sha512 value="5fede4384df1ffa94c58cbf4e9a13e09e0b5f1fbbb1fe94c01810929da0c839ec8ac61f0bacc7db0160a412a1e8cd11535790353c1d2c325a8de3fa70b0373fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.10.jar">
+            <sha512 value="2214a0acb80919a40f3d45416e9c22f7fd32a6c63b70d3b7435a66d9f729dd5e77c40081b549ce570cea4c2c87b261069b575e515376033b35cb969b2faa3d3d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.10.module">
+            <sha512 value="c2e2e6cb6e89043e507305d3b044bafb13282b90856ff59a8ea785e4d229f1d6d24a0ca242bb990f1c65eb4b67287bf7349558dfa81594b4c7160645ccadaa42" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.4.10.pom">
+            <sha512 value="9191ac9ff5eeccbe5cbabd6ad3d07f00e5911a9af2828d384908352a06c79a5bba4b8d91a55c160195ad595e77f43be26011d01c590ae4a9183b7026402dc918" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.6.0">
          <artifact name="kotlin-stdlib-common-1.6.0-javadoc.jar">
             <sha512 value="747d2f00a7f5f379582e33e452f30f3a25732a510971d9ed5161355bf7ef0fc507fef30883960dbfc780d36b6e8215fba01086b4ee053358805686e2f2c1aa85" origin="Generated by Gradle"/>
@@ -6489,17 +6806,6 @@
             <sha512 value="1e54217900620b94c3f7ac1bcf0fed0fe03fcdb24ef5383a2671fc5e7181252b46868738a06c237d56f100120842c5efa95b1482c4333519fe11fef45b1b8422" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.1.21">
-         <artifact name="kotlin-test-2.1.21-sources.jar">
-            <sha512 value="52854e4e06ec7442e23012091d30720af7e313bb2a371d91a3caf76c9abe831a72b4d248354a4715bddbbc7b62c32fbb0de85a3076600e9fee24df6a145cd955" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-test-2.1.21.module">
-            <sha512 value="dfeba1b0261e7701d2752db88eec3c7d427bb9b5b2f983f0827a1ad0347626d7af5ba3c9445fb967b75207a181132133f4980b30d1bb81935ca9791b1505a6d4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-test-2.1.21.pom">
-            <sha512 value="35ec66597b4bcab560f557fab4b9711f219aa65cabe8e3c35030f16ec985c378b2a8a5fa34791977021217e2b89518a7e97e300ce87e480f1750fc93cf322b13" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.2.10">
          <artifact name="kotlin-test-2.2.10-sources.jar">
             <sha512 value="456c65c7a6917d20d88341d4f4f467ff065848914f727c7d63d4fe019e9020231272b05cf766ac5ba727d3f723e197728f23d6d4ecc02d0b94e1e2189c02c088" origin="Generated by Gradle"/>
@@ -6511,6 +6817,17 @@
             <sha512 value="716dff3ab967ef3757cb3a05f0145abcaaf14d5ec4bbc8d256f660ceffffe7e5ef8abb2d6fe66124a68c352084e23b377ff8e376bb1a5e1dffbcc0a729aa9078" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.2.21">
+         <artifact name="kotlin-test-2.2.21-sources.jar">
+            <sha512 value="456c65c7a6917d20d88341d4f4f467ff065848914f727c7d63d4fe019e9020231272b05cf766ac5ba727d3f723e197728f23d6d4ecc02d0b94e1e2189c02c088" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-test-2.2.21.module">
+            <sha512 value="72d261d7d31c47e8d5fed379b7eab622e955aa47949e5720a968d90de9e11a781257d042c6088933d98f6349ae191b2db06930c2bc63a32ad92ed5c68760ba10" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-test-2.2.21.pom">
+            <sha512 value="1488690e35058a4c97e0a8c8d100e9b1817d2ca51b588cd78bcce2391b106f9c68b971644bba0999bdaa1bea1a0cc0cbb6e51e332ad416c44f98037d12d0e2fd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.2.10">
          <artifact name="kotlin-tooling-core-2.2.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
@@ -6522,46 +6839,46 @@
             <sha512 value="00567db370a836fb4eb8ffd3dfba987c95d2ca941668269a2f2e24ee2c10c0b9272d53c318aa60c2dd8e319060d9e1609f7e56ae2a87f419ad342ceab1c2cdda" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.3.0">
-         <artifact name="kotlin-tooling-core-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.4.10">
+         <artifact name="kotlin-tooling-core-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-tooling-core-2.3.0-sources.jar">
-            <sha512 value="b3b62630b8f074ac8208e0155a40ce5c9296228739789fe070723abf27c3717ba3d026b2bfdf131eaa38a48bd7519f6b34188866af52392ecca9c55798ff66fd" origin="Generated by Gradle"/>
+         <artifact name="kotlin-tooling-core-2.4.10-sources.jar">
+            <sha512 value="065b9ff3f9d5b0eb90ef10d933a6f34d49e2397c54fe955f6737349039d664cb6524bcc79d5a4cb2b6d60e4452c9ca87de91295a0f2fe9d353810d80ea0f4caa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-tooling-core-2.3.0.jar">
-            <sha512 value="831ec9092a896fefa8c4b2bd0c2304307dfe812ad83738e83870ae4de75d3d829cd89c576e9daadcda5c8d54777371bb5611482cfd9d6bab5fe1645dda7132a3" origin="Generated by Gradle"/>
+         <artifact name="kotlin-tooling-core-2.4.10.jar">
+            <sha512 value="f86d6c87577bafc1b1d39772bb0377898ee9ba30f974931b5e31b59504946376cf48920101007e5168f0a5fc13c2836ccbad9512a88aeb72bab515e0419081a2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-tooling-core-2.3.0.pom">
-            <sha512 value="eb97ea2ec1b75fe8b0566efb3c4d301ac70b3eb8050a011ee9829358066019627d4ea5e3cbeb64f4e9de86fdc7c1bc1105a1fc4002d0f393b55651d14ffd9e4f" origin="Generated by Gradle"/>
+         <artifact name="kotlin-tooling-core-2.4.10.pom">
+            <sha512 value="8d90f9d6ced51a22cffa73798b715e32478edcc83e13b218bdd96337545cb6ade613e75c0354ff01629b48ed394b9d911dde1801670fa244a53ee0b205dc4eb5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.3.0">
-         <artifact name="kotlin-util-io-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.4.10">
+         <artifact name="kotlin-util-io-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-io-2.3.0-sources.jar">
-            <sha512 value="9fd2857119d5193656a1032a4a7f1875920f52f00dbf60dccff6d34efab3f279be13f978d97c38550c76da192c0b58cabc0a1b6f0a1d3ffebd1750275c1fa2c8" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-io-2.4.10-sources.jar">
+            <sha512 value="9d8449b873eee1ccee07e749515dd140bc88c5690c554759fbfe56e079015f6d5d7d4623eab5a65ac103d49d8efe4231a76ed0ec55fcb49b30083fabe48c58b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-io-2.3.0.jar">
-            <sha512 value="7cb41fc5a2542595bc2cfe2cf8e15b05641dbcb35e319c124ecc014f7e67ddf453e3c61ebf0a524f2460d8453777bd27fafe0653d7e790f1596519943b3c818a" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-io-2.4.10.jar">
+            <sha512 value="9738f62fc50f21f68861b7b5bc686264a2b2468bb2d64469702de4506b36ce1080c88c1a81fb3b5dfd789d46fec5919a60c669fe27737f31cf905381f9542e32" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-io-2.3.0.pom">
-            <sha512 value="03a068c8b75c81c7998ae826edcf7b504445bda651351744d9125869e075b0a0d579911ab5aa97bc17783ab032073015b8e5cfc9363a4817bfbd78f14baf6257" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-io-2.4.10.pom">
+            <sha512 value="d89261b36942c04aff58cd885535b1818a5dc4e82db35cfca95ede0cf9ad9db9bd37ef622010f4c53ef65ab03008b0e04e188eb0780c9ec1daaebbf514c1fc64" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.3.0">
-         <artifact name="kotlin-util-klib-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.4.10">
+         <artifact name="kotlin-util-klib-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-2.3.0-sources.jar">
-            <sha512 value="f686819501f57a64a96e56fd060bbfcf9a9e460ba837549265301d6ef8e22b1023313da8e3534e34a94d321c0c4d0f349bc5852ee5ec457e9be7f7c11e1daa16" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-2.4.10-sources.jar">
+            <sha512 value="e9026c27589f379e60f8db0e82b47ad9fcd00da3dd18ec4feca8f9f23fdbd8239fabbafd230b5ce6b31b2057b8d7892429357f3396bb55949339cea3252afa36" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-2.3.0.jar">
-            <sha512 value="2bdbbe56ceaaf9cd4ec981042f3109626c311db7981ee623e6c64d381d137061f3ac02fc408a5092f4af2e8dafd94cf7a8a73b967918fd46317a165727be327d" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-2.4.10.jar">
+            <sha512 value="0f553ba6b9326e9754c7b8d4865fd84ee6b81667f0a02ee04f922b093777ac6150e7e123d67c46e2f7555c2c761587091c04aa4136f76d7e62d1c77cc6626c39" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-2.3.0.pom">
-            <sha512 value="7f40c80e7c8f65739e892e01ba536f5e57db816af3f94e1ebf660a986e03dd5bb6a71df670a2c03a25148b917d4fee8a13ba7d05975250ac57f12c0186cebed1" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-2.4.10.pom">
+            <sha512 value="7f4d3c4071672f92148c77c9a572db7479e1ebc8902f71ea457d510739ed918ab038225c852f1b7929bec5a76f3ca5aa725d7e77f24891caf588c9352308d4c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.2.10">
@@ -6575,18 +6892,18 @@
             <sha512 value="c3ed8e17501a28caade96a803f2a42aaf51c2e4f5fc2e34eb9813b8b72914f1f7472c944bdf0a185c3045154d57a264ef38e3f1aa1816349c6cab27f5dd48643" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.3.0">
-         <artifact name="kotlin-util-klib-metadata-2.3.0-javadoc.jar">
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.4.10">
+         <artifact name="kotlin-util-klib-metadata-2.4.10-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-metadata-2.3.0-sources.jar">
-            <sha512 value="107defb75276ee9c6bcbdfb729e27b186d45b3e4f562852f0eda8a69c0c353eb726ccee62ccadfcd5bf5ab0f9c0f6415403e18d103b3419608bd8a81029237ea" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-metadata-2.4.10-sources.jar">
+            <sha512 value="c84891f7d229abf0e5c4853c78cd3e4bcff1c8827099b1932d3f58e02eda7bfeb9a16c8d0fdae45ff15457d3aa6954356ecd0b3bd97215e3e4132b05e13259ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-metadata-2.3.0.jar">
-            <sha512 value="5e568c0f409ba9144375e6af7be303d443e95471ff05aa7b04b9b058dc14f0c985d720e4d2989d2d256d4212f8b1e9e1d1a51b98241b1c6109cb680b4b712800" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-metadata-2.4.10.jar">
+            <sha512 value="bd90460f5f838c90ced08ded662d14c87844dcdabe7ebec10d28184a73088ca215f183972510589c51dafd79b742a22693e066a9e5d773c43dee9bef6dbb5425" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-util-klib-metadata-2.3.0.pom">
-            <sha512 value="fb2f15c64f10958f6124e6f7740ce67e3ee019849d7c6dba290674c4953b03ab49f885ca3f6f8350825c229d283efcf6ac952d34828bb04b9ce3888c2920d7c5" origin="Generated by Gradle"/>
+         <artifact name="kotlin-util-klib-metadata-2.4.10.pom">
+            <sha512 value="f547f4b29634042fd79984a8c12a7453387494b80ad9085ea76ab76aa753a45e67ea2f9aabcf41b0bb6ed9f556fb371b749a910ef4e550fa435e41baeaa9bb81" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.0">
@@ -6649,6 +6966,17 @@
             <sha512 value="09f31fad88d70a3a43a77d0440503ba22b2b5924d17c50bac57880f70df39709b4e8e6c9a7a4b63f63bfa094f022430d3e97dbe61beefb53cdd5d787c1553e4f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.28.0">
+         <artifact name="atomicfu-0.28.0-sources.jar">
+            <sha512 value="e6b415c5be52a1c313f59eb7e554f5b6a07d54794f2eb19787f377341b9177ff45dc8c3b5da2f95fb3e1a0144effa41beb24a358a750b58d406b69ec9166b83c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="atomicfu-0.28.0.module">
+            <sha512 value="e35d0f14611c082a0c9fe9da4c1f18ad38917ceabe31a51df0f8320a4308b8e762b9fa56dee3e562952457905da7ca46f0c46f2222bfd8971cf9dd9ff4f00eb9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="atomicfu-0.28.0.pom">
+            <sha512 value="9e40b900bb5d7d293e5a1f8a1f16a3031f35de37c1a746564d8da447c48069de5ccf06d65b907f224cdecb92356ca6f24e28522681ec89d68c35357702146457" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu-jvm" version="0.22.0">
          <artifact name="atomicfu-jvm-0.22.0-javadoc.jar">
             <sha512 value="ede83e02b40ee537b2d72bdca3ea0656ba79f5ab81956133c27876cc2a3903832419aef39b6e536b7c9263f35d0582d5ad1000f7cda642f2a8099d63cb333de9" origin="Generated by Gradle"/>
@@ -6666,21 +6994,21 @@
             <sha512 value="33534e98cc164f4e87ea35134052780b12fedca686a56b58b4ade0d0e8c81a38355ee2957b8e05e9f0417cfd90fe2592f675f99fc3f4dcfdcc964eb6c17bc0b0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlinx" name="atomicfu-jvm" version="0.27.0">
-         <artifact name="atomicfu-jvm-0.27.0-javadoc.jar">
-            <sha512 value="5724bebd5f4ad34bac19d7e5d587579e2d2d629a240161ced73b2f2feb359b69f04331b19d0d3210528b3eef3a8c9649694b05da7dd59f577910aa8cd8e2fa6d" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlinx" name="atomicfu-jvm" version="0.28.0">
+         <artifact name="atomicfu-jvm-0.28.0-javadoc.jar">
+            <sha512 value="21b1ba0686471fb19e2d52b3ff7fdb38992efd987e976b1f083ed12e81267f932e5a5a4aee34e65b19aeb442478581c08bc4310f9a0de6fe58ca91fc9336e814" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="atomicfu-jvm-0.27.0-sources.jar">
-            <sha512 value="e7f18fb712aad7c2c69647ce7aca2f96ae1fa4f7a9e28641615a4283cbce487a4023a70a48ddf6d6d8e810353e9fb218eb6153798181f2d82fe17cd4e60ccb16" origin="Generated by Gradle"/>
+         <artifact name="atomicfu-jvm-0.28.0-sources.jar">
+            <sha512 value="a5c84bb5ee6ce19ea3f06cacc36bde7ea8b6d87c5bbac81c912de503f062fb154a4fb88fc8748042d5bee15ac52a6759d73984028cf76370813c90098198763f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="atomicfu-jvm-0.27.0.jar">
-            <sha512 value="761da97817060f375423f2b6d47c7bc9e5b6b593aa79cb24a26a0010cd0e36918176a7dffc20ffbf1efca786a5cc776d0f556b6dd76df33f09d8ea7b961050da" origin="Generated by Gradle"/>
+         <artifact name="atomicfu-jvm-0.28.0.jar">
+            <sha512 value="222e76c73577cd301aa7cd736609687cf7fa8340680a00cc5c15370834370c7884998b1b92f39dada0256d4ff521adce86b6813c61c70586c1e70e503e5491b0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="atomicfu-jvm-0.27.0.module">
-            <sha512 value="314c776f03db5c14ef540b30e11d6101a3d4e243ed5068b828c90d063fea3eaf70de21f29983ac624c2420fcd056eeb8fedd454d64c89f8d6635852aec649e79" origin="Generated by Gradle"/>
+         <artifact name="atomicfu-jvm-0.28.0.module">
+            <sha512 value="dfe53d0a4cc3f1c1077e77c21895f38b684e6691a3c6039d4e44926770ef7da231e7aedc75b52b9f25383f1c193640cbef6510a873523d93af6f3da1264fa079" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="atomicfu-jvm-0.27.0.pom">
-            <sha512 value="c4aebe2b360b861c345c80b0b4cad891e9b6a8ca1916170565a6ed336f39342ac8592c552b75fce59ba958d7affe9c3a06b7dd48589ebeec9717d43f123ce8b3" origin="Generated by Gradle"/>
+         <artifact name="atomicfu-jvm-0.28.0.pom">
+            <sha512 value="947174078952f5e1886ade992b3fcc4e591bfa34fba6ebb6ba891146f814cf882b520d5bc2d26ce6e5c3972ca3366cd242d841da83a7401769f8f007800404a7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.6.1">
@@ -6705,6 +7033,20 @@
             <sha512 value="7e3fafaf32a0a5a9633d3c0bbf1597149ad8a78518de5823a63d83c27880309211deecbd78d37ffa6b815c9693dd82b10ee73fad8ab6e6ff9e68aef037e4ebe8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.8.1">
+         <artifact name="kotlinx-coroutines-android-1.8.1-javadoc.jar">
+            <sha512 value="7731eb5cb79f10fa2e6836ef229f5adae6b4faee9d54480b5140cf9a5b6b9c7f5324d0f023a8d719380cb3d52e983bfce668b4b57570935bd2c4f021978b53f3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-android-1.8.1-sources.jar">
+            <sha512 value="0ef490341564fc60073ccada1025d1c1d98d5c4d53fcbda6d1dfd360d86bacc0daafdb5e5cb61c9c162ed9d5dc4ff98f55b746ccba34cd318e0f9902135175dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-android-1.8.1.module">
+            <sha512 value="07295a86dbd443df200576599057264ec800143b6c69b97cc548f65db70998437410989fb348dba701354f34f19dd6b87a117aecb3e759646a505e326cab98b3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-android-1.8.1.pom">
+            <sha512 value="8cce21dab5481ad4e3b74fb62cae07ff1fdaf5039230580b0d4baffd42190b5fc49d6ae1935dfe53d3fe3c61195150c3cc01ad9ca723f1ec716217623c6bc8c5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.9.0">
          <artifact name="kotlinx-coroutines-android-1.9.0-javadoc.jar">
             <sha512 value="4247b1026df00f9801f4fac2006198f66b2848d0cfd0d47f79f733a8ea81545b4424ebe94e9dc987704df77cd4652485daab4ca26901fa482c8ff7fbd1e38759" origin="Generated by Gradle"/>
@@ -6953,32 +7295,32 @@
             <sha512 value="d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm" version="9.8">
-         <artifact name="asm-9.8-javadoc.jar">
-            <sha512 value="6dd4e8a827bb75d9fac4f52381a3a9307fc92c7b1904c83e7f9c0dba7b160cbfa447de47e84b2639836e5aee7e09b5da03b04006ec598d469d3522da3b652a60" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm" version="9.9">
+         <artifact name="asm-9.9-javadoc.jar">
+            <sha512 value="b9042bc9f76388f19a061f33206af15166d5d29ddb8a665b20c7152a76d25e824b5b0be670f242e64527f14ffcdaa76b63051d6c8ac44d0eb1b1257ffa7e89b3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-9.8-sources.jar">
-            <sha512 value="329663d73f165c7e006a20dd24bb6f5b4ac1079097d83c91770fd9fc537655a384c4cc40e5835f800d6453d393b6adbcd51c6eab6fe90cd8e1e8e87b9b513cc4" origin="Generated by Gradle"/>
+         <artifact name="asm-9.9-sources.jar">
+            <sha512 value="f018a37a03609180494be25e913d6f50f188d9d0559aef3b6da74fac02a40662dcf52f1d1b6a5a5604451a55e367877109bd0d080f63b0fea663fd023f7d603a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-9.8.jar">
-            <sha512 value="cbd250b9c698a48a835e655f5f5262952cc6dd1a434ec0bc3429a9de41f2ce08fcd3c4f569daa7d50321ca6ad1d32e131e4199aa4fe54bce9e9691b37e45060e" origin="Generated by Gradle"/>
+         <artifact name="asm-9.9.jar">
+            <sha512 value="197a4fb3ecb34d05ac555c6a510e69affcb1e476f24c5e935ad513ecdabf74b45aa1b0e0b25dbe91224fc6db7959b2677ea5876ee49e7487265e2a29c560c21c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-9.8.pom">
-            <sha512 value="a34a1cc4ac50724e0798f4d8ee677207ba68e4f311d9d5cc200dd9351ea63f556589aa42c7a0df90b53634ae41bae3646d5115eb029aab11077a20f7b144bf3f" origin="Generated by Gradle"/>
+         <artifact name="asm-9.9.pom">
+            <sha512 value="201409cd84e380484657fbff4da7d1a0f24a6135010b307289947d9279dae399c7eb2516a822e0d6cd06371ae609806e1c5cfbd5401535da41294bf4fc811a40" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-analysis" version="9.8">
-         <artifact name="asm-analysis-9.8-javadoc.jar">
-            <sha512 value="f444aa668719fccc7cfdcb006d030ed42158fac77e5fa2501f2c25e43304189568a769019a6cabed0afbbaeeff542d59d5d88b01bc9b57aeaa7a0da1ab2832a9" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.9">
+         <artifact name="asm-analysis-9.9-javadoc.jar">
+            <sha512 value="81baf33040b97edb67c5245dd1d979b9462b61968d7c872178b112ce38b5a287aa9fdd703fb3c9ccf059046e38dbe81fb10238ea5246a0a92d210245ce39e61f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-analysis-9.8-sources.jar">
+         <artifact name="asm-analysis-9.9-sources.jar">
             <sha512 value="daabbc03bcfdb5227d410171a5322fa4cde907f9fe32760b293ffd761c3290fcf406bc0290f1f82774dcbd9347be55dbea65cda550084e35a6d57cbad63c8593" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-analysis-9.8.jar">
-            <sha512 value="0268e6dc2cc4965180ca1b62372e3c5fc280d6dc09cfeace2ac4e43468025e8a78813e4e93beafc0352e67498c70616cb4368313aaab532025fa98146c736117" origin="Generated by Gradle"/>
+         <artifact name="asm-analysis-9.9.jar">
+            <sha512 value="293fdf9ffd6858559d9bf4a2b68dfcfc58cb581d27e0fbcd2c2d0c540520498e9d587094534dd58d782ff5051b90f160971cfc388ea132e06eafa089bcc0bed7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-analysis-9.8.pom">
-            <sha512 value="7b65663a02d30ac3c499cd63d8b057091a394a73f5187c33f325c4f6dfdf103940ba29e1d02c3f59e0cb262b3015daf5dcb058ff87e0a08762071e47a1f0ffec" origin="Generated by Gradle"/>
+         <artifact name="asm-analysis-9.9.pom">
+            <sha512 value="bdfc8936b1784610997ecae933d077fe218082b0d8f76d8e0cd48469d0206b77ba442b83750ae5037af7e3c498a9b977e4e7c7e088b5d73df327ebe3a79abd0f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.ow2.asm" name="asm-commons" version="8.0.1">
@@ -6992,32 +7334,32 @@
             <sha512 value="1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-commons" version="9.8">
-         <artifact name="asm-commons-9.8-javadoc.jar">
-            <sha512 value="3759af449b89f51e8f0dc3fd2c18e0bc289b574a21ab18399325df5a1e61d5a789bf6740a425bf30f2a70d8819948028d61ddfa81fb90fe4d884fbaa8e483a5b" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm-commons" version="9.9">
+         <artifact name="asm-commons-9.9-javadoc.jar">
+            <sha512 value="ab1d4ff26b7aa2cedbda4847cfafa052b60cc9390b6c4d65d8dbd75cb4ca5e5d2dea51276917ff321a091af17999b588307a990097400a875eb0a24a9dcc12e2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-commons-9.8-sources.jar">
-            <sha512 value="dea8a2f871024210980821dc06c6796a3fca58293f650614275a086aaf9e2f45066a128f434dadabb85162c52796e99c863a6838e851ec02d6d97c603ed5a6d9" origin="Generated by Gradle"/>
+         <artifact name="asm-commons-9.9-sources.jar">
+            <sha512 value="5cbd36473312bf9dc9447564f1bcbf70071d08976e7647ed9d6cb789a5b859d051cf034b9b74943526e5101fb02f7e979148f1ad9327865f4da122980e240940" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-commons-9.8.jar">
-            <sha512 value="d2add10e25416b701bd84651b42161e090df2f32940de5e06e0e2a41c6106734db2fe5136f661d8a8af55e80dc958bc7b385a1004f0ebe550828dfa1e9d70d41" origin="Generated by Gradle"/>
+         <artifact name="asm-commons-9.9.jar">
+            <sha512 value="4949cde2b51e5d171d0ff02ebd1f9f7f111bf538c8bfd62f139364181ee4bebd6598949d895f1c78daaba6dd1da4e564fab10e602cfe297915cd0287f8c2f1d5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-commons-9.8.pom">
-            <sha512 value="a5137b1ead49660b104f0e8d54b9df646d0f87645905c38e7df0b6d10d7f8e0aabe43db227dc005fd63765eded2554c23fd0495cc25cdf4112447bd3300d9bae" origin="Generated by Gradle"/>
+         <artifact name="asm-commons-9.9.pom">
+            <sha512 value="0b141c1bf673023cb2da95d5b030995051b5d284d7c00d23ff5f4aa8853d343f835392c732c832a71648ea04a70090ee0b4ca53242f324401164e9f533ab2e0e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-tree" version="9.8">
-         <artifact name="asm-tree-9.8-javadoc.jar">
-            <sha512 value="c76076f106ab7dd7e55555e5c29ca6fc357641a9cccbfb449dd4582e8df0004cab9746bced316894a2bb0aaa3ac5f446d8b9f41d47414f57320aa9578233f56e" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm-tree" version="9.9">
+         <artifact name="asm-tree-9.9-javadoc.jar">
+            <sha512 value="894bd421609aacc2ab94fb8df1fcf3873836007aa0c815f8e3fd5e96199bc329a2966d15fc078dc2eb5cd85fb72dee626a3d801ef60844e628b23b59035fddea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-tree-9.8-sources.jar">
-            <sha512 value="3cea80bc7b55679dfa3d2065c6cb6951007cc7817082e9fcf4c5e3cdc073c22eddf7c7899cff60b1092049ec9038e8d3aa9a8828ef731739bda8b5afcec30e86" origin="Generated by Gradle"/>
+         <artifact name="asm-tree-9.9-sources.jar">
+            <sha512 value="18b7923baa5096046e3309a6c483c3b89778d3f9c8a408d1adc02edd9e6345ebedd1e32101014eb2216b2925abaefcfc1f98d88ca0d88e13dc9191a4afcbf5b3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-tree-9.8.jar">
-            <sha512 value="4493f573d9f0cfc8837db9be25a8b61a825a06aafc0e02f0363875584ff184a5a14600e53793c09866300859e44f153faffd0e050de4a7fba1a63b5fb010a9a7" origin="Generated by Gradle"/>
+         <artifact name="asm-tree-9.9.jar">
+            <sha512 value="8b555d9166a17dcd0d1b297bd61fb3da59279b00a97fd7d0a3b139cb68ca8012ac14fb9bab0a6fa7ebe5612337f8e39b240d97b05a2c25ebc9ece15b7a1bc131" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-tree-9.8.pom">
-            <sha512 value="db2073ff628d0a146bf4c132fc900d9a646476fdeda35cee7f1f0d2a486848d4cbc77fd28bf2a28bd9855e54ec3b8114d2961cee580dd27ce7d48f4ebf2821be" origin="Generated by Gradle"/>
+         <artifact name="asm-tree-9.9.pom">
+            <sha512 value="7770a74d27cd6259778a564267f17f49fc8e992f5bc7b5e3b261b0e7793d5f76954195964b82a76d0eb48a0d662301be23e40efbcc7a4221ff6e928384abc18c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.ow2.asm" name="asm-util" version="8.0.1">
@@ -7031,18 +7373,18 @@
             <sha512 value="66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.ow2.asm" name="asm-util" version="9.8">
-         <artifact name="asm-util-9.8-javadoc.jar">
-            <sha512 value="57f0829f7eb0a98f3cb5a4e7edd44671e88c72f328b8edd5c5fadfbec13cb9a91920b2a96cf5d056060aaa63aa8bfb8060693a05813792603cf6fec1f68b434a" origin="Generated by Gradle"/>
+      <component group="org.ow2.asm" name="asm-util" version="9.9">
+         <artifact name="asm-util-9.9-javadoc.jar">
+            <sha512 value="98888c8f200561a3f4e136172c1888ea10ab9d4b99542b3dcb0aa6bb0c04e6b0e4bd1aaeb4850c0ab67fd4de48d0d8c0b70668a8dddfb282816822d730d7fee3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-util-9.8-sources.jar">
-            <sha512 value="a58be3b86db2fef38472e9eb4f81768875b883ab40630e4dd182e0a376e0fd586bf27578b72c12ecde49d5cc9adf84778c43d2df0a2ffc28b03645a39ab7b01e" origin="Generated by Gradle"/>
+         <artifact name="asm-util-9.9-sources.jar">
+            <sha512 value="fac2372e402e41742009814e898ae188a701491d77e16bd03389583651c28b6a29eca26f5614b1f8d7e8a9733e3b0f60f9d8aab976ae806376604e80a57a7263" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-util-9.8.jar">
-            <sha512 value="b68048e199c49d2f90b2990c6993f1fcddccd34fb9d91154ef327d874aa5ff8609db5fbd63e23141020cdeda8fb753e97a61c2152e1b4e8f20003a5390e7e1d9" origin="Generated by Gradle"/>
+         <artifact name="asm-util-9.9.jar">
+            <sha512 value="cd4f82589e0acc801618e4f55de2e7b85718d30cf5a7d2e5ead383dcdc2689a934abea37b81f5a7c508d9f7fc9ceb2e8ae5c8e4e958537ebb80b621814b099fb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="asm-util-9.8.pom">
-            <sha512 value="281e96ee5a2bffc3cd4af80bab993a57ad2833769cd4c3941fa8709a9d552ab36c4336e85dfebd5e98aa7eaceb647211f8d5938f11fdd54edd846a2e8013523c" origin="Generated by Gradle"/>
+         <artifact name="asm-util-9.9.pom">
+            <sha512 value="539f23586675667c04c4b102418ae4c0b258db2045976b887ac41fec7c7efd5b72d0d4794397f0528ecf45e9e56c1f832e41554d52eb9d6c7ec89f04ab0eab61" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.slf4j" name="slf4j-api" version="1.7.30">

From 4fb8750dfabb8939a51aee4090a519d98377507b Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:42:10 +0300
Subject: [PATCH 06/51] Update the ProGuard keep rules for the new library
 versions

---
 app/proguard-rules.pro | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cd8b0cd5f..bca02c3d2 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,4 +1,11 @@
-# work around CameraX 1.5.0-alpha05 regression
--keepclassmembers class androidx.camera.camera2.internal.CameraBurstCaptureCallback {
-    public *;
+# ImageSaver reaches androidx.camera.core.internal.utils.ImageUtil#cropJpegByteArray by
+# reflection because it is private and copying it out isn't worth the maintenance burden. R8
+# does recognize a getDeclaredMethod() call with a constant class, name and parameter list and
+# keeps the target, but that inference is the only thing standing between this app and a
+# NoSuchMethodException, and it would fail quietly: cropping only runs when a capture is
+# actually cropped, so a build that lost the method still takes photos and only loses the
+# cropped ones, with an error dialog rather than a crash. State the dependency rather than
+# relying on it being inferred.
+-keepclassmembers class androidx.camera.core.internal.utils.ImageUtil {
+    private static byte[] cropJpegByteArray(byte[], android.graphics.Rect, int);
 }

From 30ca45370d02bcdc3857b69b1dd851afa69c917b Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:45:26 +0300
Subject: [PATCH 07/51] Persist the settings on every exit path, not just the
 back gesture

---
 .../camera/ui/activities/MoreSettings.kt      | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index dfa76fc43..58252df05 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -294,21 +294,32 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
         }
     }
 
-    private fun dumpData() {
+    override fun onPause() {
+        // dispatchTouchEvent and onEditorAction only fire when the user taps outside the field
+        // or presses the IME action key. Leaving the screen any other way (Back, gesture back,
+        // the up arrow, Home, task switch) used to drop whatever had been typed, silently.
+        // Commit here so that every exit path persists; a snackbar would be pointless on a
+        // screen that is going away, so the invalid-value complaint is suppressed.
+        // onCreate() can bail out before the views exist (no CamConfig in the intent) and the
+        // lifecycle still runs through onPause, hence the initialization check.
+        if (this::pQField.isInitialized) {
+            dumpData(notifyOnInvalidValue = false)
+        }
+        super.onPause()
+    }
+
+    private fun dumpData(notifyOnInvalidValue: Boolean = true) {
 
         // Dump state of photo quality
-        if (pQField.text.isEmpty()) {
+        val quality = pQField.text.toString().toIntOrNull()
+        if (quality == null) {
             // Revert back to the original value if invalid number was found
             pQField.setText(camConfig.photoQuality.toString())
-            showMessage(getString(R.string.invalid_photo_quality_value))
-        } else {
-            try {
-                camConfig.photoQuality = Integer.parseInt(pQField.text.toString())
-            } catch (exception: Exception) {
-                // Revert back to the original value if invalid number was found
-                pQField.setText(camConfig.photoQuality.toString())
+            if (notifyOnInvalidValue) {
                 showMessage(getString(R.string.invalid_photo_quality_value))
             }
+        } else {
+            camConfig.photoQuality = quality
         }
 
 //        // Dump state of image format

From 8e64fd643bc65048eb6ee9fd43db19d1dddf857f Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:45:26 +0300
Subject: [PATCH 08/51] Stop printing a stack trace for expected non-numeric
 input

---
 app/src/main/java/app/grapheneos/camera/NumInputFilter.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/NumInputFilter.kt b/app/src/main/java/app/grapheneos/camera/NumInputFilter.kt
index 793f9bb6e..3d5c17b2b 100644
--- a/app/src/main/java/app/grapheneos/camera/NumInputFilter.kt
+++ b/app/src/main/java/app/grapheneos/camera/NumInputFilter.kt
@@ -25,8 +25,12 @@ class NumInputFilter(private val settings: MoreSettings) : InputFilter {
                 settings.showMessage(settings.getString(
                     R.string.photo_quality_number_limit, min, max))
             }
-        } catch (e: NumberFormatException) {
-            e.printStackTrace()
+        } catch (_: NumberFormatException) {
+            // Nothing numeric to range-check: either the field is being emptied (deleting the
+            // last digit is a legitimate edit that produces "") or the edit is not a number at
+            // all. Both end up rejected below, which for a deletion is a no-op because the
+            // replacement text is already empty. MoreSettings.dumpData() restores the stored
+            // value if the field is left empty.
         }
         return ""
     }

From 444e3d9a8702b75e22bd98fceca09ae18b9263a5 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:45:26 +0300
Subject: [PATCH 09/51] Name the barcode format in the toggle message

---
 app/src/main/java/app/grapheneos/camera/ui/QRToggle.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/QRToggle.kt b/app/src/main/java/app/grapheneos/camera/ui/QRToggle.kt
index 7089a33dd..4818111ef 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/QRToggle.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/QRToggle.kt
@@ -11,6 +11,8 @@ class QRToggle @JvmOverloads constructor(
 ) : ShapeableImageView(context, attrs) {
 
     lateinit var mActivity: MainActivity
+
+    /** [com.google.zxing.BarcodeFormat] name, used as the preference key. */
     lateinit var key: String
 
     init {
@@ -34,8 +36,10 @@ class QRToggle @JvmOverloads constructor(
         val camConfig = mActivity.camConfig
 
         if (!selected && camConfig.allowedFormats.size == 1) {
+            // Name the format the way the label under the toggle does, not as the raw enum
+            // constant ("PDF 417", not "PDF_417").
             mActivity.showMessage(mActivity.getString(
-                R.string.couldnt_exclude_qr_format, key
+                R.string.couldnt_exclude_qr_format, contentDescription ?: key
             ))
             isSelected = true
         } else {

From 56267a76ae216e0a9600369c4b8a3723126e2c7e Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:45:26 +0300
Subject: [PATCH 10/51] Fall back to the stored timestamp when Exif has been
 stripped

---
 .../camera/ui/activities/InAppGallery.kt      | 97 +++++++++++++++++--
 1 file changed, 88 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 25082f3a4..da648e328 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -6,6 +6,7 @@ import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
+import android.database.Cursor
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.media.MediaMetadataRetriever
@@ -47,6 +48,7 @@ import app.grapheneos.camera.util.getParcelableExtra
 import app.grapheneos.camera.util.storageLocationToUiString
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -199,7 +201,7 @@ class InAppGallery : AppCompatActivity() {
         if (withDefault) {
             try {
                 startActivity(editIntent)
-            } catch (ignored: ActivityNotFoundException) {
+            } catch (_: ActivityNotFoundException) {
                 showMessage(getString(R.string.no_editor_app_error))
             }
         } else {
@@ -242,6 +244,61 @@ class InAppGallery : AppCompatActivity() {
 
     }
 
+    /**
+     * A provider is free to ignore the projection it was handed and answer with its own columns
+     * -- the DocumentsProvider contract explicitly allows it -- so reading by position can hand
+     * back an unrelated column, e.g. a document id that then renders as a 1970 date. Look the
+     * column up by name instead and treat "absent" the same as "not set".
+     */
+    private fun Cursor.optionalLong(column: String): Long? =
+        getColumnIndex(column).takeIf { it >= 0 && !isNull(it) }?.let { getLong(it) }
+
+    private fun Cursor.optionalString(column: String): String? =
+        getColumnIndex(column).takeIf { it >= 0 && !isNull(it) }?.let { getString(it) }
+
+    /**
+     * Best-effort creation and modification timestamps, in milliseconds, for media whose Exif
+     * has been stripped. MediaStore and the Storage Access Framework disagree both on the column
+     * names and on the unit, and each provider rejects the columns it does not know, so the two
+     * are queried separately and every failure just leaves the value unknown.
+     */
+    private fun queryStoredTimestamps(uri: Uri): Pair<Long?, Long?> {
+        var created: Long? = null
+        var modified: Long? = null
+
+        try {
+            val projection = arrayOf(MediaColumns.DATE_ADDED, MediaColumns.DATE_MODIFIED)
+            contentResolver.query(uri, projection, null, null)?.use {
+                if (it.moveToFirst()) {
+                    // Seconds since the epoch, and 0 stands for "not set"
+                    created = it.optionalLong(MediaColumns.DATE_ADDED)
+                        ?.takeIf { seconds -> seconds > 0 }?.times(1000L)
+                    modified = it.optionalLong(MediaColumns.DATE_MODIFIED)
+                        ?.takeIf { seconds -> seconds > 0 }?.times(1000L)
+                }
+            }
+        } catch (e: Exception) {
+            Log.d("queryStoredTimestamps", "no MediaStore timestamps from ${uri.authority}", e)
+        }
+
+        if (modified == null) {
+            try {
+                val projection = arrayOf(DocumentsContract.Document.COLUMN_LAST_MODIFIED)
+                contentResolver.query(uri, projection, null, null)?.use {
+                    if (it.moveToFirst()) {
+                        // Already in milliseconds here
+                        modified = it.optionalLong(DocumentsContract.Document.COLUMN_LAST_MODIFIED)
+                            ?.takeIf { millis -> millis > 0 }
+                    }
+                }
+            } catch (e: Exception) {
+                Log.d("queryStoredTimestamps", "no document timestamp from ${uri.authority}", e)
+            }
+        }
+
+        return Pair(created, modified)
+    }
+
     private fun showCurrentMediaDetails() {
         val curItem = getCurrentItem()
 
@@ -253,14 +310,15 @@ class InAppGallery : AppCompatActivity() {
         var dateModified: String? = null
 
         try {
-            // note that the first column (RELATIVE_PATH) is undefined for SAF Uris
+            // note that RELATIVE_PATH is undefined for SAF Uris, which the by-name lookups below
+            // report as absent rather than as whatever column happened to land in that position
             val projection = arrayOf(MediaColumns.RELATIVE_PATH, OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
 
             contentResolver.query(curItem.uri, projection, null,null)?.use {
                 if (it.moveToFirst()) {
-                    relativePath = it.getString(0)
-                    fileName = it.getString(1)
-                    size = it.getLong(2)
+                    relativePath = it.optionalString(MediaColumns.RELATIVE_PATH)
+                    fileName = it.optionalString(OpenableColumns.DISPLAY_NAME)
+                    size = it.optionalLong(OpenableColumns.SIZE) ?: 0
                 }
             }
 
@@ -272,8 +330,17 @@ class InAppGallery : AppCompatActivity() {
             if (curItem.type == ITEM_TYPE_VIDEO) {
                 MediaMetadataRetriever().use {
                     it.setDataSource(this, curItem.uri)
-                    dateAdded = convertTimeForVideo(it.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DATE)!!)
-                    dateModified = dateAdded
+                    // Not every container carries a creation date, and one that is missing or
+                    // malformed must not take the whole dialog down with it
+                    val date = it.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DATE)
+                    if (date != null) {
+                        try {
+                            dateAdded = convertTimeForVideo(date)
+                            dateModified = dateAdded
+                        } catch (e: ParseException) {
+                            Log.d("showCurrentMediaDetails", "unparseable video date: $date", e)
+                        }
+                    }
                 }
             } else {
                 contentResolver.openInputStream(curItem.uri)?.use { stream ->
@@ -296,6 +363,18 @@ class InAppGallery : AppCompatActivity() {
                     }
                 }
             }
+
+            // Photos carry no Exif dates when "Remove Exif data after capture" is on, which is
+            // the default, so fall back to the timestamps the storage layer keeps.
+            if (dateAdded == null || dateModified == null) {
+                val (created, modified) = queryStoredTimestamps(curItem.uri)
+                if (dateAdded == null && created != null) {
+                    dateAdded = convertTime(created)
+                }
+                if (dateModified == null && modified != null) {
+                    dateModified = convertTime(modified)
+                }
+            }
         } catch (e: Exception) {
             Log.d("showCurrentMediaDetails", "unable to obtain file details", e)
             showMessage(getString(R.string.unable_to_obtain_file_details))
@@ -313,7 +392,7 @@ class InAppGallery : AppCompatActivity() {
         detailsBuilder.append("\n\n")
 
         detailsBuilder.append(getString(R.string.file_path), "\n")
-        detailsBuilder.append(getRelativePath(this, curItem.uri, relativePath, fileName!!))
+        detailsBuilder.append(getRelativePath(this, curItem.uri, relativePath, fileName))
         detailsBuilder.append("\n\n")
 
         detailsBuilder.append(getString(R.string.file_size), "\n")
@@ -492,7 +571,7 @@ class InAppGallery : AppCompatActivity() {
         asyncLoaderOfCapturedItems.execute {
             val unprocessedItems: List<CapturedItem> = try {
                 CapturedItems.get(this)
-            } catch (e: InterruptedException) {
+            } catch (_: InterruptedException) {
                 // activity was destroyed and exectutor.shutdownNow() was called, which interrupts
                 // executor threads
                 return@execute

From dca0ed3c27cfef493f60abc71b8591265d8a3201 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:46:18 +0300
Subject: [PATCH 11/51] Label the on-screen controls for accessibility services

---
 .../camera/ui/activities/CaptureActivity.kt   |  4 +++
 app/src/main/res/layout/activity_main.xml     | 35 +++++++++++--------
 app/src/main/res/values/strings.xml           |  5 +--
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
index 37281c945..05174b418 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
@@ -94,6 +94,10 @@ open class CaptureActivity : MainActivity() {
             finish()
         }
 
+        // This is the only screen where the button has a drawable and does something, so it is
+        // also the only screen where it should be reachable by accessibility services.
+        cancelButtonView.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+
         // Remove the third option/circle from the UI
         thirdOption.visibility = View.INVISIBLE
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb02b81cb..1949bafcd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -227,14 +227,14 @@
                     android:layout_height="64dp"
                     android:src="@drawable/circle"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:importantForAccessibility="no"/>
 
                 <ImageView
                     android:layout_width="64dp"
                     android:layout_height="64dp"
                     android:src="@drawable/option_circle"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:importantForAccessibility="no"/>
 
                 <ImageView
                     android:id="@+id/flip_camera_icon_content"
@@ -268,7 +268,7 @@
                     android:layout_gravity="center"
                     android:src="@drawable/camera_shutter"
                     android:background="@drawable/cbutton_bg"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:contentDescription="@string/capture"/>
 
                 <ImageButton
                     android:id="@+id/confirm_button"
@@ -278,7 +278,7 @@
                     android:layout_gravity="center"
                     android:src="@drawable/done"
                     android:background="@drawable/cbutton_bg"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:contentDescription="@string/confirm"/>
 
                 <!-- Sp usage was ignore because -->
                 <TextView
@@ -319,7 +319,8 @@
                 android:layout_height="96dp"
                 android:clickable="true"
                 android:focusable="true"
-                android:layout_gravity="center">
+                android:layout_gravity="center"
+                android:importantForAccessibility="no">
 
                 <ImageView
                     android:id="@+id/white_option_circle"
@@ -327,7 +328,7 @@
                     android:layout_height="64dp"
                     android:src="@drawable/white_option_circle"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:importantForAccessibility="no"/>
 
                 <com.google.android.material.imageview.ShapeableImageView
                     android:id="@+id/image_preview"
@@ -337,7 +338,7 @@
                     android:layout_gravity="center"
                     android:scaleType="centerCrop"
                     app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:importantForAccessibility="no"/>
 
                 <ImageView
                     android:id="@+id/third_circle"
@@ -345,7 +346,7 @@
                     android:layout_height="64dp"
                     android:src="@drawable/option_circle"
                     android:layout_gravity="center"
-                    android:contentDescription="@string/flip_camera"/>
+                    android:contentDescription="@string/open_gallery"/>
 
                 <ProgressBar
                     android:indeterminateDrawable="@drawable/progress_bar_style"
@@ -488,7 +489,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?actionBarItemBackground"
-                android:contentDescription="@string/capture_mode"/>
+                android:importantForAccessibility="no"
+                android:contentDescription="@string/cancel"/>
 
         </FrameLayout>
 
@@ -504,7 +506,7 @@
             android:paddingHorizontal="16dp"
             android:background="@null"
             android:src="@drawable/settings_icon"
-            android:contentDescription="@string/capture_mode"/>
+            android:contentDescription="@string/settings"/>
 
         <TextView
             android:id="@+id/timer"
@@ -544,7 +546,8 @@
                         android:layout_height="@dimen/qr_toggle_button_size"
                         android:layout_gravity="center"
                         android:src="@drawable/qr_code"
-                        app:shapeAppearance="@style/ShapeAppearance.Image.PILL"/>
+                        app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
+                        android:contentDescription="@string/qr_scan"/>
 
                     <TextView
                         android:alpha="0.8"
@@ -577,7 +580,7 @@
                         android:layout_width="@dimen/qr_toggle_button_size"
                         android:layout_height="@dimen/qr_toggle_button_size"
                         app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
-                        android:contentDescription="@string/qr_scan_toggle"/>
+                        android:contentDescription="@string/data_matrix"/>
 
                     <TextView
                         android:alpha="0.8"
@@ -609,7 +612,8 @@
                         android:src="@drawable/aztec"
                         android:layout_width="@dimen/qr_toggle_button_size"
                         android:layout_height="@dimen/qr_toggle_button_size"
-                        app:shapeAppearance="@style/ShapeAppearance.Image.PILL"/>
+                        app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
+                        android:contentDescription="@string/aztec_code"/>
 
                     <TextView
                         android:alpha="0.8"
@@ -641,7 +645,8 @@
                     android:src="@drawable/pdf417"
                     android:layout_width="@dimen/qr_toggle_button_size"
                     android:layout_height="@dimen/qr_toggle_button_size"
-                    app:shapeAppearance="@style/ShapeAppearance.Image.PILL"/>
+                    app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
+                    android:contentDescription="@string/pdf_417"/>
 
                 <TextView
                     android:alpha="0.8"
@@ -673,7 +678,7 @@
                         android:layout_gravity="center"
                         android:layout_width="@dimen/qr_toggle_button_size"
                         android:layout_height="@dimen/qr_toggle_button_size"
-                        android:contentDescription="@string/grid_toggle"/>
+                        android:contentDescription="@string/more_options"/>
 
                     <TextView
                         android:alpha="0.8"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c8ae8d30..bf8e23830 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,6 @@
     <string name="flip_camera">Flip Camera</string>
     <string name="loading_camera">Loading camera</string>
     <string name="flash_mode">Flash Mode</string>
-    <string name="capture_mode">Capture Mode</string>
     <string name="start_value_timer">00:00</string>
     <string name="zoom_in">Zoom In</string>
     <string name="zoom_out">Zoom Out</string>
@@ -25,6 +24,9 @@
     <string name="open_with">Open with</string>
     <string name="copy_to_clipboard">Copy to clipboard</string>
     <string name="retake">Retake</string>
+    <string name="capture">Capture</string>
+    <string name="confirm">Confirm</string>
+    <string name="open_gallery">Open gallery</string>
     <string name="play_preview">Play Preview</string>
     <string name="toggle_button">Toggle Button</string>
     <string name="aspect_ratio">Aspect Ratio</string>
@@ -59,7 +61,6 @@
     <string name="share_media">Share Media</string>
     <string name="edit_with">Edit with</string>
     <string name="rec_without_audio">Start recording without audio</string>
-    <string name="qr_scan_toggle">QR Scan toggle</string>
     <string name="qr_scan">QR Code</string>
     <string name="data_matrix">Data Matrix</string>
     <string name="aztec_code">Aztec Code</string>

From a171ac06def17e1da0f6573adb7090f8b0fdd973 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Wed, 22 Jul 2026 20:46:23 +0300
Subject: [PATCH 12/51] Keep the control descriptions in sync with the icons
 they carry

---
 .../java/app/grapheneos/camera/CamConfig.kt   | 25 +++----
 .../camera/capturer/VideoCapturer.kt          | 30 +++++---
 .../grapheneos/camera/ui/SettingsDialog.kt    | 39 ++++++-----
 .../camera/ui/activities/MainActivity.kt      | 70 +++++++++++++++----
 .../ui/activities/VideoCaptureActivity.kt     |  2 +-
 .../camera/ui/activities/VideoOnlyActivity.kt |  2 +-
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/layout/settings.xml          |  4 +-
 app/src/main/res/values/strings.xml           | 22 +++++-
 9 files changed, 137 insertions(+), 58 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 98943b3d0..65c97b623 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -429,13 +429,13 @@ class CamConfig(private val mActivity: MainActivity) {
 
             if (isQRMode) {
                 if (value) {
-                    mActivity.flipCamIcon.setImageResource(
-                        R.drawable.cancel
+                    mActivity.setFlipCameraIcon(
+                        R.drawable.cancel, R.string.stop_scanning_all_formats
                     )
                     mActivity.qrScanToggles.visibility = View.GONE
                 } else {
-                    mActivity.flipCamIcon.setImageResource(
-                        R.drawable.auto
+                    mActivity.setFlipCameraIcon(
+                        R.drawable.auto, R.string.scan_all_formats
                     )
                     mActivity.qrScanToggles.visibility = View.VISIBLE
                 }
@@ -2005,13 +2005,13 @@ class CamConfig(private val mActivity: MainActivity) {
             mActivity.thirdOption.visibility = View.INVISIBLE
 
             if (scanAllCodes) {
-                mActivity.flipCamIcon.setImageResource(
-                    R.drawable.cancel
+                mActivity.setFlipCameraIcon(
+                    R.drawable.cancel, R.string.stop_scanning_all_formats
                 )
                 mActivity.qrScanToggles.visibility = View.GONE
             } else {
-                mActivity.flipCamIcon.setImageResource(
-                    R.drawable.auto
+                mActivity.setFlipCameraIcon(
+                    R.drawable.auto, R.string.scan_all_formats
                 )
                 mActivity.qrScanToggles.visibility = View.VISIBLE
             }
@@ -2019,13 +2019,14 @@ class CamConfig(private val mActivity: MainActivity) {
             mActivity.cancelButtonView.visibility = View.INVISIBLE
 
             mActivity.captureButton.setBackgroundResource(android.R.color.transparent)
-            mActivity.captureButton.setImageResource(R.drawable.torch_off_button)
+            // Entering QR mode always leaves the torch off
+            mActivity.setCaptureButtonIcon(R.drawable.torch_off_button, R.string.turn_torch_on)
 
             mActivity.micOffIcon.visibility = View.GONE
         } else {
             mActivity.qrOverlay.visibility = View.INVISIBLE
             mActivity.thirdOption.visibility = View.VISIBLE
-            mActivity.flipCamIcon.setImageResource(R.drawable.flip_camera)
+            mActivity.setFlipCameraIcon(R.drawable.flip_camera, R.string.flip_camera)
             mActivity.cancelButtonView.visibility = View.VISIBLE
 
             mActivity.qrScanToggles.visibility = View.GONE
@@ -2033,9 +2034,9 @@ class CamConfig(private val mActivity: MainActivity) {
             mActivity.captureButton.setBackgroundResource(R.drawable.cbutton_bg)
 
             if (isVideoMode) {
-                mActivity.captureButton.setImageResource(R.drawable.recording)
+                mActivity.setCaptureButtonIcon(R.drawable.recording, R.string.start_recording)
             } else {
-                mActivity.captureButton.setImageResource(R.drawable.camera_shutter)
+                mActivity.setCaptureButtonIcon(R.drawable.camera_shutter, R.string.capture)
                 mActivity.micOffIcon.visibility = View.GONE
             }
         }
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index 6ba33c407..a512655df 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -60,10 +60,10 @@ class VideoCapturer(private val mActivity: MainActivity) {
             if (isRecording) {
                 if (value) {
                     recording?.pause()
-                    mActivity.flipCamIcon.setImageResource(R.drawable.play)
+                    mActivity.setFlipCameraIcon(R.drawable.play, R.string.resume_recording)
                 } else {
                     recording?.resume()
-                    mActivity.flipCamIcon.setImageResource(R.drawable.pause)
+                    mActivity.setFlipCameraIcon(R.drawable.pause, R.string.pause_recording)
                 }
             }
             field = value
@@ -298,17 +298,22 @@ class VideoCapturer(private val mActivity: MainActivity) {
         mActivity.settingsDialog.videoQualitySpinner.isEnabled = false
         mActivity.settingsDialog.enableEISToggle.isEnabled = false
 
-        mActivity.flipCamIcon.setImageResource(R.drawable.pause)
+        mActivity.setFlipCameraIcon(R.drawable.pause, R.string.pause_recording)
         isPaused = false
         mActivity.cancelButtonView.visibility = View.GONE
 
+        // Only the description changes: the drawable stays the same one the corner-radius
+        // animation above is holding on to, and replacing it would cut that animation short.
+        mActivity.captureButton.contentDescription = mActivity.getString(R.string.stop_recording)
+
         if (mActivity.requiresVideoModeOnly) {
             mActivity.thirdOption.visibility = View.INVISIBLE
         }
 
         mActivity.settingsDialog.waitForFocusLockSwitch.isEnabled = false
 
-        mActivity.thirdCircle.setImageResource(R.drawable.camera_shutter)
+        // While recording, the gallery button turns into a shutter for stills
+        mActivity.setThirdCircleIcon(R.drawable.camera_shutter, R.string.capture)
         mActivity.tabLayout.visibility = View.INVISIBLE
         mActivity.timerView.setText(R.string.start_value_timer)
         mActivity.timerView.visibility = View.VISIBLE
@@ -317,9 +322,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
 
         if (camConfig.includeAudio) {
             isMuted = false
-            mActivity.muteToggle.setImageResource(R.drawable.mic_on)
-            mActivity.muteToggle.setBackgroundColor(mActivity.getColor(R.color.red))
-            mActivity.muteToggle.tooltipText = mActivity.getString(R.string.tap_to_mute_audio)
+            mActivity.setMuteToggleState(muted = false)
             mActivity.muteToggle.visibility = View.VISIBLE
         }
     }
@@ -347,7 +350,9 @@ class VideoCapturer(private val mActivity: MainActivity) {
         animator.start()
 
         mActivity.timerView.visibility = View.GONE
-        mActivity.flipCamIcon.setImageResource(R.drawable.flip_camera)
+        mActivity.setFlipCameraIcon(R.drawable.flip_camera, R.string.flip_camera)
+        mActivity.captureButton.contentDescription =
+            mActivity.getString(R.string.start_recording)
 
         mActivity.settingsDialog.videoQualitySpinner.isEnabled = true
         mActivity.settingsDialog.enableEISToggle.isEnabled = true
@@ -360,8 +365,15 @@ class VideoCapturer(private val mActivity: MainActivity) {
             mActivity.settingsDialog.waitForFocusLockSwitch.isEnabled = true
         }
 
+        // Always restore the third-circle icon and its accessibility label to the gallery button:
+        // at record start it was repurposed into an in-video shutter ("Capture") unconditionally,
+        // so restoring it only for non-VideoCaptureActivity would strand a stale "Capture" label
+        // there. The non-recording third-circle click opens the gallery in every activity, so
+        // open_gallery is the accurate label. Cancel/tab visibility stays guarded, as those don't
+        // apply to VideoCaptureActivity.
+        mActivity.setThirdCircleIcon(R.drawable.option_circle, R.string.open_gallery)
+
         if (mActivity !is VideoCaptureActivity) {
-            mActivity.thirdCircle.setImageResource(R.drawable.option_circle)
             mActivity.cancelButtonView.visibility = View.VISIBLE
             mActivity.tabLayout.visibility = View.VISIBLE
         }
diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index 28c7d9d52..220e4de5f 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -735,28 +735,31 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
     fun updateGridToggleUI() {
         mActivity.previewGrid.postInvalidate()
-        gridToggle.setImageResource(
-            when (camConfig.gridType) {
-                CamConfig.GridType.NONE -> R.drawable.grid_off_circle
-                CamConfig.GridType.THREE_BY_THREE -> R.drawable.grid_3x3_circle
-                CamConfig.GridType.FOUR_BY_FOUR -> R.drawable.grid_4x4_circle
-                CamConfig.GridType.GOLDEN_RATIO -> R.drawable.grid_goldenratio_circle
-            }
-        )
+        // The description has to travel with the drawable: this control cycles through four
+        // states, so a fixed "Grid Toggle" label left a screen reader unable to report any of them
+        val (icon, description) = when (camConfig.gridType) {
+            CamConfig.GridType.NONE -> R.drawable.grid_off_circle to R.string.grid_off
+            CamConfig.GridType.THREE_BY_THREE -> R.drawable.grid_3x3_circle to R.string.grid_3x3
+            CamConfig.GridType.FOUR_BY_FOUR -> R.drawable.grid_4x4_circle to R.string.grid_4x4
+            CamConfig.GridType.GOLDEN_RATIO ->
+                R.drawable.grid_goldenratio_circle to R.string.grid_golden_ratio
+        }
+        gridToggle.setImageResource(icon)
+        gridToggle.contentDescription = mActivity.getString(description)
     }
 
     fun updateFlashMode() {
-        flashToggle.setImageResource(
-            if (camConfig.isFlashAvailable) {
-                when (camConfig.flashMode) {
-                    ImageCapture.FLASH_MODE_ON -> R.drawable.flash_on_circle
-                    ImageCapture.FLASH_MODE_AUTO -> R.drawable.flash_auto_circle
-                    else -> R.drawable.flash_off_circle
-                }
-            } else {
-                R.drawable.flash_off_circle
+        val (icon, description) = if (camConfig.isFlashAvailable) {
+            when (camConfig.flashMode) {
+                ImageCapture.FLASH_MODE_ON -> R.drawable.flash_on_circle to R.string.flash_on
+                ImageCapture.FLASH_MODE_AUTO -> R.drawable.flash_auto_circle to R.string.flash_auto
+                else -> R.drawable.flash_off_circle to R.string.flash_off
             }
-        )
+        } else {
+            R.drawable.flash_off_circle to R.string.flash_off
+        }
+        flashToggle.setImageResource(icon)
+        flashToggle.contentDescription = mActivity.getString(description)
     }
 
     override fun show() {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 6895accce..ab969af4f 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -47,6 +47,7 @@ import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -766,13 +767,11 @@ open class MainActivity : AppCompatActivity(),
                 }
             } else if (camConfig.isQRMode) {
                 camConfig.toggleTorchState()
-                captureButton.setImageResource(
-                    if (camConfig.isTorchOn) {
-                        R.drawable.torch_on_button
-                    } else {
-                        R.drawable.torch_off_button
-                    }
-                )
+                if (camConfig.isTorchOn) {
+                    setCaptureButtonIcon(R.drawable.torch_on_button, R.string.turn_torch_off)
+                } else {
+                    setCaptureButtonIcon(R.drawable.torch_off_button, R.string.turn_torch_on)
+                }
             } else {
                 if (timerDuration == 0) {
                     imageCapturer.takePicture()
@@ -1010,15 +1009,11 @@ open class MainActivity : AppCompatActivity(),
         muteToggle.setOnClickListener {
             if (videoCapturer.isMuted) {
                 videoCapturer.unmuteRecording()
-                muteToggle.setImageResource(R.drawable.mic_on)
-                muteToggle.setBackgroundColor(getColor(R.color.red))
-                muteToggle.tooltipText = getString(R.string.tap_to_mute_audio)
+                setMuteToggleState(muted = false)
                 showMessage(R.string.video_audio_recording_unmuted)
             } else {
                 videoCapturer.muteRecording()
-                muteToggle.setImageResource(R.drawable.mic_off)
-                muteToggle.setBackgroundColor(getColor(android.R.color.darker_gray))
-                muteToggle.tooltipText = getString(R.string.tap_to_unmute_audio)
+                setMuteToggleState(muted = true)
                 showMessage(R.string.video_audio_recording_muted)
             }
         }
@@ -1515,6 +1510,55 @@ open class MainActivity : AppCompatActivity(),
         showMessage(getString(msg), action, callback)
     }
 
+    /**
+     * The icon in the left circle stands for whatever [flipCameraCircle] does right now — flip
+     * the camera, pause/resume the recording, or toggle scanning of every barcode format. Swap
+     * its description together with its drawable so that it is never announced as the wrong
+     * button.
+     */
+    fun setFlipCameraIcon(@DrawableRes icon: Int, @StringRes description: Int) {
+        flipCamIcon.setImageResource(icon)
+        flipCamIcon.contentDescription = getString(description)
+    }
+
+    /**
+     * The big middle button is a shutter, a record/stop button and a torch switch depending on
+     * the mode, so its description has to travel with its drawable exactly like the one in
+     * [setFlipCameraIcon] does.
+     */
+    fun setCaptureButtonIcon(@DrawableRes icon: Int, @StringRes description: Int) {
+        captureButton.setImageResource(icon)
+        captureButton.contentDescription = getString(description)
+    }
+
+    /**
+     * [thirdCircle] is the view that carries the click listener, so it is the one that has to be
+     * described: it opens the gallery, except while a video is being recorded, when it takes a
+     * still instead.
+     */
+    fun setThirdCircleIcon(@DrawableRes icon: Int, @StringRes description: Int) {
+        thirdCircle.setImageResource(icon)
+        thirdCircle.contentDescription = getString(description)
+    }
+
+    /**
+     * The mute toggle signals its state through an icon, a background colour and a tooltip, and a
+     * tooltip is supplementary text rather than a view's label, so the state was never described
+     * to accessibility services at all. Set all four together here so they cannot drift apart.
+     */
+    fun setMuteToggleState(muted: Boolean) {
+        muteToggle.setImageResource(if (muted) R.drawable.mic_off else R.drawable.mic_on)
+        muteToggle.setBackgroundColor(
+            if (muted) getColor(android.R.color.darker_gray) else getColor(R.color.red)
+        )
+        muteToggle.tooltipText = getString(
+            if (muted) R.string.tap_to_unmute_audio else R.string.tap_to_mute_audio
+        )
+        muteToggle.contentDescription = getString(
+            if (muted) R.string.unmute_audio else R.string.mute_audio
+        )
+    }
+
     fun showMessage(msg: String, action: String? = null, callback: View.OnClickListener? = null) {
         snackBar.apply {
             setText(msg)
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
index da57086c2..567bd8df2 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
@@ -21,7 +21,7 @@ class VideoCaptureActivity : CaptureActivity() {
         whiteOptionCircle = findViewById(R.id.white_option_circle)
         playPreview = findViewById(R.id.play_preview)
 
-        captureButton.setImageResource(R.drawable.recording)
+        setCaptureButtonIcon(R.drawable.recording, R.string.start_recording)
 
         captureButton.setOnClickListener OnClickListener@{
             if (videoCapturer.isRecording) {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
index 43b9dde0b..a6ccdb50e 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
@@ -8,7 +8,7 @@ class VideoOnlyActivity : MainActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        captureButton.setImageResource(R.drawable.recording)
+        setCaptureButtonIcon(R.drawable.recording, R.string.start_recording)
 
         tabLayout.alpha = 0f
         tabLayout.isClickable = false
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1949bafcd..607c2c308 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -185,6 +185,7 @@
                     android:layout_gravity="center"
                     app:shapeAppearance="@style/ShapeAppearance.Image.PILL"
                     android:tooltipText="@string/tap_to_mute_audio"
+                    android:contentDescription="@string/mute_audio"
                     android:visibility="gone" />
 
             </FrameLayout>
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 49909f0e6..8662057f7 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -107,7 +107,7 @@
                         android:layout_gravity="center"
                         android:layout_width="@dimen/toggle_button_size"
                         android:layout_height="@dimen/toggle_button_size"
-                        android:contentDescription="@string/toggle_flash"/>
+                        android:contentDescription="@string/flash_off"/>
 
                 </FrameLayout>
 
@@ -122,7 +122,7 @@
                         android:layout_gravity="center"
                         android:layout_width="@dimen/toggle_button_size"
                         android:layout_height="@dimen/toggle_button_size"
-                        android:contentDescription="@string/grid_toggle"/>
+                        android:contentDescription="@string/grid_off"/>
 
                 </FrameLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf8e23830..d4596127e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,11 +27,29 @@
     <string name="capture">Capture</string>
     <string name="confirm">Confirm</string>
     <string name="open_gallery">Open gallery</string>
+    <string name="pause_recording">Pause recording</string>
+    <string name="resume_recording">Resume recording</string>
+    <string name="start_recording">Start recording</string>
+    <string name="stop_recording">Stop recording</string>
+    <string name="turn_torch_on">Turn torch on</string>
+    <string name="turn_torch_off">Turn torch off</string>
+    <string name="mute_audio">Mute audio</string>
+    <string name="unmute_audio">Unmute audio</string>
+    <!-- The flash and grid controls cycle through several states rather than toggling between
+         two, so their labels name the state they are currently in; naming the next action
+         instead would leave a screen reader user unable to tell where in the cycle they are. -->
+    <string name="flash_off">Flash off</string>
+    <string name="flash_on">Flash on</string>
+    <string name="flash_auto">Flash auto</string>
+    <string name="grid_off">Grid off</string>
+    <string name="grid_3x3">Grid 3 by 3</string>
+    <string name="grid_4x4">Grid 4 by 4</string>
+    <string name="grid_golden_ratio">Grid golden ratio</string>
+    <string name="scan_all_formats">Scan all barcode formats</string>
+    <string name="stop_scanning_all_formats">Stop scanning all barcode formats</string>
     <string name="play_preview">Play Preview</string>
     <string name="toggle_button">Toggle Button</string>
     <string name="aspect_ratio">Aspect Ratio</string>
-    <string name="toggle_flash">Toggle Flash</string>
-    <string name="grid_toggle">Grid Toggle</string>
     <string name="include_audio">Include Audio</string>
     <string name="enable_eis">Enable EIS</string>
     <string name="video_quality">Video Quality</string>

From 3a0b02e4e9f8a637f16094bf2ecd860d5b335abf Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Thu, 23 Jul 2026 03:17:17 +0300
Subject: [PATCH 13/51] Drop the transitive ACCESS_NETWORK_STATE permission we
 don't use

androidx.media3:media3-common declares ACCESS_NETWORK_STATE for ExoPlayer's
network playback. We only pull media3 in transitively through camera-video,
which uses media3-muxer to write MP4s locally, so nothing we ship reads it and
the app has no INTERNET permission to pair it with. Remove it from the merged
manifest with tools:node="remove".
---
 app/src/main/AndroidManifest.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f6a2592c..3e970ee7d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,13 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
+    <!--
+      androidx.media3:media3-common declares this for ExoPlayer's network playback. We only pull
+      media3 in transitively through camera-video, which uses media3-muxer to write MP4s locally,
+      so nothing we ship reads it and the app has no INTERNET permission to pair it with.
+    -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove"/>
+
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />

From 715e0fce14e59929d72b799892854eeccbdac24b Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 16:29:17 +0300
Subject: [PATCH 14/51] Handle the window between pressing record and the
 recording actually starting

---
 app/build.gradle.kts                          |   7 +
 .../camera/VideoCapturerRegressionTest.kt     | 240 ++++++++++++++++++
 .../java/app/grapheneos/camera/CamConfig.kt   |   4 +-
 .../java/app/grapheneos/camera/TunePlayer.kt  |  23 +-
 .../camera/capturer/VideoCapturer.kt          |  70 ++++-
 gradle/libs.versions.toml                     |  10 +
 gradle/verification-metadata.xml              | 180 +++++++++++++
 7 files changed, 524 insertions(+), 10 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 586ee39f9..aa8d4e8e7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,6 +50,8 @@ android {
         targetSdk = 37
         versionCode = 90
         versionName = versionCode.toString()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -98,4 +100,9 @@ dependencies {
     implementation(libs.bundles.camerax)
 
     implementation(libs.zxing.core)
+
+    androidTestImplementation(libs.androidx.test.core.ktx)
+    androidTestImplementation(libs.androidx.test.ext.junit.ktx)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
 }
diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
new file mode 100644
index 000000000..155889f7f
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -0,0 +1,240 @@
+package app.grapheneos.camera
+
+import android.Manifest
+import android.content.ContentResolver
+import android.net.Uri
+import android.os.Bundle
+import android.os.Handler
+import android.provider.MediaStore
+import android.provider.MediaStore.MediaColumns
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.ui.activities.MainActivity
+import app.grapheneos.camera.ui.activities.VideoOnlyActivity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class VideoCapturerRegressionTest {
+
+    @get:Rule
+    val grantPermissions: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.CAMERA,
+        Manifest.permission.RECORD_AUDIO,
+    )
+
+    /** Fires the callback twice, like a MediaPlayer error followed by normal completion. */
+    private class DoubleFiringTunePlayer(activity: MainActivity) : TunePlayer(activity) {
+        override fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
+            onPlayed.run()
+            onPlayed.run()
+        }
+    }
+
+    /** Runs the callback synchronously, skipping the sound. */
+    private class ImmediateTunePlayer(activity: MainActivity) : TunePlayer(activity) {
+        override fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
+            onPlayed.run()
+        }
+    }
+
+    /** Holds the callback until the test releases it. */
+    private class ManualTunePlayer(activity: MainActivity) : TunePlayer(activity) {
+        var deferred: Runnable? = null
+        override fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
+            deferred = onPlayed
+        }
+    }
+
+    /**
+     * Regression test for the production crash: a duplicated start-sound callback must not
+     * reach PendingRecording.start twice ("A recording is already in progress").
+     */
+    @Test
+    fun startRecording_toleratesDuplicateStartSoundCallback() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+
+            scenario.onActivity { activity ->
+                activity.camConfig.mPlayer = DoubleFiringTunePlayer(activity)
+                activity.videoCapturer.startRecording()
+            }
+
+            waitUntil(scenario, "recording is running") { it.videoCapturer.isRecording }
+
+            scenario.onActivity { it.videoCapturer.stopRecording() }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
+    /**
+     * Stopping while the start is still queued behind the sound must abandon it: no recording,
+     * no leftover output entry, and the recorder stays usable.
+     */
+    @Test
+    fun stopRecording_duringDeferredStart_cancelsTheStart() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+            val pendingBefore = pendingVideoCount()
+
+            lateinit var player: ManualTunePlayer
+            scenario.onActivity { activity ->
+                player = ManualTunePlayer(activity)
+                activity.camConfig.mPlayer = player
+                activity.videoCapturer.startRecording()
+                assertTrue(activity.videoCapturer.isRecording)
+            }
+
+            scenario.onActivity { activity ->
+                activity.videoCapturer.stopRecording()
+                player.deferred!!.run()
+                assertFalse(activity.videoCapturer.isRecording)
+            }
+
+            assertEquals(pendingBefore, pendingVideoCount())
+
+            // A fresh recording must still work after the abandoned one.
+            scenario.onActivity { activity ->
+                activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
+                activity.videoCapturer.startRecording()
+            }
+            waitUntil(scenario, "recording is running") { it.videoCapturer.isRecording }
+            scenario.onActivity { it.videoCapturer.stopRecording() }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
+    /** A pause requested while the start is queued must apply once the recording starts. */
+    @Test
+    fun pauseDuringDeferredStart_appliesWhenRecordingStarts() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+
+            lateinit var player: ManualTunePlayer
+            scenario.onActivity { activity ->
+                player = ManualTunePlayer(activity)
+                activity.camConfig.mPlayer = player
+                activity.videoCapturer.startRecording()
+                activity.videoCapturer.isPaused = true
+                player.deferred!!.run()
+            }
+
+            Thread.sleep(3000)
+
+            scenario.onActivity { activity ->
+                assertTrue(activity.videoCapturer.isRecording)
+                assertEquals(
+                    activity.getString(R.string.start_value_timer),
+                    activity.timerView.text.toString(),
+                )
+                activity.videoCapturer.isPaused = false
+                activity.videoCapturer.stopRecording()
+            }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
+    /**
+     * A recording that finalizes without usable output must not leave an orphaned pending
+     * entry. Paused from the start, it produces no frames, so ERROR_NO_VALID_DATA is
+     * deterministic.
+     */
+    @Test
+    fun failedRecording_doesNotLeaveOrphanedOutputEntry() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+            val pendingBefore = pendingVideoCount()
+
+            lateinit var player: ManualTunePlayer
+            scenario.onActivity { activity ->
+                player = ManualTunePlayer(activity)
+                activity.camConfig.mPlayer = player
+                activity.videoCapturer.startRecording()
+                activity.videoCapturer.isPaused = true
+                player.deferred!!.run()
+            }
+            Thread.sleep(300)
+            scenario.onActivity { it.videoCapturer.stopRecording() }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            assertEquals(pendingBefore, pendingVideoCount())
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
+    /** Pending entries are how in-flight and orphaned outputs appear in MediaStore. */
+    private fun pendingVideoCount(): Int {
+        val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
+        val args = Bundle().apply {
+            putInt(MediaStore.QUERY_ARG_MATCH_PENDING, MediaStore.MATCH_INCLUDE)
+            putString(
+                ContentResolver.QUERY_ARG_SQL_SELECTION,
+                "${MediaColumns.IS_PENDING} = 1" +
+                        " AND ${MediaColumns.DISPLAY_NAME} LIKE '$VIDEO_NAME_PREFIX%'",
+            )
+        }
+        return resolver.query(CamConfig.videoCollectionUri, arrayOf(MediaColumns._ID), args, null)
+            ?.use { it.count } ?: 0
+    }
+
+    private fun <A : MainActivity> lastCapturedUri(scenario: ActivityScenario<A>): Uri? {
+        var uri: Uri? = null
+        scenario.onActivity { uri = it.camConfig.lastCapturedItem?.uri }
+        return uri
+    }
+
+    /** Keeps test runs from accumulating videos on the device. */
+    private fun <A : MainActivity> deleteNewCapture(scenario: ActivityScenario<A>, previous: Uri?) {
+        scenario.onActivity { activity ->
+            val item = activity.camConfig.lastCapturedItem ?: return@onActivity
+            if (item.uri != previous) {
+                try {
+                    activity.contentResolver.delete(item.uri, null, null)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    private fun <A : MainActivity> waitUntil(
+        scenario: ActivityScenario<A>,
+        description: String,
+        timeoutMs: Long = 10_000,
+        condition: (A) -> Boolean,
+    ) {
+        val deadline = System.currentTimeMillis() + timeoutMs
+        while (System.currentTimeMillis() < deadline) {
+            var satisfied = false
+            scenario.onActivity { satisfied = condition(it) }
+            if (satisfied) return
+            Thread.sleep(100)
+        }
+        throw AssertionError("Timed out after ${timeoutMs}ms waiting until $description")
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 65c97b623..6960d2822 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -16,6 +16,7 @@ import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.widget.Button
 import androidx.annotation.StringRes
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.camera.camera2.interop.Camera2CameraInfo
 import androidx.camera.camera2.interop.ExperimentalCamera2Interop
@@ -234,7 +235,8 @@ class CamConfig(private val mActivity: MainActivity) {
 
     var iAnalyzer: ImageAnalysis? = null
 
-    val mPlayer = TunePlayer(mActivity)
+    @set:VisibleForTesting
+    var mPlayer = TunePlayer(mActivity)
 
     // note that Activities which implement SecureActivity interface (meaning they are accessible
     // from the lock screen) are forced to override getSharedPreferences()
diff --git a/app/src/main/java/app/grapheneos/camera/TunePlayer.kt b/app/src/main/java/app/grapheneos/camera/TunePlayer.kt
index 3e8a5f101..a6c901a8a 100644
--- a/app/src/main/java/app/grapheneos/camera/TunePlayer.kt
+++ b/app/src/main/java/app/grapheneos/camera/TunePlayer.kt
@@ -15,7 +15,7 @@ private fun prepareMediaPlayer(context: Context, resid: Int, listener: MediaPlay
     }
 }
 
-class TunePlayer(val context: MainActivity) {
+open class TunePlayer(val context: MainActivity) {
 
     private lateinit var shutterPlayer: MediaPlayer
 
@@ -49,16 +49,29 @@ class TunePlayer(val context: MainActivity) {
         shutterPlayer.start()
     }
 
-    fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
+    open fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
         if (shouldNotPlayTune() || !::vRecPlayer.isInitialized) {
             onPlayed.run()
             return
         }
+        // An unhandled playback error is also delivered to the completion listener, and a
+        // failed sound must still deliver onPlayed once: the recording start is waiting on it.
+        var delivered = false
+        val deliverOnce = MediaPlayer.OnCompletionListener {
+            if (!delivered) {
+                delivered = true
+                vRecPlayer.setOnCompletionListener(null)
+                vRecPlayer.setOnErrorListener(null)
+                handler.postDelayed(onPlayed, 10)
+            }
+        }
+        vRecPlayer.setOnCompletionListener(deliverOnce)
+        vRecPlayer.setOnErrorListener { player, _, _ ->
+            deliverOnce.onCompletion(player)
+            true
+        }
         vRecPlayer.seekTo(0)
         vRecPlayer.start()
-        vRecPlayer.setOnCompletionListener({
-            handler.postDelayed(onPlayed, 10)
-        })
     }
 
     fun playVRStopSound() {
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index a512655df..fda173e8c 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -50,6 +50,9 @@ class VideoCapturer(private val mActivity: MainActivity) {
 
     private var recording: Recording? = null
 
+    // Invoking this abandons a start still queued behind the record-start sound.
+    private var cancelDeferredStart: (() -> Unit)? = null
+
     var isMuted = false
         private set
 
@@ -192,7 +195,28 @@ class VideoCapturer(private val mActivity: MainActivity) {
 
         beforeRecordingStarts()
 
+        // The sound callback may fire more than once; a second PendingRecording.start() throws.
+        var consumed = false
+
+        cancelDeferredStart = {
+            consumed = true
+            cancelDeferredStart = null
+            try {
+                recordingCtx.fileDescriptor.close()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            discardUnusedOutput(recordingCtx)
+            afterRecordingStops()
+        }
+
         camConfig.mPlayer.playVRStartSound(handler) {
+            if (consumed) {
+                return@playVRStartSound
+            }
+
+            consumed = true
+            cancelDeferredStart = null
 
             recording = pendingRecording.start(ctx.mainExecutor) { event ->
 
@@ -212,12 +236,14 @@ class VideoCapturer(private val mActivity: MainActivity) {
                     if (event.hasError()) {
                         when (event.error) {
                             VideoRecordEvent.Finalize.ERROR_NO_VALID_DATA -> {
+                                discardUnusedOutput(recordingCtx)
                                 ctx.showMessage(R.string.recording_too_short_to_be_saved)
                                 return@start
                             }
                             VideoRecordEvent.Finalize.ERROR_ENCODING_FAILED,
                             VideoRecordEvent.Finalize.ERROR_RECORDER_ERROR,
                             VideoRecordEvent.Finalize.ERROR_UNKNOWN -> {
+                                discardUnusedOutput(recordingCtx)
                                 ctx.showMessage(ctx.getString(R.string.unable_to_save_video_verbose, event.error))
                                 return@start
                             }
@@ -254,6 +280,14 @@ class VideoCapturer(private val mActivity: MainActivity) {
                 }
             }
 
+            // The Recording didn't exist yet when the mute/pause setters ran.
+            if (isMuted) {
+                recording?.mute(true)
+            }
+            if (isPaused) {
+                recording?.pause()
+            }
+
             try {
                 // FileDescriptorOutputOptions doc says that the file descriptor should be closed by the
                 // caller, and that it's safe to do so as soon as pendingRecording.start() returns
@@ -268,6 +302,10 @@ class VideoCapturer(private val mActivity: MainActivity) {
     private val dp8 = 8 * mActivity.resources.displayMetrics.density
 
     private fun beforeRecordingStarts() {
+        // Don't leak paused/muted state from the previous recording into this one.
+        isPaused = false
+        isMuted = false
+
         mActivity.previewView.keepScreenOn = true
     }
 
@@ -298,8 +336,12 @@ class VideoCapturer(private val mActivity: MainActivity) {
         mActivity.settingsDialog.videoQualitySpinner.isEnabled = false
         mActivity.settingsDialog.enableEISToggle.isEnabled = false
 
-        mActivity.setFlipCameraIcon(R.drawable.pause, R.string.pause_recording)
-        isPaused = false
+        // The user may have paused before the recording actually started.
+        if (isPaused) {
+            mActivity.setFlipCameraIcon(R.drawable.play, R.string.resume_recording)
+        } else {
+            mActivity.setFlipCameraIcon(R.drawable.pause, R.string.pause_recording)
+        }
         mActivity.cancelButtonView.visibility = View.GONE
 
         // Only the description changes: the drawable stays the same one the corner-radius
@@ -321,8 +363,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
         mActivity.settingsDialog.includeAudioToggle.isEnabled = false
 
         if (camConfig.includeAudio) {
-            isMuted = false
-            mActivity.setMuteToggleState(muted = false)
+            mActivity.setMuteToggleState(muted = isMuted)
             mActivity.muteToggle.visibility = View.VISIBLE
         }
     }
@@ -407,10 +448,31 @@ class VideoCapturer(private val mActivity: MainActivity) {
     }
 
     fun stopRecording() {
+        cancelDeferredStart?.let {
+            it()
+            return
+        }
+
         recording?.stop()
         recording?.close()
         recording = null
     }
+
+    private fun discardUnusedOutput(recordingCtx: RecordingContext) {
+        if (!recordingCtx.shouldAddToGallery) {
+            return
+        }
+
+        try {
+            if (recordingCtx.isPendingMediaStoreUri) {
+                mActivity.contentResolver.delete(recordingCtx.uri, null, null)
+            } else {
+                DocumentsContract.deleteDocument(mActivity.contentResolver, recordingCtx.uri)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
 }
 
 @Throws(Exception::class)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ebd0c0b11..d838de16f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,6 +10,11 @@ coreKtx = "1.19.0"
 material = "1.14.0"
 zxing = "3.5.4"
 
+androidxTestCore = "1.7.0"
+androidxTestExtJunit = "1.3.0"
+androidxTestRules = "1.7.0"
+androidxTestRunner = "1.7.0"
+
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
@@ -24,6 +29,11 @@ androidx-camera-video = { module = "androidx.camera:camera-video", version.ref =
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "camerax" }
 androidx-camera-extensions = { module = "androidx.camera:camera-extensions", version.ref = "camerax" }
 
+androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
+androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidxTestExtJunit" }
+androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestRules" }
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxTestRunner" }
+
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 ksp-gradle-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index cc1394c37..a785d7847 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -569,6 +569,20 @@
             <sha512 value="08ebbd8cb44bb6d7badcbc74ad2c949259c58cc4791f755e7878ec05c44fdf5dc31da0259b7d4d6e9819b767f6f2b1fdf40d6fc117c5132e06fd3e1fb974f6d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures" version="1.2.0">
+         <artifact name="concurrent-futures-1.2.0-sources.jar">
+            <sha512 value="061fc60e37bf5739c4d07f1f27666ea25ab3fdcaf41091a016db9e9227c9057f588a7a68f58a83bb2776f88176d3c7f054fd01c72e33bb02c5cced768ba72f75" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-1.2.0.jar">
+            <sha512 value="76ff67cd4a68d070b3ec31cb970b82fe774bb76b068423c6c16beb72300a1635e3edaabcb146a9b1943ae8edc45458d562c5597cdc88cfd2476aa4083cb95a0b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-1.2.0.module">
+            <sha512 value="bfec7a55bc8db4a6e5f1a83854d502ded6615028e1ac9082162646aa828d623c3e9937897a92d1af0c56fbc94aafe52f5052c584dd92a69c6899d5d848e8f543" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-1.2.0.pom">
+            <sha512 value="ab6993366d6c61e2cd344b15631e5c07e223538a5ab0c34ccd18f124b8ab3df5d642ebf5c63ae06314d80f8f8042dc7dfc20224976e760175389cfc839823ad0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.1.0">
          <artifact name="concurrent-futures-ktx-1.1.0-sources.jar">
             <sha512 value="3a6c4d289f4a12dfc15df8359018db36fb13f928b0c03e2cf5640d423ae521623b4801d3ba0bd3b0627f9ddf815996ba651500209a8fbe54155e7a39310bdc3e" origin="Generated by Gradle"/>
@@ -583,6 +597,20 @@
             <sha512 value="6f33e9ea3e98fbbd54c9956bb0ad225a035798b2cb302570425eea5927506afd662bc1f3690615312e437d04c359f1ebcf626129ea9bc5cea96314367c994b4d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.2.0">
+         <artifact name="concurrent-futures-ktx-1.2.0-sources.jar">
+            <sha512 value="f86a80c82edc587e211899ff6f656a5b37ca9138da1ad9184b20b525f3ecd8b777cfe681d17bedf2469b7bd261392f40140b6ac0279b433e716baa237b8bc592" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-ktx-1.2.0.jar">
+            <sha512 value="dd1c96cf4d3094deee7d3eee117adb179e2d991eb32df70dfdbd78c2af79440e3ec1d34fce300fc639db3f116a08af1ef627a1a08210aa7f9f3b25e003293c8e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-ktx-1.2.0.module">
+            <sha512 value="5edbe27ee30b1e7f28b49981cee85a6a98305a7ea988366b1cf873d2b58bef868db389bbd007a4d87561a2737e4b0f22522c08eeb6cba6f40de9ba929cafb8b3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-ktx-1.2.0.pom">
+            <sha512 value="ecaa97d7f01e90f5c63c1bdaec9f005c6b30e3e6f932c8423bc07168c3804d836735c6d4c2661d3ec2e6e2d5cb978cc2d28aa99b9735881df0db3816a89daf68" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.constraintlayout" name="constraintlayout" version="2.2.1">
          <artifact name="constraintlayout-2.2.1-sources.jar">
             <sha512 value="088ade51f172ff493a2a024eb41c2222f5c38b6a9e63035a5a30f3700afa5895ad87237b7a295392d618b7f73133f67be600e7aae179a97721cd3d45b6043683" origin="Generated by Gradle"/>
@@ -1630,6 +1658,94 @@
             <sha512 value="e9b557a7316bf4ab946c47d500de1836ae51ceebcbd8cc1ec2722462c4f39eca9f9e284e902674981bca81216a04a8028733a9230e6f9e7e9f41df3677777b39" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="core" version="1.7.0">
+         <artifact name="core-1.7.0-sources.jar">
+            <sha512 value="cb1bbe5aafe0b366f1a2c68855773721bb78af1adbd1705f4bf7beb83b745ac1cc171caf09736995c9cc59607e13ab4b0b70dac142bf26cadd1ca6503e0938f4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.7.0.aar">
+            <sha512 value="17b9202a5ea2d6f60723be95e86632be6efa7c8db1719e631cf8cbde078f2d9002c0adcbe6b4dfb611ba4b639099f0ae8f212e179830942ea845287c17fe7ccd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.7.0.pom">
+            <sha512 value="3ae235dac351dfd573fd007149637ffa2e96e87c82eda3ce9d576a82a33b066bb34dc23c24975b98c8c6d13a2af28f4e19eb5c7c09e2d9da631f6f0938265900" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test" name="core-ktx" version="1.7.0">
+         <artifact name="core-ktx-1.7.0-sources.jar">
+            <sha512 value="bf14a81bebc23783cddde9c3acb083b1161e8f9a28df619b975a77f6a520e04bd399428341a28f68546a2b843c56fbed2d599cd3fafabf7d38b57f0737aec8a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-ktx-1.7.0.aar">
+            <sha512 value="5eae16149e6c0e441723626c7d29aaa23366f1a09e7cdf08b6655fc0f9a17832ddbf1fa11502b38389d0d76660eece95941a8d78cb32d8b12d3f4439ffd32db0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-ktx-1.7.0.pom">
+            <sha512 value="e4db328bf023f47aca096d1cb1d9c064b412e55c81e5d7f5819f288db0f92e4f18036fc5ddd5c18e6b5be4f65950cc8aaf64d04ac6b15064d538da2fb40bd58a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test" name="monitor" version="1.8.0">
+         <artifact name="monitor-1.8.0-sources.jar">
+            <sha512 value="f5f56eb9acc0e97c35ff5a08cafada77ad94afb3cd23c8069126d1a9d46a6cbf62861f220a67c237e327e2710ccef969d3754c4c9e79e603a25de32b90ea6966" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="monitor-1.8.0.aar">
+            <sha512 value="43a022ac6969f9c69a8f8c0ec77e96f4840c83877f2ff7ee8e6394fe63e88f9ee31973647bab64a142f2b3187bd4d6b96f99e421ea742486977caa4b550bea26" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="monitor-1.8.0.pom">
+            <sha512 value="86f4f217d50973aed3c975e0c92ebb62b2b23b12fe38fa18c9fe81863c15d535628ceffb20f09461a5e07b460e6f626c2ba86c7a3f9bda9d1582b24ee28a2fc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test" name="rules" version="1.7.0">
+         <artifact name="rules-1.7.0-sources.jar">
+            <sha512 value="a95004ac0a60e80ccc7cd172dab5bbd02a7344bdac50aab730312b289e615a6cda5e4211c81f18625e46c9dd87574589868d7257374f9d6266957cc90f8fad7f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rules-1.7.0.aar">
+            <sha512 value="d65a6e2084fff6c6ca27e345e4ea15438f833aa6ea9f2576d3f716542d9c42edfa7c0d583cb92ed6a2cc33a0bbfa645697ea2fb141c12f68918e5172352f3a74" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rules-1.7.0.pom">
+            <sha512 value="0b109a362a8d24f95bef67c5a4925665df2933525429f5256f70a6b8a5dbb0e6a8ce4ca0437af74872fbb31762c82e6a546911eca0a47b9bc4fde83d3b2d77e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test" name="runner" version="1.7.0">
+         <artifact name="runner-1.7.0-sources.jar">
+            <sha512 value="78de8dcc85a3daead4345ee2a46e96d985d69b272e0644156d8e1737e35fcd34afb34f9e2de884075eb4963709e7fbb8832da59573b0919aae1f660fc9d14f60" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runner-1.7.0.aar">
+            <sha512 value="dbd9e8bd093eb78228886eb9fd33ab2023c323694fd88417ad63cb653428c96758b147a9a0bedb214738e8fc3626cb29d98d0f6e595329c8c8771e19007a6e98" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runner-1.7.0.pom">
+            <sha512 value="f04a61261400f523c7240d3c7d13bda178ce5a3e3c8229441bf13112719e5867b4cd6bf66d654e83f30fd0506d86c770cc306a37d26cc5712b2f91806af3cc03" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test.ext" name="junit" version="1.3.0">
+         <artifact name="junit-1.3.0-sources.jar">
+            <sha512 value="bb7c20c08af8d197a60432ff2fedf609fed38e00da0347ef8bf9f9014cbfa8f99c5190834d5c7ce35262bc7983b6c4c363f8e0ecd9d188aac981735c28b2a0f4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-1.3.0.aar">
+            <sha512 value="66dd7996af7100fc2873ad4839eb4a88df22178ac0a5977b456aafe92cda549012456f198de631deacab5a9aede14001383b179a627ef120a99c106cfc874103" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-1.3.0.pom">
+            <sha512 value="9aff1884e01184ba7a41d47cf7c1ee819685debdb8160bd76a2e523319f09bec642b3e3f7d7ee490bd90fbed53a101a112ed9b0fcd9c42125631ddb22e1701d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test.ext" name="junit-ktx" version="1.3.0">
+         <artifact name="junit-ktx-1.3.0-sources.jar">
+            <sha512 value="0b9add1c760b6f489736e8190f233a82b1b86f8e630f053e12c37e3ffbd3f36b33b65692f9bca4256e9db581f206d77177d2a689c291f9d87756e8239e8b3eeb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-ktx-1.3.0.aar">
+            <sha512 value="a99f92073b2e24dac8e91a8634bb97c768ebc5f099ffdcf894afb730d68d75decf1ae7da5ba14ab5584301f8794e74c2cca093114d8b9e72ab117b18b87b09d2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-ktx-1.3.0.pom">
+            <sha512 value="3b5e57f448ee4770603763376e5978aed1001efdaeba6074cf1cfa6a7a0a5a4c9ae4f69baa01cd0f6ea54370d098241a5fcae56add7c166bdc975135b54e112a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.test.services" name="storage" version="1.6.0">
+         <artifact name="storage-1.6.0-sources.jar">
+            <sha512 value="9256f79527ac224453f207bb4ecc2bf4416c1cc569ab705d47f7416933f8d1b1ca58ebd27abef28d6dce9d2f5e892fc9ce83a1094ba3006309a61678b0ae4b8c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="storage-1.6.0.aar">
+            <sha512 value="a4ea2695dec310255b8dbc64af6157c1a674325d3e572d0307b9649a5dafecb31bc741ee6b83621b8015df62344ecd24512079082a84306591cea9388b80c747" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="storage-1.6.0.pom">
+            <sha512 value="de294a9c14605a76e9ba8e8281b2f4532e4f1e0e0fa420299d01a618d3b6ca7db3ea4b6c43d28a2050768b79ac3252a0749d34e54b760d30850968fbe953db20" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.tracing" name="tracing" version="1.0.0">
          <artifact name="tracing-1.0.0-sources.jar">
             <sha512 value="38637c78f62d2591f6f965df88a5a3b5eeddf079ec82020eabf8baae1af0e706828ab81d8a368a2ff8d77744e73b010d0297c4e70da530f3ecf456d6664032c7" origin="Generated by Gradle"/>
@@ -1641,6 +1757,20 @@
             <sha512 value="1ef0c820f65e0dc928a433b67fbcb92f8ccc07581de9d3716494b9d825b462a4668663fdbe06126032ff9e9d3b072cedfaf9cd9a07d84acbae50d6c1bb3f1de2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.tracing" name="tracing" version="1.1.0">
+         <artifact name="tracing-1.1.0-sources.jar">
+            <sha512 value="34b66a9346853a692ae3079a47efdffc88ba7d2aaf4a9fc2d13024f41e8ee7223394c439ee7c9760a8559ac368856a9dd31f984538c251e2ecbebd8ace274a0b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tracing-1.1.0.aar">
+            <sha512 value="6797ea92a90fcb525d11b337adfce09595cc1fc422a40a91fbf5fcdcdd11be04336bb416eced5431e46f6eada3679fbb16b0e336c589273af8c88c03766e7312" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tracing-1.1.0.module">
+            <sha512 value="b395516f671b00998b9eed4daeb54ab048cd584ec8e5a3ebe332e9effd200b79c9a1e7319f0aeb9c453736ef3ea2230103513a38651b915c6764f6aff12b2dca" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tracing-1.1.0.pom">
+            <sha512 value="ffeea8958953421f49db5dfc4a6911980c0c6016f86f3a35adbf34f0e2a09c4a81811cb715b9da31adbf70f488969966cfcffd844a35ebe1915c46f2980252fe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.tracing" name="tracing" version="1.2.0">
          <artifact name="tracing-1.2.0-sources.jar">
             <sha512 value="3636b4b1c41d48c446119695ec8790044e74d8798df26705810a469287a0e291b4fd9543e2811d5c244b754361ebcaa70f0537d666bdd6785222d5f6873dda47" origin="Generated by Gradle"/>
@@ -4676,6 +4806,20 @@
             <sha512 value="02f0c773ba24b74f45f6519c653cb118395f81389c7e73a034f82074a3e277f793d77783d794143236b05fc5247af5f69d9b2605d0929b742a5673a55e51f880" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="junit" name="junit" version="4.13.2">
+         <artifact name="junit-4.13.2-javadoc.jar">
+            <sha512 value="950b978595bb5507f6797c71be30dd3d9c773331e833b8e926e009f78e090cf82f70dd1babe0698aa8ed14afa688992243b0c6dc22394d57a08ebfa50289c7d3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-4.13.2-sources.jar">
+            <sha512 value="b6299ee0f7b0ed187539d81115eb5a2cc0443172db2da63821cb683da3fafa765cd38227ac0cdfe74f2cf8e61fb8679224cebfd1057331dd9d85aa2325417481" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-4.13.2.jar">
+            <sha512 value="a31b9950f929a7e5a600d89787ef40e42a8a8e2392e210d0c0f45b3572937670a18a524f1815508cd1152cd1eaa7275cb7430ba45c053be365c83c231bccd3f0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-4.13.2.pom">
+            <sha512 value="abf1cf90ab6a525ae0cfa5235563b00bc6ef07c59f8cdd5c5495ea8b14941b5803a3f7adffaa36ec37152a7904a10e04939c0d11b48115f1943a1606cc5066c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.java" name="jvnet-parent" version="3">
          <artifact name="jvnet-parent-3.pom">
             <sha512 value="93b78fac40ca4de12d5a2fb4e339ba9e3c40a25ddcfe58272dc2a8e4b36d2c7cc51075aa2a25f0b3c1d4bd3142551e77847d1bd5599c60f5d50d548b72b74bfa" origin="Generated by Gradle"/>
@@ -5292,6 +5436,25 @@
             <sha512 value="8fbd16b2d9321d5fa9e9cb5e15e0aeaf1ad15f8147226d51ef9cd786f456bf0ae7fdb66742c8bb58226eb54dcc634443d6635924cb9f0b2b5082faaa807ff356" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.hamcrest" name="hamcrest-core" version="1.3">
+         <artifact name="hamcrest-core-1.3-javadoc.jar">
+            <sha512 value="932acd27edad49a95d34decab8ee87459305c019495941a6dc1f82b6d0621ce21d1874827df42acc383d0f8ae0b304f853ba40bac30b7872ead37de2632ca541" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-core-1.3-sources.jar">
+            <sha512 value="38553c75f18f7b39ec86b6c0ce468c775c858f3b7fe234e6bdba1f36a089953a69ea9b645afa34eedb67e0f27e016cde084c2f194d466bc930445de6f7e3fef4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-core-1.3.jar">
+            <sha512 value="e237ae735aac4fa5a7253ec693191f42ef7ddce384c11d29fbf605981c0be077d086757409acad53cb5b9e53d86a07cc428d459ff0f5b00d32a8cbbca390be49" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-core-1.3.pom">
+            <sha512 value="2f9b748225f8f6e47ae2da383f8d74568f0f4e469f387095392f516a7308eabab058877a514ec040c1a9ce8cfca77a404fa8694b391b36213d6e5b8f492f62f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest-parent" version="1.3">
+         <artifact name="hamcrest-parent-1.3.pom">
+            <sha512 value="03f22bcf14820f04db8193e3af50ebd3deb7b62c9587128092f35c1e7963de5c24b6123a80bfde4833f723b100085c043b895b9df6e02e83c201834d77c7a15a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jdom" name="jdom2" version="2.0.6">
          <artifact name="jdom2-2.0.6-javadoc.jar">
             <sha512 value="aef33408ee846ae993b93395ea205bb8b7d4c8717a138a40902d29eec4670a37c397374d55cb18da5e2a8d9f1b4733c0845d9ce5885811921b4e0e93996aaa99" origin="Generated by Gradle"/>
@@ -6417,6 +6580,9 @@
          <artifact name="kotlin-stdlib-1.9.21-common-sources.jar">
             <sha512 value="0b9f27a15f4f0432ff84b1d8da392e8a19ecbec77a009399e3a8be8c4136de597de5a9527cd507d50057589288720fec79cad88200fb2f459d6208022916658e" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="kotlin-stdlib-1.9.21-javadoc.jar">
+            <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="kotlin-stdlib-1.9.21-sources.jar">
             <sha512 value="35cf40e863e4fe66b03381dec2fa42914d48492ad585ef365e984bc860417aa19b71b2477534fea6e1e1444e3ab1a916ef4a5f7bd2f95ad7ba9934cd126661d7" origin="Generated by Gradle"/>
          </artifact>
@@ -7202,6 +7368,20 @@
             <sha512 value="010eb8254d2ff842a039043fe297a3dda0189fbd8ce1a214773724d3fa5e8e8a6a67ed0cd2e72d563d53a061e33041c9745c87c38e2dc7ea98dffab0ee062b03" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.8.1">
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1-javadoc.jar">
+            <sha512 value="921beef61bdef2dca92087123df4a8fa81cbc8965cf1e688c7c47db69c484a391449cfae0b77d74635fddc1d7a3eaea470b9db83589740b146a5e3e03eb76750" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1-sources.jar">
+            <sha512 value="67422cc79649ee8f552d68f82f89d5416103fc03a85fd258732e3f66bfd26cb0579414b4225f5b174fb85882cd01f2115a157ce567a5cab286fc365248e9b551" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1.module">
+            <sha512 value="80d556d7fe731d59b53eb5a12fb30b05a7f800c9195ab3782183e4dcbfa32630742af2d010c157cda30e179bbabc4ab61abe32b92d9de7d16edc82f640b790a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1.pom">
+            <sha512 value="3da9bba9f10f011d4f31761b7a57d1db0e2d0630823c7a31fbd5385bc5e43e264abb9235e4b1d93b01c5745e7a9213d3531af18d270f8b5aebdcce0ad810794c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.9.0">
          <artifact name="kotlinx-coroutines-core-jvm-1.9.0-javadoc.jar">
             <sha512 value="45ca2e3eaf4cebfe1dce455bff9ab6dfc12ecd3c13f59bc9ebcb00ee913135d1bd56d37a33d8a84e852b91fe2b0fbb04c99f949a0d1da620795a0aa5db6494b1" origin="Generated by Gradle"/>

From 442e121a32b4a0f87bd8fb4c4f335e79b46591fe Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 16:31:38 +0300
Subject: [PATCH 15/51] Bump AGP to 9.3.1

---
 gradle/libs.versions.toml        |   2 +-
 gradle/verification-metadata.xml | 768 +++++++++++++++----------------
 2 files changed, 385 insertions(+), 385 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d838de16f..3d5eac1f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "9.3.0"
+agp = "9.3.1"
 kotlin = "2.4.10"
 ksp = "2.3.10"
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a785d7847..7dabcf243 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -900,37 +900,37 @@
             <sha512 value="5ea9a7b751c4e3d6256ea3bb83c478e0e7c0cc2dad419ff3372d6b3f56ffb7cd5d34fd5b30adcf3e6dceb0e6cdd89e2346645e3d645f8bc6191fdf1cb02c9f3d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="9.3.0">
-         <artifact name="databinding-common-9.3.0-sources.jar">
+      <component group="androidx.databinding" name="databinding-common" version="9.3.1">
+         <artifact name="databinding-common-9.3.1-sources.jar">
             <sha512 value="d9421f75c07ec12a6407e9381f350684f150800b40aabc9600d6e36ad6ee4195603b9e7063de3d1f0a69f926c75873db69b982944633ad016533ebf154eee72e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-common-9.3.0.jar">
+         <artifact name="databinding-common-9.3.1.jar">
             <sha512 value="3cf384bb55c5d545c736dd4a5526295cd119db0c0c08320190dbe52a32d37acdf41ca2675cf2674322d60e9bf0e798bb3ced08c6f4cd3ec0fb54d4357dc38a9f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-common-9.3.0.pom">
-            <sha512 value="d2df8fefc84214d47fd0b73481191d3311821a49267fae6478097cddd3f3a910237acfcb4bb02044c3efb8c4f08757b492a2896178cd6ac426d79268facc5b63" origin="Generated by Gradle"/>
+         <artifact name="databinding-common-9.3.1.pom">
+            <sha512 value="a5491ffc566896afde8c8b8ded13022cca5a3cc89be75dc7252a31f4fd0825317713d0a1ce9455322cbceeb1c53c03b072284364413e1985e369448dd145caa1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="9.3.0">
-         <artifact name="databinding-compiler-common-9.3.0-sources.jar">
+      <component group="androidx.databinding" name="databinding-compiler-common" version="9.3.1">
+         <artifact name="databinding-compiler-common-9.3.1-sources.jar">
             <sha512 value="8a640e923f12599020473e2101dc8f61d04979523c57c069997f2c07a1dce01394bfafc6b73f67b80a8042f656f2503d3da4bd810d3dfcb50447f2da6b770571" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-compiler-common-9.3.0.jar">
-            <sha512 value="20933aca1792cfff7bf6edc055300bdbc1b583f1a6aa5a59df0d81a39ed76b15142fccd6279e20fc22e42f2e438fc63a3b9e56fd557ab4bc25d502ab661a78da" origin="Generated by Gradle"/>
+         <artifact name="databinding-compiler-common-9.3.1.jar">
+            <sha512 value="2a9c4bf58899148fc01da5121c01b42754da12d911beac6e56d34fe05560ed4aac28c68b9e9a75b850dd93a9a38457e86c71fc46fe5834234060e011fb8b8dba" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="databinding-compiler-common-9.3.0.pom">
-            <sha512 value="be84431db674ba9c8fe5ea8e76029e2c450c69963ab6246c3727ea1befc7c3143d8fd211a5468181184e8cbc449fb777780e6208170513eca35818368c8ba935" origin="Generated by Gradle"/>
+         <artifact name="databinding-compiler-common-9.3.1.pom">
+            <sha512 value="705f782c40f2bcc7d057b3e7d085c180a9ca5e70743b1682cf52346154f013b8e2402ef9c8a11668a0cccf620021590b39ff0fb8109e2617bd3e0ed402f6d536" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="viewbinding" version="9.3.0">
-         <artifact name="viewbinding-9.3.0.aar">
-            <sha512 value="d9203958fe33ede19812ef963195cf8d5e14003ac34d17d32f1b632ef1a3864f94918587e7a3208ba295b08c4a4f08e99ebabde14258ab5dd0788300f78ae3ae" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="viewbinding" version="9.3.1">
+         <artifact name="viewbinding-9.3.1.aar">
+            <sha512 value="7347c10b6bfce6dac279c3a6218cb0ac5da241ac005190226311ac87b3f84139f22f828aabeac343f2f4116581d896bcc1895c87fb96e796bc4388c363f2b9c8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="viewbinding-9.3.0.module">
-            <sha512 value="d2e79111b7085c3caddabcc784785cab03b528f654d8f4e64328e5d576a0c993da2311e78e40de996d7ab6388b63e97ccf001f36ba0c62fade86f26dd5146a1b" origin="Generated by Gradle"/>
+         <artifact name="viewbinding-9.3.1.module">
+            <sha512 value="877862e1a2424abde21c3b4aeaa5d8ccd5392818183d9d97fea9de9b9f2e97f9bae91f663817e928d170121779ea715e62e78b56799aea8b63b3633b67ecd034" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="viewbinding-9.3.0.pom">
-            <sha512 value="3da31d68063cda8f53c34c9ebb3f297dcc00b9d2bc207eadf629d6673de2d2158827ae201dd465ed58b2b66e7b1ec319d3a62c0330d5ad5f0bc78d063ec1b246" origin="Generated by Gradle"/>
+         <artifact name="viewbinding-9.3.1.pom">
+            <sha512 value="f68e35a2c4bbbbeaa32d4c31facd8cc92ce2bdf4c33c28efcfb65455da9a8fc7fff1be02161b0e5372073a2ad540d6f82b554df19d7d1e9185af5f6df0060046" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
@@ -1904,163 +1904,163 @@
             <sha512 value="35a25ca5385e9b53c396257d9781f24e0058d718f8bf56b36e583430e3d4872383b6221c93b077d312028b56dc2c9f8b0f77d7a645407d2388a453d4b0533e3c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="9.3.0">
-         <artifact name="signflinger-9.3.0-sources.jar">
+      <component group="com.android" name="signflinger" version="9.3.1">
+         <artifact name="signflinger-9.3.1-sources.jar">
             <sha512 value="eeb581fffdeb44d5ba3e359986c2ef983689ea0efa8cdc4f9a1d02ed7eff233b7a2924b67753f657c9f18d2a84829ecb5bc194201fbe6594a8086050cc4dbd75" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="signflinger-9.3.0.jar">
+         <artifact name="signflinger-9.3.1.jar">
             <sha512 value="593c91a5c742c3b5ce2e44835eefaa6ab6aed81a6ce3457ca4106bcae47f952cce19587e3bf37bc4355da5a063ef1aed7af906d2e93e052ca70f89f0f3af7a78" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="signflinger-9.3.0.pom">
-            <sha512 value="6ed299e5426b978e15901efaba0fc7769dad756053cbc6347fa35e2e92071d4f5f242ffc50ddf88373ab96d880f31ec52491c0107af7512398a1223204d0dbfe" origin="Generated by Gradle"/>
+         <artifact name="signflinger-9.3.1.pom">
+            <sha512 value="a7f3cbe519c40809d1f858097749519c9e74400debe336e8dd580834ea27a17625444c83de0e44c74407abecbb16adfaa46c21e88faa0e336951426c309ec680" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="9.3.0">
-         <artifact name="zipflinger-9.3.0-sources.jar">
+      <component group="com.android" name="zipflinger" version="9.3.1">
+         <artifact name="zipflinger-9.3.1-sources.jar">
             <sha512 value="1b578e7b258259b1bb796e4c9dd4bd147fe8cd08d379b9e2d7d3c77398de08fcaabbf58f854a5617ccc6842926d3c089f4bb63dc874bc86813bcc77c3a34b10c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="zipflinger-9.3.0.jar">
+         <artifact name="zipflinger-9.3.1.jar">
             <sha512 value="9214cb07a9836e07ba0a9abc1954aff797b1c796e3aeebb8a86277beab4f5ccba5934b43c1050afcbd617ce4296b30d861542b212b80fa9806a7a2b4019bd200" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="zipflinger-9.3.0.pom">
-            <sha512 value="706c2c769ecefb8a3372f10cadbb7a8084eaa21ce80c636f2359ede1eb4fc4106702fa4e723bf68e9f1d6bbfa03fc84da168dd1d4420b2010db1cb1066757a36" origin="Generated by Gradle"/>
+         <artifact name="zipflinger-9.3.1.pom">
+            <sha512 value="07a538d0ddba9f916ab8b252076b69b66a76fbf73032b282ebf394e87e79904ab0b20368c4a386e03fdfcd8de3766a9c7fe47cda34ad972f15f7ad49edcd1a59" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.application" name="com.android.application.gradle.plugin" version="9.3.0">
-         <artifact name="com.android.application.gradle.plugin-9.3.0.pom">
-            <sha512 value="46be78f0beb2407b52b0e2a2eddc87c0512fd7f0d2e9d5d3e166f5c4f3aa9ff73c6f592311269fbfb3f3a612e1ee821bb73ddca62ec9bcc284cc11f3153b9f51" origin="Generated by Gradle"/>
+      <component group="com.android.application" name="com.android.application.gradle.plugin" version="9.3.1">
+         <artifact name="com.android.application.gradle.plugin-9.3.1.pom">
+            <sha512 value="a95de2be5c4447666db5baf5a13b66621cc5ae38a70754d2dc1d9a66a50afd1aa8f6096538e68338ad76d63e78571ed3353ed97999899adb737588a4df319327" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="9.3.0">
-         <artifact name="baseLibrary-9.3.0-sources.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="9.3.1">
+         <artifact name="baseLibrary-9.3.1-sources.jar">
             <sha512 value="7c84913ee31bc8de89e04d0c7bd13b1878c2520950c79b463a96cba77c8a329b8e9a5adda1ba33c8f12421b1f7bb33923031d561ec4e39e8b803ded08aef9d44" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="baseLibrary-9.3.0.jar">
+         <artifact name="baseLibrary-9.3.1.jar">
             <sha512 value="ee15334d9ebbbc41926adf558018270fee26795d9509215629b0aba97503e0cb48f2db9ce8b79a9117b3ab385e635409b659831bb4c5cda09e2f57c5290726b0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="baseLibrary-9.3.0.pom">
-            <sha512 value="f8830108e0bf770774f2b18af9353c806b6bb7b1e5fca8a50434a8881e31810440fdf5b9668de5cfbba94579be6e3692ab86bd48997d803af6d59a157ec8db1e" origin="Generated by Gradle"/>
+         <artifact name="baseLibrary-9.3.1.pom">
+            <sha512 value="51ac7848d828a26045bc4b279c0982e1f8879542ccee60b6134baff9e8ff885278f7575b7b60ee7087d77185bdfe0ed1414ece19bdde590950c0ad914fede4da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="32.3.0">
-         <artifact name="annotations-32.3.0-sources.jar">
+      <component group="com.android.tools" name="annotations" version="32.3.1">
+         <artifact name="annotations-32.3.1-sources.jar">
             <sha512 value="a835971a2b055c41b1aa4a2e29d80cc93757722194f860e0f4e997d32521825711419c0cb04aec570ab87876a95475722c17b3320249ee1a088c71d0da999f46" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-32.3.0.jar">
+         <artifact name="annotations-32.3.1.jar">
             <sha512 value="4694dbc31e5b8c7ed4b941a252cb828b789f5dd90b1cc38526ccabf42005a8ce0600dfc951e3fb08c3f60b905002cf5ecb26e46a4e77e3f9e730a74a87e22788" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-32.3.0.pom">
-            <sha512 value="8423794e7ac9faf931245e3072454c3df7b4e125836aef214a43de4f31c04905ac5e26374913c04706d75c5beaaa426a7e56e36383eecb680123fb30342eb70c" origin="Generated by Gradle"/>
+         <artifact name="annotations-32.3.1.pom">
+            <sha512 value="15d9ab0d2a147901968784d2f4052d8ea651dc101ca052be8853ad961adb4ac779bfeb17fbeed5ea4ab5129f5de82a13cf135740f0a584963078dc38bf7c9258" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="32.3.0">
-         <artifact name="common-32.3.0-sources.jar">
+      <component group="com.android.tools" name="common" version="32.3.1">
+         <artifact name="common-32.3.1-sources.jar">
             <sha512 value="5b09d52dac2cd58b67fabc0973607250bab99707ff95a183475e068dd75f7274d8592cebd3b4192d037ce0d81eafc9f847592ede0cd25145717ddbf4fce2b21d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="common-32.3.0.jar">
-            <sha512 value="c7b42285224941d6eac884d97dc9d5e9fef47b49537992782813e78f886121431c0515ed3409c662432279482395b7c3d11e1dfa57231f517c0668f03f178441" origin="Generated by Gradle"/>
+         <artifact name="common-32.3.1.jar">
+            <sha512 value="599e52b5e2ef7371882b270784193f0bcef87016d4fb24174f648e9093ca65ff225119c84ba21e0d0374a733a946d02210cc6d12df8e80145631a38f8a81a100" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="common-32.3.0.pom">
-            <sha512 value="bb896a754e4934f364c8efbadcf08a17708396af59b6da778d802ad3c11ae777ce0b357ef3a42d6b333f5c02343a63d13f127f796e92df0f2602b4255435586e" origin="Generated by Gradle"/>
+         <artifact name="common-32.3.1.pom">
+            <sha512 value="40dca7a98c13c3a84cec8c565b9415978cd2d88d4dc9672064bd9b05e0cd4efd24a22b359b904872a0b84022144e5fe80cd3d2138d03c66138b75b80c88b95e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="32.3.0">
-         <artifact name="dvlib-32.3.0-sources.jar">
+      <component group="com.android.tools" name="dvlib" version="32.3.1">
+         <artifact name="dvlib-32.3.1-sources.jar">
             <sha512 value="98e927fe7b5d128c6072fb41c02e78b245000cf89921a3349df3d7968aed976719de2b73390bdaf9b021720f7c37818e4cf7e2dd34c97b070b2e2f90cd5d878a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dvlib-32.3.0.jar">
+         <artifact name="dvlib-32.3.1.jar">
             <sha512 value="b78e269e7b22b72b5e24b8768fbcb4f98ad6f8c939c8e9723810084d6ae689840e8c878fdb8fcef38c1075fa22995abb3fc2487f8240ea1beb0f08c0fec70ccb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="dvlib-32.3.0.pom">
-            <sha512 value="cc82953509646c8cab9e72d1c7ef41cabbe3fcec6c56705322ed9c73201e784c5d126d5d73859529e51ca2d8671d4b98ec2db2c5c4faa6a395abdfe510975f15" origin="Generated by Gradle"/>
+         <artifact name="dvlib-32.3.1.pom">
+            <sha512 value="9af0bc3fe0d3e2bff62cd67fb8089104c0150f6707ba482df9341b07247405b63a7902ed1553f03495638a30e70f351b49356f219e98a70dd930783d68e7dafe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="play-sdk-proto" version="32.3.0">
-         <artifact name="play-sdk-proto-32.3.0-sources.jar">
+      <component group="com.android.tools" name="play-sdk-proto" version="32.3.1">
+         <artifact name="play-sdk-proto-32.3.1-sources.jar">
             <sha512 value="b8bb85d6dcaab94feb63255ad7588bb9fd27c5b6a3431d0ce61dc0fed2bfd5a606caea1ccd5402c74c26e13266752210f94928bc19cb194bd1e641e0f9bd7749" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="play-sdk-proto-32.3.0.jar">
+         <artifact name="play-sdk-proto-32.3.1.jar">
             <sha512 value="f4fa74a4f580edf9a88c184e6ccb9d6574a5f4697ae49fc0efb3e4d717d9256ed6e5eb563d56eca6ce5922d899c4edab2a5b6ce285a3533edf7ec964f038560a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="play-sdk-proto-32.3.0.pom">
-            <sha512 value="5565adeb0c5f531dfc7a8a386c2481aff4f49e616a3e23cbfa63a49aed201abc3cd3c56ba78fa68b055e6dd5f3625eb4ef8883601030cabb269ad1bebb01a996" origin="Generated by Gradle"/>
+         <artifact name="play-sdk-proto-32.3.1.pom">
+            <sha512 value="46f039844bb082a28bf43a68ca838c84c13158f758016d38dfffb4942f85dce2e88e4f7f2231cc7d235333be3be039483796d4d028cec247a0b068a78291ce84" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="32.3.0">
-         <artifact name="repository-32.3.0-sources.jar">
+      <component group="com.android.tools" name="repository" version="32.3.1">
+         <artifact name="repository-32.3.1-sources.jar">
             <sha512 value="f44ec69cac85fb445783a0ba6d5e12e61b7447186558182e02425b222e5938f592d6719e4bb0742ca3e8e25a06c0db7baddcbebbc4a695b400a6b445f8587308" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="repository-32.3.0.jar">
+         <artifact name="repository-32.3.1.jar">
             <sha512 value="b41b763c7f7bc8e3371e585a5e731719c2307adfff6ed7709bf64ac28d3c67b495e3ddce22c6b38f3706b078a38de50284a29b7fa7a07de4ac940640b42e259f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="repository-32.3.0.pom">
-            <sha512 value="dd76b8da05cbcaac0c9f710ed181db9623e04eef8de8ddaf0f4e55fc392bd7c590299f50def696309a429e007d3cc0ff6fb3f4a5779519a9cb14edbb69710f75" origin="Generated by Gradle"/>
+         <artifact name="repository-32.3.1.pom">
+            <sha512 value="0ba3f7431d12506a801c4462c246301dca5846c26749bb72f9f5772495cdcbdb16bfc5eb81a5e2605bbae4902f4bcf4b59ea7cd8e2420eb3cf965a606a5c378a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="32.3.0">
-         <artifact name="sdk-common-32.3.0-sources.jar">
+      <component group="com.android.tools" name="sdk-common" version="32.3.1">
+         <artifact name="sdk-common-32.3.1-sources.jar">
             <sha512 value="5cf8b9c64c37dccc5f98a3f805af9d379734c1bedf9a971ae6df65d5c5124a296ce37600558a38266e545972256c50a06d0cf9c79047743cbc69baa7a5a19354" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdk-common-32.3.0.jar">
+         <artifact name="sdk-common-32.3.1.jar">
             <sha512 value="53a2220d073aedbb2eb0635f2c4fe06be415c28320cd8e4194406281e421cec9796e91c7c50ae3f262e5a3c801dee79e64fffc74db1d72ce12c53f5d793c032a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdk-common-32.3.0.pom">
-            <sha512 value="ac294f5f142a0fbaa3479d9e059ece4ee7564077a6463a5117f502f1bafd8533e0aa15493a3e886721c4825a309d790c39774135f94ba1e27cd131752f5c88b6" origin="Generated by Gradle"/>
+         <artifact name="sdk-common-32.3.1.pom">
+            <sha512 value="f62c68b4d253b17d37156990849e6eec35ef0392f495326e75a14687a9db308b6b9024ce3703191e43a942c8f56b6a79c3165a148d23a643e2d82bbe3dcf0c18" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="32.3.0">
-         <artifact name="sdklib-32.3.0-sources.jar">
-            <sha512 value="8d87b0bc96f946c91f13b188ca67140c1d28e45069f826513040d45887b970c5ce91aabb68b3750b1c9bfec5444518160ac3caf6af5db32e1e4ee5e4c17fa0d3" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdklib" version="32.3.1">
+         <artifact name="sdklib-32.3.1-sources.jar">
+            <sha512 value="db2b7ea768f47bfe5980afc44c8891f173274c860472e85b9af93d367d7402451d9542966bc60eb06017f972f044efac9b1a5807938e1b5506b94540a7455645" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdklib-32.3.0.jar">
-            <sha512 value="ae42246036e2a340237e46ac10172e26f6365de2ef63f4087f70f3a62a12643150a4b056bd30d20021b00362a8a2339935e001988c742753bb984a33b185ec52" origin="Generated by Gradle"/>
+         <artifact name="sdklib-32.3.1.jar">
+            <sha512 value="caf85f8f5c92269caf68ae138d3577d94dbc5743770325b377e07826170d092b4a6d22fbaca173a7e1e340af5f0b2a8dd17b503e1d0ffb026a309899fac14652" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="sdklib-32.3.0.pom">
-            <sha512 value="5ba913a4a82032d04ce03d385b08035220094dadd4a2b330aa532efbb43cd6c117af1a1d1c1997078f6eaf49cb1b86b43834227954921991a1eb77577d89b49b" origin="Generated by Gradle"/>
+         <artifact name="sdklib-32.3.1.pom">
+            <sha512 value="9fe5d493794b69d11ae9d29c897d57e755007cc8cfa8e460d45d5fc11532cc85b9d6389511092097c03e27b294fc18ddbc1acd294413d9ec772096e12f8850c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="32.3.0">
-         <artifact name="crash-32.3.0-sources.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="32.3.1">
+         <artifact name="crash-32.3.1-sources.jar">
             <sha512 value="5f9ee5f66bedecc2ed60807933e07c4f24714304db528e29cb17b9e8e5b984ab55abe0b717c43bf9f7b9b6d2b185b27bd2f11dbd25c8ece429afefdffef6f85f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="crash-32.3.0.jar">
+         <artifact name="crash-32.3.1.jar">
             <sha512 value="86dd08cd575b6f029c407280639fc5499cef1a89a9b744980cd79262fed2998afe0b440edc33968bbd8ece0226f44996ca2bc214592a6be74edc203f31db0d29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="crash-32.3.0.pom">
-            <sha512 value="8c4a5660a0154ed3aefbd1aabab6c0d113941633e352569391108c3025b82c806827041b4fc5e84e936d0cde8c8fa756f047eac90a97bb7a29600b82ff2ed9d0" origin="Generated by Gradle"/>
+         <artifact name="crash-32.3.1.pom">
+            <sha512 value="7fd8b8e96cf9a95036a3564b04bc33ccd69877f96d8cf8cfd3f9945df970a375d8cbd67058f3cbbe50b0c13d1c05b0e56af96574f694c61c1783f9dfcc0243ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="32.3.0">
-         <artifact name="protos-32.3.0-sources.jar">
+      <component group="com.android.tools.analytics-library" name="protos" version="32.3.1">
+         <artifact name="protos-32.3.1-sources.jar">
             <sha512 value="90048ece8a558d18d85d38984ea8fd9b3612295dbb2377ac2abc437e8219e680455f2a017615b7f889fc2af7c234ebe4ae80aca8d0f5777435a1ea7c0c4bf2ca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protos-32.3.0.jar">
+         <artifact name="protos-32.3.1.jar">
             <sha512 value="5c93e5faabe2f4a13f40dece4f42d6ffb0ddb754737809be9f140fd0cd2b388448384d50c1c224bada9de1505906cd23ef6192fd9b8803223ff5bd2aabc00422" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protos-32.3.0.pom">
-            <sha512 value="b7e8b97ad926d967714a953726ac50f1f297574bc4c8e1b3a5d4ff91220d97427935f7a7700bf0ca4957253c163b78f7b7b891359b1d2304763be763ae4717d9" origin="Generated by Gradle"/>
+         <artifact name="protos-32.3.1.pom">
+            <sha512 value="58a9fb61521dc1224f3348cf6c7eccf91e6b208af40e6e59f4f2f194b4850327c05871031085e462260fb29088cb798ad882deab9557ad4e53338cfccccd0b83" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="32.3.0">
-         <artifact name="shared-32.3.0-sources.jar">
+      <component group="com.android.tools.analytics-library" name="shared" version="32.3.1">
+         <artifact name="shared-32.3.1-sources.jar">
             <sha512 value="dab55268c61f09a36d4913c388a76e6402c11dbf3ddefad1d3b64c8de967a811da36c28f93821852e96da0b33eacef992eea24ecdcd16729164d90fd144a86fb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="shared-32.3.0.jar">
+         <artifact name="shared-32.3.1.jar">
             <sha512 value="3ef3b51394a333e039f2146796a9210639a2eb385b861b4b2d3e08c7fa883207dc9be1d404232e71d88a261c47eb7a25021dfca9119a261d95541e945266a951" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="shared-32.3.0.pom">
-            <sha512 value="b38f4a948020685a61e1cd5f22a07c38f98f69ecdd556722e58906dfed2aad36e352eb11e09c6f60c666319bdc2cd99444de86b78b7a981dd23892bcfd6afa24" origin="Generated by Gradle"/>
+         <artifact name="shared-32.3.1.pom">
+            <sha512 value="05d67a5c41f89a9400a9e7524639c34b6e444c4b743dea3015a3066c974f96bdaeed13008243db2b658df9072eda2c05c2156927ed7499c0f6440009949054e9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="32.3.0">
-         <artifact name="tracker-32.3.0-sources.jar">
+      <component group="com.android.tools.analytics-library" name="tracker" version="32.3.1">
+         <artifact name="tracker-32.3.1-sources.jar">
             <sha512 value="3521fcb077f27264c4c58b5d62ab990cca5f969b959dfb479324680ab901e11093204af52997e2901b2b30505a2783b1ee4cb4ceaee829ed49f5d142af60c3a7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="tracker-32.3.0.jar">
+         <artifact name="tracker-32.3.1.jar">
             <sha512 value="878d6c33a4737397ac3b8726f5baaa10d84da7681b259423770d59a4ceb4371c55c579a1b89b434e181fbdb8b6701ea63f5a22d9ec48eee708e765c473db4032" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="tracker-32.3.0.pom">
-            <sha512 value="370dd5264fe920eeaa738576dda04583621c7923796b326705f455eecd8af18bcda56bf3cf46ca4d1ff9292b2db87cdda617c1e9bd307cfb5347a89e264a143c" origin="Generated by Gradle"/>
+         <artifact name="tracker-32.3.1.pom">
+            <sha512 value="321093fcdb3f7d41ffafd714b62087dc8b58dae2dc0be9804d0714153ffd3b5395ebac09775c7edf06a33e9c0c09bf7dbae7f1dc64cc1f0ca35eb3bc17474298" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2" version="7.3.0-alpha07-8248216">
@@ -2077,18 +2077,18 @@
             <sha512 value="797ec83a3c1f51f8f63ba890f6cd836ebd8b5bf75da2d71ff36c8b86c36246ef48610e3dd92d438806c893a74617e48c819afb5289a6a971d72ce8218ee53f45" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2" version="9.3.0-15703166">
-         <artifact name="aapt2-9.3.0-15703166-linux.jar">
+      <component group="com.android.tools.build" name="aapt2" version="9.3.1-15703166">
+         <artifact name="aapt2-9.3.1-15703166-linux.jar">
             <sha512 value="4021309ee4fb0e49192314b608d7d747a6b41bbd0873b0fd14e55bbf8e352abaf34f365b5c3a163e9498e954f123f8912acfd5e2fe4d8a06f4063acc4f463bed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.3.0-15703166-osx.jar">
+         <artifact name="aapt2-9.3.1-15703166-osx.jar">
             <sha512 value="cc7f408124038334b67389d95b8abc2223a389df19f8db75366bda7672f32c2c07b07b0f0a408bee6d69a239f40c65f667564edba66539ce0814c72bdd8c21a5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.3.0-15703166-windows.jar">
+         <artifact name="aapt2-9.3.1-15703166-windows.jar">
             <sha512 value="7c68bf59e0df958702bce6f00f291dc79374ffd4b2db177cca2831656d1b8349d9da44e9aa251c918c733f88220de23bf86395081002968ad559d05bbd64c45f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-9.3.0-15703166.pom">
-            <sha512 value="06793d18c8713ab8c20b18537b8f8685ba0f6cfda047a5edb4e56d8b6333a99c2cc810bd0f8dbe74109cc97256bd0be6d7d04f090ecaed8217321d5e91ed485c" origin="Generated by Gradle"/>
+         <artifact name="aapt2-9.3.1-15703166.pom">
+            <sha512 value="f313d8d32ee213a040b5b776989bc57ffa74b906c16177f1b506be925b4a3036877be0a98a119a1114fca3dd28552178dc5ba83004ae168166b7c487d4f80d4b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.3.0-alpha07-8248216">
@@ -2105,111 +2105,111 @@
             <sha512 value="3b15ec18908e442bf0e317c3bcfc14bc45eadf89b853cd9efa3970b0cae97c62d6c0125b74535ecbe02c7696fa8f3faf24d86184516580fbe9fc88c5dcb2388c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="9.3.0-15703166">
-         <artifact name="aapt2-proto-9.3.0-15703166-javadoc.jar">
+      <component group="com.android.tools.build" name="aapt2-proto" version="9.3.1-15703166">
+         <artifact name="aapt2-proto-9.3.1-15703166-javadoc.jar">
             <sha512 value="415bc0caa8ea49f29a185b6fe05f9483a098f000a95d04ea5fc7187dcb205b2831eb34f9b10272db25123d76bba72301e44684cf4e5f05ec90f75c6a58cc3a57" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.3.0-15703166-sources.jar">
+         <artifact name="aapt2-proto-9.3.1-15703166-sources.jar">
             <sha512 value="92259897e27fe49641d45bf41abccf80b2be83bcc915aa387990376344b63536be1b7a558b73537d76134307bce940a04fa6f2f8c8986d424754156067ac35cf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.3.0-15703166.jar">
+         <artifact name="aapt2-proto-9.3.1-15703166.jar">
             <sha512 value="b3fdcf5e77dcc81dd7025b3e8cc81c74d12b0d8e2775c8e6dd2cc382299535bb14affc99f3b9480dbe7e18758ec4d03bd82b310d4f8f43f819a057ee777fe9d8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.3.0-15703166.module">
-            <sha512 value="772d859dccb104b4f083b8d3bf6e39e9a082b8c64469c5ba4499f2abd0d3ec9eac27322610dee6b736ab210aebafb53386c5a900ea27ad4e01f91d6eaef1ceec" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.1-15703166.module">
+            <sha512 value="ed9341204ad55f0df53d772c57d52e078501009a9f2702f6368f178e37dfbf8cbd4d22bfabf4d3850620154f2e519048c40c27efde4678215c228793fc931867" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-9.3.0-15703166.pom">
-            <sha512 value="8bb5691f3ec7906111f9cf5f86c1085932c06f7c67cc5c726a7ab4513dfbadc5735fc72b8db23c2be7ba531dafbfb16c71bb4f6d3a97c7bc3691a5aec2ef6b91" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-9.3.1-15703166.pom">
+            <sha512 value="e48818a752474bec0304e5cf577a2dfc5726656fda4d24547f8355bc68714ea97f7213e60e36bc16c1a27ea017d1df958f1bd85860b3aa6613f69037561f3fef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="9.3.0">
-         <artifact name="aaptcompiler-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="aaptcompiler" version="9.3.1">
+         <artifact name="aaptcompiler-9.3.1-javadoc.jar">
             <sha512 value="50b2a55c05905cfce9f4d49cab238bd811f2c976ceabb8c5c9980d3a4445a9da09fea2c1ca3b726ea163f612412eceef07aaa7de45881269ce6417ecce715f46" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.3.0-sources.jar">
+         <artifact name="aaptcompiler-9.3.1-sources.jar">
             <sha512 value="a2ae0ad4bc6f4d23679ea08b0c5a8fd825bf1a781a9221f995bf363422c1d83d52e8c9b8a036dd9bc253271c4e474c516c982bbe817d51e9ffc4b8c8afc78d81" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.3.0.jar">
+         <artifact name="aaptcompiler-9.3.1.jar">
             <sha512 value="38981f87e2d432bcd6890a262cb817994a638cde066e50a03cf375074db9d2dece76409b0bbf37f1c78882da4cea9d935b540401113130540bd9da72c3716329" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.3.0.module">
-            <sha512 value="9ab909a2a1f28d1e7b0e87f1e71e49f5babe67285ad1e524091af6d8596ec7c33808c252dc82494b31800265f2268dcf40e086443cf04ae25108e8b79a3b0585" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.1.module">
+            <sha512 value="bd5e047686fe4df901ce3303a427cd9a26fd66ee54dccf3572f1ce936a37201eb84fbae8a83afcf1f4fab514f1a9f3668f6e9809c1046b36cade62e73d970e9c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-9.3.0.pom">
-            <sha512 value="572dac0cee473d9968b920b80b7f5d91856bfd687248f7c906764e71ab59b7757d234769add1d310badb3cf64ca7f33984f0de32b0ca8623b0b12eca2a8fb528" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-9.3.1.pom">
+            <sha512 value="150c5d3d8f53bf30fe1c7887c53779eae0a40913f3f3ed93d073d0c1e60cffa6bf64ceea36d3e1217516fc394bc75fdd33869f7504e1ae3aa67d0a5eb57cc588" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="9.3.0">
-         <artifact name="apksig-9.3.0-sources.jar">
+      <component group="com.android.tools.build" name="apksig" version="9.3.1">
+         <artifact name="apksig-9.3.1-sources.jar">
             <sha512 value="6b5047abac85b4f6400e818a50a2c01a82e5c624ae98ff7dc94b84d564f26f9b9d3119eed43838f0482490e7e49d1cf79500a16d18eaf6de7955f5cd862787a8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apksig-9.3.0.jar">
+         <artifact name="apksig-9.3.1.jar">
             <sha512 value="75f4613b20ed254f1cbc34f5a3f54cf87dc6deb101bbcd12b256394a6878cffb9b3a91c29989709673e27f54a70d2c80db63f572f1f0ffb3254f102d89edae91" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apksig-9.3.0.pom">
-            <sha512 value="507797343e4dd0aed1650058e04d93a0cbdfa6a70f80b7275fd30183676f9ff1b3586b78f6fee11fdf3694b80d67bfae791cd9fcbcbdb51d84d53057072f0405" origin="Generated by Gradle"/>
+         <artifact name="apksig-9.3.1.pom">
+            <sha512 value="882e577a0a0ba41dd464d860f9004d5b8c12f4d75744f1d9ed12a007a363e125b266fc869569308c62df59024adfd15162fd45b687d7a6c17946a80ba8d0946a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="9.3.0">
-         <artifact name="apkzlib-9.3.0-sources.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="9.3.1">
+         <artifact name="apkzlib-9.3.1-sources.jar">
             <sha512 value="93401a9ca8f9049a2a49615d0cd76898ee1b48cf26a74ad327f8766bca101a15423b7d8dcaa9279ef11111e3e6641ea26c2a2a073ca248c0307544d5ac42c91b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apkzlib-9.3.0.jar">
+         <artifact name="apkzlib-9.3.1.jar">
             <sha512 value="8eeeff02940b72f796750bcddbcb347405dc985fc3ec37af5eeb6ff185afab31f2680832aa0bd07a0d348ceb0f09206b91bc36ff108652c04636e804ed29d303" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="apkzlib-9.3.0.pom">
-            <sha512 value="4cb81ad60c1e951eccaa8832b67afdb61957edaa5a81e84356d1d03901577322421b9bc34720675a18deb36130a3b02165b076d38f90e912ea36cea69234c2e3" origin="Generated by Gradle"/>
+         <artifact name="apkzlib-9.3.1.pom">
+            <sha512 value="5aea196ad5a8fbe4a5e3735a90699a95353f99bfa467c16e50431d2df05a890397bf8138996139c31bb37109b82eebc4cdc0d1794f2640d30c7c303f71a8cc42" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="9.3.0">
-         <artifact name="builder-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="builder" version="9.3.1">
+         <artifact name="builder-9.3.1-javadoc.jar">
             <sha512 value="fda72d70323012c03fe3038f34e67bd09999e4ace19eaf4c88fbc54ef0e70d32f8633a1aaa9766ddffc8503a2ed5e5bffd34ef5566411e5da58d8b93b8089abc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.3.0-sources.jar">
+         <artifact name="builder-9.3.1-sources.jar">
             <sha512 value="a8ed53359bbbee302fd8856e09d89e71cdc7950a88501582a6c4867b8f191b57f2e17cc503db7f1bc14ba43d398d12f61649f24724aada5895151b2851ee9534" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.3.0.jar">
-            <sha512 value="9980e76ffe9070ac13035222048340a05f07ebb6f0e5633974e91bd674a2dfb5d1141cccc9b9d77d67e0f7b6d42b7b0e78a6ba5ab2804d8b3776ed6a0f9fe0ee" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.1.jar">
+            <sha512 value="9dc255023a19fc09afda5278eb9157b2ccb4fc7286491c63bf8314f56972161f9958e9fa3af1f9637d2ba29b0d2ac6cfac4add5c347dc82af9ddf562cc958ef8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.3.0.module">
-            <sha512 value="ff19711b1810c20e319d21d209e8706586b57d43e9be0f12b5d1769d381fa96981fca4b4b826015d795ce7857aa3630526463344bc2a9b8aa1b0c27fbdd48fe5" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.1.module">
+            <sha512 value="c15ff4ef37f22b3ad55dde0e3a12b40433b7df2ab37541d1fbd279df2b6e2e4143dbe29e6426b16e5caaec0474199aaa37f4478cc74006f970a7837155a0f3f8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-9.3.0.pom">
-            <sha512 value="04bcb89923c07f40e3dc086c73da2ac9b395778eabb36cbe288b5b74a5efc1b2220fbf26eb0aba480b84822f89041d5574e8436ee5d281ed167f1c0d7ca778a9" origin="Generated by Gradle"/>
+         <artifact name="builder-9.3.1.pom">
+            <sha512 value="ee3bc92d8de8f19a3f7523df1db8feb37687b8c679e6528469b643bda4edeaf1264c4a5125a0b2e9a56947175a6eac3f041f265ed09b636583762c4bf804fed6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="9.3.0">
-         <artifact name="builder-model-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="builder-model" version="9.3.1">
+         <artifact name="builder-model-9.3.1-javadoc.jar">
             <sha512 value="fa699a2e5957bb1a04b14210533112d3b60eff4a6e6e5d6bad5eb47f098f417456667dec7fe8bd13f8f4a5091895eb4ee84aea1d662301228979e91873e5a7ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.3.0-sources.jar">
-            <sha512 value="cc71e8a8d2e403cb90a3d881105648394257aa8a0ec0ee61dbec428e1bd4dfcaeb26523a8558cbd200dab920494d7355d1bd205a77edc8acfbf01f607007d65e" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.1-sources.jar">
+            <sha512 value="ad6b3485f9364889c5d3dc92f7930267fb4e9310330c5e12db13c0acb92115e83524cfa067ce88cf1e0f2a7741317a02a615487e5c95c7178d16ade19582b29c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.3.0.jar">
-            <sha512 value="2e56de8a6ac7ec5a382e7942b9bc4c20627848b005131269819ee07bbd3477878d7f88ba72a9799418744b2795eaace858d16f1de54ed1d7c1ddf4ec0bc38d5a" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.1.jar">
+            <sha512 value="2dc49a607ea14de5dae646328235c0bac967f8d09186773860070f73ebcd73a024d8a79d65f73689075eb5e7e2f60fe7c9abcc059aed75d668f80910f2303136" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.3.0.module">
-            <sha512 value="150861335714c4ffdf2e75f191212d049acb5c8bcf5af74b0e0658a946be18fef5194a406fdc07cc24dc34afd0164308e8dbf325a8eca0a55977e5cc8e445509" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.1.module">
+            <sha512 value="322c57f3d76f4379ea053282ce348778e17e182c4a51cc85486e262b670603e42b9640cc7051d80065defe5c4dc7a137fd5369deda626e24f22482e5fb159dbd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-9.3.0.pom">
-            <sha512 value="7e8b94e210eb578dfde104625791cf9309266348aebb3e167786e07846e8306d90c86c006d0422fa8eac2774817378433d0ce9597d10303ff9cd04f40b6d43bc" origin="Generated by Gradle"/>
+         <artifact name="builder-model-9.3.1.pom">
+            <sha512 value="10c31b0d1868936f0d38959416634aaf120c53fb2b93f8cc3c55de58e60665e02f24326b3ec454fd6be1d591cb9404de326e3fe1e62229001b94d19f2638b94f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="9.3.0">
-         <artifact name="builder-test-api-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="builder-test-api" version="9.3.1">
+         <artifact name="builder-test-api-9.3.1-javadoc.jar">
             <sha512 value="54336e3d9c229e98180c264e0dde2b3ba6be8d4072194db3d7e3ec0b518e30db6ce5772411d3fc73ec79bc18df0f930c0b3b92eb90b1c1a351a2d34fa474f7e9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.3.0-sources.jar">
+         <artifact name="builder-test-api-9.3.1-sources.jar">
             <sha512 value="56d26267138e4f53579caa948ad64a02d6dfc206832a6ff952d436d16d141f706d53978d286fb50b29a3803a9054b89038953c30aea71c24c263b01b8237c34c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.3.0.jar">
+         <artifact name="builder-test-api-9.3.1.jar">
             <sha512 value="72e7b7fe0795e5c9f003698c0fe03c837258c93e0029a569d25dadfdbce9aee25a7863ed5bef74dcf854ca8b9f7f895aceb85b51abaaa4659227ee20706b7866" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.3.0.module">
-            <sha512 value="7b2d38f6a12defac74c8cd605980809d1c96ae7bdb1207de8639b61a2e08d569f2353054b1d549e521a5301a49d89fc5ab7d7b0f27315e3c45096f6d6a684800" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.1.module">
+            <sha512 value="eb41c5088542e9e047bdea48d9936b49a518514ad2a46b31cfbc3ab30b68ed1291e852ebc63841118b939d1979d97f238ec5becc1f239e49149a3957cd361fac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-9.3.0.pom">
-            <sha512 value="a1ed20ae9b98dd6d44472c1d715b1aa1e333097baf2bacbcf006def59723baeede0ce846bfd8e7744a5f11b0138104f7a1d538be25dfce2eb54e023d99ad7b7a" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-9.3.1.pom">
+            <sha512 value="93cccefe5434be6bf7634456e1d39821bbd8d6d31a655499f6e1f80be6a340de48374d4aa37fc129745a835442a254281eba6f9073408e5c55526c37f6c5befd" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="bundletool" version="1.18.3">
@@ -2220,89 +2220,89 @@
             <sha512 value="30a1d39559319505d65dc7427c0bdeb60f8c464e761af9cfa26cc0a2a41b86c4e0479f813a98bf8313959b25b6b57e47c0a28e4bde4d5b7035d13871b3f4ee43" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="9.3.0">
-         <artifact name="gradle-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle" version="9.3.1">
+         <artifact name="gradle-9.3.1-javadoc.jar">
             <sha512 value="0976aea3e5c4135b5daeb668f5c52c7a6a4bdc6dd3b57c0f32eb1c9def51a7091bdd85119c62c83ed1bce0b58101cc42e982aa0390a049b18597c8a97c2ab5da" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.3.0-sources.jar">
-            <sha512 value="fc9014a759b14ae5be0f3a36c09caeaa607349b1a3433a31c02b58762fe302d979cd0f1be25b024ace1bdf363cb231f2d3b2d8eb2d309353cf6da4891d5b97cc" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.1-sources.jar">
+            <sha512 value="096ef4b3713f44f41d4c37f3731341ced2ca08034dd7d46f84a7c455a2ebcb8a977afc9c6ed5cbb5e0db7f792e3a409ddd90c3f0046c57d0fda1def755b5051c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.3.0.jar">
-            <sha512 value="437aa9b3db2c1606dbf50b817e4a763290a30a31cc93471b41d25dcf81944fd8d9b374b586112035262d6bc1677bbb954c5ee9e1cfdcbe161caddf21b2fd1781" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.1.jar">
+            <sha512 value="13d9c598f2f446fbbb305af58ee7c3ee13df69ef4a5a1eadfc792bed2964f470da9c76f83847e92eac5ddf2fa9495cd3e41f54c168232a6f92fff6530e581f03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.3.0.module">
-            <sha512 value="88cec9c87891363655c9e3e9cb52aba57cf5cbbc8c349cf156e4f527d3fe1aa56d041ad1c1eb095021f730af9af7b6f1d83117d4cede63a07e705f78d14ed9b9" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.1.module">
+            <sha512 value="fb9e4978b16eaf29d46a306a2c0460f120264b606700788103a49aced6fe8d89675e3a751c9a55fa636fbf3715e03206868a665d6dd561eef6519d7e205cc5b0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-9.3.0.pom">
-            <sha512 value="37a657e676775686f103ca20cf0400b6c185e04ea8860e66e2f844590de515d854b868257577276fbc817cd66b20ba708da9f984ab80e99e950e64416567d276" origin="Generated by Gradle"/>
+         <artifact name="gradle-9.3.1.pom">
+            <sha512 value="83a0ee20708576b109c92e15349cf076f9c1a74bd76d3c7087415a2e1f4ac799692d2c9df6830b3f52563da8a0dc667be0da1298d523f1fc7541075ed385828a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="9.3.0">
-         <artifact name="gradle-api-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-api" version="9.3.1">
+         <artifact name="gradle-api-9.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.3.0-sources.jar">
+         <artifact name="gradle-api-9.3.1-sources.jar">
             <sha512 value="a997f0b5988bd2e9d1da89eab0612924fa306ed20b8a9e0ac3cbeef778f6bf7b58015816de3b5a3aaf2d594b76f0c06dfd7f19f6f48b8796d59f8a502864018b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.3.0.jar">
-            <sha512 value="2ace87d9f1a7de72f3d0cda926fc9dcd3d479570e2add0e178ffb012dea463015b8ed2ec50558fc045773defde6c75c63a9348aed0a94a3d8df352900cd662a5" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.1.jar">
+            <sha512 value="d34f00f9f740f2137c3ed937dcfcc3850836c67f472c9896cd2c75e31ac31f3aec013dd213d9487a0f11399448aa40acaba2ede8624279f77e92c3b8e3750b14" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.3.0.module">
-            <sha512 value="6171c434f8b5af248f74eab674d5f4c04846a0cc85de5ade75b8bcf724b1721c5ebf022009069533138e478593edb83357ceb96809c294cf3f9ac2cc0eda95d6" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.1.module">
+            <sha512 value="16f9911de67323780210f80a90a01a52a1c99528ecfdcb68f7a2a99edb665b2fef9704bbd398df0bac94a1bfd3f5aa3f647b3d7ae13c22255f45806a04c66bb4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-9.3.0.pom">
-            <sha512 value="542e7d58ab51080418c0c59aaa4b1383581da25f2081cf223d10392c56effc4b8fb9d07ac415a963c79f8b0491de82c6d83214c47ed3d8ef7be11d1a07cdd08d" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-9.3.1.pom">
+            <sha512 value="0704f55193d54a1a3d11069b43beba0d1cd547c8b17cd4ae7e6fc169cbf6b4e6cc244813a4f0ec73d7f97eaba333bdef56d28092570c11f6ec0fa5750bcb8976" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-common-api" version="9.3.0">
-         <artifact name="gradle-common-api-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-common-api" version="9.3.1">
+         <artifact name="gradle-common-api-9.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.3.0-sources.jar">
+         <artifact name="gradle-common-api-9.3.1-sources.jar">
             <sha512 value="3641940207f1479f9000e278cb2c1b19c1ced8cb981dff11d14f3ef9a24fde9fd07938444fc36fcbeffc86c26fe11a769832b031dbc0839dc1fade891ea26f0f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.3.0.jar">
+         <artifact name="gradle-common-api-9.3.1.jar">
             <sha512 value="dd6a44c7946544932d5474a90b32fa595862179138308ba3c90dc675d168ce5c6422bda6e7cc167090a5a94878027230ceab1391e6d7a6d887b4cef233452130" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.3.0.module">
-            <sha512 value="ec8e2938a693b8db64d3117ae4cc1d0b44031a02e34bbe1ce4e9d463f158f5f58d440bf148a02b85ef7d553a4df0c9d5ef29be63daee0ea7a350b94fbea94c88" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.1.module">
+            <sha512 value="8c4f648d7395db0deb87183a98feea42a732dbb047d596493d24ce247baee4b5f44303750d36c85f9991eb56fbae942a6874fabc87b786a1942994950c88bdf2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-common-api-9.3.0.pom">
-            <sha512 value="e2cc87a2edbd3ce97ff991b500beb4ceb7e7090f4be295cb8d0fc188dd14456e14719f5bc84c741f4e4907586379b4bcd95034469a206332c03afc0499ef5ee9" origin="Generated by Gradle"/>
+         <artifact name="gradle-common-api-9.3.1.pom">
+            <sha512 value="40fb2d9f5ddbeeeef1154f64dba16d61c79b9fc276d51df90573ad041608cebe734ea5037f1d00be67dc7ca18e1081db5d66289d9dd66219a5f78bf58b28bb97" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="9.3.0">
-         <artifact name="gradle-settings-api-9.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="gradle-settings-api" version="9.3.1">
+         <artifact name="gradle-settings-api-9.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.3.0-sources.jar">
+         <artifact name="gradle-settings-api-9.3.1-sources.jar">
             <sha512 value="dffc0369b9febee07283f2c6b3f32624a1868dac6930f3fc3bb58ce980cfd62f39815891be6ad491c92dd4d0e3b8c2c27b33bd568ec29ed46011d377c55dae03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.3.0.jar">
+         <artifact name="gradle-settings-api-9.3.1.jar">
             <sha512 value="b0ad64bd1f97d0e5c3af6ea5177f17335026f4dd899fdb707d1682a3517897f66e91786e32a9f4e47907a671cb42ab09e9764afc35d29bc979178674303f42ac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.3.0.module">
-            <sha512 value="b29254708e9a87f36b9bd8a91f5dbbab0d132767b4847b46aff0ae1de44748796ac6be2056f0c9a075d1481439948ae54ce6a8ca944711906965f90084128040" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.1.module">
+            <sha512 value="e458c3763bfb2226484b5ba4606c34d436a9e1efcffbf2b7667c5ee4f99d8b91906e83d0fdcf9f404088a10aea94e6154ed80b4352b1466bbb3bf472f615f8e0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-9.3.0.pom">
-            <sha512 value="da4ecb652c03314a74dd0aa97cd73a83758ebf71dde2b46cca199349b898a18be51aec008ec9c857d9dd78a4aab32b82647cc196a4d0e3129ddd57a4529b4268" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-9.3.1.pom">
+            <sha512 value="214a751d0567bb382665e9183a54903d24b89951b41d22b863c12fc5560db5ec86216da5ff0cdf7008db2ab3239b4462e6860c58bf4ceef16046aa7a24a822fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="32.3.0">
-         <artifact name="manifest-merger-32.3.0-javadoc.jar">
+      <component group="com.android.tools.build" name="manifest-merger" version="32.3.1">
+         <artifact name="manifest-merger-32.3.1-javadoc.jar">
             <sha512 value="5a3d9ae02ca2c2f79d6d8fde43330e37e6f91c5a77332d76926644c39229068628a2f13d3e51a12d9faf7cd3dc8f1d5be783f01aff3ee5b710da1cae71b1022f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.3.0-sources.jar">
+         <artifact name="manifest-merger-32.3.1-sources.jar">
             <sha512 value="d7406c7b07c9abd37091ce83f46b0e17f177241a49d1ca2f55c63730e6e19c0ab43b1e35da210b1f6282ff50bf1cc1fa3d3812a064d30a91657bad4d054a5617" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.3.0.jar">
+         <artifact name="manifest-merger-32.3.1.jar">
             <sha512 value="14976ab8dbec640590cd5b06ef606c31c6ed224ece48ef361d33e21c20fa1df06aa30d9a2d072597ded3a4e4443ea1c972f9b43a0a90c47cba2193f540a88cda" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.3.0.module">
-            <sha512 value="4e2fab2c1ea964c65164f6f473509cbeca88c3bc2004c4e48d6fc2f13d5823b6347e4b9516cc32ff10aa13f145e137e45dcd9b82325a5b170e9a3d122015083b" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.1.module">
+            <sha512 value="44fa40d2481fe597ec5c4d083be99331d48b003ef22694dc43392fa0df55e317a73a78001b7fb955530bbf5f966b7cd5142f9526cc32ecf4fb309b2e3bd841b5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-32.3.0.pom">
-            <sha512 value="027948a14f64323303b19093d3084215abe8db571c5a7e5629e1b199eab1af76dcb2b7af33d487f3352bee5f2eb1700e3b248a4b1d191408cfbad9d4c84a34c2" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-32.3.1.pom">
+            <sha512 value="50c320142fe2b3d3e204ebb07a4aa53412c1d620100849a29b1610b1cff03a2a32d98ddb64d6e1f00352de30ebf1cbfade69d98aabb4635cb48cb6a8e82096d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build.jetifier" name="jetifier-core" version="1.0.0-beta10">
@@ -2333,411 +2333,411 @@
             <sha512 value="7969cb4ccc5c767cb17af91911d6169a43017b2f352ee4bf02de25abcd882a4617386916d2218dae52769e02a38704616ace9f1f5b34fa5ff6f48142f9fa00ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="32.3.0">
-         <artifact name="ddmlib-32.3.0-sources.jar">
+      <component group="com.android.tools.ddms" name="ddmlib" version="32.3.1">
+         <artifact name="ddmlib-32.3.1-sources.jar">
             <sha512 value="7596aeb2d184a55d209c9eddbc8311e78426e78cd4e25cb2624c1d136e9d34f983157f9ce04618de1a89ce7925d547b1acc5b1a13e2f650d935ce8fe72e5e9aa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ddmlib-32.3.0.jar">
+         <artifact name="ddmlib-32.3.1.jar">
             <sha512 value="d7e36fb5beddbc6be39dfbe7d8dcd672c6ecbfde25d0273306aed8289bc49603220b49060476b877a9dab612f96e97a775691a9d4ff62538706f8e64d6aa9876" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ddmlib-32.3.0.pom">
-            <sha512 value="797d82ee671edb34ad1ca280da1d89aba08e7a7b465e109b5e4b7fc7bd0ed8e4ef9ad5c720c926d2b00b185eabc8f30c9e2c968787ca2f149da2a4d0bd2e77ec" origin="Generated by Gradle"/>
+         <artifact name="ddmlib-32.3.1.pom">
+            <sha512 value="4f1502db04e2bcd979f69d9817a8b4ba6118e16fbeb6e2f66a0585b2620844fbc6d443a364c768f9349e2c0dcb8b48fed7d1ce7baf6014965bc25ae2607fca3a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.emulator" name="proto" version="32.3.0">
-         <artifact name="proto-32.3.0-sources.jar">
+      <component group="com.android.tools.emulator" name="proto" version="32.3.1">
+         <artifact name="proto-32.3.1-sources.jar">
             <sha512 value="10365c080ba5aa35b5b6aee5fe3f759550372b51d6a1e9efbf8fcb5a91e2290f3f72b427ef4936f65dc5285cc0adb728fa4284e2f3fb1f183a5862381e1e5267" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="proto-32.3.0.jar">
+         <artifact name="proto-32.3.1.jar">
             <sha512 value="5a34fed7ecc4ad1dd7bc3b40b6bfed3ba161d56c983be6857205d405914648bd1ee165bd11b5a767d62b9c5b726289d9e91a0b302a5f0fd5ca02de7497784ff8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="proto-32.3.0.pom">
-            <sha512 value="c343d21f58872870ec7f7f7172d20e61405a9cdd72148dc12ef16648d9ce62ade19c32c6bec100553265ba986f647786fef277d554f45b785290e48a699b3036" origin="Generated by Gradle"/>
+         <artifact name="proto-32.3.1.pom">
+            <sha512 value="f8913d62c3ebac1200580fdfa978fcd7471c08f01bab740ada222f614a8af21b1b0ae51e616e189baa5b0110c48267a9ec1e24e99d7edcd6f190881dec98d3f6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="32.3.0">
-         <artifact name="intellij-core-32.3.0-sources.jar">
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="32.3.1">
+         <artifact name="intellij-core-32.3.1-sources.jar">
             <sha512 value="3743647a2e8eb1c641833ae2e25afc90580a1c9e510d683aa6c3330b66ce4b5fb9fd2fffb579fec9378e7bf6f883a99fd8ca2da6ec93c4ea28d651971967bbda" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="intellij-core-32.3.0.jar">
+         <artifact name="intellij-core-32.3.1.jar">
             <sha512 value="c9653cfe455276ed4064e1882ecff7d5c8edd765e6811fb1dba14243118c10f62aca728c415cfbed86515f85c9a7c532dd5bae14f20336bed82915cb514d9f0c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="intellij-core-32.3.0.pom">
-            <sha512 value="ff7b7de3c8b8549b1dad08b458581f7623dc03d4716cb51f4de1005a4ac8572d61279b5746dce92254361542d8e7a096a21130060f087f01ae37fabaed5e1c93" origin="Generated by Gradle"/>
+         <artifact name="intellij-core-32.3.1.pom">
+            <sha512 value="56bd1c0d8db7332808fdf65a501b52a3a619241451f6bc59156e88176e0ab5ef787dbd16473ade1e4c9d2e47439d7a21d98ecdd7466915b8a058109f17baca72" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="32.3.0">
-         <artifact name="kotlin-compiler-32.3.0-sources.jar">
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="32.3.1">
+         <artifact name="kotlin-compiler-32.3.1-sources.jar">
             <sha512 value="e5b6bf208616c0dc817efb5cfe3fc97e0384be518a0143f855a3e38b2ab71fefa7ea28978e6d90dfa12ad79cfa42716088513316b24a72721d1dd153a86663d2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-32.3.0.jar">
+         <artifact name="kotlin-compiler-32.3.1.jar">
             <sha512 value="cbb781ef7412936cebcf8079b08ea392b95bf552d6190c3f75b4f46f564b19a5ebadc05da7424edd29e56503952fe46216a37a31b488ecac8d0de5fcae245499" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-compiler-32.3.0.pom">
-            <sha512 value="bdae6bdf037e69f35f2f298364eaead78fc9de6828eab9e5c68dcc7e2b34b9f57745bc3609b3b31c95ea0e60895aab39f3ba54eabac0068da548de26362ad414" origin="Generated by Gradle"/>
+         <artifact name="kotlin-compiler-32.3.1.pom">
+            <sha512 value="23956eafcf01838f7b702f05c98c3f0456da5b6c1c5bf5b2881672e6a3d6943d6a941b240938851ad5e8cb20acd610279cd65831a370b2a5e5223fbbcd7f3e71" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="32.3.0">
-         <artifact name="uast-32.3.0-sources.jar">
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="32.3.1">
+         <artifact name="uast-32.3.1-sources.jar">
             <sha512 value="b1a8b3b25f6367e1ee299a9f91c2b286aebd09d9ac2d627a2ff3e36ad27e037891d1e6b8e3a3cb5584951f0dc5a74c5d80dc47f5c387f9a07ee7b6c08ad3cc03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uast-32.3.0.jar">
+         <artifact name="uast-32.3.1.jar">
             <sha512 value="6e1f6c6b3db2af2ebe17500e84d3393826240a321f301734c1c7f8d07070f2245a22fee69d9de6f04d45f780abd63fdd5b41838e5617e33b8a6b2a5ec3fda3f6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uast-32.3.0.pom">
-            <sha512 value="884df785dd977d9807972fb372d8a7e0941b7229762180229c869ea49935bf8e6a579701ed679caf3e51304c881b77e51ff0f6e2214868381162cc38738535ea" origin="Generated by Gradle"/>
+         <artifact name="uast-32.3.1.pom">
+            <sha512 value="6abe6a7f96e0dfd9c5ec9d20716c943568fa0da377fa7178bb4b4bfe298b589a98b0288d5cf85e3417d3dae361aae3576394e5366805b3651b92bfd1c3a621da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="32.3.0">
-         <artifact name="layoutlib-api-32.3.0-sources.jar">
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="32.3.1">
+         <artifact name="layoutlib-api-32.3.1-sources.jar">
             <sha512 value="492ab14b4793c13ba2fd2033a7f5942b4c48493a6952eb141c2823aee445ae328d03f6fc428b0a1a0d867434ec624c8d14b21ab3b8e0416020f5c295ef112f11" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="layoutlib-api-32.3.0.jar">
+         <artifact name="layoutlib-api-32.3.1.jar">
             <sha512 value="1e6cc95d9ce6fd3c9f32ad499d5bcfeb1f61ce4319358a582f5dd9e9a2ee6e2bf8f4bafb6de4a7319e58f3ce51c9e5a9c1cc80ce70f84d0b390af947ee505c39" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="layoutlib-api-32.3.0.pom">
-            <sha512 value="292a726fde1a8e4f6a4f50a71e13bfc4f8bcad922c269b9aaece56e8fa58d93021e0b7f086ec4e9bdf3b10a09cf938b502fb3c41e3faac012bbe21f5c7513748" origin="Generated by Gradle"/>
+         <artifact name="layoutlib-api-32.3.1.pom">
+            <sha512 value="8927f2802a68d056ade768b5850a98129ca28129497de464d5a5f7f4b8b5b86c3736d56be26e6569d70830a4fe7208d354446f0121de4668659763ec273f044c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="32.3.0">
-         <artifact name="lint-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint" version="32.3.1">
+         <artifact name="lint-32.3.1-sources.jar">
             <sha512 value="fa073bbd3908b35ab448fc192cc44c81f7b2c74242f1e5204aaed232a28fb79ded8f2d9c55856cb8318885c67e6786155a58425c809b810bb9c5f59aa3e537ed" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-32.3.0.jar">
+         <artifact name="lint-32.3.1.jar">
             <sha512 value="7ca98f820299ae4746856b440bd51753c15b8c2edccbd8ede47456a55e7233f54eaeb5ed5be70ceab588a9c181a35e92b82fd5383179273431e4ec1b61016cc3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-32.3.0.pom">
-            <sha512 value="ddb5e8dd4eb754d35d3a98d6a3252228de31975dd11d50f05916414e2c98a832bb58dcbfbff980436a8e3bda64685ffb584337fbdf11d30dbceaf3ec4611ccdb" origin="Generated by Gradle"/>
+         <artifact name="lint-32.3.1.pom">
+            <sha512 value="70711e20504dc3f5f64bc280bf35caaead7c35a4a4d7d605a2fc5465568191e7ec2176938876ff10764550568c8f2508a984a5a8e93946121e49039d3e69dfed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="32.3.0">
-         <artifact name="lint-api-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint-api" version="32.3.1">
+         <artifact name="lint-api-32.3.1-sources.jar">
             <sha512 value="f7dd26e03f12d23819316ddedb95f3e281833f4d5368f3a990a3b01bbe60cc21db7413e773a896fd72c933f09763c5ae326865f59c1b868c3755b1c2985c1cd4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-api-32.3.0.jar">
+         <artifact name="lint-api-32.3.1.jar">
             <sha512 value="19c6f951989d6ba01a49ab5325a4b424e332a5dd4e4067f829b292fe252c2837cd226931296a1a9608cc6e5b6b556d0cb2c9cf6d4ba4f4889232e57a23ee184c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-api-32.3.0.pom">
-            <sha512 value="7c80d13de7854ad174d4abae047d86210e4c18cb28eebe80c57a46bc57213cef893cbeb0243c9c87849c75223f17e0581581c4f526843fadd0316a6506c47101" origin="Generated by Gradle"/>
+         <artifact name="lint-api-32.3.1.pom">
+            <sha512 value="a8467c5db233fce9caa8bc8660d7147ad4c4fa2d3cc3c84039cb21415df9c85837fe9caa0e2d7da7418c011ca2e3cfee3c6b9f1fd174412b0889d15fbc28da28" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="32.3.0">
-         <artifact name="lint-checks-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint-checks" version="32.3.1">
+         <artifact name="lint-checks-32.3.1-sources.jar">
             <sha512 value="9dd0ee9826e797802ddbe8bb5d0d595d6e3d7bbc8dfbc51d2598a6168a7bd80547e0eb12e435a1b9b49fcfeb67c5f12fb447edd90ab9e310b3d1f8c3e4651949" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-checks-32.3.0.jar">
+         <artifact name="lint-checks-32.3.1.jar">
             <sha512 value="f6af1c0e8a9e69d7b3fff1591fef713550f39aab7670725dd2e4423afd3f453b5d88b2b0dcc70239f18f1265e9e3c96beba92c696fe4ea543b161b0f965aae8e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-checks-32.3.0.pom">
-            <sha512 value="808490b96209ebab9c3cfe26be16eb176c3effaabbbdd0430d4475cc4499450cfbe94525e35c036f7d23e98c04cff780458b0b3c3f2a64d196121881b639cfbe" origin="Generated by Gradle"/>
+         <artifact name="lint-checks-32.3.1.pom">
+            <sha512 value="c101cc75f106dad4956003b21666bb2fde7de9db2a39bfb4c8e0577e640d18f646575e3c1adb1939af33283769f607329f5e5cfd13e736727a04aefbeb6252fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="32.3.0">
-         <artifact name="lint-gradle-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint-gradle" version="32.3.1">
+         <artifact name="lint-gradle-32.3.1-sources.jar">
             <sha512 value="9823dff56bb54b4bea6e886e49a84d24ed85e057962eb1e1c12aae522c674f3352d3699e783610be6601eda634ce73888f0f4eb0ef950968fd58a88a984d3331" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-gradle-32.3.0.jar">
+         <artifact name="lint-gradle-32.3.1.jar">
             <sha512 value="b72cb5501190c57b8d2ae0005e11df0556eaac26ce9d5f89fd5308fb12e912a629283509f20854652d98bfc53fe12f6f3eeb96f97726d1caa5097b6436d75a14" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-gradle-32.3.0.pom">
-            <sha512 value="6ebf504c73f83dff99124e6011bfa6ee081957916b4a439cedd5bf7a5c86c306be6c49f0213d22b7fcd41ca09dc48d57d41dc4171fc33e486ca4e8854b19793f" origin="Generated by Gradle"/>
+         <artifact name="lint-gradle-32.3.1.pom">
+            <sha512 value="f4f511518964b892909edc74aebc8a5e23e87a97d9845b7db4432796239cd1a34974e49528c405dcfc65e9c35aeda4d542481cf7b40d98f98b1fb626e0d0ade1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="32.3.0">
-         <artifact name="lint-model-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint-model" version="32.3.1">
+         <artifact name="lint-model-32.3.1-sources.jar">
             <sha512 value="3b25168d263557c29bed401a84ad85c0edf71450c1cbc61dda42b7da8cd5097689a8ea9e4aa6c0ae68a9f10e04e289a0b243b2a53f822413b06e00bc20504343" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-model-32.3.0.jar">
+         <artifact name="lint-model-32.3.1.jar">
             <sha512 value="7219de486c75ec6a57b7b338c3f96911e8521312f5292b34624e8db05c82b0558be1a10a39bf85774078b2ae10787ed63deb63c271570369529dd562a68fb230" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-model-32.3.0.pom">
-            <sha512 value="45fe817dd9aff5a9a84ca550ec1a0e9809ab13a484183fa8d144f4a584cdc244642058cf0641a5981ebeb9a55072e37eac1927405f6a334413674ebecf06c160" origin="Generated by Gradle"/>
+         <artifact name="lint-model-32.3.1.pom">
+            <sha512 value="b7e15eef86e6665b1c0266f9eff57a332bcb4316a031f90c15f1fe1c2c3e67a4ea361052997be8c280d117247b3b92961419fb8fae08d08934aa7e195ab332c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="32.3.0">
-         <artifact name="lint-typedef-remover-32.3.0-sources.jar">
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="32.3.1">
+         <artifact name="lint-typedef-remover-32.3.1-sources.jar">
             <sha512 value="5a924443347672f75e09b1f9658a89279c22577ca25a3ed2d94983865d6820463b80718f289a346650094edead02bc93e22d8585bc8534450004d788da630088" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-typedef-remover-32.3.0.jar">
+         <artifact name="lint-typedef-remover-32.3.1.jar">
             <sha512 value="64bff95763f13bd351038f570b5f6e1905386a0fcb63901f6c887b13a129f250387c2c7c325067e1b8b05f3ea569ce1e0cc8009a03b90e9a680228a10d54d866" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="lint-typedef-remover-32.3.0.pom">
-            <sha512 value="74d730dbc59979675ba57ca74f8b36e172b16dae19fc663d9e2c83bc6ae1544950c361d5280e0b2bf0e135742b29df5e2cbf0a5d9e5b416e41dc05dad8afee81" origin="Generated by Gradle"/>
+         <artifact name="lint-typedef-remover-32.3.1.pom">
+            <sha512 value="4e37ac9aa5c712fa393da870e37d2639dc96925b701b51c27fb37aa343ef87887dda52b9cea4ff67e581a673ea41ef27d5944b8cb29a52aab2d43e4905787542" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="32.3.0">
-         <artifact name="android-device-provider-ddmlib-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="32.3.1">
+         <artifact name="android-device-provider-ddmlib-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.3.0-sources.jar">
+         <artifact name="android-device-provider-ddmlib-32.3.1-sources.jar">
             <sha512 value="84c6bce169be168c2c8ad2e2ea67410bac6fd60392d02e788915e8ff5bd87cb1e5ea01529f818103179ab091bee214d418ac952d6c7f5ca0c077b250da4b9a6d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.3.0.jar">
+         <artifact name="android-device-provider-ddmlib-32.3.1.jar">
             <sha512 value="1ceef9c029f885b500edbc2431e4a7c8dd52d49b1165b8ea67f3b8035664b14afcd0b2c94d67dedda5574f790c66089a583149b74bac6018ca0cb35c7450e8c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.3.0.module">
-            <sha512 value="5ee9e629100783e855815897791227ba272c3ffb21adcede1fe8f82b0e096a8f1cd7d1c6959cdc5a31810141f377f301dba65e972592937ac4d38f296af48751" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.1.module">
+            <sha512 value="2da3785bd83d8947741e8ab132fc5c0a9e9acece645e7469c6ed4a80da48b0cf2babf3c6e30fa0b6a902a9146f170a229c0f35521cc07f31eb96d21e8cef15d9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-32.3.0.pom">
-            <sha512 value="34eeac212acf611cb84c9ffa645f0b62e95711453915ba626fcad0ff33682dc203787b86c891950f3fcd28fc4faf2194e4af0ba011c192e824c3b505a1cc821c" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-32.3.1.pom">
+            <sha512 value="40c84403ae1f891565478bca9f5a8b63769fe0335c6ea68d55f7dc67b1e8f89ad4cff9387ac3d575153c62af701fb67db45fc0a631ee7c639b90ededcbee471a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="32.3.0">
-         <artifact name="android-device-provider-ddmlib-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="32.3.1">
+         <artifact name="android-device-provider-ddmlib-proto-32.3.1-sources.jar">
             <sha512 value="3dd7098062303ee1064682fd7586156abaea170ec197dc0b9b609a5a06312459a4f3219562520160c250c6bc4a0eec4b7b7fb891cc4382df6c731fdb6595760e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-proto-32.3.0.jar">
+         <artifact name="android-device-provider-ddmlib-proto-32.3.1.jar">
             <sha512 value="32b7b4a0cc52c10643bcd4f6ca718bc60b3b300ad255a691f71f28d3f52054deb3808eaa4dd8366fd113ec1252344b5a07ec8ce59793b7a6101daffceb0e26e5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-proto-32.3.0.pom">
-            <sha512 value="cf02094df5f671e4691f0db95185b0ac34fa30f0d7f7f3b898a4251e49ed69cb09c2a9066cf47fb8db069ae8bd14a2970c410d9bd9a3127a6248058d328798e8" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-proto-32.3.1.pom">
+            <sha512 value="6c035238bcb96595b4725951428f2f8b185efe5b4f5dac119e1bed6b488aa38e0dacdb30229df8a27e8cb4120c7152bf24b6fbe28802eedc04da060013efb561" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="32.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="32.3.1">
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.1-sources.jar">
             <sha512 value="1536bf14e99ce5a425dacb72ad937981c2e7194f33471633e4842f20fcb4878a62bb744a94269def50f13269253bd228cc8653e9eacf982b5d3ac04d34feb0d3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.jar">
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.1.jar">
             <sha512 value="4f8491f061bb391aa8f89331bdb1de03ca7081d86887d65ba724dde2af839eaf50b0f61828ce3f35962f39d29e1953d1f52f6d99f4713575fbc9849e01dc4af8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.module">
-            <sha512 value="e1cbd5410e2cb75a8e8a0ec6fdb7e66150e5b78d53b1fdae67b749a20b741c0f69a1468542e39ae5349a961185579921632e3abe3abf5c64e7a1f2a6e38ca5ad" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.1.module">
+            <sha512 value="945b3047410d728e579242e93a095dd362a803945606886aef1cd8ec0e5b7fb192736090b77cabc9a05a9dbbd636c87d2c20ddf3dd5c872e6418f89d93fe0240" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-32.3.0.pom">
-            <sha512 value="a4b6b04214687546d4972fedf892ae8b1d721cb5bab026f8f161f7421c2370ffb768190c0ac86a4fe545d7f833bd9284e2a40797a872c0e4837ca20ab308f02b" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-32.3.1.pom">
+            <sha512 value="5188dae5d83ad8be7963ec094bddfc2f856273f2d322143089a87ef5c81d2beac94303e3f66e475d24c85c984282c5fe60dded517a0cd1b83138de71090c01a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.1-sources.jar">
             <sha512 value="e956e293a8664fbc5ae7c4192ae3a04532c8caa944f7aca91e79fcdf536a2d9e5deb534e70f5c922025f5ca898664af5aa0a47cd9275a227fb2c95aa7ea7f42e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.1.jar">
             <sha512 value="a54f9ffa72a2e97f432fae8493cebe8f7a954da663cc4b2c150a6f9cb90c80b6220f77b45998d636a651791321cf9d72a1c798197896a9ab48b606145505d8de" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.0.pom">
-            <sha512 value="3795e450ea67162f6b7601be0e88316d53e3b1ec894c72a4d3bee8d98b6773842316cba68527a8067c55c597d60c29b16b2db0accdeaf41e0006f04a4ef7ffe3" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-proto-32.3.1.pom">
+            <sha512 value="a4b4643788fda164031d8540946a7b444c5df1744b64231eabb14c356f163c5acac39560cba3896be91a2fd8065dab7f3417c16a83c46fc3b6da1d180624196b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="32.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="32.3.1">
+         <artifact name="android-test-plugin-host-apk-installer-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-apk-installer-32.3.1-sources.jar">
             <sha512 value="c055671fe38ac9fabf90852a09e55fa468364bbd717d5552d39deb00ff61c8c563eed0d5916dde6d809e435ada22e8995b9bb4212ac2404da8200103ee7b60b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.3.0.jar">
+         <artifact name="android-test-plugin-host-apk-installer-32.3.1.jar">
             <sha512 value="35a021c1b083f99139529cd10e39799db46de5e60f0fcb0adce2bb8def5e362d946ff1533de32cffdb5825cfde108b826b5ef3a638b3dd07954de741241c68fe" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.3.0.module">
-            <sha512 value="207f285ffcf2d255b72ff651cff1a6ccd6eb629ea5dd19115305d7f7efadc591175077ba2b4bc353938f4137d6b6fc65bfb9d0c78fc2f04e79da0ef1958f0e80" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.1.module">
+            <sha512 value="d0bb49e6951242c9e3ac2cce9b9066bc133b5635fd5ea6a597bb08bef1dac806ddec050364cb518e96d5a6499f477720a5cbd3cb948fda0e26bfbbefff6eb185" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-32.3.0.pom">
-            <sha512 value="79a01efe329ece969d2b74e01d4e21218fc273a1e7f38b89ae5344544698b94dc010201dff3ec0f0c694ef1cd25df4a6e50e16c995d69a4f755b0b32d3189b28" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-32.3.1.pom">
+            <sha512 value="83097be9199b88c62c3709d979b40df47134668d33186f8c18faf8dd1bc12c7d0468692e5d2220c86a9a78727ac93012d3113d6b24096ca815b8024628198dd7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.1-sources.jar">
             <sha512 value="4afe1468a02266b513aa516b94f1f79ce1d119b6e53fb04b33c545c8b82a67ea6cb5fea41581af78dac021f6cf12490d7f7c32b2c7548747e7638496fab4dc24" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.1.jar">
             <sha512 value="2ce0439e54134812713fe08091b4c93ee858a9ac9344f1d67fbd7545079d8dcf11727382123a3e738c184b1237afed3496622e18b9fcbfe5cc6244b5c40392fb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.0.pom">
-            <sha512 value="1d863b84e34bbf4d1bc4a37180cb1404fdbe5b523c8de7d3851bf9b2af837cf2c1dc1971143325a68a9d9f79f9cbd688d4af972f8e740fdd9658bd58426c0566" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-proto-32.3.1.pom">
+            <sha512 value="b8d8f5625fd734a70c4e3b619e0d64e30192e084d3fb5b41c82d52e8cd1fd43c9609c8bb7a3fd3b138958df9058f050125311ddcf6c21c0e8b4f6c27269701d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="32.3.0">
-         <artifact name="android-test-plugin-host-coverage-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="32.3.1">
+         <artifact name="android-test-plugin-host-coverage-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-coverage-32.3.1-sources.jar">
             <sha512 value="a94fc1ff80c3d9b2913b4e937e423c604d4365f64a6733e52faf8125c348fd5297d814132ae374683b2fb0307a7d8e1bd609b3f7d95de4b6a96dd8263bae9efd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.3.0.jar">
+         <artifact name="android-test-plugin-host-coverage-32.3.1.jar">
             <sha512 value="bc10611fdf6fa02425fcdd626e668afa1f0076fc57b57636c01b8e7721c31375e42559f3bd6cd68147d74dca968a83fcd6161bdf24ad5367333213d7a2386827" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.3.0.module">
-            <sha512 value="003f242aec858d81a77b60c7a0553ce59b54c0c059483a4b859ceff03e88c07418d5d3efb20ce2a3e77bd3b8de6faa38d43f556e74d7650bdc52e42ce2f2f08d" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.1.module">
+            <sha512 value="3909c12c5e5c6d21ecbe39161c6ac7218babef2052cb4c13a0d339389743cbb204e0d54df910e13d40817cbb5dad31bdf1d8f1abf2ad09d8eb13b2e09add9944" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-32.3.0.pom">
-            <sha512 value="d8d41a0757d70deffdef6a7ea5f60c0cebce017601315c0fc7dc9cfa1b8dd84bd9dec806f9c7716a6c210a29584782b751c2c291c73b7e4fc0b6836c74e4c4cc" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-32.3.1.pom">
+            <sha512 value="1369bc3d40a2be79a1701441b24d203b126ab140e30245f3459aa2a08f077ce2d2fb03f1a4aa0f118748664aa55ad7ed7d75bfcee8855c7922d9c5c709dbe217" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-coverage-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.1-sources.jar">
             <sha512 value="9ff2e13ed602f60c79db10424cadf7f393ef799f456c06c784cb8f61a880181cc35ac949a778079d5d64efdad1b725994c268370369cbc00695fb01d6bd16638" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.1.jar">
             <sha512 value="749e0001d659e845b9490bcff1939514f06b86ce99456bc102df8d0864d50f5c2f122249cc2c454d5062d65611302a0da712c1535b413caf1c4516526b0bafcd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-proto-32.3.0.pom">
-            <sha512 value="8b77145c7b0fc0c050cb6feda298ee5187df50e40e56aa490d514a769a1a8461d7ca4b7a3ff7bc64c40bba85533679d869808c56ce9ad892219772f8d933021d" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-proto-32.3.1.pom">
+            <sha512 value="4614ec929fb6eeb61136dc4da7429b71331c2f00788d5a64d527cd3ffc6be79a3926ae2de842040d8329d9c539c80f00208f902eec7c814ed32a46f7a88a09c5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="32.3.0">
-         <artifact name="android-test-plugin-host-device-info-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="32.3.1">
+         <artifact name="android-test-plugin-host-device-info-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-device-info-32.3.1-sources.jar">
             <sha512 value="98781bf0507e5ccff7addbc218b9df8626dcc1b3052a9e2a2453f8e5642ac2be1f79bb16f1f7058a2750654fdb2f28ffcfc8484e92d62eaf3d1b637fdfa8f842" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.3.0.jar">
+         <artifact name="android-test-plugin-host-device-info-32.3.1.jar">
             <sha512 value="a4401141ab67157397ac5d92166abf4d12f1da8554aeb0b9317e24ba72ad82e3202b1e9d839f9e348d39ea1600659af033aa32a0785653d00d9a3022b2cf87ac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.3.0.module">
-            <sha512 value="07f00c1d702e17331a2486f564324429523c09036054e3e5b9b4b33de36393facd452f9eca19e29b5ba6539a986ad4fdd8da94ca8a2da45c1d680eccdd74eb89" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.1.module">
+            <sha512 value="8b7ea36d6a37d73828d488659bb4eb11653fd2a230fd6542646c6880acf8d2cf1ff1991361edcc9a3fead14d7ca8b37deeeb3f54f9e9eb37293fca278211a201" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-32.3.0.pom">
-            <sha512 value="41158dc650334fa8d12de1af82cd25e1e55fa557f1e2f791f242b9fcecba7493c2013ed39218b7b5d41d1031d2dd77a10dce921584be910a58dcc291910bd6f4" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-32.3.1.pom">
+            <sha512 value="facf31c50418091c8ea724e3247c37e1d532a85f0c74b25184f4602f00fd4cd4189266a27b8b1d714749d5334a50847bb7bd3e308cde023479afe7a7aaa81035" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-device-info-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.1-sources.jar">
             <sha512 value="1b24c26502310d385e83447fbc77345cf800496a1b58dc22656a38aaa8f921c0276ff9ff9d0108a1f4d94a8870a5852ef04278f5b110070d9ada7d8c4a5d8d29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.1.jar">
             <sha512 value="15ffd77d5425751fdd857a663543cdac3f7106cf235b062d08483cf0729f196ea7cf7323208c460be73ae74103f19f8cf2b7abc6aaeb489ce9c23caf7731d1db" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-proto-32.3.0.pom">
-            <sha512 value="59b10687c24c43868051336fe023e67d7114de679ba651863e3ba518e8e3c040af528784fb1310ed2a5965e347cea4cccfdd14c89a5e80462677322a3f88eb54" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-proto-32.3.1.pom">
+            <sha512 value="9f7593558a7c752b26952c4f00ae29f86dea41a17d1337e807720a905b9832d0d14ec37b6ac2d2a588c8599d5795647e9f64f155358cca00d809e53c60722469" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="32.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="32.3.1">
+         <artifact name="android-test-plugin-host-emulator-control-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-emulator-control-32.3.1-sources.jar">
             <sha512 value="e5ab3867af74ed830bf70ab879274d3e51c7475da3b0d346e296699f618d67fd5a2bb313d19760104215d3018783291fb7090b3f9952251600b7c12509006c71" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.3.0.jar">
+         <artifact name="android-test-plugin-host-emulator-control-32.3.1.jar">
             <sha512 value="51f883d25cba963fe934c2962bb5734a92068e05188171d4d1af5ff3e44d471087d520ba879f29fe47f1137e3001803b9d0c4a28b856c404f1169240fac36742" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.3.0.module">
-            <sha512 value="c024081f73e98df3c33e393615c0269cbc7f5fa50e4012a988474265a681f1794016e70a0801d443e109c61181a7611fac9a04e3ce5e6166b62cfd5da6864882" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.1.module">
+            <sha512 value="f48998300dbfcdaf3233f8c70791c0ab4902ad7750901e23c1373133603758d4ec8d1cfedc1c8e77e23fd7670891efb1f4f6255a27f5546d4b64f10adaac8fea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-32.3.0.pom">
-            <sha512 value="df4c5a22d6e0ac777a7008fd0a96e22d6c735474175e2c2cc7332c056cbbc869df990d74c1d0416f33be48c2519ce3bff39999eb4de430d32d3d5d16e969cd32" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-32.3.1.pom">
+            <sha512 value="bd795c5e1f710858f7eb9cecf23f1b23e9d2adf6134e91feaa71a8773b8b3695f55497e733ea5766cff408de47f247557c4cb948a80bb246bbb597e34747b751" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.1-sources.jar">
             <sha512 value="e40acd0d90b23060dc28b61827cecec5309266c082c7063c786545d795cca08366efe5f3dd8229abcd8d13277282829b4db3ba70ed07dc374ed7631d89121ddf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.1.jar">
             <sha512 value="f9bb4c6b2c250f1fd5dc653fcf2796085f41c6edde329cce666b1ef4b4ee0b66efe4d003a5eb04428a6357d8f3db5d72df312f46ac3b3c18916d51ca6b4c68c4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.0.pom">
-            <sha512 value="dd7e622102f0a655d0e9d188be0b6eabbeff2745ba084ce5bf251b675464cc5448f3cb2bde86a72ec0f360cab202b4bf546e6c12a1540522f2bedd30fcccced8" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-proto-32.3.1.pom">
+            <sha512 value="3c6bfe5b8e16d004713ef276897115cd39e5e25b1dcde5330af816eeec498359cdd2b9907d18087f620daef5d1d78aaa043c13a216f7b2b71f3965fa96f1515e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="32.3.0">
-         <artifact name="android-test-plugin-host-logcat-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="32.3.1">
+         <artifact name="android-test-plugin-host-logcat-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-host-logcat-32.3.1-sources.jar">
             <sha512 value="0be5c6da2c4ab9331bd1a54f79352e36c1ed33c043887c19feb2b30908b5717dccc7dd065f30cb393bbd23c43c255ffbf7d8ca02e09896386f08ae70c01b01c3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.3.0.jar">
+         <artifact name="android-test-plugin-host-logcat-32.3.1.jar">
             <sha512 value="b13abaa06b3eae1ba25aa26f409d3e3a8883de979d4a5e5b26616d345fe3f81421e39e4d282ff3a576e52d637fad71745bf4d24e3dec0bb778387ab4fbe4d6c1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.3.0.module">
-            <sha512 value="da7cec762506e192d22d0d801bdef0599f58809f271e146aa1d128c34097d3f4bafa881574794afdd2bd29275001af4dcc9a00db989adcbf3e1bca3af766d633" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.1.module">
+            <sha512 value="913295d78413e245e216b60bca2d973cb881de456453efca94e9a633702d5249f4afc66584897c39314fae6efa06978b9dd1bf8ae6d813b1f6910165f4556eb4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-32.3.0.pom">
-            <sha512 value="5fbf61a56d7ce634cf4472963f31b45b96b73c9abff8c094032a9cfb4e240e9bfbf5c63a2f79200c246c9e737b453d7c62badc4392c2f82de1a44e06a05c56ca" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-32.3.1.pom">
+            <sha512 value="6ce123bd37ba51d837aa636660efc9c5639c0bd2e4d4bba72326993df4697a7265068af37cf1351b6f8cb544d23367ffe474f10a1fb6f3116a5eb190f9d06b00" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="32.3.0">
-         <artifact name="android-test-plugin-host-logcat-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="32.3.1">
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.1-sources.jar">
             <sha512 value="bbf5b5dc5ab5e5542ea42adb9d3b4fe2d4efbff7211e57df42fc442168960ae8f5014a625e164d452c3521d24c5c860dd715e4fdb56d50fddf14c6e8b38c4832" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.1.jar">
             <sha512 value="e956af51c69e0c36ec27f5e8eb3c87430bc618b99baa5f1ac4a058947824ed2e515dcf1209515cdf7211af35100d6fbeadbddc84adfc0c937fa2f3544c048fd3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-proto-32.3.0.pom">
-            <sha512 value="feb2edee57b7f90e0ead2f00b79debf99fe8656afbc68f9a1ba0980b74177392c74f58b49a5be010f62c92ff1cd9037993b6deeee3745d77c121568e2abda6fb" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-proto-32.3.1.pom">
+            <sha512 value="fe146651bdf040ee5d4aa6293e17bb0c5ce112ecda52dd8ab563a1a5a0a8708942bd32bd7f5f3dbea863043e8a4a54bfb3ad8df36d49eb53496f20c35ff28996" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="32.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="32.3.1">
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.1-javadoc.jar">
             <sha512 value="e17d2175ee80e4a52cfdf0561efae8ce98b56bf915c05b2773fc194da7570d1c68a8030edfe6fd64d5605e4756775111b27eedf8828af4b41e76955a0cba6f7d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.3.0-sources.jar">
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.1-sources.jar">
             <sha512 value="be6c4e2a740c5396de933d5e5563a633a1b5a4325f3dc03e4582b43684b61e762b6f8058a0954f34127d1fa54f7cd4de243dd239d532ff538a4d0d1c483e3ebf" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.jar">
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.1.jar">
             <sha512 value="bb961dcb452a1a60827c881eda8c9252fb2bb9d524df8c23a908b04f4cfd29ebd1c65dd7ea55ba9ad3be4f3d23fc65e0ee526f888e0c1e4743bd26e7c56a5f36" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.module">
-            <sha512 value="e2416c0d46c8342b6dc1743a3228a16246b4304515bcb7a9f7d67206c3a4e476e22690c8f5336f8117d703050a2aee8eb9d99d850357dd4ca92c314110fec198" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.1.module">
+            <sha512 value="d4df9052ef848e7cd9b6f007c7a6a1200fbeaca0761a19c76ddbe141bcc8f42e6fb4e0c3398e4d12bdf48306c147bf202d5a1347ddc3e08b2939a89b17d27c86" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-32.3.0.pom">
-            <sha512 value="60c899d3ed5fc3a3d599d1f1501ae402fa97e5242150254af5272042e83ff8d4ecf685cfbbf239d5e1700654dfdbcd2e812e1c1920066763a13c84ce2c3dc84e" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-32.3.1.pom">
+            <sha512 value="4ffd500f94758b897d7198527ac237757d69710928a2932cafb262daad2353cb7f36e62ea07e7c959c9ba4a8af69426cb3cfd887f7b965b5aa5732c83d9067ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="32.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0-sources.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="32.3.1">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.1-sources.jar">
             <sha512 value="1af8c3c548796080e79f3606c9d20d3e234f537f2b17cd57da1348e52172e4c0114099e1eb2aaa77c7ece4186c79be60ade364e49cc72980d59148112f7a4edb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0.jar">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.1.jar">
             <sha512 value="9d90f441b8e80e86abd3991c00f88d77be6b90cdad22d7f92c27dc00a4c6efb47f8a67e76f34e99afe91052828d6c2bf82eba6f5b1d6ca633a9b25efe501bc6d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.0.pom">
-            <sha512 value="9588ff0beeb3995529bb3c03260cc35964e5fbefbe15c55774368dad43ba3481f55f5410a85b92a6eed6979c8d6ecffc0471267d2c7438f5f933eaf8a900f3bd" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-proto-32.3.1.pom">
+            <sha512 value="23ceaaf6b0d8f1a982f94a498a490e8b44d2b13749f8df09d0e47838f25ccf8633123a01c87cddf5427172981ba2bafeeacbad07df825270ad040af0f0e29bca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="gradle-work-action" version="32.3.0">
-         <artifact name="gradle-work-action-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="gradle-work-action" version="32.3.1">
+         <artifact name="gradle-work-action-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.3.0-sources.jar">
+         <artifact name="gradle-work-action-32.3.1-sources.jar">
             <sha512 value="8a052962418f9159edf20fe862a967866d200ef9e828840500538cd08ec54788aea2f34f0ff27ff7e6e2cc42a308dfc152cd4dda49738e3b6504b0254032bfb2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.3.0.jar">
+         <artifact name="gradle-work-action-32.3.1.jar">
             <sha512 value="e11eb4261b0d768859a8b63bf3a0bb07ecc7e4655c45eb0595fccbcc230723d47d5127c03328c0e56e9e4258ea48be79ef6b3b0d7e65afa75731d1985540c694" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.3.0.module">
-            <sha512 value="928abd36da87e01501427496dfe66bf9801ee334e2400c29fbfbcc21cd774fb902eeec699e01d50c2d8533fc5d9554c683698881e407d8f4ba7dc5d2360dcfc0" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.1.module">
+            <sha512 value="14ac98d01b2118ba33f2e92597b6bd3c14c862172e42fb7318606fb6cb36e0d6dd93812bae086f5c52e3b721ed2ed0aeff7c03a5db84152854b69bfe7da331dc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-32.3.0.pom">
-            <sha512 value="bdd94aa88825811f1dd91dfd93bb7b1cf501dd63848641867baefeea2cdaa44f16a6e0e2f74fdcca9bb7208d5a66f70347ae6817e228168cb8ba9acf6362e5c3" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-32.3.1.pom">
+            <sha512 value="37d66d6b70b68fa37bfcc3c84ebe4641fac9a485cbb1dcc4c33ecc06f1e4aefed4fead67a3b61ba0f893f38e325f60d001a1b688af01221aacfe8e01160dec42" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="gradle-work-action-api" version="32.3.0">
-         <artifact name="gradle-work-action-api-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="gradle-work-action-api" version="32.3.1">
+         <artifact name="gradle-work-action-api-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.3.0-sources.jar">
+         <artifact name="gradle-work-action-api-32.3.1-sources.jar">
             <sha512 value="e84d62defdf0e5f0c2f6b9e1af3ebb53305036295244cdfa67df7a76bbaf42e0975be7d81c0254d7324e9a92be7570f7dcdccb9c2e12518b3a22ae90460e3765" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.3.0.jar">
+         <artifact name="gradle-work-action-api-32.3.1.jar">
             <sha512 value="4fbd0f42609bd8680c7398c5380add5161111c23b2f4ceac587309ed41da7783a632548dd88a37ef4763d122e92692822c81039761aff4e5f11ac77a20f7d858" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.3.0.module">
-            <sha512 value="e31c8f49230e48cd156390f65cbe90c522ca7610de827e8262c64b84336c7dd68fcc5ee74941c3b7759ee1ea03b0676b023ebc9a7a498df732308c4b8a872294" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.1.module">
+            <sha512 value="b5c735abf5c93926bd9e59db58f20e71fa0d8cbf9fc2e78a66344613b74726353495bfca3a29c49491e38fd95bd318b057c868a1eab9053b5398c9333788375a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-work-action-api-32.3.0.pom">
-            <sha512 value="c8f0572fa9de536388d243f436b9fd495cddee95214c9b581dba17f14e06b92aa3c1c69fff4efd6b6767bb499601f1993f88ffd8030c3eaefe102b5171b5dfd2" origin="Generated by Gradle"/>
+         <artifact name="gradle-work-action-api-32.3.1.pom">
+            <sha512 value="ba3bd770e3be7de99486f0ffbc15de000767e84f22e886937ca31883fc594e62635b345ea2ef89be6e5022b782abffb97bd382c0d431400997d4fcb56647f788" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="utp-common" version="32.3.0">
-         <artifact name="utp-common-32.3.0-javadoc.jar">
+      <component group="com.android.tools.utp" name="utp-common" version="32.3.1">
+         <artifact name="utp-common-32.3.1-javadoc.jar">
             <sha512 value="1487e5a20c9e4d74f298e07c42e96a61be11b7a768c3fbc199ee138cd68e1fc2267d1cfe3f11f288acc05df755315344d052cc5f6f751f126ab4fe1caa5125ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.3.0-sources.jar">
+         <artifact name="utp-common-32.3.1-sources.jar">
             <sha512 value="67ec93e2771d2c4e1a2743d2618b6ef7749346febd25cd5b0c4fdb9b3fba1f4b9684a2b07961dd064b2891e63544d30f3f543ba237c28a59d5ab9ac93020351e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.3.0.jar">
+         <artifact name="utp-common-32.3.1.jar">
             <sha512 value="3002b53476b211ebd56673e4c6e7ba050294bfa4382a40c7f3ba16f84b892bd90f666f999545ec78f3c2ea3331a295689aac1fd62d7588116f3194dd67382f1a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.3.0.module">
-            <sha512 value="5eb6f8f81655fad5d43c9258e847b8dbcffbdba330eec99e6fed2f5f4a275c2897d4455e070495d8b8d17f1e8734754bc92480c006d2a0e96e78f34f03555c3a" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.1.module">
+            <sha512 value="41557b42be6842eb22407de2d3af716c45882d312cdc572053da2035c5b97ea91ad8ba9f72d4efacb70bd00645d6c5fc9e08894cc1911731352e79a4248d5681" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="utp-common-32.3.0.pom">
-            <sha512 value="3a3875416b9b98e7288463fb577a517fd15eeb03505e3c61097d509bd97479cda3ac33d14019c40ff133c58e91cf805f7a9bfdcfbaded70499527172b284cb5f" origin="Generated by Gradle"/>
+         <artifact name="utp-common-32.3.1.pom">
+            <sha512 value="5399c095901245db2cacf741e2013d7c18e9adbfa510dfbf8573aea42350f36b22b3a43b26154134ccac967978ff15af240f61ba00e1ad90bb8ffdcd3e9bb1e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google" name="google" version="1">

From 5519addbecaf67097ee704cc63841f92e8014c00 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 17:04:27 +0300
Subject: [PATCH 16/51] Find the capture button shape inside wrapped drawables
 instead of casting them

---
 .../camera/VideoCapturerRegressionTest.kt     | 73 +++++++++++++++++++
 .../camera/capturer/VideoCapturer.kt          | 67 +++++++----------
 2 files changed, 101 insertions(+), 39 deletions(-)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
index 155889f7f..a574a555e 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -2,11 +2,18 @@ package app.grapheneos.camera
 
 import android.Manifest
 import android.content.ContentResolver
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.StateListDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.provider.MediaStore
 import android.provider.MediaStore.MediaColumns
+import android.util.StateSet
+import android.view.View
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -19,6 +26,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.math.abs
 
 @RunWith(AndroidJUnit4::class)
 class VideoCapturerRegressionTest {
@@ -187,6 +195,71 @@ class VideoCapturerRegressionTest {
         }
     }
 
+    /**
+     * Regression test for the production crash: skinned devices wrap the capture button shape
+     * in a selector or layer-list, and the corner-radius animation cast the wrapper straight
+     * to GradientDrawable (ClassCastException in onRecordingStart/afterRecordingStops).
+     */
+    @Test
+    fun recordingUiAnimations_unwrapWrappedCaptureButtonDrawable() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+
+            val shape = GradientDrawable()
+            var dp8 = 0f
+            var dp16 = 0f
+            scenario.onActivity { activity ->
+                dp8 = 8 * activity.resources.displayMetrics.density
+                dp16 = 16 * activity.resources.displayMetrics.density
+                val selector = StateListDrawable().apply { addState(StateSet.WILD_CARD, shape) }
+                activity.captureButton.setImageDrawable(LayerDrawable(arrayOf(selector)))
+                activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
+                activity.videoCapturer.startRecording()
+            }
+
+            // The animation reaching the nested shape proves the unwrapping worked.
+            waitUntil(scenario, "corner radius animated to the recording shape") {
+                abs(shape.cornerRadius - dp8) < 0.5f
+            }
+
+            scenario.onActivity { it.videoCapturer.stopRecording() }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+            waitUntil(scenario, "corner radius animated back") {
+                abs(shape.cornerRadius - dp16) < 0.5f
+            }
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
+    /** A drawable with no shape inside must skip the animation, not crash the recording. */
+    @Test
+    fun recordingUi_toleratesUnknownCaptureButtonDrawable() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+
+            scenario.onActivity { activity ->
+                activity.captureButton.setImageDrawable(ColorDrawable(Color.RED))
+                activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
+                activity.videoCapturer.startRecording()
+            }
+            waitUntil(scenario, "recording UI is shown") {
+                it.timerView.visibility == View.VISIBLE
+            }
+
+            scenario.onActivity { it.videoCapturer.stopRecording() }
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            deleteNewCapture(scenario, capturedBefore)
+        }
+    }
+
     /** Pending entries are how in-flight and orphaned outputs appear in MediaStore. */
     private fun pendingVideoCount(): Int {
         val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index fda173e8c..73c307333 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -6,6 +6,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.LayerDrawable
 import android.graphics.drawable.StateListDrawable
@@ -301,6 +302,31 @@ class VideoCapturer(private val mActivity: MainActivity) {
     private val dp16 = 16 * mActivity.resources.displayMetrics.density
     private val dp8 = 8 * mActivity.resources.displayMetrics.density
 
+    // Skinned devices wrap the capture button shape in selectors and layer-lists
+    private fun findGradientDrawable(drawable: Drawable?): GradientDrawable? {
+        return when (drawable) {
+            is GradientDrawable -> drawable
+            is StateListDrawable -> findGradientDrawable(drawable.current)
+            is LayerDrawable -> {
+                (0 until drawable.numberOfLayers)
+                    .firstNotNullOfOrNull { findGradientDrawable(drawable.getDrawable(it)) }
+            }
+            else -> null
+        }
+    }
+
+    // If no shape can be dug out, skip the cosmetic animation rather than crash
+    private fun animateCaptureButtonCorners(from: Float, to: Float) {
+        val gd = findGradientDrawable(mActivity.captureButton.drawable) ?: return
+
+        val animator = ValueAnimator.ofFloat(from, to)
+        animator.setDuration(300)
+            .addUpdateListener { animation ->
+                gd.cornerRadius = animation.animatedValue as Float
+            }
+        animator.start()
+    }
+
     private fun beforeRecordingStarts() {
         // Don't leak paused/muted state from the previous recording into this one.
         isPaused = false
@@ -313,25 +339,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
         // TODO: Uncomment this once the main indicator UI gets implemented
         // mActivity.micOffIcon.visibility = View.GONE
 
-        val drawable = mActivity.captureButton.drawable
-
-        val gd: GradientDrawable = if (drawable is StateListDrawable) {
-            drawable.current as GradientDrawable
-        } else if (drawable is LayerDrawable) {
-            drawable.current as GradientDrawable
-        } else {
-            drawable as GradientDrawable
-        }
-
-        val animator = ValueAnimator.ofFloat(dp16, dp8)
-
-        animator.setDuration(300)
-            .addUpdateListener { animation ->
-                val value = animation.animatedValue as Float
-                gd.cornerRadius = value
-            }
-
-        animator.start()
+        animateCaptureButtonCorners(dp16, dp8)
 
         mActivity.settingsDialog.videoQualitySpinner.isEnabled = false
         mActivity.settingsDialog.enableEISToggle.isEnabled = false
@@ -369,26 +377,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
     }
 
     private fun afterRecordingStops() {
-
-        val drawable = mActivity.captureButton.drawable
-
-        val gd: GradientDrawable = if (drawable is StateListDrawable) {
-            drawable.current as GradientDrawable
-        } else if (drawable is LayerDrawable) {
-            drawable.current as GradientDrawable
-        } else {
-            drawable as GradientDrawable
-        }
-
-        val animator = ValueAnimator.ofFloat(dp8, dp16)
-
-        animator.setDuration(300)
-            .addUpdateListener { animation ->
-                val value = animation.animatedValue as Float
-                gd.cornerRadius = value
-            }
-
-        animator.start()
+        animateCaptureButtonCorners(dp8, dp16)
 
         mActivity.timerView.visibility = View.GONE
         mActivity.setFlipCameraIcon(R.drawable.flip_camera, R.string.flip_camera)

From 9c327b2e5c00f9feda2adb30d6490ccc277f6458 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 17:27:06 +0300
Subject: [PATCH 17/51] Hide the gallery actions until the media they act on
 has loaded

---
 .../camera/InAppGalleryRegressionTest.kt      | 113 ++++++++++++++++++
 .../grapheneos/camera/GallerySliderAdapter.kt |   6 +-
 .../camera/ui/activities/InAppGallery.kt      |  31 +++--
 3 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt
new file mode 100644
index 000000000..a087bd0ee
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt
@@ -0,0 +1,113 @@
+package app.grapheneos.camera
+
+import android.app.Activity
+import android.app.Application
+import android.net.Uri
+import android.os.Bundle
+import androidx.appcompat.widget.PopupMenu
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import app.grapheneos.camera.ui.activities.InAppGallery
+import java.util.concurrent.CountDownLatch
+import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class InAppGalleryRegressionTest {
+
+    private val app = InstrumentationRegistry.getInstrumentation()
+        .targetContext.applicationContext as Application
+    private val stall = StalledMediaScan()
+
+    @After
+    fun releaseScan() {
+        stall.gate.countDown()
+        app.unregisterActivityLifecycleCallbacks(stall)
+    }
+
+    /**
+     * Regression test for the production crash: tapping a media action while the media scan
+     * was still running dereferenced the null adapter (NPE in getCurrentItem).
+     */
+    @Test
+    fun mediaActions_beforeMediaScanCompletes_doNotCrash() {
+        app.registerActivityLifecycleCallbacks(stall)
+        ActivityScenario.launch(InAppGallery::class.java).use { scenario ->
+            scenario.onActivity { activity ->
+                assertNull(activity.gallerySliderAdapter)
+
+                val menu = PopupMenu(activity, activity.window.decorView).menu
+                activity.onCreateOptionsMenu(menu)
+                for (id in intArrayOf(
+                    R.id.delete_icon,
+                    R.id.share_icon,
+                    R.id.info,
+                    R.id.edit_icon
+                )) {
+                    activity.onOptionsItemSelected(menu.findItem(id))
+                }
+
+                assertFalse(activity.isFinishing)
+            }
+        }
+    }
+
+    /**
+     *  The media actions must not be offered before there is media to act on.
+     */
+    @Test
+    fun mediaActionsMenu_hiddenUntilMediaScanCompletes() {
+        app.registerActivityLifecycleCallbacks(stall)
+        ActivityScenario.launch(InAppGallery::class.java).use { scenario ->
+            scenario.onActivity { activity ->
+                val menu = PopupMenu(activity, activity.window.decorView).menu
+                activity.onCreateOptionsMenu(menu)
+
+                activity.onPrepareOptionsMenu(menu)
+                assertFalse(menu.findItem(R.id.delete_icon).isVisible)
+                assertFalse(menu.findItem(R.id.share_icon).isVisible)
+
+                val item = CapturedItem(
+                    ITEM_TYPE_IMAGE,
+                    "20260724_000000",
+                    Uri.parse("content://media/external/images/media/0"),
+                )
+                activity.gallerySliderAdapter = GallerySliderAdapter(activity, arrayListOf(item))
+                activity.onPrepareOptionsMenu(menu)
+                assertTrue(menu.findItem(R.id.delete_icon).isVisible)
+            }
+        }
+    }
+
+    /**
+     * Holds the gallery's media scan so gallerySliderAdapter stays null, like on a slow device.
+     */
+    private class StalledMediaScan : Application.ActivityLifecycleCallbacks {
+        val gate = CountDownLatch(1)
+
+        override fun onActivityPreCreated(activity: Activity, savedInstanceState: Bundle?) {
+            if (activity is InAppGallery) {
+                activity.asyncLoaderOfCapturedItems.execute {
+                    // Interrupted by shutdownNow() when the activity is destroyed
+                    try {
+                        gate.await()
+                    } catch (_: InterruptedException) {
+                    }
+                }
+            }
+        }
+
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+        override fun onActivityStarted(activity: Activity) {}
+        override fun onActivityResumed(activity: Activity) {}
+        override fun onActivityPaused(activity: Activity) {}
+        override fun onActivityStopped(activity: Activity) {}
+        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+        override fun onActivityDestroyed(activity: Activity) {}
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt b/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
index 25c8a1e62..6891aad9b 100644
--- a/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
+++ b/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
@@ -81,7 +81,7 @@ class GallerySliderAdapter(
                         }
 
                         mediaPreview.setOnClickListener {
-                            val curItem = getCurrentItem()
+                            val curItem = getCurrentItem() ?: return@setOnClickListener
                             if (curItem.type == ITEM_TYPE_VIDEO) {
                                 val intent = Intent(gActivity, VideoPlayer::class.java)
                                 intent.putExtra(VideoPlayer.VIDEO_URI, curItem.uri)
@@ -125,8 +125,8 @@ class GallerySliderAdapter(
         notifyItemRemoved(index)
     }
 
-    fun getCurrentItem(): CapturedItem {
-        return items[gActivity.gallerySlider.currentItem]
+    fun getCurrentItem(): CapturedItem? {
+        return items.getOrNull(gActivity.gallerySlider.currentItem)
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index da648e328..c1e5c9243 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -55,6 +55,8 @@ import java.util.Locale
 import java.util.TimeZone
 import java.util.concurrent.Executors
 import kotlin.properties.Delegates
+import androidx.core.view.size
+import androidx.core.view.get
 
 class InAppGallery : AppCompatActivity() {
 
@@ -140,8 +142,9 @@ class InAppGallery : AppCompatActivity() {
         }
     }
 
-    private fun getCurrentItem(): CapturedItem {
-        return gallerySliderAdapter!!.getCurrentItem()
+    // Null while the async media scan is still running (or once the last item is gone)
+    private fun getCurrentItem(): CapturedItem? {
+        return gallerySliderAdapter?.getCurrentItem()
     }
 
     override fun onSupportNavigateUp(): Boolean {
@@ -154,6 +157,15 @@ class InAppGallery : AppCompatActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        // Every item is a media action; none of them apply until the scan has delivered items
+        val hasMedia = gallerySliderAdapter != null
+        for (i in 0 until menu.size) {
+            menu[i].isVisible = hasMedia
+        }
+        return super.onPrepareOptionsMenu(menu)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         return when (item.itemId) {
@@ -190,7 +202,7 @@ class InAppGallery : AppCompatActivity() {
             return
         }
 
-        val curItem = getCurrentItem()
+        val curItem = getCurrentItem() ?: return
 
         val editIntent = Intent(Intent.ACTION_EDIT).apply {
             setDataAndType(curItem.uri, curItem.mimeType())
@@ -213,7 +225,7 @@ class InAppGallery : AppCompatActivity() {
     }
 
     private fun deleteCurrentMedia() {
-        val curItem = getCurrentItem()
+        val curItem = getCurrentItem() ?: return
 
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.delete_title)
@@ -234,7 +246,7 @@ class InAppGallery : AppCompatActivity() {
 
                 if (res) {
                     showMessage(getString(R.string.deleted_successfully))
-                    gallerySliderAdapter!!.removeItem(curItem)
+                    gallerySliderAdapter?.removeItem(curItem)
                 } else {
                     showMessage(getString(R.string.deleting_unexpected_error))
                 }
@@ -300,7 +312,7 @@ class InAppGallery : AppCompatActivity() {
     }
 
     private fun showCurrentMediaDetails() {
-        val curItem = getCurrentItem()
+        val curItem = getCurrentItem() ?: return
 
         var relativePath: String? = null
         var fileName: String? = null
@@ -504,7 +516,7 @@ class InAppGallery : AppCompatActivity() {
             return
         }
 
-        val curItem = getCurrentItem()
+        val curItem = getCurrentItem() ?: return
 
         val share = Intent(Intent.ACTION_SEND)
         share.putExtra(Intent.EXTRA_STREAM, curItem.uri)
@@ -669,6 +681,7 @@ class InAppGallery : AppCompatActivity() {
                 gallerySliderAdapter = it
                 gallerySlider.adapter = it
             }
+            invalidateOptionsMenu()
         } else {
             val adapterItems = existingAdapter.items
             adapterItems.ensureCapacity(items.size)
@@ -741,8 +754,8 @@ class InAppGallery : AppCompatActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
 
-        gallerySliderAdapter?.let {
-            outState.putParcelable(LAST_VIEWED_ITEM_KEY, it.items[gallerySlider.currentItem])
+        gallerySliderAdapter?.getCurrentItem()?.let {
+            outState.putParcelable(LAST_VIEWED_ITEM_KEY, it)
         }
     }
 }

From 1ffcb44426bed919bbaf0749c75df2ac5e92b506 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 18:21:21 +0300
Subject: [PATCH 18/51] Close the video player instead of crashing when the
 media service dies

---
 .../camera/VideoPlayerRegressionTest.kt       | 51 +++++++++++++++++++
 .../camera/ui/activities/VideoPlayer.kt       | 22 ++++++--
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt
new file mode 100644
index 000000000..be82365ee
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt
@@ -0,0 +1,51 @@
+package app.grapheneos.camera
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.widget.VideoView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import app.grapheneos.camera.ui.activities.VideoPlayer
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class VideoPlayerRegressionTest {
+
+    /**
+     * Regression test for the production crash: an IllegalStateException out of
+     * VideoView.setVideoURI took down the process instead of closing the player.
+     */
+    @Test
+    fun videoLoad_whenMediaServiceDies_closesPlayerInsteadOfCrashing() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val uri = Uri.parse("content://media/external/video/media/0")
+        val intent = Intent(context, VideoPlayer::class.java)
+            .putExtra(VideoPlayer.VIDEO_URI, uri)
+
+        ActivityScenario.launch<VideoPlayer>(intent).use { scenario ->
+            scenario.onActivity { activity ->
+                assertFalse(activity.isFinishing)
+
+                activity.playVideo(DeadMediaServiceVideoView(activity), uri)
+
+                assertTrue(activity.isFinishing)
+            }
+        }
+    }
+
+    /**
+     * Behaves like VideoView when the media service dies during playback setup: openVideo()
+     * catches IOException and IllegalArgumentException but lets prepareAsync()'s
+     * IllegalStateException escape to the caller.
+     */
+    private class DeadMediaServiceVideoView(context: Context) : VideoView(context) {
+        override fun setVideoURI(uri: Uri?) {
+            throw IllegalStateException("prepareAsync called in state 0")
+        }
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
index b9f94bb7a..c4e3c0cc7 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
@@ -9,6 +9,8 @@ import android.util.Log
 import android.widget.FrameLayout
 import android.widget.MediaController
 import android.widget.RelativeLayout
+import android.widget.Toast
+import android.widget.VideoView
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -109,9 +111,7 @@ class VideoPlayer : AppCompatActivity() {
             }
 
             mainExecutor.execute {
-                val lifecycleState = lifecycle.currentState
-
-                if (lifecycleState == Lifecycle.State.DESTROYED) {
+                if (lifecycle.currentState == Lifecycle.State.DESTROYED) {
                     return@execute
                 }
 
@@ -121,7 +121,7 @@ class VideoPlayer : AppCompatActivity() {
                 videoView.setOnPreparedListener { _ ->
                     videoView.setMediaController(mediaController)
 
-                    if (lifecycleState == Lifecycle.State.RESUMED) {
+                    if (lifecycle.currentState == Lifecycle.State.RESUMED) {
                         videoView.start()
                     }
 
@@ -129,11 +129,23 @@ class VideoPlayer : AppCompatActivity() {
                     mediaController.show(0)
                 }
 
-                videoView.setVideoURI(uri)
+                playVideo(videoView, uri)
             }
         }
     }
 
+    // When the media service dies during setup, VideoView lets prepareAsync()'s
+    // IllegalStateException escape instead of routing it to its error dialog
+    internal fun playVideo(videoView: VideoView, uri: Uri) {
+        try {
+            videoView.setVideoURI(uri)
+        } catch (e: IllegalStateException) {
+            Log.e(TAG, "Unable to play video", e)
+            Toast.makeText(applicationContext, R.string.unable_to_play_video, Toast.LENGTH_SHORT).show()
+            finish()
+        }
+    }
+
     override fun onSupportNavigateUp(): Boolean {
         finish()
         return true
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4596127e..dd2587749 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,6 +197,7 @@
     <string name="recording_too_short_to_be_saved">Recording too short to be saved</string>
     <string name="unable_to_save_video">Unable to save this video</string>
     <string name="unable_to_save_video_verbose">Unable to save this video, error code: %d</string>
+    <string name="unable_to_play_video">Unable to play this video</string>
     <string name="error_during_recording">A error has occurred finishing the current recording, error code: %d</string>
     <string name="unable_to_access_output_file">Unable to access output file</string>
     <string name="please_wait_for_image_to_get_captured_before_sharing">Please wait for the image to get captured before attempting to share via long tap</string>

From 7641e05ce0a9c917e4448ad3ca548f76a2ba89cc Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 20:38:26 +0300
Subject: [PATCH 19/51] Tell the user instead of crashing when a shared file is
 no longer accessible

---
 .../camera/ShareMediaRegressionTest.kt        | 88 +++++++++++++++++++
 .../app/grapheneos/camera/CapturedItems.kt    | 20 +++++
 .../camera/ui/activities/InAppGallery.kt      | 10 +--
 .../camera/ui/activities/MainActivity.kt      |  7 +-
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
new file mode 100644
index 000000000..b2bba922b
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
@@ -0,0 +1,88 @@
+package app.grapheneos.camera
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import app.grapheneos.camera.util.getParcelableExtra
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ShareMediaRegressionTest {
+
+    private val staleItem = CapturedItem(
+        ITEM_TYPE_IMAGE,
+        "20260724_120000",
+        Uri.parse("content://media/external/images/media/987654321"),
+    )
+
+    private fun <T : HostActivity> T.attached(): T {
+        attach(InstrumentationRegistry.getInstrumentation().targetContext)
+        return this
+    }
+
+    /**
+     * Regression test for the production crash: OEM builds that grant the shared uri inside
+     * startActivity() throw a SecurityException when the app has lost access to the item, and
+     * the exception went uncaught through the share path.
+     */
+    @Test
+    @UiThreadTest
+    fun share_whenUriGrantIsDenied_reportsFailureInsteadOfCrashing() {
+        val host = OemPreGrantHostActivity().attached()
+
+        assertFalse(host.shareCapturedItem(staleItem))
+    }
+
+    @Test
+    @UiThreadTest
+    fun share_launchesChooserWithItemUri() {
+        val host = ChooserRecordingHostActivity().attached()
+
+        assertTrue(host.shareCapturedItem(staleItem))
+
+        val chooser = host.launched
+        assertNotNull(chooser)
+        assertEquals(Intent.ACTION_CHOOSER, chooser!!.action)
+
+        val send = getParcelableExtra<Intent>(chooser, Intent.EXTRA_INTENT)!!
+        assertEquals(Intent.ACTION_SEND, send.action)
+        assertEquals(staleItem.uri, getParcelableExtra<Uri>(send, Intent.EXTRA_STREAM))
+        assertEquals(staleItem.mimeType(), send.type)
+        assertTrue(send.flags and Intent.FLAG_GRANT_READ_URI_PERMISSION != 0)
+    }
+
+    abstract class HostActivity : Activity() {
+        fun attach(base: Context) = attachBaseContext(base)
+    }
+
+    /**
+     * Behaves like OEM frameworks that eagerly grant the shared uri to the target inside
+     * startActivity(): the grant fails with a SecurityException when the sharing app cannot
+     * access the uri itself.
+     */
+    private class OemPreGrantHostActivity : HostActivity() {
+        override fun startActivity(intent: Intent?) {
+            throw SecurityException(
+                "UID 10999 does not have permission to uri 0 @ content://media/external/images/media/987654321"
+            )
+        }
+    }
+
+    /** Captures the launched intent instead of opening the system chooser. */
+    private class ChooserRecordingHostActivity : HostActivity() {
+        var launched: Intent? = null
+
+        override fun startActivity(intent: Intent?) {
+            launched = intent
+        }
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index 440e992fd..f79f439fb 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -1,7 +1,9 @@
 package app.grapheneos.camera
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.ContentResolver
+import android.content.Intent
 import android.content.ContentUris
 import android.content.Context
 import android.content.SharedPreferences
@@ -80,6 +82,24 @@ class CapturedItem(
     override fun describeContents() = 0
 }
 
+// Some OEM builds grant the shared uri to the target inside startActivity(), which throws a
+// SecurityException when this app has itself lost access to the item (e.g. it was deleted
+// externally, or its persisted uri came from a restored backup)
+internal fun Activity.shareCapturedItem(item: CapturedItem): Boolean {
+    val intent = Intent(Intent.ACTION_SEND).apply {
+        putExtra(Intent.EXTRA_STREAM, item.uri)
+        setDataAndType(item.uri, item.mimeType())
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+    }
+    return try {
+        startActivity(Intent.createChooser(intent, getString(R.string.share_image)))
+        true
+    } catch (e: SecurityException) {
+        Log.e(CapturedItems.TAG, "unable to share ${item.uiName()}", e)
+        false
+    }
+}
+
 object CapturedItems {
     const val TAG = "CapturedItems"
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index c1e5c9243..b8986f09d 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -43,6 +43,7 @@ import app.grapheneos.camera.GallerySliderAdapter
 import app.grapheneos.camera.ITEM_TYPE_VIDEO
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.GalleryBinding
+import app.grapheneos.camera.shareCapturedItem
 import app.grapheneos.camera.util.getParcelableArrayListExtra
 import app.grapheneos.camera.util.getParcelableExtra
 import app.grapheneos.camera.util.storageLocationToUiString
@@ -518,12 +519,9 @@ class InAppGallery : AppCompatActivity() {
 
         val curItem = getCurrentItem() ?: return
 
-        val share = Intent(Intent.ACTION_SEND)
-        share.putExtra(Intent.EXTRA_STREAM, curItem.uri)
-        share.setDataAndType(curItem.uri, curItem.mimeType())
-        share.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
-
-        startActivity(Intent.createChooser(share, getString(R.string.share_image)))
+        if (!shareCapturedItem(curItem)) {
+            showMessage(getString(R.string.unable_to_share_media))
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index ab969af4f..ec87ad680 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -72,6 +72,7 @@ import app.grapheneos.camera.ITEM_TYPE_IMAGE
 import app.grapheneos.camera.ITEM_TYPE_VIDEO
 import app.grapheneos.camera.R
 import app.grapheneos.camera.capturer.ImageCapturer
+import app.grapheneos.camera.shareCapturedItem
 import app.grapheneos.camera.capturer.VideoCapturer
 import app.grapheneos.camera.capturer.getVideoThumbnail
 import app.grapheneos.camera.databinding.ActivityMainBinding
@@ -1090,10 +1091,8 @@ open class MainActivity : AppCompatActivity(),
             return
         }
 
-        Intent(Intent.ACTION_SEND).let {
-            it.putExtra(Intent.EXTRA_STREAM, item.uri)
-            it.setDataAndType(item.uri, item.mimeType())
-            startActivity(Intent.createChooser(it, getString(R.string.share_image)))
+        if (!shareCapturedItem(item)) {
+            showMessage(R.string.unable_to_share_media)
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd2587749..a917be8de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -132,6 +132,7 @@
     <string name="sharing_not_allowed">Sharing images in secure mode is not allowed.</string>
     <string name="edit_image">Edit Image</string>
     <string name="share_image">Share Image</string>
+    <string name="unable_to_share_media">Unable to share this file</string>
     <string name="delete">Delete</string>
     <string name="delete_title">Are you sure?</string>
     <string name="deleted_successfully">File deleted successfully</string>

From 27b68d5af1e12ac2efc15bf2a4423a4e74a79ec2 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Fri, 24 Jul 2026 22:30:11 +0300
Subject: [PATCH 20/51] Tell the user instead of crashing when an edited file
 is no longer accessible

---
 .../camera/EditMediaRegressionTest.kt         | 137 ++++++++++++++++++
 .../camera/ShareMediaRegressionTest.kt        |   4 +-
 .../app/grapheneos/camera/CapturedItems.kt    |  33 ++++-
 .../camera/ui/activities/InAppGallery.kt      |  23 +--
 .../camera/ui/activities/MainActivity.kt      |   2 +-
 app/src/main/res/values/strings.xml           |   1 +
 6 files changed, 176 insertions(+), 24 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/EditMediaRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/EditMediaRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/EditMediaRegressionTest.kt
new file mode 100644
index 000000000..71c86d8b9
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/EditMediaRegressionTest.kt
@@ -0,0 +1,137 @@
+package app.grapheneos.camera
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import app.grapheneos.camera.util.getParcelableExtra
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EditMediaRegressionTest {
+
+    private val staleItem = CapturedItem(
+        ITEM_TYPE_IMAGE,
+        "20260724_120000",
+        Uri.parse("content://media/external/images/media/987654321"),
+    )
+
+    private fun <T : HostActivity> T.attached(): T {
+        attach(InstrumentationRegistry.getInstrumentation().targetContext)
+        return this
+    }
+
+    /**
+     * Regression test for the production crash: startActivity() computes the uri grant for a
+     * directly started editor and throws a SecurityException when the app has lost access to
+     * the item, and the exception went uncaught through the edit path.
+     */
+    @Test
+    @UiThreadTest
+    fun edit_whenUriGrantIsDenied_reportsFailureInsteadOfCrashing() {
+        val host = GrantDenyingHostActivity().attached()
+
+        assertEquals(
+            R.string.unable_to_edit_media,
+            editCapturedItem(host, staleItem, useDefaultEditor = true),
+        )
+    }
+
+    @Test
+    @UiThreadTest
+    fun editWith_whenUriGrantIsDenied_reportsFailureInsteadOfCrashing() {
+        val host = GrantDenyingHostActivity().attached()
+
+        assertEquals(
+            R.string.unable_to_edit_media,
+            editCapturedItem(host, staleItem, useDefaultEditor = false),
+        )
+    }
+
+    @Test
+    @UiThreadTest
+    fun edit_whenNoEditorIsInstalled_reportsMissingEditor() {
+        val host = NoEditorHostActivity().attached()
+
+        assertEquals(
+            R.string.no_editor_app_error,
+            editCapturedItem(host, staleItem, useDefaultEditor = true),
+        )
+    }
+
+    @Test
+    @UiThreadTest
+    fun edit_launchesEditorWithItemUri() {
+        val host = RecordingHostActivity().attached()
+
+        assertNull(editCapturedItem(host, staleItem, useDefaultEditor = true))
+
+        val edit = host.launched
+        assertNotNull(edit)
+        assertEquals(Intent.ACTION_EDIT, edit!!.action)
+        assertEquals(staleItem.uri, edit.data)
+        assertEquals(staleItem.mimeType(), edit.type)
+        assertEquals(staleItem.uri, getParcelableExtra<Uri>(edit, Intent.EXTRA_STREAM))
+        assertTrue(edit.flags and Intent.FLAG_GRANT_READ_URI_PERMISSION != 0)
+    }
+
+    @Test
+    @UiThreadTest
+    fun editWith_launchesChooserWithEditIntent() {
+        val host = RecordingHostActivity().attached()
+
+        assertNull(editCapturedItem(host, staleItem, useDefaultEditor = false))
+
+        val chooser = host.launched
+        assertNotNull(chooser)
+        assertEquals(Intent.ACTION_CHOOSER, chooser!!.action)
+        assertFalse(chooser.getBooleanExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, true))
+
+        val edit = getParcelableExtra<Intent>(chooser, Intent.EXTRA_INTENT)!!
+        assertEquals(Intent.ACTION_EDIT, edit.action)
+        assertEquals(staleItem.uri, edit.data)
+        assertEquals(staleItem.mimeType(), edit.type)
+        assertTrue(edit.flags and Intent.FLAG_GRANT_READ_URI_PERMISSION != 0)
+    }
+
+    abstract class HostActivity : Activity() {
+        fun attach(base: Context) = attachBaseContext(base)
+    }
+
+    /**
+     * Behaves like the platform's server-side grant check inside startActivity(): it throws a
+     * SecurityException when the calling app cannot itself access the uri it is granting.
+     */
+    private class GrantDenyingHostActivity : HostActivity() {
+        override fun startActivity(intent: Intent?) {
+            throw SecurityException(
+                "UID 10999 does not have permission to uri 0 @ content://media/external/images/media/987654321"
+            )
+        }
+    }
+
+    private class NoEditorHostActivity : HostActivity() {
+        override fun startActivity(intent: Intent?) {
+            throw ActivityNotFoundException("No Activity found to handle Intent")
+        }
+    }
+
+    /** Captures the launched intent instead of starting an editor. */
+    private class RecordingHostActivity : HostActivity() {
+        var launched: Intent? = null
+
+        override fun startActivity(intent: Intent?) {
+            launched = intent
+        }
+    }
+}
diff --git a/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
index b2bba922b..d013b6303 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
@@ -39,7 +39,7 @@ class ShareMediaRegressionTest {
     fun share_whenUriGrantIsDenied_reportsFailureInsteadOfCrashing() {
         val host = OemPreGrantHostActivity().attached()
 
-        assertFalse(host.shareCapturedItem(staleItem))
+        assertFalse(shareCapturedItem(host, staleItem))
     }
 
     @Test
@@ -47,7 +47,7 @@ class ShareMediaRegressionTest {
     fun share_launchesChooserWithItemUri() {
         val host = ChooserRecordingHostActivity().attached()
 
-        assertTrue(host.shareCapturedItem(staleItem))
+        assertTrue(shareCapturedItem(host, staleItem))
 
         val chooser = host.launched
         assertNotNull(chooser)
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index f79f439fb..ab3f433d0 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -2,6 +2,7 @@ package app.grapheneos.camera
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.ContentResolver
 import android.content.Intent
 import android.content.ContentUris
@@ -14,6 +15,7 @@ import android.provider.BaseColumns
 import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.util.Log
+import androidx.annotation.StringRes
 import app.grapheneos.camera.CamConfig.SettingValues
 import app.grapheneos.camera.util.edit
 import kotlin.jvm.Throws
@@ -85,14 +87,14 @@ class CapturedItem(
 // Some OEM builds grant the shared uri to the target inside startActivity(), which throws a
 // SecurityException when this app has itself lost access to the item (e.g. it was deleted
 // externally, or its persisted uri came from a restored backup)
-internal fun Activity.shareCapturedItem(item: CapturedItem): Boolean {
+internal fun shareCapturedItem(activity: Activity, item: CapturedItem): Boolean {
     val intent = Intent(Intent.ACTION_SEND).apply {
         putExtra(Intent.EXTRA_STREAM, item.uri)
         setDataAndType(item.uri, item.mimeType())
         addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
     return try {
-        startActivity(Intent.createChooser(intent, getString(R.string.share_image)))
+        activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_image)))
         true
     } catch (e: SecurityException) {
         Log.e(CapturedItems.TAG, "unable to share ${item.uiName()}", e)
@@ -100,6 +102,33 @@ internal fun Activity.shareCapturedItem(item: CapturedItem): Boolean {
     }
 }
 
+// The uri grant for a directly started editor is computed inside startActivity() on all Android
+// versions (and inside the chooser start on the OEM builds mentioned above), failing the same way
+// when the item is no longer accessible. Returns the error message to show, or null on success
+@StringRes
+internal fun editCapturedItem(activity: Activity, item: CapturedItem, useDefaultEditor: Boolean): Int? {
+    val intent = Intent(Intent.ACTION_EDIT).apply {
+        setDataAndType(item.uri, item.mimeType())
+        putExtra(Intent.EXTRA_STREAM, item.uri)
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+    }
+    return try {
+        if (useDefaultEditor) {
+            activity.startActivity(intent)
+        } else {
+            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.edit_image)).apply {
+                putExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, false)
+            })
+        }
+        null
+    } catch (e: ActivityNotFoundException) {
+        R.string.no_editor_app_error
+    } catch (e: SecurityException) {
+        Log.e(CapturedItems.TAG, "unable to edit ${item.uiName()}", e)
+        R.string.unable_to_edit_media
+    }
+}
+
 object CapturedItems {
     const val TAG = "CapturedItems"
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index b8986f09d..74cd4c4fb 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -3,7 +3,6 @@ package app.grapheneos.camera.ui.activities
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.database.Cursor
@@ -43,6 +42,7 @@ import app.grapheneos.camera.GallerySliderAdapter
 import app.grapheneos.camera.ITEM_TYPE_VIDEO
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.GalleryBinding
+import app.grapheneos.camera.editCapturedItem
 import app.grapheneos.camera.shareCapturedItem
 import app.grapheneos.camera.util.getParcelableArrayListExtra
 import app.grapheneos.camera.util.getParcelableExtra
@@ -205,23 +205,8 @@ class InAppGallery : AppCompatActivity() {
 
         val curItem = getCurrentItem() ?: return
 
-        val editIntent = Intent(Intent.ACTION_EDIT).apply {
-            setDataAndType(curItem.uri, curItem.mimeType())
-            putExtra(Intent.EXTRA_STREAM, curItem.uri)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        }
-
-        if (withDefault) {
-            try {
-                startActivity(editIntent)
-            } catch (_: ActivityNotFoundException) {
-                showMessage(getString(R.string.no_editor_app_error))
-            }
-        } else {
-            val chooser = Intent.createChooser(editIntent, getString(R.string.edit_image)).apply {
-                putExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, false)
-            }
-            startActivity(chooser)
+        editCapturedItem(this, curItem, useDefaultEditor = withDefault)?.let {
+            showMessage(getString(it))
         }
     }
 
@@ -519,7 +504,7 @@ class InAppGallery : AppCompatActivity() {
 
         val curItem = getCurrentItem() ?: return
 
-        if (!shareCapturedItem(curItem)) {
+        if (!shareCapturedItem(this, curItem)) {
             showMessage(getString(R.string.unable_to_share_media))
         }
     }
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index ec87ad680..d0d236943 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1091,7 +1091,7 @@ open class MainActivity : AppCompatActivity(),
             return
         }
 
-        if (!shareCapturedItem(item)) {
+        if (!shareCapturedItem(this, item)) {
             showMessage(R.string.unable_to_share_media)
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a917be8de..cf6bd33f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,6 +133,7 @@
     <string name="edit_image">Edit Image</string>
     <string name="share_image">Share Image</string>
     <string name="unable_to_share_media">Unable to share this file</string>
+    <string name="unable_to_edit_media">Unable to edit this file</string>
     <string name="delete">Delete</string>
     <string name="delete_title">Are you sure?</string>
     <string name="deleted_successfully">File deleted successfully</string>

From a20703a55a229af4aa53825cd6fda63ba4e4692a Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:10:48 +0300
Subject: [PATCH 21/51] Delete the never-enabled file name format settings

---
 .../java/app/grapheneos/camera/CamConfig.kt   |  36 ------
 .../camera/ui/activities/MoreSettings.kt      |  14 ---
 app/src/main/res/drawable/rename.xml          |  13 --
 app/src/main/res/layout/more_settings.xml     | 113 ------------------
 app/src/main/res/values/strings.xml           |   2 -
 5 files changed, 178 deletions(-)
 delete mode 100644 app/src/main/res/drawable/rename.xml

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 6960d2822..1157ab969 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -125,8 +125,6 @@ class CamConfig(private val mActivity: MainActivity) {
 
             const val WAIT_FOR_FOCUS_LOCK = "wait_for_focus_lock"
 
-            // const val IMAGE_FILE_FORMAT = "image_quality"
-            // const val VIDEO_FILE_FORMAT = "video_quality"
         }
 
         object Default {
@@ -172,8 +170,6 @@ class CamConfig(private val mActivity: MainActivity) {
 
             const val WAIT_FOR_FOCUS_LOCK = false
 
-            // const val IMAGE_FILE_FORMAT = ""
-            // const val VIDEO_FILE_FORMAT = ""
         }
     }
 
@@ -619,38 +615,6 @@ class CamConfig(private val mActivity: MainActivity) {
             return mActivity is CaptureActivity
         }
 
-//    var imageFormat : String
-//        get() {
-//            return commonPref.getString(
-//                SettingValues.Key.IMAGE_FILE_FORMAT,
-//                SettingValues.Default.IMAGE_FILE_FORMAT
-//            )!!
-//        }
-//        set(value) {
-//            val editor = commonPref.edit()
-//            editor.putString(
-//                SettingValues.Key.IMAGE_FILE_FORMAT,
-//                value
-//            )
-//            editor.apply()
-//        }
-//
-//    var videoFormat : String
-//        get() {
-//            return commonPref.getString(
-//                SettingValues.Key.VIDEO_FILE_FORMAT,
-//                SettingValues.Default.VIDEO_FILE_FORMAT
-//            )!!
-//        }
-//        set(value) {
-//            val editor = commonPref.edit()
-//            editor.putString(
-//                SettingValues.Key.VIDEO_FILE_FORMAT,
-//                value
-//            )
-//            editor.apply()
-//        }
-
     private fun saveLastCapturedItem(item: CapturedItem, editor: SharedPreferences.Editor) {
         editor.putInt(SettingValues.Key.LAST_CAPTURED_ITEM_TYPE, item.type)
         editor.putString(SettingValues.Key.LAST_CAPTURED_ITEM_DATE_STRING, item.dateString)
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index 58252df05..b5ef9d234 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -41,8 +41,6 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
     private lateinit var rootView: View
 
     private lateinit var pQField: EditText
-    private lateinit var iFField: EditText
-    private lateinit var vFField: EditText
 
     private val dirPickerHandler = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -151,12 +149,6 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
         pQField.filters = arrayOf(NumInputFilter(this))
         pQField.setOnEditorActionListener(this)
 
-        iFField = binding.imageFormatSettingField
-        iFField.setOnEditorActionListener(this)
-
-        vFField = binding.videoFormatSettingField
-        vFField.setOnEditorActionListener(this)
-
         val exifToggle = binding.removeExifToggle
         val exifToggleSetting = binding.removeExifSetting
 
@@ -321,12 +313,6 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
         } else {
             camConfig.photoQuality = quality
         }
-
-//        // Dump state of image format
-//        camConfig.imageFormat = iFField.text.toString()
-//
-//        // Dump state of video format
-//        camConfig.videoFormat = vFField.text.toString()
     }
 
     override fun onEditorAction(p0: TextView?, id: Int, p2: KeyEvent?): Boolean {
diff --git a/app/src/main/res/drawable/rename.xml b/app/src/main/res/drawable/rename.xml
deleted file mode 100644
index 945d95763..000000000
--- a/app/src/main/res/drawable/rename.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    android:height="24dp"
-    android:tint="?android:textColorPrimary"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18.41,5.8L17.2,4.59c-0.78,-0.78 -2.05,-0.78 -2.83,0l-2.68,2.68L3,15.96V20h4.04l8.74,-8.74 2.63,-2.63c0.79,-0.78 0.79,-2.05 0,-2.83zM6.21,18H5v-1.21l8.66,-8.66 1.21,1.21L6.21,18zM11,20l4,-4h6v4H11z"/>
-
-</vector>
diff --git a/app/src/main/res/layout/more_settings.xml b/app/src/main/res/layout/more_settings.xml
index fe2bd7bdf..7f4fa3fe3 100644
--- a/app/src/main/res/layout/more_settings.xml
+++ b/app/src/main/res/layout/more_settings.xml
@@ -664,119 +664,6 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/image_format_setting"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    android:paddingStart="10dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
-                    android:paddingBottom="10dp"
-                    android:visibility="gone">
-
-                    <ImageView
-                        android:id="@+id/image_format_setting_icon"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:contentDescription="@string/image_file_name_format"
-                        android:paddingStart="4dp"
-                        android:paddingEnd="8dp"
-                        android:src="@drawable/rename" />
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/image_format_setting_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:paddingBottom="2dp"
-                            android:text="@string/image_file_name_format"
-                            android:textColor="?android:textColorPrimary"
-                            android:textSize="16sp" />
-
-                        <AutoCompleteTextView
-                            android:id="@+id/image_format_setting_field"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:imeOptions="actionDone"
-                            android:importantForAutofill="no"
-                            android:inputType="text"
-                            android:labelFor="@id/image_format_setting_title"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:textSize="14sp"
-                            tools:ignore="LabelFor" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/video_format_setting"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    android:paddingStart="10dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
-                    android:paddingBottom="10dp"
-                    android:visibility="gone">
-
-                    <ImageView
-                        android:id="@+id/video_format_setting_icon"
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:contentDescription="@string/video_file_name_format"
-                        android:paddingStart="4dp"
-                        android:paddingEnd="8dp"
-                        android:src="@drawable/rename" />
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/video_format_setting_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:paddingBottom="2dp"
-                            android:text="@string/video_file_name_format"
-                            android:textColor="?android:textColorPrimary"
-                            android:textSize="16sp" />
-
-                        <AutoCompleteTextView
-                            android:id="@+id/video_format_setting_field"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:imeOptions="actionDone"
-                            android:importantForAutofill="no"
-                            android:inputType="text"
-                            android:labelFor="@id/video_format_setting_title"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:textSize="14sp"
-                            tools:ignore="LabelFor" />
-
-                    </LinearLayout>
-                </LinearLayout>
-
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf6bd33f8..b7860165a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,8 +102,6 @@
 
     <string name="storage">Storage</string>
     <string name="storage_location">Storage Location</string>
-    <string name="image_file_name_format">Image File Name Format</string>
-    <string name="video_file_name_format">Video File Name Format</string>
     <string name="revert_back_to_dcim">Revert back to DCIM</string>
 
     <string name="image_quality">Image Quality</string>

From eb8005142e8eb6157c1c296aa7dbe0dd43f9f877 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:11:17 +0300
Subject: [PATCH 22/51] Delete the double-tap gesture detector that only logged
 and other dead code

---
 .../camera/ui/activities/MainActivity.kt      | 63 -------------------
 1 file changed, 63 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index d0d236943..6709a2eeb 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -24,7 +24,6 @@ import android.provider.Settings
 import android.text.util.Linkify
 import android.util.Log
 import android.view.GestureDetector
-import android.view.GestureDetector.SimpleOnGestureListener
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.ScaleGestureDetector
@@ -153,7 +152,6 @@ open class MainActivity : AppCompatActivity(),
     lateinit var captureButton: ImageButton
 
     private lateinit var scaleGestureDetector: ScaleGestureDetector
-    private lateinit var dbTapGestureDetector: GestureDetector
     lateinit var timerView: TextView
     lateinit var thirdOption: View
     lateinit var imagePreview: ShapeableImageView
@@ -613,27 +611,6 @@ open class MainActivity : AppCompatActivity(),
         previewContainer = binding.previewContainer
         bottomOverlay = binding.bottomOverlay
         scaleGestureDetector = ScaleGestureDetector(this, this)
-        dbTapGestureDetector = GestureDetector(this, object : SimpleOnGestureListener() {
-            override fun onDoubleTap(e: MotionEvent): Boolean {
-                Log.i(TAG, "===============Double tap detected.=========")
-//                val zoomState = config.camera!!.cameraInfo.zoomState.value
-//                if (zoomState != null) {
-//                    val start = zoomState.linearZoom
-//                    var end = start * 1.5f
-//                    if (end < 0.25f) end = 0.25f else if (end > zoomState.maxZoomRatio) end =
-//                        zoomState.maxZoomRatio
-//                    val animator = ValueAnimator.ofFloat(start, end)
-//                    animator.duration = 300
-//                    animator.addUpdateListener { valueAnimator: ValueAnimator ->
-//                        config.camera!!.cameraControl.setLinearZoom(
-//                            valueAnimator.animatedValue as Float
-//                        )
-//                    }
-//                    animator.start()
-//                }
-                return super.onDoubleTap(e)
-            }
-        })
 
         tabLayout = binding.cameraModeTabs
 
@@ -787,38 +764,6 @@ open class MainActivity : AppCompatActivity(),
         }
 
         cancelButtonView = binding.cancelButton
-//        cancelButtonView.setOnClickListener(object : View.OnClickListener {
-//
-//            val SWITCH_ANIM_DURATION = 150
-//            override fun onClick(v: View) {
-//
-//                val imgID = if (config.isVideoMode) R.drawable.video_camera else R.drawable.camera
-//                config.switchCameraMode()
-//                val oa1 = ObjectAnimator.ofFloat(v, "scaleX", 1f, 0f)
-//                val oa2 = ObjectAnimator.ofFloat(v, "scaleX", 0f, 1f)
-//                oa1.interpolator = DecelerateInterpolator()
-//                oa2.interpolator = AccelerateDecelerateInterpolator()
-//                oa1.duration = SWITCH_ANIM_DURATION.toLong()
-//                oa2.duration = SWITCH_ANIM_DURATION.toLong()
-//                oa1.addListener(object : AnimatorListenerAdapter() {
-//                    override fun onAnimationEnd(animation: Animator) {
-//                        super.onAnimationEnd(animation)
-//                        cancelButtonView.setImageResource(imgID)
-//                        oa2.start()
-//                    }
-//                })
-//                oa1.start()
-//                if (config.isVideoMode) {
-//                    captureButton.setImageResource(R.drawable.recording)
-//                    cbText.visibility = View.INVISIBLE
-//                } else {
-//                    captureButton.setImageResource(R.drawable.camera_shutter)
-//                    if (timerDuration != 0) {
-//                        cbText.visibility = View.VISIBLE
-//                    }
-//                }
-//            }
-//        })
 
         zoomBar = binding.zoomBar
         zoomBar.setMainActivity(this)
@@ -1229,13 +1174,7 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
-//    private val fTHandler : Handler = Handler(Looper.getMainLooper())
-//    private val fTRunnable : Runnable = Runnable {
-//        config.mPlayer.playFocusCompleteSound()
-//    }
-
     override fun onTouch(v: View, event: MotionEvent): Boolean {
-        dbTapGestureDetector.onTouchEvent(event)
         scaleGestureDetector.onTouchEvent(event)
         gestureDetector.onTouchEvent(event)
 
@@ -1270,8 +1209,6 @@ open class MainActivity : AppCompatActivity(),
                 focusBuilder.disableAutoCancel()
             } else {
                 focusBuilder.setAutoCancelDuration(camConfig.focusTimeout, TimeUnit.SECONDS)
-//                fTHandler.removeCallbacks(fTRunnable)
-//                fTHandler.postDelayed(fTRunnable, focusTimeout * 1000)
             }
 
             camConfig.camera!!.cameraControl.startFocusAndMetering(focusBuilder.build())

From a76c7e8b8901ad893ad3603f4268694fa313021f Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:11:43 +0300
Subject: [PATCH 23/51] Record which upstream release each androidxc fork came
 from

---
 .../main/java/androidxc/camera/core/impl/utils/Exif.java   | 4 ++++
 .../java/androidxc/exifinterface/media/ExifInterface.java  | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java b/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
index 99cc153e6..45d360844 100644
--- a/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
+++ b/app/src/main/java/androidxc/camera/core/impl/utils/Exif.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// Fork of androidx.camera.core.impl.utils.Exif from androidx.camera:camera-core:1.6.1, moved into
+// the androidxc package so that it can use the forked ExifInterface. Local changes are marked
+// "androidxc:" — keep them when syncing with a newer upstream release.
 package androidxc.camera.core.impl.utils;
 
 import android.location.Location;
@@ -606,6 +609,7 @@ public void flipHorizontally() {
         return mExifInterface.getAttribute(ExifInterface.TAG_XMP);
     }
 
+    // androidxc: upstream marks this @VisibleForTesting, but ImageSaver writes EXIF through it
     public @NonNull ExifInterface getExifInterface() {
         return mExifInterface;
     }
diff --git a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
index a1328eb25..d3dbd109d 100644
--- a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
+++ b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// Fork of androidx.exifinterface:exifinterface:1.4.2, moved into the androidxc package so that it
+// can be modified. Local changes are marked "androidxc:" — keep them when syncing with a newer
+// upstream release.
 package androidxc.exifinterface.media;
 
 import static androidxc.exifinterface.media.ExifInterfaceUtils.closeFileDescriptor;
@@ -4983,6 +4986,10 @@ public void saveAttributes() throws IOException {
         mThumbnailBytes = null;
     }
 
+    /**
+     * androidxc: writes the image data of {@code original} out to {@code out} with the attributes
+     * of this instance, so that a capture can be edited without a temporary file on disk.
+     */
     public void saveAttributes(InputStream original, OutputStream out) throws IOException {
         if (!isSupportedFormatForSavingAttributes(mMimeType)) {
             throw new IOException("ExifInterface only supports saving attributes for JPEG, PNG, "

From aab43e344bd9fa5729a767aaa94107ede8b718aa Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:11:49 +0300
Subject: [PATCH 24/51] Name the formats saveAttributes really supports in its
 error message

---
 .../main/java/androidxc/exifinterface/media/ExifInterface.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
index d3dbd109d..e3996eb56 100644
--- a/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
+++ b/app/src/main/java/androidxc/exifinterface/media/ExifInterface.java
@@ -4993,7 +4993,7 @@ public void saveAttributes() throws IOException {
     public void saveAttributes(InputStream original, OutputStream out) throws IOException {
         if (!isSupportedFormatForSavingAttributes(mMimeType)) {
             throw new IOException("ExifInterface only supports saving attributes for JPEG, PNG, "
-                    + "and DNG formats.");
+                    + "and WebP formats.");
         }
 
         if (mHasThumbnail && mHasThumbnailStrips && !mAreThumbnailStripsConsecutive) {

From 91ae1676ae041cfaa4135301994beabf6f1e0aad Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:13:33 +0300
Subject: [PATCH 25/51] Share the wake, wait and recording helpers between the
 instrumented tests

---
 .../camera/InAppGalleryRegressionTest.kt      |   5 +
 .../app/grapheneos/camera/ScreenAwakeRule.kt  |  64 ++++++++++
 .../camera/VideoCapturerRegressionTest.kt     | 114 ++++++++----------
 .../camera/VideoPlayerRegressionTest.kt       |   5 +
 .../java/app/grapheneos/camera/WaitUntil.kt   |  27 +++++
 5 files changed, 154 insertions(+), 61 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/ScreenAwakeRule.kt
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/WaitUntil.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt
index a087bd0ee..588de3c0e 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/InAppGalleryRegressionTest.kt
@@ -14,12 +14,17 @@ import org.junit.After
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class InAppGalleryRegressionTest {
 
+    /** Launching an activity into a dozing, locked device gives it no visible window. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
     private val app = InstrumentationRegistry.getInstrumentation()
         .targetContext.applicationContext as Application
     private val stall = StalledMediaScan()
diff --git a/app/src/androidTest/java/app/grapheneos/camera/ScreenAwakeRule.kt b/app/src/androidTest/java/app/grapheneos/camera/ScreenAwakeRule.kt
new file mode 100644
index 000000000..5c9660ee6
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/ScreenAwakeRule.kt
@@ -0,0 +1,64 @@
+package app.grapheneos.camera
+
+import android.app.KeyguardManager
+import android.os.ParcelFileDescriptor
+import android.os.PowerManager
+import android.os.SystemClock
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.rules.ExternalResource
+
+/**
+ * Turns the screen on and dismisses an insecure keyguard before each test.
+ *
+ * An activity launched into a dozing, locked device gets no visible window, and one without a
+ * visible window is already stopped and receives no camera frames or animation callbacks. Tests
+ * then time out as if the app were broken, or pause an activity that was never resumed and pass
+ * without exercising anything. The screen also dozes off on its own part way through a run, so
+ * every test that launches an activity needs this.
+ */
+class ScreenAwakeRule : ExternalResource() {
+
+    override fun before() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val power = context.getSystemService(PowerManager::class.java)!!
+        val keyguard = context.getSystemService(KeyguardManager::class.java)!!
+
+        val deadline = SystemClock.uptimeMillis() + 10_000
+        while (true) {
+            val awake = power.isInteractive
+            val locked = keyguard.isKeyguardLocked
+            if (awake && !locked) return
+
+            // A secured keyguard only answers `wm dismiss-keyguard` with its credential prompt, so
+            // waiting out the deadline would tell the same story ten seconds later.
+            if (locked && keyguard.isDeviceSecure) {
+                throw AssertionError(
+                    "The keyguard is up and secured, and no test can enter the credential:" +
+                            " unlock the device before running the suite."
+                )
+            }
+
+            if (SystemClock.uptimeMillis() > deadline) {
+                throw AssertionError(
+                    when {
+                        !awake -> "The screen would not turn on."
+                        else -> "The keyguard is still up."
+                    }
+                )
+            }
+
+            // Reissued every round rather than once: the device can doze off again between the
+            // wake-up and the unlock, and a keyguard can take more than one dismissal to go away.
+            if (!awake) shell("input keyevent KEYCODE_WAKEUP")
+            if (locked) shell("wm dismiss-keyguard")
+            Thread.sleep(200)
+        }
+    }
+
+    /** Reading to EOF waits for the command to finish. */
+    private fun shell(command: String) {
+        val output = InstrumentationRegistry.getInstrumentation().uiAutomation
+            .executeShellCommand(command)
+        ParcelFileDescriptor.AutoCloseInputStream(output).use { it.readBytes() }
+    }
+}
diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
index a574a555e..5ad094fb0 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -37,6 +37,10 @@ class VideoCapturerRegressionTest {
         Manifest.permission.RECORD_AUDIO,
     )
 
+    /** Recording only starts once the preview window is visible and producing frames. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
     /** Fires the callback twice, like a MediaPlayer error followed by normal completion. */
     private class DoubleFiringTunePlayer(activity: MainActivity) : TunePlayer(activity) {
         override fun playVRStartSound(handler: Handler, onPlayed: Runnable) {
@@ -66,12 +70,7 @@ class VideoCapturerRegressionTest {
      */
     @Test
     fun startRecording_toleratesDuplicateStartSoundCallback() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
-
+        recordingTest { scenario ->
             scenario.onActivity { activity ->
                 activity.camConfig.mPlayer = DoubleFiringTunePlayer(activity)
                 activity.videoCapturer.startRecording()
@@ -81,8 +80,6 @@ class VideoCapturerRegressionTest {
 
             scenario.onActivity { it.videoCapturer.stopRecording() }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
-
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
@@ -92,11 +89,7 @@ class VideoCapturerRegressionTest {
      */
     @Test
     fun stopRecording_duringDeferredStart_cancelsTheStart() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
+        recordingTest { scenario ->
             val pendingBefore = pendingVideoCount()
 
             lateinit var player: ManualTunePlayer
@@ -123,20 +116,13 @@ class VideoCapturerRegressionTest {
             waitUntil(scenario, "recording is running") { it.videoCapturer.isRecording }
             scenario.onActivity { it.videoCapturer.stopRecording() }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
-
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
     /** A pause requested while the start is queued must apply once the recording starts. */
     @Test
     fun pauseDuringDeferredStart_appliesWhenRecordingStarts() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
-
+        recordingTest { scenario ->
             lateinit var player: ManualTunePlayer
             scenario.onActivity { activity ->
                 player = ManualTunePlayer(activity)
@@ -146,6 +132,8 @@ class VideoCapturerRegressionTest {
                 player.deferred!!.run()
             }
 
+            // A fixed dwell, not a waitUntil: the assertion below is that the timer does *not*
+            // tick, and an absence cannot be polled for. Three seconds spans several tick periods.
             Thread.sleep(3000)
 
             scenario.onActivity { activity ->
@@ -158,8 +146,6 @@ class VideoCapturerRegressionTest {
                 activity.videoCapturer.stopRecording()
             }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
-
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
@@ -170,11 +156,7 @@ class VideoCapturerRegressionTest {
      */
     @Test
     fun failedRecording_doesNotLeaveOrphanedOutputEntry() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
+        recordingTest { scenario ->
             val pendingBefore = pendingVideoCount()
 
             lateinit var player: ManualTunePlayer
@@ -185,13 +167,13 @@ class VideoCapturerRegressionTest {
                 activity.videoCapturer.isPaused = true
                 player.deferred!!.run()
             }
+            // Let the recorder reach paused-recording, so that stopping it finalizes with
+            // ERROR_NO_VALID_DATA rather than racing the start
             Thread.sleep(300)
             scenario.onActivity { it.videoCapturer.stopRecording() }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
 
             assertEquals(pendingBefore, pendingVideoCount())
-
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
@@ -202,12 +184,7 @@ class VideoCapturerRegressionTest {
      */
     @Test
     fun recordingUiAnimations_unwrapWrappedCaptureButtonDrawable() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
-
+        recordingTest { scenario ->
             val shape = GradientDrawable()
             var dp8 = 0f
             var dp16 = 0f
@@ -230,20 +207,13 @@ class VideoCapturerRegressionTest {
             waitUntil(scenario, "corner radius animated back") {
                 abs(shape.cornerRadius - dp16) < 0.5f
             }
-
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
     /** A drawable with no shape inside must skip the animation, not crash the recording. */
     @Test
     fun recordingUi_toleratesUnknownCaptureButtonDrawable() {
-        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
-            waitUntil(scenario, "video use case is bound") {
-                it.camConfig.camera != null && it.camConfig.videoCapture != null
-            }
-            val capturedBefore = lastCapturedUri(scenario)
-
+        recordingTest { scenario ->
             scenario.onActivity { activity ->
                 activity.captureButton.setImageDrawable(ColorDrawable(Color.RED))
                 activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
@@ -256,10 +226,48 @@ class VideoCapturerRegressionTest {
             scenario.onActivity { it.videoCapturer.stopRecording() }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
 
-            deleteNewCapture(scenario, capturedBefore)
         }
     }
 
+    private fun recordingTest(body: (ActivityScenario<VideoOnlyActivity>) -> Unit) {
+        recordingTest({ ActivityScenario.launch(VideoOnlyActivity::class.java) }, body)
+    }
+
+    /**
+     * Hands [body] an activity whose recorder is ready, and cleans up after it either way: a failed
+     * assertion used to leave the recording it had started behind on the device.
+     */
+    private fun <A : MainActivity> recordingTest(
+        launch: () -> ActivityScenario<A>,
+        body: (ActivityScenario<A>) -> Unit,
+    ) {
+        launch().use { scenario ->
+            waitUntil(scenario, "video use case is bound") {
+                it.camConfig.camera != null && it.camConfig.videoCapture != null
+            }
+            val capturedBefore = lastCapturedUri(scenario)
+            try {
+                body(scenario)
+            } finally {
+                stopAndDeleteRecording(scenario, capturedBefore)
+            }
+        }
+    }
+
+    /**
+     * Every step is best-effort: this also runs after a failed assertion, where the activity may
+     * already be gone and where throwing would replace the failure the test is reporting.
+     */
+    private fun <A : MainActivity> stopAndDeleteRecording(
+        scenario: ActivityScenario<A>,
+        capturedBefore: Uri?,
+    ) {
+        runCatching { scenario.onActivity { it.videoCapturer.stopRecording() } }
+        runCatching {
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+        }
+        runCatching { deleteNewCapture(scenario, capturedBefore) }
+    }
     /** Pending entries are how in-flight and orphaned outputs appear in MediaStore. */
     private fun pendingVideoCount(): Int {
         val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
@@ -294,20 +302,4 @@ class VideoCapturerRegressionTest {
             }
         }
     }
-
-    private fun <A : MainActivity> waitUntil(
-        scenario: ActivityScenario<A>,
-        description: String,
-        timeoutMs: Long = 10_000,
-        condition: (A) -> Boolean,
-    ) {
-        val deadline = System.currentTimeMillis() + timeoutMs
-        while (System.currentTimeMillis() < deadline) {
-            var satisfied = false
-            scenario.onActivity { satisfied = condition(it) }
-            if (satisfied) return
-            Thread.sleep(100)
-        }
-        throw AssertionError("Timed out after ${timeoutMs}ms waiting until $description")
-    }
 }
diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt
index be82365ee..45dec6201 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoPlayerRegressionTest.kt
@@ -10,12 +10,17 @@ import androidx.test.platform.app.InstrumentationRegistry
 import app.grapheneos.camera.ui.activities.VideoPlayer
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class VideoPlayerRegressionTest {
 
+    /** Launching an activity into a dozing, locked device gives it no visible window. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
     /**
      * Regression test for the production crash: an IllegalStateException out of
      * VideoView.setVideoURI took down the process instead of closing the player.
diff --git a/app/src/androidTest/java/app/grapheneos/camera/WaitUntil.kt b/app/src/androidTest/java/app/grapheneos/camera/WaitUntil.kt
new file mode 100644
index 000000000..e05f391e6
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/WaitUntil.kt
@@ -0,0 +1,27 @@
+package app.grapheneos.camera
+
+import android.app.Activity
+import android.os.SystemClock
+import androidx.test.core.app.ActivityScenario
+
+/**
+ * Polls [condition] on the activity until it holds, and fails the test if it never does.
+ * [description] completes the sentence "waiting until ...".
+ */
+fun <A : Activity> waitUntil(
+    scenario: ActivityScenario<A>,
+    description: String,
+    timeoutMs: Long = 10_000,
+    condition: (A) -> Boolean,
+) {
+    // Not the wall clock, which an NTP sync part way through a run can move either way
+    val deadline = SystemClock.uptimeMillis() + timeoutMs
+    while (true) {
+        var satisfied = false
+        scenario.onActivity { satisfied = condition(it) }
+        if (satisfied) return
+        if (SystemClock.uptimeMillis() >= deadline) break
+        Thread.sleep(100)
+    }
+    throw AssertionError("Timed out after ${timeoutMs}ms waiting until $description")
+}

From 9a77f26bddd0252bc95b2a33d85207b24adce033 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:14:35 +0300
Subject: [PATCH 26/51] Stop the mode tab strip from acting on a stale scroll
 position

---
 .../grapheneos/camera/ui/BottomTabLayout.kt   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
index a69de7c52..1f6c8b71b 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
@@ -3,7 +3,6 @@ package app.grapheneos.camera.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
 import app.grapheneos.camera.CameraMode
 import com.google.android.material.tabs.TabLayout
 
@@ -57,27 +56,31 @@ class BottomTabLayout @JvmOverloads constructor(
     override fun onScrollChanged(x: Int, y: Int, oldX: Int, oldY: Int) {
         super.onScrollChanged(x, y, oldX, oldY)
 
-        if (snapPoints.last() != 0) {
+        // snapPoints is empty until the first layout pass, and goes stale when the tab set is
+        // rebuilt, so an index taken from it may no longer name a tab.
+        if (snapPoints.isEmpty() || snapPoints.last() == 0) {
+            return
+        }
 
-            for (i in 0 until snapPoints.size step 2) {
+        for (i in snapPoints.indices step 2) {
 
-                val start = snapPoints[i]
-                val end = snapPoints[i + 1]
+            val start = snapPoints[i]
+            val end = snapPoints[i + 1]
 
-                if (x in start..end) {
-                    val index = i / 2
-                    if (selectedTabPosition != index) {
-                        return selectTab(getTabAt(index))
-                    }
+            if (x in start..end) {
+                val index = i / 2
+                val tab = getTabAt(index) ?: return
+                if (selectedTabPosition != index) {
+                    selectTab(tab)
                 }
-
+                return
             }
+
         }
     }
 
     fun getTabAtX(x: Int): Tab? {
-        for (i in 0 until snapPoints.size step 2) {
-
+        for (i in snapPoints.indices step 2) {
             val start = snapPoints[i]
             val end = snapPoints[i + 1]
 
@@ -89,6 +92,7 @@ class BottomTabLayout @JvmOverloads constructor(
             }
 
         }
+
         return null
     }
 

From 51989610bdf1dff420ac4731a31d11ac2f388c27 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:16:47 +0300
Subject: [PATCH 27/51] Keep the mode tab strip in sync with the mode the
 camera is in

---
 .../camera/CameraModeTabsRegressionTest.kt    | 162 ++++++++++++++++++
 .../java/app/grapheneos/camera/Fling.kt       |  36 ++++
 .../java/app/grapheneos/camera/ModeTabs.kt    |  14 ++
 .../java/app/grapheneos/camera/CamConfig.kt   |  35 ++--
 .../grapheneos/camera/ui/BottomTabLayout.kt   |  11 ++
 .../camera/ui/activities/CaptureActivity.kt   |  10 +-
 .../camera/ui/activities/MainActivity.kt      |   4 +-
 .../camera/ui/activities/VideoOnlyActivity.kt |   8 +
 8 files changed, 259 insertions(+), 21 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/CameraModeTabsRegressionTest.kt
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/Fling.kt
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/ModeTabs.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/CameraModeTabsRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/CameraModeTabsRegressionTest.kt
new file mode 100644
index 000000000..de86d7da6
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/CameraModeTabsRegressionTest.kt
@@ -0,0 +1,162 @@
+package app.grapheneos.camera
+
+import android.Manifest
+import android.content.Intent
+import android.provider.MediaStore
+import android.view.ViewTreeObserver
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.ui.activities.CaptureActivity
+import app.grapheneos.camera.ui.activities.MainActivity
+import app.grapheneos.camera.ui.activities.VideoCaptureActivity
+import app.grapheneos.camera.ui.activities.VideoOnlyActivity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.atomic.AtomicInteger
+
+@RunWith(AndroidJUnit4::class)
+class CameraModeTabsRegressionTest {
+
+    @get:Rule
+    val grantPermissions: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.CAMERA,
+    )
+
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
+    /**
+     * The tab strip used to highlight whatever the user last touched, so a mode changed from code
+     * (a failed extension bind, the QR tile) left it pointing at another mode.
+     */
+    @Test
+    fun tabStrip_followsAModeChangedFromCode() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            awaitModeTabs(scenario)
+
+            scenario.onActivity { activity ->
+                activity.camConfig.switchMode(CameraMode.VIDEO)
+                assertEquals(CameraMode.VIDEO, activity.tabLayout.selectedTab?.tag)
+
+                activity.camConfig.switchMode(CameraMode.CAMERA)
+                assertEquals(CameraMode.CAMERA, activity.tabLayout.selectedTab?.tag)
+            }
+        }
+    }
+
+    /**
+     * Moving the highlight from within onLayout() made every pass request the next one, pinning the
+     * main thread at 100% for as long as the activity lived.
+     */
+    @Test
+    fun tabStrip_settlesAfterAModeChange() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            awaitModeTabs(scenario)
+
+            scenario.onActivity { it.camConfig.switchMode(CameraMode.VIDEO) }
+
+            // Counting passes rather than reading isLayoutRequested: a request issued from inside a
+            // layout pass is parked for the next traversal and the flag is cleared on the way, so it
+            // reads false between frames -- exactly where a sample would land.
+            val passes = AtomicInteger()
+            val listener = ViewTreeObserver.OnGlobalLayoutListener { passes.incrementAndGet() }
+            scenario.onActivity { it.tabLayout.viewTreeObserver.addOnGlobalLayoutListener(listener) }
+            Thread.sleep(WINDOW_MS)
+            scenario.onActivity {
+                it.tabLayout.viewTreeObserver.removeOnGlobalLayoutListener(listener)
+            }
+
+            // Rebinding the camera behind the mode change costs one pass. The livelock cost one per
+            // frame, so anything near this window's 30-60 frames is the regression coming back.
+            val observed = passes.get()
+            assertTrue("The tab strip was laid out $observed times in ${WINDOW_MS}ms", observed < 5)
+        }
+    }
+
+    /**
+     * The strip was only made transparent there, and a transparent strip still takes taps: a
+     * disabled parent does not disable its children.
+     */
+    @Test
+    fun videoOnlyActivity_buildsNoModeTabs() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { assertNoModeTabs(it) }
+    }
+
+    /**
+     * A capture session hides the strip but used to keep its tabs, so the swipe handlers -- which
+     * read the tab model, not the strip -- could still switch modes there.
+     */
+    @Test
+    fun captureSessions_buildNoModeTabs() {
+        launchCaptureSession(CaptureActivity::class.java, MediaStore.ACTION_IMAGE_CAPTURE)
+            .use { assertNoModeTabs(it) }
+        launchCaptureSession(VideoCaptureActivity::class.java, MediaStore.ACTION_VIDEO_CAPTURE)
+            .use { assertNoModeTabs(it) }
+    }
+
+    /**
+     * An app that asked for a single photo got the camera switched to another mode behind its back
+     * when the user flung the preview, because only the strip was hidden, not the tabs behind it.
+     */
+    @Test
+    fun flingInACaptureSession_leavesTheModeAlone() {
+        // Prove the synthetic fling reaches onFling() at all: without this leg the assertion below
+        // would hold just as well for a fling that never registered.
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            awaitModeTabs(scenario)
+
+            scenario.onActivity { activity ->
+                val tabs = activity.tabLayout
+                val next = tabs.getTabAt(tabs.selectedTabPosition + 1)
+                assertNotNull("no mode to the left of ${activity.camConfig.currentMode}", next)
+
+                flingLeft(activity)
+                assertEquals(next!!.tag as CameraMode, activity.camConfig.currentMode)
+            }
+        }
+
+        launchCaptureSession(CaptureActivity::class.java, MediaStore.ACTION_IMAGE_CAPTURE)
+            .use { scenario ->
+                waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+                // Flinging before the tabs were built would pass whether or not any get built
+                Thread.sleep(TAB_BUILD_DWELL_MS)
+
+                scenario.onActivity { activity ->
+                    flingLeft(activity)
+                    assertEquals(CameraMode.CAMERA, activity.camConfig.currentMode)
+                }
+            }
+    }
+
+    private fun <A : MainActivity> assertNoModeTabs(scenario: ActivityScenario<A>) {
+        waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+        // Asserting straight after the bind would also hold while a build was merely still
+        // pending, so outlast the extension probe round that used to precede one.
+        Thread.sleep(TAB_BUILD_DWELL_MS)
+
+        scenario.onActivity {
+            assertEquals("${it.javaClass.simpleName} built mode tabs", 0, it.tabLayout.tabCount)
+        }
+    }
+
+    private fun <A : MainActivity> launchCaptureSession(
+        activityClass: Class<A>,
+        action: String,
+    ): ActivityScenario<A> {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        return ActivityScenario.launch(Intent(context, activityClass).setAction(action))
+    }
+
+    private companion object {
+        private const val WINDOW_MS = 500L
+        private const val TAB_BUILD_DWELL_MS = 2000L
+    }
+}
diff --git a/app/src/androidTest/java/app/grapheneos/camera/Fling.kt b/app/src/androidTest/java/app/grapheneos/camera/Fling.kt
new file mode 100644
index 000000000..bb5514c2e
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/Fling.kt
@@ -0,0 +1,36 @@
+package app.grapheneos.camera
+
+import android.os.SystemClock
+import android.view.MotionEvent
+import app.grapheneos.camera.ui.activities.MainActivity
+
+private const val STEPS = 6
+private const val STEP_MS = 10L
+private const val STEP_PX = 80f
+private const val START_X = STEPS * STEP_PX
+
+/**
+ * Flings [activity]'s preview leftwards, the direction that reaches onSwipeLeft(). The swipe
+ * handlers are private and onFling() only fires above a velocity threshold, so feeding the
+ * activity's own detector a synthetic gesture is the way in. Call on the main thread.
+ */
+fun flingLeft(activity: MainActivity) {
+    val downTime = SystemClock.uptimeMillis()
+    val events = ArrayList<MotionEvent>(STEPS + 1)
+
+    // Uniform motion: every sample covers the same distance in the same time, so the detector
+    // measures one constant velocity, well clear of both its own threshold and onFling()'s.
+    events += MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, START_X, 0f, 0)
+    for (step in 1..STEPS) {
+        val action = if (step == STEPS) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE
+        events += MotionEvent.obtain(
+            downTime, downTime + step * STEP_MS, action, START_X - step * STEP_PX, 0f, 0
+        )
+    }
+
+    try {
+        events.forEach { activity.gestureDetector.onTouchEvent(it) }
+    } finally {
+        events.forEach { it.recycle() }
+    }
+}
diff --git a/app/src/androidTest/java/app/grapheneos/camera/ModeTabs.kt b/app/src/androidTest/java/app/grapheneos/camera/ModeTabs.kt
new file mode 100644
index 000000000..fab9f1227
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/ModeTabs.kt
@@ -0,0 +1,14 @@
+package app.grapheneos.camera
+
+import androidx.test.core.app.ActivityScenario
+import app.grapheneos.camera.ui.activities.MainActivity
+
+/**
+ * Waits until [scenario]'s mode tabs exist. The strip is built only once the vendor extension
+ * probes report back, well after the camera binds, so anything that acts on a tab -- or on the
+ * fling handlers that read the tab model -- has to wait for both.
+ */
+fun <A : MainActivity> awaitModeTabs(scenario: ActivityScenario<A>) {
+    waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+    waitUntil(scenario, "mode tabs are built") { it.tabLayout.tabCount > 0 }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 1157ab969..a81c69d54 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -298,7 +298,8 @@ class CamConfig(private val mActivity: MainActivity) {
             }
         }
 
-    private var currentMode: CameraMode = DEFAULT_CAMERA_MODE
+    var currentMode: CameraMode = DEFAULT_CAMERA_MODE
+        private set
 
     var aspectRatio: Int
         get() {
@@ -1709,23 +1710,10 @@ class CamConfig(private val mActivity: MainActivity) {
 
             // The bind never completed: currentMode still names the mode that was just disabled
             // and nothing is rendering into the preview. Refreshing the tabs alone would only
-            // *visually* select the default tab, leaving a frozen preview behind a lying tab
-            // bar. Switch for real -- switchMode() rebinds and its startCamera() refreshes the
-            // tabs -- and then align the visible selection for the case where the failed mode
-            // survives on the other lens, which keeps availableModes() unchanged so loadTabs()
-            // rebuilds nothing. Recursion stops because the default mode uses no extension.
+            // *visually* select another tab, leaving a frozen preview behind a lying tab bar.
+            // Switch for real -- switchMode() rebinds, moves the highlight and refreshes the tabs.
+            // Recursion stops because the default mode uses no extension.
             switchMode(DEFAULT_CAMERA_MODE)
-            if (mActivity.shouldShowCameraModeTabs()) {
-                val tabLayout = mActivity.tabLayout
-                for (i in 0 until tabLayout.tabCount) {
-                    val tab = tabLayout.getTabAt(i) ?: continue
-                    if (tab.tag == DEFAULT_CAMERA_MODE) {
-                        tabLayout.selectTab(tab)
-                        tabLayout.centerTab(tab)
-                        break
-                    }
-                }
-            }
             return
         }
 
@@ -1948,7 +1936,9 @@ class CamConfig(private val mActivity: MainActivity) {
                 }
                 tab.tag = mode
 
-                tabLayout.addTab(tab, mode == DEFAULT_CAMERA_MODE)
+                // Highlight the mode the camera is really in, not the default one: the tabs are
+                // also rebuilt long after startup, once the extension probes report back.
+                tabLayout.addTab(tab, mode == currentMode)
             }
         }
     }
@@ -1960,6 +1950,15 @@ class CamConfig(private val mActivity: MainActivity) {
 
         currentMode = mode
 
+        // The strip highlights whatever the user last touched, but a mode can also change without
+        // a touch: keep the highlight on the mode the camera is actually in.
+        if (mActivity.shouldShowCameraModeTabs()) {
+            mActivity.tabLayout.getTabForMode(mode)?.let { tab ->
+                mActivity.tabLayout.selectTab(tab)
+                mActivity.tabLayout.centerTab(tab)
+            }
+        }
+
         mActivity.cancelFocusTimer()
 
         isQRMode = mode == CameraMode.QR_SCAN
diff --git a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
index 1f6c8b71b..a5738d3d3 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
@@ -21,6 +21,17 @@ class BottomTabLayout @JvmOverloads constructor(
             return getTabAt(selectedTabPosition)
         }
 
+    fun getTabForMode(mode: CameraMode): Tab? {
+        for (index in 0 until tabCount) {
+            val tab = getTabAt(index)
+            if (tab?.tag == mode) {
+                return tab
+            }
+        }
+
+        return null
+    }
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         super.onLayout(changed, l, t, r, b)
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
index 05174b418..0863bdffa 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
@@ -71,8 +71,8 @@ open class CaptureActivity : MainActivity() {
 
         }, CAPTURE_BUTTON_APPEARANCE_DELAY)
 
-        // Remove the modes tab layout as we do not want the user to be able to switch to
-        // another custom mode in this state
+        // Redundant now that no tabs get built here (see shouldShowCameraModeTabs), but kept so a
+        // regression in that override cannot hand the user a mode switcher mid-capture
         tabLayout.visibility = View.INVISIBLE
 
         // Remove the margin so that that the previewView can take some more space
@@ -124,6 +124,12 @@ open class CaptureActivity : MainActivity() {
         // Display the activity
     }
 
+    /**
+     * Hiding the strip is not enough on its own: a fling reads the tab model rather than the strip,
+     * so it switched modes here anyway. There is no mode to switch to in a capture session.
+     */
+    override fun shouldShowCameraModeTabs() = false
+
     fun takePicture() {
 
         showMessage(
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 6709a2eeb..e85a9843b 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1018,8 +1018,10 @@ open class MainActivity : AppCompatActivity(),
         val selectedTab = tab ?: tabLayout.selectedTab
         if (selectedTab != null) {
             val mode = selectedTab.tag as CameraMode
+            // The strip has to follow the touch even when the mode does not change, so do not
+            // leave this to switchMode(), which returns early for the mode it is already in.
+            tabLayout.selectTab(selectedTab)
             tabLayout.centerTab(selectedTab)
-            tab?.let { tabLayout.centerTab(it) }
             camConfig.switchMode(mode)
             resetAutoSleep()
         }
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
index a6ccdb50e..eff60349e 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoOnlyActivity.kt
@@ -10,6 +10,8 @@ class VideoOnlyActivity : MainActivity() {
 
         setCaptureButtonIcon(R.drawable.recording, R.string.start_recording)
 
+        // Kept transparent rather than hidden: afterRecordingStops() puts the strip back to VISIBLE
+        // for everything that is not a VideoCaptureActivity, so visibility would not stay hidden.
         tabLayout.alpha = 0f
         tabLayout.isClickable = false
         tabLayout.isEnabled = false
@@ -23,4 +25,10 @@ class VideoOnlyActivity : MainActivity() {
 //        }
     }
 
+    /**
+     * A transparent strip still takes taps, since a disabled parent does not disable its children.
+     * There is no mode to switch to here, so build no tabs at all.
+     */
+    override fun shouldShowCameraModeTabs() = false
+
 }
\ No newline at end of file

From ccd162d7efb313a146c1ca4432c593fc10f22cc2 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:19:45 +0300
Subject: [PATCH 28/51] Refuse to leave video mode while a recording is running

---
 .../java/app/grapheneos/camera/Fling.kt       |  17 ++-
 .../camera/VideoCapturerRegressionTest.kt     | 105 ++++++++++++++++++
 .../camera/ui/activities/MainActivity.kt      |  13 ++-
 3 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/Fling.kt b/app/src/androidTest/java/app/grapheneos/camera/Fling.kt
index bb5514c2e..a0b10d49c 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/Fling.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/Fling.kt
@@ -7,24 +7,33 @@ import app.grapheneos.camera.ui.activities.MainActivity
 private const val STEPS = 6
 private const val STEP_MS = 10L
 private const val STEP_PX = 80f
-private const val START_X = STEPS * STEP_PX
+private const val TRAVEL_PX = STEPS * STEP_PX
 
 /**
  * Flings [activity]'s preview leftwards, the direction that reaches onSwipeLeft(). The swipe
  * handlers are private and onFling() only fires above a velocity threshold, so feeding the
  * activity's own detector a synthetic gesture is the way in. Call on the main thread.
  */
-fun flingLeft(activity: MainActivity) {
+fun flingLeft(activity: MainActivity) = fling(activity, startX = TRAVEL_PX, stepPx = -STEP_PX)
+
+/**
+ * Flings [activity]'s preview rightwards, the direction that reaches onSwipeRight() -- the one that
+ * moves towards the earlier tabs, and so the only way out of the last mode in the strip. See
+ * [flingLeft] for why the gesture is synthesized. Call on the main thread.
+ */
+fun flingRight(activity: MainActivity) = fling(activity, startX = 0f, stepPx = STEP_PX)
+
+private fun fling(activity: MainActivity, startX: Float, stepPx: Float) {
     val downTime = SystemClock.uptimeMillis()
     val events = ArrayList<MotionEvent>(STEPS + 1)
 
     // Uniform motion: every sample covers the same distance in the same time, so the detector
     // measures one constant velocity, well clear of both its own threshold and onFling()'s.
-    events += MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, START_X, 0f, 0)
+    events += MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, startX, 0f, 0)
     for (step in 1..STEPS) {
         val action = if (step == STEPS) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE
         events += MotionEvent.obtain(
-            downTime, downTime + step * STEP_MS, action, START_X - step * STEP_PX, 0f, 0
+            downTime, downTime + step * STEP_MS, action, startX + step * stepPx, 0f, 0
         )
     }
 
diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
index 5ad094fb0..ed3cb0d7e 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -2,6 +2,7 @@ package app.grapheneos.camera
 
 import android.Manifest
 import android.content.ContentResolver
+import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.GradientDrawable
@@ -19,9 +20,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import app.grapheneos.camera.ui.activities.MainActivity
+import app.grapheneos.camera.ui.activities.VideoCaptureActivity
 import app.grapheneos.camera.ui.activities.VideoOnlyActivity
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
@@ -225,7 +228,105 @@ class VideoCapturerRegressionTest {
 
             scenario.onActivity { it.videoCapturer.stopRecording() }
             waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+        }
+    }
+
+    /**
+     * A fling used to rebind the camera out from under a running recorder. VIDEO is the last mode
+     * in the strip, so the reachable direction out of it is the one onSwipeRight() serves; that is
+     * where the guard has to hold.
+     */
+    @Test
+    fun flingWhileRecording_leavesTheRecordingAlone() {
+        // Not recordingTest(): that waits for a bound video use case at launch, and MainActivity
+        // starts in whichever mode was last used -- the switch below is what binds the recorder.
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            awaitModeTabs(scenario)
+
+            scenario.onActivity { it.camConfig.switchMode(CameraMode.VIDEO) }
+            waitUntil(scenario, "video use case is bound") { it.camConfig.videoCapture != null }
+
+            val capturedBefore = lastCapturedUri(scenario)
+
+            try {
+                scenario.onActivity { activity ->
+                    activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
+                    activity.videoCapturer.startRecording()
+                }
+                waitUntil(scenario, "recording is running") { it.videoCapturer.isRecording }
+
+                var mode: CameraMode? = null
+                var stillRecording = false
+                scenario.onActivity { activity ->
+                    // Prove the fling reaches a mode it could switch to, so the assertions below
+                    // cannot pass merely because there was nowhere to go.
+                    val tabs = activity.tabLayout
+                    assertNotNull(
+                        "no mode to the right of ${activity.camConfig.currentMode}",
+                        tabs.getTabAt(tabs.selectedTabPosition - 1)
+                    )
+
+                    flingRight(activity)
+                    mode = activity.camConfig.currentMode
+                    stillRecording = activity.videoCapturer.isRecording
+                }
+
+                assertEquals(CameraMode.VIDEO, mode)
+                assertTrue("the recording was cut short", stillRecording)
+            } finally {
+                stopAndDeleteRecording(scenario, capturedBefore)
+            }
+        }
+    }
+
+    /**
+     * The strip is only hidden once a recording really starts, so a tap on it while the start sound
+     * still played rebound the camera and left the queued recording to start on a dead recorder.
+     */
+    @Test
+    fun tappingAModeTabDuringTheDeferredStart_leavesTheModeAlone() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+            waitUntil(scenario, "mode tabs are built") { it.tabLayout.tabCount > 0 }
+
+            scenario.onActivity { it.camConfig.switchMode(CameraMode.VIDEO) }
+            waitUntil(scenario, "video use case is bound") { it.camConfig.videoCapture != null }
+
+            lateinit var player: ManualTunePlayer
+            var mode: CameraMode? = null
+            var highlighted: CameraMode? = null
+            val capturedBefore = lastCapturedUri(scenario)
+
+            try {
+                scenario.onActivity { activity ->
+                    player = ManualTunePlayer(activity)
+                    activity.camConfig.mPlayer = player
+                    activity.videoCapturer.startRecording()
+                    assertTrue(activity.videoCapturer.isRecording)
+
+                    val cameraTab = activity.tabLayout.getTabForMode(CameraMode.CAMERA)
+                    assertNotNull("no CAMERA tab to tap", cameraTab)
 
+                    // What both of the strip's touch listeners do with a tap
+                    activity.finalizeMode(cameraTab)
+
+                    mode = activity.camConfig.currentMode
+                    highlighted = activity.tabLayout.selectedTab?.tag as CameraMode?
+                }
+
+                // Abandon the queued start rather than record for real: the damage is done or not
+                // by now, and a cancelled start leaves nothing behind to clean up.
+                scenario.onActivity { activity ->
+                    activity.videoCapturer.stopRecording()
+                    player.deferred!!.run()
+                    assertFalse(activity.videoCapturer.isRecording)
+                }
+
+                assertEquals(CameraMode.VIDEO, mode)
+                assertEquals(CameraMode.VIDEO, highlighted)
+            } finally {
+                stopAndDeleteRecording(scenario, capturedBefore)
+            }
         }
     }
 
@@ -268,6 +369,10 @@ class VideoCapturerRegressionTest {
         }
         runCatching { deleteNewCapture(scenario, capturedBefore) }
     }
+
+    private val targetContext
+        get() = InstrumentationRegistry.getInstrumentation().targetContext
+
     /** Pending entries are how in-flight and orphaned outputs appear in MediaStore. */
     private fun pendingVideoCount(): Int {
         val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index e85a9843b..0feb0a6d2 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1015,6 +1015,17 @@ open class MainActivity : AppCompatActivity(),
 
     fun finalizeMode(tab: TabLayout.Tab? = null) {
 
+        // The strip is untouchable during a recording but not while its start sound still plays, and
+        // rebinding the camera there starts the queued recording on a dead recorder. The touch may
+        // already have dragged the strip, so put it back on the mode the camera is really in.
+        if (videoCapturer.isRecording) {
+            tabLayout.getTabForMode(camConfig.currentMode)?.let {
+                tabLayout.selectTab(it)
+                tabLayout.centerTab(it)
+            }
+            return
+        }
+
         val selectedTab = tab ?: tabLayout.selectedTab
         if (selectedTab != null) {
             val mode = selectedTab.tag as CameraMode
@@ -1419,7 +1430,7 @@ open class MainActivity : AppCompatActivity(),
     }
 
     private fun onSwipeLeft() {
-        if (isZooming || cdTimer.isRunning) return
+        if (isZooming || cdTimer.isRunning || videoCapturer.isRecording) return
 
         if (this is VideoOnlyActivity) return
 

From 8d868028a8ab36cccf83086eefa086f70ea43176 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:21:27 +0300
Subject: [PATCH 29/51] Remember the self-timer duration and keep its badge
 honest

---
 .../camera/SelfTimerRegressionTest.kt         | 136 ++++++++++++++++++
 .../java/app/grapheneos/camera/CamConfig.kt   |   8 +-
 .../grapheneos/camera/ui/CountDownTimerUI.kt  |  25 +++-
 .../grapheneos/camera/ui/SettingsDialog.kt    |  44 ++++--
 .../camera/ui/activities/MainActivity.kt      |  11 ++
 app/src/main/res/layout/activity_main.xml     |   3 +-
 app/src/main/res/values/strings.xml           |   1 +
 7 files changed, 203 insertions(+), 25 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt
new file mode 100644
index 000000000..c2e7cc00e
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt
@@ -0,0 +1,136 @@
+package app.grapheneos.camera
+
+import android.Manifest
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.ui.activities.MainActivity
+import app.grapheneos.camera.ui.activities.VideoOnlyActivity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SelfTimerRegressionTest {
+
+    @get:Rule
+    val grantPermissions: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.CAMERA,
+    )
+
+    /** An activity on a dozing device is already stopped, and cannot be paused again. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
+    /**
+     * A countdown left running in the background used to keep ticking and fire its capture into a
+     * camera that had already been unbound.
+     */
+    @Test
+    fun selfTimer_isCancelledWhenTheActivityPauses() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            // Only a resumed activity can be paused: moveToState below would otherwise be a no-op
+            // and the test would pass without exercising the fix.
+            assertEquals(Lifecycle.State.RESUMED, scenario.state)
+
+            scenario.onActivity { activity ->
+                activity.camConfig.switchMode(CameraMode.CAMERA)
+                activity.timerDuration = 10
+                activity.cdTimer.startTimer()
+                assertTrue(activity.cdTimer.isRunning)
+            }
+
+            scenario.moveToState(Lifecycle.State.CREATED)
+
+            scenario.onActivity { activity ->
+                assertFalse(activity.cdTimer.isRunning)
+                assertEquals(View.GONE, activity.cdTimer.visibility)
+                assertEquals(View.INVISIBLE, activity.cbCross.visibility)
+            }
+
+            // Closing from a stopped state waits out the whole activity lifecycle timeout: the
+            // empty activity the framework stopped us with is already resumed, so the resume it
+            // blocks on before finishing us never arrives.
+            scenario.moveToState(Lifecycle.State.RESUMED)
+        }
+    }
+
+    /**
+     * Cancelling a countdown restores the controls it hid. Doing that with no countdown up would
+     * hand them back in a mode that hides them for its own reasons.
+     */
+    @Test
+    fun cancelTimer_withNoCountdownRunning_leavesQrModeControlsHidden() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            // A countdown has to have run at least once for the bug to be reachable: the guard this
+            // replaced asked whether a timer had ever been built, not whether one was up.
+            scenario.onActivity { activity ->
+                activity.timerDuration = 1
+                activity.cdTimer.startTimer()
+                activity.cdTimer.cancelTimer()
+                assertFalse(activity.cdTimer.isRunning)
+            }
+
+            scenario.onActivity { it.camConfig.switchMode(CameraMode.QR_SCAN) }
+            waitUntil(scenario, "QR mode is active") { it.camConfig.isQRMode }
+
+            scenario.onActivity { activity ->
+                activity.cdTimer.cancelTimer()
+
+                assertEquals(View.INVISIBLE, activity.thirdOption.visibility)
+                assertEquals(View.INVISIBLE, activity.cancelButtonView.visibility)
+                assertEquals(View.INVISIBLE, activity.cbText.visibility)
+            }
+        }
+    }
+
+    /** The badge announces a pending self-timer, so it may only show where one can fire. */
+    @Test
+    fun selfTimerBadge_tracksThePendingDurationInPhotoMode() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                activity.camConfig.switchMode(CameraMode.CAMERA)
+
+                activity.timerDuration = 5
+                activity.updateSelfTimerBadge()
+                assertEquals(View.VISIBLE, activity.cbText.visibility)
+                assertEquals("5s", activity.cbText.text.toString())
+
+                activity.timerDuration = 0
+                activity.updateSelfTimerBadge()
+                assertEquals(View.INVISIBLE, activity.cbText.visibility)
+                assertEquals("", activity.cbText.text.toString())
+            }
+        }
+    }
+
+    /**
+     * The self-timer is inherited from the last photo session, so a video-only activity can hold a
+     * duration it will never use. It must not advertise one.
+     */
+    @Test
+    fun selfTimerBadge_staysHiddenWhereNoPhotoCanBeTaken() {
+        ActivityScenario.launch(VideoOnlyActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                activity.timerDuration = 5
+                activity.updateSelfTimerBadge()
+
+                assertTrue(activity.camConfig.isVideoMode)
+                assertEquals(View.INVISIBLE, activity.cbText.visibility)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index a81c69d54..538795fae 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -125,6 +125,7 @@ class CamConfig(private val mActivity: MainActivity) {
 
             const val WAIT_FOR_FOCUS_LOCK = "wait_for_focus_lock"
 
+            const val SELF_TIMER_DURATION = "self_timer_duration"
         }
 
         object Default {
@@ -170,6 +171,7 @@ class CamConfig(private val mActivity: MainActivity) {
 
             const val WAIT_FOR_FOCUS_LOCK = false
 
+            const val SELF_TIMER_DURATION = 0
         }
     }
 
@@ -2006,11 +2008,7 @@ class CamConfig(private val mActivity: MainActivity) {
             }
         }
 
-        mActivity.cbText.visibility = if (isQRMode || isVideoMode || mActivity.timerDuration == 0) {
-            View.INVISIBLE
-        } else {
-            View.VISIBLE
-        }
+        mActivity.updateSelfTimerBadge()
 
         startCamera(true)
     }
diff --git a/app/src/main/java/app/grapheneos/camera/ui/CountDownTimerUI.kt b/app/src/main/java/app/grapheneos/camera/ui/CountDownTimerUI.kt
index 7289ee7fc..28cd80ff3 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/CountDownTimerUI.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/CountDownTimerUI.kt
@@ -11,6 +11,7 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.camera.core.AspectRatio
 import app.grapheneos.camera.CamConfig
+import app.grapheneos.camera.R
 import app.grapheneos.camera.ui.activities.CaptureActivity
 import app.grapheneos.camera.ui.activities.MainActivity
 
@@ -32,6 +33,9 @@ class CountDownTimerUI @JvmOverloads constructor(
     var isRunning = false
         private set
 
+    /** The mode's own description for the capture button, to put back once the countdown ends. */
+    private var captureButtonDescription: CharSequence? = null
+
     fun setMainActivity(mainActivity: MainActivity) {
         this.mActivity = mainActivity
         camConfig = mainActivity.camConfig
@@ -89,10 +93,13 @@ class CountDownTimerUI @JvmOverloads constructor(
     }
 
     fun cancelTimer() {
-        if (::timer.isInitialized) {
-            timer.cancel()
-            onTimerEnd(true)
-        }
+        // onTimerEnd() force-shows the controls that beforeTimeStarts() hid. Running it when no
+        // countdown is up would resurrect the ones the current mode hid for its own reasons: QR mode
+        // hides thirdOption and cancelButtonView, and the badge stays hidden with no timer set.
+        if (!isRunning) return
+
+        timer.cancel()
+        onTimerEnd(true)
     }
 
     private fun beforeTimeStarts() {
@@ -113,6 +120,11 @@ class CountDownTimerUI @JvmOverloads constructor(
         mActivity.cbText.visibility = View.INVISIBLE
         mActivity.cbCross.visibility = View.VISIBLE
 
+        // The capture button cancels the countdown while one is up, so it must not keep announcing
+        // itself as the shutter. Only the description changes; the cross is drawn over the button.
+        captureButtonDescription = mActivity.captureButton.contentDescription
+        mActivity.captureButton.contentDescription = mActivity.getString(R.string.cancel_timer)
+
         visibility = View.VISIBLE
         isRunning = true
     }
@@ -123,6 +135,11 @@ class CountDownTimerUI @JvmOverloads constructor(
         mActivity.cancelButtonView.visibility = View.VISIBLE
         mActivity.cbCross.visibility = View.INVISIBLE
 
+        captureButtonDescription?.let {
+            mActivity.captureButton.contentDescription = it
+            captureButtonDescription = null
+        }
+
         if (mActivity !is CaptureActivity) {
             mActivity.cbText.visibility = View.VISIBLE
             mActivity.tabLayout.visibility = View.VISIBLE
diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index 220e4de5f..3f7c61f08 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -292,28 +292,17 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
                     val selectedOption = timerSpinner.selectedItem.toString()
 
-                    if (selectedOption == "Off") {
-                        mActivity.timerDuration = 0
-                        mActivity.cbText.visibility = View.INVISIBLE
+                    if (selectedOption == timeOptions[0]) {
+                        updateTimerDuration(0)
                     } else {
-
                         try {
                             val durS = selectedOption.substring(0, selectedOption.length - 1)
-                            val dur = durS.toInt()
-
-                            mActivity.timerDuration = dur
-
-                            mActivity.cbText.text = selectedOption
-                            mActivity.cbText.visibility = View.VISIBLE
-
+                            updateTimerDuration(durS.toInt())
                         } catch (exception: Exception) {
-
                             mActivity.showMessage(
-                                getString(R.string.unexpected_error_while_setting_focus_timeout)
+                                getString(R.string.unexpected_error_while_setting_timer_duration)
                             )
-
                         }
-
                     }
 
                 }
@@ -321,6 +310,8 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
                 override fun onNothingSelected(p0: AdapterView<*>?) {}
             }
 
+        restoreTimerDuration()
+
         mScrollView = binding.settingsScrollview
         mScrollViewContent = binding.settingsScrollviewContent
 
@@ -492,6 +483,29 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         focusTimeoutSpinner.setSelection(timeOptions.indexOf(selectedOption), false)
     }
 
+    private fun updateTimerDuration(duration: Int) {
+        mActivity.timerDuration = duration
+        mActivity.updateSelfTimerBadge()
+        // commonPref rather than modePref: the self-timer is not per-mode, and modePref is not
+        // assigned until the camera starts, which happens after this dialog is built.
+        camConfig.commonPref.edit()
+            .putInt(CamConfig.SettingValues.Key.SELF_TIMER_DURATION, duration)
+            .apply()
+    }
+
+    private fun restoreTimerDuration() {
+        val duration = camConfig.commonPref.getInt(
+            CamConfig.SettingValues.Key.SELF_TIMER_DURATION,
+            CamConfig.SettingValues.Default.SELF_TIMER_DURATION
+        )
+        // Apply directly: Spinner.setSelection() only posts its selection callback, so the duration
+        // would otherwise stay unset for a looper pass.
+        updateTimerDuration(duration)
+
+        val option = if (duration == 0) timeOptions[0] else "${duration}s"
+        timerSpinner.setSelection(timeOptions.indexOf(option).coerceAtLeast(0), false)
+    }
+
     fun updateVideoQuality(choice: String, resCam: Boolean = true) {
 
         val quality = titleToQuality(choice)
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 0feb0a6d2..8b55d1e06 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -580,6 +580,9 @@ open class MainActivity : AppCompatActivity(),
     override fun onPause() {
         super.onPause()
         pauseOrientationSensor()
+        // The countdown would otherwise keep ticking while the app is in the background and fire a
+        // capture into a camera that has already been unbound.
+        cdTimer.cancelTimer()
         if (camConfig.isQRMode) {
             cancelFocusTimer()
         } else {
@@ -1038,6 +1041,14 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
+    /** Shows the pending self-timer duration on the capture button, where it applies at all. */
+    fun updateSelfTimerBadge() {
+        cbText.text = if (timerDuration == 0) "" else "${timerDuration}s"
+        // isVideoMode covers the video-only activities too, whatever mode they are nominally in.
+        val applies = timerDuration != 0 && !camConfig.isQRMode && !camConfig.isVideoMode
+        cbText.visibility = if (applies) View.VISIBLE else View.INVISIBLE
+    }
+
     fun restartRecordingWithMicPermission() {
         restartRecordingWithAudioPermissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 607c2c308..9f142f88e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -292,6 +292,7 @@
                     android:textColor="#333"
                     tools:ignore="SpUsage"/>
 
+                <!-- Decoration drawn over the capture button, which announces the cancel itself -->
                 <ImageView
                     android:id="@+id/capture_button_cross"
                     android:layout_height="36dp"
@@ -299,7 +300,7 @@
                     android:src="@drawable/cancel"
                     android:layout_gravity="center"
                     android:visibility="invisible"
-                    android:contentDescription="@string/cancel_timer"/>
+                    android:importantForAccessibility="no"/>
 
                 <ImageView
                     android:id="@+id/mic_off"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7860165a..82e8e6778 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,6 +174,7 @@
     <string name="four_by_three_unsupported_in_video">4:3 is not supported in video mode</string>
     <string name="flash_unavailable_in_current_mode">Flash/Torch is unavailable for this mode</string>
     <string name="unexpected_error_while_setting_focus_timeout">An unexpected error occurred while setting focus timeout</string>
+    <string name="unexpected_error_while_setting_timer_duration">An unexpected error occurred while setting the self-timer duration</string>
     <string name="storage_location_updated">Storage location successfully updated to %s</string>
     <string name="no_directory_selected">No directory was selected by the picker</string>
     <string name="choose_storage_location">Choose storage location</string>

From dad42aabbb103d0a5084931e865d6a07426fd548 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:22:04 +0300
Subject: [PATCH 30/51] Close the settings panel on back instead of sending the
 camera away

---
 .../camera/SettingsDialogRegressionTest.kt    | 80 +++++++++++++++++++
 .../grapheneos/camera/ui/SettingsDialog.kt    | 22 +++++
 2 files changed, 102 insertions(+)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/SettingsDialogRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/SettingsDialogRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/SettingsDialogRegressionTest.kt
new file mode 100644
index 000000000..38ec2868c
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/SettingsDialogRegressionTest.kt
@@ -0,0 +1,80 @@
+package app.grapheneos.camera
+
+import android.Manifest
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.ui.activities.MainActivity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SettingsDialogRegressionTest {
+
+    @get:Rule
+    val grantPermissions: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.CAMERA,
+    )
+
+    /** The panel dismisses itself from an animation callback, which needs a visible window. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
+    /**
+     * The panel's window is not focusable, so back never reached it: the event fell through to the
+     * activity, which left the panel on screen and sent the camera to the background.
+     */
+    @Test
+    fun back_dismissesTheSettingsPanel() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                activity.settingsDialog.show()
+                assertTrue(activity.settingsDialog.isShowing)
+            }
+
+            scenario.onActivity { it.onBackPressedDispatcher.onBackPressed() }
+
+            // The panel dismisses itself at the end of the slide-up animation
+            waitUntil(scenario, "the settings panel is dismissed") {
+                !it.settingsDialog.isShowing
+            }
+
+            assertEquals(Lifecycle.State.RESUMED, scenario.state)
+        }
+    }
+
+    /**
+     * Back belongs to the panel only while the panel is up. A callback left enabled would swallow
+     * back for the rest of the session, and one never enabled would not dismiss the panel at all.
+     */
+    @Test
+    fun backIsIntercepted_onlyWhileTheSettingsPanelIsUp() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                assertFalse(activity.onBackPressedDispatcher.hasEnabledCallbacks())
+
+                activity.settingsDialog.show()
+                assertTrue(activity.onBackPressedDispatcher.hasEnabledCallbacks())
+
+                activity.settingsDialog.slideDialogUp()
+            }
+
+            waitUntil(scenario, "the settings panel is dismissed") {
+                !it.settingsDialog.isShowing
+            }
+
+            scenario.onActivity {
+                assertFalse(it.onBackPressedDispatcher.hasEnabledCallbacks())
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index 3f7c61f08..ee0f783df 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -28,6 +28,7 @@ import android.widget.RadioGroup
 import android.widget.ScrollView
 import android.widget.Spinner
 import android.widget.ToggleButton
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.StringRes
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.CameraSelector
@@ -93,9 +94,19 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
     private fun getString(@StringRes id: Int) = mActivity.getString(id)
 
+    // The panel window is not focusable, so it never sees the back event itself and back would
+    // otherwise fall through to the activity and close the app.
+    private val backCallback = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            slideDialogUp()
+        }
+    }
+
     init {
         setContentView(binding.root)
 
+        mActivity.onBackPressedDispatcher.addCallback(mActivity, backCallback)
+
         dialog = binding.settingsDialog
         dialog.setOnClickListener {}
 
@@ -716,6 +727,11 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
     }
 
     fun slideDialogUp() {
+        // Restarting the animation would bounce the panel back into view and postpone the dismissal
+        // its end schedules, so ignore any further request to close while it plays out.
+        if (slideUpAnimation.hasStarted() && !slideUpAnimation.hasEnded()) {
+            return
+        }
         settingsFrame.startAnimation(slideUpAnimation)
     }
 
@@ -794,10 +810,16 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
         mActivity.settingsIcon.visibility = View.INVISIBLE
         super.show()
+        backCallback.isEnabled = true
 
         slideDialogDown()
     }
 
+    override fun dismiss() {
+        backCallback.isEnabled = false
+        super.dismiss()
+    }
+
     fun reloadQualities() {
 
         val titles = getAvailableQTitles()

From d92dac5c733d3c0278c211a9062b4b3168310b38 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:22:18 +0300
Subject: [PATCH 31/51] Hand the screen brightness back to the system when
 self-illumination ends

---
 .../java/app/grapheneos/camera/ui/SettingsDialog.kt   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index ee0f783df..ab60b1c5a 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -10,7 +10,6 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Handler
 import android.os.Looper
-import android.provider.Settings
 import android.util.Log
 import android.view.MotionEvent
 import android.view.View
@@ -641,7 +640,7 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
             colorAnimation3.start()
             colorAnimation4.start()
 
-            setBrightness(getSystemBrightness())
+            setBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE)
         }
 
         wasSelfIlluminationOn = camConfig.selfIlluminate
@@ -700,14 +699,6 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         anim
     }
 
-    private fun getSystemBrightness(): Float {
-        return Settings.System.getInt(
-            context.contentResolver,
-            Settings.System.SCREEN_BRIGHTNESS,
-            -1
-        ) / 255f
-    }
-
     private fun setBrightness(brightness: Float) {
 
         val layout = mActivity.window.attributes

From dc23a33288cf813be7ae0d363d310e4c92bdf7fb Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:22:30 +0300
Subject: [PATCH 32/51] Recognise the focus timeout Off option through the
 string array it comes from

---
 app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index ab60b1c5a..cc8a4d7da 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -471,7 +471,7 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
     fun updateFocusTimeout(selectedOption: String) {
 
-        if (selectedOption == "Off") {
+        if (selectedOption == timeOptions[0]) {
             camConfig.focusTimeout = 0
         } else {
 

From 72a7526297e26639cebe32e0f2e6d324383aa9bf Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:23:00 +0300
Subject: [PATCH 33/51] Open the keyboard when the photo quality row is tapped

---
 .../grapheneos/camera/ui/activities/MoreSettings.kt    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index b5ef9d234..0efa95b42 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -211,6 +211,16 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
             sLField.performClick()
         }
 
+        // Every other row here acts on the control it holds. This one held a 36dp field and did
+        // nothing, while still announcing itself as activatable.
+        val pQSetting = binding.photoQualitySetting
+        pQSetting.setOnClickListener {
+            pQField.requestFocus()
+            pQField.setSelection(pQField.text.length)
+            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.showSoftInput(pQField, 0)
+        }
+
         val zslSetting = binding.zslSetting
         if (camConfig.isZslSupported) {
             zslSetting.visibility = View.VISIBLE

From 58837d02d44e8d1aceae37e46886f3a2aaceee39 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:23:25 +0300
Subject: [PATCH 34/51] Label the camera and settings controls for
 accessibility services

---
 .../grapheneos/camera/ui/SettingsDialog.kt    | 18 ++++++--
 app/src/main/res/layout/activity_main.xml     | 31 ++++++++------
 app/src/main/res/layout/more_settings.xml     | 41 +++++++++++--------
 app/src/main/res/layout/settings.xml          | 21 ++++++----
 app/src/main/res/values/strings.xml           |  8 ++--
 5 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index cc8a4d7da..9d90bd20f 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -38,6 +38,7 @@ import androidx.camera.video.Recorder
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
 import app.grapheneos.camera.CamConfig
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.SettingsBinding
@@ -197,12 +198,13 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         aRToggle = binding.aspectRatioToggle
         aRToggle.setOnClickListener {
             if (camConfig.isVideoMode) {
-                aRToggle.isChecked = true
+                updateAspectRatioToggle(is16by9 = true)
                 mActivity.showMessage(
                     getString(R.string.four_by_three_unsupported_in_video)
                 )
             } else {
                 camConfig.toggleAspectRatio()
+                updateAspectRatioToggle(camConfig.aspectRatio == AspectRatio.RATIO_16_9)
             }
         }
 
@@ -783,6 +785,16 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         flashToggle.contentDescription = mActivity.getString(description)
     }
 
+    /**
+     * The ratio itself is the toggle's on/off text, which its content description hides from
+     * accessibility services: announce it as the toggle's state instead.
+     */
+    private fun updateAspectRatioToggle(is16by9: Boolean) {
+        aRToggle.isChecked = is16by9
+        val ratio = if (is16by9) R.string.aspect_ratio_16_9 else R.string.aspect_ratio_4_3
+        ViewCompat.setStateDescription(aRToggle, mActivity.getString(ratio))
+    }
+
     override fun show() {
 
         this.resize()
@@ -790,9 +802,9 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         updateFlashMode()
 
         if (camConfig.isVideoMode) {
-            aRToggle.isChecked = true
+            updateAspectRatioToggle(is16by9 = true)
         } else {
-            aRToggle.isChecked = camConfig.aspectRatio == AspectRatio.RATIO_16_9
+            updateAspectRatioToggle(camConfig.aspectRatio == AspectRatio.RATIO_16_9)
         }
 
         torchToggle.isChecked = camConfig.isTorchOn
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9f142f88e..e69a7035e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -49,7 +49,7 @@
                     android:id="@+id/focusRing"
                     android:src="@drawable/focus_ring"
                     android:visibility="invisible"
-                    android:contentDescription="@string/focus_ring"
+                    android:importantForAccessibility="no"
                     app:layout_constraintTop_toTopOf="@id/preview"
                     app:layout_constraintStart_toStartOf="@id/preview"/>
 
@@ -389,13 +389,14 @@
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/zoom_in"
                 android:layout_marginBottom="10dp"
-                android:contentDescription="@string/zoom_in"/>
+                android:importantForAccessibility="no"/>
 
             <app.grapheneos.camera.ui.seekbar.ZoomBar
                 android:id="@+id/zoom_bar"
                 android:layout_width="wrap_content"
                 android:progressTint="@android:color/transparent"
-                android:layout_height="250dp"/>
+                android:layout_height="250dp"
+                android:contentDescription="@string/zoom"/>
 
             <ImageView
                 android:id="@+id/zoom_out_icon"
@@ -405,7 +406,7 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="32dp"
                 android:layout_gravity="center_horizontal"
-                android:contentDescription="@string/zoom_out"/>
+                android:importantForAccessibility="no"/>
 
         </LinearLayout>
 
@@ -426,7 +427,7 @@
                 android:layout_gravity="center_horizontal"
                 android:src="@drawable/exposure_plus"
                 android:layout_marginBottom="8dp"
-                android:contentDescription="@string/zoom_in"/>
+                android:importantForAccessibility="no"/>
 
             <FrameLayout
                 android:layout_width="wrap_content"
@@ -443,7 +444,8 @@
                     android:layout_width="wrap_content"
                     android:progressTint="@android:color/transparent"
                     android:thumb="@drawable/exposure_thumb"
-                    android:layout_height="250dp"/>
+                    android:layout_height="250dp"
+                    android:contentDescription="@string/exposure_compensation"/>
 
             </FrameLayout>
 
@@ -455,7 +457,7 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="24dp"
                 android:layout_gravity="center_horizontal"
-                android:contentDescription="@string/zoom_out"/>
+                android:importantForAccessibility="no"/>
 
         </LinearLayout>
 
@@ -565,7 +567,8 @@
                         android:textStyle="bold"
                         android:textSize="13sp"
                         android:text="@string/qr_scan"
-                        android:textColor="@android:color/white"/>
+                        android:textColor="@android:color/white"
+                        android:importantForAccessibility="no"/>
 
             </LinearLayout>
 
@@ -598,7 +601,8 @@
                         android:textStyle="bold"
                         android:textSize="13sp"
                         android:text="@string/data_matrix"
-                        android:textColor="@android:color/white"/>
+                        android:textColor="@android:color/white"
+                        android:importantForAccessibility="no"/>
 
             </LinearLayout>
 
@@ -631,7 +635,8 @@
                         android:textStyle="bold"
                         android:textSize="13sp"
                         android:text="@string/aztec_code"
-                        android:textColor="@android:color/white"/>
+                        android:textColor="@android:color/white"
+                        android:importantForAccessibility="no"/>
 
             </LinearLayout>
 
@@ -664,7 +669,8 @@
                     android:textStyle="bold"
                     android:textSize="13sp"
                     android:text="@string/pdf_417"
-                    android:textColor="@android:color/white"/>
+                    android:textColor="@android:color/white"
+                    android:importantForAccessibility="no"/>
 
             </LinearLayout>
 
@@ -696,7 +702,8 @@
                         android:shadowDy="1.3"
                         android:shadowRadius="1.6"
                         android:text="@string/more_options"
-                        android:textColor="@android:color/white"/>
+                        android:textColor="@android:color/white"
+                        android:importantForAccessibility="no"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/more_settings.xml b/app/src/main/res/layout/more_settings.xml
index 7f4fa3fe3..4ec526cbb 100644
--- a/app/src/main/res/layout/more_settings.xml
+++ b/app/src/main/res/layout/more_settings.xml
@@ -65,7 +65,7 @@
                         android:id="@+id/gyroscope_setting_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/save_image_as_previewed"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/straighten" />
@@ -103,7 +103,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/gyroscope_suggestions" />
 
                 </LinearLayout>
 
@@ -123,7 +124,7 @@
                         android:id="@+id/camera_sounds_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/camera_sounds"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/volume_up" />
@@ -161,7 +162,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/camera_sounds" />
 
                 </LinearLayout>
 
@@ -199,7 +201,7 @@
                         android:id="@+id/zsl_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/zsl_setting_title"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/zsl" />
@@ -237,7 +239,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/zsl_setting_title" />
 
                 </LinearLayout>
 
@@ -257,7 +260,7 @@
                         android:id="@+id/save_image_as_preview_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/save_image_as_previewed"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/selfie_preview" />
@@ -295,7 +298,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/save_image_as_previewed" />
 
                 </LinearLayout>
 
@@ -315,7 +319,7 @@
                         android:id="@+id/photo_quality_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/image_quality"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/image_quality" />
@@ -332,6 +336,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
+                            android:labelFor="@id/photo_quality"
                             android:paddingBottom="2dp"
                             android:text="@string/image_quality"
                             android:textColor="?android:textColorPrimary"
@@ -364,7 +369,6 @@
                             android:imeOptions="actionDone"
                             android:importantForAutofill="no"
                             android:inputType="number"
-                            android:labelFor="@id/photo_quality_setting"
                             android:maxLength="3"
                             android:paddingTop="15dp"
                             android:textAlignment="center"
@@ -400,7 +404,7 @@
                         android:id="@+id/highest_res_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/highest_res_setting"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/megapixel" />
@@ -438,7 +442,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/highest_res_setting" />
 
                 </LinearLayout>
 
@@ -459,7 +464,7 @@
                         android:id="@+id/remove_exif_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/save_image_as_previewed"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/info_adaptable" />
@@ -497,7 +502,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/remove_exif_title" />
 
                 </LinearLayout>
 
@@ -533,7 +539,7 @@
                         android:id="@+id/save_video_as_preview_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/save_video_as_previewed"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/selfie_preview" />
@@ -571,7 +577,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="0dp" />
+                        android:layout_marginEnd="0dp"
+                        android:contentDescription="@string/save_video_as_previewed" />
 
                 </LinearLayout>
 
@@ -607,7 +614,7 @@
                         android:id="@+id/storage_location_icon"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:contentDescription="@string/save_image_as_previewed"
+                        android:importantForAccessibility="no"
                         android:paddingStart="4dp"
                         android:paddingEnd="8dp"
                         android:src="@drawable/storage" />
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 8662057f7..df719ea1c 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -49,7 +49,7 @@
                         android:checked="false"
                         android:layout_gravity="center"
                         android:background="@drawable/location"
-                        android:text="@string/toggle_button"/>
+                        android:contentDescription="@string/geo_tagging"/>
 
                 </FrameLayout>
 
@@ -72,7 +72,7 @@
                         android:checked="false"
                         android:scaleType="centerCrop"
                         android:background="@drawable/aspect_ratio"
-                        android:text="@string/aspect_ratio"
+                        android:contentDescription="@string/aspect_ratio"
                         tools:ignore="SpUsage"/>
 
                 </FrameLayout>
@@ -92,7 +92,7 @@
                         android:checked="false"
                         android:scaleType="centerCrop"
                         android:background="@drawable/torch"
-                        android:text="@string/aspect_ratio"/>
+                        android:contentDescription="@string/torch"/>
 
                 </FrameLayout>
 
@@ -174,7 +174,8 @@
                                 android:layout_height="@dimen/settings_dialog_switch_height"
                                 android:scaleX="@integer/settings_dialog_switch_scale"
                                 android:scaleY="@integer/settings_dialog_switch_scale"
-                                android:checked="false"/>
+                                android:checked="false"
+                                android:contentDescription="@string/self_illumination"/>
 
                         </LinearLayout>
 
@@ -194,6 +195,7 @@
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_gravity="center_vertical"
+                            android:labelFor="@id/video_quality_spinner"
                             android:text="@string/video_quality"/>
 
                         <FrameLayout
@@ -241,7 +243,8 @@
                                 android:layout_height="@dimen/settings_dialog_switch_height"
                                 android:scaleX="@integer/settings_dialog_switch_scale"
                                 android:scaleY="@integer/settings_dialog_switch_scale"
-                                android:checked="true"/>
+                                android:checked="true"
+                                android:contentDescription="@string/include_audio"/>
 
                         </LinearLayout>
 
@@ -274,7 +277,8 @@
                                 android:layout_height="@dimen/settings_dialog_switch_height"
                                 android:scaleX="@integer/settings_dialog_switch_scale"
                                 android:scaleY="@integer/settings_dialog_switch_scale"
-                                android:checked="true"/>
+                                android:checked="true"
+                                android:contentDescription="@string/enable_eis"/>
 
                         </LinearLayout>
 
@@ -306,7 +310,8 @@
                                 android:layout_height="@dimen/settings_dialog_switch_height"
                                 android:scaleX="@integer/settings_dialog_switch_scale"
                                 android:scaleY="@integer/settings_dialog_switch_scale"
-                                android:checked="true"/>
+                                android:checked="true"
+                                android:contentDescription="@string/wait_for_focus_lock"/>
 
                         </LinearLayout>
 
@@ -326,6 +331,7 @@
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_gravity="center_vertical"
+                            android:labelFor="@id/focus_timeout_spinner"
                             android:text="@string/focus_timeout"/>
 
                         <FrameLayout
@@ -361,6 +367,7 @@
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_gravity="center_vertical"
+                            android:labelFor="@id/timer_spinner"
                             android:text="@string/timer"/>
 
                         <FrameLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82e8e6778..70303ac50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,13 +12,14 @@
         The app needs location permission for geo-tagging. Please provide the required permission via Settings in order to use this app.
     </string>
 
-    <string name="focus_ring">Focus Ring</string>
     <string name="flip_camera">Flip Camera</string>
     <string name="loading_camera">Loading camera</string>
     <string name="flash_mode">Flash Mode</string>
     <string name="start_value_timer">00:00</string>
-    <string name="zoom_in">Zoom In</string>
-    <string name="zoom_out">Zoom Out</string>
+    <string name="zoom">Zoom</string>
+    <string name="exposure_compensation">Exposure compensation</string>
+    <string name="geo_tagging">Geo-tagging</string>
+    <string name="torch">Torch</string>
     <string name="scan_result">Scan Result</string>
     <string name="share_qr_text">Share QR Text</string>
     <string name="open_with">Open with</string>
@@ -48,7 +49,6 @@
     <string name="scan_all_formats">Scan all barcode formats</string>
     <string name="stop_scanning_all_formats">Stop scanning all barcode formats</string>
     <string name="play_preview">Play Preview</string>
-    <string name="toggle_button">Toggle Button</string>
     <string name="aspect_ratio">Aspect Ratio</string>
     <string name="include_audio">Include Audio</string>
     <string name="enable_eis">Enable EIS</string>

From a8f921a71ec7bc188a1348b2cb99ee3703218bdb Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:24:25 +0300
Subject: [PATCH 35/51] Tidy up the gallery's imports, spacing and long lines

---
 .../camera/ui/activities/InAppGallery.kt      | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 74cd4c4fb..7197c05b2 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -4,7 +4,6 @@ import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
 import android.database.Cursor
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -32,6 +31,8 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.get
+import androidx.core.view.size
 import androidx.viewpager2.widget.ViewPager2
 import androidxc.exifinterface.media.ExifInterface
 import app.grapheneos.camera.AutoFinishOnSleep
@@ -56,8 +57,6 @@ import java.util.Locale
 import java.util.TimeZone
 import java.util.concurrent.Executors
 import kotlin.properties.Delegates
-import androidx.core.view.size
-import androidx.core.view.get
 
 class InAppGallery : AppCompatActivity() {
 
@@ -78,7 +77,7 @@ class InAppGallery : AppCompatActivity() {
 
     private val autoFinisher = AutoFinishOnSleep(this)
 
-    private var lastViewedMediaItem : CapturedItem? = null
+    private var lastViewedMediaItem: CapturedItem? = null
 
     private lateinit var windowInsetsController: WindowInsetsControllerCompat
 
@@ -174,10 +173,12 @@ class InAppGallery : AppCompatActivity() {
                 editCurrentMedia()
                 true
             }
+
             R.id.edit_with -> {
                 editCurrentMedia(withDefault = false)
                 true
             }
+
             R.id.delete_icon -> {
                 deleteCurrentMedia()
                 true
@@ -326,11 +327,11 @@ class InAppGallery : AppCompatActivity() {
             }
 
             if (curItem.type == ITEM_TYPE_VIDEO) {
-                MediaMetadataRetriever().use {
-                    it.setDataSource(this, curItem.uri)
+                MediaMetadataRetriever().use { retriever ->
+                    retriever.setDataSource(this, curItem.uri)
                     // Not every container carries a creation date, and one that is missing or
                     // malformed must not take the whole dialog down with it
-                    val date = it.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DATE)
+                    val date = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DATE)
                     if (date != null) {
                         try {
                             dateAdded = convertTimeForVideo(date)
@@ -549,19 +550,24 @@ class InAppGallery : AppCompatActivity() {
             val systemBars =
                 insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
             view.y = -systemBars.bottom.toFloat()
-            snackBar.setAnchorView(view)
+            snackBar.anchorView = view
             insets
         }
 
         if (savedInstanceState != null) {
-            lastViewedMediaItem = BundleCompat.getParcelable(savedInstanceState, LAST_VIEWED_ITEM_KEY, CapturedItem::class.java)
+            lastViewedMediaItem = BundleCompat.getParcelable(
+                savedInstanceState,
+                LAST_VIEWED_ITEM_KEY,
+                CapturedItem::class.java
+            )
         }
 
         val intent = this.intent
 
         val showVideosOnly = intent.getBooleanExtra(INTENT_KEY_VIDEO_ONLY_MODE, false)
         val listOfSecureModeCapturedItems = getParcelableArrayListExtra<CapturedItem>(
-            intent, INTENT_KEY_LIST_OF_SECURE_MODE_CAPTURED_ITEMS)
+            intent, INTENT_KEY_LIST_OF_SECURE_MODE_CAPTURED_ITEMS
+        )
 
         asyncLoaderOfCapturedItems.execute {
             val unprocessedItems: List<CapturedItem> = try {
@@ -595,7 +601,8 @@ class InAppGallery : AppCompatActivity() {
         }
 
         if (lastViewedMediaItem == null) {
-            val lastCapturedItem = getParcelableExtra<CapturedItem>(intent, INTENT_KEY_LAST_CAPTURED_ITEM)
+            val lastCapturedItem =
+                getParcelableExtra<CapturedItem>(intent, INTENT_KEY_LAST_CAPTURED_ITEM)
 
             if (lastCapturedItem != null) {
                 val list = ArrayList<CapturedItem>()
@@ -616,7 +623,8 @@ class InAppGallery : AppCompatActivity() {
         supportActionBar?.setBackgroundDrawable(null)
 
         ViewCompat.setOnApplyWindowInsetsListener(binding.shade) { view, insets ->
-            val systemBars = insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
+            val systemBars =
+                insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
             val actionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height)
             view.layoutParams =
                 RelativeLayout.LayoutParams(

From e518e1c3348a3f1484fdeab2a20c18bef5acdd34 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:24:59 +0300
Subject: [PATCH 36/51] Show the resolution and duration of the media the
 gallery details describe

---
 .../camera/CapturedItemsRegressionTest.kt     | 100 +++++++++++++++
 .../app/grapheneos/camera/CapturedItems.kt    |  26 ++++
 .../camera/capturer/VideoCapturer.kt          |  14 +--
 .../camera/ui/activities/InAppGallery.kt      | 114 ++++++++++++++++--
 .../java/app/grapheneos/camera/util/Utils.kt  |  14 +++
 app/src/main/res/values/strings.xml           |   3 +-
 6 files changed, 246 insertions(+), 25 deletions(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/CapturedItemsRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/CapturedItemsRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/CapturedItemsRegressionTest.kt
new file mode 100644
index 000000000..99a3852d2
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/CapturedItemsRegressionTest.kt
@@ -0,0 +1,100 @@
+package app.grapheneos.camera
+
+import android.net.Uri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * The gallery falls back to the timestamp in an item's own name when it has no creation time to
+ * show, which is what happens to a photo whose Exif was stripped and which is kept through the
+ * Storage Access Framework.
+ */
+@RunWith(AndroidJUnit4::class)
+class CapturedItemsRegressionTest {
+
+    private val uri = Uri.parse("content://media/external/images/media/0")
+
+    /** The instant the app would have named a capture after, in the zone it names captures in. */
+    private fun wallClock(
+        year: Int,
+        month: Int,
+        day: Int,
+        hour: Int,
+        minute: Int,
+        second: Int,
+        millis: Int = 0,
+    ): Long {
+        val calendar = Calendar.getInstance()
+        calendar.clear()
+        calendar.set(year, month - 1, day, hour, minute, second)
+        calendar.set(Calendar.MILLISECOND, millis)
+        return calendar.timeInMillis
+    }
+
+    @Test
+    fun captureTime_readsTheMillisecondNameImageSaverWrites() {
+        val item = CapturedItem(ITEM_TYPE_IMAGE, "20260724_153012_345", uri)
+        assertEquals(wallClock(2026, 7, 24, 15, 30, 12, 345), item.captureTime())
+    }
+
+    /**
+     * Videos are named to the second. The millisecond pattern is tried first, so this also proves
+     * it cannot swallow a shorter name and invent a sub-second part for it.
+     */
+    @Test
+    fun captureTime_readsTheSecondPrecisionNameVideoCapturerWrites() {
+        val item = CapturedItem(ITEM_TYPE_VIDEO, "20260724_153012", uri)
+        assertEquals(wallClock(2026, 7, 24, 15, 30, 12), item.captureTime())
+    }
+
+    /** Whatever the device's zone is, what the capturers write has to read back unchanged. */
+    @Test
+    fun captureTime_roundTripsTheNamesTheCapturersWrite() {
+        val captured = Date(wallClock(2026, 2, 29, 23, 59, 59, 999))
+
+        val imageName = SimpleDateFormat("yyyyMMdd_HHmmss_SSS", Locale.US).format(captured)
+        assertEquals(captured.time, CapturedItem(ITEM_TYPE_IMAGE, imageName, uri).captureTime())
+
+        val videoName = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(captured)
+        val videoItem = CapturedItem(ITEM_TYPE_VIDEO, videoName, uri)
+        // The video name has no milliseconds to give back
+        assertEquals(captured.time / 1000 * 1000, videoItem.captureTime())
+    }
+
+    /** A timestamp is only reported when the name really holds one. */
+    @Test
+    fun captureTime_isNullWhenTheNameHasNoUsableTimestamp() {
+        val dateStrings = listOf(
+            "00000000_000000",
+            "20261301_153012",
+            "20260732_153012",
+            "20260724_253012",
+            "20260724_156012",
+            "202607_153012",
+        )
+
+        for (dateString in dateStrings) {
+            assertNull(dateString, CapturedItem(ITEM_TYPE_IMAGE, dateString, uri).captureTime())
+        }
+    }
+
+    /** The names the item parser accepts off the file system are the ones that have to work. */
+    @Test
+    fun captureTime_readsTheNamesTheItemParserAccepts() {
+        val image = CapturedItems.parseCapturedItem("IMG_20260724_153012_345.jpg", uri)
+        assertNotNull(image)
+        assertEquals(wallClock(2026, 7, 24, 15, 30, 12, 345), image!!.captureTime())
+
+        val video = CapturedItems.parseCapturedItem("VID_20260724_153012.mp4", uri)
+        assertNotNull(video)
+        assertEquals(wallClock(2026, 7, 24, 15, 30, 12), video!!.captureTime())
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index ab3f433d0..0f8b3e75b 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -18,6 +18,9 @@ import android.util.Log
 import androidx.annotation.StringRes
 import app.grapheneos.camera.CamConfig.SettingValues
 import app.grapheneos.camera.util.edit
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Locale
 import kotlin.jvm.Throws
 
 typealias ItemType = Int
@@ -49,6 +52,29 @@ class CapturedItem(
         return "$prefix$dateString"
     }
 
+    /**
+     * The capture time this item's own name encodes, in milliseconds. It is the last record of when
+     * media was taken once its Exif has been stripped and the provider keeps no creation timestamp,
+     * as the Storage Access Framework never does. Null if the name carries no usable timestamp.
+     */
+    fun captureTime(): Long? {
+        // ImageSaver appends milliseconds to the name and VideoCapturer does not. Both name in
+        // whatever the default time zone was at capture, which nothing records, so the name is read
+        // back in the current one: the wall-clock digits survive a change of zone, the instant does
+        // not. Callers must not present this as a zoned timestamp.
+        return parseDateString("yyyyMMdd_HHmmss_SSS") ?: parseDateString("yyyyMMdd_HHmmss")
+    }
+
+    private fun parseDateString(pattern: String): Long? {
+        val format = SimpleDateFormat(pattern, Locale.US)
+        format.isLenient = false
+        return try {
+            format.parse(dateString)?.time
+        } catch (e: ParseException) {
+            null
+        }
+    }
+
     override fun writeToParcel(dest: Parcel, flags: Int) {
         dest.writeByte(type.toByte())
         dest.writeString(dateString)
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index 73c307333..95a3be0b4 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -34,6 +34,7 @@ import app.grapheneos.camera.VIDEO_NAME_PREFIX
 import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
+import app.grapheneos.camera.util.formatVideoDuration
 import app.grapheneos.camera.util.getTreeDocumentUri
 import app.grapheneos.camera.util.removePendingFlagFromUri
 import java.text.SimpleDateFormat
@@ -76,18 +77,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
     private val handler = Handler(Looper.getMainLooper())
 
     private fun updateTimerTime(timeInNanos: Long) {
-        val timeInSec = timeInNanos / (1000 * 1000 * 1000)
-        val sec = timeInSec % 60
-        val min = timeInSec / 60 % 60
-        val hour = timeInSec / 3600
-
-        val timerText: String = if (hour == 0L) {
-            String.format(Locale.ROOT, "%02d:%02d", min, sec)
-        } else {
-            String.format(Locale.ROOT, "%02d:%02d:%02d", hour, min, sec)
-        }
-
-        mActivity.timerView.text = timerText
+        mActivity.timerView.text = formatVideoDuration(timeInNanos / 1_000_000_000)
     }
 
     private class RecordingContext(
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 7197c05b2..b5f8abda3 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -5,6 +5,7 @@ import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.database.Cursor
+import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.media.MediaMetadataRetriever
@@ -18,6 +19,7 @@ import android.provider.MediaStore
 import android.provider.MediaStore.MediaColumns
 import android.provider.OpenableColumns
 import android.util.Log
+import android.util.Size
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -45,6 +47,7 @@ import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.GalleryBinding
 import app.grapheneos.camera.editCapturedItem
 import app.grapheneos.camera.shareCapturedItem
+import app.grapheneos.camera.util.formatVideoDuration
 import app.grapheneos.camera.util.getParcelableArrayListExtra
 import app.grapheneos.camera.util.getParcelableExtra
 import app.grapheneos.camera.util.storageLocationToUiString
@@ -298,26 +301,59 @@ class InAppGallery : AppCompatActivity() {
         return Pair(created, modified)
     }
 
+    /**
+     * The dimensions a photo presents at, which is the stored frame with its Exif orientation
+     * applied. Only the header is read, so the full bitmap is never decoded.
+     */
+    private fun readImageResolution(uri: Uri, orientation: Int): Size? {
+        val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+        contentResolver.openInputStream(uri)?.use {
+            BitmapFactory.decodeStream(it, null, options)
+        }
+
+        val width = options.outWidth
+        val height = options.outHeight
+        if (width <= 0 || height <= 0) {
+            return null
+        }
+
+        val quarterTurned = orientation == ExifInterface.ORIENTATION_ROTATE_90 ||
+                orientation == ExifInterface.ORIENTATION_ROTATE_270 ||
+                orientation == ExifInterface.ORIENTATION_TRANSPOSE ||
+                orientation == ExifInterface.ORIENTATION_TRANSVERSE
+
+        return if (quarterTurned) Size(height, width) else Size(width, height)
+    }
+
     private fun showCurrentMediaDetails() {
         val curItem = getCurrentItem() ?: return
 
         var relativePath: String? = null
         var fileName: String? = null
-        var size: Long = 0
+        // Absent rather than zero: a provider that reports no size at all used to be rendered as
+        // "Loading…", which is not what was happening and never resolved
+        var size: Long? = null
 
         var dateAdded: String? = null
         var dateModified: String? = null
 
+        var resolution: Size? = null
+        var durationMillis: Long? = null
+
         try {
             // note that RELATIVE_PATH is undefined for SAF Uris, which the by-name lookups below
             // report as absent rather than as whatever column happened to land in that position
-            val projection = arrayOf(MediaColumns.RELATIVE_PATH, OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
+            val projection = arrayOf(
+                MediaColumns.RELATIVE_PATH,
+                OpenableColumns.DISPLAY_NAME,
+                OpenableColumns.SIZE
+            )
 
-            contentResolver.query(curItem.uri, projection, null,null)?.use {
+            contentResolver.query(curItem.uri, projection, null, null)?.use {
                 if (it.moveToFirst()) {
                     relativePath = it.optionalString(MediaColumns.RELATIVE_PATH)
                     fileName = it.optionalString(OpenableColumns.DISPLAY_NAME)
-                    size = it.optionalLong(OpenableColumns.SIZE) ?: 0
+                    size = it.optionalLong(OpenableColumns.SIZE)
                 }
             }
 
@@ -340,11 +376,42 @@ class InAppGallery : AppCompatActivity() {
                             Log.d("showCurrentMediaDetails", "unparseable video date: $date", e)
                         }
                     }
+
+                    durationMillis = retriever
+                        .extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+                        ?.toLongOrNull()?.takeIf { millis -> millis > 0 }
+
+                    val width = retriever
+                        .extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)
+                        ?.toIntOrNull()
+
+                    val height = retriever
+                        .extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)
+                        ?.toIntOrNull()
+
+                    if (width != null && height != null && width > 0 && height > 0) {
+                        // A track holds its frames as encoded plus the rotation a player has to
+                        // apply, so a recording taken in portrait is stored landscape
+                        val rotation = retriever
+                            .extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)
+                            ?.toIntOrNull() ?: 0
+                        resolution = if (rotation == 90 || rotation == 270) {
+                            Size(height, width)
+                        } else {
+                            Size(width, height)
+                        }
+                    }
                 }
             } else {
+                var orientation = ExifInterface.ORIENTATION_NORMAL
+
                 contentResolver.openInputStream(curItem.uri)?.use { stream ->
                     val eInterface = ExifInterface(stream)
 
+                    orientation = eInterface.getAttributeInt(
+                        ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL
+                    )
+
                     val offset = eInterface.getAttribute(ExifInterface.TAG_OFFSET_TIME)
 
                     if (eInterface.hasAttribute(ExifInterface.TAG_DATETIME_ORIGINAL)) {
@@ -361,6 +428,8 @@ class InAppGallery : AppCompatActivity() {
                         )
                     }
                 }
+
+                resolution = readImageResolution(curItem.uri, orientation)
             }
 
             // Photos carry no Exif dates when "Remove Exif data after capture" is on, which is
@@ -374,6 +443,15 @@ class InAppGallery : AppCompatActivity() {
                     dateModified = convertTime(modified)
                 }
             }
+
+            // Neither source has a creation time to give for a stripped photo kept through the
+            // Storage Access Framework, but the app named the file after the moment it captured it.
+            // A name records wall-clock time and not the zone it was read in, so this one is shown
+            // without a zone: after the device travels, the digits are still the time the camera
+            // showed at capture, but naming a zone for them would assert the wrong one.
+            if (dateAdded == null) {
+                curItem.captureTime()?.let { dateAdded = convertTime(it, showTimeZone = false) }
+            }
         } catch (e: Exception) {
             Log.d("showCurrentMediaDetails", "unable to obtain file details", e)
             showMessage(getString(R.string.unable_to_obtain_file_details))
@@ -395,16 +473,28 @@ class InAppGallery : AppCompatActivity() {
         detailsBuilder.append("\n\n")
 
         detailsBuilder.append(getString(R.string.file_size), "\n")
-        if (size == 0L) {
-            detailsBuilder.append(getString(R.string.loading_generic))
-        } else {
+        detailsBuilder.append(
+            size
+                ?.let {
+                    String.format(Locale.getDefault(), "%.2f MB", it / (1000f * 1000f))
+                }
+                ?: getString(R.string.not_found_generic)
+        )
+
+        detailsBuilder.append("\n\n")
+
+        detailsBuilder.append(getString(R.string.resolution), "\n")
+        detailsBuilder.append(resolution?.toString() ?: getString(R.string.not_found_generic))
+
+        if (curItem.type == ITEM_TYPE_VIDEO) {
+            detailsBuilder.append("\n\n")
+
+            detailsBuilder.append(getString(R.string.duration), "\n")
             detailsBuilder.append(
-                String.format(
-                    "%.2f",
-                    (size / (1000f * 1000f))
-                )
+                durationMillis
+                    ?.let { formatVideoDuration(it / 1000) }
+                    ?: getString(R.string.not_found_generic)
             )
-            detailsBuilder.append(" MB")
         }
 
         detailsBuilder.append("\n\n")
diff --git a/app/src/main/java/app/grapheneos/camera/util/Utils.kt b/app/src/main/java/app/grapheneos/camera/util/Utils.kt
index 681a593ea..34529b0b6 100644
--- a/app/src/main/java/app/grapheneos/camera/util/Utils.kt
+++ b/app/src/main/java/app/grapheneos/camera/util/Utils.kt
@@ -14,6 +14,7 @@ import app.grapheneos.camera.capturer.SAF_URI_HOST_EXTERNAL_STORAGE
 import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.PrintStream
+import java.util.Locale
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.RejectedExecutionException
 
@@ -23,6 +24,19 @@ fun Throwable.printStackTraceToString(): String {
     return baos.toString()
 }
 
+/** Video length as mm:ss, widening to hh:mm:ss only once there is an hour to show. */
+fun formatVideoDuration(totalSeconds: Long): String {
+    val seconds = totalSeconds % 60
+    val minutes = totalSeconds / 60 % 60
+    val hours = totalSeconds / 3600
+
+    return if (hours == 0L) {
+        String.format(Locale.ROOT, "%02d:%02d", minutes, seconds)
+    } else {
+        String.format(Locale.ROOT, "%02d:%02d:%02d", hours, minutes, seconds)
+    }
+}
+
 fun getTreeDocumentUri(treeUri: Uri): Uri {
     val treeId = DocumentsContract.getTreeDocumentId(treeUri)
     return DocumentsContract.buildDocumentUriUsingTree(treeUri, treeId)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70303ac50..afd497cf9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,9 +206,10 @@
     <string name="file_details">File Details</string>
     <string name="file_name_generic">File Name: </string>
     <string name="not_found_generic">Not Found</string>
-    <string name="loading_generic">Loading…</string>
     <string name="file_size">File Size: </string>
     <string name="file_path">File Path: </string>
+    <string name="resolution">Resolution: </string>
+    <string name="duration">Duration: </string>
     <string name="file_created_on">File Created On: </string>
     <string name="last_modified_on">Last Modified On: </string>
 

From b3b648574cdc7cf584d37214cec59d8e2ca9d168 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:25:13 +0300
Subject: [PATCH 37/51] Announce a gallery slide for what it holds and drop the
 stale click state

---
 .../grapheneos/camera/GallerySliderAdapter.kt | 31 ++++++++++++-------
 app/src/main/res/layout/gallery_slide.xml     |  2 +-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt b/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
index 6891aad9b..db023b197 100644
--- a/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
+++ b/app/src/main/java/app/grapheneos/camera/GallerySliderAdapter.kt
@@ -43,6 +43,9 @@ class GallerySliderAdapter(
         mediaPreview.setGalleryActivity(gActivity)
         mediaPreview.disableZooming()
         mediaPreview.setOnClickListener(null)
+        // Clearing the listener leaves behind the clickability the last item bound here needed
+        mediaPreview.isClickable = false
+        mediaPreview.contentDescription = gActivity.getString(R.string.preview)
         mediaPreview.visibility = View.INVISIBLE
         mediaPreview.setImageBitmap(null)
 
@@ -76,20 +79,26 @@ class GallerySliderAdapter(
 
                         if (item.type == ITEM_TYPE_VIDEO) {
                             playButton.visibility = View.VISIBLE
+                            // Tapping the preview is what opens the player; the button drawn over
+                            // it is only the affordance, so the preview carries the label
+                            mediaPreview.contentDescription =
+                                gActivity.getString(R.string.play_video)
+
+                            mediaPreview.setOnClickListener {
+                                val curItem = getCurrentItem() ?: return@setOnClickListener
+                                if (curItem.type == ITEM_TYPE_VIDEO) {
+                                    val intent = Intent(gActivity, VideoPlayer::class.java)
+                                    intent.putExtra(VideoPlayer.VIDEO_URI, curItem.uri)
+                                    intent.putExtra(
+                                        VideoPlayer.IN_SECURE_MODE, gActivity.isSecureMode
+                                    )
+
+                                    gActivity.startActivity(intent)
+                                }
+                            }
                         } else if (item.type == ITEM_TYPE_IMAGE) {
                             mediaPreview.enableZooming()
                         }
-
-                        mediaPreview.setOnClickListener {
-                            val curItem = getCurrentItem() ?: return@setOnClickListener
-                            if (curItem.type == ITEM_TYPE_VIDEO) {
-                                val intent = Intent(gActivity, VideoPlayer::class.java)
-                                intent.putExtra(VideoPlayer.VIDEO_URI, curItem.uri)
-                                intent.putExtra(VideoPlayer.IN_SECURE_MODE, gActivity.isSecureMode)
-
-                                gActivity.startActivity(intent)
-                            }
-                        }
                     } else  {
                         mediaPreview.visibility = View.INVISIBLE
 
diff --git a/app/src/main/res/layout/gallery_slide.xml b/app/src/main/res/layout/gallery_slide.xml
index 31e09a8c2..f69b017c9 100644
--- a/app/src/main/res/layout/gallery_slide.xml
+++ b/app/src/main/res/layout/gallery_slide.xml
@@ -18,7 +18,7 @@
         android:layout_height="64dp"
         android:layout_gravity="center"
         android:src="@drawable/play_button_circle"
-        android:contentDescription="@string/preview"/>
+        android:importantForAccessibility="no"/>
 
     <include
         layout="@layout/gallery_placeholder"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afd497cf9..8df97c257 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="quality">Quality</string>
     <string name="latency">Latency</string>
     <string name="preview">Preview</string>
+    <string name="play_video">Play video</string>
     <string name="file_info">File Info</string>
     <string name="delete_file">Delete file</string>
     <string name="edit">Edit</string>

From 34c2d95484962cade21f1996a953acdc37eab1c8 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:25:52 +0300
Subject: [PATCH 38/51] Release the storage location grants the app has stopped
 tracking

---
 .../camera/SafTreeGrantsRegressionTest.kt     | 119 ++++++++++++++++++
 .../java/app/grapheneos/camera/CamConfig.kt   |   5 +
 .../app/grapheneos/camera/CapturedItems.kt    |  60 +++++++++
 3 files changed, 184 insertions(+)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/SafTreeGrantsRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/SafTreeGrantsRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/SafTreeGrantsRegressionTest.kt
new file mode 100644
index 000000000..1893d21e5
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/SafTreeGrantsRegressionTest.kt
@@ -0,0 +1,119 @@
+package app.grapheneos.camera
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.DocumentsContract
+import android.provider.MediaStore
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.grapheneos.camera.CamConfig.SettingValues
+import app.grapheneos.camera.util.EphemeralSharedPrefs
+import app.grapheneos.camera.util.edit
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * A directory the user picks to save captures in is granted to the app persistably, and the grant
+ * used to outlive the app's own record of it: once enough other directories had been picked to push
+ * one off the tracked list, nothing released it and the app kept indefinite read/write access to a
+ * folder it no longer had any use for.
+ */
+@RunWith(AndroidJUnit4::class)
+class SafTreeGrantsRegressionTest {
+
+    private val authority = "com.android.externalstorage.documents"
+
+    private val readAndWrite =
+        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+
+    private fun tree(name: String): Uri {
+        return DocumentsContract.buildTreeDocumentUri(authority, "primary:$name")
+    }
+
+    // Only an in-memory SharedPreferences here; what it holds is the real tracked list.
+    private fun prefs() = EphemeralSharedPrefs(Build.VERSION.SDK_INT)
+
+    /** What CamConfig.storageLocation records when the user picks a directory. */
+    private fun pickStorageLocation(prefs: EphemeralSharedPrefs, treeUri: Uri) {
+        val current = prefs.getString(
+            SettingValues.Key.STORAGE_LOCATION, SettingValues.Default.STORAGE_LOCATION
+        )!!
+        if (current != SettingValues.Default.STORAGE_LOCATION) {
+            CapturedItems.savePreviousSafTree(Uri.parse(current), prefs)
+        }
+        prefs.edit {
+            putString(SettingValues.Key.STORAGE_LOCATION, treeUri.toString())
+        }
+    }
+
+    /** The regression itself: the directory pushed off the tracked list is the one to release. */
+    @Test
+    fun theTreeThatFallsOffTheTrackedListIsReleased() {
+        val prefs = prefs()
+        val picked = (0..CapturedItems.MAX_NUMBER_OF_TRACKED_PREVIOUS_SAF_TREES + 1)
+            .map { tree("dir$it") }
+        picked.forEach { pickStorageLocation(prefs, it) }
+
+        val tracked = CapturedItems.getSafTrees(prefs)
+        assertEquals(CapturedItems.MAX_NUMBER_OF_TRACKED_PREVIOUS_SAF_TREES + 1, tracked.size)
+
+        picked.take(picked.size - tracked.size).forEach {
+            assertEquals(
+                it.toString(),
+                readAndWrite,
+                CapturedItems.safTreeFlagsToRelease(it, true, true, tracked),
+            )
+        }
+        tracked.forEach {
+            assertEquals(
+                it.toString(), 0, CapturedItems.safTreeFlagsToRelease(it, true, true, tracked)
+            )
+        }
+    }
+
+    /** A directory the app still lists keeps its grant, whether it is the current one or a past one. */
+    @Test
+    fun trackedTreesKeepTheirGrants() {
+        val prefs = prefs()
+        pickStorageLocation(prefs, tree("previous"))
+        pickStorageLocation(prefs, tree("current"))
+
+        val tracked = CapturedItems.getSafTrees(prefs)
+        assertEquals(listOf(tree("current"), tree("previous")), tracked)
+        assertEquals(0, CapturedItems.safTreeFlagsToRelease(tree("current"), true, true, tracked))
+        assertEquals(0, CapturedItems.safTreeFlagsToRelease(tree("previous"), true, true, tracked))
+    }
+
+    /** Persisted grants that are not trees belong to some other feature, not to storage locations. */
+    @Test
+    fun grantsThatAreNotTreesAreLeftAlone() {
+        val tracked = emptyList<Uri>()
+
+        val document = DocumentsContract.buildDocumentUri(authority, "primary:DCIM/IMG_1.jpg")
+        assertEquals(0, CapturedItems.safTreeFlagsToRelease(document, true, true, tracked))
+
+        val mediaStore = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+        assertEquals(0, CapturedItems.safTreeFlagsToRelease(mediaStore, true, true, tracked))
+    }
+
+    /** The release covers exactly the modes the grant holds, and a grant holding none is skipped. */
+    @Test
+    fun onlyTheModesTheGrantHoldsAreReleased() {
+        val untracked = tree("untracked")
+        val tracked = emptyList<Uri>()
+
+        assertEquals(
+            Intent.FLAG_GRANT_READ_URI_PERMISSION,
+            CapturedItems.safTreeFlagsToRelease(untracked, true, false, tracked),
+        )
+        assertEquals(
+            Intent.FLAG_GRANT_WRITE_URI_PERMISSION,
+            CapturedItems.safTreeFlagsToRelease(untracked, false, true, tracked),
+        )
+        assertEquals(
+            readAndWrite, CapturedItems.safTreeFlagsToRelease(untracked, true, true, tracked)
+        )
+        assertEquals(0, CapturedItems.safTreeFlagsToRelease(untracked, false, false, tracked))
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 538795fae..63bca2a35 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -524,6 +524,11 @@ class CamConfig(private val mActivity: MainActivity) {
             val editor = commonPref.edit()
             editor.putString(SettingValues.Key.STORAGE_LOCATION, value)
             editor.apply()
+
+            // Strictly after the write: the tree being picked only becomes tracked once it is the
+            // stored location, and re-picking a tree that savePreviousSafTree() just pushed off the
+            // tail of the tracked list would otherwise have its grant revoked out from under it.
+            CapturedItems.releaseUntrackedSafTrees(mActivity, commonPref)
         }
 
     var photoQuality: Int
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index 0f8b3e75b..8525770f1 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -17,6 +17,7 @@ import android.provider.MediaStore
 import android.util.Log
 import androidx.annotation.StringRes
 import app.grapheneos.camera.CamConfig.SettingValues
+import app.grapheneos.camera.util.EphemeralSharedPrefs
 import app.grapheneos.camera.util.edit
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -172,6 +173,65 @@ object CapturedItems {
                 remove(legacyPrefKey)
             }
         }
+
+        releaseUntrackedSafTrees(ctx, prefs)
+    }
+
+    // A directory the user picks as the storage location is granted to us persistably, which lasts
+    // until we release it or the app is uninstalled. Trees drop off the tracked list once the user
+    // has picked enough different directories to push one past
+    // MAX_NUMBER_OF_TRACKED_PREVIOUS_SAF_TREES, and the grant used to stay behind, leaving the app
+    // with indefinite read/write access to a folder it no longer has any use for. Reconcile the two.
+    fun releaseUntrackedSafTrees(ctx: Context, prefs: SharedPreferences) {
+        // A secure session reads a throwaway copy of the preferences, so the tracked list it sees is
+        // not the durable one and must never drive a durable revoke.
+        if (prefs is EphemeralSharedPrefs) {
+            return
+        }
+
+        val tracked = getSafTrees(prefs)
+        val resolver = ctx.contentResolver
+
+        resolver.persistedUriPermissions.forEach { permission ->
+            val uri = permission.uri
+            val flags = safTreeFlagsToRelease(
+                uri, permission.isReadPermission, permission.isWritePermission, tracked
+            )
+            if (flags == 0) {
+                return@forEach
+            }
+
+            try {
+                resolver.releasePersistableUriPermission(uri, flags)
+            } catch (e: Exception) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "unable to release the grant for $uri", e)
+                }
+            }
+        }
+    }
+
+    // Split out of the loop above so that the decision can be tested: an app cannot construct the
+    // UriPermission the loop reads it from.
+    internal fun safTreeFlagsToRelease(
+        uri: Uri, isRead: Boolean, isWrite: Boolean, tracked: Collection<Uri>
+    ): Int {
+        // Storage locations are the only tree grants this app takes; anything else persisted here
+        // belongs to a different feature and is none of our business.
+        if (!DocumentsContract.isTreeUri(uri) || tracked.contains(uri)) {
+            return 0
+        }
+
+        var flags = 0
+        if (isRead) {
+            flags = flags or Intent.FLAG_GRANT_READ_URI_PERMISSION
+        }
+
+        if (isWrite) {
+            flags = flags or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+        }
+
+        return flags
     }
 
     @Throws(InterruptedException::class)

From e7a9c0dccd2c175162b340b05c49acd323be435e Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:26:11 +0300
Subject: [PATCH 39/51] Discard a failed recording that never wrote a single
 byte

---
 .../java/app/grapheneos/camera/capturer/VideoCapturer.kt   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index 95a3be0b4..dbe88320e 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -240,6 +240,13 @@ class VideoCapturer(private val mActivity: MainActivity) {
                             }
                             else -> {
                                 ctx.showMessage(ctx.getString(R.string.error_during_recording, event.error))
+                                // The errors left unnamed here (the camera going away, storage
+                                // running out) finalize whatever was written before they hit, which
+                                // is worth keeping — but only if anything was.
+                                if (event.recordingStats.numBytesRecorded == 0L) {
+                                    discardUnusedOutput(recordingCtx)
+                                    return@start
+                                }
                             }
                         }
                     }

From dac1300b55da13f2ec1e8b5fa33b3d1eac9cc21c Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:28:34 +0300
Subject: [PATCH 40/51] Delete the pending recordings a killed process left
 behind

---
 .../camera/VideoCapturerRegressionTest.kt     | 54 +++++++++++++++++++
 .../main/java/app/grapheneos/camera/App.kt    |  6 +++
 .../camera/capturer/VideoCapturer.kt          | 29 ++++++++++
 3 files changed, 89 insertions(+)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
index ed3cb0d7e..7cdb419b3 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -2,6 +2,7 @@ package app.grapheneos.camera
 
 import android.Manifest
 import android.content.ContentResolver
+import android.content.ContentValues
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -19,6 +20,7 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.capturer.deleteStalePendingRecordings
 import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
 import app.grapheneos.camera.ui.activities.VideoOnlyActivity
@@ -231,6 +233,34 @@ class VideoCapturerRegressionTest {
         }
     }
 
+    /**
+     * A recording killed with the process leaves its output entry pending forever, holding the name
+     * and the space. Nothing used to clean those up.
+     */
+    @Test
+    fun stalePendingRecordings_areReaped() {
+        val uri = insertPendingRecording()
+        try {
+            // A cutoff in the future stands in for an entry old enough to be an orphan
+            deleteStalePendingRecordings(targetContext, maxAge = -2000L)
+            assertFalse(pendingRecordingExists(uri))
+        } finally {
+            deletePendingRecording(uri)
+        }
+    }
+
+    /** An in-flight recording is pending too, and reaping one would throw away the capture. */
+    @Test
+    fun freshPendingRecordings_surviveTheReaper() {
+        val uri = insertPendingRecording()
+        try {
+            deleteStalePendingRecordings(targetContext)
+            assertTrue(pendingRecordingExists(uri))
+        } finally {
+            deletePendingRecording(uri)
+        }
+    }
+
     /**
      * A fling used to rebind the camera out from under a running recorder. VIDEO is the last mode
      * in the strip, so the reachable direction out of it is the one onSwipeRight() serves; that is
@@ -373,6 +403,30 @@ class VideoCapturerRegressionTest {
     private val targetContext
         get() = InstrumentationRegistry.getInstrumentation().targetContext
 
+    private fun insertPendingRecording(): Uri {
+        val values = ContentValues().apply {
+            put(MediaColumns.DISPLAY_NAME, "${VIDEO_NAME_PREFIX}20260724_153012_stale.mp4")
+            put(MediaColumns.MIME_TYPE, "video/mp4")
+            put(MediaColumns.IS_PENDING, 1)
+        }
+        return targetContext.contentResolver.insert(CamConfig.videoCollectionUri, values)!!
+    }
+
+    /** Deleting an entry the reaper already took throws, so only clean up what is still there. */
+    private fun deletePendingRecording(uri: Uri) {
+        if (pendingRecordingExists(uri)) {
+            targetContext.contentResolver.delete(uri, null, null)
+        }
+    }
+
+    private fun pendingRecordingExists(uri: Uri): Boolean {
+        @Suppress("DEPRECATION")
+        val pendingUri = MediaStore.setIncludePending(uri)
+        return targetContext.contentResolver
+            .query(pendingUri, arrayOf(MediaColumns._ID), null, null, null)
+            ?.use { it.count == 1 } ?: false
+    }
+
     /** Pending entries are how in-flight and orphaned outputs appear in MediaStore. */
     private fun pendingVideoCount(): Int {
         val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
diff --git a/app/src/main/java/app/grapheneos/camera/App.kt b/app/src/main/java/app/grapheneos/camera/App.kt
index 88de3fd54..c0ed909e6 100644
--- a/app/src/main/java/app/grapheneos/camera/App.kt
+++ b/app/src/main/java/app/grapheneos/camera/App.kt
@@ -11,9 +11,11 @@ import android.os.CountDownTimer
 import android.view.WindowManager
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
+import app.grapheneos.camera.capturer.deleteStalePendingRecordings
 import app.grapheneos.camera.ktx.isSystemApp
 import app.grapheneos.camera.ui.activities.MainActivity
 import com.google.android.material.color.DynamicColors
+import kotlin.concurrent.thread
 
 class App : Application() {
 
@@ -114,6 +116,10 @@ class App : Application() {
         super.onCreate()
         registerActivityLifecycleCallbacks(activityLifeCycleHelper)
         DynamicColors.applyToActivitiesIfAvailable(this)
+
+        thread {
+            deleteStalePendingRecordings(this)
+        }
     }
 
     @RequiresPermission(allOf = [Manifest.permission.ACCESS_COARSE_LOCATION])
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
index dbe88320e..83819c7d9 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/VideoCapturer.kt
@@ -17,6 +17,7 @@ import android.os.Handler
 import android.os.Looper
 import android.os.ParcelFileDescriptor
 import android.provider.DocumentsContract
+import android.provider.MediaStore
 import android.provider.MediaStore.MediaColumns
 import android.view.View
 import android.webkit.MimeTypeMap
@@ -461,6 +462,34 @@ class VideoCapturer(private val mActivity: MainActivity) {
     }
 }
 
+private const val STALE_PENDING_RECORDING_AGE = 60 * 60 * 1000L
+
+// A recording that dies with its process (swipe-away from Recents, OOM kill, crash) never reaches
+// the Finalize callback that clears IS_PENDING, so it leaves a half-written file that is invisible
+// to the user until MediaProvider expires it a week later, and unplayable in the meantime since it
+// has no moov atom. Deleting is the honest outcome. Pending rows are only visible to the app that
+// owns them, so this can never reach another app's in-flight write, and the age cutoff keeps it
+// clear of a recording that is still being muxed.
+fun deleteStalePendingRecordings(
+    context: Context,
+    maxAge: Long = STALE_PENDING_RECORDING_AGE,
+) {
+    val selection = "${MediaColumns.IS_PENDING} = 1" +
+            " AND ${MediaColumns.DISPLAY_NAME} LIKE ?" +
+            " AND ${MediaColumns.DATE_ADDED} < ?"
+    val cutoffSeconds = (System.currentTimeMillis() - maxAge) / 1000L
+    val args = arrayOf("$VIDEO_NAME_PREFIX%", cutoffSeconds.toString())
+
+    try {
+        // Pending rows are filtered out of every operation unless they are explicitly asked for.
+        @Suppress("DEPRECATION")
+        val collection = MediaStore.setIncludePending(CamConfig.videoCollectionUri)
+        context.contentResolver.delete(collection, selection, args)
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
+}
+
 @Throws(Exception::class)
 fun getVideoThumbnail(context: Context, uri: Uri?): Bitmap? {
     MediaMetadataRetriever().use {

From c2162571c5ec9d988a42188c8bd1c1548fb08ca3 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:29:15 +0300
Subject: [PATCH 41/51] Stop asking for location permission the user never
 asked to give

---
 .../main/java/app/grapheneos/camera/CamConfig.kt  | 15 ++++++++++++---
 .../camera/ui/activities/MainActivity.kt          |  6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 63bca2a35..d7ee84125 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -651,8 +651,13 @@ class CamConfig(private val mActivity: MainActivity) {
         }
         set(value) {
             mActivity.locationCamConfigChanged(value)
-            modePref.edit {
-                putBoolean(SettingValues.Key.GEO_TAGGING, value)
+
+            // A permission result is delivered before the first onResume of an activity the system
+            // recreated, so this can run before startCamera() has picked the prefs for a mode
+            if (::modePref.isInitialized) {
+                modePref.edit {
+                    putBoolean(SettingValues.Key.GEO_TAGGING, value)
+                }
             }
 
             mActivity.settingsDialog.locToggle.isChecked = value
@@ -734,10 +739,14 @@ class CamConfig(private val mActivity: MainActivity) {
             SettingValues.Default.FLASH_MODE
         )
 
+        // A stored "on" is written before a permission request resolves, and it outlives a later
+        // revocation, so it cannot be asserted on its own: doing so opened a permission dialog on
+        // startup that the user never asked for. Coercing it here settles the stale value through
+        // the setter, and leaves every dialog in the app originating from an explicit toggle.
         requireLocation = modePref.getBoolean(
             SettingValues.Key.GEO_TAGGING,
             SettingValues.Default.GEO_TAGGING
-        )
+        ) && !(mActivity.applicationContext as App).shouldAskForLocationPermission()
 
         selfIlluminate = modePref.getBoolean(
             SettingValues.Key.SELF_ILLUMINATION,
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 8b55d1e06..aa3491fe5 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1701,7 +1701,11 @@ open class MainActivity : AppCompatActivity(),
     private val enableLocationLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) {
-        requestLocation(application.isAnyLocationProvideActive())
+        // The snackbar that leads here outlives a mode switch, so geo-tagging can be off for the
+        // mode this returns to
+        if (camConfig.requireLocation) {
+            requestLocation(application.isAnyLocationProvideActive())
+        }
     }
 
     // Used to request permission from the user

From 1de7d2da256310be645ec68aa9a509265b85ffb3 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:29:45 +0300
Subject: [PATCH 42/51] Keep the extension probe verdicts for the whole process

---
 .../java/app/grapheneos/camera/CamConfig.kt   | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index d7ee84125..d916653ab 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -209,6 +209,16 @@ class CamConfig(private val mActivity: MainActivity) {
         val REAR_CAMERA_SELECTOR = CameraSelector.Builder()
             .requireLensFacing(CameraSelector.LENS_FACING_BACK)
             .build()
+
+        // Whether a vendor extension is usable, keyed by lens facing and extension mode (see
+        // probeExtension). A verdict describes the device rather than any one activity and costs
+        // binder round trips to reach, so it is kept for the process: every lock screen launch used
+        // to re-probe what the session underneath it had already answered.
+        private val extensionUsability = HashMap<Pair<Int, Int>, Boolean>()
+
+        // The provider the verdicts above were probed through. A different instance means the
+        // camera stack was reinitialized and none of them describe it any more.
+        private var probedCameraProvider: ProcessCameraProvider? = null
     }
 
     var camera: Camera? = null
@@ -1044,11 +1054,12 @@ class CamConfig(private val mActivity: MainActivity) {
                 return
             }
 
-            if (provider !== cameraProvider) {
+            if (provider !== probedCameraProvider) {
                 // A different provider instance means the camera stack was reinitialized:
                 // extension verdicts probed through the previous instance (including bind-time
                 // blacklists, see startCamera) describe vendor state that no longer exists.
                 extensionUsability.clear()
+                probedCameraProvider = provider
             }
             cameraProvider = provider
 
@@ -1108,18 +1119,17 @@ class CamConfig(private val mActivity: MainActivity) {
     // only safe option is to stop offering the mode.
     //
     // getCameraInfo() performs exactly the same vendor init that bindToLifecycle() does, so it is
-    // a faithful probe. Verdicts are cached because every step of the probe -- including the
-    // availability query, see probeExtension -- costs a binder round trip. A negative verdict is
-    // only cached when the failure is known to be persistent: caching a transient probe failure
-    // would make the mode's tab vanish for the rest of the process lifetime over a condition
-    // that clears seconds later.
+    // a faithful probe. Verdicts are cached (extensionUsability) because every step of the probe
+    // -- including the availability query, see probeExtension -- costs a binder round trip. A
+    // negative verdict is only cached when the failure is known to be persistent: caching a
+    // transient probe failure would make the mode's tab vanish for the rest of the process
+    // lifetime over a condition that clears seconds later.
+    //
+    // The cache is read and written on the main thread only, which is also what keeps the two
+    // activities that can share it (a secure session over a running one) from racing each other.
+    // probeExtension() itself also runs on the probe thread that loadTabs() spawns, but its
+    // results come back through the main executor.
     //
-    // The cache is read and written on the main thread only. probeExtension() itself also runs
-    // on the probe thread that loadTabs() spawns, but its results come back through the main
-    // executor, which keeps the provider-change invalidation in initializeCamera() and these
-    // writes free of cross-thread races.
-    private val extensionUsability = HashMap<Pair<Int, Int>, Boolean>()
-
     // true/false is a verdict that is safe to cache; null is a failure that may be transient
     // and must not be (see extensionUsability above). The provider and manager are parameters
     // rather than the fields because this also runs off the main thread, where the fields could
@@ -1904,7 +1914,7 @@ class CamConfig(private val mActivity: MainActivity) {
                 extensionProbesInFlight = false
                 if (mActivity.isDestroyed || mActivity.isFinishing) return@execute
 
-                if (cameraProvider !== provider) {
+                if (probedCameraProvider !== provider) {
                     // The camera stack was reinitialized while probing: these verdicts describe
                     // vendor state that no longer exists (the same reasoning as the cache clear
                     // in initializeCamera). Any refresh that ran for the new provider found this

From 6262c1e900fc0ee3001256417cf2ca219cd0102e Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:30:29 +0300
Subject: [PATCH 43/51] Let shareCapturedItem name the failure it wants
 reported

---
 .../app/grapheneos/camera/ShareMediaRegressionTest.kt |  6 +++---
 .../main/java/app/grapheneos/camera/CapturedItems.kt  | 11 +++++++----
 .../grapheneos/camera/ui/activities/InAppGallery.kt   |  4 ++--
 .../grapheneos/camera/ui/activities/MainActivity.kt   |  6 ++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
index d013b6303..72e1795ee 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/ShareMediaRegressionTest.kt
@@ -9,8 +9,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import app.grapheneos.camera.util.getParcelableExtra
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -39,7 +39,7 @@ class ShareMediaRegressionTest {
     fun share_whenUriGrantIsDenied_reportsFailureInsteadOfCrashing() {
         val host = OemPreGrantHostActivity().attached()
 
-        assertFalse(shareCapturedItem(host, staleItem))
+        assertEquals(R.string.unable_to_share_media, shareCapturedItem(host, staleItem))
     }
 
     @Test
@@ -47,7 +47,7 @@ class ShareMediaRegressionTest {
     fun share_launchesChooserWithItemUri() {
         val host = ChooserRecordingHostActivity().attached()
 
-        assertTrue(shareCapturedItem(host, staleItem))
+        assertNull(shareCapturedItem(host, staleItem))
 
         val chooser = host.launched
         assertNotNull(chooser)
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index 8525770f1..91417ba0c 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -113,19 +113,22 @@ class CapturedItem(
 
 // Some OEM builds grant the shared uri to the target inside startActivity(), which throws a
 // SecurityException when this app has itself lost access to the item (e.g. it was deleted
-// externally, or its persisted uri came from a restored backup)
-internal fun shareCapturedItem(activity: Activity, item: CapturedItem): Boolean {
+// externally, or its persisted uri came from a restored backup). Returns the error message to
+// show, or null on success
+@StringRes
+internal fun shareCapturedItem(activity: Activity, item: CapturedItem): Int? {
     val intent = Intent(Intent.ACTION_SEND).apply {
         putExtra(Intent.EXTRA_STREAM, item.uri)
         setDataAndType(item.uri, item.mimeType())
         addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
+
     return try {
         activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_image)))
-        true
+        null
     } catch (e: SecurityException) {
         Log.e(CapturedItems.TAG, "unable to share ${item.uiName()}", e)
-        false
+        R.string.unable_to_share_media
     }
 }
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index b5f8abda3..49828bb26 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -595,8 +595,8 @@ class InAppGallery : AppCompatActivity() {
 
         val curItem = getCurrentItem() ?: return
 
-        if (!shareCapturedItem(this, curItem)) {
-            showMessage(getString(R.string.unable_to_share_media))
+        shareCapturedItem(this, curItem)?.let {
+            showMessage(getString(it))
         }
     }
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index aa3491fe5..46e8efe59 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -71,9 +71,9 @@ import app.grapheneos.camera.ITEM_TYPE_IMAGE
 import app.grapheneos.camera.ITEM_TYPE_VIDEO
 import app.grapheneos.camera.R
 import app.grapheneos.camera.capturer.ImageCapturer
-import app.grapheneos.camera.shareCapturedItem
 import app.grapheneos.camera.capturer.VideoCapturer
 import app.grapheneos.camera.capturer.getVideoThumbnail
+import app.grapheneos.camera.shareCapturedItem
 import app.grapheneos.camera.databinding.ActivityMainBinding
 import app.grapheneos.camera.databinding.ScanResultDialogBinding
 import app.grapheneos.camera.ktx.SystemSettingsObserver
@@ -1060,9 +1060,7 @@ open class MainActivity : AppCompatActivity(),
             return
         }
 
-        if (!shareCapturedItem(this, item)) {
-            showMessage(R.string.unable_to_share_media)
-        }
+        shareCapturedItem(this, item)?.let { showMessage(it) }
     }
 
     open fun bytesToHex(bytes: ByteArray): String {

From 879d1b4d4d9aefb780f34aaf8189b262703ea5f7 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:30:54 +0300
Subject: [PATCH 44/51] Refuse to share the last capture out of a secure
 session

---
 .../java/app/grapheneos/camera/ui/activities/MainActivity.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 46e8efe59..0657e998f 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1054,6 +1054,11 @@ open class MainActivity : AppCompatActivity(),
     }
 
     private fun shareLatestMedia() {
+        if (this is SecureActivity) {
+            showMessage(R.string.sharing_not_allowed)
+            return
+        }
+
         val item = camConfig.lastCapturedItem
         if (item == null) {
             showMessage(R.string.please_wait_for_image_to_get_captured_before_sharing)

From 34e0f9b874e6ce38caa74a29fa19c1cf1bbb96f8 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:31:06 +0300
Subject: [PATCH 45/51] Leave the level indicator alone in QR scan mode

---
 .../java/app/grapheneos/camera/ui/activities/MainActivity.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 0657e998f..9b6f64120 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1587,7 +1587,7 @@ open class MainActivity : AppCompatActivity(),
         val zAngle = zDegrees
 
         // If we are in photo mode and the countdown timer isn't running
-        if (!(camConfig.isVideoMode || camConfig.isVideoMode || cdTimer.isRunning)) {
+        if (!(camConfig.isQRMode || camConfig.isVideoMode || cdTimer.isRunning)) {
 
             if (gCircle.rotation != xAngle) {
                 gCircle.rotation = xAngle

From b5020eddf49519af117b2a1c6de1ccf76d2092bd Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 17:31:06 +0300
Subject: [PATCH 46/51] Stop a running recording before the unbind in onStop
 tears it down

---
 .../camera/VideoCapturerRegressionTest.kt     | 33 +++++++++++++++++++
 .../camera/ui/activities/CaptureActivity.kt   | 16 ++++++---
 .../camera/ui/activities/MainActivity.kt      |  7 ++--
 .../ui/activities/VideoCaptureActivity.kt     | 22 ++++++++++++-
 4 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
index 7cdb419b3..e479b352f 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/VideoCapturerRegressionTest.kt
@@ -16,6 +16,7 @@ import android.provider.MediaStore
 import android.provider.MediaStore.MediaColumns
 import android.util.StateSet
 import android.view.View
+import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -309,6 +310,38 @@ class VideoCapturerRegressionTest {
         }
     }
 
+    /**
+     * Leaving a capture session while it records finalizes the recording after the preview is gone:
+     * the confirm UI used to be built there and then, off a PreviewView with no bitmap left to give.
+     */
+    @Test
+    fun leavingACaptureSessionWhileRecording_defersThePreview() {
+        val intent = Intent(targetContext, VideoCaptureActivity::class.java)
+            .setAction(MediaStore.ACTION_VIDEO_CAPTURE)
+
+        recordingTest({ ActivityScenario.launch<VideoCaptureActivity>(intent) }) { scenario ->
+            scenario.onActivity { activity ->
+                activity.camConfig.mPlayer = ImmediateTunePlayer(activity)
+                activity.videoCapturer.startRecording()
+            }
+            waitUntil(scenario, "recording is running") { it.videoCapturer.isRecording }
+
+            // Stops the activity, which stops the recording; the finalize event that used to crash
+            // lands afterwards, on the main thread of a stopped activity.
+            scenario.moveToState(Lifecycle.State.CREATED)
+            waitUntil(scenario, "recording is finalized") { !it.videoCapturer.isRecording }
+
+            scenario.moveToState(Lifecycle.State.RESUMED)
+
+            var confirmVisibility = View.GONE
+            scenario.onActivity { confirmVisibility = it.confirmButton.visibility }
+            assertEquals(
+                "the preview the finalize deferred never arrived",
+                View.VISIBLE, confirmVisibility
+            )
+        }
+    }
+
     /**
      * The strip is only hidden once a recording really starts, so a tap on it while the start sound
      * still played rebound the camera and left the queued recording to start on a dead recorder.
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
index 0863bdffa..a81900b0c 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/CaptureActivity.kt
@@ -32,7 +32,8 @@ open class CaptureActivity : MainActivity() {
     }
 
     lateinit var outputUri: Uri
-    lateinit var bitmap: Bitmap
+
+    var bitmap: Bitmap? = null
 
     private lateinit var retakeIcon: ImageView
 
@@ -200,8 +201,14 @@ open class CaptureActivity : MainActivity() {
 
         val resultIntent = Intent("inline-data")
 
-        if (::outputUri.isInitialized) {
+        val bitmap = bitmap
+        if (bitmap == null) {
+            setResult(RESULT_CANCELED)
+            finish()
+            return
+        }
 
+        if (::outputUri.isInitialized) {
             val bos = ByteArrayOutputStream()
 
             val cf: CompressFormat =
@@ -227,8 +234,9 @@ open class CaptureActivity : MainActivity() {
 
             setResult(result)
         } else {
-            bitmap = resizeImage(bitmap)
-            resultIntent.putExtra("data", bitmap)
+            val resized = resizeImage(bitmap)
+            this.bitmap = resized
+            resultIntent.putExtra("data", resized)
             setResult(RESULT_OK, resultIntent)
         }
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 9b6f64120..705f0351d 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -129,7 +129,8 @@ open class MainActivity : AppCompatActivity(),
     // is already visible and to dismiss it if the permission gets granted.
     private var cameraPermissionDialog: AlertDialog? = null
     private var audioPermissionDialog: AlertDialog? = null
-    private var lastFrame: Bitmap? = null
+    var lastFrame: Bitmap? = null
+        private set
 
     private lateinit var mainFrame: View
     lateinit var rootView: View
@@ -1785,11 +1786,13 @@ open class MainActivity : AppCompatActivity(),
     }
 
     override fun onStop() {
-        super.onStop()
         isStarted = false
+        // Stop explicitly rather than letting the unbind tear the recording down for us.
         if (this::videoCapturer.isInitialized && videoCapturer.isRecording) {
+            updateLastFrame()
             videoCapturer.stopRecording()
         }
+        super.onStop()
     }
 
     var isThumbnailLoaded = false
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
index 567bd8df2..baf2ce67c 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt
@@ -15,6 +15,8 @@ class VideoCaptureActivity : CaptureActivity() {
 
     private var savedUri: Uri? = null
 
+    private var previewPending = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -54,7 +56,25 @@ class VideoCaptureActivity : CaptureActivity() {
 
         this.savedUri = savedUri
 
-        bitmap = previewView.bitmap!!
+        if (!isStarted) {
+            previewPending = true
+            return
+        }
+
+        showRecordingPreview()
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        if (previewPending) {
+            previewPending = false
+            showRecordingPreview()
+        }
+    }
+
+    private fun showRecordingPreview() {
+        bitmap = previewView.bitmap ?: lastFrame
 
         cancelButtonView.visibility = View.VISIBLE
 

From 027d62779f62a342db169f8ac3da0ac37329a4eb Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 22:56:24 +0300
Subject: [PATCH 47/51] Mux recordings with the platform muxer instead of the
 media3 one that drops audio

---
 app/src/main/java/app/grapheneos/camera/CamConfig.kt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index d916653ab..ba5a5da98 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -44,6 +44,7 @@ import androidx.camera.video.Quality
 import androidx.camera.video.QualitySelector
 import androidx.camera.video.Recorder
 import androidx.camera.video.VideoCapture
+import androidx.camera.video.internal.muxer.MediaMuxerImpl
 import androidx.core.content.ContextCompat
 import app.grapheneos.camera.analyzer.QRAnalyzer
 import app.grapheneos.camera.ktx.markAs16by9Layout
@@ -1502,6 +1503,13 @@ class CamConfig(private val mActivity: MainActivity) {
 
                 val recorderBuilder = Recorder.Builder()
 
+                // camera-video 1.6 writes mp4 through the media3 muxer, which cannot keep up with
+                // 2160p on a Tensor device: the audio queue overflows a few seconds in and stop
+                // then has to drain everything the muxer is behind by. The platform muxer, which
+                // is what every release up to 1.5 used, keeps up. Both live in an internal
+                // package, so this has to be re-checked on every camera-video upgrade.
+                recorderBuilder.setMuxerFactory { MediaMuxerImpl() }
+
                 if (!usesFeatureGroup) {
                     recorderBuilder.setQualitySelector(QualitySelector.from(videoQuality))
                 }

From 58eb521fdf3b641964dffb39f0337c1d0f0509b8 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 23:48:43 +0300
Subject: [PATCH 48/51] Pick a mode from the tab strip's scroll position only
 while it is being dragged

---
 .../grapheneos/camera/ui/BottomTabLayout.kt   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
index a5738d3d3..c1dfbda23 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/BottomTabLayout.kt
@@ -2,6 +2,7 @@ package app.grapheneos.camera.ui
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.MotionEvent
 import android.view.ViewGroup
 import app.grapheneos.camera.CameraMode
 import com.google.android.material.tabs.TabLayout
@@ -14,6 +15,8 @@ class BottomTabLayout @JvmOverloads constructor(
 
     private val snapPoints: ArrayList<Int> = arrayListOf()
 
+    private var isDragging = false
+
     private lateinit var tabParent: ViewGroup
 
     val selectedTab: Tab?
@@ -32,6 +35,16 @@ class BottomTabLayout @JvmOverloads constructor(
         return null
     }
 
+    // Called for every event dispatched to the strip, tabs included, so this sees the whole gesture
+    // even once a tab's own view has taken the touch.
+    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+        when (ev.action) {
+            MotionEvent.ACTION_MOVE -> isDragging = true
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> isDragging = false
+        }
+        return super.onInterceptTouchEvent(ev)
+    }
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         super.onLayout(changed, l, t, r, b)
 
@@ -73,6 +86,15 @@ class BottomTabLayout @JvmOverloads constructor(
             return
         }
 
+        // Only a finger on the strip picks a mode this way. Centering a tab animates the scroll
+        // position through the snap ranges of every tab in between, and switching mode blocks the
+        // main thread for long enough that those frames arrive after the switch -- the first of them
+        // still at the tab the animation started from, which would drag the highlight back onto the
+        // mode the camera just left.
+        if (!isDragging) {
+            return
+        }
+
         for (i in snapPoints.indices step 2) {
 
             val start = snapPoints[i]

From 5dd9fc878e25fdd0ec6970a301f4c0ca6d33e3f6 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Sun, 26 Jul 2026 23:48:43 +0300
Subject: [PATCH 49/51] Read a cached zoom state instead of asking the camera
 on every zoom update

---
 .../java/app/grapheneos/camera/CamConfig.kt   | 32 ++++++++++++++++---
 .../camera/ui/activities/MainActivity.kt      |  2 +-
 .../grapheneos/camera/ui/seekbar/ZoomBar.kt   |  3 +-
 .../grapheneos/camera/util/CameraControl.kt   |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index ba5a5da98..9f11ea197 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -31,6 +31,7 @@ import androidx.camera.core.Preview
 import androidx.camera.core.SessionConfig
 import androidx.camera.core.TorchState
 import androidx.camera.core.UseCase
+import androidx.camera.core.ZoomState
 import androidx.camera.core.featuregroup.GroupableFeature
 import androidx.camera.core.resolutionselector.AspectRatioStrategy
 import androidx.camera.core.resolutionselector.ResolutionSelector
@@ -46,6 +47,8 @@ import androidx.camera.video.Recorder
 import androidx.camera.video.VideoCapture
 import androidx.camera.video.internal.muxer.MediaMuxerImpl
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
 import app.grapheneos.camera.analyzer.QRAnalyzer
 import app.grapheneos.camera.ktx.markAs16by9Layout
 import app.grapheneos.camera.ktx.markAs4by3Layout
@@ -224,6 +227,22 @@ class CamConfig(private val mActivity: MainActivity) {
 
     var camera: Camera? = null
 
+    // Asking CameraInfo for the zoom state is cheap for a plain camera but costs ~100 ms once an
+    // extension is bound, because CameraX then queries the extension's zoom range through
+    // CameraExtensionCharacteristics, which enumerates every vendor key. Read this snapshot instead
+    // of the camera on any path that runs more than once per bind.
+    var zoomState: ZoomState? = null
+        private set
+
+    private var zoomStateSource: LiveData<ZoomState>? = null
+
+    private val zoomStateObserver = Observer<ZoomState> {
+        zoomState = it
+        if (it.linearZoom != 0f || it.zoomRatio != 1f) {
+            mActivity.zoomBar.updateThumb()
+        }
+    }
+
     var cameraProvider: ProcessCameraProvider? = null
     private var extensionsManager: ExtensionsManager? = null
 
@@ -1753,11 +1772,16 @@ class CamConfig(private val mActivity: MainActivity) {
 
         loadTabs()
 
-        camera?.cameraInfo?.zoomState?.observe(mActivity) {
-            if (it.linearZoom != 0f || it.zoomRatio != 1f) {
-                mActivity.zoomBar.updateThumb()
-            }
+        // Every bind hands out a fresh LiveData in extension modes, and the old observer would
+        // otherwise stay attached: after a handful of mode switches a single zoom step redrew the
+        // thumb once per bind that had ever happened.
+        zoomStateSource?.removeObserver(zoomStateObserver)
+        zoomStateSource = camera?.cameraInfo?.zoomState?.also {
+            it.observe(mActivity, zoomStateObserver)
         }
+        // The observer above has already run if the activity is started; this covers the case where
+        // it has not, so the bar does not claim 1.0x while the camera is zoomed.
+        zoomState = zoomStateSource?.value
 
         mActivity.zoomBar.updateThumb(false)
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 705f0351d..968770894 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1250,7 +1250,7 @@ open class MainActivity : AppCompatActivity(),
 
     override fun onScale(detector: ScaleGestureDetector): Boolean {
         isZooming = true
-        val zoomState = camConfig.camera!!.cameraInfo.zoomState.value
+        val zoomState = camConfig.zoomState
         var scale = 1f
         if (zoomState != null) {
             scale = zoomState.zoomRatio * detector.scaleFactor
diff --git a/app/src/main/java/app/grapheneos/camera/ui/seekbar/ZoomBar.kt b/app/src/main/java/app/grapheneos/camera/ui/seekbar/ZoomBar.kt
index 68dc4ce39..74c08b075 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/seekbar/ZoomBar.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/seekbar/ZoomBar.kt
@@ -85,8 +85,7 @@ class ZoomBar : AppCompatSeekBar {
     }
 
     fun updateThumb(shouldShowPanel: Boolean = true) {
-        val zoomState: ZoomState? = camConfig.camera?.cameraInfo?.zoomState
-            ?.value
+        val zoomState: ZoomState? = camConfig.zoomState
 
         if (shouldShowPanel) {
             showPanel()
diff --git a/app/src/main/java/app/grapheneos/camera/util/CameraControl.kt b/app/src/main/java/app/grapheneos/camera/util/CameraControl.kt
index 50fbb50f0..57a19ea27 100644
--- a/app/src/main/java/app/grapheneos/camera/util/CameraControl.kt
+++ b/app/src/main/java/app/grapheneos/camera/util/CameraControl.kt
@@ -5,7 +5,7 @@ import app.grapheneos.camera.CamConfig
 
 class CameraControl(private val camConfig: CamConfig) {
 
-    private fun zoomState(): ZoomState? = camConfig.camera?.cameraInfo?.zoomState?.value
+    private fun zoomState(): ZoomState? = camConfig.zoomState
 
     fun zoomIn() = zoomByRatio(1f)
 

From ee4830b6a2bd2fdb71dfc9ec1064b0ce1aa8bcdf Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Mon, 27 Jul 2026 01:25:51 +0300
Subject: [PATCH 50/51] Reject out-of-range photo quality values instead of
 crashing the next camera bind

---
 .../camera/PhotoQualityRegressionTest.kt      | 100 ++++++++++++++++++
 .../camera/ui/activities/MoreSettings.kt      |   6 +-
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 app/src/androidTest/java/app/grapheneos/camera/PhotoQualityRegressionTest.kt

diff --git a/app/src/androidTest/java/app/grapheneos/camera/PhotoQualityRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/PhotoQualityRegressionTest.kt
new file mode 100644
index 000000000..a5fec25c9
--- /dev/null
+++ b/app/src/androidTest/java/app/grapheneos/camera/PhotoQualityRegressionTest.kt
@@ -0,0 +1,100 @@
+package app.grapheneos.camera
+
+import android.Manifest
+import android.widget.EditText
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import app.grapheneos.camera.ui.activities.MainActivity
+import app.grapheneos.camera.ui.activities.MoreSettings
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PhotoQualityRegressionTest {
+
+    @get:Rule
+    val grantPermissions: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.CAMERA,
+    )
+
+    /** More Settings is started from a resumed camera, which a dozing device cannot provide. */
+    @get:Rule
+    val screenAwake = ScreenAwakeRule()
+
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    /**
+     * NumInputFilter cannot veto a deletion: the empty replacement it returns to reject an edit is
+     * the very edit a deletion asks for. Deleting the leading digit of "10" therefore leaves "0"
+     * behind, and committing that stored a quality ImageCapture refuses, crashing the next bind
+     * with "jpegQuality is out of range of [1, 100]".
+     */
+    @Test
+    fun photoQualityOutOfRange_isNotCommitted() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            // The same instance More Settings edits, so it can be read while that screen is up
+            val camConfig = camConfigOf(scenario)
+            val stored = camConfig.photoQuality
+
+            val settings = openMoreSettings(scenario)
+            val field = settings.findViewById<EditText>(R.id.photo_quality)
+
+            instrumentation.runOnMainSync {
+                field.setText("10")
+                field.text.delete(0, 1)
+                assertEquals("0", field.text.toString())
+
+                instrumentation.callActivityOnPause(settings)
+
+                assertEquals(stored, camConfig.photoQuality)
+                assertEquals(stored.toString(), field.text.toString())
+            }
+        }
+    }
+
+    /** The range check may not reject the values it exists to let through. */
+    @Test
+    fun photoQualityInRange_isCommitted() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            val camConfig = camConfigOf(scenario)
+            val stored = camConfig.photoQuality
+
+            val settings = openMoreSettings(scenario)
+            val field = settings.findViewById<EditText>(R.id.photo_quality)
+
+            try {
+                instrumentation.runOnMainSync {
+                    field.setText("77")
+                    instrumentation.callActivityOnPause(settings)
+
+                    assertEquals(77, camConfig.photoQuality)
+                }
+            } finally {
+                camConfig.photoQuality = stored
+            }
+        }
+    }
+
+    private fun camConfigOf(scenario: ActivityScenario<MainActivity>): CamConfig {
+        lateinit var camConfig: CamConfig
+        scenario.onActivity { camConfig = it.camConfig }
+        return camConfig
+    }
+
+    private fun openMoreSettings(scenario: ActivityScenario<MainActivity>): MoreSettings {
+        val monitor = instrumentation.addMonitor(MoreSettings::class.java.name, null, false)
+        scenario.onActivity { MoreSettings.start(it) }
+        val settings = instrumentation.waitForMonitorWithTimeout(monitor, 10_000)
+        assertNotNull("More Settings did not open", settings)
+        return settings as MoreSettings
+    }
+}
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index 0efa95b42..ef5c03b77 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -314,7 +314,11 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
 
         // Dump state of photo quality
         val quality = pQField.text.toString().toIntOrNull()
-        if (quality == null) {
+        // NumInputFilter keeps out-of-range values from being typed, but it cannot stop them being
+        // deleted into place: the empty replacement it returns to reject an edit is the very edit a
+        // deletion asks for, so deleting the leading digit of "10" leaves "0" behind. Committing
+        // that made ImageCapture reject the quality and crash the next bind.
+        if (quality == null || quality !in NumInputFilter.min..NumInputFilter.max) {
             // Revert back to the original value if invalid number was found
             pQField.setText(camConfig.photoQuality.toString())
             if (notifyOnInvalidValue) {

From 124d62f4a29de0caab3784076d87b2474152ff9c Mon Sep 17 00:00:00 2001
From: Artem Smirnov <artem@smirnov.page>
Date: Mon, 27 Jul 2026 04:34:06 +0300
Subject: [PATCH 51/51] Check that the capture button starts the self-timer
 instead of the shutter

---
 .../camera/SelfTimerRegressionTest.kt         | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt b/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt
index c2e7cc00e..6373271ef 100644
--- a/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt
+++ b/app/src/androidTest/java/app/grapheneos/camera/SelfTimerRegressionTest.kt
@@ -115,6 +115,66 @@ class SelfTimerRegressionTest {
         }
     }
 
+    /**
+     * The capture button's two branches are mutually exclusive, so a running countdown is proof the
+     * tap was not spent taking a photo. Checking this from the outside is awkward enough to invite
+     * being skipped: a dump waits for an idle UI, and the countdown retexts itself every second.
+     */
+    @Test
+    fun captureButton_withATimerSet_startsTheCountdownInsteadOfCapturing() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                activity.camConfig.switchMode(CameraMode.CAMERA)
+                activity.timerDuration = 10
+                activity.updateSelfTimerBadge()
+
+                activity.captureButton.performClick()
+
+                assertTrue(activity.cdTimer.isRunning)
+                assertEquals(View.VISIBLE, activity.cdTimer.visibility)
+                assertEquals(View.VISIBLE, activity.cbCross.visibility)
+                assertEquals(View.INVISIBLE, activity.settingsIcon.visibility)
+                assertEquals(View.INVISIBLE, activity.tabLayout.visibility)
+                assertEquals(
+                    activity.getString(R.string.cancel_timer),
+                    activity.captureButton.contentDescription
+                )
+
+                activity.cdTimer.cancelTimer()
+            }
+        }
+    }
+
+    /** The same button cancels the countdown it started, and owes back everything it hid. */
+    @Test
+    fun captureButton_duringACountdown_cancelsItAndPutsTheControlsBack() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            waitUntil(scenario, "camera is bound") { it.camConfig.camera != null }
+
+            scenario.onActivity { activity ->
+                activity.camConfig.switchMode(CameraMode.CAMERA)
+                activity.timerDuration = 10
+                activity.updateSelfTimerBadge()
+                val shutterDescription = activity.captureButton.contentDescription
+
+                activity.captureButton.performClick()
+                assertTrue(activity.cdTimer.isRunning)
+
+                activity.captureButton.performClick()
+
+                assertFalse(activity.cdTimer.isRunning)
+                assertEquals(View.GONE, activity.cdTimer.visibility)
+                assertEquals(View.INVISIBLE, activity.cbCross.visibility)
+                assertEquals(View.VISIBLE, activity.settingsIcon.visibility)
+                assertEquals(View.VISIBLE, activity.tabLayout.visibility)
+                assertEquals(View.VISIBLE, activity.cbText.visibility)
+                assertEquals(shutterDescription, activity.captureButton.contentDescription)
+            }
+        }
+    }
+
     /**
      * The self-timer is inherited from the last photo session, so a video-only activity can hold a
      * duration it will never use. It must not advertise one.