diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 16:38:37 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 16:39:13 +0100 |
| commit | b1f1c773f8a484bd2820b59d883fcc602ddb2ef8 (patch) | |
| tree | 83445fb0c88d384819526ea30a6afed1d90a3403 | |
| parent | d69583c3f3156aca438a023062632d9d6f6ecc7f (diff) | |
move some more config variables to match different app modes
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/Config.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/util/IntroHelper.java | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 47f3a2b81..2828e6db7 100644 --- a/build.gradle +++ b/build.gradle @@ -116,8 +116,7 @@ android { 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("boolean", "SHOW_INTRO", 'true') buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"') resValue "string", "applicationId", applicationId resValue "string", "app_name", "Pix-Art Messenger" @@ -154,7 +153,7 @@ android { 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') + buildConfigField("boolean", "SHOW_INTRO", "false") versionCode = 1 versionName = '1.0.0' } diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index dbac68194..19af8b31b 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -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 = BuildConfig.ENCRYPTION_MASK; + private static final int ENCRYPTION_MASK = UNENCRYPTED | OPENPGP | OTR | OMEMO; public static boolean supportUnencrypted() { return (ENCRYPTION_MASK & UNENCRYPTED) != 0; @@ -56,6 +56,7 @@ public final class Config { public static final String CHANNEL_DISCOVERY = "https://search.jabber.network"; public static final String DEFAULT_INVIDIOUS_HOST = "invidio.us"; public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox + public static final boolean SHOW_INTRO = BuildConfig.SHOW_INTRO; public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false; diff --git a/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java b/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java index 817551c4f..f4a593739 100644 --- a/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java +++ b/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import de.pixart.messenger.Config; import de.pixart.messenger.ui.IntroActivity; import static de.pixart.messenger.ui.IntroActivity.ACTIVITY; @@ -19,7 +20,7 @@ public class IntroHelper { String INTRO = "intro_shown_on_activity_" + activityname + "_MultiMode_" + mode_multi; boolean SHOW_INTRO = getPrefs.getBoolean(INTRO, true); - if (SHOW_INTRO) { + if (SHOW_INTRO && Config.SHOW_INTRO) { final Intent i = new Intent(activity, IntroActivity.class); i.putExtra(ACTIVITY, activityname); i.putExtra(MULTICHAT, mode_multi); |