chore(deps): bump ktorClientCore from 3.1.3 to 3.2.0

Bumps `ktorClientCore` from 3.1.3 to 3.2.0.

Updates `io.ktor:ktor-client-cio` from 3.1.3 to 3.2.0
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/3.1.3...3.2.0)

Updates `io.ktor:ktor-client-content-negotiation` from 3.1.3 to 3.2.0
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/3.1.3...3.2.0)

Updates `io.ktor:ktor-client-core` from 3.1.3 to 3.2.0
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/3.1.3...3.2.0)

Updates `io.ktor:ktor-client-okhttp` from 3.1.3 to 3.2.0
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/3.1.3...3.2.0)

Updates `io.ktor:ktor-serialization-kotlinx-json` from 3.1.3 to 3.2.0
- [Release notes](https://github.com/ktorio/ktor/releases)
- [Changelog](https://github.com/ktorio/ktor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ktorio/ktor/compare/3.1.3...3.2.0)

---
updated-dependencies:
- dependency-name: io.ktor:ktor-client-cio
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.ktor:ktor-client-content-negotiation
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.ktor:ktor-client-core
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.ktor:ktor-client-okhttp
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.ktor:ktor-serialization-kotlinx-json
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

app/build.gradle.kts

@@ -123,7 +123,7 @@ android {
 
     licensee {
         Constants.allowedLicenses.forEach { allow(it) }
-        Constants.allowedLicenseUrls.forEach { allowUrl(it) }
+        allowUrl(Constants.XZING_LICENSE_URL)
     }
 
     applicationVariants.all {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/autotunnel/AutoTunnelService.kt

@@ -73,8 +73,6 @@ class AutoTunnelService : LifecycleService() {
 
     private val binder = LocalBinder(this)
 
-    private var isServiceRunning = false
-
     override fun onCreate() {
         super.onCreate()
         launchWatcherNotification()
@@ -93,8 +91,6 @@ class AutoTunnelService : LifecycleService() {
     }
 
     fun start() {
-        if (isServiceRunning) return
-        isServiceRunning = true
         kotlin
             .runCatching {
                 launchWatcherNotification()
@@ -107,7 +103,6 @@ class AutoTunnelService : LifecycleService() {
     }
 
     fun stop() {
-        isServiceRunning = false
         wakeLock?.let { if (it.isHeld) it.release() }
         stopSelf()
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/GitHubReleaseMapper.kt

@@ -5,11 +5,11 @@ import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
 import kotlin.collections.firstOrNull
 
 object GitHubReleaseMapper {
-    fun toAppUpdate(gitHubRelease: GitHubRelease, newVersion: String): AppUpdate {
+    fun toAppUpdate(gitHubRelease: GitHubRelease): AppUpdate {
         with(gitHubRelease) {
             val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
             return AppUpdate(
-                version = newVersion,
+                version = tagName.removePrefix("v"),
                 title = name ?: "Update $tagName",
                 releaseNotes = body ?: "No release notes provided",
                 apkUrl = apkAsset?.browserDownloadUrl,

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt

@@ -7,7 +7,6 @@ import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
 import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
-import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
@@ -32,30 +31,24 @@ class GitHubUpdateRepository(
     override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
         withContext(ioDispatcher) {
             Timber.i("Checking for update")
-            val isNightly = BuildConfig.VERSION_NAME.contains("nightly")
             val release =
-                if (isNightly) {
-                    gitHubApi.getNightlyRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                if (BuildConfig.VERSION_NAME.contains("nightly")) {
+                    gitHubApi.getNightlyRelease(githubOwner, githubRepo)
                 } else {
-                    gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                    gitHubApi.getLatestRelease(githubOwner, githubRepo)
                 }
             release.map { release ->
                 val apkAsset =
                     release.assets.find { asset ->
-                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
-                            asset.name.endsWith(".apk")
+                        asset.name.startsWith("wgtunnel-full-v") && asset.name.endsWith(".apk")
                     }
                 val newVersion =
-                    apkAsset
-                        ?.name
-                        ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
-                        ?.removeSuffix(".apk") ?: return@map null
+                    apkAsset?.name?.removePrefix("wgtunnel-full-v")?.removeSuffix(".apk")
+                        ?: return@map null
 
                 Timber.i("Latest version: $newVersion, current version: $currentVersion")
-                if (isNightly && newVersion != currentVersion)
-                    return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(release, newVersion)
+                    GitHubReleaseMapper.toAppUpdate(release)
                 } else {
                     null
                 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt

@@ -12,12 +12,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.LinkAnnotation
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextLinkStyles
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -78,41 +72,8 @@ fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: A
                     verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
                     modifier = Modifier.fillMaxWidth(),
                 ) {
-                    val annotatedString = buildAnnotatedString {
-                        append("${uiState.appUpdate?.version ?: ""}\n")
-                        // Add clickable text for second line
-                        withLink(
-                            link =
-                                LinkAnnotation.Clickable(
-                                    tag = stringResource(id = R.string.release_notes),
-                                    linkInteractionListener = {
-                                        val version =
-                                            if (BuildConfig.VERSION_NAME.contains("nightly")) {
-                                                "nightly"
-                                            } else {
-                                                uiState.appUpdate
-                                                    ?.version
-                                                    ?.removePrefix("v")
-                                                    ?.trim() ?: ""
-                                            }
-                                        val url = "${Constants.BASE_RELEASE_URL}$version".trim()
-                                        context.openWebUrl(url)
-                                    },
-                                    styles =
-                                        TextLinkStyles(
-                                            style =
-                                                SpanStyle(
-                                                    color = MaterialTheme.colorScheme.primary,
-                                                    textDecoration = TextDecoration.Underline,
-                                                )
-                                        ),
-                                )
-                        ) {
-                            append(stringResource(R.string.release_notes))
-                        }
-                    }
-
-                    Text(text = annotatedString)
+                    Text(uiState.appUpdate?.version ?: "")
+                    Text(uiState.appUpdate?.releaseNotes ?: "")
                     if (uiState.isLoading) {
                         LinearProgressIndicator(
                             progress = { uiState.downloadProgress },

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/Constants.kt

@@ -38,6 +38,4 @@ object Constants {
     const val GOOGLE_PLAY_FLAVOR = "google"
     const val STANDALONE_FLAVOR = "standalone"
     const val RELEASE = "release"
-
-    const val BASE_RELEASE_URL = "https://github.com/wgtunnel/wgtunnel/releases/tag/"
 }

app/src/main/res/values/strings.xml

@@ -279,5 +279,4 @@
     <string name="use_android_recommended">Use Android\'s recommended method for getting Wi-Fi information, based on
         Android version
     </string>
-    <string name="release_notes">Release notes</string>
 </resources>

buildSrc/src/main/kotlin/Constants.kt

@@ -1,7 +1,7 @@
 object Constants {
-	const val VERSION_NAME = "3.9.3"
+	const val VERSION_NAME = "3.9.2"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 39300
+    const val VERSION_CODE = 39200
     const val TARGET_SDK = 35
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"
@@ -13,5 +13,5 @@ object Constants {
 	const val PRERELEASE = "prerelease"
 
     val allowedLicenses = listOf("MIT", "Apache-2.0", "BSD-3-Clause")
-    val allowedLicenseUrls = listOf("https://github.com/journeyapps/zxing-android-embedded/blob/master/COPYING")
+    const val XZING_LICENSE_URL: String = "https://github.com/journeyapps/zxing-android-embedded/blob/master/COPYING"
 }

fastlane/metadata/android/en-US/changelogs/39300.txt

@@ -1,4 +0,0 @@
-What's new:
-- Fixes deprecate location API bug by adding Wi-Fi info method selection
-- Simplified update check dialog UI
-- Improve auto-tunnel reliability with delayed recheck

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ hiltAndroid = "2.56.2"
 hiltCompiler = "1.2.0"
 junit = "4.13.2"
 kotlinx-serialization-json = "1.8.1"
-ktorClientCore = "3.1.3"
+ktorClientCore = "3.2.0"
 lifecycle-runtime-compose = "2.9.1"
 material3 = "1.3.2"
 navigationCompose = "2.9.0"

networkmonitor/src/main/java/com/zaneschepke/networkmonitor/AndroidNetworkMonitor.kt

@@ -181,16 +181,8 @@ class AndroidNetworkMonitor(context: Context, val wifiDetectionMethod: WifiDetec
                 activeWifiNetworks.add(network.toString())
                 currentSsid =
                     when (wifiDetectionMethod) {
-                        WifiDetectionMethod.DEFAULT -> {
-                            if (networkCapabilities == null) {
-                                Timber.d("Capabilities not available, getting SSID via legacy API")
-                                getWifiSsid()
-                            } else
-                                networkCapabilities.getWifiSsid().also {
-                                    Timber.d("Got SSID from capabilities")
-                                }
-                        }
-
+                        WifiDetectionMethod.DEFAULT ->
+                            networkCapabilities?.getWifiSsid() ?: getWifiSsid()
                         WifiDetectionMethod.LEGACY -> getWifiSsid()
                         WifiDetectionMethod.ROOT -> rootShell.getCurrentWifiName()
                         // TODO implement Shizuku
@@ -220,12 +212,18 @@ class AndroidNetworkMonitor(context: Context, val wifiDetectionMethod: WifiDetec
                     }
                 else ->
                     object : ConnectivityManager.NetworkCallback(FLAG_INCLUDE_LOCATION_INFO) {
+                        private var netCapabilities: NetworkCapabilities? = null
+
+                        override fun onAvailable(network: Network) {
+                            Timber.i("Wi-Fi change detected using new API")
+                            launch { handleOnWifiAvailable(network, netCapabilities) }
+                        }
 
                         override fun onCapabilitiesChanged(
                             network: Network,
                             networkCapabilities: NetworkCapabilities,
                         ) {
-                            launch { handleOnWifiAvailable(network, networkCapabilities) }
+                            launch { wifiMutex.withLock { netCapabilities = networkCapabilities } }
                         }
 
                         override fun onLost(network: Network) {

networkmonitor/src/main/java/com/zaneschepke/networkmonitor/Extensions.kt

@@ -29,7 +29,7 @@ fun NetworkCapabilities.getWifiSsid(): String? {
         val info: WifiInfo
         if (transportInfo is WifiInfo) {
             info = transportInfo as WifiInfo
-            return info.ssid.removeSurrounding("\"").trim()
+            return info.ssid
         }
     }
     return null