fix: create config not saving
Fixes bug where creating a config from scratch was failing to save Closes #93 Closes #96 Closes #89
This commit is contained in:
parent
d6ee36edc0
commit
d9f3a21cc3
|
@ -70,7 +70,7 @@ jobs:
|
|||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
# fix hardcode changelog file name
|
||||
body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33300.txt
|
||||
body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33400.txt
|
||||
tag_name: ${{ github.ref_name }}
|
||||
name: Release ${{ github.ref_name }}
|
||||
draft: false
|
||||
|
|
|
@ -206,11 +206,13 @@ constructor(
|
|||
val peerList = buildPeerListFromProxyPeers()
|
||||
val wgInterface = buildInterfaceListFromProxyInterface()
|
||||
val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
|
||||
val tunnelConfig =
|
||||
_uiState.value.tunnel?.copy(
|
||||
val tunnelConfig = when(uiState.value.tunnel) {
|
||||
null -> TunnelConfig(name = _uiState.value.tunnelName, wgQuick = config.toWgQuickString())
|
||||
else -> uiState.value.tunnel!!.copy(
|
||||
name = _uiState.value.tunnelName,
|
||||
wgQuick = config.toWgQuickString(),
|
||||
)
|
||||
}
|
||||
updateTunnelConfig(tunnelConfig)
|
||||
Result.Success(Event.Message.ConfigSaved)
|
||||
} catch (e: Exception) {
|
||||
|
|
|
@ -69,11 +69,6 @@ fun WireguardAutoTunnelTheme(
|
|||
window.navigationBarColor = Color.Transparent.toArgb()
|
||||
WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
|
||||
!darkTheme
|
||||
WindowCompat.getInsetsController(
|
||||
window,
|
||||
window.decorView,
|
||||
)
|
||||
.isAppearanceLightNavigationBars = !darkTheme
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
object Constants {
|
||||
const val VERSION_NAME = "3.3.3"
|
||||
const val VERSION_NAME = "3.3.4"
|
||||
const val JVM_TARGET = "17"
|
||||
const val VERSION_CODE = 33300
|
||||
const val VERSION_CODE = 33400
|
||||
const val TARGET_SDK = 34
|
||||
const val MIN_SDK = 26
|
||||
const val APP_ID = "com.zaneschepke.wireguardautotunnel"
|
||||
const val APP_NAME = "wgtunnel"
|
||||
const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.7"
|
||||
const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.8"
|
||||
|
||||
|
||||
const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
Enhancements:
|
||||
- Fixed create config not saving
|
||||
- Bumped versions
|
|
@ -15,7 +15,7 @@ hiltAndroid = "2.50"
|
|||
hiltNavigationCompose = "1.1.0"
|
||||
junit = "4.13.2"
|
||||
kotlinx-serialization-json = "1.6.2"
|
||||
lifecycle-runtime-compose = "2.6.2"
|
||||
lifecycle-runtime-compose = "2.7.0"
|
||||
material-icons-extended = "1.5.4"
|
||||
material3 = "1.1.2"
|
||||
navigationCompose = "2.7.6"
|
||||
|
@ -23,8 +23,8 @@ roomVersion = "2.6.1"
|
|||
timber = "5.0.1"
|
||||
tunnel = "1.0.20230706"
|
||||
androidGradlePlugin = "8.2.1"
|
||||
kotlin = "1.9.21"
|
||||
ksp = "1.9.21-1.0.16"
|
||||
kotlin = "1.9.22"
|
||||
ksp = "1.9.22-1.0.16"
|
||||
composeBom = "2023.10.01"
|
||||
firebaseBom = "32.7.0"
|
||||
compose = "1.5.4"
|
||||
|
|
Loading…
Reference in New Issue