Merge branch 'master' into introduce_cplus_database_version

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/res/values/strings.xml

1 files changed, 36 insertions, 51 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/Config.java b/src/main/java/de/thedevstack/conversationsplus/Config.java
index 2f35ad6e..a6825246 100644
--- a/src/main/java/de/thedevstack/conversationsplus/Config.java
+++ b/src/main/java/de/thedevstack/conversationsplus/Config.java
@@ -34,77 +34,62 @@ public final class Config {
 		return (ENCRYPTION_MASK & (ENCRYPTION_MASK - 1)) != 0;
 	}
 
-	public static final String LOGTAG = "conversations";
+	public static final String LOGTAG = BuildConfig.LOGTAG;
 
+	public static final String DOMAIN_LOCK = BuildConfig.LOCKED_IN_DOMAIN; //only allow account creation for this domain
+	public static final String CONFERENCE_DOMAIN_LOCK = BuildConfig.LOCKED_IN_DOMAIN_CONFERENCES; //only allow conference creation for this domain
+	public static final boolean LOCK_DOMAINS_IN_CONVERSATIONS = BuildConfig.CONTACTS_CONFERENCES_LOCKED_TO_DOMAIN; //only add contacts and conferences for own domains
 
-	public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
-	public static final String CONFERENCE_DOMAIN_LOCK = null; //only allow conference creation for this domain
-	public static final boolean LOCK_DOMAINS_IN_CONVERSATIONS = false; //only add contacts and conferences for own domains
+	public static final boolean LOCK_SETTINGS = BuildConfig.ACCOUNT_SETTINGS_LOCKED; //set to true to disallow account and settings editing
+	public static final boolean DISALLOW_REGISTRATION_IN_UI = BuildConfig.DISALLOW_REGISTRATION_IN_UI; //hide the register checkbox
 
-	public static final boolean LOCK_SETTINGS = false; //set to true to disallow account and settings editing
-	public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
+	public static final boolean ALLOW_NON_TLS_CONNECTIONS = BuildConfig.ALLOW_NON_TLS_CONNECTIONS; //very dangerous. you should have a good reason to set this to true
+	public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = BuildConfig.HIDE_MESSAGE_TEXT_IN_NOTIFICATION;
+	public static final boolean SHOW_CONNECTED_ACCOUNTS = BuildConfig.SHOW_CONNECTED_ACCOUNTS_IN_FOREGROUND_NOTIFICATION; //show number of connected accounts in foreground notification
 
-	public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true
-	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
+	public static final int PING_MAX_INTERVAL = BuildConfig.PING_MAX_INTERVAL;
+	public static final int PING_MIN_INTERVAL = BuildConfig.PING_MIN_INTERVAL;
+	public static final int PING_TIMEOUT = BuildConfig.PING_TIMEOUT;
+	public static final int SOCKET_TIMEOUT = BuildConfig.SOCKET_TIMEOUT;
+	public static final int CONNECT_TIMEOUT = BuildConfig.CONNECT_TIMEOUT;
+	public static final int CONNECT_DISCO_TIMEOUT = BuildConfig.CONNECT_DISCO_TIMEOUT;
+	public static final int CARBON_GRACE_PERIOD = BuildConfig.CARBON_GRACE_PERIOD;
+	public static final int MINI_GRACE_PERIOD = BuildConfig.MINI_GRACE_PERIOD;
 
-	public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false;
+	public static final boolean CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND = BuildConfig.CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND;
 
-	public static final boolean LEGACY_NAMESPACE_HTTP_UPLOAD = false;
+	public static final int AVATAR_SIZE = BuildConfig.AVATAR_SIZE;
+	public static final Bitmap.CompressFormat AVATAR_FORMAT = BuildConfig.AVATAR_FORMAT;
 
