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

Added database support for repo public key

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-01-29 09:41:40 +00:00
parent 445b273b36
commit 8c30e0cfdb
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/fdroid/fdroid/DB.java
View File

@ -182,6 +182,7 @@ public class DB {
public String address; public String address;
public boolean inuse; public boolean inuse;
public int priority; public int priority;
public String pubkey; // null for an unsigned repo
} }
// SQL to update the database to versions beyond the first. Here is // SQL to update the database to versions beyond the first. Here is
@ -215,8 +216,10 @@ public class DB {
{ "alter table " + TABLE_APP + " add antiFeatures string" }, { "alter table " + TABLE_APP + " add antiFeatures string" },
// Version 6... // Version 6...
{ "alter table " + TABLE_APK + " add sig string" } { "alter table " + TABLE_APK + " add sig string" },
// Version 7...
{ "alter table " + TABLE_REPO + " add pubkey string" }
}; };
private class DBHelper extends SQLiteOpenHelper { private class DBHelper extends SQLiteOpenHelper {
@ -234,6 +237,8 @@ public class DB {
values.put("address", "http://f-droid.org/repo"); values.put("address", "http://f-droid.org/repo");
values.put("inuse", 1); values.put("inuse", 1);
values.put("priority", 10); values.put("priority", 10);
String pubkey = null;
values.put("pubkey", pubkey);
db.insert(TABLE_REPO, null, values); db.insert(TABLE_REPO, null, values);
onUpgrade(db, 1, DB_UPGRADES.length + 1); onUpgrade(db, 1, DB_UPGRADES.length + 1);
} }
@ -624,7 +629,7 @@ public class DB {
Vector<Repo> repos = new Vector<Repo>(); Vector<Repo> repos = new Vector<Repo>();
Cursor c = null; Cursor c = null;
try { try {
c = db.rawQuery("select address, inuse, priority from " c = db.rawQuery("select address, inuse, priority, pubkey from "
+ TABLE_REPO + " order by priority", null); + TABLE_REPO + " order by priority", null);
c.moveToFirst(); c.moveToFirst();
while (!c.isAfterLast()) { while (!c.isAfterLast()) {
@ -632,6 +637,7 @@ public class DB {
repo.address = c.getString(0); repo.address = c.getString(0);
repo.inuse = (c.getInt(1) == 1); repo.inuse = (c.getInt(1) == 1);
repo.priority = c.getInt(2); repo.priority = c.getInt(2);
repo.pubkey = c.getString(3);
repos.add(repo); repos.add(repo);
c.moveToNext(); c.moveToNext();
} }
@ -650,11 +656,12 @@ public class DB {
new String[] { address }); new String[] { address });
} }
public void addServer(String address, int priority) { public void addServer(String address, int priority, String pubkey) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put("address", address); values.put("address", address);
values.put("inuse", 1); values.put("inuse", 1);
values.put("priority", priority); values.put("priority", priority);
values.put("pubkey", pubkey);
db.insert(TABLE_REPO, null, values); db.insert(TABLE_REPO, null, values);
} }

2
src/org/fdroid/fdroid/ManageRepo.java
View File

@ -131,7 +131,7 @@ public class ManageRepo extends ListActivity {
EditText uri = (EditText) alrt EditText uri = (EditText) alrt
.findViewById(R.id.edit_uri); .findViewById(R.id.edit_uri);
String uri_str = uri.getText().toString(); String uri_str = uri.getText().toString();
db.addServer(uri_str, 10); db.addServer(uri_str, 10, null);
changed = true; changed = true;
redraw(); redraw();
} }