Permalink
Browse files

Facebook iOS SDK 3.12

  • Loading branch information...
1 parent 283b0d0 commit 605493d7066873f23a7ae11cab09684e6c01b464 @toddkrabach toddkrabach committed Jan 30, 2014
Showing with 5,634 additions and 5,712 deletions.
  1. +3 −0 .gitmodules
  2. +25 −0 samples/Configurations/Application.xcconfig
  3. +29 −0 samples/Configurations/Project-Debug.xcconfig
  4. +32 −0 samples/Configurations/Project-Release.xcconfig
  5. +63 −0 samples/Configurations/Project.xcconfig
  6. +30 −58 samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
  7. +2 −5 samples/FriendPickerSample/FriendPickerSample/FPAppDelegate.m
  8. +1 −4 samples/FriendPickerSample/FriendPickerSample/FPViewController.m
  9. +30 −60 samples/GraphApiSample/GraphApiSample.xcodeproj/project.pbxproj
  10. +0 −3 samples/GraphApiSample/GraphApiSample/GraphApiAppDelegate.m
  11. +0 −5 samples/GraphApiSample/GraphApiSample/GraphApiViewController.m
  12. +30 −58 samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
  13. +0 −3 samples/HelloFacebookSample/HelloFacebookSample/HFAppDelegate.m
  14. +18 −30 samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
  15. +30 −62 samples/PlacePickerSample/PlacePickerSample.xcodeproj/project.pbxproj
  16. +0 −3 samples/PlacePickerSample/PlacePickerSample/PPAppDelegate.m
  17. +0 −5 samples/PlacePickerSample/PlacePickerSample/PPViewController.m
  18. +30 −66 samples/ProfilePictureSample/ProfilePictureSample.xcodeproj/project.pbxproj
  19. +0 −3 samples/ProfilePictureSample/ProfilePictureSample/PPAppDelegate.m
  20. +10 −12 samples/ProfilePictureSample/ProfilePictureSample/PPViewController.m
  21. +41 −67 samples/RPSSample/RPSSample.xcodeproj/project.pbxproj
  22. +8 −8 samples/RPSSample/RPSSample/OGProtocols.h
  23. +40 −1 samples/RPSSample/RPSSample/RPSAppDelegate.m
  24. +25 −0 samples/RPSSample/RPSSample/RPSCommonObjects.h
  25. +25 −0 samples/RPSSample/RPSSample/RPSDeeplyLinkedViewController.h
  26. +76 −0 samples/RPSSample/RPSSample/RPSDeeplyLinkedViewController.m
  27. +46 −0 samples/RPSSample/RPSSample/RPSDeeplyLinkedViewController.xib
  28. +11 −14 samples/RPSSample/RPSSample/RPSFriendsViewController.m
  29. +92 −38 samples/RPSSample/RPSSample/RPSGameViewController.m
  30. +6 −6 samples/RPSSample/RPSSample/en.lproj/RPSGameViewController_iPhone.xib
  31. +29 −71 samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj
  32. +3 −1 samples/Scrumptious/scrumptious/SCAppDelegate.h
  33. +1 −1 samples/Scrumptious/scrumptious/SCAppDelegate.m
  34. +2 −2 samples/Scrumptious/scrumptious/SCLoginViewController.m
  35. +2 −2 samples/Scrumptious/scrumptious/SCPhotoViewController.h
  36. +2 −2 samples/Scrumptious/scrumptious/SCPhotoViewController.m
  37. +124 −104 samples/Scrumptious/scrumptious/SCViewController.m
  38. +61 −367 samples/Scrumptious/scrumptious/en.lproj/SCViewController.xib
  39. +30 −68 samples/SessionLoginSample/SessionLoginSample.xcodeproj/project.pbxproj
  40. +0 −4 samples/SessionLoginSample/SessionLoginSample/SLAppDelegate.m
  41. +0 −3 samples/SessionLoginSample/SessionLoginSample/SLViewController.m
  42. +30 −66 samples/SwitchUserSample/SwitchUserSample.xcodeproj/project.pbxproj
  43. +0 −4 samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
  44. +15 −17 samples/SwitchUserSample/SwitchUserSample/SUProfileTableViewCell.m
  45. +29 −35 samples/SwitchUserSample/SwitchUserSample/SUSettingsViewController.m
  46. +7 −9 samples/SwitchUserSample/SwitchUserSample/SUUserManager.h
  47. +25 −28 samples/SwitchUserSample/SwitchUserSample/SUUserManager.m
  48. +6 −6 samples/SwitchUserSample/SwitchUserSample/SUUsingViewController.m
  49. +3 −10 scripts/build_distribution.sh
  50. +16 −11 scripts/build_documentation.sh
  51. +7 −8 scripts/build_framework.sh
  52. +6 −6 scripts/build_samples.sh
  53. +13 −13 scripts/common.sh
  54. +114 −0 scripts/export.sh
  55. +10 −10 scripts/productbuild_distribution.xml
  56. 0 src/{ → Ads}/FBAppEvents+Internal.h
  57. +1 −1 src/{ → Ads}/FBAppEvents.m
  58. 0 src/{ → Ads}/FBInsights.m
  59. +2 −2 src/Base64/FBBase64.h
  60. +128 −128 src/Base64/FBBase64.m
  61. +10 −10 src/{ → Core}/FBAppLinkData+Internal.h
  62. +14 −14 src/{ → Core}/FBAppLinkData.m
  63. +20 −20 src/{ → Core}/FBCacheIndex.h
  64. +210 −221 src/{ → Core}/FBCacheIndex.m
  65. +8 −8 src/{ → Core}/FBDataDiskCache.h
  66. +57 −60 src/{ → Core}/FBDataDiskCache.m
  67. +2 −2 src/{ → Core}/FBDynamicFrameworkLoader.h
  68. +22 −22 src/{ → Core}/FBDynamicFrameworkLoader.m
  69. 0 src/{ → Core}/FBError.m
  70. +1 −1 src/{ → Core}/FBErrorUtility+Internal.h
  71. +32 −32 src/{ → Core}/FBErrorUtility.m
  72. +4 −4 src/{ → Core}/FBFetchedAppSettings.h
  73. +5 −5 src/{ → Core}/FBFetchedAppSettings.m
  74. +2 −2 src/{ → Core}/FBImageResourceLoader.h
  75. +5 −5 src/{ → Core}/FBImageResourceLoader.m
  76. +1 −1 src/{ → Core}/FBLogger.h
  77. +2 −7 src/{ → Core}/FBLogger.m
  78. 0 src/{ → Core}/FBSDKVersion.h
  79. +1 −1 src/{ → Core}/FBSettings+Internal.h
  80. +87 −87 src/{ → Core}/FBSettings.m
  81. +15 −15 src/{ → Core}/FBUtility.h
  82. +92 −92 src/{ → Core}/FBUtility.m
  83. +3 −3 src/{ → Core}/NSError+FBError.m
  84. +2 −2 src/Cryptography/FBCrypto.h
  85. +170 −170 src/Cryptography/FBCrypto.m
  86. +6 −7 src/{ → DeviceAPI}/FBAppBridge.h
  87. +12 −61 src/{ → DeviceAPI}/FBAppBridge.m
  88. +37 −0 src/DeviceAPI/FBAppBridgeScheme.h
  89. +180 −0 src/DeviceAPI/FBAppBridgeScheme.m
  90. 0 src/{ → DeviceAPI}/FBAppBridgeTypeToJSONConverter.h
  91. +1 −3 src/{ → DeviceAPI}/FBAppBridgeTypeToJSONConverter.m
  92. +2 −2 src/{ → DeviceAPI}/FBAppCall+Internal.h
  93. +28 −28 src/{ → DeviceAPI}/FBAppCall.m
  94. 0 src/{ → DeviceAPI}/FBDialogs+Internal.h
  95. +147 −118 src/{ → DeviceAPI}/FBDialogs.m
  96. +1 −1 src/{ → DeviceAPI}/FBDialogsData+Internal.h
  97. +2 −2 src/{ → DeviceAPI}/FBDialogsData.m
  98. +0 −7 src/{ → DeviceAPI}/FBDialogsParams+Internal.h
  99. +0 −6 src/{ → DeviceAPI}/FBDialogsParams.m
  100. 0 src/{ → DeviceAPI}/FBLoginDialogParams.h
  101. +0 −18 src/{ → DeviceAPI}/FBLoginDialogParams.m
  102. +14 −14 src/{ → DeviceAPI}/FBNativeDialogs.m
  103. +27 −0 src/DeviceAPI/FBOpenGraphActionShareDialogParams+Internal.h
  104. +7 −24 src/{ → DeviceAPI}/FBOpenGraphActionShareDialogParams.m
  105. +3 −34 src/{ → DeviceAPI}/FBShareDialogParams.m
  106. +29 −29 src/FBAccessTokenData.h
  107. +7 −7 src/FBAppCall.h
  108. +1 −1 src/FBCacheDescriptor.h
  109. +19 −19 src/FBDialogs.h
  110. +3 −3 src/FBError.h
  111. +3 −3 src/FBErrorUtility.h
  112. +1 −7 src/FBFrictionlessRecipientCache.h
  113. +6 −12 src/FBFriendPickerViewController.h
  114. +30 −30 src/FBGraphObject.h
  115. +8 −9 src/FBLoginView.h
  116. +14 −14 src/FBNativeDialogs.h
  117. +11 −11 src/FBPlacePickerViewController.h
  118. +4 −5 src/FBProfilePictureView.h
  119. +47 −47 src/FBRequest.h
  120. +64 −64 src/FBRequestConnection.h
  121. +4 −4 src/FBSession+FBSessionLoginStrategy.h
  122. +47 −47 src/FBSession.h
  123. +6 −6 src/FBSessionAppSwitchingLoginStategy.m
  124. +11 −11 src/FBSessionFacebookAppNativeLoginStategy.m
  125. +1 −1 src/FBSessionLoginStrategyParams.m
  126. +9 −9 src/FBSessionTokenCachingStrategy.h
  127. +8 −8 src/FBSettings.h
  128. +1 −1 src/FBTask.m
  129. +1 −1 src/FBTaskCompletionSource.m
  130. +7 −7 src/FBTestSession.h
  131. +1 −1 src/FBViewController.h
  132. +1 −1 src/FacebookSDK.h
  133. +95 −95 src/FacebookSDKIntegrationTests/FBAccessTokenDataTests.m
  134. +4 −4 src/FacebookSDKIntegrationTests/FBAppEventsIntegrationTests.m
  135. +2 −2 src/FacebookSDKIntegrationTests/FBCacheIntegrationTests.h
  136. +155 −157 src/FacebookSDKIntegrationTests/FBCacheIntegrationTests.m
  137. +18 −18 src/FacebookSDKIntegrationTests/FBIntegrationTests.h
  138. +114 −107 src/FacebookSDKIntegrationTests/FBIntegrationTests.m
  139. +30 −30 src/FacebookSDKIntegrationTests/FBOpenGraphActionTests.m
  140. +64 −64 src/FacebookSDKIntegrationTests/FBRequestIntegrationTests.m
  141. +35 −35 src/FacebookSDKIntegrationTests/FBSessionIntegrationTests.m
  142. 0 src/{ → Legacy}/FBConnect.h
  143. +19 −19 src/{ → Legacy}/FBDialog.h
  144. +40 −43 src/{ → Legacy}/FBDialog.m
  145. +7 −12 src/{ → Legacy}/FBFrictionlessRequestSettings.h
  146. +10 −19 src/{ → Legacy}/FBFrictionlessRequestSettings.m
  147. +4 −4 src/{ → Legacy}/FBLoginDialog.h
  148. +10 −9 src/{ → Legacy}/FBLoginDialog.m
  149. +2 −2 src/{ → Legacy}/FBSessionManualTokenCachingStrategy.h
  150. +40 −52 src/{ → Legacy}/Facebook.h
  151. +77 −72 src/{ → Legacy}/Facebook.m
  152. 0 src/{ → Login}/FBAccessTokenData+Internal.h
  153. +27 −27 src/{ → Login}/FBAccessTokenData.m
  154. +11 −11 src/{ → Login}/FBSession+Internal.h
  155. +4 −4 src/{ → Login}/FBSession+Protected.h
  156. +281 −281 src/{ → Login}/FBSession.m
  157. 0 src/{ → Login}/FBSessionAppEventsState.h
  158. +4 −9 src/{ → Login}/FBSessionAppEventsState.m
  159. +2 −2 src/{ → Login}/FBSessionAuthLogger.h
  160. +2 −2 src/{ → Login}/FBSessionAuthLogger.m
  161. +2 −5 src/{ → Login}/FBSessionManualTokenCachingStrategy.m
  162. +11 −12 src/{ → Login}/FBSessionTokenCachingStrategy.m
  163. +3 −3 src/{ → Login}/FBSessionUtility.h
  164. +5 −5 src/{ → Login}/FBSessionUtility.m
  165. +18 −18 src/{ → Login}/FBSystemAccountStoreAdapter.h
  166. +29 −32 src/{ → Login}/FBSystemAccountStoreAdapter.m
  167. 0 src/{ → Login}/FBTestSession+Internal.h
  168. +53 −61 src/{ → Login}/FBTestSession.m
  169. +20 −20 src/{ → Network}/FBGraphObject.m
  170. +10 −10 src/{ → Network}/FBGraphObjectPagingLoader.h
  171. +11 −22 src/{ → Network}/FBGraphObjectPagingLoader.m
  172. 0 src/{ → Network}/FBGraphObjectTableCell.h
  173. +7 −13 src/{ → Network}/FBGraphObjectTableCell.m
  174. +5 −5 src/{ → Network}/FBGraphObjectTableDataSource.h
  175. +7 −25 src/{ → Network}/FBGraphObjectTableDataSource.m
  176. +3 −3 src/{ → Network}/FBGraphObjectTableSelection.h
  177. +8 −23 src/{ → Network}/FBGraphObjectTableSelection.m
  178. +1 −1 src/{ → Network}/FBRequest+Internal.h
  179. +60 −60 src/{ → Network}/FBRequest.m
  180. +0 −2 src/{ → Network}/FBRequestBody.h
  181. +2 −4 src/{ → Network}/FBRequestBody.m
  182. +3 −3 src/{ → Network}/FBRequestConnection+Internal.h
  183. +62 −62 src/{ → Network}/FBRequestConnection.m
  184. +5 −5 src/{ → Network}/FBRequestConnectionRetryManager.h
  185. +14 −17 src/{ → Network}/FBRequestConnectionRetryManager.m
  186. +3 −3 src/{ → Network}/FBRequestHandlerFactory.h
  187. +7 −7 src/{ → Network}/FBRequestHandlerFactory.m
  188. +5 −5 src/{ → Network}/FBRequestMetadata.h
  189. +6 −6 src/{ → Network}/FBRequestMetadata.m
  190. 0 src/{ → Network}/FBURLConnection.h
  191. +28 −36 src/{ → Network}/FBURLConnection.m
  192. 0 src/{ → UI}/FBCacheDescriptor.m
  193. 0 src/{ → UI}/FBFrictionlessDialogSupportDelegate.h
  194. +2 −5 src/{ → UI}/FBFrictionlessRecipientCache.m
  195. +5 −14 src/{ → UI}/FBFriendPickerCacheDescriptor.h
  196. +5 −11 src/{ → UI}/FBFriendPickerCacheDescriptor.m
  197. +4 −4 src/{ → UI}/FBFriendPickerViewController+Internal.h
  198. +42 −55 src/{ → UI}/FBFriendPickerViewController.m
  199. +12 −11 src/{ → UI}/FBLoginView.m
  200. +5 −5 src/{ → UI}/FBPlacePickerCacheDescriptor.h
  201. +6 −14 src/{ → UI}/FBPlacePickerCacheDescriptor.m
  202. +7 −7 src/{ → UI}/FBPlacePickerViewController+Internal.h
  203. +74 −91 src/{ → UI}/FBPlacePickerViewController.m
  204. +18 −24 src/{ → UI}/FBProfilePictureView.m
  205. +9 −9 src/{ → UI}/FBUserSettingsViewController.m
  206. 0 src/{ → UI}/FBViewController+Internal.h
  207. +7 −17 src/{ → UI}/FBViewController.m
  208. +4 −11 src/{ → UI}/FBWebDialogs.m
  209. +775 −671 src/facebook-ios-sdk.xcodeproj/project.pbxproj
  210. +8 −0 src/facebook_ios_sdk_Prefix.pch
  211. +37 −30 src/tests/FBAppBridgeTests.m
  212. +3 −3 src/tests/FBAppCallTests.m
  213. +4 −4 src/tests/FBAuthenticationTests.h
  214. +24 −24 src/tests/FBAuthenticationTests.m
  215. +40 −40 src/tests/FBGraphObjectTests.m
  216. +2 −2 src/tests/FBIsStringRepresentingJSONDictionary.h
  217. +2 −2 src/tests/FBIsStringRepresentingJSONDictionary.m
  218. +2 −2 src/tests/FBIsURLHavingQueryParams.h
  219. +2 −2 src/tests/FBIsURLHavingQueryParams.m
  220. +1 −1 src/tests/FBRequestConnectionTests.m
  221. +2 −3 src/tests/FBRequestTests.m
  222. +5 −5 src/tests/FBSessionTests.m
  223. +1 −1 src/tests/FBSystemAccountAuthenticationTests.m
  224. +3 −4 src/tests/FBTestBlocker.h
  225. +12 −12 src/tests/FBTestBlocker.m
  226. +2 −2 src/tests/FBTests.h
  227. +12 −12 src/tests/FBTests.m
  228. +106 −109 src/tests/FBURLConnectionTests.m
  229. +1 −0 vendor/appledoc
