aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/otr_fingerprint.xml17
-rw-r--r--res/menu/manageaccounts_context.xml34
-rw-r--r--res/values/strings.xml2
3 files changed, 37 insertions, 16 deletions
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
new file mode 100644
index 00000000..28b6a555
--- /dev/null
+++ b/res/layout/otr_fingerprint.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="8dp">
+
+ <TextView
+ android:id="@+id/otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:typeface="monospace"
+ android:text="@string/no_otr_fingerprint"/>
+
+</LinearLayout>
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 765ed4e9..da8c8bf2 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -1,34 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
<item
android:id="@+id/mgmt_account_edit"
android:icon="@drawable/ic_action_edit"
- android:title="Edit Account"
- android:showAsAction="always" />
+ android:showAsAction="always"
+ android:title="Edit Account"/>
<item
android:id="@+id/mgmt_account_delete"
android:icon="@drawable/ic_action_delete"
- android:title="Delete"
android:showAsAction="always"
- />
+ android:title="Delete"/>
<item
android:id="@+id/mgmt_account_disable"
- android:title="Temporarily disable"
- android:showAsAction="never"/>
+ android:showAsAction="never"
+ android:title="Temporarily disable"/>
<item
android:id="@+id/mgmt_account_enable"
- android:title="Enable"
android:showAsAction="never"
+ android:title="Enable"
android:visible="false"/>
-
- <item
+ <item
android:id="@+id/mgmt_account_announce_pgp"
android:showAsAction="never"
- android:title="@string/announce_pgp" />
- <item
- android:id="@+id/mgmt_account_info"
- android:title="@string/account_info"
- android:showAsAction="never"
- />
+ android:title="@string/announce_pgp"/>
+ <item
+ android:id="@+id/mgmt_otr_key"
+ android:showAsAction="never"
+ android:title="@string/show_otr_key"/>
+ <item
+ android:id="@+id/mgmt_account_info"
+ android:showAsAction="never"
+ android:title="@string/account_info"/>
-</menu>
+</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aa53d081..062b2b0d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,4 +27,6 @@
<string name="register_account">Register new account on server</string>
<string name="share_with">Share with</string>
<string name="ask_again"><u>Click to ask again</u></string>
+ <string name="show_otr_key">OTR fingerprint</string>
+ <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string>
</resources>