Merge pull request #2565 from AndBible/bugfix/2563_stepbible_link_doc…

…ument Fix StepBible link document (version)
AndBible · Jul 21, 2023 · 6c25f2f · 6c25f2f
2 parents 470c708 + 923e943
commit 6c25f2f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/bibleview-js/src/components/StudyPadRow.vue b/app/bibleview-js/src/components/StudyPadRow.vue
@@ -178,7 +178,7 @@ const bibleUrl = computed(
         const osis = bookmarkItem.osisRef;
 
         if(exportMode.value) {
-            return formatExportLink({ref: osis, v11n: bookmarkItem.v11n})
+            return formatExportLink({ref: osis, v11n: bookmarkItem.v11n, doc: bookmarkItem.bookInitials});
         } else {
             return `osis://?osis=${osis}&v11n=${bookmarkItem.v11n}`;
         }

diff --git a/app/bibleview-js/src/utils.ts b/app/bibleview-js/src/utils.ts
@@ -639,6 +639,7 @@ export function sprintf(format: string, ...args: any[]) {
 }
 
 export function formatExportLink({ref, v11n, doc}: {ref: string, v11n: string, doc?: string}) {
-    const docStr = doc ? `&document=${doc}`: ""
-    return `https://stepbible.org/?q=reference=${ref}&v11n=${v11n}${docStr}`
-}
+    const docStr = doc ? `|version=${doc}`: ""
+    // this is parsed in MainBibleActivity::openLink(uri: Uri) function for intent parsing
+    return `https://stepbible.org/?q=reference=${ref}${docStr}&v11n=${v11n}`
+}
diff --git a/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt b/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
@@ -1065,18 +1065,21 @@ class MainBibleActivity : CustomTitlebarActivityBase() {
                 windowControl.showLink(doc, key)
             }
             "stepbible.org" -> {
-                val docStr = uri.getQueryParameter("document")
-                val doc = if (docStr != null) Books.installed().getBook(docStr) else null
+                val qParam = uri.getQueryParameter("q") ?: return
+
+                val docRegex = Regex("""version=([^&|]+)""")
+                val refRegex = Regex("""reference=([^&|]+)""")
+
+                val versionMatch = docRegex.find(qParam)
+                val version = if (versionMatch != null) versionMatch.groups[1]?.value else null
+                val doc = if (version != null) Books.installed().getBook(version) else null
 
                 val defV11n = if (doc is SwordBook) doc.versification else KJVA
                 val v11nStr = uri.getQueryParameter("v11n")
                 val v11n = if (v11nStr == null) defV11n else Versifications.instance().getVersification(v11nStr) ?: defV11n
 
-                val refStr = uri.getQueryParameter("q")?:return
-                val refRegex = Regex("""reference=(.*)""")
-                val match = refRegex.find(refStr) ?: return
-
-                val keyStr = match.groups[1]?.value ?: return
+                val refMatch = refRegex.find(qParam) ?: return
+                val keyStr = refMatch.groups[1]?.value ?: return
 
                 val key = PassageKeyFactory.instance().getKey(v11n, keyStr)
                 windowControl.showLink(doc, key)