From 53e1d99a751e7a9cb8ae3f67ac8f3630b2aea398 Mon Sep 17 00:00:00 2001 From: "E.Z. Hart" Date: Tue, 27 Sep 2016 07:50:02 -0600 Subject: Fix potential NRE accessing current application via Page.RealParent (#330) * Fix potential NRE accessing current application via Page.RealParent * Update Native Bindings Gallery to use MessagingCenter --- Xamarin.Forms.Platform.iOS/Platform.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Xamarin.Forms.Platform.iOS') diff --git a/Xamarin.Forms.Platform.iOS/Platform.cs b/Xamarin.Forms.Platform.iOS/Platform.cs index 9ec4a8a8..04874db8 100644 --- a/Xamarin.Forms.Platform.iOS/Platform.cs +++ b/Xamarin.Forms.Platform.iOS/Platform.cs @@ -149,16 +149,6 @@ namespace Xamarin.Forms.Platform.iOS Page Page { get; set; } - Application TargetApplication - { - get - { - if (Page == null) - return null; - return Page.RealParent as Application; - } - } - void IDisposable.Dispose() { if (_disposed) @@ -304,7 +294,7 @@ namespace Xamarin.Forms.Platform.iOS internal void DidAppear() { _animateModals = false; - TargetApplication.NavigationProxy.Inner = this; + Application.Current.NavigationProxy.Inner = this; _animateModals = true; } @@ -388,7 +378,7 @@ namespace Xamarin.Forms.Platform.iOS Page.DescendantRemoved += HandleChildRemoved; - TargetApplication.NavigationProxy.Inner = this; + Application.Current.NavigationProxy.Inner = this; } internal void WillAppear() -- cgit v1.2.3