aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/editaccount.xml20
-rw-r--r--src/main/res/menu/message_context.xml8
-rw-r--r--src/main/res/menu/omemo_key_context.xml13
-rw-r--r--src/main/res/menu/trust_keys.xml9
4 files changed, 46 insertions, 4 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 9ab1788b..c67e5c47 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -1,5 +1,21 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/action_share"
+ android:title="@string/share_uri_with"
+ android:icon="?attr/icon_share"
+ android:showAsAction="always">
+ <menu>
+ <item
+ android:id="@+id/action_share_barcode"
+ android:title="@string/share_as_barcode"/>
+ <item
+ android:id="@+id/action_share_uri"
+ android:title="@string/share_as_uri"/>
+ <item android:id="@+id/action_share_http"
+ android:title="@string/share_as_http"/>
+ </menu>
+ </item>
+
<item
android:id="@+id/action_change_presence"
android:showAsAction="always"
@@ -44,10 +60,6 @@
android:title="@string/change_password"/>
<item
- android:id="@+id/action_clear_devices"
- android:showAsAction="never"
- android:title="@string/clear_other_devices"/>
- <item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index bc8acede..283d3f2f 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,6 +5,10 @@
android:id="@+id/copy_text"
android:title="@string/copy_text"
android:visible="false"/>
+ <item
+ android:id="@+id/select_text"
+ android:title="@string/select_text"
+ android:visible="false"/>
<item
android:id="@+id/retry_decryption"
android:title="Retry decryption"
@@ -22,6 +26,10 @@
android:title="@string/copy_original_url"
android:visible="false"/>
<item
+ android:id="@+id/show_error_message"
+ android:title="@string/show_error_message"
+ android:visible="false"/>
+ <item
android:id="@+id/send_again"
android:title="@string/send_again"
android:visible="false"/>
diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml
new file mode 100644
index 00000000..1e825902
--- /dev/null
+++ b/src/main/res/menu/omemo_key_context.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/verify_scan"
+ android:title="@string/scan_qr_code"
+ />
+ <item
+ android:id="@+id/purge_omemo_key"
+ android:title="@string/purge_key"/>
+ <item
+ android:id="@+id/copy_omemo_key"
+ android:title="@string/copy_fingerprint"/>
+</menu> \ No newline at end of file
diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml
new file mode 100644
index 00000000..90304767
--- /dev/null
+++ b/src/main/res/menu/trust_keys.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/action_scan_qr_code"
+ android:title="@string/scan_qr_code"
+ android:showAsAction="always"
+ android:icon="?attr/icon_scan_qr_code"/>
+</menu> \ No newline at end of file