Merge pull request #1329 from hussainmohd-a/v055e

v055e

Author: hussainmohd-a

app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt

@@ -51,7 +51,6 @@ import com.celzero.bravedns.backup.BackupHelper.Companion.BACKUP_FILE_EXTN
 import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_RESTART_APP
 import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_SCHEME
 import com.celzero.bravedns.backup.RestoreAgent
-import com.celzero.bravedns.data.AppConfig
 import com.celzero.bravedns.database.RefreshDatabase
 import com.celzero.bravedns.databinding.ActivityHomeScreenBinding
 import com.celzero.bravedns.service.AppUpdater
@@ -90,7 +89,6 @@ class HomeScreenActivity : AppCompatActivity(R.layout.activity_home_screen) {
     private val b by viewBinding(ActivityHomeScreenBinding::bind)
 
     private val persistentState by inject<PersistentState>()
-    private val appConfig by inject<AppConfig>()
     private val appUpdateManager by inject<AppUpdater>()
     private val rdb by inject<RefreshDatabase>()
 
@@ -101,8 +99,10 @@ class HomeScreenActivity : AppCompatActivity(R.layout.activity_home_screen) {
 
     private var biometricPromptRetryCount = 1
     private var onResumeCalledAlready = false
-    private val ON_RESUME_CALLED_PREFERENCE_KEY = "onResumeCalled"
-
+    companion object {
+        private const val ON_RESUME_CALLED_PREFERENCE_KEY = "onResumeCalled"
+    }
+    
     // TODO - #324 - Usage of isDarkTheme() in all activities.
     private fun Context.isDarkThemeOn(): Boolean {
         return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.celzero.bravedns"
-    android:versionCode="35"
-    android:versionName="v055d"> <!-- 35(v055d) -->
+    android:versionCode="36"
+    android:versionName="v055e"> <!-- 36(v055e) -->
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />

app/src/main/java/com/celzero/bravedns/data/AppConfig.kt

@@ -69,6 +69,9 @@ internal constructor(
 ) {
     private var braveModeObserver: MutableLiveData<Int> = MutableLiveData()
     private var pcapFilePath: String = ""
+    private var customSocks5Endpoint: ProxyEndpoint? = null
+    private var customHttpEndpoint: ProxyEndpoint? = null
+    private var orbotEndpoint: ProxyEndpoint? = null
 
     companion object {
         private var connectedDns: MutableLiveData<String> = MutableLiveData()
@@ -381,7 +384,7 @@ internal constructor(
             DnsType.DOT.type -> DnsType.DOT
             DnsType.ODOH.type -> DnsType.ODOH
             else -> {
-                Log.wtf(LOG_TAG_VPN, "Invalid dns type mode: ${persistentState.dnsType}")
+                Log.w(LOG_TAG_VPN, "Invalid dns type mode: ${persistentState.dnsType}")
                 DnsType.DOH
             }
         }
@@ -442,15 +445,24 @@ internal constructor(
     }
 
     suspend fun getSocks5ProxyDetails(): ProxyEndpoint {
-        return proxyEndpointRepository.getCustomSocks5Endpoint()
+        if (customSocks5Endpoint == null) {
+            customSocks5Endpoint = proxyEndpointRepository.getCustomSocks5Endpoint()
+        }
+        return customSocks5Endpoint!!
     }
 
     suspend fun getHttpProxyDetails(): ProxyEndpoint {
-        return proxyEndpointRepository.getHttpProxyDetails()
+        if (customHttpEndpoint == null) {
+            customHttpEndpoint = proxyEndpointRepository.getHttpProxyDetails()
+        }
+        return customHttpEndpoint!!
     }
 
     suspend fun getConnectedOrbotProxy(): ProxyEndpoint? {
-        return proxyEndpointRepository.getConnectedOrbotProxy()
+        if (orbotEndpoint == null) {
+            orbotEndpoint = proxyEndpointRepository.getConnectedOrbotProxy()
+        }
+        return orbotEndpoint
     }
 
     suspend fun getOrbotSocks5Endpoint(): ProxyEndpoint {
@@ -1039,15 +1051,18 @@ internal constructor(
 
     suspend fun updateCustomSocks5Proxy(proxyEndpoint: ProxyEndpoint) {
         proxyEndpointRepository.update(proxyEndpoint)
+        customSocks5Endpoint = proxyEndpoint
         addProxy(ProxyType.SOCKS5, ProxyProvider.CUSTOM)
     }
 
     suspend fun updateOrbotProxy(proxyEndpoint: ProxyEndpoint) {
         proxyEndpointRepository.update(proxyEndpoint)
+        orbotEndpoint = proxyEndpoint
     }
 
     suspend fun updateCustomHttpProxy(proxyEndpoint: ProxyEndpoint) {
         proxyEndpointRepository.update(proxyEndpoint)
+        customHttpEndpoint = proxyEndpoint
         addProxy(ProxyType.HTTP, ProxyProvider.CUSTOM)
     }
 

app/src/main/java/com/celzero/bravedns/net/go/GoVpnAdapter.kt

@@ -572,7 +572,7 @@ class GoVpnAdapter : KoinComponent {
     }
 
     private suspend fun setSocks5TunnelModeIfNeeded(tunProxyMode: AppConfig.TunProxyMode) {
-        val socksEnabled = AppConfig.ProxyType.of(persistentState.proxyType).isSocks5Enabled()
+        val socksEnabled = AppConfig.ProxyType.of(appConfig.getProxyType()).isSocks5Enabled()
         if (!socksEnabled) return
 
         val socks5: ProxyEndpoint? =

app/src/main/java/com/celzero/bravedns/service/BraveVPNService.kt

@@ -1443,7 +1443,13 @@ class BraveVPNService :
         logd("on pref change, key: $key")
         when (key) {
             PersistentState.BRAVE_MODE -> {
-                io("braveModeChange") { setTunMode() }
+                io("braveModeChange") {
+                    // change in brave mode, requires restart of the vpn (to set routes in vpn),
+                    // tunMode (to set the tun mode), and dnsAlg (to update the dns alg) in go
+                    restartVpnWithNewAppConfig(reason = "braveMode")
+                    setTunMode()
+                    updateDnsAlg()
+                }
                 notificationManager.notify(SERVICE_ID, updateNotificationBuilder())
             }
             PersistentState.LOCAL_BLOCK_LIST -> {
@@ -2995,7 +3001,7 @@ class BraveVPNService :
         }
 
         if (trapVpnDns) {
-            logd("flow: dns-request, returning Ipn.Base, $uid")
+            logd("flow: dns-request, returning ${Backend.Base}, $uid, $connId")
             return@runBlocking persistAndConstructFlowResponse(null, Backend.Base, connId, uid)
         }
 
@@ -3043,22 +3049,22 @@ class BraveVPNService :
             val proxyId = "${ProxyManager.ID_WG_BASE}${wgConfig.id}"
             // even if inactive, route connections to wg if lockdown/catch-all is enabled to
             // avoid leaks
-            return if (wgConfig.isActive || wgConfig.isLockdown || wgConfig.isCatchAll) {
+            if (wgConfig.isActive || wgConfig.isLockdown || wgConfig.isCatchAll) {
                 val canRoute = vpnAdapter?.canRouteIp(proxyId, connTracker.destIP, true)
                 if (canRoute == true) {
                     logd("flow: wg is active/lockdown/catch-all; $proxyId, $connId, $uid")
-                    persistAndConstructFlowResponse(connTracker, proxyId, connId, uid)
+                    return persistAndConstructFlowResponse(connTracker, proxyId, connId, uid)
                 } else {
                     logd("flow: wg is active/lockdown/catch-all, but no route, $connId, $uid")
-                    persistAndConstructFlowResponse(connTracker, Backend.Base, connId, uid)
+                    return persistAndConstructFlowResponse(connTracker, Backend.Base, connId, uid)
                 }
             } else {
-                logd("flow: wg is not active; using base, $connId, $uid")
-                persistAndConstructFlowResponse(connTracker, Backend.Base, connId, uid)
+                // fall-through, no lockdown/catch-all/active wg found, so proceed with other checks
             }
         }
 
         // no need to check for other proxies if the protocol is not TCP or UDP
+        // fixme: is this even needed?
         if (
             connTracker.protocol != Protocol.TCP.protocolType &&
                 connTracker.protocol != Protocol.UDP.protocolType
@@ -3132,7 +3138,7 @@ class BraveVPNService :
 
         // chose socks5 proxy over http proxy
         if (appConfig.isCustomSocks5Enabled()) {
-            val endpoint = runBlocking { appConfig.getSocks5ProxyDetails() }
+            val endpoint = appConfig.getSocks5ProxyDetails()
             val packageName = FirewallManager.getPackageNameByUid(uid)
             logd("flow: socks5 proxy is enabled, $packageName, ${endpoint.proxyAppName}")
             // do not block the app if the app is set to forward the traffic via socks5 proxy
@@ -3153,7 +3159,7 @@ class BraveVPNService :
         }
 
         if (appConfig.isCustomHttpProxyEnabled()) {
-            val endpoint = runBlocking { appConfig.getHttpProxyDetails() }
+            val endpoint = appConfig.getHttpProxyDetails()
             val packageName = FirewallManager.getPackageNameByUid(uid)
             // do not block the app if the app is set to forward the traffic via http proxy
             if (endpoint.proxyAppName == packageName) {

app/src/main/java/com/celzero/bravedns/service/ConnectionMonitor.kt

@@ -787,14 +787,15 @@ class ConnectionMonitor(context: Context, networkListener: NetworkListener) :
         }
 
         private suspend fun tcp53(nw: Network?, host: String): Boolean {
+            val timeout = 500 // ms
             val port53 = 53 // port
             var socket: Socket? = null
 
             try {
                 socket = Socket()
                 val s = InetSocketAddress(host, port53)
                 nw?.bindSocket(socket)
-                socket.connect(s)
+                socket.connect(s, timeout)
                 val c = socket.isConnected
                 val b = socket.isBound
                 if (DEBUG)
@@ -816,13 +817,15 @@ class ConnectionMonitor(context: Context, networkListener: NetworkListener) :
         }
 
         private suspend fun udp53(nw: Network?, host: String): Boolean {
+            val timeout = 500 // ms
             val port53 = 53 // port
             var socket: DatagramSocket? = null
 
             try {
                 socket = DatagramSocket()
                 val s = InetSocketAddress(host, port53)
                 nw?.bindSocket(socket)
+                socket.soTimeout = timeout
                 socket.connect(s)
                 val c = socket.isConnected
                 val b = socket.isBound

gradle.properties

@@ -24,5 +24,5 @@ android.nonTransitiveRClass=true
 # Enable configuration cache
 org.gradle.unsafe.configuration-cache=true
 android.nonFinalResIds=true
-# Version code for this module (35 for v055d)
-VERSION_CODE=35
+# Version code for this module (36 for v055e)
+VERSION_CODE=36