aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-27 10:50:34 +0100
committerChristian S <christian@pix-art.de>2016-02-27 10:50:34 +0100
commitc17b19c40c9b66c3892f1a9d7a6548b7f72b0330 (patch)
tree44f54bc99d5792df9d527d02bc8b8b6a750338c8 /src/main
parentc393e6089177f31683c4cecfdb359802de1b5e0c (diff)
Revert "disallow message correction by default. fixes #1720"
This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291.
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java2
-rw-r--r--src/main/res/xml/preferences.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index dde8ad280..8df3808c7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2629,7 +2629,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public boolean allowMessageCorrection() {
- return getPreferences().getBoolean("allow_message_correction", false);
+ return getPreferences().getBoolean("allow_message_correction", true);
}
public boolean sendChatStates() {
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"/>