AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add passing the VPN connection status when rebinding to the service

Browse source
This commit is contained in:
albexk 2023-12-05 16:10:29 +03:00
parent 5835a756ce
commit dc6e3ec53b
8 changed files with 65 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/android/src/org/amnezia/vpn/AmneziaActivity.kt
View file

@ -62,8 +62,8 @@ class AmneziaActivity : QtActivity() {
ServiceEvent.STATUS -> {
if (isWaitingStatus) {
isWaitingStatus = false
msg.data?.getStatus()?.let { (isConnected) ->
QtAndroidController.onStatus(isConnected)
msg.data?.getStatus()?.let { (state) ->
QtAndroidController.onStatus(state.ordinal)
}
}
}

2
client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
View file

@ -123,7 +123,7 @@ class AmneziaVpnService : VpnService() {
clientMessenger.send {
ServiceEvent.STATUS.packToMessage {
putStatus(Status.build {
setConnected(this@AmneziaVpnService.isConnected)
setState(this@AmneziaVpnService.protocolState.value)
})
}
}

2
client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
View file

@ -5,7 +5,7 @@ package org.amnezia.vpn.qt
* called by events in the Android part of the client
*/
object QtAndroidController {
external fun onStatus(isVpnConnected: Boolean)
external fun onStatus(stateCode: Int)
external fun onServiceDisconnected()
external fun onServiceError()