Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
eaae468
add changed files
bparrishMines Feb 22, 2023
9d90d9f
some more changes
bparrishMines Feb 23, 2023
1094620
update tests
bparrishMines Feb 23, 2023
ce1634c
fix tests
bparrishMines Feb 23, 2023
3fae384
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Feb 23, 2023
44e6f81
update instancemanager
bparrishMines Feb 23, 2023
ce6550b
ensure callback methods are passed to copy
bparrishMines Feb 23, 2023
def8956
version bump
bparrishMines Feb 23, 2023
ca9993e
update tests since objects can't be added multiple times
bparrishMines Feb 23, 2023
1408d00
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Feb 27, 2023
1c48779
fix test
bparrishMines Feb 28, 2023
a552de9
change back to using copyable
bparrishMines Feb 28, 2023
9d58bd8
probably fix tests
bparrishMines Feb 28, 2023
2a05f7c
some reverts
bparrishMines Feb 28, 2023
73ea794
update changelog
bparrishMines Feb 28, 2023
625146d
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Feb 28, 2023
32ff598
add a copy
bparrishMines Feb 28, 2023
b848c1f
raise minimum meta version
bparrishMines Feb 28, 2023
8efddc9
remove meta
bparrishMines Feb 28, 2023
e2b53b1
remove copy override
bparrishMines Feb 28, 2023
a9a9aa6
remove print
bparrishMines Feb 28, 2023
0ea91f7
remove unneeded changes
bparrishMines Feb 28, 2023
8141e9a
include raising of pigeon version
bparrishMines Feb 28, 2023
4a5aab1
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Mar 6, 2023
f196771
update globalInstanceManager
bparrishMines Mar 6, 2023
7e32787
move location of asserts
bparrishMines Mar 6, 2023
9b572e2
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Mar 9, 2023
1062ddb
lint
bparrishMines Mar 9, 2023
9605570
use a constant
bparrishMines Mar 16, 2023
d786495
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Mar 16, 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
Prev Previous commit
Next Next commit
remove unneeded changes
  • Loading branch information
bparrishMines committed Feb 28, 2023
commit 0ea91f7a1a81d8ce2e1a34690a71cd77b87b1cf0
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,9 @@ class JavaObjectFlutterApiImpl implements JavaObjectFlutterApi {
class WebViewHostApiImpl extends WebViewHostApi {
/// Constructs a [WebViewHostApiImpl].
WebViewHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager,
super(binaryMessenger: binaryMessenger);

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;
Expand Down Expand Up @@ -357,16 +350,10 @@ class WebViewHostApiImpl extends WebViewHostApi {
class WebSettingsHostApiImpl extends WebSettingsHostApi {
/// Constructs a [WebSettingsHostApiImpl].
WebSettingsHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;

Expand Down Expand Up @@ -504,16 +491,10 @@ class WebSettingsHostApiImpl extends WebSettingsHostApi {
class JavaScriptChannelHostApiImpl extends JavaScriptChannelHostApi {
/// Constructs a [JavaScriptChannelHostApiImpl].
JavaScriptChannelHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;

Expand Down Expand Up @@ -554,16 +535,10 @@ class JavaScriptChannelFlutterApiImpl extends JavaScriptChannelFlutterApi {
class WebViewClientHostApiImpl extends WebViewClientHostApi {
/// Constructs a [WebViewClientHostApiImpl].
WebViewClientHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;

Expand Down Expand Up @@ -747,16 +722,10 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
class DownloadListenerHostApiImpl extends DownloadListenerHostApi {
/// Constructs a [DownloadListenerHostApiImpl].
DownloadListenerHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;

Expand Down Expand Up @@ -807,16 +776,10 @@ class DownloadListenerFlutterApiImpl extends DownloadListenerFlutterApi {
class WebChromeClientHostApiImpl extends WebChromeClientHostApi {
/// Constructs a [WebChromeClientHostApiImpl].
WebChromeClientHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;

Expand Down Expand Up @@ -893,16 +856,9 @@ class WebChromeClientFlutterApiImpl extends WebChromeClientFlutterApi {
class WebStorageHostApiImpl extends WebStorageHostApi {
/// Constructs a [WebStorageHostApiImpl].
WebStorageHostApiImpl({
this.binaryMessenger,
super.binaryMessenger,
InstanceManager? instanceManager,
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager,
super(binaryMessenger: binaryMessenger);

/// Sends binary data across the Flutter platform barrier.
///
/// If it is null, the default BinaryMessenger will be used which routes to
/// the host platform.
final BinaryMessenger? binaryMessenger;
}) : instanceManager = instanceManager ?? JavaObject.globalInstanceManager;

/// Maintains instances stored to communicate with java objects.
final InstanceManager instanceManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,6 @@ class CapturingWebViewClient extends android_webview.WebViewClient {
bool value) async {
synchronousReturnValueForShouldOverrideUrlLoading = value;
}

@override
CapturingWebViewClient copy() {
return CapturingWebViewClient();
}
}

// Records the last created instance of itself.
Expand All @@ -505,11 +500,6 @@ class CapturingWebChromeClient extends android_webview.WebChromeClient {
}
static CapturingWebChromeClient lastCreatedDelegate =
CapturingWebChromeClient();

@override
CapturingWebChromeClient copy() {
return CapturingWebChromeClient();
}
}

// Records the last created instance of itself.
Expand All @@ -523,9 +513,4 @@ class CapturingDownloadListener extends android_webview.DownloadListener {
}
static CapturingDownloadListener lastCreatedListener =
CapturingDownloadListener(onDownloadStart: (_, __, ___, ____, _____) {});

@override
CapturingDownloadListener copy() {
return CapturingDownloadListener(onDownloadStart: onDownloadStart);
}
}