diff options
| author | Christian S <christian@pix-art.de> | 2015-12-16 19:55:31 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-16 19:55:31 +0100 |
| commit | 081c5e4a1c8de7053d394d60c9afc82b9ea6a892 (patch) | |
| tree | d5680195ef37ac6b9da16f309a49419ac7ed01d9 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | efaa1223b6e002d5afba0462d57ff30be91dd0e5 (diff) | |
| parent | 43dd681239ea5a287f5761597de5dcdc4daed3de (diff) | |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 8173c05d7..430980a20 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -14,7 +14,10 @@ public final class Config { public static final boolean HIDE_PGP_IN_UI = false; //some more consumer focused clients might want to disable OpenPGP public static final boolean HIDE_ENCRYPTION_IN_UI = false; //completely hide encryption options in menu bar - public static final boolean PARANOID_MODE = false; //disables ability to send unencrypted 1-on-1 chats and forces TOR + + public static final boolean FORCE_ENCRYPTION = false; //disables ability to send unencrypted 1-on-1 + public static final boolean FORCE_ORBOT = false; // always use TOR + public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false; public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification @@ -25,6 +28,8 @@ public final class Config { public static final int PING_TIMEOUT = 15; public static final int SOCKET_TIMEOUT = 15; public static final int CONNECT_TIMEOUT = 60; + public static final int CONNECT_DISCO_TIMEOUT = 20; + public static final int CARBON_GRACE_PERIOD = 90; public static final int MINI_GRACE_PERIOD = 750; |