Added guard code to iOS content page ViewDidLayoutSubviews

Protected against race condition where ViewDidLayoutSubviews is called before the XF NativeView property has been initialized. Also added null-conditional checks to XFGlossGradientLayer’s GetGradientLayer method.
tbaggett · Dec 13, 2016 · 274a2b4 · 274a2b4
1 parent 36eca57
commit 274a2b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/XFGloss.iOS/Renderers/XFGlossContentPageRenderer.cs b/XFGloss.iOS/Renderers/XFGlossContentPageRenderer.cs
@@ -131,10 +131,13 @@ protected override void Dispose(bool disposing)
 		/// </summary>
 		public override void ViewDidLayoutSubviews()
 		{
-			var layer = XFGlossGradientLayer.GetGradientLayer(NativeView);
-			if (layer != null)
+			if (NativeView != null)
 			{
-				layer.Frame = new CGRect(CGPoint.Empty, NativeView.Frame.Size);
+				var layer = XFGlossGradientLayer.GetGradientLayer(NativeView);
+				if (layer != null)
+				{
+					layer.Frame = new CGRect(CGPoint.Empty, NativeView.Frame.Size);
+				}
 			}
 
 			base.ViewDidLayoutSubviews();

diff --git a/XFGloss.iOS/Views/UIBackgroundGradientView.cs b/XFGloss.iOS/Views/UIBackgroundGradientView.cs
@@ -152,7 +152,7 @@ static public void RemoveGradientLayer(UIView view)
 		/// <param name="view">The native view that the gradient layer is expected to be attached to</param>
 		static public XFGlossGradientLayer GetGradientLayer(UIView view)
 		{
-			if (view.Layer.Sublayers != null && view.Layer.Sublayers.Length > 0 && view.Layer.Sublayers[0] is XFGlossGradientLayer)
+			if (view?.Layer?.Sublayers != null && view.Layer.Sublayers.Length > 0 && view.Layer.Sublayers[0] is XFGlossGradientLayer)
 			{
 				return view.Layer.Sublayers[0] as XFGlossGradientLayer;
 			}

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.4.{build}
+version: 1.0.5.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches: