From 00f2a0271cbfbbcc55995d8d520d849e6ba36e37 Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Sat, 25 Jun 2022 20:05:53 +0800
Subject: [PATCH] fix proxy flush and enabled

---
 .../java/tw/nekomimi/nekogram/proxy/SubInfo.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/SubInfo.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/SubInfo.java
index e190a221a..93a53263c 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/SubInfo.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/proxy/SubInfo.java
@@ -11,12 +11,14 @@ import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import cn.hutool.core.util.StrUtil;
+import tw.nekomimi.nekogram.NekoConfig;
 import tw.nekomimi.nekogram.parts.ProxyLoadsKt;
 
 @Index("id")
@@ -47,7 +49,18 @@ public class SubInfo implements Mappable {
         HashMap<String, Exception> exceptions = new HashMap<>();
 
         try {
-            return id == SubManager.publicProxySubID ? ProxyLoadsKt.loadProxiesPublic(urls, exceptions) : ProxyLoadsKt.loadProxies(urls, exceptions);
+            if (id == SubManager.publicProxySubID) {
+                if (!NekoConfig.enablePublicProxy.Bool())
+                    return new ArrayList<>();
+                List<String> pubs = ProxyLoadsKt.loadProxiesPublic(urls, exceptions);
+                if (!NekoConfig.enablePublicProxy.Bool())
+                    return new ArrayList<>();
+                else
+                    return pubs;
+            } else {
+                return ProxyLoadsKt.loadProxies(urls, exceptions);
+            }
+//            return id == SubManager.publicProxySubID ?  :
         } catch (Exception ignored) {
         }