Do not assume e164 is populated in storage service insert.

fork-5.53.8
Greyson Parrelli 2021-11-28 18:01:44 -05:00
rodzic 1621c060b5
commit 4364e9513f
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -842,7 +842,7 @@ public class RecipientDatabase extends Database {
if (id < 0) {
Log.w(TAG, "[applyStorageSyncContactInsert] Failed to insert. Possibly merging.");
recipientId = getAndPossiblyMerge(insert.getAddress().hasValidAci() ? insert.getAddress().getAci() : null, insert.getAddress().getNumber().get(), true);
recipientId = getAndPossiblyMerge(insert.getAddress().hasValidAci() ? insert.getAddress().getAci() : null, insert.getAddress().getNumber().orNull(), true);
db.update(TABLE_NAME, values, ID_WHERE, SqlUtil.buildArgs(recipientId));
} else {
recipientId = RecipientId.from(id);