[url_launcher] Move away from shared method channel implementation in…

… native packages. (#4719) * Move away from shared method channel implementation in native packages. * Implement PR Feedback Implement PR Feedback Implement PR Feedback * Fix missed test * Implement PR feedback
flutter · Feb 8, 2022 · 99feee9 · 99feee9
1 parent 039068e
commit 99feee9
Show file tree

Hide file tree

Showing 26 changed files with 1,213 additions and 17 deletions.
diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.15
+
+* Switches to an in-package method channel implementation.
+
 ## 6.0.14
 
 * Updates code for new analysis options.

diff --git a/...r_android/android/src/main/java/io/flutter/plugins/urllauncher/MethodCallHandlerImpl.java b/...r_android/android/src/main/java/io/flutter/plugins/urllauncher/MethodCallHandlerImpl.java
@@ -61,7 +61,7 @@ void startListening(BinaryMessenger messenger) {
       stopListening();
     }
 
-    channel = new MethodChannel(messenger, "plugins.flutter.io/url_launcher");
+    channel = new MethodChannel(messenger, "plugins.flutter.io/url_launcher_android");
     channel.setMethodCallHandler(this);
   }
 

diff --git a/...droid/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java b/...droid/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java
@@ -27,7 +27,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class MethodCallHandlerImplTest {
-  private static final String CHANNEL_NAME = "plugins.flutter.io/url_launcher";
+  private static final String CHANNEL_NAME = "plugins.flutter.io/url_launcher_android";
   private UrlLauncher urlLauncher;
   private MethodCallHandlerImpl methodCallHandler;
 

diff --git a/packages/url_launcher/url_launcher_android/lib/url_launcher_android.dart b/packages/url_launcher/url_launcher_android/lib/url_launcher_android.dart
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+import 'package:url_launcher_platform_interface/link.dart';
+import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
+
+const MethodChannel _channel =
+    MethodChannel('plugins.flutter.io/url_launcher_android');
+
+/// An implementation of [UrlLauncherPlatform] for Android.
+class UrlLauncherAndroid extends UrlLauncherPlatform {
+  /// Registers this class as the default instance of [UrlLauncherPlatform].
+  static void registerWith() {
+    UrlLauncherPlatform.instance = UrlLauncherAndroid();
+  }
+
+  @override
+  final LinkDelegate? linkDelegate = null;
+
+  @override
+  Future<bool> canLaunch(String url) {
+    return _channel.invokeMethod<bool>(
+      'canLaunch',
+      <String, Object>{'url': url},
+    ).then((bool? value) => value ?? false);
+  }
+
+  @override
+  Future<void> closeWebView() {
+    return _channel.invokeMethod<void>('closeWebView');
+  }
+
+  @override
+  Future<bool> launch(
+    String url, {
+    required bool useSafariVC,
+    required bool useWebView,
+    required bool enableJavaScript,
+    required bool enableDomStorage,
+    required bool universalLinksOnly,
+    required Map<String, String> headers,
+    String? webOnlyWindowName,
+  }) {
+    return _channel.invokeMethod<bool>(
+      'launch',
+      <String, Object>{
+        'url': url,
+        'useWebView': useWebView,
+        'enableJavaScript': enableJavaScript,
+        'enableDomStorage': enableDomStorage,
+        'universalLinksOnly': universalLinksOnly,
+        'headers': headers,
+      },
+    ).then((bool? value) => value ?? false);
+  }
+}
diff --git a/packages/url_launcher/url_launcher_android/pubspec.yaml b/packages/url_launcher/url_launcher_android/pubspec.yaml
@@ -2,11 +2,11 @@ name: url_launcher_android
 description: Android implementation of the url_launcher plugin.
 repository: https://github.com/flutter/plugins/tree/main/packages/url_launcher/url_launcher_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.0.14
+version: 6.0.15
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.5.0"
+  flutter: ">=2.8.0"
 
 flutter:
   plugin:
@@ -15,6 +15,7 @@ flutter:
       android:
         package: io.flutter.plugins.urllauncher
         pluginClass: UrlLauncherPlugin
+        dartPluginClass: UrlLauncherAndroid
 
 dependencies:
   flutter:

diff --git a/packages/url_launcher/url_launcher_android/test/url_launcher_android_test.dart b/packages/url_launcher/url_launcher_android/test/url_launcher_android_test.dart
@@ -0,0 +1,234 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:url_launcher_android/url_launcher_android.dart';
+import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('$UrlLauncherAndroid', () {
+    const MethodChannel channel =
+        MethodChannel('plugins.flutter.io/url_launcher_android');
+    final List<MethodCall> log = <MethodCall>[];
+    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+      log.add(methodCall);
+
+      // Return null explicitly instead of relying on the implicit null
+      // returned by the method channel if no return statement is specified.
+      return null;
+    });
+
+    tearDown(() {
+      log.clear();
+    });
+
+    test('registers instance', () {
+      UrlLauncherAndroid.registerWith();
+      expect(UrlLauncherPlatform.instance, isA<UrlLauncherAndroid>());
+    });
+
+    test('canLaunch', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.canLaunch('http://example.com/');
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('canLaunch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+          })
+        ],
+      );
+    });
+
+    test('canLaunch should return false if platform returns null', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      final bool canLaunch = await launcher.canLaunch('http://example.com/');
+
+      expect(canLaunch, false);
+    });
+
+    test('launch', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: false,
+        enableJavaScript: false,
+        enableDomStorage: false,
+        universalLinksOnly: false,
+        headers: const <String, String>{},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': false,
+            'enableJavaScript': false,
+            'enableDomStorage': false,
+            'universalLinksOnly': false,
+            'headers': <String, String>{},
+          })
+        ],
+      );
+    });
+
+    test('launch with headers', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: false,
+        enableJavaScript: false,
+        enableDomStorage: false,
+        universalLinksOnly: false,
+        headers: const <String, String>{'key': 'value'},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': false,
+            'enableJavaScript': false,
+            'enableDomStorage': false,
+            'universalLinksOnly': false,
+            'headers': <String, String>{'key': 'value'},
+          })
+        ],
+      );
+    });
+
+    test('launch universal links only', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: false,
+        useWebView: false,
+        enableJavaScript: false,
+        enableDomStorage: false,
+        universalLinksOnly: true,
+        headers: const <String, String>{},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': false,
+            'enableJavaScript': false,
+            'enableDomStorage': false,
+            'universalLinksOnly': true,
+            'headers': <String, String>{},
+          })
+        ],
+      );
+    });
+
+    test('launch force WebView', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: true,
+        enableJavaScript: false,
+        enableDomStorage: false,
+        universalLinksOnly: false,
+        headers: const <String, String>{},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': true,
+            'enableJavaScript': false,
+            'enableDomStorage': false,
+            'universalLinksOnly': false,
+            'headers': <String, String>{},
+          })
+        ],
+      );
+    });
+
+    test('launch force WebView enable javascript', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: true,
+        enableJavaScript: true,
+        enableDomStorage: false,
+        universalLinksOnly: false,
+        headers: const <String, String>{},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': true,
+            'enableJavaScript': true,
+            'enableDomStorage': false,
+            'universalLinksOnly': false,
+            'headers': <String, String>{},
+          })
+        ],
+      );
+    });
+
+    test('launch force WebView enable DOM storage', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: true,
+        enableJavaScript: false,
+        enableDomStorage: true,
+        universalLinksOnly: false,
+        headers: const <String, String>{},
+      );
+      expect(
+        log,
+        <Matcher>[
+          isMethodCall('launch', arguments: <String, Object>{
+            'url': 'http://example.com/',
+            'useWebView': true,
+            'enableJavaScript': false,
+            'enableDomStorage': true,
+            'universalLinksOnly': false,
+            'headers': <String, String>{},
+          })
+        ],
+      );
+    });
+
+    test('launch should return false if platform returns null', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      final bool launched = await launcher.launch(
+        'http://example.com/',
+        useSafariVC: true,
+        useWebView: false,
+        enableJavaScript: false,
+        enableDomStorage: false,
+        universalLinksOnly: false,
+        headers: const <String, String>{},
+      );
+
+      expect(launched, false);
+    });
+
+    test('closeWebView default behavior', () async {
+      final UrlLauncherAndroid launcher = UrlLauncherAndroid();
+      await launcher.closeWebView();
+      expect(
+        log,
+        <Matcher>[isMethodCall('closeWebView', arguments: null)],
+      );
+    });
+  });
+}
diff --git a/packages/url_launcher/url_launcher_ios/CHANGELOG.md b/packages/url_launcher/url_launcher_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.15
+
+* Switches to an in-package method channel implementation.
+
 ## 6.0.14
 
 * Updates code for new analysis options.

diff --git a/packages/url_launcher/url_launcher_ios/ios/Classes/FLTURLLauncherPlugin.m b/packages/url_launcher/url_launcher_ios/ios/Classes/FLTURLLauncherPlugin.m
@@ -63,7 +63,7 @@ @implementation FLTURLLauncherPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
-      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/url_launcher"
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/url_launcher_ios"
                                   binaryMessenger:registrar.messenger];
   FLTURLLauncherPlugin *plugin = [[FLTURLLauncherPlugin alloc] init];
   [registrar addMethodCallDelegate:plugin channel:channel];