From f075bcbe5ade31e9def7892c39671135f23491e2 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 4 Mar 2015 18:28:17 +0300 Subject: [PATCH] [ios] Removed unused FB Account Manager code. --- iphone/Maps/AccountManager.h | 15 ---- iphone/Maps/AccountManager.m | 86 ---------------------- iphone/Maps/Classes/MapViewController.mm | 1 - iphone/Maps/Classes/MapsAppDelegate.mm | 9 --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 14 ---- 5 files changed, 125 deletions(-) delete mode 100644 iphone/Maps/AccountManager.h delete mode 100644 iphone/Maps/AccountManager.m diff --git a/iphone/Maps/AccountManager.h b/iphone/Maps/AccountManager.h deleted file mode 100644 index 44b697015b..0000000000 --- a/iphone/Maps/AccountManager.h +++ /dev/null @@ -1,15 +0,0 @@ - -#import - -typedef void (^CompletionBlock)(BOOL success); - -@interface AccountManager : NSObject - -- (void)shareToFacebookWithCompletion:(CompletionBlock)block; - -- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation; -- (void)applicationDidBecomeActive:(UIApplication *)application; - -+ (instancetype)sharedManager; - -@end diff --git a/iphone/Maps/AccountManager.m b/iphone/Maps/AccountManager.m deleted file mode 100644 index c1c490db8d..0000000000 --- a/iphone/Maps/AccountManager.m +++ /dev/null @@ -1,86 +0,0 @@ - -#import "AccountManager.h" -#import -#import "UIKitCategories.h" - -@interface AccountManager () - -@property (nonatomic, copy) CompletionBlock completionBlock; - -@end - -@implementation AccountManager - -+ (instancetype)sharedManager -{ - static AccountManager * manager; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - manager = [[self alloc] init]; - }); - return manager; -} - -- (void)shareToFacebookWithCompletion:(CompletionBlock)block -{ - self.completionBlock = block; - NSString * permissionName = @"publish_actions"; - FBSession * session = [FBSession activeSession]; - if (session.isOpen) - { - if ([session.permissions containsObject:permissionName]) - { - [self shareTextToFacebookWithCompletion:block]; - } - else - { - [session requestNewPublishPermissions:@[permissionName] defaultAudience:FBSessionDefaultAudienceEveryone completionHandler:^(FBSession * session, NSError * error) { - if (error) - block(NO); - else - [self shareTextToFacebookWithCompletion:block]; - }]; - } - } - else - { - [FBSession openActiveSessionWithPublishPermissions:@[permissionName] defaultAudience:FBSessionDefaultAudienceEveryone allowLoginUI:YES completionHandler:^(FBSession * session, FBSessionState state, NSError * error) { - if (!error && state == FBSessionStateOpen) - [self shareTextToFacebookWithCompletion:block]; - else - block(NO); - }]; - } -} - -- (void)shareTextToFacebookWithCompletion:(CompletionBlock)block -{ - NSDictionary * parameters = @{@"message" : L(@"maps_me_is_free_today_facebook_post_ios"), - @"picture" : @"http://static.mapswithme.com/images/17th_august_promo.jpg", - @"link" : @"http://maps.me/get?17aug"}; - [FBRequestConnection startWithGraphPath:@"me/feed" parameters:parameters HTTPMethod:@"POST" completionHandler:^(FBRequestConnection * connection, id result, NSError * error) { - block(!error); - }]; -} - -- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation -{ - [[FBSession activeSession] setStateChangeHandler:^(FBSession * session, FBSessionState state, NSError * error) { - if (!error && state == FBSessionStateOpen) - [self shareToFacebookWithCompletion:self.completionBlock]; - else - self.completionBlock(NO); - }]; - - if ([FBAppCall handleOpenURL:url sourceApplication:sourceApplication]) - return YES; - - return NO; -} - -- (void)applicationDidBecomeActive:(UIApplication *)application -{ - [FBAppCall handleDidBecomeActive]; -} - -@end diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 67a107f6ea..69af917342 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -11,7 +11,6 @@ #import "SelectSetVC.h" #import "BookmarkDescriptionVC.h" #import "BookmarkNameVC.h" -#import "AccountManager.h" #import "SettingsAndMoreVC.h" #import "RouteView.h" #import "CountryTreeVC.h" diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 946d7c693f..5c5990717a 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -6,7 +6,6 @@ #import "UIKitCategories.h" #import "AppInfo.h" #import "LocalNotificationManager.h" -#import "AccountManager.h" #import #include @@ -237,10 +236,6 @@ void InitLocalizedStrings() [FBSettings setDefaultAppID:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"FacebookAppID"]]; [FBAppEvents activateApp]; -#ifdef OMIM_FULL - [[AccountManager sharedManager] applicationDidBecomeActive:application]; -#endif - f.GetLocationState()->InvalidatePosition(); } @@ -318,10 +313,6 @@ void InitLocalizedStrings() // We don't support HandleOpenUrl as it's deprecated from iOS 4.2 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation { -#ifdef OMIM_FULL - [[AccountManager sharedManager] application:application openURL:url sourceApplication:sourceApplication annotation:annotation]; -#endif - NSString * scheme = url.scheme; m_scheme = scheme; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index c07b34ade6..00b87793df 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 46F26D1F10F626CB00ECCA39 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */; }; 6B948E1F1A25533C00229BD5 /* libAppsFlyerLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B948E1B1A25533C00229BD5 /* libAppsFlyerLib.a */; }; 6BBD66B41A695722005FF58D /* MRGService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BBD66B21A695722005FF58D /* MRGService.framework */; }; - 97354B6E196EDD3A00352536 /* AccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 97354B6D196EDD3A00352536 /* AccountManager.m */; }; 6BDCBF471AA7561B004DAE48 /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BDCBF461AA7561B004DAE48 /* FacebookSDK.framework */; }; 974386DD19373EA400FD5659 /* ToastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 974386DC19373EA400FD5659 /* ToastView.m */; }; 9746492718EEE2F8004B4658 /* ToolbarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9746492618EEE2F8004B4658 /* ToolbarView.mm */; }; @@ -204,8 +203,6 @@ 77DDA9A116D504F900804BDB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 8D1107310486CEB800E47090 /* MAPSME.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MAPSME.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 972CDCC51887F1B7006641CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; - 97354B6C196EDD3A00352536 /* AccountManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountManager.h; sourceTree = ""; }; - 97354B6D196EDD3A00352536 /* AccountManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountManager.m; sourceTree = ""; }; 974386D81934CBAC00FD5659 /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FacebookSDK.framework; sourceTree = ""; }; 974386DB19373EA400FD5659 /* ToastView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToastView.h; sourceTree = ""; }; 974386DC19373EA400FD5659 /* ToastView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToastView.m; sourceTree = ""; }; @@ -644,8 +641,6 @@ children = ( EDC5C541175F2CA600420E92 /* ShareActionSheet.h */, EDC5C542175F2CA600420E92 /* ShareActionSheet.mm */, - 97354B6C196EDD3A00352536 /* AccountManager.h */, - 97354B6D196EDD3A00352536 /* AccountManager.m */, ); name = "Login & sharing"; sourceTree = ""; @@ -1248,7 +1243,6 @@ F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */, 9778E99D191A5B6600AD850A /* BookmarkDescriptionVC.mm in Sources */, 974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */, - 97354B6E196EDD3A00352536 /* AccountManager.m in Sources */, 97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */, 978F9242183B660F000D6C7C /* SelectableCell.m in Sources */, CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */, @@ -1334,7 +1328,6 @@ _RELEASE, TARGET_OS_IPHONE, "NS_BLOCK_ASSERTIONS=1", - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; @@ -1462,7 +1455,6 @@ DEBUG, _DEBUG, TARGET_OS_IPHONE, - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -1562,7 +1554,6 @@ TARGET_OS_IPHONE, DEBUG, _DEBUG, - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -1658,7 +1649,6 @@ DEBUG, _DEBUG, TARGET_OS_IPHONE, - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -1781,7 +1771,6 @@ _RELEASE, TARGET_OS_IPHONE, "NS_BLOCK_ASSERTIONS=1", - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; @@ -1881,7 +1870,6 @@ NDEBUG, TARGET_OS_IPHONE, "NS_BLOCK_ASSERTIONS=1", - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; @@ -1980,7 +1968,6 @@ _RELEASE, TARGET_OS_IPHONE, "NS_BLOCK_ASSERTIONS=1", - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; @@ -2078,7 +2065,6 @@ RELEASE, _RELEASE, "NS_BLOCK_ASSERTIONS=1", - OMIM_FULL, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES;