refactored handling of endConversation

4 files changed, 14 insertions, 2 deletions

diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 252808c84..3d738e8a1 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -16,6 +16,7 @@
         android:id="@+id/end_conversation_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/also_end_conversation" />
+        android:text="@string/also_end_conversation"
+        android:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 7155b8ce5..de13d9a42 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -42,11 +42,16 @@
         android:showAsAction="never"
         android:title="@string/action_clear_history"/>
     <item
-        android:id="@+id/action_archive"
+        android:id="@+id/action_archive_chat"
         android:orderInCategory="60"
         android:showAsAction="never"
         android:title="@string/action_end_conversation"/>
     <item
+        android:id="@+id/action_archive_muc"
+        android:orderInCategory="60"
+        android:showAsAction="never"
+        android:title="@string/action_end_conversation_muc"/>
+    <item
         android:id="@+id/action_mute"
         android:orderInCategory="70"
         android:showAsAction="never"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9d1801f67..a272ecb49 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -594,4 +594,8 @@
   <string name="account_status_bind_failure">Bindungsfehler</string>
   <string name="uninstall">Deinstallieren</string>
   <string name="uninstall_plugins">Wir haben den VoiceRecorder und das ShareLocation Plugin direkt integriert. Die Plugins sind nicht länger erforderlich und sollten deinstalliert werden.</string>
+  <string name="account_status_host_unknown">Domäne wurde nicht erkannt</string>
+  <string name="action_end_conversation_muc">Konferenz verlassen</string>
+  <string name="default_resource"></string>
+  <string name="leave_conference_warning">Willst du die Konferenz wirklich verlassen? Du wirst keine neuen Nachrichten mehr bekommen, bis du der Konferenz erneut beitrittst.</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3556a972f..a8d62e3d3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -630,5 +630,7 @@
     <string name="locating">Locating…</string>
 	<string name="uninstall_plugins">We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins.</string>
 	<string name="uninstall">Uninstall</string>
+	<string name="action_end_conversation_muc">Leave conference</string>
+	<string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string>
 
 </resources>