mirror of
https://github.com/f-droid/fdroidclient.git
synced 2026-08-02 10:36:57 -04:00
[app] some pre-repo mirror nitpicks
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user