move some more config variables to match different app modes

This commit is contained in:
Christian Schneppe 2019-11-02 16:07:46 +01:00
parent 7bb48465e2
commit d69583c3f3
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
2 changed files with 10 additions and 3 deletions

View file

@ -114,6 +114,10 @@ android {
applicationId "de.pixart.messenger"
multiDexEnabled true
buildConfigField("String", "LOGTAG", '"Pix-Art_Messenger"')
buildConfigField("String", "DOMAIN_LOCK", 'null')
buildConfigField("String", "MAGIC_CREATE_DOMAIN", '"blabber.im"')
buildConfigField("int", "ENCRYPTION_MASK", 'UNENCRYPTED | OPENPGP | OTR | OMEMO')
buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
resValue "string", "applicationId", applicationId
resValue "string", "app_name", "Pix-Art Messenger"
@ -147,7 +151,10 @@ android {
applicationId = 'de.schulchat.messenger'
resValue "string", "applicationId", applicationId
resValue "string", "app_name", "Schulchat Messenger"
buildConfigField("String", "DOMAIN_LOCK", '"kurswahl-online.de"')
buildConfigField("String", "MAGIC_CREATE_DOMAIN", '"kurswahl-online.de"')
buildConfigField("String", "LOGTAG", '"Schulchat_Messenger"')
buildConfigField("int", "ENCRYPTION_MASK", 'UNENCRYPTED')
versionCode = 1
versionName = '1.0.0'
}

View file

@ -17,7 +17,7 @@ public final class Config {
private static final int OTR = 4;
private static final int OMEMO = 8;
private static final int ENCRYPTION_MASK = UNENCRYPTED | OPENPGP | OTR | OMEMO;
private static final int ENCRYPTION_MASK = BuildConfig.ENCRYPTION_MASK;
public static boolean supportUnencrypted() {
return (ENCRYPTION_MASK & UNENCRYPTED) != 0;
@ -50,8 +50,8 @@ public final class Config {
public static final String XMPP_IP = null; //BuildConfig.XMPP_IP; // set to null means disable
public static final Integer[] XMPP_Ports = null; //BuildConfig.XMPP_Ports; // set to null means disable
public static final String DOMAIN_LOCK = null; //BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain
public static final String MAGIC_CREATE_DOMAIN = "blabber.im";
public static final String DOMAIN_LOCK = BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain
public static final String MAGIC_CREATE_DOMAIN = BuildConfig.MAGIC_CREATE_DOMAIN; //"blabber.im";
public static final String QUICKSY_DOMAIN = "quicksy.im";
public static final String CHANNEL_DISCOVERY = "https://search.jabber.network";
public static final String DEFAULT_INVIDIOUS_HOST = "invidio.us";