Merge branch 'no-waiting-webview'

Author: io7m

README-CHANGES.xml

@@ -226,8 +226,14 @@
         <c:change date="2026-01-12T00:00:00+00:00" summary="Fix night mode visual issues."/>
       </c:changes>
     </c:release>
-    <c:release date="2026-01-16T09:57:36+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="6.12.0">
-      <c:changes/>
+    <c:release date="2026-01-30T10:41:59+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="6.12.0">
+      <c:changes>
+        <c:change date="2026-01-30T10:41:59+00:00" summary="Correct a possible ANR.">
+          <c:tickets>
+            <c:ticket id="PP-3577"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
     </c:release>
   </c:releases>
   <c:ticket-systems>

org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt

@@ -37,6 +37,7 @@ import org.librarysimplified.r2.api.SR2Locator.SR2LocatorChapterEnd
 import org.librarysimplified.r2.api.SR2Locator.SR2LocatorPercent
 import org.librarysimplified.r2.api.SR2PageNumberingMode
 import org.librarysimplified.r2.api.SR2Theme
+import org.librarysimplified.r2.ui_thread.SR2UIThread
 import org.librarysimplified.r2.vanilla.BuildConfig
 import org.readium.r2.shared.ExperimentalReadiumApi
 import org.readium.r2.shared.publication.Href
@@ -141,8 +142,7 @@ internal class SR2Controller private constructor(
       val publicationOpener =
         PublicationOpener(
           publicationParser = publicationParser,
-          contentProtections =
-          configuration.contentProtections,
+          contentProtections = configuration.contentProtections,
           onCreatePublication = {
           },
         )
@@ -723,7 +723,7 @@ internal class SR2Controller private constructor(
               this.logger.debug("{} Failed to set scroll mode: ", this.name(), exception)
             }
           }.thenCompose {
-            this.executeThemeSet(this.waitForWebViewAvailability(), this.themeNow())
+            this.executeThemeSet(connection, this.themeNow())
           }.handle { _, exception ->
             if (exception != null) {
               this.logger.debug("{} Failed to set theme: ", this.name(), exception)
@@ -1193,6 +1193,10 @@ internal class SR2Controller private constructor(
    */
 
   private fun waitForWebViewAvailability(): SR2WebViewConnectionType {
+    check(!SR2UIThread.isUIThread()) {
+      "Waiting for the web view on the UI thread is not permitted."
+    }
+
     while (true) {
       synchronized(this.webViewConnectionLock) {
         val webView = this.webViewConnection