View
@@ -7,3 +7,6 @@
[submodule "vendor/OCHamcrest"]
path = vendor/OCHamcrest
url = git://github.com/hamcrest/OCHamcrest
+[submodule "vendor/appledoc"]
+ path = vendor/appledoc
+ url = git://github.com/tomaz/appledoc.git
@@ -0,0 +1,25 @@
+//
+// Copyright 2010-present Facebook.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Linking
+// This is required in order to use the SDK views in xibs.
+OTHER_LDFLAGS = "-ObjC"
+
+// Code Signing
+CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
+
+// Packaging
+WRAPPER_EXTENSION = app
@@ -0,0 +1,29 @@
+//
+// Copyright 2010-present Facebook.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "Project.xcconfig"
+
+// Architectures
+ONLY_ACTIVE_ARCH = YES
+
+// Deployment
+COPY_PHASE_STRIP = NO
+
+// Code Generation
+GCC_OPTIMIZATION_LEVEL = 0
+
+// Preprocessor
+GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited)
@@ -0,0 +1,32 @@
+//
+// Copyright 2010-present Facebook.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "Project.xcconfig"
+
+// Architectures
+ONLY_ACTIVE_ARCH = NO
+
+// Deployment
+COPY_PHASE_STRIP = YES
+
+// Build Options
+VALIDATE_PRODUCT = YES
+
+// Code Generation
+GCC_OPTIMIZATION_LEVEL = s
+
+// Apple LLVM
+OTHER_CFLAGS = -DNS_BLOCK_ASSERTIONS=1
@@ -0,0 +1,63 @@
+//
+// Copyright 2010-present Facebook.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Architectures
+// 3GS+
+ARCHS = arm64 armv7 armv7s
+IPHONEOS_DEPLOYMENT_TARGET = 6.0
+SDKROOT = iphoneos
+
+// Build Options
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+
+// Deployment
+TARGETED_DEVICE_FAMILY = 1,2 // iPhone, iPad
+
+// Packaging
+PRODUCT_NAME = $(TARGET_NAME)
+INFOPLIST_FILE = $(TARGET_NAME)/$(TARGET_NAME)-Info.plist
+
+// Search Paths
+ALWAYS_SEARCH_USER_PATHS = NO
+FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SRCROOT)/../../build"
+
+// Code Generation
+GCC_DYNAMIC_NO_PIC = NO
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+
+// Language
+CLANG_ENABLE_OBJC_ARC = YES
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+GCC_PREFIX_HEADER = $(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch
+
+// Warnings
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_BOOL_CONVERSION = YES
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_CXX0X_EXTENSIONS = NO
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_ENUM_CONVERSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+GCC_TREAT_WARNINGS_AS_ERRORS = YES
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES
+GCC_WARN_MISSING_PARENTHESES = YES
+GCC_WARN_SHADOW = YES
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES
+GCC_WARN_UNUSED_VARIABLE = YES
@@ -14,6 +14,10 @@
85C69D7F1602B0AF008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7C1602B0AF008AD9A0 /* Default-568h@2x.png */; };
85C69D801602B0AF008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7D1602B0AF008AD9A0 /* Default.png */; };
85C69D811602B0AF008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7E1602B0AF008AD9A0 /* Default@2x.png */; };
+ 8986C7C518909A25004B90DD /* Project-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8986C7C218909A25004B90DD /* Project-Debug.xcconfig */; };
+ 8986C7C618909A25004B90DD /* Project.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8986C7C318909A25004B90DD /* Project.xcconfig */; };
+ 8986C7C718909A25004B90DD /* Project-Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8986C7C418909A25004B90DD /* Project-Release.xcconfig */; };
+ 8986C7C918909EB1004B90DD /* Application.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 8986C7C818909EB1004B90DD /* Application.xcconfig */; };
DD37EA8815ABA46B0015966B /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD37EA8715ABA46B0015966B /* FacebookSDK.framework */; };
E2D6B81315413A570050835F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B81215413A570050835F /* UIKit.framework */; };
E2D6B81515413A570050835F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B81415413A570050835F /* Foundation.framework */; };
@@ -34,6 +38,10 @@
85C69D7C1602B0AF008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D7D1602B0AF008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
85C69D7E1602B0AF008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
+ 8986C7C218909A25004B90DD /* Project-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Debug.xcconfig"; sourceTree = "<group>"; };
+ 8986C7C318909A25004B90DD /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
+ 8986C7C418909A25004B90DD /* Project-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Release.xcconfig"; sourceTree = "<group>"; };
+ 8986C7C818909EB1004B90DD /* Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = "<group>"; };
DD37EA8715ABA46B0015966B /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookSDK.framework; path = ../../build/FacebookSDK.framework; sourceTree = "<group>"; };
E2D6B80E15413A570050835F /* FriendPickerSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FriendPickerSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E2D6B81215413A570050835F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -66,9 +74,22 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 8986C7BF1890995C004B90DD /* Configurations */ = {
+ isa = PBXGroup;
+ children = (
+ 8986C7C818909EB1004B90DD /* Application.xcconfig */,
+ 8986C7C218909A25004B90DD /* Project-Debug.xcconfig */,
+ 8986C7C418909A25004B90DD /* Project-Release.xcconfig */,
+ 8986C7C318909A25004B90DD /* Project.xcconfig */,
+ );
+ name = Configurations;
+ path = ../Configurations;
+ sourceTree = "<group>";
+ };
E2D6B80315413A560050835F = {
isa = PBXGroup;
children = (
+ 8986C7BF1890995C004B90DD /* Configurations */,
E2D6B81815413A570050835F /* FriendPickerSample */,
E2D6B81115413A570050835F /* Frameworks */,
E2D6B80F15413A570050835F /* Products */,
@@ -154,7 +175,7 @@
E2D6B80515413A560050835F /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = E2D6B80815413A560050835F /* Build configuration list for PBXProject "FriendPickerSample" */;
compatibilityVersion = "Xcode 3.2";
@@ -186,8 +207,12 @@
85AFB4D8158F9C1D000AF7F5 /* Icon-72@2x.png in Resources */,
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */,
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */,
+ 8986C7C518909A25004B90DD /* Project-Debug.xcconfig in Resources */,
85C69D7F1602B0AF008AD9A0 /* Default-568h@2x.png in Resources */,
+ 8986C7C618909A25004B90DD /* Project.xcconfig in Resources */,
+ 8986C7C918909EB1004B90DD /* Application.xcconfig in Resources */,
85C69D801602B0AF008AD9A0 /* Default.png in Resources */,
+ 8986C7C718909A25004B90DD /* Project-Release.xcconfig in Resources */,
85C69D811602B0AF008AD9A0 /* Default@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -237,82 +262,29 @@
/* Begin XCBuildConfiguration section */
E2D6B82D15413A570050835F /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 8986C7C218909A25004B90DD /* Project-Debug.xcconfig */;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = NO;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
E2D6B82E15413A570050835F /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 8986C7C418909A25004B90DD /* Project-Release.xcconfig */;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- COPY_PHASE_STRIP = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- VALIDATE_PRODUCT = YES;
};
name = Release;
};
E2D6B83015413A570050835F /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 8986C7C818909EB1004B90DD /* Application.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../build\"",
- );
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "FriendPickerSample/FriendPickerSample-Prefix.pch";
- INFOPLIST_FILE = "FriendPickerSample/FriendPickerSample-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
};
name = Debug;
};
E2D6B83115413A570050835F /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 8986C7C818909EB1004B90DD /* Application.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../build\"",
- );
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "FriendPickerSample/FriendPickerSample-Prefix.pch";
- INFOPLIST_FILE = "FriendPickerSample/FriendPickerSample-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
- OTHER_LDFLAGS = "-ObjC";
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
};
name = Release;
};
@@ -20,9 +20,6 @@
@implementation FPAppDelegate
-@synthesize window = _window;
-@synthesize rootViewController = _rootViewController;
-
// FBSample logic
// In the login workflow, the Facebook native application, or Safari will transition back to
// this applicaiton via a url following the scheme fb[app id]://; the call to handleOpenURL
@@ -65,7 +62,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// Set up a UINavigationController as the basis of this app, with the nib generated viewController
// as the initial view.
UINavigationController *navigationController =
- [[UINavigationController alloc] initWithRootViewController:self.rootViewController];
+ [[UINavigationController alloc] initWithRootViewController:self.rootViewController];
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.rootViewController = navigationController;
@@ -74,7 +71,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
return YES;
}
-- (NSUInteger)supportedInterfaceOrientations{
+- (NSUInteger)supportedInterfaceOrientations {
return UIInterfaceOrientationMaskAllButUpsideDown;
}
@@ -33,9 +33,6 @@ - (void)fillTextBoxAndDismiss:(NSString *)text;
@implementation FPViewController
-@synthesize selectedFriendsView = _friendResultText;
-@synthesize friendPickerController = _friendPickerController;
-
#pragma mark View lifecycle
- (void)viewDidLoad {
@@ -110,7 +107,7 @@ - (void)facebookViewControllerCancelWasPressed:(id)sender {
- (void)fillTextBoxAndDismiss:(NSString *)text {
self.selectedFriendsView.text = text;
- [self dismissModalViewControllerAnimated:YES];
+ [self dismissViewControllerAnimated:YES completion:NULL];
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
Oops, something went wrong.

0 comments on commit 605493d

Please sign in to comment.