[app] some pre-repo mirror nitpicks

This commit is contained in:
Torsten Grote
2023-07-11 13:29:45 -03:00
parent bcd9cc0548
commit 8d4da28936
3 changed files with 4 additions and 11 deletions

View File

@@ -80,8 +80,8 @@ final class ContentProviderMigrator {
}
// add new repo if not existing
if (repo == null) { // new repo to be added to new DB
InitialRepository newRepo = new InitialRepository(
name, address, Arrays.asList(new String[]{}), "", certificate, 0, enabled, ++weight);
InitialRepository newRepo = new InitialRepository(name, address, "", certificate,
0, enabled, ++weight);
long repoId = repoDao.insert(newRepo);
repo = ObjectsCompat.requireNonNull(repoDao.getRepository(repoId));
} else { // old repo that may need an update for the new DB

View File

@@ -51,14 +51,7 @@ internal class RepositoryDaoTest : DbTest() {
assertEquals(3, actualRepo.mirrors.size)
assertEquals(emptyList(), actualRepo.userMirrors)
assertEquals(emptyList(), actualRepo.disabledMirrors)
assertEquals(
listOf(
org.fdroid.download.Mirror(repo.address),
org.fdroid.download.Mirror(repo.mirrors[0]),
org.fdroid.download.Mirror(repo.mirrors[1]),
org.fdroid.download.Mirror(repo.mirrors[2]),
).toSet(), actualRepo.getAllMirrors().toSet()
)
assertEquals(repo.mirrors.toSet(), actualRepo.mirrors.map { it.url }.toSet())
assertEquals(emptyList(), actualRepo.antiFeatures)
assertEquals(emptyList(), actualRepo.categories)
assertEquals(emptyList(), actualRepo.releaseChannels)

View File

@@ -140,7 +140,7 @@ internal interface RepositoryDaoInt : RepositoryDao {
enabled = initialRepo.enabled,
)
insert(repositoryPreferences)
insertMirrors(initialRepo.mirrors.map { it -> Mirror(repoId, it, null) })
insertMirrors(initialRepo.mirrors.map { url -> Mirror(repoId, url, null) })
return repoId
}