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

rename item lists to repoItems

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-10-16 17:20:46 +02:00
parent 9f3a32d986
commit ec58141379
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,19 +316,19 @@ public class DBHelper extends SQLiteOpenHelper {
* ROM has the lowest priority, then Vendor, ODM, and OEM. * ROM has the lowest priority, then Vendor, ODM, and OEM.
*/ */
private static List<String> loadAdditionalRepos(String packageName) { private static List<String> loadAdditionalRepos(String packageName) {
List<String> externalRepos = new LinkedList<>(); List<String> repoItems = new LinkedList<>();
for (String root : Arrays.asList("/system", "/vendor", "/odm", "/oem")) { for (String root : Arrays.asList("/system", "/vendor", "/odm", "/oem")) {
File additionalReposFile = new File(root + "/etc/" + packageName + "/additional_repos.xml"); File additionalReposFile = new File(root + "/etc/" + packageName + "/additional_repos.xml");
try { try {
if (additionalReposFile.isFile()) { if (additionalReposFile.isFile()) {
externalRepos.addAll(DBHelper.parseXmlRepos(additionalReposFile)); repoItems.addAll(DBHelper.parseXmlRepos(additionalReposFile));
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Error loading " + additionalReposFile + ": " + e.getMessage()); Log.e(TAG, "Error loading " + additionalReposFile + ": " + e.getMessage());
} }
} }
return externalRepos; return repoItems;
} }
/** /**
@ -340,7 +340,7 @@ public class DBHelper extends SQLiteOpenHelper {
* override {@code default_repos.xml}. * override {@code default_repos.xml}.
*/ */
public static List<String> parseXmlRepos(File defaultReposFile) throws IOException, XmlPullParserException { public static List<String> parseXmlRepos(File defaultReposFile) throws IOException, XmlPullParserException {
List<String> defaultRepos = new LinkedList<>(); List<String> repoItems = new LinkedList<>();
InputStream xmlInputStream = new FileInputStream(additionalReposFile); InputStream xmlInputStream = new FileInputStream(additionalReposFile);
XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
@ -362,7 +362,7 @@ public class DBHelper extends SQLiteOpenHelper {
break; break;
case XmlPullParser.TEXT: case XmlPullParser.TEXT:
if (isItem) { if (isItem) {
defaultRepos.add(parser.getText()); repoItems.add(parser.getText());
} }
break; break;
} }
@ -371,16 +371,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_ITEM_COUNT) { for (int i = PRIORITY_INDEX; i < repoItems.size(); i += REPO_XML_ITEM_COUNT) {
defaultRepos.add(i, "0"); repoItems.add(i, "0");
} }
if (defaultRepos.size() % REPO_XML_ITEM_COUNT == 0) { if (repoItems.size() % REPO_XML_ITEM_COUNT == 0) {
return defaultRepos; return repoItems;
} }
Log.e(TAG, "Ignoring " + additionalReposFile + ", wrong number of items: " Log.e(TAG, "Ignoring " + additionalReposFile + ", wrong number of items: "
+ defaultRepos.size() + " % " + (REPO_XML_ITEM_COUNT - 1) + " != 0"); + repoItems.size() + " % " + (REPO_XML_ITEM_COUNT - 1) + " != 0");
return new LinkedList<>(); return new LinkedList<>();
} }