From 096cf5f328aa24f44fabaf68b4cbb70fb6ff8124 Mon Sep 17 00:00:00 2001
From: Tonigt <1984701289@qq.com>
Date: Fri, 26 Mar 2021 15:24:14 +0800
Subject: [PATCH 1/4] Update pubspec.yaml

null safety
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 5f25653..0e90e2c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  http: ^0.12.1
+  http: ^0.13.1
 
 dev_dependencies:
   flutter_test:

From e4cb81186c1c1bbbcccb1916b0cbfc443e2710c4 Mon Sep 17 00:00:00 2001
From: Tonigt <1984701289@qq.com>
Date: Fri, 26 Mar 2021 17:55:09 +0800
Subject: [PATCH 2/4] Update pubspec.yaml

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 0e90e2c..05dee28 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/wslaimin
 repository: https://github.com/wslaimin/http_proxy
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.10.0"
 
 dependencies:

From 05290f214c5c6850af8dca57cd649baf875978d2 Mon Sep 17 00:00:00 2001
From: Tonigt <1984701289@qq.com>
Date: Sat, 27 Mar 2021 08:46:31 +0800
Subject: [PATCH 3/4] Update http_proxy.dart

---
 lib/http_proxy.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/http_proxy.dart b/lib/http_proxy.dart
index 80fe7c5..63fe8d0 100644
--- a/lib/http_proxy.dart
+++ b/lib/http_proxy.dart
@@ -22,7 +22,7 @@ class HttpProxy extends HttpOverrides {
   }
 
   @override
-  HttpClient createHttpClient(SecurityContext context) {
+  HttpClient createHttpClient(SecurityContext? context) {
     var client = super.createHttpClient(context);
     client.badCertificateCallback =
         (X509Certificate cert, String host, int port) {
@@ -32,7 +32,7 @@ class HttpProxy extends HttpOverrides {
   }
 
   @override
-  String findProxyFromEnvironment(Uri url, Map<String, String> environment) {
+  String findProxyFromEnvironment(Uri url, Map<String, String>? environment) {
     if (host == null) {
       return super.findProxyFromEnvironment(url, environment);
     }

From 0c383a2337383a4eef98377918396e89f2bc8c89 Mon Sep 17 00:00:00 2001
From: Tonigt <1984701289@qq.com>
Date: Tue, 30 Mar 2021 18:18:07 +0800
Subject: [PATCH 4/4] Update http_proxy.dart

---
 lib/http_proxy.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/http_proxy.dart b/lib/http_proxy.dart
index 63fe8d0..45ece77 100644
--- a/lib/http_proxy.dart
+++ b/lib/http_proxy.dart
@@ -3,17 +3,17 @@ import 'package:flutter/services.dart';
 
 MethodChannel _channel = MethodChannel('com.lm.http.proxy');
 
-Future<String> _getProxyHost() async {
+Future<String?> _getProxyHost() async {
   return await _channel.invokeMethod('getProxyHost');
 }
 
-Future<String> _getProxyPort() async {
+Future<String?> _getProxyPort() async {
   return await _channel.invokeMethod('getProxyPort');
 }
 
 class HttpProxy extends HttpOverrides {
-  String host;
-  String port;
+  String? host;
+  String? port;
 
   HttpProxy._(this.host, this.port);