From 5be2dbcfd72d386447c4d924f91ddc066962f825 Mon Sep 17 00:00:00 2001 From: Pacalini <141402887+Pacalini@users.noreply.github.com> Date: Tue, 31 Dec 2024 08:54:01 +0800 Subject: [PATCH] revert #46 --- assets/translation.json | 2 -- lib/foundation/appdata.dart | 1 - lib/network/app_dio.dart | 10 ---------- lib/pages/settings/network.dart | 15 --------------- 4 files changed, 28 deletions(-) diff --git a/assets/translation.json b/assets/translation.json index ebb586a..9d69000 100644 --- a/assets/translation.json +++ b/assets/translation.json @@ -218,7 +218,6 @@ "Create Folder": "新建文件夹", "Select an image on screen": "选择屏幕上的图片", "Added @count comics to download queue.": "已添加 @count 本漫画到下载队列", - "Ignore Certificate Errors": "忽略证书错误", "Authorization Required": "需要身份验证", "Sync": "同步", "The folder is Linked to @source": "文件夹已关联到 @source", @@ -481,7 +480,6 @@ "Create Folder": "新建文件夾", "Select an image on screen": "選擇屏幕上的圖片", "Added @count comics to download queue.": "已添加 @count 本漫畫到下載隊列", - "Ignore Certificate Errors": "忽略證書錯誤", "Authorization Required": "需要身份驗證", "Sync": "同步", "The folder is Linked to @source": "文件夾已關聯到 @source", diff --git a/lib/foundation/appdata.dart b/lib/foundation/appdata.dart index 654de9b..1628a14 100644 --- a/lib/foundation/appdata.dart +++ b/lib/foundation/appdata.dart @@ -122,7 +122,6 @@ class _Settings with ChangeNotifier { 'quickFavorite': null, 'enableTurnPageByVolumeKey': true, 'enableClockAndBatteryInfoInReader': true, - 'ignoreCertificateErrors': false, 'authorizationRequired': false, 'onClickFavorite': 'viewDetail', // viewDetail, read 'enableDnsOverrides': false, diff --git a/lib/network/app_dio.dart b/lib/network/app_dio.dart index 59ab961..7180c2a 100644 --- a/lib/network/app_dio.dart +++ b/lib/network/app_dio.dart @@ -108,7 +108,6 @@ class MyLogInterceptor implements Interceptor { class AppDio with DioMixin { String? _proxy = proxy; - static bool get ignoreCertificateErrors => appdata.settings['ignoreCertificateErrors'] == true; AppDio([BaseOptions? options]) { this.options = options ?? BaseOptions(); @@ -116,9 +115,6 @@ class AppDio with DioMixin { proxySettings: proxy == null ? const rhttp.ProxySettings.noProxy() : rhttp.ProxySettings.proxy(proxy!), - tlsSettings: rhttp.TlsSettings( - verifyCertificates: !ignoreCertificateErrors, - ), )); interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!)); interceptors.add(NetworkCacheManager()); @@ -196,9 +192,6 @@ class AppDio with DioMixin { proxySettings: proxy == null ? const rhttp.ProxySettings.noProxy() : rhttp.ProxySettings.proxy(proxy!), - tlsSettings: rhttp.TlsSettings( - verifyCertificates: !ignoreCertificateErrors, - ), )); } try { @@ -247,9 +240,6 @@ class RHttpAdapter implements HttpClientAdapter { keepAlivePing: Duration(seconds: 30), ), throwOnStatusCode: false, - tlsSettings: rhttp.TlsSettings( - verifyCertificates: !AppDio.ignoreCertificateErrors, - ), dnsSettings: rhttp.DnsSettings.static(overrides: _getOverrides()), ); } diff --git a/lib/pages/settings/network.dart b/lib/pages/settings/network.dart index f6ec75b..ccaf23a 100644 --- a/lib/pages/settings/network.dart +++ b/lib/pages/settings/network.dart @@ -46,7 +46,6 @@ class _ProxySettingViewState extends State<_ProxySettingView> { String port = ''; String username = ''; String password = ''; - bool ignoreCertificateErrors = false; // USERNAME:PASSWORD@HOST:PORT String toProxyStr() { @@ -104,8 +103,6 @@ class _ProxySettingViewState extends State<_ProxySettingView> { void initState() { var proxy = appdata.settings['proxy']; parseProxyString(proxy); - ignoreCertificateErrors = - appdata.settings['ignoreCertificateErrors'] ?? false; super.initState(); } @@ -151,18 +148,6 @@ class _ProxySettingViewState extends State<_ProxySettingView> { }, ), if (type == 'manual') buildManualProxy(), - SwitchListTile( - title: Text("Ignore Certificate Errors".tl), - value: ignoreCertificateErrors, - onChanged: (v) { - setState(() { - ignoreCertificateErrors = v; - }); - appdata.settings['ignoreCertificateErrors'] = - ignoreCertificateErrors; - appdata.saveData(); - }, - ), ], ), ),