From 480b1cde810e0ed2afc6ea424fb36fd973ae24b9 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 23:35:03 +0200
Subject: Add clear devices to overflow menu in EditAccount

---
 src/main/res/menu/editaccount.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/res/menu/editaccount.xml')

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 4ce9e1f3..2076805e 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -20,4 +20,8 @@
 	<item android:id="@+id/action_change_password_on_server"
           android:title="@string/change_password"
           android:showAsAction="never" />
+
+    <item android:id="@+id/action_clear_devices"
+          android:title="@string/clear_other_devices"
+          android:showAsAction="never"/>
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 7be331bbb2ae2abde55eb031f4fdf4616846360e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 11 Oct 2015 15:48:58 +0200
Subject: add menu item in account details to renew certificate

---
 src/main/res/menu/editaccount.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/res/menu/editaccount.xml')

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 2076805e..62981a45 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -10,6 +10,13 @@
         android:title="@string/show_block_list"
         android:showAsAction="never" />
 
+    <item
+        android:id="@+id/action_renew_certificate"
+        android:title="@string/action_renew_certificate"
+        android:visible="false"
+        android:showAsAction="never" />
+        />
+
     <item
         android:id="@+id/action_server_info_show_more"
         android:title="@string/server_info_show_more"
-- 
cgit v1.2.3


From f0b1761ec3826b72fe3b20032b532dc5b1adfc1c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 28 Nov 2015 20:11:38 +0100
Subject: initial tor support

---
 src/main/res/menu/editaccount.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/res/menu/editaccount.xml')

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 62981a45..b7a40418 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -31,4 +31,9 @@
     <item android:id="@+id/action_clear_devices"
           android:title="@string/clear_other_devices"
           android:showAsAction="never"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3