Upgrade to kotlin 2.1.0

This commit is contained in:
Greyson Parrelli
2024-12-20 11:23:57 -05:00
parent 859eabe3d3
commit 7b101e13fb
22 changed files with 297 additions and 25 deletions

View File

@@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.database
import app.cash.exhaustive.Exhaustive
import org.thoughtcrime.securesms.database.model.RecipientRecord
import org.thoughtcrime.securesms.recipients.RecipientId
import org.whispersystems.signalservice.api.push.ServiceId
@@ -49,7 +48,6 @@ data class PnpDataSet(
val records: MutableSet<RecipientRecord> = listOfNotNull(e164Record, pniRecord, aciRecord).toMutableSet()
for (operation in operations) {
@Exhaustive
when (operation) {
is PnpOperation.RemoveE164 -> {
records.replace(operation.recipientId) { it.copy(e164 = null) }

View File

@@ -8,7 +8,6 @@ import android.net.Uri
import android.text.TextUtils
import androidx.annotation.VisibleForTesting
import androidx.core.content.contentValuesOf
import app.cash.exhaustive.Exhaustive
import okio.ByteString.Companion.toByteString
import org.signal.core.util.Base64
import org.signal.core.util.Bitmask
@@ -2470,7 +2469,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
var changedNumberId: RecipientId? = null
for (operation in changeSet.operations) {
@Exhaustive
when (operation) {
is PnpOperation.RemoveE164,
is PnpOperation.RemovePni,
@@ -2507,7 +2505,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
fun writePnpChangeSetToDisk(changeSet: PnpChangeSet, inputPni: PNI?, pniVerified: Boolean): RecipientId {
var hadThreadMerge = false
for (operation in changeSet.operations) {
@Exhaustive
when (operation) {
is PnpOperation.RemoveE164 -> {
writableDatabase