diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-24 11:02:18 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-24 11:02:18 -0300 |
| commit | 5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee (patch) | |
| tree | 23ca0a8a499c1369648d803d082c5f5b6a16a056 | |
| parent | c85a6908d8c2a085a6100e6053ffffd7861e98e2 (diff) | |
| parent | 163029ce0a78b1e8bcdcc932d16632b0bfe49545 (diff) | |
| download | mullvadvpn-5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee.tar.xz mullvadvpn-5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee.zip | |
Merge branch 'load-jni-library-sooner'
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee3c0eb65..5c67e9a09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ Line wrap the file at 100 chars. Th ### Changed - Use gRPC for communication between frontends and the backend instead of JSON-RPC. +### Fixed +#### Android +- Fix possible crash when starting the app, caused by trying to use JNI functions before the library + is loaded. + ## [2020.6-beta1] - 2020-08-20 ### Added diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 17003b5440..6ba1a42c1e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -28,6 +28,10 @@ class MullvadVpnService : TalpidVpnService() { val KEY_CONNECT_ACTION = "net.mullvad.mullvadvpn.connect_action" val KEY_DISCONNECT_ACTION = "net.mullvad.mullvadvpn.disconnect_action" + + init { + System.loadLibrary("mullvad_jni") + } } private enum class PendingAction { |