kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update recipient merging.
rodzic
580c000bda
commit
e90fa05d60
|
@ -404,10 +404,8 @@ public class RecipientDatabase extends Database {
|
||||||
return getByColumn(EMAIL, email);
|
return getByColumn(EMAIL, email);
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NonNull
|
public @NonNull Optional<RecipientId> getByGroupId(@NonNull GroupId groupId) {
|
||||||
Optional<RecipientId> getByGroupId(@NonNull GroupId groupId) {
|
|
||||||
return getByColumn(GROUP_ID, groupId.toString());
|
return getByColumn(GROUP_ID, groupId.toString());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NonNull
|
public @NonNull
|
||||||
|
@ -2976,19 +2974,25 @@ public class RecipientDatabase extends Database {
|
||||||
// SMS Messages
|
// SMS Messages
|
||||||
ContentValues smsValues = new ContentValues();
|
ContentValues smsValues = new ContentValues();
|
||||||
smsValues.put(SmsDatabase.RECIPIENT_ID, byUuid.serialize());
|
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));
|
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
|
// MMS Messages
|
||||||
ContentValues mmsValues = new ContentValues();
|
ContentValues mmsValues = new ContentValues();
|
||||||
mmsValues.put(MmsDatabase.RECIPIENT_ID, byUuid.serialize());
|
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));
|
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
|
// Sessions
|
||||||
boolean hasE164Session = DatabaseFactory.getSessionDatabase(context).getAllFor(byE164).size() > 0;
|
boolean hasE164Session = DatabaseFactory.getSessionDatabase(context).getAllFor(byE164).size() > 0;
|
||||||
boolean hasUuidSession = DatabaseFactory.getSessionDatabase(context).getAllFor(byUuid).size() > 0;
|
boolean hasUuidSession = DatabaseFactory.getSessionDatabase(context).getAllFor(byUuid).size() > 0;
|
||||||
|
|
Ładowanie…
Reference in New Issue