Skip to content

Commit

Permalink
Merge remote-tracking branch 'francois/master' into feature/embed_wg
Browse files Browse the repository at this point in the history
  • Loading branch information
dzolnai committed Oct 18, 2024
2 parents 471eb14 + fc1416b commit 4b68ac5
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
34 changes: 22 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@ $ git clone --recurse-submodules https://codeberg.org/eduVPN/android

# Download the app

## Stores

[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid"
height="80">](https://f-droid.org/packages/nl.eduvpn.app/)
[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
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.
Expand Down Expand Up @@ -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

Expand All @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_app_git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build_app_tar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion create_release_tar.sh
Original file line number Diff line number Diff line change
@@ -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

###############################################################################
Expand Down
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/31.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- update WireGuard, OpenVPN and "common" sub-modules
- Move backend methods to background threads
- More crash fixes
- small README updates

0 comments on commit 4b68ac5

Please sign in to comment.