[child_view] Fix null checks
These were firing in some instances when using ChildView with the new
token types.
TEST: Ran through the login flow, launched a story in sysUI
SCN-898 #comment
CN-1214 #comment
Change-Id: Ia4ead165fc064088d250b9e7f641790304f6963e
diff --git a/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart b/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
index a3a6b34..b926b31 100644
--- a/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
+++ b/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
@@ -157,8 +157,8 @@
if (shared.globalViewContainer == null) {
return;
}
- assert(_attached);
assert(_viewHolderToken.value.isValid);
+ assert(_attached);
assert(_viewKey == null);
assert(!_available);
assert(_sceneHost == null);
@@ -227,10 +227,8 @@
if (shared.globalViewContainer == null) {
return;
}
- assert(_viewHolderToken != null);
- assert(_viewHolderToken.value != null);
- assert(!_attached);
assert(!_viewHolderToken.value.isValid);
+ assert(!_attached);
assert(_viewKey != null);
assert(_sceneHost != null);
assert(ViewContainerListenerImpl.instance.getConnectionForKey(_viewKey) ==
diff --git a/public/dart/zircon/lib/src/handle_wrapper.dart b/public/dart/zircon/lib/src/handle_wrapper.dart
index 3a3e603..1f701c5 100644
--- a/public/dart/zircon/lib/src/handle_wrapper.dart
+++ b/public/dart/zircon/lib/src/handle_wrapper.dart
@@ -11,7 +11,7 @@
_HandleWrapper(this._handle);
Handle get handle => _handle;
- bool get isValid => handle?.isValid;
+ bool get isValid => handle?.isValid ?? false;
void close() {
_handle.close();
