Merge branch 'try-replacing-ktfmt-with-detekt-droid-559'

Author: albin-mullvad

.github/workflows/android-app.yml

@@ -243,6 +243,15 @@ jobs:
           build-root-directory: android
           execution-only-caches: true
 
+      - name: Run detekt
+        uses: burrunan/gradle-cache-action@v1
+        with:
+          job-id: jdk17
+          arguments: detekt
+          gradle-version: wrapper
+          build-root-directory: android
+          execution-only-caches: true
+
       # Running the AGP lint here rather than in the separate lint workflow
       # (android-kotlin-format-check.yml) since it's easier to make use of the running container,
       # cache and previously ran tasks.

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt

@@ -149,7 +149,6 @@ class RedeemVoucherDialogTest {
         }
 
     companion object {
-        private const val REDEEM_BUTTON_TEXT = "Redeem"
         private const val CANCEL_BUTTON_TEXT = "Cancel"
         private const val GOT_IT_BUTTON_TEXT = "Got it!"
         private const val DUMMY_VOUCHER = "DUMMY____VOUCHER"

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt

@@ -8,7 +8,12 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color

android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt

@@ -1,3 +1,5 @@
+@file:Suppress("MagicNumber")
+
 package net.mullvad.mullvadvpn.util
 
 import kotlinx.coroutines.Deferred

android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PackageManagerExtensions.kt

@@ -7,12 +7,10 @@ import androidx.core.graphics.drawable.toBitmapOrNull
 fun PackageManager.getApplicationIconBitmapOrNull(packageName: String): Bitmap? =
     try {
         getApplicationIcon(packageName).toBitmapOrNull()
-    } catch (e: Exception) {
+    } catch (e: PackageManager.NameNotFoundException) {
         // Name not found is thrown if the application is not installed
+        null
+    } catch (e: IllegalArgumentException) {
         // IllegalArgumentException is thrown if the application has an invalid icon
-        when (e) {
-            is PackageManager.NameNotFoundException,
-            is IllegalArgumentException -> null
-            else -> throw e
-        }
+        null
     }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import java.net.InetAddress
+import java.net.UnknownHostException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.BufferOverflow
@@ -223,7 +224,7 @@ class VpnSettingsViewModel(
     private fun List<String>.asInetAddressList(): List<InetAddress> {
         return try {
             map { InetAddress.getByName(it) }
-        } catch (ex: Exception) {
+        } catch (ex: UnknownHostException) {
             Log.e("mullvad", "Error parsing the DNS address list.")
             emptyList()
         }

android/app/src/test/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSourceTest.kt

@@ -13,7 +13,6 @@ import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
 import kotlin.reflect.KClass
-import net.mullvad.mullvadvpn.lib.common.util.JobTracker
 import net.mullvad.mullvadvpn.lib.ipc.Event
 import net.mullvad.mullvadvpn.lib.ipc.EventDispatcher
 import net.mullvad.mullvadvpn.lib.ipc.Request
@@ -22,8 +21,6 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 class ServiceConnectionDeviceDataSourceTest {
-    private val tracker = JobTracker()
-
     @MockK private lateinit var mockedMainLooper: Looper
 
     @MockK private lateinit var mockedDispatchingHandler: EventDispatcher

android/build.gradle.kts

@@ -1,16 +1,19 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
     id(Dependencies.Plugin.dependencyCheckId) version Versions.Plugin.dependencyCheck apply false
     id(Dependencies.Plugin.gradleVersionsId) version Versions.Plugin.gradleVersions
     id(Dependencies.Plugin.ktfmtId) version Versions.Plugin.ktfmt apply false
+    id(Dependencies.Plugin.detektId) version Versions.Plugin.detekt
 }
 
 buildscript {
     repositories {
         google()
         mavenCentral()
         maven(Repositories.GradlePlugins)
+        gradlePluginPortal()
     }
 
     dependencies {
@@ -27,6 +30,28 @@ buildscript {
     }
 }
 
+val baselineFile = file("$rootDir/config/baseline.xml")
+val configFile = files("$rootDir/config/detekt.yml")
+
+val projectSource = file(projectDir)
+val buildFiles = "**/build/**"
+
+detekt {
+    buildUponDefaultConfig = true
+    allRules = false
+    config.setFrom(configFile)
+    source.setFrom(projectSource)
+    baseline = baselineFile
+    parallel = true
+    ignoreFailures = false
+    autoCorrect = true
+}
+
+tasks.withType<Detekt>().configureEach {
+    // Ignore generated files from the build directory, e.g files created by ksp.
+    exclude(buildFiles)
+}
+
 allprojects {
     apply(plugin = Dependencies.Plugin.dependencyCheckId)
     apply(plugin = Dependencies.Plugin.ktfmtId)

android/buildSrc/src/main/kotlin/Dependencies.kt

@@ -116,6 +116,7 @@ object Dependencies {
         const val dependencyCheck =
             "org.owasp:dependency-check-gradle:${Versions.Plugin.dependencyCheck}"
         const val dependencyCheckId = "org.owasp.dependencycheck"
+        const val detektId = "io.gitlab.arturbosch.detekt"
         const val gradleVersionsId = "com.github.ben-manes.versions"
         const val junit5 = "de.mannodermaus.android-junit5"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"

android/buildSrc/src/main/kotlin/Extensions.kt

@@ -11,8 +11,8 @@ fun String.isNonStableVersion(): Boolean {
     return isNonStable
 }
 
-fun DependencyHandler.`leakCanaryImplementation`(dependencyNotation: Any): Dependency? =
+fun DependencyHandler.leakCanaryImplementation(dependencyNotation: Any): Dependency? =
     add("leakCanaryImplementation", dependencyNotation)
 
-fun DependencyHandler.`playImplementation`(dependencyNotation: Any): Dependency? =
+fun DependencyHandler.playImplementation(dependencyNotation: Any): Dependency? =
     add("playImplementation", dependencyNotation)

android/buildSrc/src/main/kotlin/Versions.kt

@@ -50,6 +50,7 @@ object Versions {
         const val androidAapt = "$android-10154469"
         const val playPublisher = "3.8.4"
         const val dependencyCheck = "8.3.1"
+        const val detekt = "1.23.4"
         const val gradleVersions = "0.47.0"
         const val junit5 = "1.10.0.0"
         const val ktfmt = "0.16.0"