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

rename parseXmlRepos to parseAdditionalReposXml

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

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

@ -321,7 +321,7 @@ public class DBHelper extends SQLiteOpenHelper {
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()) {
repoItems.addAll(DBHelper.parseXmlRepos(additionalReposFile)); repoItems.addAll(DBHelper.parseAdditionalReposXml(additionalReposFile));
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Error loading " + additionalReposFile + ": " + e.getMessage()); Log.e(TAG, "Error loading " + additionalReposFile + ": " + e.getMessage());
@ -339,7 +339,8 @@ public class DBHelper extends SQLiteOpenHelper {
* not allowed to set the priority since that would give it the power to * not allowed to set the priority since that would give it the power to
* override {@code default_repos.xml}. * override {@code default_repos.xml}.
*/ */
public static List<String> parseXmlRepos(File defaultReposFile) throws IOException, XmlPullParserException { public static List<String> parseAdditionalReposXml(File additionalReposFile)
throws IOException, XmlPullParserException {
List<String> repoItems = 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();

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

@ -36,7 +36,7 @@ public class DBHelperTest {
outputStream.close(); outputStream.close();
// Now parse that xml file // Now parse that xml file
return DBHelper.parseXmlRepos(additionalReposXml); return DBHelper.parseAdditionalReposXml(additionalReposXml);
} }
protected Context context; protected Context context;