stephen/StikDebug
1
0
Fork 0
mirror of https://github.com/StikDebug/StikDebug.git synced 2026-10-16 20:30:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't detect wifi as we have stosvpn now

Browse source
This commit is contained in:
Huge_Black 2025-03-31 21:58:45 +08:00
parent 1a946c422c
commit f0f143feed
1 changed files with 2 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
StikJIT/StikJITApp.swift
View file

@ -43,14 +43,6 @@ struct HeartbeatApp: App {
if isLoading { if isLoading {
LoadingView() LoadingView()
.onAppear { .onAppear {
if !isConnectedToWifi() {
showAlert(title: "Connection Required",
message: "Please connect to WiFi to continue",
showOk: true) { _ in
exit(0)
}
return
}
startProxy() { result, error in startProxy() { result, error in
if result { if result {
checkVPNConnection() { result, vpn_error in checkVPNConnection() { result, vpn_error in
@ -170,7 +162,7 @@ struct HeartbeatApp: App {
DispatchQueue.main.async { DispatchQueue.main.async {
// Only call back if we haven't already // Only call back if we haven't already
if timeoutWorkItem?.isCancelled == false { if timeoutWorkItem?.isCancelled == false {
callback(false, "[TIMEOUT] Wireguard is not connected. Try closing this app, turn Wireguard off and back on.") callback(false, "[TIMEOUT] The loopback VPN is not connected. Try closing this app, turn it off and back on.")
} }
} }
} }
@ -191,7 +183,7 @@ struct HeartbeatApp: App {
connection?.cancel() connection?.cancel()
DispatchQueue.main.async { DispatchQueue.main.async {
if error == NWError.posix(.ETIMEDOUT) { if error == NWError.posix(.ETIMEDOUT) {
callback(false, "Wireguard is not connected. Try closing the app, turn it off and back on.") callback(false, "The loopback VPN is not connected. Try closing the app, turn it off and back on.")
} else if error == NWError.posix(.ECONNREFUSED) { } else if error == NWError.posix(.ECONNREFUSED) {
callback(false, "Wifi is not connected. StikJIT won't work on cellular data.") callback(false, "Wifi is not connected. StikJIT won't work on cellular data.")
} else { } else {
@ -211,27 +203,6 @@ struct HeartbeatApp: App {
DispatchQueue.global().asyncAfter(deadline: .now() + 20, execute: workItem) DispatchQueue.global().asyncAfter(deadline: .now() + 20, execute: workItem)
} }
} }
func isConnectedToWifi() -> Bool {
var isWifi = false
let monitor = NWPathMonitor(requiredInterfaceType: .wifi)
let semaphore = DispatchSemaphore(value: 0)
monitor.pathUpdateHandler = { path in
isWifi = path.status == .satisfied
semaphore.signal()
}
let queue = DispatchQueue(label: "WiFiCheckQueue")
monitor.start(queue: queue)
// Wait for the result with a timeout to avoid hanging
let result = semaphore.wait(timeout: .now() + 2)
monitor.cancel()
// Return false if we timed out
return result == .success && isWifi
}
} }
var pubHeartBeat = false var pubHeartBeat = false