Unverified Commit acbfb40f authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Handle null return from WillPopCallback (#127039)

Partial revert of https://github.com/flutter/flutter/pull/126647 to work around issue in google3.

See b/283046390
parent c08b9acc
...@@ -1499,7 +1499,9 @@ abstract class ModalRoute<T> extends TransitionRoute<T> with LocalHistoryRoute<T ...@@ -1499,7 +1499,9 @@ abstract class ModalRoute<T> extends TransitionRoute<T> with LocalHistoryRoute<T
final _ModalScopeState<T>? scope = _scopeKey.currentState; final _ModalScopeState<T>? scope = _scopeKey.currentState;
assert(scope != null); assert(scope != null);
for (final WillPopCallback callback in List<WillPopCallback>.of(_willPopCallbacks)) { for (final WillPopCallback callback in List<WillPopCallback>.of(_willPopCallbacks)) {
if (!await callback()) { // TODO(goderbauer): Tests using the Component Framework in google3 insist on returning
// null for mocked out WillPopCallbacks. Fix that to remove ignore.
if (await callback() != true) { // ignore: no_literal_bool_comparisons
return RoutePopDisposition.doNotPop; return RoutePopDisposition.doNotPop;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment