From: Jimmy Garrido Date: Fri, 3 Mar 2017 12:20:20 +0000 (-0800) Subject: Throw exception when ViewCell View is null (#752) X-Git-Tag: submit/tizen/20170424.094440~241 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97b28b1c20746bec32d8a1cd26f1c5d268d11680;p=platform%2Fupstream%2Fxamarin-forms.git Throw exception when ViewCell View is null (#752) --- diff --git a/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs index 9604364..8134a9c 100644 --- a/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs @@ -2,6 +2,7 @@ using Android.Content; using Android.Views; using AView = Android.Views.View; using Xamarin.Forms.Internals; +using System; namespace Xamarin.Forms.Platform.Android { @@ -32,6 +33,9 @@ namespace Xamarin.Forms.Platform.Android rowHeight = ListView.RowHeightProperty; } + if (cell.View == null) + throw new InvalidOperationException($"ViewCell must have a {nameof(cell.View)}"); + IVisualElementRenderer view = Platform.CreateRenderer(cell.View); Platform.SetRenderer(cell.View, view); cell.View.IsPlatformEnabled = true; diff --git a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs index 30c1723..697608f 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs @@ -139,6 +139,9 @@ namespace Xamarin.Forms.Platform.iOS IVisualElementRenderer GetNewRenderer() { + if (_viewCell.View == null) + throw new InvalidOperationException($"ViewCell must have a {nameof(_viewCell.View)}"); + var newRenderer = Platform.CreateRenderer(_viewCell.View); _rendererRef = new WeakReference(newRenderer); ContentView.AddSubview(newRenderer.NativeView);