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

renamed to additional_repos.xml, now collects them on all custom partitions

Browse Source
This commit is contained in:
Dimitri Rusin 2018-07-12 20:34:55 +00:00
parent 51135e5684
commit a96621c6ec
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ import org.xmlpull.v1.*;
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_ARG_COUNT = 8;
private static DBHelper instance; private static DBHelper instance;
@ -245,6 +244,7 @@ public class DBHelper extends SQLiteOpenHelper {
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL(CREATE_TABLE_PACKAGE); db.execSQL(CREATE_TABLE_PACKAGE);
db.execSQL(CREATE_TABLE_APP_METADATA); db.execSQL(CREATE_TABLE_APP_METADATA);
db.execSQL(CREATE_TABLE_APK); db.execSQL(CREATE_TABLE_APK);
@ -290,20 +290,19 @@ public class DBHelper extends SQLiteOpenHelper {
} }
/* /*
* Look for external repositories under { "/oem", "/odm", "/vendor", "/system" } in this order and only load the first one. * Look for external repositories under { "/oem", "/odm", "/vendor", "/system" }
* If ROOT is one of those paths and 'packageName' is the name of the package * If ROOT is one of those paths and 'packageName' is the name of the package
* that contains this class, then we look under 'root'/etc/'packageName'/default_repos.xml * that contains this class, then we look under 'root'/etc/'packageName'/additional_repos.xml
*/ */
private List<String> loadDefaultReposExternal() { private List<String> loadDefaultReposExternal() {
List<String> externalRepos = new LinkedList<>();
final String packageName = context.getPackageName(); final String packageName = context.getPackageName();
for (String root : Arrays.asList("/oem", "/odm", "/vendor", "/system")) { for (String root : Arrays.asList("/oem", "/odm", "/vendor", "/system")) {
String defaultReposPath = root + "/etc/" + packageName + "/default_repos.xml"; String defaultReposPath = root + "/etc/" + packageName + "/additional_repos.xml";
try { try {
File defaultReposFile = new File(defaultReposPath); File defaultReposFile = new File(defaultReposPath);
// Only try loading external repos once. Even if this one fails, we will not try the other roots
if (defaultReposFile.exists() && defaultReposFile.isFile()) { if (defaultReposFile.exists() && defaultReposFile.isFile()) {
return parseXmlRepos(defaultReposFile); externalRepos.addAll(parseXmlRepos(defaultReposFile));
} }
} catch (Exception e) { } catch (Exception e) {
Utils.debugLog(TAG, "Error loading " + defaultReposPath); Utils.debugLog(TAG, "Error loading " + defaultReposPath);
@ -311,7 +310,7 @@ public class DBHelper extends SQLiteOpenHelper {
break; break;
} }
} }
return new LinkedList<>(); return externalRepos;
} }
private List<String> parseXmlRepos(File defaultReposFile) throws IOException, XmlPullParserException { private List<String> parseXmlRepos(File defaultReposFile) throws IOException, XmlPullParserException {