From 54449361c9d91bd7e1a79af1ddb611b781ab4f28 Mon Sep 17 00:00:00 2001
From: OfficialDakari <squiggle_ground671@simplelogin.com>
Date: Sun, 2 Nov 2025 17:54:56 +0500
Subject: [PATCH] merging

---
 lib/utils/custom_http_client.dart | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/utils/custom_http_client.dart b/lib/utils/custom_http_client.dart
index c73b4a3..c6c5060 100644
--- a/lib/utils/custom_http_client.dart
+++ b/lib/utils/custom_http_client.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:extera_next/config/app_config.dart';
 import 'package:extera_next/utils/platform_infos.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/io_client.dart';
@@ -8,7 +9,9 @@ import 'package:http/io_client.dart';
 import 'package:extera_next/config/isrg_x1.dart';
 
 class CustomHttpClient {
-  static HttpClient customHttpClient(String? cert) {
+  static HttpClient? customHttpClient(String? cert) {
+    if (PlatformInfos.isWeb) return null;
+
     final context = SecurityContext.defaultContext;
 
     if (PlatformInfos.isAndroid) {
@@ -26,14 +29,15 @@ class CustomHttpClient {
       }
     }
 
-    // Use Nekoray mixed proxy
-    // Made it for myself, remove later
-    final httpClient = HttpClient(context: context);
-    // httpClient.findProxy = (uri) {
-    //   return 'PROXY localhost:2080;';
-    // };
+    final client = HttpClient(context: context);
 
-    return httpClient;
+    if (AppConfig.httpProxy != null) {
+      client.findProxy = (uri) {
+        return "PROXY ${AppConfig.httpProxy};";
+      };
+    }
+
+    return client;
   }
 
   static http.Client createHTTPClient() => IOClient(customHttpClient(ISRG_X1));
-- 
2.43.0