From 5df5737c8564aca017dca3fdef99de7a0df8ed73 Mon Sep 17 00:00:00 2001 From: SaeedDev94 Date: Fri, 22 Mar 2024 14:26:02 +0330 Subject: [PATCH] ConnectivityManager: remove redundant api level check --- .../saeeddev94/xray/service/TProxyService.kt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/github/saeeddev94/xray/service/TProxyService.kt b/app/src/main/java/io/github/saeeddev94/xray/service/TProxyService.kt index 2eade3a..4f51295 100644 --- a/app/src/main/java/io/github/saeeddev94/xray/service/TProxyService.kt +++ b/app/src/main/java/io/github/saeeddev94/xray/service/TProxyService.kt @@ -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) { @@ -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 */ @@ -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()