github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle transitions to AppLifecycleState.detached in lifecycle state generation (#142523)

Browse Source 
Generates the correct lifecycle state transitions in ServicesBinding when detaching.
This commit is contained in:
maRci002 2024-02-07 19:01:22 +01:00 committed by GitHub
parent 8431cae884
commit 8e2da8414c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter/lib/src/services/binding.dart
View File

@ -289,12 +289,6 @@ mixin ServicesBinding on BindingBase, SchedulerBinding {
if (previousState == state) { if (previousState == state) {
return const <AppLifecycleState>[]; return const <AppLifecycleState>[];
} }
if (previousState == AppLifecycleState.paused && state == AppLifecycleState.detached) {
// Handle the wrap-around from paused to detached
return const <AppLifecycleState>[
AppLifecycleState.detached,
];
}
final List<AppLifecycleState> stateChanges = <AppLifecycleState>[]; final List<AppLifecycleState> stateChanges = <AppLifecycleState>[];
if (previousState == null) { if (previousState == null) {
// If there was no previous state, just jump directly to the new state. // If there was no previous state, just jump directly to the new state.
@ -304,7 +298,12 @@ mixin ServicesBinding on BindingBase, SchedulerBinding {
final int stateIndex = AppLifecycleState.values.indexOf(state); final int stateIndex = AppLifecycleState.values.indexOf(state);
assert(previousStateIndex != -1, 'State $previousState missing in stateOrder array'); assert(previousStateIndex != -1, 'State $previousState missing in stateOrder array');
assert(stateIndex != -1, 'State $state missing in stateOrder array'); assert(stateIndex != -1, 'State $state missing in stateOrder array');
if (previousStateIndex > stateIndex) { if (state == AppLifecycleState.detached) {
for (int i = previousStateIndex + 1; i < AppLifecycleState.values.length; ++i) {
stateChanges.add(AppLifecycleState.values[i]);
}
stateChanges.add(AppLifecycleState.detached);
} else if (previousStateIndex > stateIndex) {
for (int i = stateIndex; i < previousStateIndex; ++i) { for (int i = stateIndex; i < previousStateIndex; ++i) {
stateChanges.insert(0, AppLifecycleState.values[i]); stateChanges.insert(0, AppLifecycleState.values[i]);
} }

11
packages/flutter/test/widgets/app_lifecycle_listener_test.dart
View File

@ -129,10 +129,11 @@ void main() {
await setAppLifeCycleState(AppLifecycleState.resumed); await setAppLifeCycleState(AppLifecycleState.resumed);
expect(transitions, equals(<String>['restart', 'show', 'resume'])); expect(transitions, equals(<String>['restart', 'show', 'resume']));
// Generates intermediate states. // Generates intermediate states from lower to higher lifecycle states.
transitions.clear(); transitions.clear();
await setAppLifeCycleState(AppLifecycleState.paused); await setAppLifeCycleState(AppLifecycleState.paused);
expect(transitions, equals(<String>['inactive', 'hide', 'pause'])); expect(transitions, equals(<String>['inactive', 'hide', 'pause']));
// Wraps around from pause to detach. // Wraps around from pause to detach.
await setAppLifeCycleState(AppLifecycleState.detached); await setAppLifeCycleState(AppLifecycleState.detached);
expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach'])); expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach']));
@ -140,14 +141,16 @@ void main() {
expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach', 'resume'])); expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach', 'resume']));
await setAppLifeCycleState(AppLifecycleState.paused); await setAppLifeCycleState(AppLifecycleState.paused);
expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach', 'resume', 'inactive', 'hide', 'pause'])); expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach', 'resume', 'inactive', 'hide', 'pause']));
// Generates intermediate states from higher to lower lifecycle states.
transitions.clear(); transitions.clear();
await setAppLifeCycleState(AppLifecycleState.resumed); await setAppLifeCycleState(AppLifecycleState.resumed);
expect(transitions, equals(<String>['restart', 'show', 'resume'])); expect(transitions, equals(<String>['restart', 'show', 'resume']));
// Asserts on bad transitions // Go to detached
await expectLater(() => setAppLifeCycleState(AppLifecycleState.detached), throwsAssertionError); transitions.clear();
await setAppLifeCycleState(AppLifecycleState.paused);
await setAppLifeCycleState(AppLifecycleState.detached); await setAppLifeCycleState(AppLifecycleState.detached);
expect(transitions, equals(<String>['inactive', 'hide', 'pause', 'detach']));
}); });
testWidgets('Receives exit requests', (WidgetTester tester) async { testWidgets('Receives exit requests', (WidgetTester tester) async {

8
packages/flutter/test/widgets/binding_test.dart
View File

@ -224,7 +224,13 @@ void main() {
]); ]);
observer.accumulatedStates.clear(); observer.accumulatedStates.clear();
await expectLater(() async => setAppLifeCycleState(AppLifecycleState.detached), throwsAssertionError); await setAppLifeCycleState(AppLifecycleState.detached);
expect(observer.accumulatedStates, <AppLifecycleState>[
AppLifecycleState.inactive,
AppLifecycleState.hidden,
AppLifecycleState.paused,
AppLifecycleState.detached,
]);
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
}); });