Merge pull request #1183 from kusma/fuse-views-back-button

Fuse.Nodes: do not use KeyboardBootstrapper with Fuse.Views
fuse-open · May 22, 2018 · b83894f · b83894f
2 parents d3e9b2c + edb47c2
commit b83894f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,9 @@
 ## WrapPanel / WrapLayout
 - Fixed `WrapPanel` to update its layout when a layout property changes.
 
+## Fuse.Views
+- Fixed a crash when pushing the back-button on Android.
+
 
 # 1.8
 

diff --git a/Source/Fuse.Nodes/MobileBootstrapping.uno b/Source/Fuse.Nodes/MobileBootstrapping.uno
@@ -17,8 +17,11 @@ namespace Fuse
 			Fuse.Platform.Lifecycle.ExitedInteractive += OnExitInteractive;
 			Fuse.Platform.Lifecycle.Terminating += OnTerminating;
 
-			Uno.Platform.EventSources.HardwareKeys.KeyDown += KeyboardBootstrapper.OnKeyPressed;
-			Uno.Platform.EventSources.HardwareKeys.KeyUp += KeyboardBootstrapper.OnKeyReleased;
+			if defined(Mobile && !Library)
+			{
+				Uno.Platform.EventSources.HardwareKeys.KeyDown += KeyboardBootstrapper.OnKeyPressed;
+				Uno.Platform.EventSources.HardwareKeys.KeyUp += KeyboardBootstrapper.OnKeyReleased;
+			}
 		}
 
 		static void OnTerminating(Fuse.Platform.ApplicationState state)