From 7d879f8d1fbf138f64b60849ee4d7d0392ee04c3 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 4 Dec 2024 11:24:13 +0100 Subject: [PATCH] always prefix href with baseURL --- src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java | 2 +- src/main/res/raw/webxdc_wrapper.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java index a956dabb5..6d0335658 100644 --- a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java @@ -216,7 +216,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE webView.setNetworkAvailable(internetAccess); // this does not block network but sets `window.navigator.isOnline` in js land webView.addJavascriptInterface(new InternalJSApi(), "InternalJSApi"); - String href = b.getString(EXTRA_HREF, ""); + String href = baseURL + "/" + b.getString(EXTRA_HREF, "index.html"); String encodedHref = ""; try { encodedHref = URLEncoder.encode(href, Charsets.UTF_8.name()); diff --git a/src/main/res/raw/webxdc_wrapper.html b/src/main/res/raw/webxdc_wrapper.html index 0ee0ceff4..d8c866291 100644 --- a/src/main/res/raw/webxdc_wrapper.html +++ b/src/main/res/raw/webxdc_wrapper.html @@ -145,7 +145,7 @@ const params = new URLSearchParams(document.location.search); const internetAccess = (params.get("i") || "0") === "1"; - let href = params.get("href") || "index.html"; + const href = params.get("href"); if (internetAccess) { // fill500 not needed, just load the frame fill500 = (href) => {