From 894b5892a977c6b7ac52f07e00f452a44bdc1168 Mon Sep 17 00:00:00 2001
From: fiaxh <github@lightrise.org>
Date: Tue, 23 Feb 2016 15:30:41 +0100
Subject: Retry decryption from message menu

---
 src/main/res/menu/message_context.xml | 4 ++++
 src/main/res/values/strings.xml       | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 0d4e66efc..4096297c7 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/retry_decryption"
+        android:title="Retry decryption"
+        android:visible="false"/>
     <item
         android:id="@+id/correct_message"
         android:title="@string/correct_message"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 48c3de6c7..8e3629ca2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -97,7 +97,6 @@
 	<string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
 	<string name="no_pgp_keys">No OpenPGP Keys found</string>
 	<string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
-	<string name="encrypted_message_received"><i>Encrypted message received. Touch to decrypt.</i></string>
 	<string name="pref_general">General</string>
 	<string name="pref_xmpp_resource">XMPP resource</string>
 	<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
-- 
cgit v1.2.3


From bbede8bbeb8728aac35856cc41eabea899056d74 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 24 Feb 2016 16:53:19 +0100
Subject: optionally lock conference domains as well and hide known domains in
 ui

---
 src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8e3629ca2..a25c1a849 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -522,6 +522,8 @@
 	<string name="username">Username</string>
 	<string name="username_hint">Username</string>
 	<string name="invalid_username">This is not a valid username</string>
+	<string name="conference_name">Conference name</string>
+	<string name="invalid_conference_name">This is not a valid conference name</string>
 	<string name="download_failed_server_not_found">Download failed: Server not found</string>
 	<string name="download_failed_file_not_found">Download failed: File not found</string>
 	<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
-- 
cgit v1.2.3


From 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 26 Feb 2016 09:48:58 +0100
Subject: disallow message correction by default. fixes #1720

---
 src/main/res/xml/preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index e8747a8bb..357995735 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -147,7 +147,7 @@
                     android:summary="@string/pref_remove_trusted_certificates_summary"
                     android:title="@string/pref_remove_trusted_certificates_title"/>
                 <CheckBoxPreference
-                    android:defaultValue="true"
+                    android:defaultValue="false"
                     android:key="allow_message_correction"
                     android:title="@string/pref_allow_message_correction"
                     android:summary="@string/pref_allow_message_correction_summary"/>
-- 
cgit v1.2.3


From c17b19c40c9b66c3892f1a9d7a6548b7f72b0330 Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Sat, 27 Feb 2016 10:50:34 +0100
Subject: Revert "disallow message correction by default. fixes #1720"

This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291.
---
 src/main/res/xml/preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 357995735..e8747a8bb 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -147,7 +147,7 @@
                     android:summary="@string/pref_remove_trusted_certificates_summary"
                     android:title="@string/pref_remove_trusted_certificates_title"/>
                 <CheckBoxPreference
-                    android:defaultValue="false"
+                    android:defaultValue="true"
                     android:key="allow_message_correction"
                     android:title="@string/pref_allow_message_correction"
                     android:summary="@string/pref_allow_message_correction_summary"/>
-- 
cgit v1.2.3