Do not allow recipient merges to remove your own E164.

This would only happen in some niche change number cases where an
unregistered device would continue to send sealed sender messages to you
using your old number.
This commit is contained in:
Greyson Parrelli
2021-12-02 13:35:47 -05:00
parent 398fdd84b9
commit a346dd33d9
5 changed files with 84 additions and 12 deletions

View File

@@ -16,8 +16,6 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
companion object {
private val TAG = Log.tag(AccountValues::class.java)
private const val KEY_ACI = "account.aci"
private const val KEY_PNI = "account.pni"
private const val KEY_SERVICE_PASSWORD = "account.service_password"
private const val KEY_IS_REGISTERED = "account.is_registered"
private const val KEY_REGISTRATION_ID = "account.registration_id"
@@ -28,6 +26,10 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
@VisibleForTesting
const val KEY_E164 = "account.e164"
@VisibleForTesting
const val KEY_ACI = "account.aci"
@VisibleForTesting
const val KEY_PNI = "account.pni"
}
init {