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

DBHelper: don't wrap entire func bodies in ifs

Browse Source 
This removes tons of unnecessary indenting. Do it in smaller functions
too for consistency.
This commit is contained in:
Daniel Martí 2016-04-23 15:40:09 +01:00
parent 7f2a811541
commit 6a0eec1262
1 changed files with 199 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,80 +116,82 @@ class DBHelper extends SQLiteOpenHelper {
} }
private void populateRepoNames(SQLiteDatabase db, int oldVersion) { private void populateRepoNames(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 37) { if (oldVersion >= 37) {
Utils.debugLog(TAG, "Populating repo names from the url"); return;
final String[] columns = {"address", "_id"}; }
Cursor cursor = db.query(TABLE_REPO, columns, Utils.debugLog(TAG, "Populating repo names from the url");
"name IS NULL OR name = ''", null, null, null, null); final String[] columns = {"address", "_id"};
if (cursor != null) { Cursor cursor = db.query(TABLE_REPO, columns,
if (cursor.getCount() > 0) { "name IS NULL OR name = ''", null, null, null, null);
cursor.moveToFirst(); if (cursor != null) {
while (!cursor.isAfterLast()) { if (cursor.getCount() > 0) {
String address = cursor.getString(0); cursor.moveToFirst();
long id = cursor.getInt(1); while (!cursor.isAfterLast()) {
ContentValues values = new ContentValues(1); String address = cursor.getString(0);
String name = Repo.addressToName(address); long id = cursor.getInt(1);
values.put("name", name); ContentValues values = new ContentValues(1);
final String[] args = {Long.toString(id)}; String name = Repo.addressToName(address);
Utils.debugLog(TAG, "Setting repo name to '" + name + "' for repo " + address); values.put("name", name);
db.update(TABLE_REPO, values, "_id = ?", args); final String[] args = {Long.toString(id)};
cursor.moveToNext(); Utils.debugLog(TAG, "Setting repo name to '" + name + "' for repo " + address);
} db.update(TABLE_REPO, values, "_id = ?", args);
cursor.moveToNext();
} }
cursor.close();
} }
cursor.close();
} }
} }
private void renameRepoId(SQLiteDatabase db, int oldVersion) { private void renameRepoId(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 36 && !columnExists(db, TABLE_REPO, "_id")) { if (oldVersion >= 36 || columnExists(db, TABLE_REPO, "_id")) {
return;
Utils.debugLog(TAG, "Renaming " + TABLE_REPO + ".id to _id");
db.beginTransaction();
try {
// http://stackoverflow.com/questions/805363/how-do-i-rename-a-column-in-a-sqlite-database-table#805508
String tempTableName = TABLE_REPO + "__temp__";
db.execSQL("ALTER TABLE " + TABLE_REPO + " RENAME TO " + tempTableName + ";");
// I realise this is available in the CREATE_TABLE_REPO above,
// however I have a feeling that it will need to be the same as the
// current structure of the table as of DBVersion 36, or else we may
// get into strife. For example, if there was a field that
// got removed, then it will break the "insert select"
// statement. Therefore, I've put a copy of CREATE_TABLE_REPO
// here that is the same as it was at DBVersion 36.
String createTableDdl = "create table " + TABLE_REPO + " ("
+ "_id integer not null primary key, "
+ "address text not null, "
+ "name text, "
+ "description text, "
+ "inuse integer not null, "
+ "priority integer not null, "
+ "pubkey text, "
+ "fingerprint text, "
+ "maxage integer not null default 0, "
+ "version integer not null default 0, "
+ "lastetag text, "
+ "lastUpdated string);";
db.execSQL(createTableDdl);
String nonIdFields = "address, name, description, inuse, priority, " +
"pubkey, fingerprint, maxage, version, lastetag, lastUpdated";
String insertSql = "INSERT INTO " + TABLE_REPO +
"(_id, " + nonIdFields + " ) " +
"SELECT id, " + nonIdFields + " FROM " + tempTableName + ";";
db.execSQL(insertSql);
db.execSQL("DROP TABLE " + tempTableName + ";");
db.setTransactionSuccessful();
} catch (Exception e) {
Log.e(TAG, "Error renaming id to _id", e);
}
db.endTransaction();
} }
Utils.debugLog(TAG, "Renaming " + TABLE_REPO + ".id to _id");
db.beginTransaction();
try {
// http://stackoverflow.com/questions/805363/how-do-i-rename-a-column-in-a-sqlite-database-table#805508
String tempTableName = TABLE_REPO + "__temp__";
db.execSQL("ALTER TABLE " + TABLE_REPO + " RENAME TO " + tempTableName + ";");
// I realise this is available in the CREATE_TABLE_REPO above,
// however I have a feeling that it will need to be the same as the
// current structure of the table as of DBVersion 36, or else we may
// get into strife. For example, if there was a field that
// got removed, then it will break the "insert select"
// statement. Therefore, I've put a copy of CREATE_TABLE_REPO
// here that is the same as it was at DBVersion 36.
String createTableDdl = "create table " + TABLE_REPO + " ("
+ "_id integer not null primary key, "
+ "address text not null, "
+ "name text, "
+ "description text, "
+ "inuse integer not null, "
+ "priority integer not null, "
+ "pubkey text, "
+ "fingerprint text, "
+ "maxage integer not null default 0, "
+ "version integer not null default 0, "
+ "lastetag text, "
+ "lastUpdated string);";
db.execSQL(createTableDdl);
String nonIdFields = "address, name, description, inuse, priority, " +
"pubkey, fingerprint, maxage, version, lastetag, lastUpdated";
String insertSql = "INSERT INTO " + TABLE_REPO +
"(_id, " + nonIdFields + " ) " +
"SELECT id, " + nonIdFields + " FROM " + tempTableName + ";";
db.execSQL(insertSql);
db.execSQL("DROP TABLE " + tempTableName + ";");
db.setTransactionSuccessful();
} catch (Exception e) {
Log.e(TAG, "Error renaming id to _id", e);
}
db.endTransaction();
} }
@Override @Override
@ -299,36 +301,37 @@ class DBHelper extends SQLiteOpenHelper {
* key in sqlite - table must be recreated). * key in sqlite - table must be recreated).
*/ */
private void migrateRepoTable(SQLiteDatabase db, int oldVersion) { private void migrateRepoTable(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 20) { if (oldVersion >= 20) {
List<Repo> oldrepos = new ArrayList<>(); return;
Cursor cursor = db.query(TABLE_REPO, }
new String[] {"address", "inuse", "pubkey"}, List<Repo> oldrepos = new ArrayList<>();
null, null, null, null, null); Cursor cursor = db.query(TABLE_REPO,
if (cursor != null) { new String[] {"address", "inuse", "pubkey"},
if (cursor.getCount() > 0) { null, null, null, null, null);
cursor.moveToFirst(); if (cursor != null) {
while (!cursor.isAfterLast()) { if (cursor.getCount() > 0) {
Repo repo = new Repo(); cursor.moveToFirst();
repo.address = cursor.getString(0); while (!cursor.isAfterLast()) {
repo.inuse = cursor.getInt(1) == 1; Repo repo = new Repo();
repo.signingCertificate = cursor.getString(2); repo.address = cursor.getString(0);
oldrepos.add(repo); repo.inuse = cursor.getInt(1) == 1;
cursor.moveToNext(); repo.signingCertificate = cursor.getString(2);
} oldrepos.add(repo);
cursor.moveToNext();
} }
cursor.close();
}
db.execSQL("drop table " + TABLE_REPO);
db.execSQL(CREATE_TABLE_REPO);
for (final Repo repo : oldrepos) {
ContentValues values = new ContentValues();
values.put("address", repo.address);
values.put("inuse", repo.inuse);
values.put("priority", 10);
values.put("pubkey", repo.signingCertificate);
values.put("lastetag", (String) null);
db.insert(TABLE_REPO, null, values);
} }
cursor.close();
}
db.execSQL("drop table " + TABLE_REPO);
db.execSQL(CREATE_TABLE_REPO);
for (final Repo repo : oldrepos) {
ContentValues values = new ContentValues();
values.put("address", repo.address);
values.put("inuse", repo.inuse);
values.put("priority", 10);
values.put("pubkey", repo.signingCertificate);
values.put("lastetag", (String) null);
db.insert(TABLE_REPO, null, values);
} }
} }
@ -350,22 +353,23 @@ class DBHelper extends SQLiteOpenHelper {
private void addNameAndDescriptionToRepo(SQLiteDatabase db, int oldVersion) { private void addNameAndDescriptionToRepo(SQLiteDatabase db, int oldVersion) {
boolean nameExists = columnExists(db, TABLE_REPO, "name"); boolean nameExists = columnExists(db, TABLE_REPO, "name");
boolean descriptionExists = columnExists(db, TABLE_REPO, "description"); boolean descriptionExists = columnExists(db, TABLE_REPO, "description");
if (oldVersion < 21 && !(nameExists && descriptionExists)) { if (oldVersion >= 21 || (nameExists && descriptionExists)) {
if (!nameExists) { return;
db.execSQL("alter table " + TABLE_REPO + " add column name text");
}
if (!descriptionExists) {
db.execSQL("alter table " + TABLE_REPO + " add column description text");
}
insertNameAndDescription(db, R.string.fdroid_repo_address,
R.string.fdroid_repo_name, R.string.fdroid_repo_description);
insertNameAndDescription(db, R.string.fdroid_archive_address,
R.string.fdroid_archive_name, R.string.fdroid_archive_description);
insertNameAndDescription(db, R.string.guardianproject_repo_address,
R.string.guardianproject_repo_name, R.string.guardianproject_repo_description);
insertNameAndDescription(db, R.string.guardianproject_archive_address,
R.string.guardianproject_archive_name, R.string.guardianproject_archive_description);
} }
if (!nameExists) {
db.execSQL("alter table " + TABLE_REPO + " add column name text");
}
if (!descriptionExists) {
db.execSQL("alter table " + TABLE_REPO + " add column description text");
}
insertNameAndDescription(db, R.string.fdroid_repo_address,
R.string.fdroid_repo_name, R.string.fdroid_repo_description);
insertNameAndDescription(db, R.string.fdroid_archive_address,
R.string.fdroid_archive_name, R.string.fdroid_archive_description);
insertNameAndDescription(db, R.string.guardianproject_repo_address,
R.string.guardianproject_repo_name, R.string.guardianproject_repo_description);
insertNameAndDescription(db, R.string.guardianproject_archive_address,
R.string.guardianproject_archive_name, R.string.guardianproject_archive_description);
} }
@ -374,115 +378,128 @@ class DBHelper extends SQLiteOpenHelper {
* calculate its fingerprint and save it to the database. * calculate its fingerprint and save it to the database.
*/ */
private void addFingerprintToRepo(SQLiteDatabase db, int oldVersion) { private void addFingerprintToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 44) { if (oldVersion >= 44) {
if (!columnExists(db, TABLE_REPO, "fingerprint")) { return;
db.execSQL("alter table " + TABLE_REPO + " add column fingerprint text"); }
} if (!columnExists(db, TABLE_REPO, "fingerprint")) {
List<Repo> oldrepos = new ArrayList<>(); db.execSQL("alter table " + TABLE_REPO + " add column fingerprint text");
Cursor cursor = db.query(TABLE_REPO, }
new String[] {"address", "pubkey"}, List<Repo> oldrepos = new ArrayList<>();
null, null, null, null, null); Cursor cursor = db.query(TABLE_REPO,
if (cursor != null) { new String[] {"address", "pubkey"},
if (cursor.getCount() > 0) { null, null, null, null, null);
cursor.moveToFirst(); if (cursor != null) {
while (!cursor.isAfterLast()) { if (cursor.getCount() > 0) {
Repo repo = new Repo(); cursor.moveToFirst();
repo.address = cursor.getString(0); while (!cursor.isAfterLast()) {
repo.signingCertificate = cursor.getString(1); Repo repo = new Repo();
oldrepos.add(repo); repo.address = cursor.getString(0);
cursor.moveToNext(); repo.signingCertificate = cursor.getString(1);
} oldrepos.add(repo);
cursor.moveToNext();
} }
cursor.close();
}
for (final Repo repo : oldrepos) {
ContentValues values = new ContentValues();
values.put("fingerprint", Utils.calcFingerprint(repo.signingCertificate));
db.update(TABLE_REPO, values, "address = ?", new String[] {repo.address});
} }
cursor.close();
}
for (final Repo repo : oldrepos) {
ContentValues values = new ContentValues();
values.put("fingerprint", Utils.calcFingerprint(repo.signingCertificate));
db.update(TABLE_REPO, values, "address = ?", new String[] {repo.address});
} }
} }
private void addMaxAgeToRepo(SQLiteDatabase db, int oldVersion) { private void addMaxAgeToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 30 && !columnExists(db, TABLE_REPO, "maxage")) { if (oldVersion >= 30 || columnExists(db, TABLE_REPO, "maxage")) {
db.execSQL("alter table " + TABLE_REPO + " add column maxage integer not null default 0"); return;
} }
db.execSQL("alter table " + TABLE_REPO + " add column maxage integer not null default 0");
} }
private void addVersionToRepo(SQLiteDatabase db, int oldVersion) { private void addVersionToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 33 && !columnExists(db, TABLE_REPO, "version")) { if (oldVersion >= 33 || columnExists(db, TABLE_REPO, "version")) {
db.execSQL("alter table " + TABLE_REPO + " add column version integer not null default 0"); return;
} }
db.execSQL("alter table " + TABLE_REPO + " add column version integer not null default 0");
} }
private void addLastUpdatedToRepo(SQLiteDatabase db, int oldVersion) { private void addLastUpdatedToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 35 && !columnExists(db, TABLE_REPO, "lastUpdated")) { if (oldVersion >= 35 || columnExists(db, TABLE_REPO, "lastUpdated")) {
Utils.debugLog(TAG, "Adding lastUpdated column to " + TABLE_REPO); return;
db.execSQL("Alter table " + TABLE_REPO + " add column lastUpdated string");
} }
Utils.debugLog(TAG, "Adding lastUpdated column to " + TABLE_REPO);
db.execSQL("Alter table " + TABLE_REPO + " add column lastUpdated string");
} }
private void addIsSwapToRepo(SQLiteDatabase db, int oldVersion) { private void addIsSwapToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 47 && !columnExists(db, TABLE_REPO, "isSwap")) { if (oldVersion >= 47 || columnExists(db, TABLE_REPO, "isSwap")) {
Utils.debugLog(TAG, "Adding isSwap field to " + TABLE_REPO + " table in db."); return;
db.execSQL("alter table " + TABLE_REPO + " add column isSwap boolean default 0;");
} }
Utils.debugLog(TAG, "Adding isSwap field to " + TABLE_REPO + " table in db.");
db.execSQL("alter table " + TABLE_REPO + " add column isSwap boolean default 0;");
} }
private void addCredentialsToRepo(SQLiteDatabase db, int oldVersion) { private void addCredentialsToRepo(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 52) { if (oldVersion >= 52) {
if (!columnExists(db, TABLE_REPO, "username")) { return;
Utils.debugLog(TAG, "Adding username field to " + TABLE_REPO + " table in db."); }
db.execSQL("alter table " + TABLE_REPO + " add column username string;"); if (!columnExists(db, TABLE_REPO, "username")) {
} Utils.debugLog(TAG, "Adding username field to " + TABLE_REPO + " table in db.");
db.execSQL("alter table " + TABLE_REPO + " add column username string;");
}
if (!columnExists(db, TABLE_REPO, "password")) { if (!columnExists(db, TABLE_REPO, "password")) {
Utils.debugLog(TAG, "Adding password field to " + TABLE_REPO + " table in db."); Utils.debugLog(TAG, "Adding password field to " + TABLE_REPO + " table in db.");
db.execSQL("alter table " + TABLE_REPO + " add column password string;"); db.execSQL("alter table " + TABLE_REPO + " add column password string;");
}
} }
} }
private void addChangelogToApp(SQLiteDatabase db, int oldVersion) { private void addChangelogToApp(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 48 && !columnExists(db, TABLE_APP, "changelogURL")) { if (oldVersion >= 48 || columnExists(db, TABLE_APP, "changelogURL")) {
Utils.debugLog(TAG, "Adding changelogURL column to " + TABLE_APP); return;
db.execSQL("alter table " + TABLE_APP + " add column changelogURL text");
} }
Utils.debugLog(TAG, "Adding changelogURL column to " + TABLE_APP);
db.execSQL("alter table " + TABLE_APP + " add column changelogURL text");
} }
private void addIconUrlLargeToApp(SQLiteDatabase db, int oldVersion) { private void addIconUrlLargeToApp(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 49 && !columnExists(db, TABLE_APP, "iconUrlLarge")) { if (oldVersion >= 49 || columnExists(db, TABLE_APP, "iconUrlLarge")) {
Utils.debugLog(TAG, "Adding iconUrlLarge columns to " + TABLE_APP); return;
db.execSQL("alter table " + TABLE_APP + " add column iconUrlLarge text");
} }
Utils.debugLog(TAG, "Adding iconUrlLarge columns to " + TABLE_APP);
db.execSQL("alter table " + TABLE_APP + " add column iconUrlLarge text");
} }
private void updateIconUrlLarge(SQLiteDatabase db, int oldVersion) { private void updateIconUrlLarge(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 50) { if (oldVersion >= 50) {
Utils.debugLog(TAG, "Recalculating app icon URLs so that the newly added large icons will get updated."); return;
AppProvider.UpgradeHelper.updateIconUrls(context, db);
clearRepoEtags(db);
} }
Utils.debugLog(TAG, "Recalculating app icon URLs so that the newly added large icons will get updated.");
AppProvider.UpgradeHelper.updateIconUrls(context, db);
clearRepoEtags(db);
} }
private void addAuthorToApp(SQLiteDatabase db, int oldVersion) { private void addAuthorToApp(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 53 && !columnExists(db, TABLE_APP, "author")) { if (oldVersion >= 53) {
return;
}
if (!columnExists(db, TABLE_APP, "author")) {
Utils.debugLog(TAG, "Adding author column to " + TABLE_APP); Utils.debugLog(TAG, "Adding author column to " + TABLE_APP);
db.execSQL("alter table " + TABLE_APP + " add column author text"); db.execSQL("alter table " + TABLE_APP + " add column author text");
} }
if (oldVersion < 53 && !columnExists(db, TABLE_APP, "email")) { if (!columnExists(db, TABLE_APP, "email")) {
Utils.debugLog(TAG, "Adding email column to " + TABLE_APP); Utils.debugLog(TAG, "Adding email column to " + TABLE_APP);
db.execSQL("alter table " + TABLE_APP + " add column email text"); db.execSQL("alter table " + TABLE_APP + " add column email text");
} }
} }
private void useMaxValueInMaxSdkVersion(SQLiteDatabase db, int oldVersion) { private void useMaxValueInMaxSdkVersion(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 54) { if (oldVersion >= 54) {
Utils.debugLog(TAG, "Converting maxSdkVersion value 0 to " + Byte.MAX_VALUE); return;
ContentValues values = new ContentValues();
values.put(ApkProvider.DataColumns.MAX_SDK_VERSION, Byte.MAX_VALUE);
db.update(TABLE_APK, values, ApkProvider.DataColumns.MAX_SDK_VERSION + " < 1", null);
} }
Utils.debugLog(TAG, "Converting maxSdkVersion value 0 to " + Byte.MAX_VALUE);
ContentValues values = new ContentValues();
values.put(ApkProvider.DataColumns.MAX_SDK_VERSION, Byte.MAX_VALUE);
db.update(TABLE_APK, values, ApkProvider.DataColumns.MAX_SDK_VERSION + " < 1", null);
} }
/** /**
@ -501,14 +518,15 @@ class DBHelper extends SQLiteOpenHelper {
// was is specified by the user. We don't want to weely-neely nuke that data. // was is specified by the user. We don't want to weely-neely nuke that data.
// and the new way to deal with changes to the table structure is to add a // and the new way to deal with changes to the table structure is to add a
// if (oldVersion < x && !columnExists(...) and then alter the table as required. // if (oldVersion < x && !columnExists(...) and then alter the table as required.
if (oldVersion < 42) { if (oldVersion >= 42) {
context.getSharedPreferences("FDroid", Context.MODE_PRIVATE).edit() return;
.putBoolean("triedEmptyUpdate", false).commit();
db.execSQL("drop table " + TABLE_APP);
db.execSQL("drop table " + TABLE_APK);
clearRepoEtags(db);
createAppApk(db);
} }
context.getSharedPreferences("FDroid", Context.MODE_PRIVATE).edit()
.putBoolean("triedEmptyUpdate", false).commit();
db.execSQL("drop table " + TABLE_APP);
db.execSQL("drop table " + TABLE_APK);
clearRepoEtags(db);
createAppApk(db);
} }
private static void createAppApk(SQLiteDatabase db) { private static void createAppApk(SQLiteDatabase db) {
@ -527,10 +545,11 @@ class DBHelper extends SQLiteOpenHelper {
// If any column was added or removed, just drop the table, create it // If any column was added or removed, just drop the table, create it
// again and let the cache be filled from scratch again. // again and let the cache be filled from scratch again.
private void recreateInstalledCache(SQLiteDatabase db, int oldVersion) { private void recreateInstalledCache(SQLiteDatabase db, int oldVersion) {
if (oldVersion < 51) { if (oldVersion >= 51) {
db.execSQL(DROP_TABLE_INSTALLED_APP); return;
createInstalledApp(db);
} }
db.execSQL(DROP_TABLE_INSTALLED_APP);
createInstalledApp(db);
} }
private static boolean columnExists(SQLiteDatabase db, private static boolean columnExists(SQLiteDatabase db,