From c894e4867594bb5a45905aedf958b576cc2f4937 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 13 Feb 2024 09:46:28 -0300
Subject: [PATCH] [db] last minute change to fdroid.link format

The new one is simpler and basically wrap the real URL by just prepending https://fdroid.link/#
---
 .../database/src/main/java/org/fdroid/repo/RepoUriGetter.kt | 3 +--
 .../src/test/java/org/fdroid/repo/RepoUriGetterTest.kt      | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/database/src/main/java/org/fdroid/repo/RepoUriGetter.kt b/libs/database/src/main/java/org/fdroid/repo/RepoUriGetter.kt
index 3a8782ee0..511a9d81a 100644
--- a/libs/database/src/main/java/org/fdroid/repo/RepoUriGetter.kt
+++ b/libs/database/src/main/java/org/fdroid/repo/RepoUriGetter.kt
@@ -81,8 +81,7 @@ internal object RepoUriGetter {
     }
 
     private fun getFdroidLinkUri(uri: Uri): Uri {
-        val tmpUri = uri.buildUpon().encodedQuery(uri.encodedFragment).build()
-        return Uri.parse(tmpUri.getQueryParameter("repo"))
+        return Uri.parse(uri.encodedFragment)
     }
 
     /**
diff --git a/libs/database/src/test/java/org/fdroid/repo/RepoUriGetterTest.kt b/libs/database/src/test/java/org/fdroid/repo/RepoUriGetterTest.kt
index 77fdd092e..80cfdaf73 100644
--- a/libs/database/src/test/java/org/fdroid/repo/RepoUriGetterTest.kt
+++ b/libs/database/src/test/java/org/fdroid/repo/RepoUriGetterTest.kt
@@ -74,7 +74,7 @@ internal class RepoUriGetterTest {
     @Test
     fun testFDroidLink() {
         val uri1 = RepoUriGetter.getUri(
-            "https://fdroid.link/index.html#repo=https://f-droid.org/repo?" +
+            "https://fdroid.link/index.html#https://f-droid.org/repo?" +
                 "fingerprint=43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab"
         )
         assertEquals("https://f-droid.org/repo", uri1.uri.toString())
@@ -83,11 +83,11 @@ internal class RepoUriGetterTest {
             uri1.fingerprint
         )
 
-        val uri2 = RepoUriGetter.getUri("https://fdroid.link#repo=https://f-droid.org/repo")
+        val uri2 = RepoUriGetter.getUri("https://fdroid.link#https://f-droid.org/repo")
         assertEquals("https://f-droid.org/repo", uri2.uri.toString())
         assertNull(uri2.fingerprint)
 
-        val uri3 = RepoUriGetter.getUri("https://fdroid.link/#repo=http://f-droid.org/repo")
+        val uri3 = RepoUriGetter.getUri("https://fdroid.link/#http://f-droid.org/repo")
         assertEquals("http://f-droid.org/repo", uri3.uri.toString())
         assertNull(uri3.fingerprint)
     }