Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

separate defaultRepos from initialRepos, which includes additionalRepos

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-10-16 17:16:33 +02:00
parent e8264d7dbb
commit aace086da4
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
View File

@ -265,42 +265,45 @@ public class DBHelper extends SQLiteOpenHelper {
db.execSQL(CREATE_TABLE_APK_ANTI_FEATURE_JOIN); db.execSQL(CREATE_TABLE_APK_ANTI_FEATURE_JOIN);
ensureIndexes(db); ensureIndexes(db);
List<String> defaultRepos = DBHelper.loadDefaultRepos(context); List<String> initialRepos = DBHelper.loadInitialRepos(context);
for (int i = 0; i < defaultRepos.size(); i += REPO_XML_ITEM_COUNT) { for (int i = 0; i < initialRepos.size(); i += REPO_XML_ITEM_COUNT) {
insertRepo( insertRepo(
db, db,
defaultRepos.get(i), // name initialRepos.get(i), // name
defaultRepos.get(i + 1), // address initialRepos.get(i + 1), // address
defaultRepos.get(i + 2), // description initialRepos.get(i + 2), // description
defaultRepos.get(i + 3), // version initialRepos.get(i + 3), // version
defaultRepos.get(i + 4), // enabled initialRepos.get(i + 4), // enabled
defaultRepos.get(i + 5), // priority initialRepos.get(i + 5), // priority
defaultRepos.get(i + 6), // pushRequests initialRepos.get(i + 6), // pushRequests
defaultRepos.get(i + 7) // pubkey initialRepos.get(i + 7) // pubkey
); );
} }
} }
/** /**
* Load additional repos first, then internal repos. This way, internal * Load Additional Repos first, then Default Repos. This way, Default
* repos will be shown after the OEM-added ones on the Manage Repos * Repos will be shown after the OEM-added ones on the Manage Repos
* screen. This throws a hard {@code Exception} on parse errors since * screen. This throws a hard {@code Exception} on parse errors since
* this file is built into the APK. So it should fail as hard and fast * Default Repos are built into the APK. So it should fail as hard and fast
* as possible so the developer catches the problem. * as possible so the developer catches the problem.
* <p>
* Additional Repos ({@code additional_repos.xml}) come from the ROM,
* while Default Repos ({@code default_repos.xml} is built into the APK.
*/ */
public static List<String> loadDefaultRepos(Context context) throws IllegalArgumentException { public static List<String> loadInitialRepos(Context context) throws IllegalArgumentException {
String packageName = context.getPackageName(); String packageName = context.getPackageName();
List<String> defaultRepos = DBHelper.loadAdditionalRepos(packageName); List<String> initialRepos = DBHelper.loadAdditionalRepos(packageName);
List<String> internalRepos = Arrays.asList(context.getResources().getStringArray(R.array.default_repos)); List<String> defaultRepos = Arrays.asList(context.getResources().getStringArray(R.array.default_repos));
defaultRepos.addAll(internalRepos); initialRepos.addAll(defaultRepos);
if (defaultRepos.size() % REPO_XML_ITEM_COUNT != 0) { if (initialRepos.size() % REPO_XML_ITEM_COUNT != 0) {
throw new IllegalArgumentException("default_repos.xml has wrong item count: " + throw new IllegalArgumentException("default_repos.xml has wrong item count: " +
defaultRepos.size() + " % REPO_XML_ARG_COUNT(" + REPO_XML_ITEM_COUNT + ") != 0"); initialRepos.size() + " % REPO_XML_ARG_COUNT(" + REPO_XML_ITEM_COUNT + ") != 0");
} }
return defaultRepos; return initialRepos;
} }
/** /**

2
app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
View File

@ -278,7 +278,7 @@ public class DBHelperTest {
outputStream.close(); outputStream.close();
try { try {
List<String> initialRepos = DBHelper.loadDefaultRepos(context); List<String> initialRepos = DBHelper.loadInitialRepos(context);
// Construct the repos that we should have loaded // Construct the repos that we should have loaded
List<String> oem0 = Arrays.asList("oem0Name", "https://www.oem0.com/yeah/repo", "I'm the first oem repo.", List<String> oem0 = Arrays.asList("oem0Name", "https://www.oem0.com/yeah/repo", "I'm the first oem repo.",