From 655d1b6e944fffd9645894a93e2058b8b200d2c3 Mon Sep 17 00:00:00 2001 From: mikhaylenko Date: Mon, 14 Sep 2015 11:51:08 +0300 Subject: Revert "[ios] Update FBSDK to v.4.6.0" --- .../CustomAlert/FacebookAlert/MWMFacebookAlert.mm | 2 +- iphone/Maps/MAPSME.plist | 4 --- .../Statistics/FBSDKCoreKit.framework/FBSDKCoreKit | Bin 19193104 -> 12186472 bytes .../Headers/FBSDKAccessToken.h | 4 --- .../Headers/FBSDKAppEvents.h | 4 +-- .../Headers/FBSDKConstants.h | 10 ------- .../FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h | 2 +- .../Statistics/FBSDKCoreKit.framework/Info.plist | Bin 758 -> 759 bytes .../PrivateHeaders/FBSDKBridgeAPIProtocol.h | 2 ++ .../PrivateHeaders/FBSDKGraphRequestMetadata.h | 4 +-- .../FBSDKLoginKit.framework/FBSDKLoginKit | Bin 4499128 -> 3026680 bytes .../Headers/FBSDKLoginButton.h | 9 ------ .../Headers/FBSDKLoginManager.h | 31 +++------------------ .../Statistics/FBSDKLoginKit.framework/Info.plist | Bin 761 -> 762 bytes .../FBSDKShareKit.framework/FBSDKShareKit | Bin 13215528 -> 8750520 bytes .../Headers/FBSDKAppInviteDialog.h | 19 +------------ .../Headers/FBSDKShareDialog.h | 4 +-- .../Statistics/FBSDKShareKit.framework/Info.plist | Bin 761 -> 762 bytes 18 files changed, 15 insertions(+), 80 deletions(-) diff --git a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.mm b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.mm index 4196443a8f..9e7b6743ef 100644 --- a/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.mm @@ -35,7 +35,7 @@ extern NSString * const kUDAlreadySharedKey; FBSDKAppInviteContent * const content = [[FBSDKAppInviteContent alloc] init]; content.appLinkURL = [NSURL URLWithString:kFacebookAppName]; content.appInvitePreviewImageURL = [NSURL URLWithString:kFacebookAlertPreviewImage]; - [FBSDKAppInviteDialog showFromViewController:self.alertController.ownerViewController withContent:content delegate:nil]; + [FBSDKAppInviteDialog showWithContent:content delegate:nil]; } - (IBAction)notNowButtonTap:(id)sender diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/MAPSME.plist index ac3e4b9abf..db70c673bc 100644 --- a/iphone/Maps/MAPSME.plist +++ b/iphone/Maps/MAPSME.plist @@ -2,10 +2,6 @@ - LSApplicationQueriesSchemes - - fbauth2 - AdmanTrackerAppID ***REMOVED*** CFBundleDevelopmentRegion diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/FBSDKCoreKit b/iphone/Maps/Statistics/FBSDKCoreKit.framework/FBSDKCoreKit index 475883039c..b26e040b6f 100644 Binary files a/iphone/Maps/Statistics/FBSDKCoreKit.framework/FBSDKCoreKit and b/iphone/Maps/Statistics/FBSDKCoreKit.framework/FBSDKCoreKit differ diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h index ab9f9b97bf..c364cf2c1c 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAccessToken.h @@ -37,10 +37,6 @@ FBSDK_EXTERN NSString *const FBSDKAccessTokenDidChangeNotification; which do not change the user. If you're only interested in user changes (such as logging out), you should check for the existence of this key. The value is a NSNumber with a boolValue. - - On a fresh start of the app where the SDK reads in the cached value - of an access token, this key will also exist since the access token - is moving from a null state (no user) to a non-null state (user). */ FBSDK_EXTERN NSString *const FBSDKAccessTokenDidChangeUserID; diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h index 7f4a85aabb..ecfe0c320b 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKAppEvents.h @@ -171,7 +171,7 @@ FBSDK_EXTERN NSString *const FBSDKAppEventParameterValueNo; + Events will be accumulated when the app is in a disconnected state, and sent when the connection is restored and one of the above 'flush' conditions are met. - + The `FBSDKAppEvents` class is thread-safe in that events may be logged from any of the app's threads. + + The `FBSDKAppEvents` class in thread-safe in that events may be logged from any of the app's threads. + The developer can set the `flushBehavior` on `FBSDKAppEvents` to force the flushing of events to only occur on an explicit call to the `flush` method. @@ -409,7 +409,7 @@ FBSDK_EXTERN NSString *const FBSDKAppEventParameterValueNo; In some cases, apps want to use one Facebook App ID for login and social presence and another for App Event logging. (An example is if multiple apps from the same company share an app ID for login, but want distinct logging.) By default, this value is `nil`, and defers to the `FBSDKAppEventsOverrideAppIDBundleKey` - plist value. If that's not set, it defaults to `[FBSDKSettings appID]`. + plist value. If that's not set, it defaults to `[FBSDKSettigns appID]`. This should be set before any other calls are made to `FBSDKAppEvents`. Thus, you should set it in your application delegate's `application:didFinishLaunchingWithOptions:` delegate. diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKConstants.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKConstants.h index 5f53161244..7ce42dbc3e 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKConstants.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKConstants.h @@ -93,16 +93,6 @@ typedef NS_ENUM(NSInteger, FBSDKErrorCode) @abstract Indicates an operation failed because a required access token was not found. */ FBSDKAccessTokenRequiredErrorCode, - - /*! - @abstract Indicates an app switch (typically for a dialog) failed because the destination app is out of date. - */ - FBSDKAppVersionUnsupportedErrorCode, - - /*! - @abstract Indicates an app switch to the browser (typically for a dialog) failed. - */ - FBSDKBrowswerUnavailableErrorCode, }; /*! diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h index fc2945798b..b8f40f9cc9 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Headers/FBSDKCoreKit.h @@ -34,5 +34,5 @@ #import #import -#define FBSDK_VERSION_STRING @"4.6.0" +#define FBSDK_VERSION_STRING @"4.4.0" #define FBSDK_TARGET_PLATFORM_VERSION @"v2.4" diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Info.plist b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Info.plist index 64575b8645..e8bbb1337b 100644 Binary files a/iphone/Maps/Statistics/FBSDKCoreKit.framework/Info.plist and b/iphone/Maps/Statistics/FBSDKCoreKit.framework/Info.plist differ diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKBridgeAPIProtocol.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKBridgeAPIProtocol.h index 679577c4b8..1c41f1a8e9 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKBridgeAPIProtocol.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKBridgeAPIProtocol.h @@ -30,6 +30,8 @@ FBSDK_EXTERN NSString *const FBSDKBridgeAPIVersionKey; @protocol FBSDKBridgeAPIProtocol +@property (nonatomic, assign, readonly, getter=isEnabled) BOOL enabled; + - (NSURL *)requestURLWithActionID:(NSString *)actionID scheme:(NSString *)scheme methodName:(NSString *)methodName diff --git a/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKGraphRequestMetadata.h b/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKGraphRequestMetadata.h index cd218c43a4..801485d32d 100644 --- a/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKGraphRequestMetadata.h +++ b/iphone/Maps/Statistics/FBSDKCoreKit.framework/PrivateHeaders/FBSDKGraphRequestMetadata.h @@ -20,8 +20,8 @@ #import -// Internal only class to facilitate FBSDKGraphRequest processing, specifically -// associating FBSDKGraphRequest and FBSDKGraphRequestHandler instances and necessary +// Internal only class to facilitate FBRequest processing, specifically +// associating FBRequest and FBRequestHandler instances and necessary // data for retry processing. @interface FBSDKGraphRequestMetadata : NSObject diff --git a/iphone/Maps/Statistics/FBSDKLoginKit.framework/FBSDKLoginKit b/iphone/Maps/Statistics/FBSDKLoginKit.framework/FBSDKLoginKit index 887b6f02c0..9a1824962d 100644 Binary files a/iphone/Maps/Statistics/FBSDKLoginKit.framework/FBSDKLoginKit and b/iphone/Maps/Statistics/FBSDKLoginKit.framework/FBSDKLoginKit differ diff --git a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h index 51499d4f9d..1cbd262ede 100644 --- a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h +++ b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginButton.h @@ -100,7 +100,6 @@ typedef NS_ENUM(NSUInteger, FBSDKLoginButtonTooltipBehavior) */ @protocol FBSDKLoginButtonDelegate -@required /*! @abstract Sent to the delegate when the button was used to login. @param loginButton the sender @@ -117,12 +116,4 @@ didCompleteWithResult:(FBSDKLoginManagerLoginResult *)result */ - (void)loginButtonDidLogOut:(FBSDKLoginButton *)loginButton; -@optional -/*! - @abstract Sent to the delegate when the button is about to login. - @param loginButton the sender - @return YES if the login should be allowed to proceed, NO otherwise - */ -- (BOOL) loginButtonWillLogin:(FBSDKLoginButton *)loginButton; - @end diff --git a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h index 728e8f22b7..2a6ec8fb86 100644 --- a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h +++ b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Headers/FBSDKLoginManager.h @@ -18,7 +18,6 @@ #import #import -#import @class FBSDKLoginManagerLoginResult; @@ -86,10 +85,8 @@ typedef NS_ENUM(NSUInteger, FBSDKLoginBehavior) */ FBSDKLoginBehaviorBrowser, /*! - @abstract Attempts log in through the Facebook account currently signed in through - the device Settings. - @note If the account is not available to the app (either not configured by user or - as determined by the SDK) this behavior falls back to \c FBSDKLoginBehaviorNative. + @abstract Attempts log in through the Facebook account currently signed in through Settings. + If no Facebook account is signed in, falls back to \c FBSDKLoginBehaviorNative. */ FBSDKLoginBehaviorSystemAccount, /*! @@ -127,24 +124,10 @@ typedef NS_ENUM(NSUInteger, FBSDKLoginBehavior) */ @property (assign, nonatomic) FBSDKLoginBehavior loginBehavior; -/*! - @deprecated use logInWithReadPermissions:fromViewController:handler: instead - */ -- (void)logInWithReadPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler -__attribute__ ((deprecated("use logInWithReadPermissions:fromViewController:handler: instead"))); - -/*! - @deprecated use logInWithPublishPermissions:fromViewController:handler: instead - */ -- (void)logInWithPublishPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler -__attribute__ ((deprecated("use logInWithPublishPermissions:fromViewController:handler: instead"))); - /*! @abstract Logs the user in or authorizes additional permissions. @param permissions the optional array of permissions. Note this is converted to NSSet and is only an NSArray for the convenience of literal syntax. - @param fromViewController the view controller to present from. If nil, the topmost view controller will be - automatically determined as best as possible. @param handler the callback. @discussion Use this method when asking for read permissions. You should only ask for permissions when they are needed and explain the value to the user. You can inspect the result.declinedPermissions to also @@ -157,16 +140,12 @@ __attribute__ ((deprecated("use logInWithPublishPermissions:fromViewController:h already contains the permissions you need before asking to reduce unnecessary app switching. For example, you could make that check at viewDidLoad. */ -- (void)logInWithReadPermissions:(NSArray *)permissions - fromViewController:(UIViewController *)fromViewController - handler:(FBSDKLoginManagerRequestTokenHandler)handler; +- (void)logInWithReadPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler; /*! @abstract Logs the user in or authorizes additional permissions. @param permissions the optional array of permissions. Note this is converted to NSSet and is only an NSArray for the convenience of literal syntax. - @param fromViewController the view controller to present from. If nil, the topmost view controller will be - automatically determined as best as possible. @param handler the callback. @discussion Use this method when asking for publish permissions. You should only ask for permissions when they are needed and explain the value to the user. You can inspect the result.declinedPermissions to also @@ -179,9 +158,7 @@ __attribute__ ((deprecated("use logInWithPublishPermissions:fromViewController:h already contains the permissions you need before asking to reduce unnecessary app switching. For example, you could make that check at viewDidLoad. */ -- (void)logInWithPublishPermissions:(NSArray *)permissions - fromViewController:(UIViewController *)fromViewController - handler:(FBSDKLoginManagerRequestTokenHandler)handler; +- (void)logInWithPublishPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler; /*! @abstract Logs the user out diff --git a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Info.plist b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Info.plist index 744b6525ad..fb3726e91d 100644 Binary files a/iphone/Maps/Statistics/FBSDKLoginKit.framework/Info.plist and b/iphone/Maps/Statistics/FBSDKLoginKit.framework/Info.plist differ diff --git a/iphone/Maps/Statistics/FBSDKShareKit.framework/FBSDKShareKit b/iphone/Maps/Statistics/FBSDKShareKit.framework/FBSDKShareKit index 60c890b877..cee2fef732 100644 Binary files a/iphone/Maps/Statistics/FBSDKShareKit.framework/FBSDKShareKit and b/iphone/Maps/Statistics/FBSDKShareKit.framework/FBSDKShareKit differ diff --git a/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKAppInviteDialog.h b/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKAppInviteDialog.h index 0859d4c33c..3b7494eec3 100644 --- a/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKAppInviteDialog.h +++ b/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKAppInviteDialog.h @@ -17,7 +17,6 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #import -#import #import @@ -30,26 +29,10 @@ /*! @abstract Convenience method to show a FBSDKAppInviteDialog - @param viewController A UIViewController to present the dialog from. @param content The content for the app invite. @param delegate The receiver's delegate. -*/ -+ (instancetype)showFromViewController:(UIViewController *)viewController - withContent:(FBSDKAppInviteContent *)content - delegate:(id)delegate; - - -/*! - @deprecated use showFromViewController:withContent:delegate: instead - */ -+ (instancetype)showWithContent:(FBSDKAppInviteContent *)content delegate:(id)delegate -__attribute__ ((deprecated("use showFromViewController:withContent:delegate: instead"))); - -/*! - @abstract A UIViewController to present the dialog from. - @discussion If not specified, the top most view controller will be automatically determined as best as possible. */ -@property (nonatomic, weak) UIViewController *fromViewController; ++ (instancetype)showWithContent:(FBSDKAppInviteContent *)content delegate:(id)delegate; /*! @abstract The receiver's delegate or nil if it doesn't have a delegate. diff --git a/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h b/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h index 29489a6b34..3fc15cb924 100644 --- a/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h +++ b/iphone/Maps/Statistics/FBSDKShareKit.framework/Headers/FBSDKShareDialog.h @@ -38,8 +38,8 @@ delegate:(id)delegate; /*! - @abstract A UIViewController to present the dialog from. - @discussion If not specified, the top most view controller will be automatically determined as best as possible. + @abstract A UIViewController to present the dialog from, if appropriate. + @discussion This value is required for FBSDKShareDialogModeShareSheet. */ @property (nonatomic, weak) UIViewController *fromViewController; diff --git a/iphone/Maps/Statistics/FBSDKShareKit.framework/Info.plist b/iphone/Maps/Statistics/FBSDKShareKit.framework/Info.plist index e140215fb2..55e76a8c63 100644 Binary files a/iphone/Maps/Statistics/FBSDKShareKit.framework/Info.plist and b/iphone/Maps/Statistics/FBSDKShareKit.framework/Info.plist differ -- cgit v1.2.3