From 0c7444e7ffca7ba201c73b7bf6a264f6ff49dd48 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 11 Sep 2019 15:09:11 +0300 Subject: [PATCH] [ios] no need to use url into upload bookmark completion block --- .../Sharing/BookmarksSharingViewController.swift | 4 ++-- .../Categories/Sharing/EditOnWebViewController.swift | 2 +- iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm | 3 +-- iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h | 3 +-- iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h | 2 +- iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm | 11 +++++------ 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift index 871d148cdf..c7f2211c0f 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift @@ -233,7 +233,7 @@ final class BookmarksSharingViewController: MWMTableViewController { with: .automatic) } - manager.uploadAndPublishCategory(withId: category.categoryId, progress: nil) { (_, error) in + manager.uploadAndPublishCategory(withId: category.categoryId, progress: nil) { (error) in if let error = error as NSError? { self.uploadAndPublishCell.cellState = .normal self.showErrorAlert(error) @@ -277,7 +277,7 @@ final class BookmarksSharingViewController: MWMTableViewController { section: s.privateSectionIndex)], with: .automatic) } - s.manager.uploadAndGetDirectLinkCategory(withId: s.category.categoryId, progress: nil) { (_, error) in + s.manager.uploadAndGetDirectLinkCategory(withId: s.category.categoryId, progress: nil) { (error) in if let error = error as NSError? { s.getDirectLinkCell.cellState = .normal s.showErrorAlert(error) diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift index 80f54905fc..7a9bf14c63 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift @@ -63,7 +63,7 @@ final class EditOnWebViewController: MWMViewController { sendMeLinkButton.setTitle(nil, for: .normal) MWMBookmarksManager.shared().uploadCategory(withId: category.categoryId, progress: { (progress) in - }) { [weak self] (url, error) in + }) { [weak self] (error) in guard let self = self else { return } self.activityIndicator.isHidden = true self.sendMeLinkButton.isEnabled = true diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm index d1157197ae..81daceeba0 100644 --- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm @@ -179,8 +179,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) auto observer = self.catalogObservers[[NSString stringWithFormat:@"%lld", originCategoryId]]; if (observer) { - NSURL * url = [self sharingUrlForCategoryId:resultCategoryId]; - [observer onUploadComplete:uploadResult withUrl:url]; + [observer onUploadComplete:uploadResult]; [self.catalogObservers removeObjectForKey:observer.categoryId]; } }; diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h b/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h index a31bbdf689..e568457a8a 100644 --- a/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h +++ b/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h @@ -37,5 +37,4 @@ static NSString * const kCategoryUploadStatusKey = @"kCategoryUploadStatusKey"; typedef void (^ProgressBlock)(MWMCategoryProgress progress); typedef void (^DownloadCompletionBlock)(UInt64 categoryId, NSError * error); -typedef void (^UploadCompletionBlock)(NSURL * url, NSError * error); - +typedef void (^UploadCompletionBlock)(NSError* error); diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h b/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h index d853cb7c2c..4bd0e9a4f0 100644 --- a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h +++ b/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h @@ -14,6 +14,6 @@ - (void)onImportStart; - (void)onImportCompleteSuccessful:(BOOL)success forCategoryId:(UInt64)categoryId; - (void)onUploadStart; -- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result withUrl:(NSURL *)categoryUrl; +- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result; @end diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm b/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm index 1aa9f44d8d..2009476847 100644 --- a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm +++ b/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm @@ -61,14 +61,13 @@ self.progressBlock(MWMCategoryProgressUploadStarted); } -- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result withUrl:(NSURL *)categoryUrl -{ +- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result { MWMCategoryUploadStatus uploadStatus; switch (result) { case BookmarkCatalog::UploadResult::Success: if (self.uploadCompletionBlock) - self.uploadCompletionBlock(categoryUrl, nil); + self.uploadCompletionBlock(nil); return; case BookmarkCatalog::UploadResult::NetworkError: uploadStatus = MWMCategoryUploadStatusNetworkError; @@ -90,9 +89,9 @@ break; } if (self.uploadCompletionBlock) - self.uploadCompletionBlock(nil, [[NSError alloc] initWithDomain:kCatalogErrorDomain - code:kCategoryUploadFailedCode - userInfo:@{kCategoryUploadStatusKey : @(uploadStatus)}]); + self.uploadCompletionBlock([[NSError alloc] initWithDomain:kCatalogErrorDomain + code:kCategoryUploadFailedCode + userInfo:@{kCategoryUploadStatusKey: @(uploadStatus)}]); } @end