diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm index 43300c5171..48276685e4 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm @@ -24,7 +24,7 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; return alert; } -// Build attributet string in format "{alert_reauth_message_ios} {alert_reauth_link_text_ios}" +// Build attributed string in format "{alert_reauth_message_ios} {alert_reauth_link_text_ios}" // where {alert_reauth_link_text_ios} has blue color as a link + (NSMutableAttributedString*)buildAlertMessage { @@ -56,6 +56,9 @@ static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; - (IBAction)showMoreInfo { NSLog(@"Navigate to URL: https://github.com/organicmaps/organicmaps/issues/6144"); + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/organicmaps/organicmaps/issues/6144"] + options:@{} + completionHandler:nil]; } - (IBAction)closeTap diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 5531911ccb..cf82f0bce2 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -338,6 +338,11 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) self.controlsManager.menuState = self.controlsManager.menuRestoreState; + + // Added in https://github.com/organicmaps/organicmaps/pull/7333 + // After all users migrate to OAuth2 we can remove next code + [self migrateOAuthCredentials]; + /// @todo: Uncomment update dialog when will be ready to handle big traffic bursts. /* @@ -363,8 +368,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; // Otherwise PP container view is nil, or there is no animation/selection of the point. if (DeepLinkHandler.shared.isLaunchedByDeeplink) (void)[DeepLinkHandler.shared handleDeepLinkAndReset]; - else - [self migrateOAuthCredentials]; } - (void)viewDidLayoutSubviews { @@ -423,8 +426,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; - (void)migrateOAuthCredentials { if (osm_auth_ios::AuthorizationHaveOAuth1Credentials()) { - //osm_auth_ios::AuthorizationClearOAuth1Credentials(); - // TODO + osm_auth_ios::AuthorizationClearOAuth1Credentials(); [self.alertController presentOsmReauthAlert]; } }