diff options
| author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
| commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
| tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
| parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 125facf07..f7ed9f96d 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -37,6 +37,8 @@ public final class Config { public static final int CARBON_GRACE_PERIOD = 90; public static final int MINI_GRACE_PERIOD = 750; + public static final boolean CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND = false; + public static final int AVATAR_SIZE = 640; public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.WEBP; @@ -118,6 +120,5 @@ public final class Config { }; private Config() { - } } |