aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-07-17 22:42:37 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-07-17 22:42:37 +0200
commite90e333f292301c1b46237a72756ab0eeabce52e (patch)
tree27cd0e58dd448b017c8b69b1ed20c1d2b1f639ac /src/main
parenteb3ac1c326faf03e4299c39544b2bb09f2ffb6fe (diff)
allow message correction by default since security implications are negligible
Conversations only allows correction of the *last* message. so nudging a message into oblivion by adding a message correction doesn't work. also conversations checks the fingerprint for encrypted messages
Diffstat (limited to 'src/main')
-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 02c0650c..766b1473 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2825,7 +2825,7 @@ public class XmppConnectionService extends Service {
}
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 b81c78d4..68b2f73a 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -179,7 +179,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"/>