mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-15 11:21:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

[download] fix MirrorChooser always picking f-droid.org if there's no domestic mirror

Browse Source
This commit is contained in:
Torsten Grote
2026-06-04 10:04:07 -03:00
parent b89f10d8d2
commit 4e8549d3ce
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/download/src/commonMain/kotlin/org/fdroid/download/MirrorChooser.kt
View File

@@ -127,7 +127,7 @@ internal class MirrorChooserWithParameters(
error1.compareTo(error2)
}
val mirrorList: MutableList<Mirror> = mutableListOf<Mirror>()
val mirrorList: MutableList<Mirror> = mutableListOf()
if (
mirrorParameterManager != null && mirrorParameterManager.getCurrentLocation().isNotEmpty()
@@ -186,8 +186,8 @@ internal class MirrorChooserWithParameters(
mirrorList.addAll(domesticList)
} else {
mirrorList.addAll(domesticList)
mirrorList.addAll(unknownList)
mirrorList.addAll(foreignList)
mirrorList.addAll(unknownList)
}
return mirrorList
}

11
libs/download/src/commonTest/kotlin/org/fdroid/download/MirrorChooserTest.kt
View File

@@ -9,7 +9,6 @@ import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertTrue
import kotlinx.io.IOException
import org.fdroid.getIndexFile
import org.fdroid.runSuspend
class MirrorChooserTest {
@@ -29,15 +28,13 @@ class MirrorChooserTest {
)
private val downloadRequest = DownloadRequest("foo", mirrors)
private val downloadRequestLocation = DownloadRequest("location", mirrorsLocation)
private val downloadRequestTryFIrst =
private val downloadRequestTryFirst =
DownloadRequest(
path = "location",
mirrors = mirrorsLocation,
tryFirstMirror = Mirror(baseUrl = "remote_1", countryCode = "THERE"),
)
private val ipfsIndexFile = getIndexFile(name = "foo", ipfsCidV1 = "CIDv1")
@Test
fun testMirrorChooserDefaultImpl() = runSuspend {
val mirrorChooser = MirrorChooserRandom()
@@ -177,7 +174,9 @@ class MirrorChooserTest {
assertEquals("HERE", domesticList[0].countryCode)
assertEquals("HERE", domesticList[1].countryCode)
assertEquals("HERE", domesticList[2].countryCode)
assertEquals(null, domesticList[3].countryCode)
// unknown mirrors should be last,
// because otherwise they will always be at the front if there are no domestic mirrors
assertEquals(null, domesticList.last().countryCode)
}
@Test
@@ -229,7 +228,7 @@ class MirrorChooserTest {
val mirrorChooser = MirrorChooserWithParameters(mockManager)
// test tryfirst mirror parameter
val tryFirstList = mirrorChooser.orderMirrors(downloadRequestTryFIrst)
val tryFirstList = mirrorChooser.orderMirrors(downloadRequestTryFirst)
// confirm the list contains all mirrors
assertEquals(9, tryFirstList.size)
// tryfirst mirror should be included before local mirrors