Skip to content
Browse files

Change package name to com.facebook.sdk

Summary:
Renamed package name from com.facebook.FBiOSSDK to com.facebook.sdk
Also cleaned up some other instances of FBiOSSDK appearing

Test Plan:
Ran unit tests
Ran samples

Reviewers: jacl, clang

Reviewed By: jacl

CC: msdkexp@, platform-diffs@lists, bhiller

Differential Revision: https://phabricator.fb.com/D532201

Task ID: 1167996
  • Loading branch information...
1 parent c89fea4 commit 562ca8eb3bfaed711bbf3e3ba82a204fed963bf9 @awzy awzy committed Jul 26, 2012
View
2 scripts/configure_simulator_for_unit_tests.sh
@@ -31,7 +31,7 @@ fi
function write_plist {
SIMULATOR_CONFIG_DIR="$1"/Documents
- SIMULATOR_CONFIG_FILE="$SIMULATOR_CONFIG_DIR"/FBiOSSDK-UnitTestConfig.plist
+ SIMULATOR_CONFIG_FILE="$SIMULATOR_CONFIG_DIR"/FacebookSDK-UnitTestConfig.plist
if [ ! -d "$SIMULATOR_CONFIG_DIR" ]; then
mkdir "$SIMULATOR_CONFIG_DIR"
View
4 src/FBError.h
@@ -17,7 +17,7 @@
#import <Foundation/Foundation.h>
/// The error domain of all error codes returned by the Facebook SDK
-extern NSString *const FBiOSSDKDomain;
+extern NSString *const FacebookSDKDomain;
// ----------------------------------------------------------------------------
// Keys in the userInfo NSDictionary of NSError where you can find additional
@@ -37,7 +37,7 @@ extern NSString *const FBErrorHTTPStatusCodeKey;
@abstract Error codes returned by the Facebook SDK in NSError.
@discussion
- These are valid only in the scope of FBiOSSDKDomain.
+ These are valid only in the scope of FacebookSDKDomain.
*/
typedef enum FBErrorCode {
/*!
View
20 src/FBError.m
@@ -16,16 +16,16 @@
#import "FBError.h"
-NSString *const FBiOSSDKDomain = @"com.facebook.FBiOSSDK";
-NSString *const FBErrorInnerErrorKey = @"com.facebook.FBiOSSDK:ErrorInnerErrorKey";
-NSString *const FBErrorParsedJSONResponseKey = @"com.facebook.FBiOSSDK:ParsedJSONResponseKey";
-NSString *const FBErrorHTTPStatusCodeKey = @"com.facebook.FBiOSSDK:HTTPStatusCode";
+NSString *const FacebookSDKDomain = @"com.facebook.sdk";
+NSString *const FBErrorInnerErrorKey = @"com.facebook.sdk:ErrorInnerErrorKey";
+NSString *const FBErrorParsedJSONResponseKey = @"com.facebook.sdk:ParsedJSONResponseKey";
+NSString *const FBErrorHTTPStatusCodeKey = @"com.facebook.sdk:HTTPStatusCode";
-NSString *const FBErrorLoginFailedReason = @"com.facebook.FBiOSSDK:ErrorLoginFailedReason";
-NSString *const FBErrorLoginFailedOriginalErrorCode = @"com.facebook.FBiOSSDK:ErrorLoginFailedOriginalErrorCode";
+NSString *const FBErrorLoginFailedReason = @"com.facebook.sdk:ErrorLoginFailedReason";
+NSString *const FBErrorLoginFailedOriginalErrorCode = @"com.facebook.sdk:ErrorLoginFailedOriginalErrorCode";
-NSString *const FBErrorReauthorizeFailedReasonSessionClosed = @"com.facebook.FBiOSSDK:ErrorReauthorizeFailedReasonSessionClosed";
-NSString *const FBErrorReauthorizeFailedReasonUserCancelled = @"com.facebook.FBiOSSDK:ErrorReauthorizeFailedReasonUserCancelled";
-NSString *const FBErrorReauthorizeFailedReasonWrongUser = @"com.facebook.FBiOSSDK:ErrorReauthorizeFailedReasonWrongUser";
+NSString *const FBErrorReauthorizeFailedReasonSessionClosed = @"com.facebook.sdk:ErrorReauthorizeFailedReasonSessionClosed";
+NSString *const FBErrorReauthorizeFailedReasonUserCancelled = @"com.facebook.sdk:ErrorReauthorizeFailedReasonUserCancelled";
+NSString *const FBErrorReauthorizeFailedReasonWrongUser = @"com.facebook.sdk:ErrorReauthorizeFailedReasonWrongUser";
-NSString *const FBInvalidOperationException = @"com.facebook.FBiOSSDK:InvalidOperationException";
+NSString *const FBInvalidOperationException = @"com.facebook.sdk:InvalidOperationException";
View
4 src/FBGraphObjectPagingLoader.m
@@ -270,15 +270,15 @@ - (void)requestCompleted:(FBRequestConnection *)connection
if (!error && !data) {
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:result
forKey:FBErrorParsedJSONResponseKey];
- error = [[[NSError alloc] initWithDomain:FBiOSSDKDomain
+ error = [[[NSError alloc] initWithDomain:FacebookSDKDomain
code:FBErrorProtocolMismatch
userInfo:userInfo]
autorelease];
}
if (error) {
// Cancellation is not really an error we want to bother the delegate with.
- BOOL cancelled = [error.domain isEqualToString:FBiOSSDKDomain] &&
+ BOOL cancelled = [error.domain isEqualToString:FacebookSDKDomain] &&
error.code == FBErrorOperationCancelled;
if (cancelled) {
View
4 src/FBRequestConnection.m
@@ -1225,7 +1225,7 @@ - (NSError *)errorWithCode:(FBErrorCode)code
}
NSError *error = [[[NSError alloc]
- initWithDomain:FBiOSSDKDomain
+ initWithDomain:FacebookSDKDomain
code:code
userInfo:userInfo]
autorelease];
@@ -1239,7 +1239,7 @@ - (NSError *)checkConnectionError:(NSError *)innerError
{
// We don't want to re-wrap our own errors.
if (innerError &&
- [innerError.domain isEqualToString:FBiOSSDKDomain]) {
+ [innerError.domain isEqualToString:FacebookSDKDomain]) {
return innerError;
}
NSError *result = nil;
View
14 src/FBSession.m
@@ -59,8 +59,8 @@ - (id)oauthToken;
#endif
// extern const strings
-NSString *const FBErrorLoginFailedReasonInlineCancelledValue = @"com.facebook.FBiOSSDK:InlineLoginCancelled";
-NSString *const FBErrorLoginFailedReasonInlineNotCancelledValue = @"com.facebook.FBiOSSDK:ErrorLoginNotCancelled";
+NSString *const FBErrorLoginFailedReasonInlineCancelledValue = @"com.facebook.sdk:InlineLoginCancelled";
+NSString *const FBErrorLoginFailedReasonInlineNotCancelledValue = @"com.facebook.sdk:ErrorLoginNotCancelled";
// const strings
static NSString *const FBPLISTAppIDKey = @"FacebookAppID";
@@ -81,10 +81,10 @@ - (id)oauthToken;
static NSString *const FBLoginUXSDK = @"sdk";
// the following constant strings are used by NSNotificationCenter
-NSString *const FBSessionDidSetActiveSessionNotification = @"com.facebook.FBiOSSDK:FBSessionDidSetActiveSessionNotification";
-NSString *const FBSessionDidUnsetActiveSessionNotification = @"com.facebook.FBiOSSDK:FBSessionDidUnsetActiveSessionNotification";
-NSString *const FBSessionDidBecomeOpenActiveSessionNotification = @"com.facebook.FBiOSSDK:FBSessionDidBecomeOpenActiveSessionNotification";
-NSString *const FBSessionDidBecomeClosedActiveSessionNotification = @"com.facebook.FBiOSSDK:FBSessionDidBecomeClosedActiveSessionNotification";
+NSString *const FBSessionDidSetActiveSessionNotification = @"com.facebook.sdk:FBSessionDidSetActiveSessionNotification";
+NSString *const FBSessionDidUnsetActiveSessionNotification = @"com.facebook.sdk:FBSessionDidUnsetActiveSessionNotification";
+NSString *const FBSessionDidBecomeOpenActiveSessionNotification = @"com.facebook.sdk:FBSessionDidBecomeOpenActiveSessionNotification";
+NSString *const FBSessionDidBecomeClosedActiveSessionNotification = @"com.facebook.sdk:FBSessionDidBecomeClosedActiveSessionNotification";
// the following const strings name properties for which KVO is manually handled
// if name changes occur, these strings must be modified to match, else KVO will fail
@@ -1198,7 +1198,7 @@ + (NSError*)errorLoginFailedWithReason:(NSString*)errorReason
}
// create error object
- NSError *err = [NSError errorWithDomain:FBiOSSDKDomain
+ NSError *err = [NSError errorWithDomain:FacebookSDKDomain
code:FBErrorLoginFailedOrCancelled
userInfo:userinfo];
[userinfo release];
View
12 src/FBSessionTokenCachingStrategy.m
@@ -19,12 +19,12 @@
// const strings
static NSString *const FBAccessTokenInformationKeyName = @"FBAccessTokenInformationKey";
-NSString *const FBTokenInformationTokenKey = @"com.facebook.FBiOSSDK:TokenInformationTokenKey";
-NSString *const FBTokenInformationExpirationDateKey = @"com.facebook.FBiOSSDK:TokenInformationExpirationDateKey";
-NSString *const FBTokenInformationRefreshDateKey = @"com.facebook.FBiOSSDK:TokenInformationRefreshDateKey";
-NSString *const FBTokenInformationUserFBIDKey = @"com.facebook.FBiOSSDK:TokenInformationUserFBIDKey";
-NSString *const FBTokenInformationIsFacebookLoginKey = @"com.facebook.FBiOSSDK:TokenInformationIsFacebookLoginKey";
-NSString *const FBTokenInformationPermissionsKey = @"com.facebook.FBiOSSDK:TokenInformationPermissionsKey";
+NSString *const FBTokenInformationTokenKey = @"com.facebook.sdk:TokenInformationTokenKey";
+NSString *const FBTokenInformationExpirationDateKey = @"com.facebook.sdk:TokenInformationExpirationDateKey";
+NSString *const FBTokenInformationRefreshDateKey = @"com.facebook.sdk:TokenInformationRefreshDateKey";
+NSString *const FBTokenInformationUserFBIDKey = @"com.facebook.sdk:TokenInformationUserFBIDKey";
+NSString *const FBTokenInformationIsFacebookLoginKey = @"com.facebook.sdk:TokenInformationIsFacebookLoginKey";
+NSString *const FBTokenInformationPermissionsKey = @"com.facebook.sdk:TokenInformationPermissionsKey";
@implementation FBSessionTokenCachingStrategy {
NSString *_accessTokenInformationKeyName;
View
6 src/FBTestSession.m
@@ -56,7 +56,7 @@
NSString *kSecondTestUserTag = @"Second";
NSString *kThirdTestUserTag = @"Third";
-NSString *const FBErrorLoginFailedReasonUnitTestResponseUnrecognized = @"com.facebook.FBiOSSDK:UnitTestResponseUnrecognized";
+NSString *const FBErrorLoginFailedReasonUnitTestResponseUnrecognized = @"com.facebook.sdk:UnitTestResponseUnrecognized";
#pragma mark Module scoped global variables
@@ -499,15 +499,15 @@ + (id)sessionForUnitTestingWithPermissions:(NSArray*)permissions
NSString *documentsDirectory = [paths objectAtIndex:0];
// fetch config contents
- NSString *configFilename = [documentsDirectory stringByAppendingPathComponent:@"FBiOSSDK-UnitTestConfig.plist"];
+ NSString *configFilename = [documentsDirectory stringByAppendingPathComponent:@"FacebookSDK-UnitTestConfig.plist"];
NSDictionary *configSettings = [NSDictionary dictionaryWithContentsOfFile:configFilename];
NSString *appID = [configSettings objectForKey:FBPLISTAppIDKey];
NSString *appSecret = [configSettings objectForKey:FBPLISTAppSecretKey];
if (!appID || !appSecret) {
[[NSException exceptionWithName:FBInvalidOperationException
reason:
- @"FBSession: Missing AppID or AppSecret; FBiOSSDK-UnitTestConfig.plist is "
+ @"FBSession: Missing AppID or AppSecret; FacebookSDK-UnitTestConfig.plist is "
@"is missing or invalid; to create a Facebook AppID, "
@"visit https://developers.facebook.com/apps"
userInfo:nil]
View
2 src/FBURLConnection.m
@@ -174,7 +174,7 @@ - (void)cancel
return;
}
- NSError *error = [[NSError alloc] initWithDomain:FBiOSSDKDomain
+ NSError *error = [[NSError alloc] initWithDomain:FacebookSDKDomain
code:FBErrorOperationCancelled
userInfo:nil];
View
4 src/Framework/Resources/Info.plist
@@ -5,9 +5,9 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>FBiOSSDK</string>
+ <string>FacebookSDK</string>
<key>CFBundleIdentifier</key>
- <string>com.facebook.FBiOSSDK</string>
+ <string>com.facebook.sdk</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>1.0</string>
<key>CFBundlePackageType</key>
View
2 src/Package/FacebookSDK.pmdoc/01package.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="6382BBBB-4394-46D0-BC96-3A1AB933F6D3"><config><identifier>com.facebook.FBiOSSDK.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">../../build/package</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installTo</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod></config><contents><component id="com.facebook.FBiOSSDK" path="/Users/mmarucheck/local/ios-sdk/build/package/Contents/Library/Developer/FacebookSDK/FBiOSSDK.framework" version="1.0"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="6382BBBB-4394-46D0-BC96-3A1AB933F6D3"><config><identifier>com.facebook.sdk.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">../../build/package</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>installTo</mod><mod>parent</mod></config><contents><file-list>01package-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
View
2 src/Package/FacebookSDK.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Facebook iOS SDK</title><organization>com.facebook</organization><userSees ui="easy"/><min-target os="3"/><domain user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="Contents" id="choice6" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.facebook.FBiOSSDK.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="readme">../../README</resource><resource relative="true" mod="true" type="conclusion">../../README</resource></locale></resources><flags/><item type="file">01package.xml</item><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>Facebook iOS SDK</title><organization>com.facebook</organization><userSees ui="easy"/><min-target os="3"/><domain user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="Contents" id="choice6" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.facebook.sdk.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="readme">../../README</resource><resource relative="true" mod="true" type="conclusion">../../README</resource></locale></resources><flags/><item type="file">01package.xml</item><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod></pkmkdoc>
View
2 src/tests/FBBatchRequestTests.m
@@ -21,7 +21,7 @@
#import "FBTestBlocker.h"
#import "FBGraphUser.h"
-#if defined(FBIOSSDK_SKIP_BATCH_REQUEST_TESTS)
+#if defined(FACEBOOKSDK_SKIP_BATCH_REQUEST_TESTS)
#pragma message ("warning: Skipping FBBatchRequestTests")
View
2 src/tests/FBCacheTests.m
@@ -26,7 +26,7 @@
#import "FBRequestConnection.h"
#import "FBRequestConnection+Internal.h"
-#if defined(FBIOSSDK_SKIP_CACHE_TESTS)
+#if defined(FACEBOOKSDK_SKIP_CACHE_TESTS)
#pragma message ("warning: Skipping FBCacheTests")
View
2 src/tests/FBCommonRequestTests.m
@@ -26,7 +26,7 @@
#import "FBUtility.h"
#import "FBTests.h"
-#if defined(FBIOSSDK_SKIP_COMMON_REQUEST_TESTS)
+#if defined(FACEBOOKSDK_SKIP_COMMON_REQUEST_TESTS)
#pragma message ("warning: Skipping FBCommonRequestTests")
View
2 src/tests/FBContentLinkTests.m
@@ -18,7 +18,7 @@
#import "FBContentLink.h"
#import "FBTests.h"
-#if defined(FBIOSSDK_SKIP_CONTENT_LINK_TESTS)
+#if defined(FACEBOOKSDK_SKIP_CONTENT_LINK_TESTS)
#pragma message ("warning: Skipping FBContentLinkTests")
View
2 src/tests/FBGraphObjectTests.m
@@ -24,7 +24,7 @@
#import "FBTestBlocker.h"
#import "FBTests.h"
-#if defined(FBIOSSDK_SKIP_GRAPH_OBJECT_TESTS)
+#if defined(FACEBOOKSDK_SKIP_GRAPH_OBJECT_TESTS)
#pragma message ("warning: Skipping FBGraphObjectTests")
View
2 src/tests/FBOpenGraphActionTests.h
@@ -36,4 +36,4 @@
// Open Graph namespaces must be unique, so running these tests against specific
// Facebook Applications will require choosing a new namespace.
-#define UNIT_TEST_OPEN_GRAPH_NAMESPACE "fbiossdktests"
+#define UNIT_TEST_OPEN_GRAPH_NAMESPACE "facebooksdktests"
View
4 src/tests/FBOpenGraphActionTests.m
@@ -22,7 +22,7 @@
#import "FBGraphUser.h"
#import "FBTestSession.h"
-#if defined(FBIOSSDK_SKIP_OPEN_GRAPH_ACTION_TESTS) || !defined(UNIT_TEST_OPEN_GRAPH_NAMESPACE)
+#if defined(FACEBOOKSDK_SKIP_OPEN_GRAPH_ACTION_TESTS) || !defined(UNIT_TEST_OPEN_GRAPH_NAMESPACE)
#pragma message ("warning: Skipping FBOpenGraphActionTests")
@@ -40,7 +40,7 @@ @implementation FBOpenGraphActionTests
// OG objects for this app; your OG objects will have URLs hosted by your server.
NSString *format =
@"http://fbsdkog.herokuapp.com/repeater.php?"
- @"fb:app_id=171298632997486&og:type=%@&"
+ @"fb:app_id=414221181947517&og:type=%@&"
@"og:title=%@&og:description=%%22%@%%22&"
@"og:image=https://s-static.ak.fbcdn.net/images/devsite/attachment_blank.png&"
@"body=%@";
View
2 src/tests/FBRequestConnectionTests.m
@@ -22,7 +22,7 @@
#import "FBRequest.h"
#import "FBTestBlocker.h"
-#if defined(FBIOSSDK_SKIP_REQUEST_CONNECTION_TESTS)
+#if defined(FACEBOOKSDK_SKIP_REQUEST_CONNECTION_TESTS)
#pragma message ("warning: Skipping FBRequestConnectionTests")
View
2 src/tests/FBSessionTests.m
@@ -21,7 +21,7 @@
#import "FBTestBlocker.h"
#import "FBTests.h"
-#if defined(FBIOSSDK_SKIP_SESSION_TESTS)
+#if defined(FACEBOOKSDK_SKIP_SESSION_TESTS)
#pragma message ("warning: Skipping FBSessionTests")
View
2 src/tests/FBTestSessionTests.m
@@ -20,7 +20,7 @@
#import "FBRequest.h"
#import <CommonCrypto/CommonDigest.h>
-#if defined(FBIOSSDK_SKIP_TEST_SESSION_TESTS)
+#if defined(FACEBOOKSDK_SKIP_TEST_SESSION_TESTS)
#pragma message ("warning: Skipping FBTestSessionTests")
View
18 src/tests/FBTests.h
@@ -22,15 +22,15 @@
// to disable certain categories of tests. They should never be left on
// in committed code.
-//#define FBIOSSDK_SKIP_CACHE_TESTS
-//#define FBIOSSDK_SKIP_COMMON_REQUEST_TESTS
-//#define FBIOSSDK_SKIP_GRAPH_OBJECT_TESTS
-//#define FBIOSSDK_SKIP_OPEN_GRAPH_ACTION_TESTS
-//#define FBIOSSDK_SKIP_SESSION_TESTS
-//#define FBIOSSDK_SKIP_BATCH_REQUEST_TESTS
-//#define FBIOSSDK_SKIP_REQUEST_CONNECTION_TESTS
-//#define FBIOSSDK_SKIP_TEST_SESSION_TESTS
-//#define FBIOSSDK_SKIP_CONTENT_LINK_TESTS
+//#define FACEBOOKSDK_SKIP_CACHE_TESTS
+//#define FACEBOOKSDK_SKIP_COMMON_REQUEST_TESTS
+//#define FACEBOOKSDK_SKIP_GRAPH_OBJECT_TESTS
+//#define FACEBOOKSDK_SKIP_OPEN_GRAPH_ACTION_TESTS
+//#define FACEBOOKSDK_SKIP_SESSION_TESTS
+//#define FACEBOOKSDK_SKIP_BATCH_REQUEST_TESTS
+//#define FACEBOOKSDK_SKIP_REQUEST_CONNECTION_TESTS
+//#define FACEBOOKSDK_SKIP_TEST_SESSION_TESTS
+//#define FACEBOOKSDK_SKIP_CONTENT_LINK_TESTS
@class FBTestBlocker;
@protocol FBGraphObject;

0 comments on commit 562ca8e

Please sign in to comment.
Something went wrong with that request. Please try again.