Skip to content

Commit

Permalink
ConnectivityManager: remove redundant api level check
Browse files Browse the repository at this point in the history
  • Loading branch information
SaeedDev94 committed Mar 22, 2024
1 parent fe40153 commit 5df5737
Showing 1 changed file with 7 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class TProxyService : VpnService() {
}
}
private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
@delegate:RequiresApi(Build.VERSION_CODES.P)
private val defaultNetworkCallback by lazy {
object : ConnectivityManager.NetworkCallback() {
override fun onLost(network: Network) {
Expand Down Expand Up @@ -180,12 +179,10 @@ class TProxyService : VpnService() {
}

/** Register network callback */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
try {
connectivity.registerDefaultNetworkCallback(defaultNetworkCallback)
} catch (error: Exception) {
error.printStackTrace()
}
try {
connectivity.registerDefaultNetworkCallback(defaultNetworkCallback)
} catch (error: Exception) {
error.printStackTrace()
}

/** Create, Update tun2socks config */
Expand Down Expand Up @@ -224,11 +221,9 @@ class TProxyService : VpnService() {

private fun stopVPN() {
isRunning = false
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
try {
connectivity.unregisterNetworkCallback(defaultNetworkCallback)
} catch (_: Exception) {
}
try {
connectivity.unregisterNetworkCallback(defaultNetworkCallback)
} catch (_: Exception) {
}
TProxyStopService()
XrayCore.stop()
Expand Down

0 comments on commit 5df5737

Please sign in to comment.