From 4566643f46d5ddb7c95b117ea0f25efffcf9a360 Mon Sep 17 00:00:00 2001 From: Kiryl <79797627+kirylkaveryn@users.noreply.github.com> Date: Tue, 16 Apr 2024 22:41:41 +0400 Subject: [PATCH] [ios] [bookmarks] Remove observer pattern during the category files exporting (#7933) --- .../CoreApi/Bookmarks/MWMBookmarksManager.h | 22 ++++++++-- .../CoreApi/Bookmarks/MWMBookmarksManager.mm | 41 ++++++------------ .../CoreApi/Bookmarks/MWMBookmarksObserver.h | 1 - .../BookmarksListInteractor.swift | 42 +------------------ .../BookmarksListInterfaces.swift | 2 +- .../BookmarksListPresenter.swift | 6 +-- .../BMCView/BMCViewController.swift | 34 +++++++-------- .../BMCViewModel/BMCDefaultViewModel.swift | 31 ++------------ 8 files changed, 58 insertions(+), 121 deletions(-) diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index 12cac8f36a..63de1655da 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -24,6 +24,7 @@ typedef void (^PingCompletionBlock)(BOOL success); typedef void (^ElevationPointChangedBlock)(double distance); typedef void (^SearchBookmarksCompletionBlock)(NSArray *bookmarks); typedef void (^SortBookmarksCompletionBlock)(NSArray * _Nullable sortedSections); +typedef void (^SharingResultCompletionHandler)(MWMBookmarksShareStatus status, NSURL * _Nullable urlToALocalFile); NS_SWIFT_NAME(BookmarksManager) @interface MWMBookmarksManager : NSObject @@ -84,9 +85,24 @@ NS_SWIFT_NAME(BookmarksManager) - (MWMTrackIDCollection)trackIdsForCategory:(MWMMarkGroupID)categoryId; -- (void)shareCategory:(MWMMarkGroupID)groupId; -- (void)shareAllCategories; -- (NSURL *)shareCategoryURL; +/** + Shares a specific category with the given group ID. + + @param groupId The identifier for the category to be shared. + @param completion A block that handles the result of the share operation and takes two parameters: + - status: The status of the share operation, of type `MWMBookmarksShareStatus`. + - urlToALocalFile: The local file URL containing the shared data. This parameter is guaranteed to be non-nil only if `status` is `MWMBookmarksShareStatusSuccess`. In other cases, it will be nil. +*/ +- (void)shareCategory:(MWMMarkGroupID)groupId completion:(SharingResultCompletionHandler)completion; + +/** + Shares all categories. + + @param completion A block that handles the result of the share operation and takes two parameters: + - status: The status of the share operation, of type `MWMBookmarksShareStatus`. + - urlToALocalFile: The local file URL containing the shared data. This parameter is guaranteed to be non-nil only if `status` is `MWMBookmarksShareStatusSuccess`. In other cases, it will be nil. +*/ +- (void)shareAllCategoriesWithCompletion:(SharingResultCompletionHandler)completion; - (void)finishShareCategory; - (void)setNotificationsEnabled:(BOOL)enabled; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 2b051567f0..b8e0c801ec 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -562,34 +562,28 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting #pragma mark - Category sharing -- (void)shareCategory:(MWMMarkGroupID)groupId -{ - self.bm.PrepareFileForSharing({groupId}, [self](auto sharingResult) - { - [self handleSharingResult:sharingResult]; +- (void)shareCategory:(MWMMarkGroupID)groupId completion:(SharingResultCompletionHandler)completion { + self.bm.PrepareFileForSharing({groupId}, [self, completion](auto sharingResult) { + [self handleSharingResult:sharingResult completion:completion]; }); } -- (void)shareAllCategories -{ - self.bm.PrepareAllFilesForSharing([self](auto sharingResult) - { - [self handleSharingResult:sharingResult]; +- (void)shareAllCategoriesWithCompletion:(SharingResultCompletionHandler)completion { + self.bm.PrepareAllFilesForSharing([self, completion](auto sharingResult) { + [self handleSharingResult:sharingResult completion:completion]; }); } -- (void)handleSharingResult:(BookmarkManager::SharingResult)sharingResult -{ +- (void)handleSharingResult:(BookmarkManager::SharingResult)sharingResult completion:(SharingResultCompletionHandler)completion { + NSURL *urlToALocalFile = nil; MWMBookmarksShareStatus status; - switch (sharingResult.m_code) - { + switch (sharingResult.m_code) { case BookmarkManager::SharingResult::Code::Success: - { - self.shareCategoryURL = [NSURL fileURLWithPath:@(sharingResult.m_sharingPath.c_str()) isDirectory:NO]; - ASSERT(self.shareCategoryURL, ("Invalid share category url")); + urlToALocalFile = [NSURL fileURLWithPath:@(sharingResult.m_sharingPath.c_str()) isDirectory:NO]; + ASSERT(urlToALocalFile, ("Invalid share category URL")); + self.shareCategoryURL = urlToALocalFile; status = MWMBookmarksShareStatusSuccess; break; - } case BookmarkManager::SharingResult::Code::EmptyCategory: status = MWMBookmarksShareStatusEmptyCategory; break; @@ -600,16 +594,7 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting status = MWMBookmarksShareStatusFileError; break; } - - [self loopObservers:^(id observer) { - if ([observer respondsToSelector:@selector(onBookmarksCategoryFilePrepared:)]) - [observer onBookmarksCategoryFilePrepared:status]; - }]; -} - -- (NSURL *)shareCategoryURL { - NSAssert(_shareCategoryURL != nil, @"Invalid share category url"); - return _shareCategoryURL; + completion(status, urlToALocalFile); } - (void)finishShareCategory { diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h index a1159d9ef1..c24baded9f 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h @@ -11,7 +11,6 @@ NS_SWIFT_NAME(BookmarksObserver) - (void)onBookmarksFileLoadError; - (void)onBookmarksCategoryDeleted:(MWMMarkGroupID)groupId; - (void)onBookmarkDeleted:(MWMMarkID)bookmarkId; -- (void)onBookmarksCategoryFilePrepared:(MWMBookmarksShareStatus)status; @end NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift index 36f8da9b32..f362f4b264 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift @@ -15,37 +15,9 @@ extension BookmarksListSortingType { } } -enum ExportFileStatus { - case success - case empty - case error -} - -fileprivate final class BookmarksManagerListener: NSObject { - private var callback: (ExportFileStatus) -> Void - - init(_ callback: @escaping (ExportFileStatus) -> Void) { - self.callback = callback - } -} - -extension BookmarksManagerListener: BookmarksObserver { - func onBookmarksCategoryFilePrepared(_ status: BookmarksShareStatus) { - switch status { - case .success: - callback(.success) - case .emptyCategory: - callback(.empty) - case .archiveError, .fileError: - callback(.error) - } - } -} - final class BookmarksListInteractor { private let markGroupId: MWMMarkGroupID private var bookmarksManager: BookmarksManager { BookmarksManager.shared() } - private var bookmarksManagerListener: BookmarksManagerListener? init(markGroupId: MWMMarkGroupID) { self.markGroupId = markGroupId @@ -172,18 +144,8 @@ extension BookmarksListInteractor: IBookmarksListInteractor { bookmarksManager.userCategoriesCount() > 1 } - func exportFile(_ completion: @escaping (URL?, ExportFileStatus) -> Void) { - bookmarksManagerListener = BookmarksManagerListener({ [weak self] status in - guard let self = self else { return } - self.bookmarksManager.remove(self.bookmarksManagerListener!) - var url: URL? = nil - if status == .success { - url = self.bookmarksManager.shareCategoryURL() - } - completion(url, status) - }) - bookmarksManager.add(bookmarksManagerListener!) - bookmarksManager.shareCategory(markGroupId) + func exportFile(_ completion: @escaping SharingResultCompletionHandler) { + bookmarksManager.shareCategory(markGroupId, completion: completion) } func finishExportFile() { diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift index 2634abb2dd..772a42175d 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift @@ -106,7 +106,7 @@ protocol IBookmarksListInteractor { func updateTrack(_ trackId: MWMTrackID, setGroupId groupId: MWMMarkGroupID) func deleteBookmarksGroup() func canDeleteGroup() -> Bool - func exportFile(_ completion: @escaping (URL?, ExportFileStatus) -> Void) + func exportFile(_ completion: @escaping SharingResultCompletionHandler) func finishExportFile() } diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift index 96eb5a9ee1..231a75e705 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift @@ -139,17 +139,17 @@ final class BookmarksListPresenter { self.router.listSettings(self.bookmarkGroup, delegate: self) })) moreItems.append(BookmarksListMenuItem(title: L("export_file"), action: { [weak self] in - self?.interactor.exportFile { (url, status) in + self?.interactor.exportFile { (status, url) in switch status { case .success: guard let url = url else { fatalError() } self?.view.share(url) { self?.interactor.finishExportFile() } - case .empty: + case .emptyCategory: self?.view.showError(title: L("bookmarks_error_title_share_empty"), message: L("bookmarks_error_message_share_empty")) - case .error: + case .archiveError, .fileError: self?.view.showError(title: L("dialog_routing_system_error"), message: L("bookmarks_error_message_share_general")) } diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift index 8ac6a2a9c4..d2d150ea22 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift @@ -74,31 +74,29 @@ final class BMCViewController: MWMViewController { } private func shareCategoryFile(at index: Int, anchor: UIView) { - viewModel.shareCategoryFile(at: index) { - switch $0 { - case let .success(url): - let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body")) - { [weak self] _, _, _, _ in - self?.viewModel?.finishShareCategory() - } - shareController?.present(inParentViewController: self, anchorView: anchor) - case let .error(title, text): - MWMAlertViewController.activeAlert().presentInfoAlert(title, text: text) - } - } + viewModel.shareCategoryFile(at: index, handler: sharingResultHandler(anchorView: anchor)) } private func shareAllCategories(anchor: UIView?) { - viewModel.shareAllCategories { - switch $0 { - case let .success(url): + viewModel.shareAllCategories(handler: sharingResultHandler(anchorView: anchor)) + } + + private func sharingResultHandler(anchorView: UIView?) -> SharingResultCompletionHandler { + { [weak self] status, url in + guard let self else { return } + switch status { + case .success: let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body")) { [weak self] _, _, _, _ in self?.viewModel?.finishShareCategory() } - shareController?.present(inParentViewController: self, anchorView: anchor) - case let .error(title, text): - MWMAlertViewController.activeAlert().presentInfoAlert(title, text: text) + shareController?.present(inParentViewController: self, anchorView: anchorView) + case .emptyCategory: + MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"), + text: L("bookmarks_error_message_share_empty")) + case .fileError, .archiveError: + MWMAlertViewController.activeAlert().presentInfoAlert(L("dialog_routing_system_error"), + text: L("bookmarks_error_message_share_general")) } } } diff --git a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift index 4eb29872f3..88adf9c2c7 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift @@ -5,11 +5,6 @@ protocol BMCView: AnyObject { func conversionFinished(success: Bool) } -enum BMCShareCategoryStatus { - case success(URL) - case error(title: String, text: String) -} - final class BMCDefaultViewModel: NSObject { private let manager = BookmarksManager.shared() @@ -24,9 +19,6 @@ final class BMCDefaultViewModel: NSObject { private var isAuthenticated = false private var filesPrepared = false - typealias OnPreparedToShareHandler = (BMCShareCategoryStatus) -> Void - private var onPreparedToShareCategory: OnPreparedToShareHandler? - let minCategoryNameLength: UInt = 0 let maxCategoryNameLength: UInt = 60 @@ -137,20 +129,17 @@ extension BMCDefaultViewModel { return manager.checkCategoryName(name) } - func shareCategoryFile(at index: Int, handler: @escaping OnPreparedToShareHandler) { + func shareCategoryFile(at index: Int, handler: @escaping SharingResultCompletionHandler) { let category = categories[index] - onPreparedToShareCategory = handler - manager.shareCategory(category.categoryId) + manager.shareCategory(category.categoryId, completion: handler) } - func shareAllCategories(handler: @escaping OnPreparedToShareHandler) { - onPreparedToShareCategory = handler - manager.shareAllCategories() + func shareAllCategories(handler: @escaping SharingResultCompletionHandler) { + manager.shareAllCategories(completion: handler) } func finishShareCategory() { manager.finishShareCategory() - onPreparedToShareCategory = nil } func addToObserverList() { @@ -179,16 +168,4 @@ extension BMCDefaultViewModel: BookmarksObserver { func onBookmarkDeleted(_: MWMMarkID) { reloadData() } - - func onBookmarksCategoryFilePrepared(_ status: BookmarksShareStatus) { - switch status { - case .success: - onPreparedToShareCategory?(.success(manager.shareCategoryURL())) - case .emptyCategory: - onPreparedToShareCategory?(.error(title: L("bookmarks_error_title_share_empty"), text: L("bookmarks_error_message_share_empty"))) - case .archiveError: fallthrough - case .fileError: - onPreparedToShareCategory?(.error(title: L("dialog_routing_system_error"), text: L("bookmarks_error_message_share_general"))) - } - } }