Merge pull request #130 from samuele3hu/fix_v_3_4_facebook

minggo · minggo · commit e872e05212cd · 2015-01-23T14:20:16.000+08:00
issue #10186:setSDKVersion of facebookagent would trigger crash on the iOS platform
diff --git a/plugins/facebook/proj.ios/PluginFacebook/ShareFacebook.m b/plugins/facebook/proj.ios/PluginFacebook/ShareFacebook.m
@@ -179,7 +179,7 @@ - (NSString*) getSDKVersion
 }
 
 - (void) setSDKVersion: (NSString *)sdkVersion{
-     [FBSettings setsdkVersion:sdkVersion];
+     [FBSettings setSDKVersion:sdkVersion];
 }
 
 - (NSString*) getPluginVersion
diff --git a/plugins/facebook/proj.ios/PluginFacebook/UserFacebook.m b/plugins/facebook/proj.ios/PluginFacebook/UserFacebook.m
@@ -99,7 +99,7 @@ - (NSString*) getSDKVersion{
     return [FBSettings sdkVersion];
 }
 - (void) setSDKVersion: (NSString *)sdkVersion{
-    [FBSettings setsdkVersion:sdkVersion];
+    [FBSettings setSDKVersion:sdkVersion];
 }
 - (NSString*) getPluginVersion{
     return @"";
diff --git a/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSettings.h b/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/DeprecatedHeaders/FBSettings.h
@@ -97,7 +97,7 @@ typedef NS_ENUM(NSUInteger, FBRestrictedTreatment) {
  @abstract Retrieve the current iOS SDK version.
  
  */
-+ (void)setsdkVersion:(NSString*)version;
++ (void)setSDKVersion:(NSString*)version;
 
 /*!
  @method
diff --git a/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/FacebookSDK b/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/FacebookSDK
diff --git a/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSettings.h b/plugins/facebook/proj.ios/sdk/FacebookSDK.framework/Versions/A/Headers/FBSettings.h
@@ -97,7 +97,7 @@ typedef NS_ENUM(NSUInteger, FBRestrictedTreatment) {
  @abstract Retrieve the current iOS SDK version.
  
  */
-+ (void)setsdkVersion:(NSString*)version;
++ (void)setSDKVersion:(NSString*)version;
 
 /*!
  @method

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ - (NSString*) getSDKVersion`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`- (void) setSDKVersion: (NSString *)sdkVersion{`
`182`		`- [FBSettings setsdkVersion:sdkVersion];`
	`182`	`+ [FBSettings setSDKVersion:sdkVersion];`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`- (NSString*) getPluginVersion`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ - (NSString*) getSDKVersion{`
`99`	`99`	`return [FBSettings sdkVersion];`
`100`	`100`	`}`
`101`	`101`	`- (void) setSDKVersion: (NSString *)sdkVersion{`
`102`		`- [FBSettings setsdkVersion:sdkVersion];`
	`102`	`+ [FBSettings setSDKVersion:sdkVersion];`
`103`	`103`	`}`
`104`	`104`	`- (NSString*) getPluginVersion{`
`105`	`105`	`return @"";`