Merge branch 'master' into introduce_cplus_database_version

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

1 files changed, 51 insertions, 0 deletions

diff --git a/configuration.gradle b/configuration.gradle
new file mode 100644
index 00000000..fbb02b6e
--- /dev/null
+++ b/configuration.gradle
@@ -0,0 +1,51 @@
+
+apply plugin: 'com.android.application'
+
+
+android {
+
+    productFlavors {
+        free {
+            buildConfigField 'String', 'LOGTAG', '"conversationsplus"' // JUST AS EXAMPLE
+        }
+    }
+
+    defaultConfig {
+        buildConfigField 'String', 'LOGTAG', '"conversationsplus"'
+        buildConfigField 'String', 'LOCKED_IN_DOMAIN', 'null' // only allow account creation for this domain
+        buildConfigField 'String', 'LOCKED_IN_DOMAIN_CONFERENCES', 'null' // only allow conference creation for this domain
+        buildConfigField 'boolean', 'CONTACTS_CONFERENCES_LOCKED_TO_DOMAIN', 'false' // only add contacts and conferences for own domains
+        buildConfigField 'boolean', 'ACCOUNT_SETTINGS_LOCKED', 'false' // set to true to disallow account and settings editing
+        buildConfigField 'boolean', 'DISALLOW_REGISTRATION_IN_UI', 'false' // hide the register checkbox
+        buildConfigField 'boolean', 'ALLOW_NON_TLS_CONNECTIONS', 'false'  // very dangerous. you should have a good reason to set this to true
+        buildConfigField 'boolean', 'HIDE_MESSAGE_TEXT_IN_NOTIFICATION', 'false'  //
+        buildConfigField 'boolean', 'SHOW_CONNECTED_ACCOUNTS_IN_FOREGROUND_NOTIFICATION', 'false'  // show number of connected accounts in foreground notification
+        buildConfigField 'int', 'PING_MAX_INTERVAL', '300' // maximum ping interval in seconds
+        buildConfigField 'int', 'PING_MIN_INTERVAL', '30' // minimum ping interval in seconds
+        buildConfigField 'int', 'PING_TIMEOUT', '15' // ping timeout in seconds
+        buildConfigField 'int', 'SOCKET_TIMEOUT', '15' // socket timeout in seconds
+        buildConfigField 'int', 'CONNECT_TIMEOUT', '90' // connect timeout in seconds
+        buildConfigField 'int', 'CONNECT_DISCO_TIMEOUT', '20' // disco timeout while connecting in seconds
+        buildConfigField 'int', 'CARBON_GRACE_PERIOD', '90' // carbon grace period in seconds
+        buildConfigField 'int', 'MINI_GRACE_PERIOD', '750' // whatever ???
+        buildConfigField 'boolean', 'CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND', 'false' //
+        buildConfigField 'int', 'AVATAR_SIZE', '192' // height and width of an avatar
+        buildConfigField 'int', 'PAGE_SIZE', '50' // maximum messages per page
+        buildConfigField 'int', 'MAX_NUM_PAGES', '3' // maximum pages
+        buildConfigField 'int', 'REFRESH_UI_INTERVAL', '500' // Refresh UI interval in milliseonds
+        buildConfigField 'android.graphics.Bitmap.CompressFormat', 'AVATAR_FORMAT', 'android.graphics.Bitmap.CompressFormat.PNG' // Format of an avatar
+        buildConfigField 'boolean', 'DISABLE_PROXY_LOOKUP', 'false' // disables proxy lookup for JingleConnections - useful to debug ibb
+        buildConfigField 'boolean', 'DISABLE_HTTP_UPLOAD', 'false' //
+        buildConfigField 'boolean', 'DISABLE_STRING_PREP', 'false' // setting to true might increase startup performance
+        buildConfigField 'boolean', 'EXTENDED_SM_LOGGING', 'false' // log stanza counts
+        buildConfigField 'boolean', 'RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE', 'true' // setting to true might increase power consumption
+        buildConfigField 'boolean', 'ENCRYPT_ON_HTTP_UPLOADED', 'false' //
+        buildConfigField 'boolean', 'REPORT_WRONG_FILESIZE_IN_OTR_JINGLE', 'true' //
+        buildConfigField 'boolean', 'SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON', 'false' //
+        buildConfigField 'boolean', 'X509_VERIFICATION_OF_OMEMO_KEYS', 'false' // use x509 certificates to verify OMEMO keys
+        buildConfigField 'boolean', 'IGNORE_ID_REWRITE_IN_MUC', 'true' //
+        buildConfigField 'boolean', 'REQUEST_DISCO', 'true' //
+        buildConfigField 'int', 'MAM_MAX_MESSAGES', '500' // maximum number of messages to load via MAM
+        buildConfigField 'int', 'TYPING_TIMEOUT', '8' // Typing timeout in seconds
+    }
+}
\ No newline at end of file