Distinguish between secure and insecure call in conversation menu.

// FREEBIE

res/menu/conversation_callable_insecure.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:title="@string/conversation_callable__menu_call"
-          android:id="@+id/menu_call"
+          android:id="@+id/menu_call_insecure"
           android:icon="?menu_call_icon"
           app:showAsAction="ifRoom" />
 

res/menu/conversation_callable_secure.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/conversation_callable__menu_call"
+          android:id="@+id/menu_call_secure"
+          android:icon="@drawable/ic_call_secure_white_24dp"
+          app:showAsAction="ifRoom" />
+
+</menu>

res/menu/conversation_secure_identity.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:title="@string/conversation_secure_verified__menu_security"
-          android:id="@+id/menu_security"
-          android:icon="?menu_lock_icon"
-          app:showAsAction="ifRoom">
-          <menu>
-              <item android:title="@string/conversation_secure_verified__menu_verify_identity"
-                    android:id="@+id/menu_verify_identity"/>
-          </menu>
-    </item>
-</menu>

res/values/strings.xml

@@ -659,6 +659,7 @@
     <string name="recipient_preferences__block">Block</string>
     <string name="recipient_preferences__color">Color</string>
     <string name="recipient_preferences__color_for_this_contact">Color for this contact</string>
+    <string name="recipient_preferences__verify_identity">Verify identity</string>
 
     <!--- redphone_call_controls -->
     <string name="redphone_call_card__signal_call">Signal Call</string>
@@ -937,7 +938,7 @@
     <!-- refreshing push directory from menu -->
     <string name="push_directory__menu_refresh">Refresh contact list</string>
 
-    <!-- conversation_callable -->
+    <!-- conversation_callable_insecure -->
     <string name="conversation_callable__menu_call">Call</string>
 
     <!-- conversation_context -->
@@ -993,7 +994,7 @@
     <!-- conversation_popup -->
     <string name="conversation_popup__menu_expand_popup">Expand popup</string>
 
-    <!-- conversation_callable -->
+    <!-- conversation_callable_insecure -->
     <string name="conversation_add_to_contacts__menu_add_to_contacts">Add to contacts</string>
 
     <!-- conversation_group_options -->

res/xml/recipient_preferences.xml

@@ -36,9 +36,13 @@
             android:persistent="false"
             app:numColumns="5" />
 
+    <Preference android:key="pref_key_recipient_identity"
+                android:title="@string/recipient_preferences__verify_identity"
+                android:persistent="false"/>
 
     <Preference android:key="pref_key_recipient_block"
-                android:title="@string/recipient_preferences__block" />
+                android:title="@string/recipient_preferences__block"
+                android:persistent="false"/>
 
 
 </PreferenceScreen>