mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-25 23:57:32 +00:00
Rollbacks, v2 sms-transport key exchanges, push identity conflicts.
1) Stop protocol rollbacks. 2) Handle v2 version key exchange messages. 3) Handle identity key conflicts on prekeybundle messages.
This commit is contained in:
@@ -188,6 +188,8 @@
|
||||
signature on this key exchange is trusted, but you have the \'automatically complete key
|
||||
exchanges\' setting disabled.
|
||||
</string>
|
||||
<string name="ReceiveKeyActivity_processing">Processing</string>
|
||||
<string name="ReceiveKeyActivity_processing_key_exchange">Processing key exchange…</string>
|
||||
|
||||
<!-- RegistrationActivity -->
|
||||
<string name="RegistrationActivity_connect_with_textsecure">Connect With TextSecure</string>
|
||||
@@ -246,6 +248,18 @@
|
||||
<string name="RegistrationService_registration_error">Registration Error</string>
|
||||
<string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure registration has encountered a problem.</string>
|
||||
|
||||
<!-- SmsMessageRecord -->
|
||||
<string name="SmsMessageRecord_received_corrupted_key_exchange_message">Received corrupted key
|
||||
exchange message!
|
||||
</string>
|
||||
<string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
|
||||
Received key exchange message for invalid protocol version.
|
||||
</string>
|
||||
<string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
|
||||
Received message with unknown identity key. Click to process and display.
|
||||
</string>
|
||||
|
||||
|
||||
<!-- VerifyIdentityActivity -->
|
||||
<string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
|
||||
<string name="VerifyIdentityActivity_recipient_has_no_identity_key">Recipient has no identity key.</string>
|
||||
|
Reference in New Issue
Block a user