diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-30 20:03:05 +0100 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-30 20:03:05 +0100 |
| commit | f73d69de09f6080e30099e1f7eb68451b4e93317 (patch) | |
| tree | d52b2e0d2eb160133f1bdb4adcd6352060ed787c /android | |
| parent | 6dd4dc87e1f49abbad35b83cfe9db9d89b04ccde (diff) | |
| parent | 37e7be1c39e31644eb63b34402927f9fc66a2f93 (diff) | |
| download | mullvadvpn-f73d69de09f6080e30099e1f7eb68451b4e93317.tar.xz mullvadvpn-f73d69de09f6080e30099e1f7eb68451b4e93317.zip | |
Merge branch 'readd-maybenot-machines-v1'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 2 | ||||
| -rw-r--r-- | android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index fa098430df..bea4a33de8 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -18,7 +18,7 @@ plugins { val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get() val relayListPath = extraAssetsDirectory.file("relays.json").asFile -val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines").asFile +val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines_v2").asFile val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/" val extraJniDirectory = layout.buildDirectory.dir("extraJni").get() diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index ebdcbec780..9351d67f81 100644 --- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -32,7 +32,7 @@ import org.koin.android.ext.android.getKoin import org.koin.core.context.loadKoinModules private const val RELAY_LIST_ASSET_NAME = "relays.json" -private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines" +private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines_v2" class MullvadVpnService : TalpidVpnService() { |