zaneschepke
/
wgtunnel
mirror of https://github.com/zaneschepke/wgtunnel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Zane Schepke 2024-01-19 20:52:11 -05:00
parent d6ee36edc0
commit d9f3a21cc3
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/android.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
# fix hardcode changelog file name # 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 }} tag_name: ${{ github.ref_name }}
name: Release ${{ github.ref_name }} name: Release ${{ github.ref_name }}
draft: false draft: false

6
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigViewModel.kt
View File

@ -206,11 +206,13 @@ constructor(
val peerList = buildPeerListFromProxyPeers() val peerList = buildPeerListFromProxyPeers()
val wgInterface = buildInterfaceListFromProxyInterface() val wgInterface = buildInterfaceListFromProxyInterface()
val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build() val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
val tunnelConfig = val tunnelConfig = when(uiState.value.tunnel) {
_uiState.value.tunnel?.copy( null -> TunnelConfig(name = _uiState.value.tunnelName, wgQuick = config.toWgQuickString())
else -> uiState.value.tunnel!!.copy(
name = _uiState.value.tunnelName, name = _uiState.value.tunnelName,
wgQuick = config.toWgQuickString(), wgQuick = config.toWgQuickString(),
) )
}
updateTunnelConfig(tunnelConfig) updateTunnelConfig(tunnelConfig)
Result.Success(Event.Message.ConfigSaved) Result.Success(Event.Message.ConfigSaved)
} catch (e: Exception) { } catch (e: Exception) {

5
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt
View File

@ -69,11 +69,6 @@ fun WireguardAutoTunnelTheme(
window.navigationBarColor = Color.Transparent.toArgb() window.navigationBarColor = Color.Transparent.toArgb()
WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
!darkTheme !darkTheme
WindowCompat.getInsetsController(
window,
window.decorView,
)
.isAppearanceLightNavigationBars = !darkTheme
} }
} }

6
buildSrc/src/main/kotlin/Constants.kt
View File

@ -1,12 +1,12 @@
object Constants { object Constants {
const val VERSION_NAME = "3.3.3" const val VERSION_NAME = "3.3.4"
const val JVM_TARGET = "17" const val JVM_TARGET = "17"
const val VERSION_CODE = 33300 const val VERSION_CODE = 33400
const val TARGET_SDK = 34 const val TARGET_SDK = 34
const val MIN_SDK = 26 const val MIN_SDK = 26
const val APP_ID = "com.zaneschepke.wireguardautotunnel" const val APP_ID = "com.zaneschepke.wireguardautotunnel"
const val APP_NAME = "wgtunnel" 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" const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"

3
fastlane/metadata/android/en-US/changelogs/33400.txt Normal file
View File

@ -0,0 +1,3 @@
Enhancements:
- Fixed create config not saving
- Bumped versions

6
gradle/libs.versions.toml
View File

@ -15,7 +15,7 @@ hiltAndroid = "2.50"
hiltNavigationCompose = "1.1.0" hiltNavigationCompose = "1.1.0"
junit = "4.13.2" junit = "4.13.2"
kotlinx-serialization-json = "1.6.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" material-icons-extended = "1.5.4"
material3 = "1.1.2" material3 = "1.1.2"
navigationCompose = "2.7.6" navigationCompose = "2.7.6"
@ -23,8 +23,8 @@ roomVersion = "2.6.1"
timber = "5.0.1" timber = "5.0.1"
tunnel = "1.0.20230706" tunnel = "1.0.20230706"
androidGradlePlugin = "8.2.1" androidGradlePlugin = "8.2.1"
kotlin = "1.9.21" kotlin = "1.9.22"
ksp = "1.9.21-1.0.16" ksp = "1.9.22-1.0.16"
composeBom = "2023.10.01" composeBom = "2023.10.01"
firebaseBom = "32.7.0" firebaseBom = "32.7.0"
compose = "1.5.4" compose = "1.5.4"