-	public static final int PING_MAX_INTERVAL = 300;
-	public static final int PING_MIN_INTERVAL = 30;
-	public static final int PING_TIMEOUT = 15;
-	public static final int SOCKET_TIMEOUT = 15;
-	public static final int CONNECT_TIMEOUT = 90;
-	public static final int CONNECT_DISCO_TIMEOUT = 20;
-	public static final int CARBON_GRACE_PERIOD = 90;
-	public static final int MINI_GRACE_PERIOD = 750;
+	public static final int PAGE_SIZE = BuildConfig.PAGE_SIZE;
+	public static final int MAX_NUM_PAGES = BuildConfig.MAX_NUM_PAGES;
 
-	public static final boolean CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND = false;
+	public static final int REFRESH_UI_INTERVAL = BuildConfig.REFRESH_UI_INTERVAL;
 
-	public static final int AVATAR_SIZE = 192;
-	public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.PNG;
+	public static final boolean DISABLE_PROXY_LOOKUP = BuildConfig.DISABLE_PROXY_LOOKUP; //useful to debug ibb
+	public static final boolean DISABLE_HTTP_UPLOAD = BuildConfig.DISABLE_HTTP_UPLOAD;
+	public static final boolean DISABLE_STRING_PREP = BuildConfig.DISABLE_STRING_PREP; // setting to true might increase startup performance
+	public static final boolean EXTENDED_SM_LOGGING = BuildConfig.EXTENDED_SM_LOGGING; // log stanza counts
+	public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = BuildConfig.RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE; //setting to true might increase power consumption
 
-	public static final int IMAGE_SIZE = 1920;
-	public static final Bitmap.CompressFormat IMAGE_FORMAT = Bitmap.CompressFormat.JPEG;
-	public static final int IMAGE_QUALITY = 75;
-	public static final int IMAGE_MAX_SIZE = 524288; //512KiB
+	public static final boolean ENCRYPT_ON_HTTP_UPLOADED = BuildConfig.ENCRYPT_ON_HTTP_UPLOADED;
 
-	public static final int MESSAGE_MERGE_WINDOW = 20;
+	public static final boolean REPORT_WRONG_FILESIZE_IN_OTR_JINGLE = BuildConfig.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE;
 
-	public static final boolean UTF8_EMOTICONS = false;
+	public static final boolean SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON = BuildConfig.SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON;
 
-	public static final int PAGE_SIZE = 50;
-	public static final int MAX_NUM_PAGES = 3;
+	public static final boolean X509_VERIFICATION = BuildConfig.X509_VERIFICATION_OF_OMEMO_KEYS; //use x509 certificates to verify OMEMO keys
 
-	public static final int PROGRESS_UI_UPDATE_INTERVAL = 750;
-	public static final int REFRESH_UI_INTERVAL = 500;
+	public static final boolean IGNORE_ID_REWRITE_IN_MUC = BuildConfig.IGNORE_ID_REWRITE_IN_MUC;
 
-	public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb
-	public static final boolean DISABLE_HTTP_UPLOAD = false;
-	public static final boolean DISABLE_STRING_PREP = false; // setting to true might increase startup performance
-	public static final boolean EXTENDED_SM_LOGGING = false; // log stanza counts
-	public static final boolean RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE = true; //setting to true might increase power consumption
-
-	public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false;
-
-	public static final boolean REPORT_WRONG_FILESIZE_IN_OTR_JINGLE = true;
-
-	public static final boolean SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON = false;
-
-	public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys
-
-	public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
-
-	public static final boolean REQUEST_DISCO = true;
+	public static final boolean REQUEST_DISCO = BuildConfig.REQUEST_DISCO;
 
 	public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
 	public static final long MAM_MAX_CATCHUP =  MILLISECONDS_IN_DAY / 2;
-	public static final int MAM_MAX_MESSAGES = 500;
+	public static final int MAM_MAX_MESSAGES = BuildConfig.MAM_MAX_MESSAGES;
 
 	public static final ChatState DEFAULT_CHATSTATE = ChatState.ACTIVE;
-	public static final int TYPING_TIMEOUT = 8;
+	public static final int TYPING_TIMEOUT = BuildConfig.TYPING_TIMEOUT;
 
 	public static final String ENABLED_CIPHERS[] = {
 		"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",