From ab99206d58f5a33d98eafcb3b435d9454b57ab56 Mon Sep 17 00:00:00 2001
From: Tuomas Airaksinen <tuomas.airaksinen@vrt.fi>
Date: Thu, 18 Jan 2024 18:10:13 +0200
Subject: [PATCH] Fix #3046 (With "Text follows speech" option TTS does not
 highlight genbook text)

---
 .../main/java/net/bible/android/control/page/window/Window.kt | 2 +-
 .../java/net/bible/android/view/activity/page/BibleView.kt    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/bible/android/control/page/window/Window.kt b/app/src/main/java/net/bible/android/control/page/window/Window.kt
index 923ac05dbf..1f05dd49aa 100644
--- a/app/src/main/java/net/bible/android/control/page/window/Window.kt
+++ b/app/src/main/java/net/bible/android/control/page/window/Window.kt
@@ -318,7 +318,7 @@ class Window (
         val anchorOrdinal = pageManager.currentPage.anchorOrdinal
         val htmlId = pageManager.currentPage.htmlId
         if(prevKey == key && (anchorOrdinal != null || htmlId != null)) {
-            bibleView?.scrollOrJumpToOrdinal(anchorOrdinal, htmlId)
+            bibleView?.scrollOrJumpToOrdinal(anchorOrdinal, htmlId, document?.initials, key?.osisRef)
             return
         }
         loadText(notifyLocationChange = true)
diff --git a/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt b/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt
index b129d3ad08..d52a7e9362 100644
--- a/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt
+++ b/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt
@@ -1740,7 +1740,7 @@ class BibleView(val mainBibleActivity: MainBibleActivity,
             PassageChangeMediator.onCurrentVerseChanged(window)
         }
     }
-    fun scrollOrJumpToOrdinal(ordinal: OrdinalRange?, htmlId: String?, forceNow: Boolean = false) {
+    fun scrollOrJumpToOrdinal(ordinal: OrdinalRange?, htmlId: String?, bookInitials: String?, osisRef: String?, forceNow: Boolean = false) {
         Log.i(TAG, "Scroll or jump to ordinal:$ordinal")
         val now = !contentVisible || forceNow
         fun boolString(value: Boolean?): String {
@@ -1751,7 +1751,7 @@ class BibleView(val mainBibleActivity: MainBibleActivity,
         val highlight = !contentVisible || ordinal?.end != null
         val jumpToId = if(ordinal != null) "o-${ordinal.start}" else htmlId!!
 
-        executeJavascriptOnUiThread("bibleView.emit('scroll_to_verse', '$jumpToId', {now: ${boolString(now)}, highlight: ${boolString(highlight)}, ordinalStart: ${ordinal?.start}, ordinalEnd: ${ordinal?.end}});")
+        executeJavascriptOnUiThread("bibleView.emit('scroll_to_verse', '$jumpToId', {now: ${boolString(now)}, highlight: ${boolString(highlight)}, bookInitials: '$bookInitials', osisRef: '$osisRef', ordinalStart: ${ordinal?.start}, ordinalEnd: ${ordinal?.end}});")
         if(isActive) {
             PassageChangeMediator.onCurrentVerseChanged(window)
         }