From 3a75912da9826ce2c441870e0710b03d3b887468 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Tue, 15 Sep 2020 00:46:01 +0200 Subject: [PATCH 1/5] replace deprecated getFlutterEngine call on Android --- .../src/main/java/io/flutter/plugins/camera/CameraPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java index 9bd34e17aa02..2511898038bb 100644 --- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java +++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java @@ -68,7 +68,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) { maybeStartListening( binding.getActivity(), - flutterPluginBinding.getFlutterEngine().getDartExecutor(), + flutterPluginBinding.getBinaryMessenger(), binding::addRequestPermissionsResultListener, flutterPluginBinding.getFlutterEngine().getRenderer()); } From 707314909d202303523f82a30f25bf52c973d0ef Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Tue, 15 Dec 2020 12:21:06 +0100 Subject: [PATCH 2/5] Fix PlatformException https://github.com/flutter/flutter/issues/71725 --- packages/url_launcher/url_launcher/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher/lib/url_launcher.dart | 2 +- packages/url_launcher/url_launcher/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md index aaf958a52624..bb47cabda782 100644 --- a/packages/url_launcher/url_launcher/CHANGELOG.md +++ b/packages/url_launcher/url_launcher/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.0.0-nullsafety.2 + +* Fix PlatformException when not specifying `forceSafariVC` for non-web URLs + ## 6.0.0-nullsafety.1 * Bump Dart SDK to support null safety. diff --git a/packages/url_launcher/url_launcher/lib/url_launcher.dart b/packages/url_launcher/url_launcher/lib/url_launcher.dart index 6138fff2e3d9..c6af1d8b05d3 100644 --- a/packages/url_launcher/url_launcher/lib/url_launcher.dart +++ b/packages/url_launcher/url_launcher/lib/url_launcher.dart @@ -62,7 +62,7 @@ import 'package:url_launcher_platform_interface/url_launcher_platform_interface. /// is set to true and the universal link failed to launch. Future launch( String urlString, { - bool forceSafariVC = true, + bool forceSafariVC = false, bool forceWebView = false, bool enableJavaScript = false, bool enableDomStorage = false, diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml index d0abd941a9c2..e2d7a161e1ea 100644 --- a/packages/url_launcher/url_launcher/pubspec.yaml +++ b/packages/url_launcher/url_launcher/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher description: Flutter plugin for launching a URL on Android and iOS. Supports web, phone, SMS, and email schemes. homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher -version: 6.0.0-nullsafety.1 +version: 6.0.0-nullsafety.2 flutter: plugin: From b67a31850432de9d0823cde420c8ac14b94f422d Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 13 Jan 2021 19:03:10 +0100 Subject: [PATCH 3/5] [url_launcher] add tests, update version + changelog --- .../url_launcher/url_launcher/CHANGELOG.md | 14 +++++++++- .../url_launcher/url_launcher/pubspec.yaml | 2 +- .../url_launcher/test/url_launcher_test.dart | 28 ++++++++++++++++++- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/packages/url_launcher/url_launcher/CHANGELOG.md b/packages/url_launcher/url_launcher/CHANGELOG.md index bb47cabda782..3efdd1ef6d78 100644 --- a/packages/url_launcher/url_launcher/CHANGELOG.md +++ b/packages/url_launcher/url_launcher/CHANGELOG.md @@ -1,7 +1,19 @@ -## 6.0.0-nullsafety.2 +## 6.0.0-nullsafety.5 * Fix PlatformException when not specifying `forceSafariVC` for non-web URLs +## 6.0.0-nullsafety.4 + +* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets. + +## 6.0.0-nullsafety.3 + +* forceSafariVC should be nullable. + +## 6.0.0-nullsafety.2 + +* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276)) + ## 6.0.0-nullsafety.1 * Bump Dart SDK to support null safety. diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml index e2d7a161e1ea..2f9c38a22f36 100644 --- a/packages/url_launcher/url_launcher/pubspec.yaml +++ b/packages/url_launcher/url_launcher/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher description: Flutter plugin for launching a URL on Android and iOS. Supports web, phone, SMS, and email schemes. homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher -version: 6.0.0-nullsafety.2 +version: 6.0.0-nullsafety.5 flutter: plugin: diff --git a/packages/url_launcher/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/url_launcher/test/url_launcher_test.dart index 89a7801e1ca8..57d08ea3a83b 100644 --- a/packages/url_launcher/url_launcher/test/url_launcher_test.dart +++ b/packages/url_launcher/url_launcher/test/url_launcher_test.dart @@ -57,7 +57,7 @@ void main() { )).captured, [ 'http://flutter.dev/', - true, + false, false, false, false, @@ -191,6 +191,32 @@ void main() { throwsA(isA())); }); + test('send e-mail', () async { + await launch('mailto:gmail-noreply@google.com?subject=Hello'); + expect( + verify(await mock.launch( + any, + useSafariVC: anyNamed('useSafariVC'), + useWebView: anyNamed('useWebView'), + enableJavaScript: anyNamed('enableJavaScript'), + enableDomStorage: anyNamed('enableDomStorage'), + universalLinksOnly: anyNamed('universalLinksOnly'), + headers: anyNamed('headers'), + )), + isInstanceOf(), + ); + }); + + test('cannot send e-mail with forceSafariVC: true', () async { + expect(() async => await launch('mailto:gmail-noreply@google.com?subject=Hello', forceSafariVC: true), + throwsA(isA())); + }); + + test('cannot send e-mail with forceWebView: true', () async { + expect(() async => await launch('mailto:gmail-noreply@google.com?subject=Hello', forceWebView: true), + throwsA(isA())); + }); + test('controls system UI when changing statusBarBrightness', () async { final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized(); From 882141a0c08686fe2f08b6d009fa8ddf57ae916d Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:35:30 +0100 Subject: [PATCH 4/5] Update test --- packages/url_launcher/url_launcher/test/url_launcher_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/url_launcher/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/url_launcher/test/url_launcher_test.dart index 57d08ea3a83b..c2b4bf145eab 100644 --- a/packages/url_launcher/url_launcher/test/url_launcher_test.dart +++ b/packages/url_launcher/url_launcher/test/url_launcher_test.dart @@ -57,7 +57,7 @@ void main() { )).captured, [ 'http://flutter.dev/', - false, + true, false, false, false, From 45b848a8e34d24b9db94a658f461b68486f956c8 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Thu, 4 Feb 2021 16:11:04 +0100 Subject: [PATCH 5/5] Fix format --- .../url_launcher/test/url_launcher_test.dart | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/url_launcher/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/url_launcher/test/url_launcher_test.dart index c2b4bf145eab..bb3fd2ad92b5 100644 --- a/packages/url_launcher/url_launcher/test/url_launcher_test.dart +++ b/packages/url_launcher/url_launcher/test/url_launcher_test.dart @@ -208,12 +208,18 @@ void main() { }); test('cannot send e-mail with forceSafariVC: true', () async { - expect(() async => await launch('mailto:gmail-noreply@google.com?subject=Hello', forceSafariVC: true), + expect( + () async => await launch( + 'mailto:gmail-noreply@google.com?subject=Hello', + forceSafariVC: true), throwsA(isA())); }); test('cannot send e-mail with forceWebView: true', () async { - expect(() async => await launch('mailto:gmail-noreply@google.com?subject=Hello', forceWebView: true), + expect( + () async => await launch( + 'mailto:gmail-noreply@google.com?subject=Hello', + forceWebView: true), throwsA(isA())); });