Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify contact splitting when reading from storage service.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-01-26 12:48:23 -05:00
committed by Nicholas Tinsley
parent 9146f2fb30
commit d4488c72fb
4 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View File

@@ -113,6 +113,7 @@ import java.util.LinkedList
import java.util.Objects
import java.util.Optional
import java.util.concurrent.TimeUnit
import kotlin.jvm.optionals.getOrNull
import kotlin.math.max
open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTable(context, databaseHelper) {
@@ -2246,13 +2247,16 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
* Removes the target recipient's E164+PNI, then creates a new recipient with that E164+PNI.
* Done so we can match a split contact during storage sync.
*/
fun splitForStorageSync(storageId: ByteArray) {
val record = getByStorageId(storageId)!!
if (record.aci == null || record.pni == null) {
Log.w(TAG, "Invalid state for split, ignoring.")
fun splitForStorageSyncIfNecessary(aci: ACI) {
val recipientId = getByAci(aci).getOrNull() ?: return
val record = getRecord(recipientId)
if (record.pni == null && record.e164 == null) {
return
}
Log.i(TAG, "Splitting $recipientId for storage sync", true)
writableDatabase
.update(TABLE_NAME)
.values(