From 9c9143cf19332b54b9c25aa30020dc43f8ef4215 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 9 Dec 2022 21:17:50 +0100 Subject: allow default obfuscation proxy pinning values in RiseupVPN, disallow them in Bitmask --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index af65493f..f23600f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,9 +48,9 @@ android { // decide if we use obfsvpn or shapeshifter as obfs4 lib buildConfigField 'boolean', 'use_obfsvpn', 'true' // obfsvpn Debugging config fields to pin and configure a particular proxy - buildConfigField "String", "obfsvpn_port", '"443"' - buildConfigField "String", "obfsvpn_ip", '"159.223.173.205"' - buildConfigField "String", "obfsvpn_cert", '"8nuAbPJwFrKc/29KcCfL5LBuEWxQrjBASYXdUbwcm9d9pKseGK4r2Tg47e23+t6WghxGGw"' + buildConfigField "String", "obfsvpn_port", '""' + buildConfigField "String", "obfsvpn_ip", '""' + buildConfigField "String", "obfsvpn_cert", '""' buildConfigField 'boolean', 'obfsvpn_use_kcp', 'false' // static update url pointing to the latest stable release apk @@ -147,10 +147,10 @@ android { // decide if we use obfsvpn or shapeshifter as obfs4 lib buildConfigField 'boolean', 'use_obfsvpn', 'true' // obfsvpn Debugging config fields to pin and configure a particular proxy - buildConfigField "String", "obfsvpn_port", '""' - buildConfigField "String", "obfsvpn_ip", '""' - buildConfigField "String", "obfsvpn_cert", '""' - buildConfigField 'boolean', 'obfsvpn_use_kcp', 'false' + buildConfigField "String", "obfsvpn_port", '"443"' + buildConfigField "String", "obfsvpn_ip", '"159.223.173.205"' + buildConfigField "String", "obfsvpn_cert", '"8nuAbPJwFrKc/29KcCfL5LBuEWxQrjBASYXdUbwcm9d9pKseGK4r2Tg47e23+t6WghxGGw"' + buildConfigField 'boolean', 'obfsvpn_use_kcp', 'true' //Build Config Fields for automatic apk update checks -- cgit v1.2.3 From e6639aba950a3a68d44f4d2b586ae37debd87955 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 14 Dec 2022 17:09:58 +0100 Subject: set minSDK version to API 21 / Android 5.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index f23600f3..20d3eb0e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { // however we don't calculate the versionCode here, because F-Droid doesn't like that versionCode 165000 versionName "1.1.6RC1" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 31 vectorDrawables.useSupportLibrary = true buildConfigField 'boolean', 'openvpn3', 'false' -- cgit v1.2.3 From e090b6dd60daca11603b36a197dfe5b05ecc3cb9 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 15 Dec 2022 15:11:22 +0100 Subject: center and capitalize actionbar title, in Bitmask, center but not capitalize title in riseupvpn, allow to configure both properties on compile time in build.gradle --- app/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 20d3eb0e..6c1bf394 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,6 +60,10 @@ android { // the version file contains the versionCode of the latest release buildConfigField "String", "version_file_url", '"https://dl.bitmask.net/client/android/versioncode.txt"' + // if center_actionbar_title is set to true, the actionbar title and subtitle will be centered, otherwise default + buildConfigField 'boolean', 'actionbar_center_title', 'true' + buildConfigField 'boolean', 'actionbar_capitalize_title', 'true' + //ignore the following configs, only used in custom flavor buildConfigField 'String', 'donation_url', 'null' buildConfigField "String", "customProviderUrl", '""' @@ -174,6 +178,12 @@ android { //The duration in days to trigger the donation reminder buildConfigField 'int', 'donation_reminder_duration', '7' + // ActionBar design + + // if center_actionbar_title is set to true, the actionbar title and subtitle will be centered, otherwise default + buildConfigField 'boolean', 'actionbar_center_title', 'true' + buildConfigField 'boolean', 'actionbar_capitalize_title', 'false' + // Build apks for each architecture, in addition to one 'fat' apk containing libraries for all all architectures // enable this if you're publishing in gplay ext { -- cgit v1.2.3