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

Fix PNI prefixing in provisioning message.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-08-09 10:35:54 -04:00
committed by Alex Hart
parent f56a65d30d
commit 1cc7b46555
6 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
View File

@@ -57,7 +57,7 @@ class ContactRecordProcessorTest {
val record = buildRecord {
setAci(ACI_B.toString())
setPni(PNI_B.toString())
setPni(PNI_B.toStringWithoutPrefix())
setE164(E164_B)
}
@@ -117,22 +117,6 @@ class ContactRecordProcessorTest {
assertTrue(result)
}
@Test
fun `isInvalid, pni matches self as serviceId, true`() {
// GIVEN
val subject = ContactRecordProcessor(ACI_A, PNI_A, E164_A, recipientTable)
val record = buildRecord {
setAci(PNI_A.toString())
}
// WHEN
val result = subject.isInvalid(record)
// THEN
assertTrue(result)
}
@Test
fun `isInvalid, pni matches self as pni, true`() {
// GIVEN
@@ -140,7 +124,7 @@ class ContactRecordProcessorTest {
val record = buildRecord {
setAci(ACI_B.toString())
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
// WHEN
@@ -262,13 +246,13 @@ class ContactRecordProcessorTest {
val local = buildRecord(STORAGE_ID_A) {
setAci(ACI_A.toString())
setE164(E164_A)
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
val remote = buildRecord(STORAGE_ID_B) {
setAci(ACI_A.toString())
setE164(E164_A)
setPni(PNI_B.toString())
setPni(PNI_B.toStringWithoutPrefix())
}
// WHEN
@@ -290,13 +274,13 @@ class ContactRecordProcessorTest {
val local = buildRecord(STORAGE_ID_A) {
setAci(ACI_A.toString())
setE164(E164_A)
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
val remote = buildRecord(STORAGE_ID_B) {
setAci(ACI_A.toString())
setE164(E164_B)
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
// WHEN
@@ -318,13 +302,13 @@ class ContactRecordProcessorTest {
val local = buildRecord(STORAGE_ID_A) {
setAci(ACI_A.toString())
setE164(E164_A)
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
val remote = buildRecord(STORAGE_ID_B) {
setAci(ACI_A.toString())
setE164(E164_B)
setPni(PNI_B.toString())
setPni(PNI_B.toStringWithoutPrefix())
}
// WHEN
@@ -346,13 +330,13 @@ class ContactRecordProcessorTest {
val local = buildRecord(STORAGE_ID_A) {
setAci(ACI_A.toString())
setE164(E164_A)
setPni(PNI_A.toString())
setPni(PNI_A.toStringWithoutPrefix())
}
val remote = buildRecord(STORAGE_ID_B) {
setAci(ACI_A.toString())
setE164(E164_B)
setPni(PNI_B.toString())
setPni(PNI_B.toStringWithoutPrefix())
}
// WHEN