From 19d64a778f937614f63eacd4dc2b79dc64d9dce7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 30 Mar 2025 12:34:35 +0200 Subject: [PATCH] #1160 - Use of fedilinks (scheme web+ap) / Fix url scheme to support with and without // --- app/src/main/AndroidManifest.xml | 4 +--- .../fedilab/android/activities/WebActivityPub.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 67606c31..763c94e4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -455,9 +455,7 @@ - - - + diff --git a/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java b/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java index c41ddb87..9214652a 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java +++ b/app/src/main/java/app/fedilab/android/activities/WebActivityPub.java @@ -13,7 +13,6 @@ package app.fedilab.android.activities; * * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ -import static app.fedilab.android.mastodon.helper.Helper.TAG; import android.content.Intent; import android.net.Uri; @@ -26,7 +25,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import app.fedilab.android.mastodon.activities.ProfileActivity; -import app.fedilab.android.mastodon.client.entities.api.Mention; import app.fedilab.android.mastodon.client.entities.app.CachedBundle; import app.fedilab.android.mastodon.helper.Helper; @@ -48,6 +46,17 @@ public class WebActivityPub extends AppCompatActivity { finish(); return; } + String scheme = uri.getScheme(); + String uriString = uri.toString(); + if(!uriString.startsWith(scheme+"://")) { + uriString = uri.toString().replace(scheme+":",scheme+"://"); + uri = Uri.parse(uriString); + if(uri == null) { + finish(); + return; + } + } + String host = uri.getHost(); String path = uri.getPath(); String query = uri.getQuery();