Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 0.7.53 changes #1767

Closed
wants to merge 64 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
c5af012
Librarify module
Nov 8, 2016
5987a43
Change activity which opens when tapping notification
Nov 8, 2016
8b69a96
Fix parent activity problem.
Sep 14, 2016
fe180e7
Merge tag 'v0.6.73'
dzolnai Jul 31, 2017
b5eb68e
Explicitly import support-v4 library needed for NavUtils
dzolnai Jul 31, 2017
8311f3e
Update documentation
dzolnai Jul 31, 2017
004d99d
Merge pull request #1 from dzolnai/master
dzolnai Aug 1, 2017
7692d19
Rewrite build-native.bat to mimic build-native.sh
anton-vaytulevich-rubius Jun 29, 2017
10a8fff
Remove info on failing Windows build from README
anton-vaytulevich-rubius Jun 29, 2017
46b28b5
Add short command path when building on Windows
anton-vaytulevich-rubius Jun 29, 2017
6eed7cb
Fix windows 'build-native.bat' (#727)
mbg033 Jul 18, 2017
9a46701
route-noulll has no parameter (closes #730)
schwabe Jul 23, 2017
63a0a0c
Don't ask for a gateway we don't use and need. (closes #734)
schwabe Jul 26, 2017
a3429d1
Silently ignore parsing error if DNS server looks like IPv6 (and hope…
schwabe Jul 31, 2017
0815b1f
Clarify how the files names should look like
schwabe Jul 31, 2017
08bb0dc
Fix rare crash with LogFragment
dzolnai Sep 12, 2017
a1ad358
Merge pull request #2 from dzolnai/master
dzolnai Oct 12, 2017
0040605
Readd support-v4 which got accidentally removed
dzolnai Oct 12, 2017
89dccb0
Merge pull request #3 from dzolnai/master
dzolnai Oct 12, 2017
f31002d
Merge tag 'v0.7.4'
dzolnai Apr 27, 2018
336c0ba
Replace switch with if for library project
dzolnai Apr 27, 2018
a708c0b
Update README
dzolnai Apr 27, 2018
ce38d0b
Merge pull request #4 from eduvpn/f/0.7.4
dzolnai Apr 30, 2018
3f5d25c
merge upstream v0.7.5
May 4, 2018
828afa2
Merge pull request #5 from eduvpn/ics-openvpn-v0.7.5
dzolnai May 4, 2018
ef9739e
Merge tag 'v0.7.8'
dzolnai Oct 28, 2019
20cf5f5
Fix building this OpenVPN tag
dzolnai Oct 28, 2019
c0a7f5a
Enable NoOpenVPN3
dzolnai Oct 29, 2019
58ab748
Merge tag 'v0.7.10' into feature/version_0.7.10
dzolnai Oct 29, 2019
4bcaadf
Convert our code to AndroidX
dzolnai Oct 29, 2019
ca83c96
Add task dependencies
dzolnai Nov 1, 2019
073f450
Replace gitmodules URL to https
dzolnai Feb 3, 2020
bbdb5cf
Merge tag 'v0.7.13' into feature/version_0.7.13
dzolnai Feb 6, 2020
df4cab8
Update commits for v0.7.13
dzolnai Feb 6, 2020
f7a36b6
Revert "Update commits for v0.7.13"
dzolnai Feb 6, 2020
751b49a
Fix build issue
dzolnai Feb 6, 2020
3baf9ce
eduvpn#242 Fix Gradle warnings
dzolnai Mar 20, 2020
512accc
Merge tag 'v0.7.15-production' into feature/version_0.7.15
dzolnai Jun 8, 2020
76eafaf
Specify NDK version
dzolnai Jul 21, 2020
8b1d33a
Merge remote-tracking branch 'upstream/master' into feature/version_0…
dzolnai Aug 25, 2020
eff4293
Merge pull request #9 from eduvpn/feature/version_0.7.17a
dzolnai Aug 25, 2020
d047469
#schwabe/1225: Disable building of 'nopie' assets
dzolnai Aug 25, 2020
25314bf
Merge pull request #10 from eduvpn/f/nopie_fix
dzolnai Aug 25, 2020
d6ec55b
Merge remote-tracking branch 'upstream/master'
Mar 18, 2021
90d350e
Merge pull request #11 from fkooman/master
Mar 18, 2021
95df4be
Change FileProvider authority
dzolnai Apr 13, 2021
c9d2c41
Merge pull request #12 from eduvpn/f/fix_provider
dzolnai Apr 13, 2021
9c6e1b5
Merge tag 'v0.7.34'
dzolnai Apr 22, 2022
2a4cf65
Fix build.gradle
dzolnai Apr 22, 2022
c8e8ff9
Update README.md
fantostisch Dec 2, 2021
2d59ce3
Move notification creation to library user
fantostisch Dec 2, 2021
b59f377
Update README.md with notification patch
fantostisch Dec 2, 2021
9516e5c
Do not create unused notification channels
fantostisch Dec 5, 2021
e5a1eb1
Update README.md
fantostisch Dec 5, 2021
28b1d75
Merge pull request #16 from eduvpn/feature/version_0_7_34
dzolnai Apr 25, 2022
79bf99c
Update README.md with latest patches
fantostisch Nov 2, 2022
1dda1f6
Undo random change to French strings.xml
fantostisch Nov 2, 2022
55db463
Merge tag 'v0.7.42' into version_0_7_42
fantostisch Nov 2, 2022
54a2557
Merge tag 'v0.7.43' into HEAD
fantostisch Jan 6, 2023
fe0f470
Update to v0.7.49
dzolnai Oct 20, 2023
9563cc8
Merge tag 'v0.7.50' into HEAD
dzolnai Dec 14, 2023
3520bde
Merge tag 'v0.7.51'
dzolnai Jun 7, 2024
ea9b4e4
Merge tag 'v0.7.53' into HEAD
dzolnai Oct 16, 2024
f33220c
Bump AGP version
dzolnai Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 0 additions & 1 deletion doc/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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" }
121 changes: 40 additions & 81 deletions main/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}

Expand All @@ -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"
Expand All @@ -48,19 +46,19 @@ android {
sourceSets {
getByName("main") {
assets.srcDirs("src/main/assets", "build/ovpnassets")

}

create("ui") {
}

create("skeleton") {
}

getByName("debug") {

}

getByName("release") {

}
}

Expand Down Expand Up @@ -122,7 +120,6 @@ android {
create("ovpn2")
{
dimension = "ovpnimpl"
versionNameSuffix = "-o2"
buildConfigField("boolean", "openvpn3", "false")
}
}
Expand All @@ -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 :(
Expand Down Expand Up @@ -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()

Expand All @@ -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)
Loading
Loading