mirror of
https://github.com/wgtunnel/android.git
synced 2026-07-03 14:07:49 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 99cd1d917a | |||
| 7940b97329 | |||
| 99419ebe9f | |||
| 3e2ffc1b64 |
@@ -72,7 +72,7 @@ jobs:
|
||||
outputs:
|
||||
UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Set up JDK 17
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
has_new_commits: ${{ steps.check.outputs.new_commits }}
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v4
|
||||
- name: Check for new commits
|
||||
id: check
|
||||
env:
|
||||
@@ -41,7 +41,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install system dependencies
|
||||
run: |
|
||||
|
||||
@@ -10,7 +10,7 @@ jobs:
|
||||
format_check:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
|
||||
@@ -72,7 +72,7 @@ jobs:
|
||||
name: publish-github
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event_name == 'push' && github.ref || 'main' }}
|
||||
- name: Install system dependencies
|
||||
@@ -189,7 +189,7 @@ jobs:
|
||||
KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
|
||||
+14
-11
@@ -138,19 +138,22 @@ constructor(
|
||||
}
|
||||
|
||||
val host =
|
||||
{
|
||||
val parts = allowedIpStr.split("/")
|
||||
val internalIp = if (parts.size == 2) parts[0] else allowedIpStr
|
||||
tunnelConf.pingTarget
|
||||
?: {
|
||||
val parts = allowedIpStr.split("/")
|
||||
val internalIp =
|
||||
if (parts.size == 2) parts[0] else allowedIpStr
|
||||
|
||||
val prefix =
|
||||
if (parts.size == 2) parts[1].toIntOrNull() ?: 32 else 32
|
||||
if (prefix <= 1) {
|
||||
tunnelConf.pingTarget ?: CLOUDFLARE_IPV4_IP
|
||||
} else {
|
||||
internalIp.removeSurrounding("[", "]")
|
||||
val prefix =
|
||||
if (parts.size == 2) parts[1].toIntOrNull() ?: 32
|
||||
else 32
|
||||
if (prefix <= 1) {
|
||||
CLOUDFLARE_IPV4_IP
|
||||
} else {
|
||||
internalIp.removeSurrounding("[", "]")
|
||||
}
|
||||
}
|
||||
}
|
||||
.invoke()
|
||||
.invoke()
|
||||
|
||||
val attemptTime = System.currentTimeMillis()
|
||||
runCatching {
|
||||
|
||||
+1
-1
@@ -82,7 +82,7 @@ fun ConfigScreen(
|
||||
if (save) {
|
||||
try {
|
||||
appViewModel.handleEvent(
|
||||
AppEvent.SaveTunnelUniquely(
|
||||
AppEvent.SaveTunnel(
|
||||
uiState.configProxy.buildTunnelConfFromState(uiState.tunnelName, tunnelConf)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -263,7 +263,7 @@ constructor(
|
||||
saveSettings(
|
||||
state.appSettings.copy(tunnelPingTimeoutSeconds = event.timeout)
|
||||
)
|
||||
is AppEvent.SaveTunnelUniquely -> saveTunnelsUniquely(listOf(event.tunnel))
|
||||
is AppEvent.SaveTunnel -> saveTunnel(event.tunnel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ sealed class AppEvent {
|
||||
|
||||
data class SetTheme(val theme: Theme) : AppEvent()
|
||||
|
||||
data class SaveTunnelUniquely(val tunnel: TunnelConf) : AppEvent()
|
||||
data class SaveTunnel(val tunnel: TunnelConf) : AppEvent()
|
||||
|
||||
data class SaveMonitoringSettings(
|
||||
val pingInterval: Int,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
object Constants {
|
||||
const val VERSION_NAME = "3.9.4"
|
||||
const val VERSION_CODE = 39400
|
||||
const val VERSION_NAME = "3.9.5"
|
||||
const val VERSION_CODE = 39500
|
||||
const val TARGET_SDK = 35
|
||||
const val MIN_SDK = 26
|
||||
const val APP_ID = "com.zaneschepke.wireguardautotunnel"
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
What's new:
|
||||
- Fix for tunnel sort bug
|
||||
- Improved location permissions flow
|
||||
- Location permission detection and notifications
|
||||
- Fix for AndroidTV apps detection for split tunneling
|
||||
- Improved tunnel monitoring and reboot recovery
|
||||
- Fix tunnel slow reconnect from sleep
|
||||
@@ -1,7 +1,7 @@
|
||||
[versions]
|
||||
accompanist = "0.37.3"
|
||||
activityCompose = "1.10.1"
|
||||
amneziawgAndroid = "1.6.1"
|
||||
amneziawgAndroid = "1.6.2"
|
||||
androidx-junit = "1.3.0"
|
||||
icmp4a = "1.0.0"
|
||||
roomdatabasebackup = "1.1.0"
|
||||
|
||||
Reference in New Issue
Block a user