Accept 'PNI:' prefix in ProvisioningProtoProvisionMessage

This commit is contained in:
Harry 2023-08-08 16:17:47 -07:00 committed by GitHub
parent 37eca71e77
commit 81e33ff21a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -141,10 +141,13 @@ public class ProvisioningCipher {
let pni: UUID? = try {
guard proto.hasPni, let pniString = proto.pni else { return nil }
guard let pni = UUID(uuidString: pniString) else {
if let pni = UUID(uuidString: pniString) {
return pni
} else if let serviceId = try? ServiceId.parseFrom(serviceIdString: pniString), let pni = serviceId as? Pni {
return pni.rawUUID
} else {
throw ProvisioningError.invalidProvisionMessage("invalid PNI from provisioning message")
}
return pni
}()
return ProvisionMessage(aci: aci,