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

Further recipient insertion improvements.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-03 10:55:23 -04:00
parent a9cff032f5
commit bea21ed5ff
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,15 +188,17 @@ public class RecipientDatabase extends Database {
String query = PHONE + " = ?"; String query = PHONE + " = ?";
String[] args = new String[] { e164 }; String[] args = new String[] { e164 };
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) { synchronized (this) {
if (cursor != null && cursor.moveToFirst()) { try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID))); if (cursor != null && cursor.moveToFirst()) {
} else { return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
ContentValues values = new ContentValues(); } else {
values.put(PHONE, e164); ContentValues values = new ContentValues();
long id = db.insert(TABLE_NAME, null, values); values.put(PHONE, e164);
if (id < 0) throw new AssertionError("Failed to insert recipient!"); long id = db.insertOrThrow(TABLE_NAME, null, values);
return RecipientId.from(id); if (id < 0) throw new AssertionError("Failed to insert recipient!");
return RecipientId.from(id);
}
} }
} }
} }
@ -210,15 +212,17 @@ public class RecipientDatabase extends Database {
String query = EMAIL + " = ?"; String query = EMAIL + " = ?";
String[] args = new String[] { email }; String[] args = new String[] { email };
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) { synchronized (this) {
if (cursor != null && cursor.moveToFirst()) { try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID))); if (cursor != null && cursor.moveToFirst()) {
} else { return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
ContentValues values = new ContentValues(); } else {
values.put(EMAIL, email); ContentValues values = new ContentValues();
long id = db.insert(TABLE_NAME, null, values); values.put(EMAIL, email);
if (id < 0) throw new AssertionError("Failed to insert recipient!"); long id = db.insertOrThrow(TABLE_NAME, null, values);
return RecipientId.from(id); if (id < 0) throw new AssertionError("Failed to insert recipient!");
return RecipientId.from(id);
}
} }
} }
} }
@ -232,15 +236,17 @@ public class RecipientDatabase extends Database {
String query = GROUP_ID + " = ?"; String query = GROUP_ID + " = ?";
String[] args = new String[] { groupId }; String[] args = new String[] { groupId };
try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) { synchronized (this) {
if (cursor != null && cursor.moveToFirst()) { try (Cursor cursor = db.query(TABLE_NAME, ID_PROJECTION, query, args, null, null, null)) {
return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID))); if (cursor != null && cursor.moveToFirst()) {
} else { return RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(ID)));
ContentValues values = new ContentValues(); } else {
values.put(GROUP_ID, groupId); ContentValues values = new ContentValues();
long id = db.insert(TABLE_NAME, null, values); values.put(GROUP_ID, groupId);
if (id < 0) throw new AssertionError("Failed to insert recipient!"); long id = db.insertOrThrow(TABLE_NAME, null, values);
return RecipientId.from(id); if (id < 0) throw new AssertionError("Failed to insert recipient!");
return RecipientId.from(id);
}
} }
} }
} }