diff options
Diffstat (limited to 'android/lib')
20 files changed, 63 insertions, 23 deletions
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts index e6753a306a..46554cf956 100644 --- a/android/lib/billing/build.gradle.kts +++ b/android/lib/billing/build.gradle.kts @@ -20,7 +20,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt index 9ccd1d77ff..77eaea03a6 100644 --- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt +++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt @@ -7,6 +7,7 @@ import com.android.billingclient.api.BillingClient.BillingResponseCode import com.android.billingclient.api.BillingClientStateListener import com.android.billingclient.api.BillingFlowParams import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.PendingPurchasesParams import com.android.billingclient.api.ProductDetails import com.android.billingclient.api.ProductDetailsResult import com.android.billingclient.api.PurchasesResult @@ -62,7 +63,9 @@ class BillingRepository(context: Context) { init { billingClient = BillingClient.newBuilder(context) - .enablePendingPurchases() + .enablePendingPurchases( + PendingPurchasesParams.newBuilder().enableOneTimeProducts().build() + ) .setListener(purchaseUpdateListener) .build() } diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts index 33107baba5..733d2b9111 100644 --- a/android/lib/common-test/build.gradle.kts +++ b/android/lib/common-test/build.gradle.kts @@ -15,7 +15,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts index a686f023a1..2c4fbe0233 100644 --- a/android/lib/common/build.gradle.kts +++ b/android/lib/common/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts index d8b02aad1d..e1807c9d34 100644 --- a/android/lib/daemon-grpc/build.gradle.kts +++ b/android/lib/daemon-grpc/build.gradle.kts @@ -21,7 +21,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt index 4e74a8f78b..7961b5460c 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt @@ -143,6 +143,7 @@ class ManagementService( private var job: Job? = null // We expect daemon to create the rpc socket file on the path provided on initialisation + @Suppress("DEPRECATION") private val channel = UdsChannelBuilder.forPath( rpcSocketFile.absolutePath, diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt index a0e5bd5fd1..8ce5a10876 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/ManagedChannel.kt @@ -3,13 +3,11 @@ package net.mullvad.mullvadvpn.lib.daemon.grpc.util import co.touchlab.kermit.Logger import io.grpc.ConnectivityState import io.grpc.ManagedChannel -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.isActive import kotlinx.coroutines.suspendCancellableCoroutine -@OptIn(ExperimentalCoroutinesApi::class) internal fun ManagedChannel.connectivityFlow(): Flow<ConnectivityState> { return callbackFlow { var currentState = getState(false) @@ -20,7 +18,9 @@ internal fun ManagedChannel.connectivityFlow(): Flow<ConnectivityState> { currentState = suspendCancellableCoroutine { notifyWhenStateChanged(currentState) { // If we are cancelled we will just log - it.resume(getState(false)) { Logger.w("Resume while cancelled", it) } + it.resume(getState(false)) { cause, value, _ -> + Logger.w("Resume while cancelled, value: $value", cause) + } } } } diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts index cf632b1419..7b6e82b769 100644 --- a/android/lib/endpoint/build.gradle.kts +++ b/android/lib/endpoint/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt index 9e46c5dda8..d8ba956188 100644 --- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt +++ b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt @@ -13,6 +13,6 @@ fun Intent.getApiEndpointConfigurationExtras(): ApiEndpointOverride? { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { getParcelableExtra(OVERRIDE_API_EXTRA_NAME, ApiEndpointOverride::class.java) } else { - getParcelableExtra(OVERRIDE_API_EXTRA_NAME) + @Suppress("DEPRECATION") getParcelableExtra(OVERRIDE_API_EXTRA_NAME) } } diff --git a/android/lib/intent-provider/build.gradle.kts b/android/lib/intent-provider/build.gradle.kts index 03cafa5970..66c9b6ff74 100644 --- a/android/lib/intent-provider/build.gradle.kts +++ b/android/lib/intent-provider/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts index 8367a435de..a0253ebc4d 100644 --- a/android/lib/map/build.gradle.kts +++ b/android/lib/map/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } buildFeatures { compose = true diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt index a1e411bece..05b8d59701 100644 --- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt +++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt @@ -4,10 +4,10 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.viewinterop.AndroidView import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver +import androidx.lifecycle.compose.LocalLifecycleOwner import net.mullvad.mullvadvpn.lib.map.data.CameraPosition import net.mullvad.mullvadvpn.lib.map.data.GlobeColors import net.mullvad.mullvadvpn.lib.map.data.MapViewState diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts index 543852a360..c961dcc32f 100644 --- a/android/lib/model/build.gradle.kts +++ b/android/lib/model/build.gradle.kts @@ -22,7 +22,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Constraint.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Constraint.kt index 95e7d95154..79ccd6899e 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Constraint.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Constraint.kt @@ -1,12 +1,8 @@ package net.mullvad.mullvadvpn.lib.model -import arrow.optics.optics - -@optics sealed interface Constraint<out T> { data object Any : Constraint<Nothing> - @optics data class Only<T>(val value: T) : Constraint<T> { companion object } diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts index 8fda0feacd..421ade90d4 100644 --- a/android/lib/payment/build.gradle.kts +++ b/android/lib/payment/build.gradle.kts @@ -18,7 +18,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts index 9a208f29eb..c162b25a0c 100644 --- a/android/lib/resource/build.gradle.kts +++ b/android/lib/resource/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("lint.xml") diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts index 1665c2c663..4be82a9eb2 100644 --- a/android/lib/shared/build.gradle.kts +++ b/android/lib/shared/build.gradle.kts @@ -18,7 +18,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts index 3b4d422af8..a5cd613de1 100644 --- a/android/lib/talpid/build.gradle.kts +++ b/android/lib/talpid/build.gradle.kts @@ -16,7 +16,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts index 592cb25337..9c1ac32b09 100644 --- a/android/lib/theme/build.gradle.kts +++ b/android/lib/theme/build.gradle.kts @@ -18,7 +18,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = Versions.jvmTarget } + kotlinOptions { + jvmTarget = Versions.jvmTarget + allWarningsAsErrors = true + } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index 33fdfd4ded..2407fda047 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -50,6 +50,7 @@ data class Dimensions( val notificationIconPadding: Dp = 10.dp, val notificationStatusIconSize: Dp = 10.dp, val obfuscationNavigationBoxWidth: Dp = 80.dp, + val privacyPolicyIconSize: Dp = 16.dp, val problemReportIconToTitlePadding: Dp = 60.dp, val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp, val relayCircleSize: Dp = 16.dp, |