From e752160ba6eabf59cb65d5df691cd13bfddd84cf Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Thu, 12 Dec 2024 17:54:00 +0100
Subject: [PATCH 1/4] Enable lint option checkAllWarnings

---
 android/app/build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8e252e1fc6a5..cb5737e3ffbb 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -47,7 +47,9 @@ android {
 
         lint {
             lintConfig = file("${rootProject.projectDir}/config/lint.xml")
+            baseline = file("${rootProject.projectDir}/config/lint-baseline.xml")
             abortOnError = true
+            checkAllWarnings = true
             warningsAsErrors = true
             checkDependencies = true
         }

From 246e8f4d815af485bab2e05bcafebab4cf320e1f Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Thu, 12 Dec 2024 17:59:46 +0100
Subject: [PATCH 2/4] Set lint issue NewerVersionAvailable to ignore

---
 android/config/lint.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/config/lint.xml b/android/config/lint.xml
index 981075ff91c3..37ce4b5c8280 100644
--- a/android/config/lint.xml
+++ b/android/config/lint.xml
@@ -14,4 +14,5 @@
     <issue id="AndroidGradlePluginVersion" severity="ignore" />
     <!-- Temporarily ignored since a dependency is checked with older version of lint -->
     <issue id="ObsoleteLintCustomCheck" severity="ignore" />
+    <issue id="NewerVersionAvailable" severity="ignore" />
 </lint>

From edfe445abb973eff944236c012525fd160bf42dc Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Thu, 12 Dec 2024 18:14:13 +0100
Subject: [PATCH 3/4] Generate lint baseline

---
 android/config/lint-baseline.xml | 403 +++++++++++++++++++++++++++++++
 1 file changed, 403 insertions(+)
 create mode 100644 android/config/lint-baseline.xml

diff --git a/android/config/lint-baseline.xml b/android/config/lint-baseline.xml
new file mode 100644
index 000000000000..f43a56a8604e
--- /dev/null
+++ b/android/config/lint-baseline.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.3" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.3)" variant="all" version="8.7.3">
+
+    <issue
+        id="InvalidPackage"
+        message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
+        <location
+            file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/>
+    </issue>
+
+    <issue
+        id="InvalidPackage"
+        message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
+        <location
+            file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-core = { id = &quot;com.google.protobuf&quot;, version.ref = &quot;protobuf&quot; }"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="180"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-core = { id = &quot;com.google.protobuf&quot;, version.ref = &quot;protobuf&quot; }"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="180"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-core = { id = &quot;com.google.protobuf&quot;, version.ref = &quot;protobuf&quot; }"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="180"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-protoc = { id = &quot;com.google.protobuf:protoc&quot;, version.ref = &quot;grpc-protobuf&quot; }"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="181"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-protoc = { id = &quot;com.google.protobuf:protoc&quot;, version.ref = &quot;grpc-protobuf&quot; }"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="181"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies com.google.protobuf but with different version"
+        errorLine1="protobuf-protoc = { id = &quot;com.google.protobuf:protoc&quot;, version.ref = &quot;grpc-protobuf&quot; }"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="181"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-java = { id = &quot;io.grpc:protoc-gen-grpc-java&quot;, version.ref = &quot;grpc&quot; }"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="184"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-java = { id = &quot;io.grpc:protoc-gen-grpc-java&quot;, version.ref = &quot;grpc&quot; }"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="184"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-java = { id = &quot;io.grpc:protoc-gen-grpc-java&quot;, version.ref = &quot;grpc&quot; }"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="184"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-kotlin = { id = &quot;io.grpc:protoc-gen-grpc-kotlin&quot;, version.ref = &quot;grpc-kotlin-jar&quot; }"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="185"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-kotlin = { id = &quot;io.grpc:protoc-gen-grpc-kotlin&quot;, version.ref = &quot;grpc-kotlin-jar&quot; }"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="185"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="SimilarGradleDependency"
+        message="There are multiple dependencies io.grpc but with different version"
+        errorLine1="grpc-protoc-gen-grpc-kotlin = { id = &quot;io.grpc:protoc-gen-grpc-kotlin&quot;, version.ref = &quot;grpc-kotlin-jar&quot; }"
+        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="185"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterNaming"
+        message="Composable lambda parameter should be named `content`"
+        errorLine1="    icon: @Composable (() -> Unit)? = null,"
+        errorLine2="    ~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt"
+            line="79"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterNaming"
+        message="Composable lambda parameter should be named `content`"
+        errorLine1="    leadingIcon: @Composable (() -> Unit)? = null,"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt"
+            line="60"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterNaming"
+        message="Composable lambda parameter should be named `content`"
+        errorLine1="    leadingContent: (@Composable RowScope.() -> Unit)? = null,"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt"
+            line="129"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterNaming"
+        message="Composable lambda parameter should be named `content`"
+        errorLine1="    thumbContent: (@Composable () -> Unit)? = {"
+        errorLine2="    ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt"
+            line="49"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterPosition"
+        message="Composable lambda parameter should be the last parameter so it can be used as a trailing lambda"
+        errorLine1="    leadingIcon: @Composable (() -> Unit)? = null,"
+        errorLine2="    ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt"
+            line="60"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterPosition"
+        message="Composable lambda parameter should be the last parameter so it can be used as a trailing lambda"
+        errorLine1="    leadingContent: (@Composable RowScope.() -> Unit)? = null,"
+        errorLine2="    ~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt"
+            line="129"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="ComposableLambdaParameterPosition"
+        message="Composable lambda parameter should be the last parameter so it can be used as a trailing lambda"
+        errorLine1="    thumbContent: (@Composable () -> Unit)? = {"
+        errorLine2="    ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt"
+            line="49"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateOtherStates` of class `AccountUiStatePreviewParameterProviderKt` requires synthetic accessor"
+        errorLine1="        ) + generateOtherStates()"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/AccountUiStatePreviewParameterProvider.kt"
+            line="39"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `buildTopText` of class `AutoConnectAndLockdownModeScreenKt` requires synthetic accessor"
+        errorLine1="            @Composable { buildTopText(id = R.string.auto_connect_carousel_first_slide_top_text) },"
+        errorLine2="                          ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt"
+            line="302"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `buildTopText` of class `AutoConnectAndLockdownModeScreenKt` requires synthetic accessor"
+        errorLine1="            @Composable { buildTopText(id = R.string.auto_connect_carousel_second_slide_top_text) },"
+        errorLine2="                          ~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt"
+            line="308"
+            column="27"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `buildLockdownTopText` of class `AutoConnectAndLockdownModeScreenKt` requires synthetic accessor"
+        errorLine1="        annotatedTopText = @Composable { buildLockdownTopText() },"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt"
+            line="313"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateOtherStates` of class `ConnectUiStatePreviewParameterProviderKt` requires synthetic accessor"
+        errorLine1="    override val values = sequenceOf(ConnectUiState.INITIAL) + generateOtherStates()"
+        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt"
+            line="10"
+            column="64"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateCountryCode` of class `RelayItemPreviewDataKt` requires synthetic accessor"
+        errorLine1="            id = name.generateCountryCode(),"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt"
+            line="18"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateRelayItemCity` of class `RelayItemPreviewDataKt` requires synthetic accessor"
+        errorLine1="                    generateRelayItemCity("
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt"
+            line="21"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateCountryCode` of class `RelayItemPreviewDataKt` requires synthetic accessor"
+        errorLine1="                        name.generateCountryCode(),"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt"
+            line="23"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `sort` of class `SplitTunnelingViewModelStateKt` requires synthetic accessor"
+        errorLine1="                    excludedApps = excluded.sort(),"
+        errorLine2="                                   ~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt"
+            line="25"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `sort` of class `SplitTunnelingViewModelStateKt` requires synthetic accessor"
+        errorLine1="                        if (showSystemApps) {"
+        errorLine2="                        ^">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt"
+            line="27"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateTunnelEndpoint` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            endpoint = generateTunnelEndpoint(quantumResistant = quantumResistant, daita = false),"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="21"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateLocation` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            location = generateLocation(),"
+        errorLine2="                       ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="22"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateFeatureIndicators` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            featureIndicators = generateFeatureIndicators(featureIndicators),"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="23"
+            column="33"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateTunnelEndpoint` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            endpoint = generateTunnelEndpoint(quantumResistant = quantumResistant, daita = true),"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="28"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateLocation` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            location = generateLocation(),"
+        errorLine2="                       ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="29"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `generateFeatureIndicators` of class `TunnelStatePreviewDataKt` requires synthetic accessor"
+        errorLine1="            featureIndicators = generateFeatureIndicators(featureIndicators),"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/TunnelStatePreviewData.kt"
+            line="30"
+            column="33"/>
+    </issue>
+
+</issues>

From 81e63f07bc61b7ac5943339266d7078ad4c1ff14 Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Thu, 12 Dec 2024 14:36:33 +0100
Subject: [PATCH 4/4] Change CI lint task to only run on app module

Limit linting to the app module in CI since it has
the `checkDependencies` option set.
---
 .github/workflows/android-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 5e784b5d6904..28114f961519 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -240,7 +240,7 @@ jobs:
               :lib:shared:testDebugUnitTest
           - gradle-task: :test:arch:test --rerun-tasks
           - gradle-task: detekt
-          - gradle-task: lint
+          - gradle-task: :app:lint
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
       # https://github.com/actions/runner/issues/863