aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-22 21:31:02 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-22 21:31:02 +0200
commit0f388f9cc0229581a3d0bd7c5dfc5b7ad7b8bd3a (patch)
treef2071e8402e9c87224733922fa7b08036b8b9dc9 /src/main/java/eu/siacs/conversations/Config.java
parentcf956b605c459bd8d8e08ced00a06207bbd8cdc4 (diff)
don't make OMEMO default
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index eebeb54f1..54a272a23 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -33,6 +33,8 @@ public final class Config {
return (ENCRYPTION_MASK & (ENCRYPTION_MASK - 1)) != 0;
}
+ public static boolean AlwayUseOMEMO = false; //true makes OMEMO as default on every 1 to 1 chat
+
public static final String LOGTAG = "Pix-Art Messenger";
public static final String XMPP_IP = "185.26.156.37"; // set to null means disable
@@ -78,7 +80,7 @@ public final class Config {
public static final int MESSAGE_MERGE_WINDOW = 20;
- public static final int PAGE_SIZE = 20;
+ public static final int PAGE_SIZE = 50;
public static final int MAX_NUM_PAGES = 3;
public static final int REFRESH_UI_INTERVAL = 500;