Skip to content
Browse files

[ios-sdk] Fix small permission bug in FBSession; remove duplicate cop…

…ies of launch images in some samples.

Summary:
FBSession was adding "email" to iOS 6 permissions even when not necessary.

Two copies of the launch images ended up being added to three of the samples. This confuses Xcode in some instances,
plus is just plain redundant. Removing the duplicates.

Test Plan:
- Built and ran the three samples on an iOS device

Revert Plan:

Reviewers: jacl

Reviewed By: jacl

CC: msdkexp@

Differential Revision: https://phabricator.fb.com/D581331
  • Loading branch information...
1 parent 81c56ce commit e9530128aa6f36bdaab499eae65b9523d20af2b5 @clang13 clang13 committed Sep 21, 2012
View
12 samples/BooleanOGSample/BooleanOGSample.xcodeproj/project.pbxproj
@@ -28,9 +28,6 @@
85AFB4CB158F9B8B000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C7158F9B8B000AF7F5 /* Icon-72@2x.png */; };
85AFB4CC158F9B8B000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C8158F9B8B000AF7F5 /* Icon.png */; };
85AFB4CD158F9B8B000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C9158F9B8B000AF7F5 /* Icon@2x.png */; };
- 85C69D3D1602AC6F008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D3C1602AC6F008AD9A0 /* Default.png */; };
- 85C69D401602AC77008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D3F1602AC77008AD9A0 /* Default@2x.png */; };
- 85C69D421602AC7E008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D411602AC7E008AD9A0 /* Default-568h@2x.png */; };
85C69D741602B098008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D711602B098008AD9A0 /* Default-568h@2x.png */; };
85C69D751602B098008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D721602B098008AD9A0 /* Default.png */; };
85C69D761602B098008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D731602B098008AD9A0 /* Default@2x.png */; };
@@ -68,9 +65,6 @@
85AFB4C7158F9B8B000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB4C8158F9B8B000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB4C9158F9B8B000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
- 85C69D3C1602AC6F008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- 85C69D3F1602AC77008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 85C69D411602AC7E008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D711602B098008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D721602B098008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
85C69D731602B098008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
@@ -98,9 +92,6 @@
84070D0B1540AA2B00E39703 = {
isa = PBXGroup;
children = (
- 85C69D411602AC7E008AD9A0 /* Default-568h@2x.png */,
- 85C69D3F1602AC77008AD9A0 /* Default@2x.png */,
- 85C69D3C1602AC6F008AD9A0 /* Default.png */,
84070D201540AA2B00E39703 /* BooleanOGSample */,
84070D191540AA2B00E39703 /* Frameworks */,
84070D171540AA2B00E39703 /* Products */,
@@ -236,9 +227,6 @@
85AFB4CD158F9B8B000AF7F5 /* Icon@2x.png in Resources */,
DE1C9C2A15CC8F9A00809B9E /* FacebookSDKResources.bundle in Resources */,
DE1C9C2C15CC8FE400809B9E /* FBUserSettingsViewResources.bundle in Resources */,
- 85C69D3D1602AC6F008AD9A0 /* Default.png in Resources */,
- 85C69D401602AC77008AD9A0 /* Default@2x.png in Resources */,
- 85C69D421602AC7E008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D741602B098008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D751602B098008AD9A0 /* Default.png in Resources */,
85C69D761602B098008AD9A0 /* Default@2x.png in Resources */,
View
BIN samples/BooleanOGSample/Default-568h@2x.png
Deleted file not rendered
View
BIN samples/BooleanOGSample/Default.png
Deleted file not rendered
View
BIN samples/BooleanOGSample/Default@2x.png
Deleted file not rendered
View
BIN samples/FriendPickerSample/Default-568h@2x.png
Deleted file not rendered
View
BIN samples/FriendPickerSample/Default.png
Deleted file not rendered
View
BIN samples/FriendPickerSample/Default@2x.png
Deleted file not rendered
View
12 samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
@@ -12,9 +12,6 @@
85AFB4D8158F9C1D000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D4158F9C1D000AF7F5 /* Icon-72@2x.png */; };
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D5158F9C1D000AF7F5 /* Icon.png */; };
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D6158F9C1D000AF7F5 /* Icon@2x.png */; };
- 85C69D481602ADB7008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D471602ADB7008AD9A0 /* Default.png */; };
- 85C69D4B1602ADBC008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D4A1602ADBC008AD9A0 /* Default@2x.png */; };
- 85C69D4D1602ADC0008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D4C1602ADC0008AD9A0 /* Default-568h@2x.png */; };
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 */; };
@@ -37,9 +34,6 @@
85AFB4D4158F9C1D000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB4D5158F9C1D000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB4D6158F9C1D000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
- 85C69D471602ADB7008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- 85C69D4A1602ADBC008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 85C69D4C1602ADC0008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
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>"; };
@@ -80,9 +74,6 @@
E2D6B80315413A560050835F = {
isa = PBXGroup;
children = (
- 85C69D4C1602ADC0008AD9A0 /* Default-568h@2x.png */,
- 85C69D4A1602ADBC008AD9A0 /* Default@2x.png */,
- 85C69D471602ADB7008AD9A0 /* Default.png */,
E2D6B81815413A570050835F /* FriendPickerSample */,
E2D6B81115413A570050835F /* Frameworks */,
E2D6B80F15413A570050835F /* Products */,
@@ -201,9 +192,6 @@
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */,
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */,
DD37EA8615ABA4670015966B /* FacebookSDKResources.bundle in Resources */,
- 85C69D481602ADB7008AD9A0 /* Default.png in Resources */,
- 85C69D4B1602ADBC008AD9A0 /* Default@2x.png in Resources */,
- 85C69D4D1602ADC0008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D7F1602B0AF008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D801602B0AF008AD9A0 /* Default.png in Resources */,
85C69D811602B0AF008AD9A0 /* Default@2x.png in Resources */,
View
BIN samples/HelloFacebookSample/Default-568h@2x.png
Deleted file not rendered
View
BIN samples/HelloFacebookSample/Default.png
Deleted file not rendered
View
BIN samples/HelloFacebookSample/Default@2x.png
Deleted file not rendered
View
12 samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
@@ -22,9 +22,6 @@
85AFB50D158F9D78000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB509158F9D78000AF7F5 /* Icon-72@2x.png */; };
85AFB50E158F9D78000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB50A158F9D78000AF7F5 /* Icon.png */; };
85AFB50F158F9D78000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB50B158F9D78000AF7F5 /* Icon@2x.png */; };
- 85C69D5C1602B021008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D5B1602B021008AD9A0 /* Default.png */; };
- 85C69D5F1602B027008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D5E1602B027008AD9A0 /* Default@2x.png */; };
- 85C69D611602B02D008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D601602B02D008AD9A0 /* Default-568h@2x.png */; };
85C69D8F1602B0D3008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D8C1602B0D3008AD9A0 /* Default-568h@2x.png */; };
85C69D901602B0D3008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D8D1602B0D3008AD9A0 /* Default.png */; };
85C69D911602B0D3008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D8E1602B0D3008AD9A0 /* Default@2x.png */; };
@@ -53,9 +50,6 @@
85AFB509158F9D78000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB50A158F9D78000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB50B158F9D78000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
- 85C69D5B1602B021008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- 85C69D5E1602B027008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 85C69D601602B02D008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D8C1602B0D3008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D8D1602B0D3008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
85C69D8E1602B0D3008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
@@ -83,9 +77,6 @@
5F6AF17E1532A37B00DDBD75 = {
isa = PBXGroup;
children = (
- 85C69D601602B02D008AD9A0 /* Default-568h@2x.png */,
- 85C69D5E1602B027008AD9A0 /* Default@2x.png */,
- 85C69D5B1602B021008AD9A0 /* Default.png */,
5F6AF1931532A37B00DDBD75 /* HelloFacebookSample */,
5F6AF18C1532A37B00DDBD75 /* Frameworks */,
5F6AF18A1532A37B00DDBD75 /* Products */,
@@ -205,9 +196,6 @@
85AFB50E158F9D78000AF7F5 /* Icon.png in Resources */,
85AFB50F158F9D78000AF7F5 /* Icon@2x.png in Resources */,
DD37EAC315ABA8FE0015966B /* FacebookSDKResources.bundle in Resources */,
- 85C69D5C1602B021008AD9A0 /* Default.png in Resources */,
- 85C69D5F1602B027008AD9A0 /* Default@2x.png in Resources */,
- 85C69D611602B02D008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D8F1602B0D3008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D901602B0D3008AD9A0 /* Default.png in Resources */,
85C69D911602B0D3008AD9A0 /* Default@2x.png in Resources */,
View
6 src/FBSession.m
@@ -895,13 +895,13 @@ - (void)authorizeUsingSystemAccountStore:(ACAccountStore*)accountStore
// app may be asking for nothing, but we will always have an array here
NSMutableArray *permissionsToUse = nil;
- if (permissions) {
+ if (permissions != nil && permissions.count > 0) {
permissionsToUse = [NSMutableArray arrayWithArray:permissions];
} else {
permissionsToUse = [NSMutableArray array];
+ // No iOS 6 auth can contain 0 permissions; email is a proxy for basic
+ [permissionsToUse addObject:@"email"];
}
- // all iOS6 auths include email
- [permissionsToUse addObject:@"email"];
NSString *audience;
switch (defaultAudience) {

0 comments on commit e953012

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