Merge 0.7.53 changes

.gitmodules

@@ -1,18 +1,18 @@
 [submodule "main/openvpn"]
 	path = main/src/main/cpp/openvpn
-	url = ../../schwabe/openvpn.git
+	url = https://github.com/schwabe/openvpn.git
 [submodule "main/openssl"]
 	path = main/src/main/cpp/openssl
-	url = ../../schwabe/platform_external_openssl.git
+	url = https://github.com/schwabe/platform_external_openssl.git
 [submodule "main/src/main/cpp/mbedtls"]
 	path = main/src/main/cpp/mbedtls
-	url = ../../ARMmbed/mbedtls.git
+	url = https://github.com/ARMmbed/mbedtls.git
 [submodule "main/src/main/cpp/openvpn3"]
 	path = main/src/main/cpp/openvpn3
-	url = ../../schwabe/openvpn3.git
+	url = https://github.com/schwabe/openvpn3.git
 [submodule "main/src/main/cpp/asio"]
 	path = main/src/main/cpp/asio
-	url = ../../chriskohlhoff/asio/
+	url = https://github.com/chriskohlhoff/asio/
 [submodule "main/src/main/cpp/lz4"]
 	path = main/src/main/cpp/lz4
-	url = ../../lz4/lz4.git
+	url = https://github.com/lz4/lz4.git

README.md

