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

rename REPO_XML_ARG_COUNT to REPO_XML_ITEM_COUNT

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

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

@ -65,7 +65,7 @@ import java.util.List;
public class DBHelper extends SQLiteOpenHelper { public class DBHelper extends SQLiteOpenHelper {
private static final String TAG = "DBHelper"; private static final String TAG = "DBHelper";
public static final int REPO_XML_ARG_COUNT = 8; public static final int REPO_XML_ITEM_COUNT = 8;
private static DBHelper instance; private static DBHelper instance;
private static final String DATABASE_NAME = "fdroid"; private static final String DATABASE_NAME = "fdroid";
@ -267,7 +267,7 @@ public class DBHelper extends SQLiteOpenHelper {
List<String> defaultRepos = DBHelper.loadDefaultRepos(context); List<String> defaultRepos = DBHelper.loadDefaultRepos(context);
for (int i = 0; i < defaultRepos.size(); i += REPO_XML_ARG_COUNT) { for (int i = 0; i < defaultRepos.size(); i += REPO_XML_ITEM_COUNT) {
insertRepo( insertRepo(
db, db,
defaultRepos.get(i), // name defaultRepos.get(i), // name
@ -295,9 +295,9 @@ public class DBHelper extends SQLiteOpenHelper {
List<String> internalRepos = Arrays.asList(context.getResources().getStringArray(R.array.default_repos)); List<String> internalRepos = Arrays.asList(context.getResources().getStringArray(R.array.default_repos));
defaultRepos.addAll(internalRepos); defaultRepos.addAll(internalRepos);
if (defaultRepos.size() % REPO_XML_ARG_COUNT != 0) { if (defaultRepos.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_ARG_COUNT + ") != 0"); defaultRepos.size() + " % REPO_XML_ARG_COUNT(" + REPO_XML_ITEM_COUNT + ") != 0");
} }
return defaultRepos; return defaultRepos;
@ -368,16 +368,16 @@ public class DBHelper extends SQLiteOpenHelper {
xmlInputStream.close(); xmlInputStream.close();
final int PRIORITY_INDEX = 5; final int PRIORITY_INDEX = 5;
for (int i = PRIORITY_INDEX; i < defaultRepos.size(); i += REPO_XML_ARG_COUNT) { for (int i = PRIORITY_INDEX; i < defaultRepos.size(); i += REPO_XML_ITEM_COUNT) {
defaultRepos.add(i, "0"); defaultRepos.add(i, "0");
} }
if (defaultRepos.size() % REPO_XML_ARG_COUNT == 0) { if (defaultRepos.size() % REPO_XML_ITEM_COUNT == 0) {
return defaultRepos; return defaultRepos;
} }
Log.e(TAG, "Ignoring " + additionalReposFile + ", wrong number of items: " Log.e(TAG, "Ignoring " + additionalReposFile + ", wrong number of items: "
+ defaultRepos.size() + " % " + (REPO_XML_ARG_COUNT - 1) + " != 0"); + defaultRepos.size() + " % " + (REPO_XML_ITEM_COUNT - 1) + " != 0");
return new LinkedList<>(); return new LinkedList<>();
} }
@ -703,10 +703,10 @@ public class DBHelper extends SQLiteOpenHelper {
String[] defaultRepos = context.getResources().getStringArray(R.array.default_repos); String[] defaultRepos = context.getResources().getStringArray(R.array.default_repos);
String fdroidPubKey = defaultRepos[7]; String fdroidPubKey = defaultRepos[7];
String fdroidAddress = defaultRepos[1]; String fdroidAddress = defaultRepos[1];
String fdroidArchiveAddress = defaultRepos[REPO_XML_ARG_COUNT + 1]; String fdroidArchiveAddress = defaultRepos[REPO_XML_ITEM_COUNT + 1];
String gpPubKey = defaultRepos[REPO_XML_ARG_COUNT * 2 + 7]; String gpPubKey = defaultRepos[REPO_XML_ITEM_COUNT * 2 + 7];
String gpAddress = defaultRepos[REPO_XML_ARG_COUNT * 2 + 1]; String gpAddress = defaultRepos[REPO_XML_ITEM_COUNT * 2 + 1];
String gpArchiveAddress = defaultRepos[REPO_XML_ARG_COUNT * 3 + 1]; String gpArchiveAddress = defaultRepos[REPO_XML_ITEM_COUNT * 3 + 1];
updateRepoPriority(db, fdroidPubKey, fdroidAddress, 1); updateRepoPriority(db, fdroidPubKey, fdroidAddress, 1);
updateRepoPriority(db, fdroidPubKey, fdroidArchiveAddress, 2); updateRepoPriority(db, fdroidPubKey, fdroidArchiveAddress, 2);
@ -957,8 +957,8 @@ public class DBHelper extends SQLiteOpenHelper {
} }
String[] defaultRepos = context.getResources().getStringArray(R.array.default_repos); String[] defaultRepos = context.getResources().getStringArray(R.array.default_repos);
for (int i = 0; i < defaultRepos.length / REPO_XML_ARG_COUNT; i++) { for (int i = 0; i < defaultRepos.length / REPO_XML_ITEM_COUNT; i++) {
int offset = i * REPO_XML_ARG_COUNT; int offset = i * REPO_XML_ITEM_COUNT;
insertNameAndDescription(db, insertNameAndDescription(db,
defaultRepos[offset], // name defaultRepos[offset], // name
defaultRepos[offset + 1], // address defaultRepos[offset + 1], // address

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

@ -73,7 +73,7 @@ public class DBHelperTest {
"</string-array>" + "</string-array>" +
"</resources>"; "</resources>";
List<String> repos = getReposFromXml(oneRepoXml); List<String> repos = getReposFromXml(oneRepoXml);
assertEquals("Should contain one repo's worth of items", DBHelper.REPO_XML_ARG_COUNT, repos.size()); assertEquals("Should contain one repo's worth of items", DBHelper.REPO_XML_ITEM_COUNT, repos.size());
} }
@Test @Test
@ -171,7 +171,7 @@ public class DBHelperTest {
String validXml = IOUtils.toString(input, "UTF-8"); String validXml = IOUtils.toString(input, "UTF-8");
List<String> repos = getReposFromXml(validXml); List<String> repos = getReposFromXml(validXml);
assertEquals(2 * DBHelper.REPO_XML_ARG_COUNT, repos.size()); assertEquals(2 * DBHelper.REPO_XML_ITEM_COUNT, repos.size());
assertEquals("Repo Name", repos.get(8)); assertEquals("Repo Name", repos.get(8));
assertEquals("https://www.oem0.com/yeah/repo", repos.get(9)); assertEquals("https://www.oem0.com/yeah/repo", repos.get(9));
} }

6
app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
View File

@ -157,12 +157,12 @@ public class RepoProviderTest extends FDroidProviderTest {
assertEquals(defaultRepos.size(), 4); // based on app/src/main/res/default_repo.xml assertEquals(defaultRepos.size(), 4); // based on app/src/main/res/default_repo.xml
String[] reposFromXml = context.getResources().getStringArray(R.array.default_repos); String[] reposFromXml = context.getResources().getStringArray(R.array.default_repos);
if (reposFromXml.length % DBHelper.REPO_XML_ARG_COUNT != 0) { if (reposFromXml.length % DBHelper.REPO_XML_ITEM_COUNT != 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"default_repo.xml array does not have the right number of elements"); "default_repo.xml array does not have the right number of elements");
} }
for (int i = 0; i < reposFromXml.length / DBHelper.REPO_XML_ARG_COUNT; i++) { for (int i = 0; i < reposFromXml.length / DBHelper.REPO_XML_ITEM_COUNT; i++) {
int offset = i * DBHelper.REPO_XML_ARG_COUNT; int offset = i * DBHelper.REPO_XML_ITEM_COUNT;
assertRepo( assertRepo(
defaultRepos.get(i), defaultRepos.get(i),
reposFromXml[offset + 1], // address reposFromXml[offset + 1], // address