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

Prevent insertion of UUID-only contacts at the database level.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-05-20 17:02:05 -04:00 committed by Alex Hart
parent f8f959e05a
commit 23401440bf
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper;
import org.thoughtcrime.securesms.storage.StorageSyncHelper.RecordUpdate; import org.thoughtcrime.securesms.storage.StorageSyncHelper.RecordUpdate;
import org.thoughtcrime.securesms.storage.StorageSyncModels; import org.thoughtcrime.securesms.storage.StorageSyncModels;
import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.IdentityUtil; import org.thoughtcrime.securesms.util.IdentityUtil;
import org.thoughtcrime.securesms.util.SqlUtil; import org.thoughtcrime.securesms.util.SqlUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
@ -491,7 +492,7 @@ public class RecipientDatabase extends Database {
try { try {
for (SignalContactRecord insert : contactInserts) { for (SignalContactRecord insert : contactInserts) {
ContentValues values = getValuesForStorageContact(insert); ContentValues values = validateContactValuesForInsert(getValuesForStorageContact(insert));
long id = db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE); long id = db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
if (id < 0) { if (id < 0) {
@ -1644,6 +1645,17 @@ public class RecipientDatabase extends Database {
} }
} }
private static ContentValues validateContactValuesForInsert(ContentValues values) {
if (!FeatureFlags.uuids() &&
values.getAsString(UUID) != null &&
values.getAsString(PHONE) == null)
{
throw new UuidRecipientError();
} else {
return values;
}
}
public class BulkOperationsHandle { public class BulkOperationsHandle {
private final SQLiteDatabase database; private final SQLiteDatabase database;
@ -2041,4 +2053,7 @@ public class RecipientDatabase extends Database {
this.neededInsert = neededInsert; this.neededInsert = neededInsert;
} }
} }
private static class UuidRecipientError extends AssertionError {
}
} }