Skip to content

[url_launcher] Remove nested third_party safari checker #4330

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

Merged
auto-submit merged 11 commits into from
Jul 6, 2023
Merged

[url_launcher] Remove nested third_party safari checker #4330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a397323
[url_launcher] Remove nested third_party safari checker
victorsanni Jun 27, 2023
930d186
Update url_launcher_web.dart
victorsanni Jun 28, 2023
e6e88eb
Update url_launcher_web.dart
victorsanni Jun 28, 2023
8009826
Merge branch 'main' into safari_check
victorsanni Jun 29, 2023
85ec1eb
Merge branch 'main' into safari_check
victorsanni Jun 29, 2023
35de858
Update url_launcher_web.dart
victorsanni Jul 5, 2023
713504c
Merge branch 'main' into safari_check
victorsanni Jul 5, 2023
1f13148
Change tests from mocking vendor/version to mocking user agent
victorsanni Jul 6, 2023
4eb1269
fixed formatting
victorsanni Jul 6, 2023
916d1e5
Update packages/url_launcher/url_launcher_web/CHANGELOG.md
victorsanni Jul 6, 2023
a3ee758
run dart format command
Jul 6, 2023
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
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.0.18

* Removes nested third_party Safari check.

## 2.0.17

* Removes obsolete null checks on non-nullable values.
Expand Down
9 changes: 4 additions & 5 deletions packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ void main() {
// Simulate that window.open does something.
when(mockWindow.open(any, any)).thenReturn(MockWindow());

when(mockNavigator.vendor).thenReturn('Google LLC');
when(mockNavigator.appVersion).thenReturn('Mock version!');
when(mockNavigator.userAgent).thenReturn(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36');

plugin = UrlLauncherPlugin(debugWindow: mockWindow);
});
Expand Down Expand Up @@ -148,9 +148,8 @@ void main() {

group('Safari', () {
setUp(() {
when(mockNavigator.vendor).thenReturn('Apple Computer, Inc.');
when(mockNavigator.appVersion).thenReturn(
'5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Safari/605.1.15');
when(mockNavigator.userAgent).thenReturn(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5.1 Safari/605.1.15');
// Recreate the plugin, so it grabs the overrides from this group
plugin = UrlLauncherPlugin(debugWindow: mockWindow);
});
Expand Down
65 changes: 0 additions & 65 deletions packages/url_launcher/url_launcher_web/lib/src/third_party/platform_detect/AUTHORS
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions packages/url_launcher/url_launcher_web/lib/src/third_party/platform_detect/LICENSE
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...ges/url_launcher/url_launcher_web/lib/src/third_party/platform_detect/README.md
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions packages/url_launcher/url_launcher_web/lib/src/third_party/platform_detect/browser.dart
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions packages/url_launcher/url_launcher_web/lib/url_launcher_web.dart
View file
Open in desktop
Comment thread
victorsanni marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:url_launcher_platform_interface/url_launcher_platform_interface.

import 'src/link.dart';
import 'src/shims/dart_ui.dart' as ui;
import 'src/third_party/platform_detect/browser.dart';

const Set<String> _safariTargetTopSchemes = <String>{
'mailto',
Expand All @@ -24,14 +23,18 @@ String? _getUrlScheme(String url) => Uri.tryParse(url)?.scheme;
bool _isSafariTargetTopScheme(String url) =>
_safariTargetTopSchemes.contains(_getUrlScheme(url));

bool _navigatorIsSafari(html.Navigator navigator) =>
navigator.userAgent.contains('Safari') &&
!navigator.userAgent.contains('Chrome');
Comment thread
ditman marked this conversation as resolved.

/// The web implementation of [UrlLauncherPlatform].
///
/// This class implements the `package:url_launcher` functionality for the web.
class UrlLauncherPlugin extends UrlLauncherPlatform {
/// A constructor that allows tests to override the window object used by the plugin.
UrlLauncherPlugin({@visibleForTesting html.Window? debugWindow})
: _window = debugWindow ?? html.window {
_isSafari = navigatorIsSafari(_window.navigator);
_isSafari = _navigatorIsSafari(_window.navigator);
}

final html.Window _window;
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: url_launcher_web
description: Web platform implementation of url_launcher
repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
version: 2.0.17
version: 2.0.18

environment:
sdk: ">=2.18.0 <4.0.0"
Expand Down