diff --git a/.gitmodules b/.gitmodules index c09634ad..7093e588 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "ics-openvpn"] path = ics-openvpn - url = https://github.com/eduvpn/ics-openvpn + url = https://codeberg.org/eduVPN/ics-openvpn [submodule "common/libs/eduvpn-common"] path = common/libs/eduvpn-common url = https://github.com/eduvpn/eduvpn-common [submodule "wireguard"] path = wireguard - url = https://codeberg.org/fkooman/wireguard-android + url = https://codeberg.org/eduVPN/wireguard-android diff --git a/CHANGES.md b/CHANGES.md index 5e4d6539..a8bdd19c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # Changelog +## 3.3.4 (...) +- update WireGuard, OpenVPN and "common" sub-modules +- Move backend methods to background threads +- More crash fixes +- small README updates + ## 3.3.3 (2024-10-04) - embed WireGuard for Android - fix crash when reconnecting diff --git a/README.md b/README.md index 5e25b39d..90c91754 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ $ git clone --recurse-submodules https://codeberg.org/eduVPN/android # Download the app +## Stores + [Get it on F-Droid](https://f-droid.org/packages/nl.eduvpn.app/) @@ -17,6 +19,11 @@ $ git clone --recurse-submodules https://codeberg.org/eduVPN/android alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=nl.eduvpn.app) +## APKs + +* [APKs for eduVPN](https://app.eduvpn.org/#android) +* [APKs for Let's Connect!](https://app.letsconnect-vpn.org/#android) + # Running with Android Studio First install the `swig` and `go` packages with your operating system package manager. @@ -47,10 +54,10 @@ Anything lower was not tested, but 1GB of memory definitely does not work. The builder will spew a lot of backtraces/warnings, but does seem to complete eventually. -We last tested this on 2023-10-20 with Fedora 38. +We last tested this on 2024-10-07 with Fedora 40. We removed the Debian instructions as building on Debian no longer works on -Debian 11 (as of 2023-03-06) and I have no desire to investigate fixing this. +Debian 11 (as of 2023-03-06). ## Dependencies @@ -68,22 +75,25 @@ $ sudo dnf -y install \ ncurses-compat-libs \ ninja-build \ cmake \ - pv + pv \ + gcc-c++ ``` ## Key Store Generate a key store for signing the Android application: - $ keytool \ - -genkey \ - -keystore ${HOME}/android.jks \ - -keyalg RSA \ - -keysize 4096 \ - -sigalg SHA256withRSA \ - -dname "CN=eduVPN for Android" \ - -validity 10000 \ - -alias eduVPN +```bash +$ keytool \ + -genkey \ + -keystore ${HOME}/android.jks \ + -keyalg RSA \ + -keysize 4096 \ + -sigalg SHA256withRSA \ + -dname "CN=eduVPN for Android" \ + -validity 10000 \ + -alias eduVPN +``` Additional documentation [here](https://developer.android.com/studio/publish/app-signing#signing-manually). diff --git a/app/build.gradle b/app/build.gradle index cf1d557b..964dbd86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "nl.eduvpn.app" minSdkVersion 21 targetSdkVersion 34 - versionCode 30 - versionName "3.3.3" + versionCode 31 + versionName "3.3.4" ndkVersion "26.1.10909125" vectorDrawables.useSupportLibrary = true diff --git a/build_app_git.sh b/build_app_git.sh index d315efea..f0e895c7 100755 --- a/build_app_git.sh +++ b/build_app_git.sh @@ -8,7 +8,7 @@ SDK_DIR=${HOME}/android-sdk KEY_STORE=${HOME}/android.jks GIT_REPO=https://codeberg.org/eduVPN/android -#GIT_TAG=3.3.3 +#GIT_TAG=3.3.4 GIT_TAG=master PROJECT_DIR=${HOME}/Projects diff --git a/build_app_tar.sh b/build_app_tar.sh index de42a04c..4c049bd3 100755 --- a/build_app_tar.sh +++ b/build_app_tar.sh @@ -7,7 +7,7 @@ SDK_DIR=${HOME}/android-sdk KEY_STORE=${HOME}/android.jks -V=3.3.3 +V=3.3.4 DOWNLOAD_URL=https://codeberg.org/eduVPN/android/releases/download/${V}/eduvpn-android-${V}.tar.xz PROJECT_DIR=${HOME}/Projects diff --git a/create_release_tar.sh b/create_release_tar.sh index c7badd92..2858c62f 100755 --- a/create_release_tar.sh +++ b/create_release_tar.sh @@ -1,7 +1,7 @@ #!/bin/sh GIT_REPO=https://codeberg.org/eduVPN/android -GIT_TAG=3.3.3 +GIT_TAG=3.3.4 #GIT_TAG=master ############################################################################### diff --git a/fastlane/metadata/android/en-US/changelogs/31.txt b/fastlane/metadata/android/en-US/changelogs/31.txt new file mode 100644 index 00000000..787664e5 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/31.txt @@ -0,0 +1,4 @@ +- update WireGuard, OpenVPN and "common" sub-modules +- Move backend methods to background threads +- More crash fixes +- small README updates