Skip to content

null safety #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tonigt wants to merge 5 commits into
base: master
Choose a base branch
from
Open

null safety #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
096cf5f
Update pubspec.yaml
Tonigt Mar 26, 2021
e4cb811
Update pubspec.yaml
Tonigt Mar 26, 2021
05290f2
Update http_proxy.dart
Tonigt Mar 27, 2021
6bd0cbc
Merge pull request #1 from Tonigt/null-safety
Tonigt Mar 27, 2021
0c383a2
Update http_proxy.dart
Tonigt Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/http_proxy.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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) {
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ 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:
flutter:
sdk: flutter
http: ^0.12.1
http: ^0.13.1

dev_dependencies:
flutter_test:
Expand Down