From 311f736b66861977f6fce69b83c9fc1e61dbff82 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:02:52 +0300 Subject: [PATCH 1/7] [cherry] [FABRIC-7708] Removed incorrect assert. --- base/buffer_vector.hpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp index 2da0a75347..d9d664041c 100644 --- a/base/buffer_vector.hpp +++ b/base/buffer_vector.hpp @@ -224,10 +224,7 @@ public: T const * data() const { if (IsDynamic()) - { - ASSERT(!m_dynamic.empty(), ()); - return &m_dynamic[0]; - } + return m_dynamic.data(); return &m_static[0]; } @@ -235,10 +232,7 @@ public: T * data() { if (IsDynamic()) - { - ASSERT(!m_dynamic.empty(), ()); - return &m_dynamic[0]; - } + return m_dynamic.data(); return &m_static[0]; } From 917eb4f5a5143f3895dd487ab03a2a3be5bd15a4 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:04:28 +0300 Subject: [PATCH 2/7] [cherry] [FABRIC-7708] Fixed special search marks for local ads and tinkoff objects. # Conflicts: # map/framework.cpp --- map/framework.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index 15caf2ccab..054f04c689 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1748,7 +1748,8 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin, SearchMarkPoint * mark = static_cast(guard.m_controller.CreateUserMark(r.GetFeatureCenter())); ASSERT_EQUAL(mark->GetMarkType(), UserMark::Type::SEARCH, ()); - if (r.GetResultType() == search::Result::RESULT_FEATURE) + auto const isFeature = r.GetResultType() == search::Result::RESULT_FEATURE; + if (isFeature) mark->SetFoundFeature(r.GetFeatureID()); mark->SetMatchedName(r.GetString()); @@ -1756,7 +1757,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin, mark->SetCustomSymbol("search-booking"); else if (r.m_metadata.m_isSponsoredBank) mark->SetCustomSymbol("search-tinkoff"); - else if (m_localAdsManager.Contains(r.GetFeatureID())) + else if (isFeature && m_localAdsManager.Contains(r.GetFeatureID())) mark->SetCustomSymbol("search-adv"); } } From 46e368af052c128edae9d4cdc1ad929000f5063c Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:05:46 +0300 Subject: [PATCH 3/7] [cherry] [FABRIC-7708] [ios] Fixed search results processing. --- iphone/Maps/Core/Search/MWMSearch.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 5507940f03..0f55f5f1f2 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -88,6 +88,11 @@ using TObservers = NSHashTable<__kindof TObserver>; return; if (timestamp != self.lastSearchStamp) return; + + self->m_everywhereResults = results; + self->m_isLocalAdsCustomer = isLocalAdsCustomer; + self.suggestionsCount = results.GetSuggestsCount(); + if (results.IsEndMarker()) { [self checkIsHotelResults:results]; @@ -106,9 +111,6 @@ using TObservers = NSHashTable<__kindof TObserver>; } else { - self->m_everywhereResults = results; - self->m_isLocalAdsCustomer = isLocalAdsCustomer; - self.suggestionsCount = results.GetSuggestsCount(); [self updateItemsIndexWithBannerReload:NO]; [self onSearchResultsUpdated]; } From d775c89902bf5fb5f30916a38afbbebe16fd4374 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:06:13 +0300 Subject: [PATCH 4/7] [cherry] [FABRIC-7708] [ios] Fixed UI layout bug. --- .../TrafficButton/MWMTrafficButtonViewController.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index 39150d06e3..b13f7a5677 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -120,7 +120,7 @@ NSArray * imagesWithName(NSString * name) CGFloat const leftOffset = self.hidden ? -self.view.width : self.leftBound + kViewControlsOffsetToBounds; UIView * ov = self.view.superview; - [ov layoutIfNeeded]; + [ov setNeedsLayout]; self.topOffset.constant = topOffset; self.leftOffset.constant = leftOffset; [UIView animateWithDuration:kDefaultAnimationDuration From a1007b4559aca841196ea27609e0f50caf5ed17a Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:06:42 +0300 Subject: [PATCH 5/7] [cherry] [FABRIC-7708] [ios] Fixed search ads indexer crash. --- iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index 849b5f2b87..8598a3de81 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -148,6 +148,7 @@ BOOL const noResults = [MWMSearch resultsCount] == 0; self.tableView.hidden = noResults; [(MWMSearchTableView *)self.view hideNoResultsView:!noResults]; + [self reloadData]; } - (void)onSearchResultsUpdated From 08fdbea183489614fc8c8a286b6ed1a78a34e36a Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 25 May 2017 16:06:58 +0300 Subject: [PATCH 6/7] [cherry] [FABRIC-7708] Increased app version to 7.3.4 --- xcode/common.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 2dee126d88..5403353cd2 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -1,4 +1,4 @@ -CURRENT_PROJECT_VERSION = 7.3.3 +CURRENT_PROJECT_VERSION = 7.3.4 // Paths OMIM_ROOT = $(PROJECT_DIR)/../.. From 744de98fef1780e6085949307f6e1c296995582b Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Thu, 25 May 2017 13:03:05 +0300 Subject: [PATCH 7/7] [cherry] [ios] Handle deep link from push notification. --- iphone/Maps/Classes/MapsAppDelegate.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 00e63b8f38..30b0ea2d75 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -747,7 +747,10 @@ using namespace osm_auth_ios; m_sourceApplication = sourceApplication; if ([self checkLaunchURL:url]) + { + [self handleURLs]; return YES; + } return [[FBSDKApplicationDelegate sharedInstance] application:application openURL:url