aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-04-16 18:05:56 +0200
committerChristian S <christian@pix-art.de>2016-04-16 18:05:56 +0200
commit28d318409ddbea90d187a037057c7e8bbde00aa3 (patch)
treebad0ef55019f44bab50dba3f605ccfb9e403a93e /src/main/java
parentf987abe3e5a8329b348e1f22d39f0d147a2be908 (diff)
changed default values to match preferences.xml
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java4
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 8d02f975a..50bb83d30 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -46,11 +46,11 @@ public class AbstractConnectionManager {
public long getAutoAcceptFileSize() {
String config = this.mXmppConnectionService.getPreferences().getString(
- "auto_accept_file_size", "524288");
+ "auto_accept_file_size", "1048576");
try {
return Long.parseLong(config);
} catch (NumberFormatException e) {
- return 524288;
+ return 1048576;
}
}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1db65b486..6b7bf001f 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2738,7 +2738,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public boolean sendChatStates() {
- return getPreferences().getBoolean("chat_states", false);
+ return getPreferences().getBoolean("chat_states", true);
}
public boolean saveEncryptedMessages() {
@@ -2750,7 +2750,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public boolean indicateReceived() {
- return getPreferences().getBoolean("indicate_received", false);
+ return getPreferences().getBoolean("indicate_received", true);
}
public boolean useTorToConnect() {