Add VPN check to proxy confirmation dialog and manual enable

SEVENID · SEVENID · commit 37944e9cae34 · 2026-04-03T00:01:08.000+03:00
- Add VPN warning text in ProxyConfirmSheet when VPN is active
- Check VPN status before enabling proxy in confirmProxy() and onEnableProxy()
- Add translations for proxy_saved_vpn_active_dialog and proxy_enable_failed_vpn_active
- Expose VpnDetector through AppContainer and RootComponent
diff --git a/app/src/main/java/org/monogram/app/MainContent.kt b/app/src/main/java/org/monogram/app/MainContent.kt
@@ -199,7 +199,19 @@ private fun ProxyConfirmSheet(root: RootComponent) {
                     }
                 }
 
-                Spacer(modifier = Modifier.height(24.dp))
+                Spacer(modifier = Modifier.height(8.dp))
+
+                val vpnActive by root.vpnDetector.isVpnActive.collectAsState()
+                if (vpnActive) {
+                    Text(
+                        text = stringResource(R.string.proxy_saved_vpn_active_dialog),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.warning,
+                        modifier = Modifier.padding(horizontal = 4.dp, vertical = 8.dp)
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
 
                 Row(
                     modifier = Modifier.fillMaxWidth(),
@@ -220,7 +232,8 @@ private fun ProxyConfirmSheet(root: RootComponent) {
                             root.confirmProxy(
                                 proxyConfirmState.server!!,
                                 proxyConfirmState.port!!,
-                                proxyConfirmState.type!!
+                                proxyConfirmState.type!!,
+                                vpnActive
                             )
                         },
                         modifier = Modifier
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -15,6 +15,8 @@
     <string name="proxy_port">Порт</string>
     <string name="proxy_type">Тип</string>
     <string name="proxy_unknown">Неизвестно</string>
+    <string name="proxy_saved_vpn_active_dialog">Прокси сохранено, но не включено из-за активной VPN</string>
+    <string name="proxy_enable_failed_vpn_active">Невозможно включить прокси: VPN активна</string>
     <string name="cancel">Отмена</string>
     <string name="connect">Подключиться</string>
 
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
@@ -15,6 +15,8 @@
     <string name="proxy_port">Port</string>
     <string name="proxy_type">Typ</string>
     <string name="proxy_unknown">Neznáme</string>
+    <string name="proxy_saved_vpn_active_dialog">Proxy uložené, ale neaktivované kvôli aktívnej VPN</string>
+    <string name="proxy_enable_failed_vpn_active">Nemožno aktivovať proxy: VPN je aktívna</string>
     <string name="cancel">Zrušiť</string>
     <string name="connect">Pripojiť</string>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -15,6 +15,8 @@
     <string name="proxy_port">Порт</string>
     <string name="proxy_type">Тип</string>
     <string name="proxy_unknown">Невідомо</string>
+    <string name="proxy_saved_vpn_active_dialog">Проксі збережено, але не увімкнено через активну VPN</string>
+    <string name="proxy_enable_failed_vpn_active">Неможливо увімкнути проксі: VPN активна</string>
     <string name="cancel">Скасувати</string>
     <string name="connect">Підключитися</string>
 
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -15,6 +15,8 @@
     <string name="proxy_port">端口</string>
     <string name="proxy_type">类型</string>
     <string name="proxy_unknown">未知</string>
+    <string name="proxy_saved_vpn_active_dialog">代理已保存，但因 VPN 处于活动状态而未启用</string>
+    <string name="proxy_enable_failed_vpn_active">无法启用代理：VPN 处于活动状态</string>
     <string name="cancel">取消</string>
     <string name="connect">连接</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
     <string name="proxy_port">Port</string>
     <string name="proxy_type">Type</string>
     <string name="proxy_unknown">Unknown</string>
+    <string name="proxy_saved_vpn_active_dialog">Proxy saved but not enabled due to active VPN</string>
+    <string name="proxy_enable_failed_vpn_active">Cannot enable proxy: VPN is active</string>
     <string name="cancel">Cancel</string>
     <string name="connect">Connect</string>
 
diff --git a/presentation/src/main/java/org/monogram/presentation/di/AppContainer.kt b/presentation/src/main/java/org/monogram/presentation/di/AppContainer.kt
@@ -6,6 +6,7 @@ import org.monogram.core.DispatcherProvider
 import org.monogram.core.Logger
 import org.monogram.domain.managers.*
 import org.monogram.domain.repository.*
+import org.monogram.data.infra.VpnDetector
 import org.monogram.presentation.core.util.AppPreferences
 import org.monogram.presentation.core.util.IDownloadUtils
 import org.monogram.presentation.features.chats.currentChat.components.ExoPlayerCache
@@ -48,6 +49,7 @@ interface UtilsContainer {
     val clipManager: ClipManager
     val dispatcherProvider: DispatcherProvider
     val logger: Logger
+    val vpnDetector: VpnDetector
     fun messageDisplayer(): MessageDisplayer
     fun externalNavigator(): ExternalNavigator
     fun phoneManager(): PhoneManager
diff --git a/presentation/src/main/java/org/monogram/presentation/di/KoinAppContainer.kt b/presentation/src/main/java/org/monogram/presentation/di/KoinAppContainer.kt
@@ -7,6 +7,7 @@ import org.monogram.core.DispatcherProvider
 import org.monogram.core.Logger
 import org.monogram.domain.managers.*
 import org.monogram.domain.repository.*
+import org.monogram.data.infra.VpnDetector
 import org.monogram.presentation.core.util.AppPreferences
 import org.monogram.presentation.core.util.IDownloadUtils
 import org.monogram.presentation.features.chats.currentChat.components.ExoPlayerCache
@@ -49,6 +50,7 @@ class KoinUtilsContainer(private val koin: Koin) : UtilsContainer {
     override val clipManager: ClipManager by lazy { koin.get() }
     override val dispatcherProvider: DispatcherProvider by lazy { koin.get() }
     override val logger: Logger by lazy { koin.get() }
+    override val vpnDetector: VpnDetector by lazy { koin.get() }
 
     override fun messageDisplayer(): MessageDisplayer = koin.get()
     override fun externalNavigator(): ExternalNavigator = koin.get()
diff --git a/presentation/src/main/java/org/monogram/presentation/root/DefaultRootComponent.kt b/presentation/src/main/java/org/monogram/presentation/root/DefaultRootComponent.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
+import org.monogram.data.infra.VpnDetector
 import org.monogram.domain.managers.PhoneManager
 import org.monogram.domain.models.MessageContent
 import org.monogram.domain.models.ProxyTypeModel
@@ -69,9 +70,11 @@ class DefaultRootComponent(
     private val updateRepository: UpdateRepository = container.repositories.updateRepository
     private val userRepository: UserRepository = container.repositories.userRepository
     private val cacheProvider: CacheProvider = container.cacheProvider
+    private val vpnDetector: VpnDetector = container.utils.vpnDetector
 
     override val appPreferences: AppPreferences = container.preferences.appPreferences
     override val videoPlayerPool: VideoPlayerPool = container.utils.videoPlayerPool
+    override val vpnDetector: VpnDetector = vpnDetector
 
     private val navigation = StackNavigation<Config>()
     private val scope = componentScope
@@ -322,11 +325,16 @@ class DefaultRootComponent(
         _proxyToConfirm.update { RootComponent.ProxyConfirmState() }
     }
 
-    override fun confirmProxy(server: String, port: Int, type: ProxyTypeModel) {
+    override fun confirmProxy(server: String, port: Int, type: ProxyTypeModel, vpnActive: Boolean = false) {
         scope.launch {
-            externalProxyRepository.addProxy(server, port, true, type)
+            val isVpnActive = vpnActive || vpnDetector.isVpnActive.value
+            externalProxyRepository.addProxy(server, port, !isVpnActive, type)
             dismissProxyConfirm()
-            messageDisplayer.show("Proxy added and enabled")
+            if (isVpnActive) {
+                messageDisplayer.show(container.utils.stringProvider().getString("proxy_saved_vpn_active_dialog"))
+            } else {
+                messageDisplayer.show("Proxy added and enabled")
+            }
         }
     }
 
diff --git a/presentation/src/main/java/org/monogram/presentation/root/RootComponent.kt b/presentation/src/main/java/org/monogram/presentation/root/RootComponent.kt
@@ -40,6 +40,7 @@ import org.monogram.presentation.settings.sessions.SessionsComponent
 import org.monogram.presentation.settings.settings.SettingsComponent
 import org.monogram.presentation.settings.stickers.StickersComponent
 import org.monogram.presentation.settings.storage.StorageUsageComponent
+import org.monogram.data.infra.VpnDetector
 
 interface RootComponent {
     val backHandler: BackHandler
@@ -51,6 +52,7 @@ interface RootComponent {
     val isBiometricEnabled: StateFlow<Boolean>
     val videoPlayerPool: VideoPlayerPool
     val appPreferences: AppPreferences
+    val vpnDetector: VpnDetector
 
     fun onBack()
     fun handleLink(link: String)
diff --git a/presentation/src/main/java/org/monogram/presentation/settings/proxy/ProxyComponent.kt b/presentation/src/main/java/org/monogram/presentation/settings/proxy/ProxyComponent.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.json.JSONObject
+import org.monogram.data.infra.VpnDetector
 import org.monogram.domain.models.ProxyModel
 import org.monogram.domain.models.ProxyTypeModel
 import org.monogram.domain.repository.AppPreferencesProvider
@@ -80,6 +81,7 @@ class DefaultProxyComponent(
     private val appPreferences: AppPreferencesProvider = container.preferences.appPreferences
     private val cacheProvider: CacheProvider = container.cacheProvider
     private val externalProxyRepository: ExternalProxyRepository = container.repositories.externalProxyRepository
+    private val vpnDetector: VpnDetector = container.utils.vpnDetector
 
     private val _state = MutableValue(ProxyComponent.State())
     override val state: Value<ProxyComponent.State> = _state
@@ -315,6 +317,10 @@ class DefaultProxyComponent(
 
     override fun onEnableProxy(proxyId: Int) {
         scope.launch {
+            if (vpnDetector.isVpnActive.value) {
+                _state.update { it.copy(toastMessage = container.utils.stringProvider().getString("proxy_enable_failed_vpn_active")) }
+                return@launch
+            }
             if (externalProxyRepository.enableProxy(proxyId)) {
                 refreshProxies(shouldPing = false)
                 onPingProxy(proxyId)
