empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update recipient merging.

Browse source
This commit is contained in:
Greyson Parrelli 2021-07-14 11:07:35 -04:00
parent 580c000bda
commit e90fa05d60
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View file

@ -404,10 +404,8 @@ public class RecipientDatabase extends Database {
return getByColumn(EMAIL, email);
}
public @NonNull
Optional<RecipientId> getByGroupId(@NonNull GroupId groupId) {
public @NonNull Optional<RecipientId> getByGroupId(@NonNull GroupId groupId) {
return getByColumn(GROUP_ID, groupId.toString());
}
public @NonNull
@ -2976,19 +2974,25 @@ public class RecipientDatabase extends Database {
// SMS Messages
ContentValues smsValues = new ContentValues();
smsValues.put(SmsDatabase.RECIPIENT_ID, byUuid.serialize());
if (threadMerge.neededMerge) {
smsValues.put(SmsDatabase.THREAD_ID, threadMerge.threadId);
}
db.update(SmsDatabase.TABLE_NAME, smsValues, SmsDatabase.RECIPIENT_ID + " = ?", SqlUtil.buildArgs(byE164));
if (threadMerge.neededMerge) {
ContentValues values = new ContentValues();
values.put(SmsDatabase.THREAD_ID, threadMerge.threadId);
db.update(SmsDatabase.TABLE_NAME, values, SmsDatabase.THREAD_ID + " = ?", SqlUtil.buildArgs(threadMerge.previousThreadId));
}
// MMS Messages
ContentValues mmsValues = new ContentValues();
mmsValues.put(MmsDatabase.RECIPIENT_ID, byUuid.serialize());
if (threadMerge.neededMerge) {
mmsValues.put(MmsDatabase.THREAD_ID, threadMerge.threadId);
}
db.update(MmsDatabase.TABLE_NAME, mmsValues, MmsDatabase.RECIPIENT_ID + " = ?", SqlUtil.buildArgs(byE164));
if (threadMerge.neededMerge) {
ContentValues values = new ContentValues();
values.put(MmsDatabase.THREAD_ID, threadMerge.threadId);
db.update(MmsDatabase.TABLE_NAME, values, MmsDatabase.THREAD_ID + " = ?", SqlUtil.buildArgs(threadMerge.previousThreadId));
}
// Sessions
boolean hasE164Session = DatabaseFactory.getSessionDatabase(context).getAllFor(byE164).size() > 0;
boolean hasUuidSession = DatabaseFactory.getSessionDatabase(context).getAllFor(byUuid).size() > 0;