mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-01-29 01:01:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db] Handle fdroidrepos:// Uris as well

Browse Source
This commit is contained in:
Torsten Grote
2023-08-31 10:17:29 +02:00
committed by Michael Pöhn
parent 7b52db331c
commit 03a5b697bb
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/database/src/main/java/org/fdroid/repo/RepoUriGetter.kt
View File

@@ -7,7 +7,18 @@ internal object RepoUriGetter {
fun getUri(url: String): NormalizedUri {
val uri = Uri.parse(url).let {
if (it.host == "fdroid.link") getFdroidLinkUri(it) else it
when {
it.scheme.equals("fdroidrepos", ignoreCase = true) -> {
it.buildUpon().scheme("https").build()
}
it.scheme.equals("fdroidrepo", ignoreCase = true) -> {
it.buildUpon().scheme("http").build()
}
it.host == "fdroid.link" -> getFdroidLinkUri(it)
else -> it
}
}
val fingerprint = uri.getQueryParameter("fingerprint")?.lowercase()

29
libs/database/src/test/java/org/fdroid/repo/RepoUriGetterTest.kt
View File

@@ -76,4 +76,33 @@ internal class RepoUriGetterTest {
assertEquals("http://f-droid.org/repo", uri3.uri.toString())
assertNull(uri3.fingerprint)
}
@Test
fun testFDroidRepoUriScheme() {
val uri1 =
RepoUriGetter.getUri("fdroidrepos://grobox.de/fdroid/repo?fingerprint=" +
"28e14fb3b280bce8ff1e0f8e82726ff46923662cecff2a0689108ce19e8b347c")
assertEquals("https://grobox.de/fdroid/repo", uri1.uri.toString())
assertEquals(
"28e14fb3b280bce8ff1e0f8e82726ff46923662cecff2a0689108ce19e8b347c",
uri1.fingerprint,
)
val uri2 = RepoUriGetter.getUri("fdroidrepo://grobox.de/fdroid/repo")
assertEquals("http://grobox.de/fdroid/repo", uri2.uri.toString())
assertNull(uri2.fingerprint)
val uri3 =
RepoUriGetter.getUri("FDROIDREPOS://grobox.de/fdroid/repo?fingerprint=" +
"28e14fb3b280bce8ff1e0f8e82726ff46923662cecff2a0689108ce19e8b347c")
assertEquals("https://grobox.de/fdroid/repo", uri3.uri.toString())
assertEquals(
"28e14fb3b280bce8ff1e0f8e82726ff46923662cecff2a0689108ce19e8b347c",
uri3.fingerprint,
)
val uri4 = RepoUriGetter.getUri("fdroidREPO://grobox.de/fdroid/repo")
assertEquals("http://grobox.de/fdroid/repo", uri4.uri.toString())
assertNull(uri4.fingerprint)
}
}