Cleanup HandlerCleanupHelper

thomasgalliker · Sep 10, 2024 · 7e47ac9 · 7e47ac9
1 parent 3a7d1c9
commit 7e47ac9
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Plugin.SegmentedControl.Maui/Utils/HandlerCleanUpHelper.cs b/Plugin.SegmentedControl.Maui/Utils/HandlerCleanUpHelper.cs
@@ -56,7 +56,6 @@ private static bool CheckIfPageIsUsed(Page targetPage)
             // is still used in Shell.Current or one of its children.
             if (Shell.Current is Shell shell)
             {
-                var currentPage = WalkToPage(shell);
                 var pages = GetActivePages(shell);
                 var pageExists = pages.Any(p => p == targetPage);
                 return pageExists;
@@ -79,8 +78,7 @@ private static IEnumerable<Page> GetActivePages(Shell shell)
         {
             var hashSet = new HashSet<Page>();
 
-            var items = shell.Items.ToArray();
-            foreach (var shellItem in items)
+            foreach (var shellItem in shell.Items)
             {
                 foreach (var page in WalkToPage(shellItem))
                 {
@@ -89,7 +87,7 @@ private static IEnumerable<Page> GetActivePages(Shell shell)
 
                 foreach (var shellSection in shellItem.Items)
                 {
-                    foreach (var page in WalkToPage(shellItem))
+                    foreach (var page in WalkToPage(shellSection))
                     {
                         hashSet.Add(page);
                     }
@@ -110,9 +108,8 @@ private static IEnumerable<Page> WalkToPage(Element element)
                     return WalkToPage(shellItem.CurrentItem);
 
                 case ShellSection shellSection:
-
-                    var controller = (IShellSectionController)element;
-                    var children = controller.LogicalChildren.OfType<IShellContentController>();
+                    IShellSectionController controller = shellSection;
+                    var children = controller.GetItems().OfType<IShellContentController>();
                     return children.Select(c => c.Page);
             }