diff options
Diffstat (limited to 'android/lib')
5 files changed, 21 insertions, 50 deletions
diff --git a/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt b/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt new file mode 100644 index 0000000000..2de7e829dd --- /dev/null +++ b/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt @@ -0,0 +1,10 @@ +package net.mullvad.mullvadvpn.lib.endpoint + +class ApiEndpointFromIntentHolder { + var apiEndpointOverride: ApiEndpointOverride? = null + private set + + fun setApiEndpointOverride(apiEndpointOverride: ApiEndpointOverride?) { + this.apiEndpointOverride = apiEndpointOverride + } +} diff --git a/android/lib/endpoint/src/release/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt b/android/lib/endpoint/src/release/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt new file mode 100644 index 0000000000..9fa617276b --- /dev/null +++ b/android/lib/endpoint/src/release/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointFromIntentHolder.kt @@ -0,0 +1,11 @@ +package net.mullvad.mullvadvpn.lib.endpoint + +// Overridding the API endpoint is not supported in release builds +class ApiEndpointFromIntentHolder { + val apiEndpointOverride: ApiEndpointOverride? = null + + @Suppress("UnusedParameter") + fun setApiEndpointOverride(apiEndpointOverride: ApiEndpointOverride?) { + // No-op + } +} diff --git a/android/lib/intent-provider/build.gradle.kts b/android/lib/intent-provider/build.gradle.kts deleted file mode 100644 index 66c9b6ff74..0000000000 --- a/android/lib/intent-provider/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) -} - -android { - namespace = "net.mullvad.mullvadvpn.lib.intent" - compileSdk = Versions.compileSdkVersion - buildToolsVersion = Versions.buildToolsVersion - - defaultConfig { minSdk = Versions.minSdkVersion } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - - kotlinOptions { - jvmTarget = Versions.jvmTarget - allWarningsAsErrors = true - } - - lint { - lintConfig = file("${rootProject.projectDir}/config/lint.xml") - abortOnError = true - warningsAsErrors = true - } - buildFeatures { buildConfig = true } -} - -dependencies { - implementation(libs.kotlin.stdlib) - implementation(libs.kotlinx.coroutines.android) -} diff --git a/android/lib/intent-provider/src/main/AndroidManifest.xml b/android/lib/intent-provider/src/main/AndroidManifest.xml deleted file mode 100644 index cc947c5679..0000000000 --- a/android/lib/intent-provider/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ -<manifest /> diff --git a/android/lib/intent-provider/src/main/kotlin/net/mullvad/mullvadvpn/lib/intent/IntentProvider.kt b/android/lib/intent-provider/src/main/kotlin/net/mullvad/mullvadvpn/lib/intent/IntentProvider.kt deleted file mode 100644 index bd6e716d8d..0000000000 --- a/android/lib/intent-provider/src/main/kotlin/net/mullvad/mullvadvpn/lib/intent/IntentProvider.kt +++ /dev/null @@ -1,14 +0,0 @@ -package net.mullvad.mullvadvpn.lib.intent - -import android.content.Intent -import kotlinx.coroutines.flow.MutableStateFlow - -class IntentProvider { - private val _intents = MutableStateFlow<Intent?>(null) - - fun setStartIntent(intent: Intent?) { - _intents.tryEmit(intent) - } - - fun getLatestIntent(): Intent? = _intents.value -} |