diff options
| author | Emīls <emils@mullvad.net> | 2024-11-12 12:47:43 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2024-11-12 12:47:43 +0100 |
| commit | eb88e35d7b3c94ad95d4fac23f85e3400d0654bb (patch) | |
| tree | d076477a9b6d43000cb1cd4746192f536d178d56 /android | |
| parent | 13209073f803095c351f90acb106aa6d69e69333 (diff) | |
| parent | 1c5b020af047c354fa43c6bfbad0e4659f9f3c1f (diff) | |
| download | mullvadvpn-eb88e35d7b3c94ad95d4fac23f85e3400d0654bb.tar.xz mullvadvpn-eb88e35d7b3c94ad95d4fac23f85e3400d0654bb.zip | |
Merge branch 'update-to-maybenot-v2-ios-914'
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 bea4a33de8..fa098430df 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_v2").asFile +val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines").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 9351d67f81..ebdcbec780 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_v2" +private const val MAYBENOT_MACHINES_ASSET_NAME = "maybenot_machines" class MullvadVpnService : TalpidVpnService() { |