Merge fixes

mozilla-mobile · Dec 20, 2024 · 847b6a7 · 847b6a7
1 parent f4e62f9
commit 847b6a7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift b/firefox-ios/Client/Coordinators/Browser/BrowserCoordinator.swift
@@ -29,7 +29,8 @@ class BrowserCoordinator: BaseCoordinator,
                           WindowEventCoordinator,
                           MainMenuCoordinatorDelegate,
                           ETPCoordinatorSSLStatusDelegate,
-                          SearchEngineSelectionCoordinatorDelegate {
+                          SearchEngineSelectionCoordinatorDelegate,
+                          BookmarksRefactorFeatureFlagProvider {
     private struct UX {
         static let searchEnginePopoverSize = CGSize(width: 250, height: 536)
     }
@@ -188,7 +189,8 @@ class BrowserCoordinator: BaseCoordinator,
             profile: profile,
             windowUUID: windowUUID,
             libraryCoordinator: self,
-            libraryNavigationHandler: nil
+            libraryNavigationHandler: nil,
+            isBookmarkRefactorEnabled: isBookmarkRefactorEnabled
         )
         add(child: bookmarksCoordinator)
         bookmarksCoordinator.start(parentFolder: parentFolder, bookmark: bookmark)

diff --git a/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift b/firefox-ios/Client/Coordinators/Library/BookmarksCoordinator.swift
@@ -60,16 +60,14 @@ class BookmarksCoordinator: BaseCoordinator,
         router: Router,
         profile: Profile,
         windowUUID: WindowUUID,
-        parentCoordinator: LibraryCoordinatorDelegate?,
-        navigationHandler: LibraryNavigationHandler?,
+        libraryCoordinator: LibraryCoordinatorDelegate?,
+        libraryNavigationHandler: LibraryNavigationHandler?,
         isBookmarkRefactorEnabled: Bool
     ) {
         self.profile = profile
         self.windowUUID = windowUUID
         self.libraryCoordinator = libraryCoordinator
         self.libraryNavigationHandler = libraryNavigationHandler
-        self.parentCoordinator = parentCoordinator
-        self.navigationHandler = navigationHandler
         self.isBookmarkRefactorEnabled = isBookmarkRefactorEnabled
         super.init(router: router)
     }

diff --git a/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift b/firefox-ios/Client/Coordinators/Library/LibraryCoordinator.swift
@@ -127,8 +127,8 @@ class LibraryCoordinator: BaseCoordinator,
             router: router,
             profile: profile,
             windowUUID: windowUUID,
-            parentCoordinator: parentCoordinator,
-            navigationHandler: self,
+            libraryCoordinator: parentCoordinator,
+            libraryNavigationHandler: self,
             isBookmarkRefactorEnabled: isBookmarkRefactorEnabled
         )
         add(child: bookmarksCoordinator)

diff --git a/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift b/firefox-ios/Client/Frontend/Browser/MainMenuActionHelper.swift
@@ -28,7 +28,6 @@ protocol ToolBarActionMenuDelegate: AnyObject {
     func showSignInView(fxaParameters: FxASignInViewParameters)
     func showFilePicker(fileURL: URL)
     func showEditBookmark()
-    func showEditBookmark()
 }
 
 extension ToolBarActionMenuDelegate {

diff --git a/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift b/firefox-ios/Client/Frontend/Library/Bookmarks/Edit Bookmark/EditBookmarkViewModel.swift
@@ -128,16 +128,17 @@ class EditBookmarkViewModel: ParentFolderSelector {
         }
     }
 
+    func didFinish() {
+        bookmarkCoordinatorDelegate?.didFinish()
+    }
+
     // MARK: ParentFolderSelector
 
     func selectFolderCreatedFromChild(folder: Folder) {
         isFolderCollapsed = true
         selectedFolder = folder
         folderStructures = [folder]
         onFolderStatusUpdate?()
-
-    func didFinish() {
-        bookmarkCoordinatorDelegate?.didFinish()
     }
 }