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

Convert Recipient to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-04-03 12:23:55 -04:00
parent b50eab230d
commit 3ba2b46bb0
100 changed files with 1513 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
View File

@@ -98,7 +98,7 @@ class IdentityTable internal constructor(context: Context?, databaseHelper: Sign
val byServiceId = recipients.getByServiceId(ServiceId.parseOrThrow(addressName))
if (byServiceId.isPresent) {
val recipient = Recipient.resolved(byServiceId.get())
if (recipient.hasE164() && !UuidUtil.isUuid(recipient.requireE164())) {
if (recipient.hasE164 && !UuidUtil.isUuid(recipient.requireE164())) {
Log.i(TAG, "Could not find identity for UUID. Attempting E164.")
return getIdentityStoreRecord(recipient.requireE164())
} else {

6
app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedTable.kt
View File

@@ -116,14 +116,14 @@ class SenderKeySharedTable internal constructor(context: Context?, databaseHelpe
*/
fun deleteAllFor(recipientId: RecipientId) {
val recipient = Recipient.resolved(recipientId)
if (recipient.hasServiceId()) {
if (recipient.hasAci()) {
if (recipient.hasServiceId) {
if (recipient.hasAci) {
writableDatabase
.delete(TABLE_NAME)
.where("$ADDRESS = ?", recipient.requireAci().toString())
.run()
}
if (recipient.hasPni()) {
if (recipient.hasPni) {
writableDatabase
.delete(TABLE_NAME)
.where("$ADDRESS = ?", recipient.requirePni().toString())

11
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
View File

@@ -56,7 +56,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck
import org.thoughtcrime.securesms.mms.StickerSlide
import org.thoughtcrime.securesms.notifications.v2.ConversationId
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientDetails
import org.thoughtcrime.securesms.recipients.RecipientCreator
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.recipients.RecipientUtil
import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -1930,15 +1930,14 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
val recipient: Recipient = if (recipientSettings.groupId != null) {
GroupTable.Reader(cursor).getCurrent()?.let { group ->
val details = RecipientDetails.forGroup(
RecipientCreator.forGroup(
groupRecord = group,
recipientRecord = recipientSettings
recipientRecord = recipientSettings,
resolved = false
)
Recipient(recipientId, details, false)
} ?: Recipient.live(recipientId).get()
} else {
val details = RecipientDetails.forIndividual(context, recipientSettings)
Recipient(recipientId, details, true)
RecipientCreator.forIndividual(context, recipientSettings)
}
val hasReadReceipt = TextSecurePreferences.isReadReceiptsEnabled(context) && cursor.requireBoolean(HAS_READ_RECEIPT)

2
app/src/main/java/org/thoughtcrime/securesms/database/model/GroupRecord.kt
View File

@@ -187,7 +187,7 @@ class GroupRecord(
* True if the user meets all the requirements to be auto-migrated, otherwise false.
*/
private fun Recipient.isAutoMigratable(): Boolean {
return hasServiceId() && registered === RecipientTable.RegisteredState.REGISTERED && profileKey != null
return hasServiceId && registered === RecipientTable.RegisteredState.REGISTERED && profileKey != null
}
}
}