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

[app] also migrate repository names

Browse Source 
because disabled repos won't get updated, so they will appear with an empty name in the repo list otherwise
This commit is contained in:
Torsten Grote
2023-01-17 09:24:32 -03:00
parent bf32cd8a8e
commit 93735833bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
View File

@@ -33,10 +33,11 @@ final class ContentProviderMigrator {
int weight = repos.isEmpty() ? 0 : repos.get(repos.size() - 1).getWeight();
try (SQLiteDatabase oldDb = new ContentProviderDbHelper(context).getReadableDatabase()) {
String[] projection = new String[]{"address", "pubkey", "inuse", "userMirrors", "disabledMirrors",
String[] projection = new String[]{"name", "address", "pubkey", "inuse", "userMirrors", "disabledMirrors",
"username", "password"};
try (Cursor c = oldDb.query("fdroid_repo", projection, null, null, null, null, null)) {
while (c.moveToNext()) {
String name = c.getString(c.getColumnIndexOrThrow("name"));
String address = c.getString(c.getColumnIndexOrThrow("address"));
String certificateDb = c.getString(c.getColumnIndexOrThrow("pubkey"));
if (certificateDb == null) continue;
@@ -59,7 +60,7 @@ final class ContentProviderMigrator {
}
// add new repo if not existing
if (repo == null) { // new repo to be added to new DB
InitialRepository newRepo = new InitialRepository("", address, "", certificate,
InitialRepository newRepo = new InitialRepository(name, address, "", certificate,
0, enabled, ++weight);
long repoId = repoDao.insert(newRepo);
repo = ObjectsCompat.requireNonNull(repoDao.getRepository(repoId));