From 1d2b67ff7628e3e9193cc5641f7a766011b25bb7 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Fri, 2 Mar 2018 12:41:02 +0300
Subject: [PATCH] [device-model] [ios] Moved trackwarning alert setting 2
 MWMSettings.

---
 iphone/Maps/Classes/MapsAppDelegate.mm              | 11 ++---------
 iphone/Maps/Core/Settings/MWMSettings.h             |  3 +++
 iphone/Maps/Core/Settings/MWMSettings.mm            | 13 +++++++++++++
 .../UI/Settings/MWMRecentTrackSettingsController.mm |  6 +-----
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 82f05ec318..850ba1e7a2 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -43,11 +43,6 @@ extern NSString * const MapsStatusChangedNotification = @"MapsStatusChangedNotif
 extern NSString * const kUDAlreadyRatedKey = @"UserAlreadyRatedApp";
 extern NSString * const kUDAlreadySharedKey = @"UserAlreadyShared";
 
-extern NSString * const kUDTrackWarningAlertWasShown;
-extern string const kCountryCodeKey;
-extern string const kUniqueIdKey;
-extern string const kLanguageKey;
-
 namespace
 {
 NSString * const kUDLastLaunchDateKey = @"LastLaunchDate";
@@ -486,16 +481,14 @@ using namespace osm_auth_ios;
   if (![topVc isKindOfClass:[MWMViewController class]])
     return;
 
-  NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
-  if ([ud boolForKey:kUDTrackWarningAlertWasShown])
+  if ([MWMSettings isTrackWarningAlertShown])
     return;
 
   [topVc.alertController presentTrackWarningAlertWithCancelBlock:^{
     GpsTracker::Instance().SetEnabled(false);
   }];
 
-  [ud setBool:YES forKey:kUDTrackWarningAlertWasShown];
-  [ud synchronize];
+  [MWMSettings setTrackWarningAlertShown:YES];
   LOG(LINFO, ("applicationWillEnterForeground - end"));
 }
 
diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h
index 5d6ec219b6..b4e8333acb 100644
--- a/iphone/Maps/Core/Settings/MWMSettings.h
+++ b/iphone/Maps/Core/Settings/MWMSettings.h
@@ -36,4 +36,7 @@
 + (BOOL)transliteration;
 + (void)setTransliteration:(BOOL)transliteration;
 
++ (BOOL)isTrackWarningAlertShown;
++ (void)setTrackWarningAlertShown:(BOOL)shown;
+
 @end
diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm
index 59fe06321e..86ff5ba1fe 100644
--- a/iphone/Maps/Core/Settings/MWMSettings.mm
+++ b/iphone/Maps/Core/Settings/MWMSettings.mm
@@ -23,6 +23,7 @@ char const * kStatisticsEnabledSettingsKey = "StatisticsEnabled";
 NSString * const kUDAutoNightModeOff = @"AutoNightModeOff";
 NSString * const kThemeMode = @"ThemeMode";
 NSString * const kSpotlightLocaleLanguageId = @"SpotlightLocaleLanguageId";
+NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown";
 }  // namespace
 
 @implementation MWMSettings
@@ -181,4 +182,16 @@ NSString * const kSpotlightLocaleLanguageId = @"SpotlightLocaleLanguageId";
   f.AllowTransliteration(isTransliteration);
 }
 
++ (BOOL)isTrackWarningAlertShown
+{
+  return [NSUserDefaults.standardUserDefaults boolForKey:kUDTrackWarningAlertWasShown];
+}
+
++ (void)setTrackWarningAlertShown:(BOOL)shown
+{
+  NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
+  [ud setBool:shown forKey:kUDTrackWarningAlertWasShown];
+  [ud synchronize];
+}
+
 @end
diff --git a/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm b/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm
index 9ddbf3c8c5..956e3f7277 100644
--- a/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm
+++ b/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm
@@ -5,8 +5,6 @@
 
 #include "map/gps_tracker.hpp"
 
-extern NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown";
-
 typedef NS_ENUM(NSUInteger, DurationInHours) { One = 1, Two = 2, Six = 6, Twelve = 12, Day = 24 };
 
 @interface MWMRecentTrackSettingsController ()
@@ -64,9 +62,7 @@ typedef NS_ENUM(NSUInteger, DurationInHours) { One = 1, Two = 2, Six = 6, Twelve
     if (!tracker.IsEnabled())
     {
       tracker.SetEnabled(true);
-      NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
-      [ud setBool:NO forKey:kUDTrackWarningAlertWasShown];
-      [ud synchronize];
+      [MWMSettings setTrackWarningAlertShown:NO];
     }
     f.ConnectToGpsTracker();