disallow account deactivation

added reconnect to account context menu

5 files changed, 8 insertions, 25 deletions

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index f0d0c903d..6540793f9 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -25,9 +25,7 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/account_image"
         android:orientation="vertical"
-        android:paddingLeft="8dp"
-        android:layout_toLeftOf="@+id/tgl_account_status"
-        android:layout_toStartOf="@+id/tgl_account_status">
+        android:paddingLeft="8dp">
 
         <TextView
             android:id="@+id/account_jid"
@@ -48,14 +46,4 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <eu.siacs.conversations.ui.widget.Switch
-        style="@style/MD"
-        android:id="@+id/tgl_account_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:padding="16dp"
-        android:focusable="false"/>
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index ffa692a0b..2ce422a7b 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -13,12 +13,6 @@
 		android:title="@string/action_add_account_with_certificate"
 		android:visible="true"/>
 	<item
-		android:id="@+id/action_enable_all"
-		android:title="@string/enable_all_accounts"/>
-	<item
-		android:id="@+id/action_disable_all"
-		android:title="@string/disable_all_accounts"/>
-	<item
 		android:id="@+id/action_settings"
 		android:orderInCategory="100"
 		android:showAsAction="never"
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index 7a7cc0a22..ddfcb5535 100644
--- a/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -2,18 +2,15 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/mgmt_account_enable"
-        android:title="@string/mgmt_account_enable"/>
-    <item
         android:id="@+id/mgmt_account_publish_avatar"
         android:title="@string/mgmt_account_publish_avatar"/>
     <item
         android:id="@+id/mgmt_account_announce_pgp"
         android:title="@string/mgmt_account_publish_pgp"/>
     <item
-        android:id="@+id/mgmt_account_disable"
-        android:showAsAction="never"
-        android:title="@string/mgmt_account_disable"/>
+        android:id="@+id/mgmt_account_reconnect"
+        android:showAsAction="always"
+        android:title="@string/mgmt_account_reconnect"/>
     <item
         android:id="@+id/mgmt_account_delete"
         android:title="@string/mgmt_account_delete"/>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 8fd8cd6ee..4cbf17319 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -610,4 +610,7 @@
   <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string>
   <string name="delete_x_file">%s löschen</string>
   <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string>
+  <string name="mgmt_account_reconnect">neu verbinden</string>
+  <string name="no_application_to_share_uri">Keine Anwendung zu Teilen der URI</string>
+  <string name="share_uri_with">Teile URI mit…</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b12f8b59d..49ecbf89e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -642,4 +642,5 @@
 	<string name="security_error_invalid_file_access">Security error: Invalid file access</string>
 	<string name="no_application_to_share_uri">No application found to share URI</string>
 	<string name="share_uri_with">Share URI with…</string>
+	<string name="mgmt_account_reconnect">reconnect</string>
 </resources>