@@ -1,8 +1,19 @@
-OpenVPN for Android
+OpenVPN for Android -EduVPN fork
 =============
 ![build status](https://github.com/schwabe/ics-openvpn/actions/workflows/build.yaml/badge.svg)
 
 
+The EduVPN changes are:
+
+* [Explicitly import support-v4 library](https://github.com/eduvpn/ics-openvpn/commit/b5eb68ea8749314342cd454cdda7766dbb36977c): Support-v4 was removed as a transitional dependency, so we have to import it explicitly now for the parent activity fix.
+* [Librarify module](https://github.com/eduvpn/ics-openvpn/commit/c5af0126f61a893e3e30d69bc5b7e209781e497c): This converts the submodule to a library with as less changes as possible.
+* [Change activity which opens when tapping notification](https://github.com/eduvpn/ics-openvpn/commit/5987a435b6e61548330e6fc0827989e92f44ec41): Opens a different activity when tapping on the notification
+* [Fix parent activity problem](https://github.com/eduvpn/ics-openvpn/commit/8b69a964fe9b30f4430a04df03b1fa444efb0ee7): Opens the correct parent activity from the log window.
+* [Replace switch with if for library project](https://github.com/eduvpn/ics-openvpn/commit/ce38d0b12ff5327b82a8a4aa3993395fddad5eeb)
+* [Move notification creation to library user](https://github.com/eduvpn/ics-openvpn/commit/2d59ce3a81edb0e24b54680544758df4cb658f66)
+* [Do not create unused notification channels](https://github.com/eduvpn/ics-openvpn/commit/9516e5cc6f3816aff61e381f977d95c1e7cc7242): Removes notification channels from notification settings.
+* [Fix build.gradle](https://github.com/eduvpn/ics-openvpn/commit/2a4cf656bf012dd247670808df30e3127e4eecb5)
+
 Description
 ------------
 With the new VPNService of Android API level 14+ (Ice Cream Sandwich) it is possible to create a VPN service that does not need root access. This project is a port of OpenVPN.

build.gradle.kts

@@ -4,6 +4,6 @@
  */
 
 plugins {
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
+    alias(libVersions.plugins.android.library) apply false
+    alias(libVersions.plugins.kotlin.android) apply false
 }

doc/README.txt

@@ -36,7 +36,6 @@ build variants.
 The native build should work with Windows and Linux but is rarely tested
 since my main development platform is macOS.
 
-
 FAQ
 
 Q: Why are you not answering my questions about modifying

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-android-gradle-plugin = "8.5.2"
+android-gradle-plugin = "8.7.0"
 androidx-activity = "1.9.1"
 androidx-annotation = "1.8.2"
 androidx-appcompat = "1.7.0"
@@ -60,4 +60,5 @@ robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
+android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

main/build.gradle.kts

@@ -1,13 +1,14 @@
-import com.android.build.gradle.api.ApplicationVariant
+import com.android.build.gradle.api.LibraryVariant
+
 
 /*
  * Copyright (c) 2012-2016 Arne Schwabe
  * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
  */
 
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
+    alias(libVersions.plugins.android.library)
+    alias(libVersions.plugins.kotlin.android)
     id("checkstyle")
 }
 
@@ -26,9 +27,6 @@ android {
     defaultConfig {
         minSdk = 21
         targetSdk = 35
-        //targetSdkPreview = "UpsideDownCake"
-        versionCode = 208
-        versionName = "0.7.53"
         externalNativeBuild {
             cmake {
                 //arguments+= "-DCMAKE_VERBOSE_MAKEFILE=1"
@@ -48,19 +46,19 @@ android {
     sourceSets {
         getByName("main") {
             assets.srcDirs("src/main/assets", "build/ovpnassets")
-
         }
 
         create("ui") {
         }
-
         create("skeleton") {
         }
 
         getByName("debug") {
+
         }
 
         getByName("release") {
+
         }
     }
 
@@ -122,7 +120,6 @@ android {
         create("ovpn2")
         {
             dimension = "ovpnimpl"
-            versionNameSuffix = "-o2"
             buildConfigField("boolean", "openvpn3", "false")
         }
     }
@@ -144,51 +141,13 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    splits {
-        abi {
-            isEnable = true
-            reset()
-            include("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
-            isUniversalApk = true
-        }
-    }
-
-    packaging {
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
-
-    bundle {
-        codeTransparency {
-            signing {
-                val keystoreTPFile: String? by project
-                storeFile = keystoreTPFile?.let { file(it) }
-                val keystoreTPPassword: String? by project
-                storePassword = keystoreTPPassword
-                val keystoreTPAliasPassword: String? by project
-                keyPassword = keystoreTPAliasPassword
-                val keystoreTPAlias: String? by project
-                keyAlias = keystoreTPAlias
-
-                if (keystoreTPFile?.isEmpty() ?: true)
-                    println("keystoreTPFile not set, disabling transparency signing")
-                if (keystoreTPPassword?.isEmpty() ?: true)
-                    println("keystoreTPPassword not set, disabling transparency signing")
-                if (keystoreTPAliasPassword?.isEmpty() ?: true)
-                    println("keystoreTPAliasPassword not set, disabling transparency signing")
-                if (keystoreTPAlias?.isEmpty() ?: true)
-                    println("keyAlias not set, disabling transparency signing")
-
-            }
-        }
+    // Ensure native build is run before assets, so assets are ready to be merged into the apk
+    libraryVariants.configureEach {
+        mergeAssetsProvider.get().dependsOn(externalNativeBuildProviders)
     }
 }
 
+
 var swigcmd = "swig"
 // Workaround for macOS(arm64) and macOS(intel) since it otherwise does not find swig and
 // I cannot get the Exec task to respect the PATH environment :(
@@ -220,8 +179,8 @@ fun registerGenTask(variantName: String, variantDirName: String): File {
     return baseDir
 }
 
-android.applicationVariants.all(object : Action<ApplicationVariant> {
-    override fun execute(variant: ApplicationVariant) {
+android.libraryVariants.all(object : Action<LibraryVariant> {
+    override fun execute(variant: LibraryVariant) {
         val sourceDir = registerGenTask(variant.name, variant.baseName.replace("-", "/"))
         val task = tasks.named("generateOpenVPN3Swig${variant.name}").get()
 
@@ -232,34 +191,34 @@ android.applicationVariants.all(object : Action<ApplicationVariant> {
 
 dependencies {
     // https://maven.google.com/web/index.html
-    implementation(libs.androidx.annotation)
-    implementation(libs.androidx.core.ktx)
-
-    uiImplementation(libs.android.view.material)
-    uiImplementation(libs.androidx.activity)
-    uiImplementation(libs.androidx.activity.ktx)
-    uiImplementation(libs.androidx.appcompat)
-    uiImplementation(libs.androidx.cardview)
-    uiImplementation(libs.androidx.viewpager2)
-    uiImplementation(libs.androidx.constraintlayout)
-    uiImplementation(libs.androidx.core.ktx)
-    uiImplementation(libs.androidx.fragment.ktx)
-    uiImplementation(libs.androidx.lifecycle.runtime.ktx)
-    uiImplementation(libs.androidx.lifecycle.viewmodel.ktx)
-    uiImplementation(libs.androidx.preference.ktx)
-    uiImplementation(libs.androidx.recyclerview)
-    uiImplementation(libs.androidx.security.crypto)
-    uiImplementation(libs.androidx.webkit)
-    uiImplementation(libs.kotlin)
-    uiImplementation(libs.mpandroidchart)
-    uiImplementation(libs.square.okhttp)
-
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlin)
-    testImplementation(libs.mockito.core)
-    testImplementation(libs.robolectric)
+    implementation(libVersions.androidx.annotation)
+    implementation(libVersions.androidx.core.ktx)
+
+    uiImplementation(libVersions.android.view.material)
+    uiImplementation(libVersions.androidx.activity)
+    uiImplementation(libVersions.androidx.activity.ktx)
+    uiImplementation(libVersions.androidx.appcompat)
+    uiImplementation(libVersions.androidx.cardview)
+    uiImplementation(libVersions.androidx.viewpager2)
+    uiImplementation(libVersions.androidx.constraintlayout)
+    uiImplementation(libVersions.androidx.core.ktx)
+    uiImplementation(libVersions.androidx.fragment.ktx)
+    uiImplementation(libVersions.androidx.lifecycle.runtime.ktx)
+    uiImplementation(libVersions.androidx.lifecycle.viewmodel.ktx)
+    uiImplementation(libVersions.androidx.preference.ktx)
+    uiImplementation(libVersions.androidx.recyclerview)
+    uiImplementation(libVersions.androidx.security.crypto)
+    uiImplementation(libVersions.androidx.webkit)
+    uiImplementation(libVersions.kotlin)
+    uiImplementation(libVersions.mpandroidchart)
+    uiImplementation(libVersions.square.okhttp)
+
+    testImplementation(libVersions.androidx.test.core)
+    testImplementation(libVersions.junit)
+    testImplementation(libVersions.kotlin)
+    testImplementation(libVersions.mockito.core)
+    testImplementation(libVersions.robolectric)
 }
 
 fun DependencyHandler.uiImplementation(dependencyNotation: Any): Dependency? =
-    add("uiImplementation", dependencyNotation)
+    add("uiImplementation", dependencyNotation)