PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UpdatesDbHelper: Move identical code into helper method

Browse Source 
Change-Id: I2e19d9756fab94d9fcd3352b0baef45300044d3a
This commit is contained in:
Pavel Salomatov
2019-01-16 17:59:34 +03:00
committed by Bruno Martins
parent 9689a6b8bb
commit ffe5b527f6
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/lineageos/updater/UpdatesDbHelper.java
View File

@@ -78,19 +78,18 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
public long addUpdate(Update update) { public long addUpdate(Update update) {
SQLiteDatabase db = getWritableDatabase(); SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(UpdateEntry.COLUMN_NAME_STATUS, update.getPersistentStatus()); fillContentValues(update, values);
values.put(UpdateEntry.COLUMN_NAME_PATH, update.getFile().getAbsolutePath());
values.put(UpdateEntry.COLUMN_NAME_DOWNLOAD_ID, update.getDownloadId());
values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp());
values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());
values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
return db.insert(UpdateEntry.TABLE_NAME, null, values); return db.insert(UpdateEntry.TABLE_NAME, null, values);
} }
public long addUpdateWithOnConflict(Update update, int conflictAlgorithm) { public long addUpdateWithOnConflict(Update update, int conflictAlgorithm) {
SQLiteDatabase db = getWritableDatabase(); SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
fillContentValues(update, values);
return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm);
}
private static void fillContentValues(Update update, ContentValues values) {
values.put(UpdateEntry.COLUMN_NAME_STATUS, update.getPersistentStatus()); values.put(UpdateEntry.COLUMN_NAME_STATUS, update.getPersistentStatus());
values.put(UpdateEntry.COLUMN_NAME_PATH, update.getFile().getAbsolutePath()); values.put(UpdateEntry.COLUMN_NAME_PATH, update.getFile().getAbsolutePath());
values.put(UpdateEntry.COLUMN_NAME_DOWNLOAD_ID, update.getDownloadId()); values.put(UpdateEntry.COLUMN_NAME_DOWNLOAD_ID, update.getDownloadId());
@@ -98,7 +97,6 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType()); values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion()); values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());
values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize()); values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm);
} }
public boolean removeUpdate(String downloadId) { public boolean removeUpdate(String downloadId) {