diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/build.gradle.kts | 16 | ||||
| -rw-r--r-- | main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java | 8 |
2 files changed, 21 insertions, 3 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 60392602..3442b8a5 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -98,15 +98,27 @@ android { } } } - flavorDimensions += listOf("implementation") + flavorDimensions += listOf("implementation", "ovpnimpl") productFlavors { create("ui") { dimension = "implementation" - buildConfigField("boolean", "openvpn3", "true") } + create("skeleton") { dimension = "implementation" + } + + create("ovpn23") + { + dimension = "ovpnimpl" + buildConfigField("boolean", "openvpn3", "true") + } + + create("ovpn2") + { + dimension = "ovpnimpl" + versionNameSuffix = "-o2" buildConfigField("boolean", "openvpn3", "false") } } diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java index 182c1a56..de6c83d8 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java @@ -31,6 +31,7 @@ import androidx.fragment.app.Fragment; import com.android.vending.billing.IInAppBillingService; +import de.blinkt.openvpn.BuildConfig; import de.blinkt.openvpn.core.NativeUtils; import org.json.JSONException; import org.json.JSONObject; @@ -86,7 +87,12 @@ public class AboutFragment extends Fragment implements View.OnClickListener { TextView osslVer = v.findViewById(R.id.openssl_version); verO2.setText(String.format(Locale.US, "OpenVPN version: %s", NativeUtils.getOpenVPN2GitVersion())); - verO3.setText(String.format(Locale.US, "OpenVPN3 core version: %s", NativeUtils.getOpenVPN3GitVersion())); + if (BuildConfig.openvpn3) + verO3.setText(String.format(Locale.US, "OpenVPN3 core version: %s", NativeUtils.getOpenVPN3GitVersion())); + else + verO3.setText("(OpenVPN 2.x only build. No OpenVPN 3.x core in this app)"); + + osslVer.setText(String.format(Locale.US, "OpenSSL version: %s", NativeUtils.getOpenSSLVersion())); |