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

Stop putting e164s into SignalProtocolAddress.

Browse Source
This commit is contained in:
Cody Henthorne
2026-04-15 14:30:24 -04:00
committed by jeffrey-signal
parent fcdbf93626
commit 3804890265
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
View File

@@ -142,10 +142,6 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
if (recipient.getHasPni()) {
archiveSession(new SignalProtocolAddress(recipient.requirePni().toString(), deviceId));
}
if (recipient.getHasE164()) {
archiveSession(new SignalProtocolAddress(recipient.requireE164(), deviceId));
}
}
}
@@ -164,12 +160,6 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
archiveSiblingSessions(address);
archiveSession(address);
}
if (recipient.getHasE164()) {
SignalProtocolAddress address = new SignalProtocolAddress(recipient.requireE164(), 1);
archiveSiblingSessions(address);
archiveSession(address);
}
}
}

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

@@ -167,6 +167,7 @@ import org.thoughtcrime.securesms.database.helpers.migration.V311_AddAttachmentM
import org.thoughtcrime.securesms.database.helpers.migration.V312_RefactorNameCollisionTables
import org.thoughtcrime.securesms.database.helpers.migration.V313_AddCollapsingUpdateColumns
import org.thoughtcrime.securesms.database.helpers.migration.V314_FixMessageRequestAcceptedToRecipient
import org.thoughtcrime.securesms.database.helpers.migration.V315_CleanupE164SenderKeyShared
import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSqliteDatabase
/**
@@ -341,10 +342,11 @@ object SignalDatabaseMigrations {
311 to V311_AddAttachmentMediaOverviewSizeIndex,
312 to V312_RefactorNameCollisionTables,
313 to V313_AddCollapsingUpdateColumns,
314 to V314_FixMessageRequestAcceptedToRecipient
314 to V314_FixMessageRequestAcceptedToRecipient,
315 to V315_CleanupE164SenderKeyShared
)
const val DATABASE_VERSION = 314
const val DATABASE_VERSION = 315
@JvmStatic
fun migrate(context: Application, db: SignalSqliteDatabase, oldVersion: Int, newVersion: Int) {

11
app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V315_CleanupE164SenderKeyShared.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.thoughtcrime.securesms.database.helpers.migration
import android.app.Application
import org.thoughtcrime.securesms.database.SQLiteDatabase
@Suppress("ClassName")
object V315_CleanupE164SenderKeyShared : SignalDatabaseMigration {
override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
db.execSQL("DELETE FROM sender_key_shared WHERE address LIKE '+%'")
}
}

4
app/src/test/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStoreTest.kt
View File

@@ -7,16 +7,18 @@ import io.mockk.verify
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.signal.core.models.ServiceId
import org.signal.libsignal.protocol.IdentityKey
import org.signal.libsignal.protocol.SignalProtocolAddress
import org.signal.libsignal.protocol.ecc.ECPublicKey
import org.thoughtcrime.securesms.database.IdentityTable
import org.thoughtcrime.securesms.database.model.IdentityStoreRecord
import org.whispersystems.signalservice.test.LibSignalLibraryUtil.assumeLibSignalSupportedOnOS
import java.util.UUID
class SignalBaseIdentityKeyStoreTest {
companion object {
private const val ADDRESS = "address1"
private val ADDRESS = ServiceId.parseOrThrow(UUID.randomUUID().toString()).toString()
}
@Before

4
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -3059,10 +3059,6 @@ public class SignalServiceMessageSender {
for (int staleDeviceId : devices) {
addresses.add(new SignalProtocolAddress(recipient.getServiceId().toString(), staleDeviceId));
if (recipient.getNumber().isPresent()) {
addresses.add(new SignalProtocolAddress(recipient.getNumber().get(), staleDeviceId));
}
}
return addresses;