DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1531 from abarth/raw_keyboard_crash

Browse Source 
RawKeyboardListener asserts if disposed without keyboard
This commit is contained in:
Adam Barth 2016-02-02 20:52:30 -08:00
commit 421cd7c2fb
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/flutter/lib/src/widgets/raw_keyboard_listener.dart
View File

@ -39,19 +39,20 @@ class _RawKeyboardListenerState extends State<RawKeyboardListener> implements mo
}
void dispose() {
_detachKeyboard();
_detachKeyboardIfAttached();
super.dispose();
}
void _attachOrDetachKeyboard() {
if (config.focused && _stub == null)
_attachKeyboard();
else if (!config.focused && _stub != null)
_detachKeyboard();
if (config.focused)
_attachKeyboardIfDetached();
else
_detachKeyboardIfAttached();
}
void _attachKeyboard() {
assert(_stub == null);
void _attachKeyboardIfDetached() {
if (_stub != null)
return;
_stub = new mojom.RawKeyboardListenerStub.unbound()..impl = this;
mojom.RawKeyboardServiceProxy keyboard = new mojom.RawKeyboardServiceProxy.unbound();
shell.connectToService(null, keyboard);
@ -59,9 +60,8 @@ class _RawKeyboardListenerState extends State<RawKeyboardListener> implements mo
keyboard.close();
}
void _detachKeyboard() {
assert(_stub != null);
_stub.close();
void _detachKeyboardIfAttached() {
_stub?.close();
_stub = null;
}

16
packages/flutter/test/widget/raw_keyboard_listener_test.dart Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2016 The Chromium 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_test/flutter_test.dart';
import 'package:flutter/widgets.dart';
import 'package:test/test.dart';
void main() {
test('Can dispose without keyboard', () {
testWidgets((WidgetTester tester) {
tester.pumpWidget(new RawKeyboardListener(child: new Container()));
tester.pumpWidget(new Container());
});
});
}