TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 16:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify recipient inserts.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-07 13:36:05 -07:00
parent be4daff0f3
commit d7395af774
1 changed files with 56 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@ -179,94 +179,28 @@ public class RecipientDatabase extends Database {
super(context, databaseHelper); super(context, databaseHelper);
} }
public RecipientId getOrInsertFromE164(@NonNull String e164) { public @NonNull Optional<RecipientId> getByE164(@NonNull String e164) {
if (TextUtils.isEmpty(e164)) { return getByColumn(PHONE, e164);
throw new AssertionError("Phone number cannot be empty.");
} }
SQLiteDatabase db = databaseHelper.getWritableDatabase(); public @NonNull Optional<RecipientId> getByEmail(@NonNull String email) {
String query = PHONE + " = ?"; return getByColumn(EMAIL, email);
String[] args = new String[] { e164 };
db.beginTransaction();
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
db.setTransactionSuccessful();
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
} else {
ContentValues values = new ContentValues();
values.put(PHONE, e164);
long id = db.insertOrThrow(TABLE_NAME, null, values);
if (id < 0) throw new AssertionError("Failed to insert recipient!");
db.setTransactionSuccessful();
return RecipientId.from(id);
} }
} finally {
db.endTransaction(); public @NonNull Optional<RecipientId> getByGroupId(@NonNull String groupId) {
return getByColumn(GROUP_ID, groupId);
} }
public @NonNull RecipientId getOrInsertFromE164(@NonNull String e164) {
return getOrInsertByColumn(PHONE, e164);
} }
public RecipientId getOrInsertFromEmail(@NonNull String email) { public RecipientId getOrInsertFromEmail(@NonNull String email) {
if (TextUtils.isEmpty(email)) { return getOrInsertByColumn(EMAIL, email);
throw new AssertionError("Email cannot be empty.");
}
SQLiteDatabase db = databaseHelper.getWritableDatabase();
String query = EMAIL + " = ?";
String[] args = new String[] { email };
db.beginTransaction();
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
db.setTransactionSuccessful();
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
} else {
ContentValues values = new ContentValues();
values.put(EMAIL, email);
long id = db.insertOrThrow(TABLE_NAME, null, values);
if (id < 0) throw new AssertionError("Failed to insert recipient!");
db.setTransactionSuccessful();
return RecipientId.from(id);
}
} finally {
db.endTransaction();
}
} }
public RecipientId getOrInsertFromGroupId(@NonNull String groupId) { public RecipientId getOrInsertFromGroupId(@NonNull String groupId) {
if (TextUtils.isEmpty(groupId)) { return getOrInsertByColumn(GROUP_ID, groupId);
throw new AssertionError("GroupId cannot be empty.");
}
SQLiteDatabase db = databaseHelper.getWritableDatabase();
String query = GROUP_ID + " = ?";
String[] args = new String[] { groupId };
db.beginTransaction();
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
db.setTransactionSuccessful();
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
} else {
ContentValues values = new ContentValues();
values.put(GROUP_ID, groupId);
long id = db.insertOrThrow(TABLE_NAME, null, values);
if (id < 0) throw new AssertionError("Failed to insert recipient!");
db.setTransactionSuccessful();
return RecipientId.from(id);
}
} finally {
db.endTransaction();
}
} }
public Cursor getBlocked() { public Cursor getBlocked() {
@ -653,6 +587,49 @@ public class RecipientDatabase extends Database {
return database.update(TABLE_NAME, contentValues, ID + " = ?", new String[] { id.serialize() }); return database.update(TABLE_NAME, contentValues, ID + " = ?", new String[] { id.serialize() });
} }
private @NonNull Optional<RecipientId> getByColumn(@NonNull String column, String value) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
String query = column + " = ?";
String[] args = new String[] { value };
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
return Optional.of(RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID))));
} else {
return Optional.absent();
}
}
}
private @NonNull RecipientId getOrInsertByColumn(@NonNull String column, String value) {
if (TextUtils.isEmpty(value)) {
throw new AssertionError(column + " cannot be empty.");
}
Optional<RecipientId> existing = getByColumn(column, value);
if (existing.isPresent()) {
return existing.get();
} else {
ContentValues values = new ContentValues();
values.put(column, value);
long id = databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, values);
if (id < 0) {
existing = getByColumn(column, value);
if (existing.isPresent()) {
return existing.get();
} else {
throw new AssertionError("Failed to insert recipient!");
}
}
return RecipientId.from(id);
}
}
public class BulkOperationsHandle { public class BulkOperationsHandle {
private final SQLiteDatabase database; private final SQLiteDatabase database;