From 3533f7b61edd28031a72e143dec2462956035680 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Wed, 8 Dec 2021 20:49:29 +0800
Subject: [PATCH] Delete disableProxyWhenVpnEnabled

---
 .../src/main/java/org/telegram/ui/LaunchActivity.java    | 9 ---------
 .../nekogram/settings/NekoGeneralSettingsActivity.java   | 1 -
 .../src/main/java/tw/nekomimi/nkmr/NekomuraConfig.java   | 4 +---
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
index 3adbf0fce..bfa43ce22 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -4270,15 +4270,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
             passcodeView.onResume();
         }
 
-        if (NekomuraConfig.disableProxyWhenVpnEnabled.Bool()) {
-            if (SharedConfig.proxyEnabled && ProxyUtil.isVPNEnabled()) {
-                SharedConfig.setProxyEnable(false);
-            } else if (!ProxyUtil.isVPNEnabled()) {
-                SharedConfig.setProxyEnable(true);
-            }
-            NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.proxySettingsChanged);
-        }
-
         ConnectionsManager.getInstance(currentAccount).setAppPaused(false, false);
         updateCurrentConnectionState(currentAccount);
 
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
index 3aa0ce870..21874469c 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
@@ -90,7 +90,6 @@ public class NekoGeneralSettingsActivity extends BaseFragment {
 
     private final AbstractCell header1 = cellGroup.appendCell(new NekomuraTGHeader(LocaleController.getString("Connection")));
     private final AbstractCell useIPv6Row = cellGroup.appendCell(new NekomuraTGTextCheck(NekomuraConfig.useIPv6));
-    private final AbstractCell disableProxyWhenVpnEnabledRow = cellGroup.appendCell(new NekomuraTGTextCheck(NekomuraConfig.disableProxyWhenVpnEnabled));
     private final AbstractCell useProxyItemRow = cellGroup.appendCell(new NekomuraTGTextCheck(NekomuraConfig.useProxyItem));
     private final AbstractCell hideProxyByDefaultRow = cellGroup.appendCell(new NekomuraTGTextCheck(NekomuraConfig.hideProxyByDefault));
     private final AbstractCell autoUpdateSubInfoRow = cellGroup.appendCell(new NekomuraTGTextCheck(NekomuraConfig.autoUpdateSubInfo));
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nkmr/NekomuraConfig.java b/TMessagesProj/src/main/java/tw/nekomimi/nkmr/NekomuraConfig.java
index 469cc0e83..dca32af66 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nkmr/NekomuraConfig.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nkmr/NekomuraConfig.java
@@ -112,7 +112,7 @@ public class NekomuraConfig {
     public static ConfigItem filterUnmutedAndUnread = addConfig("filter_unmuted_and_unread", configTypeBool, true);
 
     public static ConfigItem disableSystemAccount = addConfig("DisableSystemAccount", configTypeBool, false);
-    public static ConfigItem disableProxyWhenVpnEnabled = addConfig("DisableProxyWhenVpnEnabled", configTypeBool, false);
+//    public static ConfigItem disableProxyWhenVpnEnabled = addConfig("DisableProxyWhenVpnEnabled", configTypeBool, false);
     public static ConfigItem skipOpenLinkConfirm = addConfig("SkipOpenLinkConfirm", configTypeBool, false);
 
     public static ConfigItem ignoreMutedCount = addConfig("IgnoreMutedCount", configTypeBool, true);
@@ -419,8 +419,6 @@ public class NekomuraConfig {
 
         if (preferences.contains("disable_system_account"))
             disableSystemAccount.setConfigBool(preferences.getBoolean("disable_system_account", false));
-        if (preferences.contains("disable_proxy_when_vpn_enabled"))
-            disableProxyWhenVpnEnabled.setConfigBool(preferences.getBoolean("disable_proxy_when_vpn_enabled", false));
         if (preferences.contains("skip_open_link_confirm"))
             skipOpenLinkConfirm.setConfigBool(preferences.getBoolean("skip_open_link_confirm", false));