[Android] Fix Index Out of Bounds when removing page on non AppCompact (#1189)

* [Controls] Add test case and reproducion for 31688

* [Android] Don't specify index out of bounds when inserting a view

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs
new file mode 100644 (file)
index 0000000..cae1d96
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs
@@ -0,0 +1,128 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System.Threading.Tasks;
+using System;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+       [Preserve(AllMembers = true)]
+       [Issue(IssueTracker.Bugzilla, 31688, "'Navigation.InsertPageBefore()' does not work for more than two pages, \"throws java.lang.IndexOutOfBoundsException: index=3 count=2", PlatformAffected.Android)]
+       public class Bugzilla31688 : TestNavigationPage // or TestMasterDetailPage, etc ...
+       {
+               MyMainPage page;
+               protected override async void Init()
+               {
+                       page = new MyMainPage();
+                       await Navigation.PushAsync(page);
+                       page.LoadAsync();
+               }
+
+               public class MyMainPage : ContentPage
+               {
+                       public MyMainPage()
+                       {
+                               Content = new Label { Text = "My Main Page" };
+                       }
+
+                       public async void LoadAsync()
+                       {
+                               ActivityIndicatorPage aip = new ActivityIndicatorPage();
+                               await Navigation.PushAsync(aip);
+
+                               var page1 = await Page1.CreateAsync();
+                               Navigation.InsertPageBefore(page1, aip);
+
+                               var page2 = await Page2.CreateAsync();
+                               Navigation.InsertPageBefore(page2, aip);
+
+                               var page3 = await Page3.CreateAsync();
+                               Navigation.InsertPageBefore(page3, aip);
+
+                       
+                               //// try to remove last page (with AcitivityIndicator) and here it bombs with the error: "java.lang.IndexOutOfBoundsException: index=3 count=2"
+                               await Navigation.PopAsync();
+                       }
+               }
+
+               public class Page1 : ContentPage
+               {
+                       private Page1()
+                       {
+                               Content = new Label { Text = "Page 1" };
+                       }
+
+                       public static async Task<Page1> CreateAsync()
+                       {
+                               var page = new Page1();
+                               await Task.Delay(TimeSpan.FromMilliseconds(200)); // simulate loading of state from DB
+                               return page;
+                       }
+               }
+
+               public class Page2 : ContentPage
+               {
+                       private Page2()
+                       {
+                               Content = new Label { Text = "Page 2" };
+                       }
+
+                       public static async Task<Page2> CreateAsync()
+                       {
+                               var page = new Page2();
+                               await Task.Delay(TimeSpan.FromMilliseconds(200)); // simulate loading of state from DB
+                               return page;
+                       }
+               }
+
+               class Page3 : ContentPage
+               {
+                       private Page3()
+                       {
+                               Content = new Label { Text = "Page 3" };
+                       }
+
+                       public static async Task<Page3> CreateAsync()
+                       {
+                               var page = new Page3();
+                               await Task.Delay(TimeSpan.FromMilliseconds(200)); // simulate loading of state from DB
+                               return page;
+                       }
+               }
+
+               public class Page4 : ContentPage
+               {
+                       private Page4()
+                       {
+                               Content = new Label { Text = "Page 4" };
+                       }
+
+                       public static async Task<Page4> CreateAsync()
+                       {
+                               var page = new Page4();
+                               await Task.Delay(TimeSpan.FromMilliseconds(200)); // simulate loading of state from DB
+                               return page;
+                       }
+               }
+
+               public class ActivityIndicatorPage : ContentPage
+               {
+                       public ActivityIndicatorPage()
+                       {
+                               Content = new ActivityIndicator { IsRunning = true };
+                       }
+               }
+
+#if UITEST
+               [Test]
+               public void Bugzilla31688Test ()
+               {
+                       RunningApp.WaitForElement (q => q.Marked ("Page 3"));
+               }
+#endif
+       }
+}
\ No newline at end of file

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 2ebd607..9dc69dc 100644 (file)
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -613,6 +613,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ButtonFastRendererTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DesktopSupportTestPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla58779.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla31688.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">

diff --git a/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs
index 8493978..7ec7246 100644 (file)
--- a/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs
@@ -237,7 +237,10 @@ namespace Xamarin.Forms.Platform.Android
                                {
                                        // animate out
                                        if (containerToAdd.Parent != this)
-                                               AddView(containerToAdd, ((IElementController)Element).LogicalChildren.IndexOf(rendererToAdd.Element));
+                                       {
+                                               var indexRenderToAdd = Math.Min(ChildCount,((IElementController)Element).LogicalChildren.IndexOf(rendererToAdd.Element));
+                                               AddView(containerToAdd, indexRenderToAdd);
+                                       }                                               
                                        else
                                                ((IPageController)rendererToAdd.Element).SendAppearing();
                                        containerToAdd.Visibility = ViewStates.Visible;