mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 05:58:33 +00:00
Support for Axolotl protocol.
1) Split code into v1 and v2 message paths. 2) Do the Axolotl protocol for v2. 3) Switch all v2 entities to protobuf.
This commit is contained in:
@@ -5,8 +5,9 @@
|
||||
android:icon="@drawable/ic_menu_lock_holo_dark"
|
||||
android:showAsAction="ifRoom">
|
||||
<menu>
|
||||
<item android:title="@string/conversation_secure_verified__menu_verify_session"
|
||||
android:id="@+id/menu_verify_session" />
|
||||
<item android:title="@string/conversation_secure_verified__menu_no_identity"
|
||||
android:enabled="false"
|
||||
android:id="@+id/menu_no_identity" />
|
||||
|
||||
<item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
|
||||
android:id="@+id/menu_abort_session"/>
|
||||
|
@@ -688,7 +688,7 @@
|
||||
|
||||
<!-- conversation_secure_verified -->
|
||||
<string name="conversation_secure_verified__menu_security">Security</string>
|
||||
<string name="conversation_secure_verified__menu_verify_session">Verify Session</string>
|
||||
<string name="conversation_secure_verified__menu_no_identity">No Identity Available</string>
|
||||
<string name="conversation_secure_verified__menu_verify_recipient">Verify Recipient</string>
|
||||
<string name="conversation_secure_verified__menu_abort_secure_session">Abort Secure Session</string>
|
||||
|
||||
|
Reference in New Issue
Block a user