Update Google+ integration.
[UPDATED] Google+ SDK to 1.1.0.
This commit is contained in:
parent
cc015ada1b
commit
6c23134e47
6
External/google-plus-ios-sdk/Changelog
vendored
6
External/google-plus-ios-sdk/Changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
2012-10-12 -- v1.1.0
|
||||||
|
- Content deep linking on Google+ share
|
||||||
|
- iOS6 support
|
||||||
|
- Shortened class names
|
||||||
|
- Bug fixes
|
||||||
|
|
||||||
2012-06-25 -- v1.0.0
|
2012-06-25 -- v1.0.0
|
||||||
- Google+ sign-in button, share plugin, and Google+ history integration library
|
- Google+ sign-in button, share plugin, and Google+ history integration library
|
||||||
with sample app.
|
with sample app.
|
||||||
|
@ -80,7 +80,7 @@ static NSData *DecodeBase64StringCommon(NSString *base64Str,
|
|||||||
const char *cString = [base64Str cStringUsingEncoding:NSASCIIStringEncoding];
|
const char *cString = [base64Str cStringUsingEncoding:NSASCIIStringEncoding];
|
||||||
if (cString == nil) return nil;
|
if (cString == nil) return nil;
|
||||||
|
|
||||||
NSUInteger inputLength = strlen(cString);
|
NSInteger inputLength = strlen(cString);
|
||||||
if (inputLength % 4 != 0) return nil;
|
if (inputLength % 4 != 0) return nil;
|
||||||
if (inputLength == 0) return [NSData data];
|
if (inputLength == 0) return [NSData data];
|
||||||
|
|
||||||
|
@ -17,6 +17,9 @@
|
|||||||
// GTLBatchQuery.h
|
// GTLBatchQuery.h
|
||||||
//
|
//
|
||||||
|
|
||||||
|
// Batch query documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Batch_Operations
|
||||||
|
|
||||||
#import "GTLQuery.h"
|
#import "GTLQuery.h"
|
||||||
|
|
||||||
@interface GTLBatchQuery : NSObject <GTLQueryProtocol> {
|
@interface GTLBatchQuery : NSObject <GTLQueryProtocol> {
|
||||||
|
@ -16,6 +16,9 @@
|
|||||||
//
|
//
|
||||||
// GTLDateTime.h
|
// GTLDateTime.h
|
||||||
//
|
//
|
||||||
|
// This is an immutable class representing a date and optionally a
|
||||||
|
// time with time zone.
|
||||||
|
//
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
#import "GTLDefines.h"
|
#import "GTLDefines.h"
|
||||||
@ -28,14 +31,16 @@
|
|||||||
NSTimeZone *timeZone_; // specific time zone by name, if known
|
NSTimeZone *timeZone_; // specific time zone by name, if known
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: nil can be passed for time zone arguments when the time zone is not
|
|
||||||
// known.
|
|
||||||
|
|
||||||
+ (GTLDateTime *)dateTimeWithRFC3339String:(NSString *)str;
|
+ (GTLDateTime *)dateTimeWithRFC3339String:(NSString *)str;
|
||||||
|
|
||||||
|
// timeZone may be nil if the time zone is not known.
|
||||||
+ (GTLDateTime *)dateTimeWithDate:(NSDate *)date timeZone:(NSTimeZone *)tz;
|
+ (GTLDateTime *)dateTimeWithDate:(NSDate *)date timeZone:(NSTimeZone *)tz;
|
||||||
|
|
||||||
- (void)setFromDate:(NSDate *)date timeZone:(NSTimeZone *)tz;
|
// Use this method to make a dateTime for an all-day event (date only, so
|
||||||
- (void)setFromRFC3339String:(NSString *)str;
|
// hasTime is NO.)
|
||||||
|
+ (GTLDateTime *)dateTimeForAllDayWithDate:(NSDate *)date;
|
||||||
|
|
||||||
|
+ (GTLDateTime *)dateTimeWithDateComponents:(NSDateComponents *)date;
|
||||||
|
|
||||||
@property (nonatomic, readonly) NSDate *date;
|
@property (nonatomic, readonly) NSDate *date;
|
||||||
@property (nonatomic, readonly) NSCalendar *calendar;
|
@property (nonatomic, readonly) NSCalendar *calendar;
|
||||||
@ -43,14 +48,13 @@
|
|||||||
@property (nonatomic, readonly) NSString *RFC3339String;
|
@property (nonatomic, readonly) NSString *RFC3339String;
|
||||||
@property (nonatomic, readonly) NSString *stringValue; // same as RFC3339String
|
@property (nonatomic, readonly) NSString *stringValue; // same as RFC3339String
|
||||||
|
|
||||||
@property (nonatomic, retain) NSTimeZone *timeZone;
|
@property (nonatomic, readonly, retain) NSTimeZone *timeZone;
|
||||||
@property (nonatomic, copy) NSDateComponents *dateComponents;
|
@property (nonatomic, readonly, copy) NSDateComponents *dateComponents;
|
||||||
@property (nonatomic, assign) NSInteger milliseconds; // This is only for the fraction of a second 0-999
|
@property (nonatomic, readonly) NSInteger milliseconds; // This is only for the fraction of a second 0-999
|
||||||
|
|
||||||
@property (nonatomic, assign) BOOL hasTime;
|
@property (nonatomic, readonly) BOOL hasTime;
|
||||||
@property (nonatomic, assign) NSInteger offsetSeconds;
|
@property (nonatomic, readonly) NSInteger offsetSeconds;
|
||||||
@property (nonatomic, assign, getter=isUniversalTime) BOOL universalTime;
|
@property (nonatomic, readonly, getter=isUniversalTime) BOOL universalTime;
|
||||||
|
|
||||||
- (void)setTimeZone:(NSTimeZone *)timeZone withOffsetSeconds:(NSInteger)val;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -19,6 +19,20 @@
|
|||||||
|
|
||||||
#import "GTLDateTime.h"
|
#import "GTLDateTime.h"
|
||||||
|
|
||||||
|
@interface GTLDateTime ()
|
||||||
|
|
||||||
|
- (void)setFromDate:(NSDate *)date timeZone:(NSTimeZone *)tz;
|
||||||
|
- (void)setFromRFC3339String:(NSString *)str;
|
||||||
|
|
||||||
|
@property (nonatomic, retain, readwrite) NSTimeZone *timeZone;
|
||||||
|
@property (nonatomic, copy, readwrite) NSDateComponents *dateComponents;
|
||||||
|
@property (nonatomic, assign, readwrite) NSInteger milliseconds;
|
||||||
|
|
||||||
|
@property (nonatomic, assign, readwrite) BOOL hasTime;
|
||||||
|
@property (nonatomic, assign, readwrite) NSInteger offsetSeconds;
|
||||||
|
@property (nonatomic, assign, getter=isUniversalTime, readwrite) BOOL universalTime;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
@implementation GTLDateTime
|
@implementation GTLDateTime
|
||||||
|
|
||||||
@ -60,6 +74,30 @@
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ (GTLDateTime *)dateTimeForAllDayWithDate:(NSDate *)date {
|
||||||
|
if (date == nil) return nil;
|
||||||
|
|
||||||
|
GTLDateTime *result = [[[self alloc] init] autorelease];
|
||||||
|
[result setFromDate:date timeZone:nil];
|
||||||
|
result.hasTime = NO;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (GTLDateTime *)dateTimeWithDateComponents:(NSDateComponents *)components {
|
||||||
|
NSCalendar *cal = [[[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar] autorelease];
|
||||||
|
NSDate *date = [cal dateFromComponents:components];
|
||||||
|
#if GTL_IPHONE
|
||||||
|
NSTimeZone *tz = [components timeZone];
|
||||||
|
#else
|
||||||
|
// NSDateComponents added timeZone: in Mac OS X 10.7.
|
||||||
|
NSTimeZone *tz = nil;
|
||||||
|
if ([components respondsToSelector:@selector(timeZone)]) {
|
||||||
|
tz = [components timeZone];
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return [self dateTimeWithDate:date timeZone:tz];
|
||||||
|
}
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
[dateComponents_ release];
|
[dateComponents_ release];
|
||||||
[timeZone_ release];
|
[timeZone_ release];
|
||||||
@ -67,15 +105,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (id)copyWithZone:(NSZone *)zone {
|
- (id)copyWithZone:(NSZone *)zone {
|
||||||
|
// Object is immutable
|
||||||
GTLDateTime *newObj = [[GTLDateTime alloc] init];
|
return [self retain];
|
||||||
|
|
||||||
newObj.universalTime = self.isUniversalTime;
|
|
||||||
[newObj setTimeZone:self.timeZone withOffsetSeconds:self.offsetSeconds];
|
|
||||||
newObj.dateComponents = self.dateComponents;
|
|
||||||
newObj.milliseconds = self.milliseconds;
|
|
||||||
|
|
||||||
return newObj;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// until NSDateComponent implements isEqual, we'll use this
|
// until NSDateComponent implements isEqual, we'll use this
|
||||||
@ -148,13 +179,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setTimeZone:(NSTimeZone *)timeZone withOffsetSeconds:(NSInteger)val {
|
|
||||||
[timeZone_ release];
|
|
||||||
timeZone_ = [timeZone retain];
|
|
||||||
|
|
||||||
offsetSeconds_ = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (NSCalendar *)calendar {
|
- (NSCalendar *)calendar {
|
||||||
NSCalendar *cal = [[[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar] autorelease];
|
NSCalendar *cal = [[[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar] autorelease];
|
||||||
NSTimeZone *tz = self.timeZone;
|
NSTimeZone *tz = self.timeZone;
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
// GTLObject.h
|
// GTLObject.h
|
||||||
//
|
//
|
||||||
|
|
||||||
|
// GTLObject documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Objects_and_Queries
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
@ -51,7 +53,7 @@
|
|||||||
|
|
||||||
// Used when creating the subobjects from this one.
|
// Used when creating the subobjects from this one.
|
||||||
NSDictionary *surrogates_;
|
NSDictionary *surrogates_;
|
||||||
|
|
||||||
// Any complex object hung off this object goes into the cache so the
|
// Any complex object hung off this object goes into the cache so the
|
||||||
// next fetch will get the same object back instead of having to recreate
|
// next fetch will get the same object back instead of having to recreate
|
||||||
// it.
|
// it.
|
||||||
@ -156,15 +158,39 @@
|
|||||||
@end
|
@end
|
||||||
|
|
||||||
// Collection objects with an "items" property should derive from GTLCollection
|
// Collection objects with an "items" property should derive from GTLCollection
|
||||||
// object. This provides support for fast object enumeration and the
|
// object. This provides support for fast object enumeration, the
|
||||||
// itemAtIndex: convenience method.
|
// itemAtIndex: convenience method, and indexed subscripts.
|
||||||
//
|
//
|
||||||
// Subclasses must implement the items method dynamically.
|
// Subclasses must implement the items method dynamically.
|
||||||
@interface GTLCollectionObject : GTLObject <GTLCollectionProtocol, NSFastEnumeration>
|
@interface GTLCollectionObject : GTLObject <GTLCollectionProtocol, NSFastEnumeration> {
|
||||||
|
@private
|
||||||
|
NSDictionary *identifierMap_;
|
||||||
|
}
|
||||||
|
|
||||||
// itemAtIndex: returns nil when the index exceeds the bounds of the items array
|
// itemAtIndex: and objectAtIndexedSubscript: return nil when the index exceeds
|
||||||
|
// the bounds of the items array.
|
||||||
- (id)itemAtIndex:(NSUInteger)idx;
|
- (id)itemAtIndex:(NSUInteger)idx;
|
||||||
|
|
||||||
|
- (id)objectAtIndexedSubscript:(NSInteger)idx;
|
||||||
|
|
||||||
|
// itemForIdentifier: looks up items from the collection object by identifier,
|
||||||
|
// and returns the first one.
|
||||||
|
//
|
||||||
|
// Typically, items will have a unique identifier (with key "id" in the
|
||||||
|
// object's JSON). This method returns the first item found in the collection
|
||||||
|
// with the specified identifier.
|
||||||
|
//
|
||||||
|
// The first time this method is used, the collection will cache a map of
|
||||||
|
// identifiers to items. If the items list for the instance somehow changes,
|
||||||
|
// use the reset method below to force a new cache to be created for this
|
||||||
|
// collection.
|
||||||
|
- (id)itemForIdentifier:(NSString *)key;
|
||||||
|
|
||||||
|
// Identifiers for all items are cached when the first one is obtained.
|
||||||
|
// This method resets the cache. It is needed only if the item list has
|
||||||
|
// changed.
|
||||||
|
- (void)resetIdentifierMap;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface GTLCollectionObject (DynamicMethods)
|
@interface GTLCollectionObject (DynamicMethods)
|
||||||
|
@ -516,14 +516,11 @@ static NSMutableDictionary *gKindMap = nil;
|
|||||||
defaultClass:(Class)defaultClass
|
defaultClass:(Class)defaultClass
|
||||||
surrogates:(NSDictionary *)surrogates
|
surrogates:(NSDictionary *)surrogates
|
||||||
batchClassMap:(NSDictionary *)batchClassMap {
|
batchClassMap:(NSDictionary *)batchClassMap {
|
||||||
if ([json isEqual:[NSNull null]]) {
|
if ([json count] == 0 || [json isEqual:[NSNull null]]) {
|
||||||
// no actual result, such as the response from a delete
|
// no actual result, such as the response from a delete
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
GTL_ASSERT([json count] != 0, @"Creating object from empty json");
|
|
||||||
if ([json count] == 0) return nil;
|
|
||||||
|
|
||||||
// Determine the class to instantiate, based on the original fetch
|
// Determine the class to instantiate, based on the original fetch
|
||||||
// request or by looking up "kind" string from the registration at
|
// request or by looking up "kind" string from the registration at
|
||||||
// +load time of GTLObject subclasses
|
// +load time of GTLObject subclasses
|
||||||
@ -629,9 +626,13 @@ static NSMutableDictionary *gArrayPropertyToClassMapCache = nil;
|
|||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation GTLCollectionObject
|
@implementation GTLCollectionObject
|
||||||
|
|
||||||
// Subclasses must implement the items method dynamically.
|
// Subclasses must implement the items method dynamically.
|
||||||
|
|
||||||
|
- (void)dealloc {
|
||||||
|
[identifierMap_ release];
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
- (id)itemAtIndex:(NSUInteger)idx {
|
- (id)itemAtIndex:(NSUInteger)idx {
|
||||||
NSArray *items = [self performSelector:@selector(items)];
|
NSArray *items = [self performSelector:@selector(items)];
|
||||||
if (idx < [items count]) {
|
if (idx < [items count]) {
|
||||||
@ -640,6 +641,36 @@ static NSMutableDictionary *gArrayPropertyToClassMapCache = nil;
|
|||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (id)objectAtIndexedSubscript:(NSInteger)idx {
|
||||||
|
if (idx >= 0) {
|
||||||
|
return [self itemAtIndex:(NSUInteger)idx];
|
||||||
|
}
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (id)itemForIdentifier:(NSString *)key {
|
||||||
|
if (identifierMap_ == nil) {
|
||||||
|
NSArray *items = [self performSelector:@selector(items)];
|
||||||
|
NSMutableDictionary *dict =
|
||||||
|
[NSMutableDictionary dictionaryWithCapacity:[items count]];
|
||||||
|
for (id item in items) {
|
||||||
|
id identifier = [item valueForKey:@"identifier"];
|
||||||
|
if (identifier != nil && identifier != [NSNull null]) {
|
||||||
|
if ([dict objectForKey:identifier] == nil) {
|
||||||
|
[dict setObject:item forKey:identifier];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
identifierMap_ = [dict copy];
|
||||||
|
}
|
||||||
|
return [identifierMap_ objectForKey:key];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)resetIdentifierMap {
|
||||||
|
[identifierMap_ release];
|
||||||
|
identifierMap_ = nil;
|
||||||
|
}
|
||||||
|
|
||||||
// NSFastEnumeration protocol
|
// NSFastEnumeration protocol
|
||||||
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
|
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
|
||||||
objects:(id *)stackbuf
|
objects:(id *)stackbuf
|
||||||
|
@ -24,13 +24,12 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
|
|
||||||
#import "GTLPlusConstants.h"
|
#import "GTLPlusConstants.h"
|
||||||
|
|
||||||
#import "GTLPlusItemScope.h"
|
#import "GTLPlusItemScope.h"
|
||||||
#import "GTLPlusMoment.h"
|
#import "GTLPlusMoment.h"
|
||||||
#import "GTLPlusPerson.h"
|
|
||||||
|
|
||||||
#import "GTLQueryPlus.h"
|
#import "GTLQueryPlus.h"
|
||||||
#import "GTLServicePlus.h"
|
#import "GTLServicePlus.h"
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
@ -36,11 +36,9 @@
|
|||||||
|
|
||||||
// Authorization scope
|
// Authorization scope
|
||||||
// Know who you are on Google
|
// Know who you are on Google
|
||||||
GTL_EXTERN NSString * const kGTLAuthScopePlusMe; // "https://www.googleapis.com/auth/plus.me"
|
GTL_EXTERN NSString * const kGTLAuthScopePlusMe; // "https://www.googleapis.com/auth/plus.me"
|
||||||
// View and manage user activity information in Google+
|
// Send your activity to your private Google+ history
|
||||||
GTL_EXTERN NSString * const kGTLAuthScopePlusMomentsWrite; // "https://www.googleapis.com/auth/plus.moments.write"
|
GTL_EXTERN NSString * const kGTLAuthScopePlusMomentsWrite; // "https://www.googleapis.com/auth/plus.moments.write"
|
||||||
// View your email address
|
|
||||||
GTL_EXTERN NSString * const kGTLAuthScopePlusUserinfoEmail; // "https://www.googleapis.com/auth/userinfo.email"
|
|
||||||
|
|
||||||
// Collection
|
// Collection
|
||||||
GTL_EXTERN NSString * const kGTLPlusCollectionVault; // "vault"
|
GTL_EXTERN NSString * const kGTLPlusCollectionVault; // "vault"
|
||||||
|
@ -24,14 +24,13 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
|
|
||||||
#import "GTLPlusConstants.h"
|
#import "GTLPlusConstants.h"
|
||||||
|
|
||||||
// Authorization scope
|
// Authorization scope
|
||||||
NSString * const kGTLAuthScopePlusMe = @"https://www.googleapis.com/auth/plus.me";
|
NSString * const kGTLAuthScopePlusMe = @"https://www.googleapis.com/auth/plus.me";
|
||||||
NSString * const kGTLAuthScopePlusMomentsWrite = @"https://www.googleapis.com/auth/plus.moments.write";
|
NSString * const kGTLAuthScopePlusMomentsWrite = @"https://www.googleapis.com/auth/plus.moments.write";
|
||||||
NSString * const kGTLAuthScopePlusUserinfoEmail = @"https://www.googleapis.com/auth/userinfo.email";
|
|
||||||
|
|
||||||
// Collection
|
// Collection
|
||||||
NSString * const kGTLPlusCollectionVault = @"vault";
|
NSString * const kGTLPlusCollectionVault = @"vault";
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLPlusItemScope (0 custom class methods, 55 custom properties)
|
// GTLPlusItemScope (0 custom class methods, 55 custom properties)
|
||||||
|
|
||||||
@ -169,11 +169,11 @@
|
|||||||
// belongs to.
|
// belongs to.
|
||||||
@property (retain) GTLPlusItemScope *partOfTVSeries;
|
@property (retain) GTLPlusItemScope *partOfTVSeries;
|
||||||
|
|
||||||
// The main performer or performers of the event—for example, a presenter,
|
// The main performer or performers of the event-for example, a presenter,
|
||||||
// musician, or actor.
|
// musician, or actor.
|
||||||
@property (retain) NSArray *performers; // of GTLPlusItemScope
|
@property (retain) NSArray *performers; // of GTLPlusItemScope
|
||||||
|
|
||||||
// Player type required—for example, Flash or Silverlight.
|
// Player type required-for example, Flash or Silverlight.
|
||||||
@property (copy) NSString *playerType;
|
@property (copy) NSString *playerType;
|
||||||
|
|
||||||
// Postal code.
|
// Postal code.
|
||||||
@ -186,7 +186,7 @@
|
|||||||
@property (copy) NSString *ratingValue;
|
@property (copy) NSString *ratingValue;
|
||||||
|
|
||||||
// Review rating.
|
// Review rating.
|
||||||
@property (retain) NSArray *reviewRating; // of GTLPlusItemScope
|
@property (retain) GTLPlusItemScope *reviewRating;
|
||||||
|
|
||||||
// The start date and time of the event (in ISO 8601 date format).
|
// The start date and time of the event (in ISO 8601 date format).
|
||||||
@property (copy) NSString *startDate;
|
@property (copy) NSString *startDate;
|
||||||
@ -213,7 +213,7 @@
|
|||||||
// The item type.
|
// The item type.
|
||||||
@property (copy) NSString *type;
|
@property (copy) NSString *type;
|
||||||
|
|
||||||
// A url for this scope.
|
// A URL for the item upon which the action was performed.
|
||||||
@property (copy) NSString *url;
|
@property (copy) NSString *url;
|
||||||
|
|
||||||
// The width of the media object.
|
// The width of the media object.
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLPlusItemScope (0 custom class methods, 55 custom properties)
|
// GTLPlusItemScope (0 custom class methods, 55 custom properties)
|
||||||
|
|
||||||
@ -66,7 +66,6 @@
|
|||||||
[GTLPlusItemScope class], @"author",
|
[GTLPlusItemScope class], @"author",
|
||||||
[GTLPlusItemScope class], @"contributor",
|
[GTLPlusItemScope class], @"contributor",
|
||||||
[GTLPlusItemScope class], @"performers",
|
[GTLPlusItemScope class], @"performers",
|
||||||
[GTLPlusItemScope class], @"reviewRating",
|
|
||||||
nil];
|
nil];
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
@ -24,10 +24,9 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLPlusMoment (0 custom class methods, 6 custom properties)
|
// GTLPlusMoment (0 custom class methods, 6 custom properties)
|
||||||
// GTLPlusMomentVerb (0 custom class methods, 1 custom properties)
|
|
||||||
|
|
||||||
#if GTL_BUILT_AS_FRAMEWORK
|
#if GTL_BUILT_AS_FRAMEWORK
|
||||||
#import "GTL/GTLObject.h"
|
#import "GTL/GTLObject.h"
|
||||||
@ -36,7 +35,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
@class GTLPlusItemScope;
|
@class GTLPlusItemScope;
|
||||||
@class GTLPlusMomentVerb;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
@ -45,35 +43,23 @@
|
|||||||
|
|
||||||
@interface GTLPlusMoment : GTLObject
|
@interface GTLPlusMoment : GTLObject
|
||||||
|
|
||||||
|
// The moment ID.
|
||||||
|
// identifier property maps to 'id' in JSON (to avoid Objective C's 'id').
|
||||||
|
@property (copy) NSString *identifier;
|
||||||
|
|
||||||
// Identifies this resource as a moment.
|
// Identifies this resource as a moment.
|
||||||
@property (copy) NSString *kind;
|
@property (copy) NSString *kind;
|
||||||
|
|
||||||
// The object generated by performing the action on the item
|
// The object generated by performing the action on the item
|
||||||
@property (retain) GTLPlusItemScope *result;
|
@property (retain) GTLPlusItemScope *result;
|
||||||
|
|
||||||
// Timestamp of the action (when it occured) in RFC3339 format.
|
// Time stamp of when the action occurred in RFC3339 format.
|
||||||
@property (retain) GTLDateTime *startDate;
|
@property (retain) GTLDateTime *startDate;
|
||||||
|
|
||||||
// The object on which the action was performed
|
// The object on which the action was performed.
|
||||||
@property (retain) GTLPlusItemScope *target;
|
@property (retain) GTLPlusItemScope *target;
|
||||||
|
|
||||||
// The schema.org activity type
|
// The schema.org activity type.
|
||||||
@property (copy) NSString *type;
|
@property (copy) NSString *type;
|
||||||
|
|
||||||
// The action the user performed
|
|
||||||
@property (retain) GTLPlusMomentVerb *verb;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusMomentVerb
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusMomentVerb : GTLObject
|
|
||||||
|
|
||||||
// Url name of the verb
|
|
||||||
@property (copy) NSString *url;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -24,10 +24,9 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLPlusMoment (0 custom class methods, 6 custom properties)
|
// GTLPlusMoment (0 custom class methods, 6 custom properties)
|
||||||
// GTLPlusMomentVerb (0 custom class methods, 1 custom properties)
|
|
||||||
|
|
||||||
#import "GTLPlusMoment.h"
|
#import "GTLPlusMoment.h"
|
||||||
|
|
||||||
@ -39,20 +38,17 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
@implementation GTLPlusMoment
|
@implementation GTLPlusMoment
|
||||||
@dynamic kind, result, startDate, target, type, verb;
|
@dynamic identifier, kind, result, startDate, target, type;
|
||||||
|
|
||||||
|
+ (NSDictionary *)propertyToJSONKeyMap {
|
||||||
|
NSDictionary *map =
|
||||||
|
[NSDictionary dictionaryWithObject:@"id"
|
||||||
|
forKey:@"identifier"];
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
+ (void)load {
|
+ (void)load {
|
||||||
[self registerObjectClassForKind:@"plus#moment"];
|
[self registerObjectClassForKind:@"plus#moment"];
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusMomentVerb
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusMomentVerb
|
|
||||||
@dynamic url;
|
|
||||||
@end
|
|
||||||
|
@ -1,285 +0,0 @@
|
|||||||
/* Copyright (c) 2012 Google Inc.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
//
|
|
||||||
// GTLPlusPerson.h
|
|
||||||
//
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// NOTE: This file is generated from Google APIs Discovery Service.
|
|
||||||
// Service:
|
|
||||||
// Google+ API (plus/v1moments)
|
|
||||||
// Description:
|
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
|
||||||
// Documentation:
|
|
||||||
// http://developers.google.com/+/api/
|
|
||||||
// Classes:
|
|
||||||
// GTLPlusPerson (0 custom class methods, 21 custom properties)
|
|
||||||
// GTLPlusPersonEmailsItem (0 custom class methods, 3 custom properties)
|
|
||||||
// GTLPlusPersonImage (0 custom class methods, 1 custom properties)
|
|
||||||
// GTLPlusPersonName (0 custom class methods, 6 custom properties)
|
|
||||||
// GTLPlusPersonOrganizationsItem (0 custom class methods, 9 custom properties)
|
|
||||||
// GTLPlusPersonPlacesLivedItem (0 custom class methods, 2 custom properties)
|
|
||||||
// GTLPlusPersonUrlsItem (0 custom class methods, 3 custom properties)
|
|
||||||
|
|
||||||
#if GTL_BUILT_AS_FRAMEWORK
|
|
||||||
#import "GTL/GTLObject.h"
|
|
||||||
#else
|
|
||||||
#import "GTLObject.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@class GTLPlusPersonEmailsItem;
|
|
||||||
@class GTLPlusPersonImage;
|
|
||||||
@class GTLPlusPersonName;
|
|
||||||
@class GTLPlusPersonOrganizationsItem;
|
|
||||||
@class GTLPlusPersonPlacesLivedItem;
|
|
||||||
@class GTLPlusPersonUrlsItem;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPerson
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPerson : GTLObject
|
|
||||||
|
|
||||||
// A short biography for this person.
|
|
||||||
@property (copy) NSString *aboutMe;
|
|
||||||
|
|
||||||
// The person's date of birth, represented as YYYY-MM-DD.
|
|
||||||
@property (copy) NSString *birthday;
|
|
||||||
|
|
||||||
// The current location for this person.
|
|
||||||
@property (copy) NSString *currentLocation;
|
|
||||||
|
|
||||||
// The name of this person, suitable for display.
|
|
||||||
@property (copy) NSString *displayName;
|
|
||||||
|
|
||||||
// A list of email addresses for this person.
|
|
||||||
@property (retain) NSArray *emails; // of GTLPlusPersonEmailsItem
|
|
||||||
|
|
||||||
// ETag of this response for caching purposes.
|
|
||||||
@property (copy) NSString *ETag;
|
|
||||||
|
|
||||||
// The person's gender. Possible values are:
|
|
||||||
// - "male" - Male gender.
|
|
||||||
// - "female" - Female gender.
|
|
||||||
// - "other" - Other.
|
|
||||||
@property (copy) NSString *gender;
|
|
||||||
|
|
||||||
// If "true", indicates that the person has installed the app that is making the
|
|
||||||
// request and has chosen to expose this install state to the caller. A value of
|
|
||||||
// "false" indicates that the install state cannot be determined (it is either
|
|
||||||
// not installed or the person has chosen to keep this information private).
|
|
||||||
@property (retain) NSNumber *hasApp; // boolValue
|
|
||||||
|
|
||||||
// The ID of this person.
|
|
||||||
// identifier property maps to 'id' in JSON (to avoid Objective C's 'id').
|
|
||||||
@property (copy) NSString *identifier;
|
|
||||||
|
|
||||||
// The representation of the person's profile photo.
|
|
||||||
@property (retain) GTLPlusPersonImage *image;
|
|
||||||
|
|
||||||
// Identifies this resource as a person. Value: "plus#person".
|
|
||||||
@property (copy) NSString *kind;
|
|
||||||
|
|
||||||
// The languages spoken by this person.
|
|
||||||
@property (retain) NSArray *languagesSpoken; // of NSString
|
|
||||||
|
|
||||||
// An object representation of the individual components of a person's name.
|
|
||||||
@property (retain) GTLPlusPersonName *name;
|
|
||||||
|
|
||||||
// The nickname of this person.
|
|
||||||
@property (copy) NSString *nickname;
|
|
||||||
|
|
||||||
// Type of person within Google+. Possible values are:
|
|
||||||
// - "person" - represents an actual person.
|
|
||||||
// - "page" - represents a page.
|
|
||||||
@property (copy) NSString *objectType;
|
|
||||||
|
|
||||||
// A list of current or past organizations with which this person is associated.
|
|
||||||
@property (retain) NSArray *organizations; // of GTLPlusPersonOrganizationsItem
|
|
||||||
|
|
||||||
// A list of places where this person has lived.
|
|
||||||
@property (retain) NSArray *placesLived; // of GTLPlusPersonPlacesLivedItem
|
|
||||||
|
|
||||||
// The person's relationship status. Possible values are:
|
|
||||||
// - "single" - Person is single.
|
|
||||||
// - "in_a_relationship" - Person is in a relationship.
|
|
||||||
// - "engaged" - Person is engaged.
|
|
||||||
// - "married" - Person is married.
|
|
||||||
// - "its_complicated" - The relationship is complicated.
|
|
||||||
// - "open_relationship" - Person is in an open relationship.
|
|
||||||
// - "widowed" - Person is widowed.
|
|
||||||
// - "in_domestic_partnership" - Person is in a domestic partnership.
|
|
||||||
// - "in_civil_union" - Person is in a civil union.
|
|
||||||
@property (copy) NSString *relationshipStatus;
|
|
||||||
|
|
||||||
// The brief description (tagline) of this person.
|
|
||||||
@property (copy) NSString *tagline;
|
|
||||||
|
|
||||||
// The URL of this person's profile.
|
|
||||||
@property (copy) NSString *url;
|
|
||||||
|
|
||||||
// A list of URLs for this person.
|
|
||||||
@property (retain) NSArray *urls; // of GTLPlusPersonUrlsItem
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonEmailsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonEmailsItem : GTLObject
|
|
||||||
|
|
||||||
// If "true", indicates this email address is the person's primary one.
|
|
||||||
@property (retain) NSNumber *primary; // boolValue
|
|
||||||
|
|
||||||
// The type of address. Possible values are:
|
|
||||||
// - "home" - Home email address.
|
|
||||||
// - "work" - Work email address.
|
|
||||||
// - "other" - Other.
|
|
||||||
@property (copy) NSString *type;
|
|
||||||
|
|
||||||
// The email address.
|
|
||||||
@property (copy) NSString *value;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonImage
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonImage : GTLObject
|
|
||||||
|
|
||||||
// The URL of the person's profile photo. To re-size the image and crop it to a
|
|
||||||
// square, append the query string ?sz=x, where x is the dimension in pixels of
|
|
||||||
// each side.
|
|
||||||
@property (copy) NSString *url;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonName
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonName : GTLObject
|
|
||||||
|
|
||||||
// The family name (last name) of this person.
|
|
||||||
@property (copy) NSString *familyName;
|
|
||||||
|
|
||||||
// The full name of this person, including middle names, suffixes, etc.
|
|
||||||
@property (copy) NSString *formatted;
|
|
||||||
|
|
||||||
// The given name (first name) of this person.
|
|
||||||
@property (copy) NSString *givenName;
|
|
||||||
|
|
||||||
// The honorific prefixes (such as "Dr." or "Mrs.") for this person.
|
|
||||||
@property (copy) NSString *honorificPrefix;
|
|
||||||
|
|
||||||
// The honorific suffixes (such as "Jr.") for this person.
|
|
||||||
@property (copy) NSString *honorificSuffix;
|
|
||||||
|
|
||||||
// The middle name of this person.
|
|
||||||
@property (copy) NSString *middleName;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonOrganizationsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonOrganizationsItem : GTLObject
|
|
||||||
|
|
||||||
// The department within the organization.
|
|
||||||
@property (copy) NSString *department;
|
|
||||||
|
|
||||||
// A short description of the person's role in this organization.
|
|
||||||
// Remapped to 'descriptionProperty' to avoid NSObject's 'description'.
|
|
||||||
@property (copy) NSString *descriptionProperty;
|
|
||||||
|
|
||||||
// The date the person left this organization.
|
|
||||||
@property (copy) NSString *endDate;
|
|
||||||
|
|
||||||
// The location of this organization.
|
|
||||||
@property (copy) NSString *location;
|
|
||||||
|
|
||||||
// The name of the organization.
|
|
||||||
@property (copy) NSString *name;
|
|
||||||
|
|
||||||
// If "true", indicates this organization is the person's primary one (typically
|
|
||||||
// interpreted as current one).
|
|
||||||
@property (retain) NSNumber *primary; // boolValue
|
|
||||||
|
|
||||||
// The date the person joined this organization.
|
|
||||||
@property (copy) NSString *startDate;
|
|
||||||
|
|
||||||
// The person's job title or role within the organization.
|
|
||||||
@property (copy) NSString *title;
|
|
||||||
|
|
||||||
// The type of organization. Possible values are:
|
|
||||||
// - "work" - Work.
|
|
||||||
// - "school" - School.
|
|
||||||
@property (copy) NSString *type;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonPlacesLivedItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonPlacesLivedItem : GTLObject
|
|
||||||
|
|
||||||
// If "true", this place of residence is this person's primary residence.
|
|
||||||
@property (retain) NSNumber *primary; // boolValue
|
|
||||||
|
|
||||||
// A place where this person has lived. For example: "Seattle, WA", "Near
|
|
||||||
// Toronto".
|
|
||||||
@property (copy) NSString *value;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonUrlsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@interface GTLPlusPersonUrlsItem : GTLObject
|
|
||||||
|
|
||||||
// If "true", this URL is the person's primary URL.
|
|
||||||
@property (retain) NSNumber *primary; // boolValue
|
|
||||||
|
|
||||||
// The type of URL. Possible values are:
|
|
||||||
// - "home" - URL for home.
|
|
||||||
// - "work" - URL for work.
|
|
||||||
// - "blog" - URL for blog.
|
|
||||||
// - "profile" - URL for profile.
|
|
||||||
// - "other" - Other.
|
|
||||||
@property (copy) NSString *type;
|
|
||||||
|
|
||||||
// The URL value.
|
|
||||||
@property (copy) NSString *value;
|
|
||||||
|
|
||||||
@end
|
|
@ -1,145 +0,0 @@
|
|||||||
/* Copyright (c) 2012 Google Inc.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
//
|
|
||||||
// GTLPlusPerson.m
|
|
||||||
//
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// NOTE: This file is generated from Google APIs Discovery Service.
|
|
||||||
// Service:
|
|
||||||
// Google+ API (plus/v1moments)
|
|
||||||
// Description:
|
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
|
||||||
// Documentation:
|
|
||||||
// http://developers.google.com/+/api/
|
|
||||||
// Classes:
|
|
||||||
// GTLPlusPerson (0 custom class methods, 21 custom properties)
|
|
||||||
// GTLPlusPersonEmailsItem (0 custom class methods, 3 custom properties)
|
|
||||||
// GTLPlusPersonImage (0 custom class methods, 1 custom properties)
|
|
||||||
// GTLPlusPersonName (0 custom class methods, 6 custom properties)
|
|
||||||
// GTLPlusPersonOrganizationsItem (0 custom class methods, 9 custom properties)
|
|
||||||
// GTLPlusPersonPlacesLivedItem (0 custom class methods, 2 custom properties)
|
|
||||||
// GTLPlusPersonUrlsItem (0 custom class methods, 3 custom properties)
|
|
||||||
|
|
||||||
#import "GTLPlusPerson.h"
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPerson
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPerson
|
|
||||||
@dynamic aboutMe, birthday, currentLocation, displayName, emails, ETag, gender,
|
|
||||||
hasApp, identifier, image, kind, languagesSpoken, name, nickname,
|
|
||||||
objectType, organizations, placesLived, relationshipStatus, tagline,
|
|
||||||
url, urls;
|
|
||||||
|
|
||||||
+ (NSDictionary *)propertyToJSONKeyMap {
|
|
||||||
NSDictionary *map =
|
|
||||||
[NSDictionary dictionaryWithObjectsAndKeys:
|
|
||||||
@"etag", @"ETag",
|
|
||||||
@"id", @"identifier",
|
|
||||||
nil];
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ (NSDictionary *)arrayPropertyToClassMap {
|
|
||||||
NSDictionary *map =
|
|
||||||
[NSDictionary dictionaryWithObjectsAndKeys:
|
|
||||||
[GTLPlusPersonEmailsItem class], @"emails",
|
|
||||||
[NSString class], @"languagesSpoken",
|
|
||||||
[GTLPlusPersonOrganizationsItem class], @"organizations",
|
|
||||||
[GTLPlusPersonPlacesLivedItem class], @"placesLived",
|
|
||||||
[GTLPlusPersonUrlsItem class], @"urls",
|
|
||||||
nil];
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ (void)load {
|
|
||||||
[self registerObjectClassForKind:@"plus#person"];
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonEmailsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonEmailsItem
|
|
||||||
@dynamic primary, type, value;
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonImage
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonImage
|
|
||||||
@dynamic url;
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonName
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonName
|
|
||||||
@dynamic familyName, formatted, givenName, honorificPrefix, honorificSuffix,
|
|
||||||
middleName;
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonOrganizationsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonOrganizationsItem
|
|
||||||
@dynamic department, descriptionProperty, endDate, location, name, primary,
|
|
||||||
startDate, title, type;
|
|
||||||
|
|
||||||
+ (NSDictionary *)propertyToJSONKeyMap {
|
|
||||||
NSDictionary *map =
|
|
||||||
[NSDictionary dictionaryWithObject:@"description"
|
|
||||||
forKey:@"descriptionProperty"];
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonPlacesLivedItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonPlacesLivedItem
|
|
||||||
@dynamic primary, value;
|
|
||||||
@end
|
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// GTLPlusPersonUrlsItem
|
|
||||||
//
|
|
||||||
|
|
||||||
@implementation GTLPlusPersonUrlsItem
|
|
||||||
@dynamic primary, type, value;
|
|
||||||
@end
|
|
@ -24,9 +24,9 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLQueryPlus (2 custom class methods, 4 custom properties)
|
// GTLQueryPlus (1 custom class methods, 4 custom properties)
|
||||||
|
|
||||||
#if GTL_BUILT_AS_FRAMEWORK
|
#if GTL_BUILT_AS_FRAMEWORK
|
||||||
#import "GTL/GTLQuery.h"
|
#import "GTL/GTLQuery.h"
|
||||||
@ -59,32 +59,18 @@
|
|||||||
// Method: plus.moments.insert
|
// Method: plus.moments.insert
|
||||||
// Record a user activity (e.g Bill watched a video on Youtube)
|
// Record a user activity (e.g Bill watched a video on Youtube)
|
||||||
// Required:
|
// Required:
|
||||||
// userId: The ID of the user to get activities for. The special value "me"
|
// userId: The ID of the user to record activities for. The only valid values
|
||||||
// can be used to indicate the authenticated user.
|
// are "me" and the ID of the authenticated user.
|
||||||
// collection: The collection to which to write moments.
|
// collection: The collection to which to write moments.
|
||||||
// kGTLPlusCollectionVault: The default collection for writing new moments.
|
// kGTLPlusCollectionVault: The default collection for writing new moments.
|
||||||
// Optional:
|
// Optional:
|
||||||
// debug: Return the moment as written. Should be used only for debugging.
|
// debug: Return the moment as written. Should be used only for debugging.
|
||||||
// Authorization scope(s):
|
// Authorization scope(s):
|
||||||
|
// kGTLAuthScopePlusMe
|
||||||
// kGTLAuthScopePlusMomentsWrite
|
// kGTLAuthScopePlusMomentsWrite
|
||||||
// Fetches a GTLPlusMoment.
|
// Fetches a GTLPlusMoment.
|
||||||
+ (id)queryForMomentsInsertWithObject:(GTLPlusMoment *)object
|
+ (id)queryForMomentsInsertWithObject:(GTLPlusMoment *)object
|
||||||
userId:(NSString *)userId
|
userId:(NSString *)userId
|
||||||
collection:(NSString *)collection;
|
collection:(NSString *)collection;
|
||||||
|
|
||||||
#pragma mark -
|
|
||||||
#pragma mark "people" methods
|
|
||||||
// These create a GTLQueryPlus object.
|
|
||||||
|
|
||||||
// Method: plus.people.get
|
|
||||||
// Get a person's profile.
|
|
||||||
// Required:
|
|
||||||
// userId: The ID of the person to get the profile for. The special value "me"
|
|
||||||
// can be used to indicate the authenticated user.
|
|
||||||
// Authorization scope(s):
|
|
||||||
// kGTLAuthScopePlusMe
|
|
||||||
// kGTLAuthScopePlusUserinfoEmail
|
|
||||||
// Fetches a GTLPlusPerson.
|
|
||||||
+ (id)queryForPeopleGetWithUserId:(NSString *)userId;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -24,14 +24,13 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLQueryPlus (2 custom class methods, 4 custom properties)
|
// GTLQueryPlus (1 custom class methods, 4 custom properties)
|
||||||
|
|
||||||
#import "GTLQueryPlus.h"
|
#import "GTLQueryPlus.h"
|
||||||
|
|
||||||
#import "GTLPlusMoment.h"
|
#import "GTLPlusMoment.h"
|
||||||
#import "GTLPlusPerson.h"
|
|
||||||
|
|
||||||
@implementation GTLQueryPlus
|
@implementation GTLQueryPlus
|
||||||
|
|
||||||
@ -57,16 +56,4 @@
|
|||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark -
|
|
||||||
#pragma mark "people" methods
|
|
||||||
// These create a GTLQueryPlus object.
|
|
||||||
|
|
||||||
+ (id)queryForPeopleGetWithUserId:(NSString *)userId {
|
|
||||||
NSString *methodName = @"plus.people.get";
|
|
||||||
GTLQueryPlus *query = [self queryWithMethodName:methodName];
|
|
||||||
query.userId = userId;
|
|
||||||
query.expectedObjectClass = [GTLPlusPerson class];
|
|
||||||
return query;
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLServicePlus (0 custom class methods, 0 custom properties)
|
// GTLServicePlus (0 custom class methods, 0 custom properties)
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// Description:
|
// Description:
|
||||||
// The Google+ API enables developers to build on top of the Google+ platform.
|
// The Google+ API enables developers to build on top of the Google+ platform.
|
||||||
// Documentation:
|
// Documentation:
|
||||||
// http://developers.google.com/+/api/
|
// https://developers.google.com/+/history/
|
||||||
// Classes:
|
// Classes:
|
||||||
// GTLServicePlus (0 custom class methods, 0 custom properties)
|
// GTLServicePlus (0 custom class methods, 0 custom properties)
|
||||||
|
|
||||||
@ -40,7 +40,6 @@
|
|||||||
[GTLQueryPlus class],
|
[GTLQueryPlus class],
|
||||||
[GTLPlusItemScope class],
|
[GTLPlusItemScope class],
|
||||||
[GTLPlusMoment class],
|
[GTLPlusMoment class],
|
||||||
[GTLPlusPerson class],
|
|
||||||
nil];
|
nil];
|
||||||
return classes;
|
return classes;
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,9 @@
|
|||||||
// GTLQuery.h
|
// GTLQuery.h
|
||||||
//
|
//
|
||||||
|
|
||||||
|
// Query documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Query_Operations
|
||||||
|
|
||||||
#import "GTLObject.h"
|
#import "GTLObject.h"
|
||||||
#import "GTLUploadParameters.h"
|
#import "GTLUploadParameters.h"
|
||||||
|
|
||||||
|
@ -108,6 +108,12 @@ static NSString *const kJSONKey = @"jsonKey";
|
|||||||
canBeCached = NO;
|
canBeCached = NO;
|
||||||
} else if ([obj isKindOfClass:[GTLObject class]]) {
|
} else if ([obj isKindOfClass:[GTLObject class]]) {
|
||||||
result = [obj JSON];
|
result = [obj JSON];
|
||||||
|
if (result == nil) {
|
||||||
|
// adding an empty object; it should have a JSON dictionary so it can
|
||||||
|
// hold future assignments
|
||||||
|
[obj setJSON:[NSMutableDictionary dictionary]];
|
||||||
|
result = [obj JSON];
|
||||||
|
}
|
||||||
} else if ([obj isKindOfClass:[NSArray class]]) {
|
} else if ([obj isKindOfClass:[NSArray class]]) {
|
||||||
checkExpected = NO;
|
checkExpected = NO;
|
||||||
NSArray *array = obj;
|
NSArray *array = obj;
|
||||||
|
@ -17,6 +17,9 @@
|
|||||||
// GTLService.h
|
// GTLService.h
|
||||||
//
|
//
|
||||||
|
|
||||||
|
// Service object documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Services_and_Tickets
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
#import "GTLDefines.h"
|
#import "GTLDefines.h"
|
||||||
@ -123,8 +126,8 @@ typedef void *GTLServiceUploadProgressBlock;
|
|||||||
|
|
||||||
NSUInteger uploadChunkSize_; // zero when uploading via multi-part MIME http body
|
NSUInteger uploadChunkSize_; // zero when uploading via multi-part MIME http body
|
||||||
|
|
||||||
BOOL isRetryEnabled_; // user allows auto-retries
|
BOOL isRetryEnabled_; // user allows auto-retries
|
||||||
SEL retrySelector_; // optional; set with setServiceRetrySelector
|
SEL retrySelector_; // optional; set with setServiceRetrySelector
|
||||||
NSTimeInterval maxRetryInterval_; // default to 600. seconds
|
NSTimeInterval maxRetryInterval_; // default to 600. seconds
|
||||||
|
|
||||||
BOOL shouldFetchNextPages_;
|
BOOL shouldFetchNextPages_;
|
||||||
@ -152,7 +155,8 @@ typedef void *GTLServiceUploadProgressBlock;
|
|||||||
// be nil.)
|
// be nil.)
|
||||||
//
|
//
|
||||||
// If the query object is a GTLBatchQuery, the object passed to the callback
|
// If the query object is a GTLBatchQuery, the object passed to the callback
|
||||||
// will be a GTLBatchResult
|
// will be a GTLBatchResult; see the batch query documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Batch_Operations
|
||||||
|
|
||||||
- (GTLServiceTicket *)executeQuery:(id<GTLQueryProtocol>)query
|
- (GTLServiceTicket *)executeQuery:(id<GTLQueryProtocol>)query
|
||||||
delegate:(id)delegate
|
delegate:(id)delegate
|
||||||
@ -350,6 +354,17 @@ typedef void *GTLServiceUploadProgressBlock;
|
|||||||
// is ignored.
|
// is ignored.
|
||||||
@property (nonatomic, assign) BOOL shouldFetchInBackground;
|
@property (nonatomic, assign) BOOL shouldFetchInBackground;
|
||||||
|
|
||||||
|
// Callbacks can be invoked on an operation queue rather than via the run loop
|
||||||
|
// starting on 10.7 and iOS 6. Do not specify both run loop modes and an
|
||||||
|
// operation queue. Specifying a delegate queue typically looks like this:
|
||||||
|
//
|
||||||
|
// service.delegateQueue = [[[NSOperationQueue alloc] init] autorelease];
|
||||||
|
//
|
||||||
|
// Since the callbacks will be on a thread of the operation queue, the client
|
||||||
|
// may re-dispatch from the callbacks to a known dispatch queue or to the
|
||||||
|
// main queue.
|
||||||
|
@property (nonatomic, retain) NSOperationQueue *delegateQueue;
|
||||||
|
|
||||||
// Run loop modes are used for scheduling NSURLConnections.
|
// Run loop modes are used for scheduling NSURLConnections.
|
||||||
//
|
//
|
||||||
// The default value, nil, schedules connections using the current run
|
// The default value, nil, schedules connections using the current run
|
||||||
|
@ -1159,20 +1159,29 @@ totalBytesExpectedToSend:(NSInteger)totalBytesExpected {
|
|||||||
|
|
||||||
SEL parseDoneSel = @selector(handleParsedObjectForFetcher:);
|
SEL parseDoneSel = @selector(handleParsedObjectForFetcher:);
|
||||||
NSArray *runLoopModes = [properties valueForKey:kFetcherCallbackRunLoopModesKey];
|
NSArray *runLoopModes = [properties valueForKey:kFetcherCallbackRunLoopModesKey];
|
||||||
if (runLoopModes) {
|
// If this callback was enqueued, then the fetcher has already released
|
||||||
|
// its delegateQueue. We'll use our own delegateQueue to determine how to
|
||||||
|
// invoke the callbacks.
|
||||||
|
NSOperationQueue *delegateQueue = self.delegateQueue;
|
||||||
|
if (delegateQueue) {
|
||||||
|
NSInvocationOperation *op;
|
||||||
|
op = [[[NSInvocationOperation alloc] initWithTarget:self
|
||||||
|
selector:parseDoneSel
|
||||||
|
object:fetcher] autorelease];
|
||||||
|
[delegateQueue addOperation:op];
|
||||||
|
} else if (runLoopModes) {
|
||||||
[self performSelector:parseDoneSel
|
[self performSelector:parseDoneSel
|
||||||
onThread:callbackThread
|
onThread:callbackThread
|
||||||
withObject:fetcher
|
withObject:fetcher
|
||||||
waitUntilDone:NO
|
waitUntilDone:NO
|
||||||
modes:runLoopModes];
|
modes:runLoopModes];
|
||||||
} else {
|
} else {
|
||||||
// defaults to common modes
|
// Defaults to common modes
|
||||||
[self performSelector:parseDoneSel
|
[self performSelector:parseDoneSel
|
||||||
onThread:callbackThread
|
onThread:callbackThread
|
||||||
withObject:fetcher
|
withObject:fetcher
|
||||||
waitUntilDone:NO];
|
waitUntilDone:NO];
|
||||||
}
|
}
|
||||||
|
|
||||||
// the fetcher now belongs to the callback thread
|
// the fetcher now belongs to the callback thread
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2031,6 +2040,14 @@ totalBytesExpectedToSend:(NSInteger)totalBytesExpected {
|
|||||||
return self.fetcherService.shouldFetchInBackground;
|
return self.fetcherService.shouldFetchInBackground;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setDelegateQueue:(NSOperationQueue *)delegateQueue {
|
||||||
|
self.fetcherService.delegateQueue = delegateQueue;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSOperationQueue *)delegateQueue {
|
||||||
|
return self.fetcherService.delegateQueue;
|
||||||
|
}
|
||||||
|
|
||||||
- (void)setRunLoopModes:(NSArray *)array {
|
- (void)setRunLoopModes:(NSArray *)array {
|
||||||
self.fetcherService.runLoopModes = array;
|
self.fetcherService.runLoopModes = array;
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,9 @@
|
|||||||
// GTLUploadParameters.h
|
// GTLUploadParameters.h
|
||||||
//
|
//
|
||||||
|
|
||||||
|
// Uploading documentation:
|
||||||
|
// https://code.google.com/p/google-api-objectivec-client/wiki/Introduction#Uploading_Files
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
#import "GTLDefines.h"
|
#import "GTLDefines.h"
|
||||||
|
@ -90,16 +90,4 @@ NSNumber *GTL_EnsureNSNumber(NSNumber *num);
|
|||||||
startClass:(Class)startClass
|
startClass:(Class)startClass
|
||||||
ancestorClass:(Class)ancestorClass
|
ancestorClass:(Class)ancestorClass
|
||||||
cache:(NSMutableDictionary *)cache;
|
cache:(NSMutableDictionary *)cache;
|
||||||
|
|
||||||
//
|
|
||||||
// MIME Types
|
|
||||||
//
|
|
||||||
|
|
||||||
// Utility routine to convert a file path to the file's MIME type using
|
|
||||||
// Mac OS X's UTI database
|
|
||||||
#if !GTL_FOUNDATION_ONLY
|
|
||||||
+ (NSString *)MIMETypeForFileAtPath:(NSString *)path
|
|
||||||
defaultMIMEType:(NSString *)defaultType;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -300,41 +300,6 @@ const CFStringRef kCharsToForceEscape = CFSTR("!*'();:@&=+$,/?%#[]");
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark MIME Types
|
|
||||||
|
|
||||||
// Utility routine to convert a file path to the file's MIME type using
|
|
||||||
// Mac OS X's UTI database
|
|
||||||
#if !GTL_FOUNDATION_ONLY
|
|
||||||
+ (NSString *)MIMETypeForFileAtPath:(NSString *)path
|
|
||||||
defaultMIMEType:(NSString *)defaultType {
|
|
||||||
NSString *result = defaultType;
|
|
||||||
|
|
||||||
// Convert the path to an FSRef
|
|
||||||
FSRef fileFSRef;
|
|
||||||
Boolean isDirectory;
|
|
||||||
OSStatus err = FSPathMakeRef((UInt8 *) [path fileSystemRepresentation],
|
|
||||||
&fileFSRef, &isDirectory);
|
|
||||||
if (err == noErr) {
|
|
||||||
// Get the UTI (content type) for the FSRef
|
|
||||||
CFStringRef fileUTI;
|
|
||||||
err = LSCopyItemAttribute(&fileFSRef, kLSRolesAll, kLSItemContentType,
|
|
||||||
(CFTypeRef *)&fileUTI);
|
|
||||||
if (err == noErr) {
|
|
||||||
// Get the MIME type for the UTI
|
|
||||||
CFStringRef mimeTypeTag;
|
|
||||||
mimeTypeTag = UTTypeCopyPreferredTagWithClass(fileUTI,
|
|
||||||
kUTTagClassMIMEType);
|
|
||||||
if (mimeTypeTag) {
|
|
||||||
// Convert the CFStringRef to an autoreleased NSString
|
|
||||||
result = [(id)CFMakeCollectable(mimeTypeTag) autorelease];
|
|
||||||
}
|
|
||||||
CFRelease(fileUTI);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
// isEqual: has the fatal flaw that it doesn't deal well with the receiver
|
// isEqual: has the fatal flaw that it doesn't deal well with the receiver
|
||||||
|
@ -21,9 +21,13 @@
|
|||||||
#include <AvailabilityMacros.h>
|
#include <AvailabilityMacros.h>
|
||||||
#include <TargetConditionals.h>
|
#include <TargetConditionals.h>
|
||||||
|
|
||||||
|
#ifdef __OBJC__
|
||||||
|
#include <Foundation/NSObjCRuntime.h>
|
||||||
|
#endif // __OBJC__
|
||||||
|
|
||||||
#if TARGET_OS_IPHONE
|
#if TARGET_OS_IPHONE
|
||||||
#include <Availability.h>
|
#include <Availability.h>
|
||||||
#endif // TARGET_OS_IPHONE
|
#endif // TARGET_OS_IPHONE
|
||||||
|
|
||||||
// Not all MAC_OS_X_VERSION_10_X macros defined in past SDKs
|
// Not all MAC_OS_X_VERSION_10_X macros defined in past SDKs
|
||||||
#ifndef MAC_OS_X_VERSION_10_5
|
#ifndef MAC_OS_X_VERSION_10_5
|
||||||
@ -356,6 +360,7 @@
|
|||||||
#if __has_feature(objc_arc)
|
#if __has_feature(objc_arc)
|
||||||
#define GTMInvalidateInitializer() \
|
#define GTMInvalidateInitializer() \
|
||||||
do { \
|
do { \
|
||||||
|
[self class]; /* Avoid warning of dead store to |self|. */ \
|
||||||
_GTMDevAssert(NO, @"Invalid initializer."); \
|
_GTMDevAssert(NO, @"Invalid initializer."); \
|
||||||
return nil; \
|
return nil; \
|
||||||
} while (0)
|
} while (0)
|
||||||
@ -436,4 +441,4 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,
|
|||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
#endif // GTM_SEL_STRING
|
#endif // GTM_SEL_STRING
|
||||||
|
|
||||||
#endif // __OBJC__
|
#endif // __OBJC__
|
||||||
|
@ -40,10 +40,10 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
// add all cookies in the new cookie array to the storage,
|
// Add all cookies in the new cookie array to the storage,
|
||||||
// replacing stored cookies as appropriate
|
// replacing stored cookies as appropriate.
|
||||||
//
|
//
|
||||||
// Side effect: removes expired cookies from the storage array
|
// Side effect: removes expired cookies from the storage array.
|
||||||
- (void)setCookies:(NSArray *)newCookies {
|
- (void)setCookies:(NSArray *)newCookies {
|
||||||
|
|
||||||
@synchronized(cookies_) {
|
@synchronized(cookies_) {
|
||||||
@ -82,9 +82,9 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// retrieve all cookies appropriate for the given URL, considering
|
// Retrieve all cookies appropriate for the given URL, considering
|
||||||
// domain, path, cookie name, expiration, security setting.
|
// domain, path, cookie name, expiration, security setting.
|
||||||
// Side effect: removed expired cookies from the storage array
|
// Side effect: removed expired cookies from the storage array.
|
||||||
- (NSArray *)cookiesForURL:(NSURL *)theURL {
|
- (NSArray *)cookiesForURL:(NSURL *)theURL {
|
||||||
|
|
||||||
NSMutableArray *foundCookies = nil;
|
NSMutableArray *foundCookies = nil;
|
||||||
@ -92,9 +92,9 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
@synchronized(cookies_) {
|
@synchronized(cookies_) {
|
||||||
[self removeExpiredCookies];
|
[self removeExpiredCookies];
|
||||||
|
|
||||||
// we'll prepend "." to the desired domain, since we want the
|
// We'll prepend "." to the desired domain, since we want the
|
||||||
// actual domain "nytimes.com" to still match the cookie domain
|
// actual domain "nytimes.com" to still match the cookie domain
|
||||||
// ".nytimes.com" when we check it below with hasSuffix
|
// ".nytimes.com" when we check it below with hasSuffix.
|
||||||
NSString *host = [[theURL host] lowercaseString];
|
NSString *host = [[theURL host] lowercaseString];
|
||||||
NSString *path = [theURL path];
|
NSString *path = [theURL path];
|
||||||
NSString *scheme = [theURL scheme];
|
NSString *scheme = [theURL scheme];
|
||||||
@ -144,13 +144,13 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
return foundCookies;
|
return foundCookies;
|
||||||
}
|
}
|
||||||
|
|
||||||
// return a cookie from the array with the same name, domain, and path as the
|
// Return a cookie from the array with the same name, domain, and path as the
|
||||||
// given cookie, or else return nil if none found
|
// given cookie, or else return nil if none found.
|
||||||
//
|
//
|
||||||
// Both the cookie being tested and all cookies in the storage array should
|
// Both the cookie being tested and all cookies in the storage array should
|
||||||
// be valid (non-nil name, domains, paths)
|
// be valid (non-nil name, domains, paths).
|
||||||
//
|
//
|
||||||
// note: this should only be called from inside a @synchronized(cookies_) block
|
// Note: this should only be called from inside a @synchronized(cookies_) block
|
||||||
- (NSHTTPCookie *)cookieMatchingCookie:(NSHTTPCookie *)cookie {
|
- (NSHTTPCookie *)cookieMatchingCookie:(NSHTTPCookie *)cookie {
|
||||||
|
|
||||||
NSUInteger numberOfCookies = [cookies_ count];
|
NSUInteger numberOfCookies = [cookies_ count];
|
||||||
@ -176,10 +176,10 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// internal routine to remove any expired cookies from the array, excluding
|
// Internal routine to remove any expired cookies from the array, excluding
|
||||||
// cookies with nil expirations
|
// cookies with nil expirations.
|
||||||
//
|
//
|
||||||
// note: this should only be called from inside a @synchronized(cookies_) block
|
// Note: this should only be called from inside a @synchronized(cookies_) block
|
||||||
- (void)removeExpiredCookies {
|
- (void)removeExpiredCookies {
|
||||||
|
|
||||||
// count backwards since we're deleting items from the array
|
// count backwards since we're deleting items from the array
|
||||||
@ -281,18 +281,18 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
[self class], self, [responses_ allValues]];
|
[self class], self, [responses_ allValues]];
|
||||||
}
|
}
|
||||||
|
|
||||||
// setters/getters
|
// Setters/getters
|
||||||
|
|
||||||
- (void)pruneCacheResponses {
|
- (void)pruneCacheResponses {
|
||||||
// internal routine to remove the least-recently-used responses when the
|
// Internal routine to remove the least-recently-used responses when the
|
||||||
// cache has grown too large
|
// cache has grown too large
|
||||||
if (memoryCapacity_ >= totalDataSize_) return;
|
if (memoryCapacity_ >= totalDataSize_) return;
|
||||||
|
|
||||||
// sort keys by date
|
// Sort keys by date
|
||||||
SEL sel = @selector(compareUseDate:);
|
SEL sel = @selector(compareUseDate:);
|
||||||
NSArray *sortedKeys = [responses_ keysSortedByValueUsingSelector:sel];
|
NSArray *sortedKeys = [responses_ keysSortedByValueUsingSelector:sel];
|
||||||
|
|
||||||
// the least-recently-used keys are at the beginning of the sorted array;
|
// The least-recently-used keys are at the beginning of the sorted array;
|
||||||
// remove those (except ones still reserved) until the total data size is
|
// remove those (except ones still reserved) until the total data size is
|
||||||
// reduced sufficiently
|
// reduced sufficiently
|
||||||
for (NSURL *key in sortedKeys) {
|
for (NSURL *key in sortedKeys) {
|
||||||
@ -303,13 +303,13 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
&& ([resDate timeIntervalSinceNow] > -reservationInterval_);
|
&& ([resDate timeIntervalSinceNow] > -reservationInterval_);
|
||||||
|
|
||||||
if (!isResponseReserved) {
|
if (!isResponseReserved) {
|
||||||
// we can remove this response from the cache
|
// We can remove this response from the cache
|
||||||
NSUInteger storedSize = [[response data] length];
|
NSUInteger storedSize = [[response data] length];
|
||||||
totalDataSize_ -= storedSize;
|
totalDataSize_ -= storedSize;
|
||||||
[responses_ removeObjectForKey:key];
|
[responses_ removeObjectForKey:key];
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we've removed enough response data, then we're done
|
// If we've removed enough response data, then we're done
|
||||||
if (memoryCapacity_ >= totalDataSize_) break;
|
if (memoryCapacity_ >= totalDataSize_) break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -317,7 +317,7 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
- (void)storeCachedResponse:(GTMCachedURLResponse *)cachedResponse
|
- (void)storeCachedResponse:(GTMCachedURLResponse *)cachedResponse
|
||||||
forRequest:(NSURLRequest *)request {
|
forRequest:(NSURLRequest *)request {
|
||||||
@synchronized(self) {
|
@synchronized(self) {
|
||||||
// remove any previous entry for this request
|
// Remove any previous entry for this request
|
||||||
[self removeCachedResponseForRequest:request];
|
[self removeCachedResponseForRequest:request];
|
||||||
|
|
||||||
// cache this one only if it's not bigger than our cache
|
// cache this one only if it's not bigger than our cache
|
||||||
@ -340,7 +340,7 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
NSURL *key = [request URL];
|
NSURL *key = [request URL];
|
||||||
response = [[[responses_ objectForKey:key] retain] autorelease];
|
response = [[[responses_ objectForKey:key] retain] autorelease];
|
||||||
|
|
||||||
// touch the date to indicate this was recently retrieved
|
// Touch the date to indicate this was recently retrieved
|
||||||
[response setUseDate:[NSDate date]];
|
[response setUseDate:[NSDate date]];
|
||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
@ -376,7 +376,7 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// methods for unit testing
|
// Methods for unit testing.
|
||||||
- (void)setReservationInterval:(NSTimeInterval)secs {
|
- (void)setReservationInterval:(NSTimeInterval)secs {
|
||||||
reservationInterval_ = secs;
|
reservationInterval_ = secs;
|
||||||
}
|
}
|
||||||
@ -432,32 +432,34 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)updateRequest:(NSMutableURLRequest *)request isHTTPGet:(BOOL)isHTTPGet {
|
- (void)updateRequest:(NSMutableURLRequest *)request isHTTPGet:(BOOL)isHTTPGet {
|
||||||
if ([self shouldRememberETags]) {
|
@synchronized(self) {
|
||||||
// If this URL is in the history, and no ETag has been set, then
|
if ([self shouldRememberETags]) {
|
||||||
// set the ETag header field
|
// If this URL is in the history, and no ETag has been set, then
|
||||||
|
// set the ETag header field
|
||||||
|
|
||||||
// if we have a history, we're tracking across fetches, so we don't
|
// If we have a history, we're tracking across fetches, so we don't
|
||||||
// want to pull results from any other cache
|
// want to pull results from any other cache
|
||||||
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
|
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
|
||||||
|
|
||||||
if (isHTTPGet) {
|
if (isHTTPGet) {
|
||||||
// we'll only add an ETag if there's no ETag specified in the user's
|
// We'll only add an ETag if there's no ETag specified in the user's
|
||||||
// request
|
// request
|
||||||
NSString *specifiedETag = [request valueForHTTPHeaderField:kGTMIfNoneMatchHeader];
|
NSString *specifiedETag = [request valueForHTTPHeaderField:kGTMIfNoneMatchHeader];
|
||||||
if (specifiedETag == nil) {
|
if (specifiedETag == nil) {
|
||||||
// no ETag: extract the previous ETag for this request from the
|
// No ETag: extract the previous ETag for this request from the
|
||||||
// fetch history, and add it to the request
|
// fetch history, and add it to the request
|
||||||
NSString *cachedETag = [self cachedETagForRequest:request];
|
NSString *cachedETag = [self cachedETagForRequest:request];
|
||||||
|
|
||||||
if (cachedETag != nil) {
|
if (cachedETag != nil) {
|
||||||
[request addValue:cachedETag forHTTPHeaderField:kGTMIfNoneMatchHeader];
|
[request addValue:cachedETag forHTTPHeaderField:kGTMIfNoneMatchHeader];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Has an ETag: remove any stored response in the fetch history
|
||||||
|
// for this request, as the If-None-Match header could lead to
|
||||||
|
// a 304 Not Modified, and we want that error delivered to the
|
||||||
|
// user since they explicitly specified the ETag
|
||||||
|
[self removeCachedDataForRequest:request];
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// has an ETag: remove any stored response in the fetch history
|
|
||||||
// for this request, as the If-None-Match header could lead to
|
|
||||||
// a 304 Not Modified, and we want that error delivered to the
|
|
||||||
// user since they explicitly specified the ETag
|
|
||||||
[self removeCachedDataForRequest:request];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -466,38 +468,41 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
- (void)updateFetchHistoryWithRequest:(NSURLRequest *)request
|
- (void)updateFetchHistoryWithRequest:(NSURLRequest *)request
|
||||||
response:(NSURLResponse *)response
|
response:(NSURLResponse *)response
|
||||||
downloadedData:(NSData *)downloadedData {
|
downloadedData:(NSData *)downloadedData {
|
||||||
if (![self shouldRememberETags]) return;
|
@synchronized(self) {
|
||||||
|
if (![self shouldRememberETags]) return;
|
||||||
|
|
||||||
if (![response respondsToSelector:@selector(allHeaderFields)]) return;
|
if (![response respondsToSelector:@selector(allHeaderFields)]) return;
|
||||||
|
|
||||||
NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
|
NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
|
||||||
|
|
||||||
if (statusCode != kGTMHTTPFetcherStatusNotModified) {
|
if (statusCode != kGTMHTTPFetcherStatusNotModified) {
|
||||||
// save this ETag string for successful results (<300)
|
// Save this ETag string for successful results (<300)
|
||||||
// If there's no last modified string, clear the dictionary
|
// If there's no last modified string, clear the dictionary
|
||||||
// entry for this URL. Also cache or delete the data, if appropriate
|
// entry for this URL. Also cache or delete the data, if appropriate
|
||||||
// (when etaggedDataCache is non-nil.)
|
// (when etaggedDataCache is non-nil.)
|
||||||
NSDictionary *headers = [(NSHTTPURLResponse *)response allHeaderFields];
|
NSDictionary *headers = [(NSHTTPURLResponse *)response allHeaderFields];
|
||||||
NSString* etag = [headers objectForKey:kGTMETagHeader];
|
NSString* etag = [headers objectForKey:kGTMETagHeader];
|
||||||
|
|
||||||
if (etag != nil && statusCode < 300) {
|
if (etag != nil && statusCode < 300) {
|
||||||
|
|
||||||
// we want to cache responses for the headers, even if the client
|
// we want to cache responses for the headers, even if the client
|
||||||
// doesn't want the response body data caches
|
// doesn't want the response body data caches
|
||||||
NSData *dataToStore = shouldCacheETaggedData_ ? downloadedData : nil;
|
NSData *dataToStore = shouldCacheETaggedData_ ? downloadedData : nil;
|
||||||
|
|
||||||
GTMCachedURLResponse *cachedResponse;
|
GTMCachedURLResponse *cachedResponse;
|
||||||
cachedResponse = [[[GTMCachedURLResponse alloc] initWithResponse:response
|
cachedResponse = [[[GTMCachedURLResponse alloc] initWithResponse:response
|
||||||
data:dataToStore] autorelease];
|
data:dataToStore] autorelease];
|
||||||
[etaggedDataCache_ storeCachedResponse:cachedResponse
|
[etaggedDataCache_ storeCachedResponse:cachedResponse
|
||||||
forRequest:request];
|
forRequest:request];
|
||||||
} else {
|
} else {
|
||||||
[etaggedDataCache_ removeCachedResponseForRequest:request];
|
[etaggedDataCache_ removeCachedResponseForRequest:request];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *)cachedETagForRequest:(NSURLRequest *)request {
|
- (NSString *)cachedETagForRequest:(NSURLRequest *)request {
|
||||||
|
// Internal routine.
|
||||||
GTMCachedURLResponse *cachedResponse;
|
GTMCachedURLResponse *cachedResponse;
|
||||||
cachedResponse = [etaggedDataCache_ cachedResponseForRequest:request];
|
cachedResponse = [etaggedDataCache_ cachedResponseForRequest:request];
|
||||||
|
|
||||||
@ -505,46 +510,56 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
NSDictionary *headers = [(NSHTTPURLResponse *)response allHeaderFields];
|
NSDictionary *headers = [(NSHTTPURLResponse *)response allHeaderFields];
|
||||||
NSString *cachedETag = [headers objectForKey:kGTMETagHeader];
|
NSString *cachedETag = [headers objectForKey:kGTMETagHeader];
|
||||||
if (cachedETag) {
|
if (cachedETag) {
|
||||||
// since the request having an ETag implies this request is about
|
// Since the request having an ETag implies this request is about
|
||||||
// to be fetched again, reserve the cached response to ensure that
|
// to be fetched again, reserve the cached response to ensure that
|
||||||
// that it will be around at least until the fetch completes
|
// that it will be around at least until the fetch completes.
|
||||||
//
|
//
|
||||||
// when the fetch completes, either the cached response will be replaced
|
// When the fetch completes, either the cached response will be replaced
|
||||||
// with a new response, or the cachedDataForRequest: method below will
|
// with a new response, or the cachedDataForRequest: method below will
|
||||||
// clear the reservation
|
// clear the reservation.
|
||||||
[cachedResponse setReservationDate:[NSDate date]];
|
[cachedResponse setReservationDate:[NSDate date]];
|
||||||
}
|
}
|
||||||
return cachedETag;
|
return cachedETag;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSData *)cachedDataForRequest:(NSURLRequest *)request {
|
- (NSData *)cachedDataForRequest:(NSURLRequest *)request {
|
||||||
GTMCachedURLResponse *cachedResponse;
|
@synchronized(self) {
|
||||||
cachedResponse = [etaggedDataCache_ cachedResponseForRequest:request];
|
GTMCachedURLResponse *cachedResponse;
|
||||||
|
cachedResponse = [etaggedDataCache_ cachedResponseForRequest:request];
|
||||||
|
|
||||||
NSData *cachedData = [cachedResponse data];
|
NSData *cachedData = [cachedResponse data];
|
||||||
|
|
||||||
// since the data for this cached request is being obtained from the cache,
|
// Since the data for this cached request is being obtained from the cache,
|
||||||
// we can clear the reservation as the fetch has completed
|
// we can clear the reservation as the fetch has completed.
|
||||||
[cachedResponse setReservationDate:nil];
|
[cachedResponse setReservationDate:nil];
|
||||||
|
|
||||||
return cachedData;
|
return cachedData;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)removeCachedDataForRequest:(NSURLRequest *)request {
|
- (void)removeCachedDataForRequest:(NSURLRequest *)request {
|
||||||
[etaggedDataCache_ removeCachedResponseForRequest:request];
|
@synchronized(self) {
|
||||||
|
[etaggedDataCache_ removeCachedResponseForRequest:request];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)clearETaggedDataCache {
|
- (void)clearETaggedDataCache {
|
||||||
[etaggedDataCache_ removeAllCachedResponses];
|
@synchronized(self) {
|
||||||
|
[etaggedDataCache_ removeAllCachedResponses];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)clearHistory {
|
- (void)clearHistory {
|
||||||
[self clearETaggedDataCache];
|
@synchronized(self) {
|
||||||
[cookieStorage_ removeAllCookies];
|
[self clearETaggedDataCache];
|
||||||
|
[cookieStorage_ removeAllCookies];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)removeAllCookies {
|
- (void)removeAllCookies {
|
||||||
[cookieStorage_ removeAllCookies];
|
@synchronized(self) {
|
||||||
|
[cookieStorage_ removeAllCookies];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)shouldRememberETags {
|
- (BOOL)shouldRememberETags {
|
||||||
@ -556,7 +571,7 @@ static NSString* const kGTMETagHeader = @"Etag";
|
|||||||
shouldRememberETags_ = flag;
|
shouldRememberETags_ = flag;
|
||||||
|
|
||||||
if (wasRemembering && !flag) {
|
if (wasRemembering && !flag) {
|
||||||
// free up the cache memory
|
// Free up the cache memory
|
||||||
[self clearETaggedDataCache];
|
[self clearETaggedDataCache];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,6 +77,33 @@
|
|||||||
// Status codes are at <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>
|
// Status codes are at <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
// Threading and queue support:
|
||||||
|
//
|
||||||
|
// Callbacks require either that the thread used to start the fetcher have a run
|
||||||
|
// loop spinning (typically the main thread), or that an NSOperationQueue be
|
||||||
|
// provided upon which the delegate callbacks will be called. Starting with
|
||||||
|
// iOS 6 and Mac OS X 10.7, clients may simply create an operation queue for
|
||||||
|
// callbacks on a background thread:
|
||||||
|
//
|
||||||
|
// fetcher.delegateQueue = [[[NSOperationQueue alloc] init] autorelease];
|
||||||
|
//
|
||||||
|
// or specify the main queue for callbacks on the main thread:
|
||||||
|
//
|
||||||
|
// fetcher.delegateQueue = [NSOperationQueue mainQueue];
|
||||||
|
//
|
||||||
|
// The client may also re-dispatch from the callbacks and notifications to
|
||||||
|
// a known dispatch queue:
|
||||||
|
//
|
||||||
|
// [myFetcher beginFetchWithCompletionHandler:^(NSData *retrievedData, NSError *error) {
|
||||||
|
// if (error == nil) {
|
||||||
|
// dispatch_async(myDispatchQueue, ^{
|
||||||
|
// ...
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }];
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
// Downloading to disk:
|
// Downloading to disk:
|
||||||
//
|
//
|
||||||
// To have downloaded data saved directly to disk, specify either a path for the
|
// To have downloaded data saved directly to disk, specify either a path for the
|
||||||
@ -343,6 +370,9 @@ NSString *GTMApplicationIdentifier(NSBundle *bundle);
|
|||||||
@protocol GTMHTTPFetcherServiceProtocol <NSObject>
|
@protocol GTMHTTPFetcherServiceProtocol <NSObject>
|
||||||
// This protocol allows us to call into the service without requiring
|
// This protocol allows us to call into the service without requiring
|
||||||
// GTMHTTPFetcherService sources in this project
|
// GTMHTTPFetcherService sources in this project
|
||||||
|
|
||||||
|
@property (retain) NSOperationQueue *delegateQueue;
|
||||||
|
|
||||||
- (BOOL)fetcherShouldBeginFetching:(GTMHTTPFetcher *)fetcher;
|
- (BOOL)fetcherShouldBeginFetching:(GTMHTTPFetcher *)fetcher;
|
||||||
- (void)fetcherDidStop:(GTMHTTPFetcher *)fetcher;
|
- (void)fetcherDidStop:(GTMHTTPFetcher *)fetcher;
|
||||||
|
|
||||||
@ -416,7 +446,8 @@ NSString *GTMApplicationIdentifier(NSBundle *bundle);
|
|||||||
#endif
|
#endif
|
||||||
id userData_; // retained, if set by caller
|
id userData_; // retained, if set by caller
|
||||||
NSMutableDictionary *properties_; // more data retained for caller
|
NSMutableDictionary *properties_; // more data retained for caller
|
||||||
NSArray *runLoopModes_; // optional, for 10.5 and later
|
NSArray *runLoopModes_; // optional
|
||||||
|
NSOperationQueue *delegateQueue_; // optional; available iOS 6/10.7 and later
|
||||||
id <GTMHTTPFetchHistoryProtocol> fetchHistory_; // if supplied by the caller, used for Last-Modified-Since checks and cookies
|
id <GTMHTTPFetchHistoryProtocol> fetchHistory_; // if supplied by the caller, used for Last-Modified-Since checks and cookies
|
||||||
NSInteger cookieStorageMethod_; // constant from above
|
NSInteger cookieStorageMethod_; // constant from above
|
||||||
id <GTMCookieStorageProtocol> cookieStorage_;
|
id <GTMCookieStorageProtocol> cookieStorage_;
|
||||||
@ -502,7 +533,8 @@ NSString *GTMApplicationIdentifier(NSBundle *bundle);
|
|||||||
// fetchers that are being delayed by a fetcher service.
|
// fetchers that are being delayed by a fetcher service.
|
||||||
@property (assign) NSInteger servicePriority;
|
@property (assign) NSInteger servicePriority;
|
||||||
|
|
||||||
// The thread used to run this fetcher in the fetcher service
|
// The thread used to run this fetcher in the fetcher service when no operation
|
||||||
|
// queue is provided.
|
||||||
@property (retain) NSThread *thread;
|
@property (retain) NSThread *thread;
|
||||||
|
|
||||||
// The delegate is retained during the connection
|
// The delegate is retained during the connection
|
||||||
@ -677,6 +709,11 @@ NSString *GTMApplicationIdentifier(NSBundle *bundle);
|
|||||||
// Log of request and response, if logging is enabled
|
// Log of request and response, if logging is enabled
|
||||||
@property (copy) NSString *log;
|
@property (copy) NSString *log;
|
||||||
|
|
||||||
|
// Callbacks can be invoked on an operation queue rather than via the run loop,
|
||||||
|
// starting on 10.7 and iOS 6. If a delegate queue is supplied. the run loop
|
||||||
|
// modes are ignored.
|
||||||
|
@property (retain) NSOperationQueue *delegateQueue;
|
||||||
|
|
||||||
// Using the fetcher while a modal dialog is displayed requires setting the
|
// Using the fetcher while a modal dialog is displayed requires setting the
|
||||||
// run-loop modes to include NSModalPanelRunLoopMode
|
// run-loop modes to include NSModalPanelRunLoopMode
|
||||||
@property (retain) NSArray *runLoopModes;
|
@property (retain) NSArray *runLoopModes;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -40,10 +40,13 @@
|
|||||||
@end
|
@end
|
||||||
|
|
||||||
// If GTMNSJSONSerialization is available, it is used for formatting JSON
|
// If GTMNSJSONSerialization is available, it is used for formatting JSON
|
||||||
|
#if (TARGET_OS_MAC && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED < 1070)) || \
|
||||||
|
(TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MAX_ALLOWED < 50000))
|
||||||
@interface GTMNSJSONSerialization : NSObject
|
@interface GTMNSJSONSerialization : NSObject
|
||||||
+ (NSData *)dataWithJSONObject:(id)obj options:(NSUInteger)opt error:(NSError **)error;
|
+ (NSData *)dataWithJSONObject:(id)obj options:(NSUInteger)opt error:(NSError **)error;
|
||||||
+ (id)JSONObjectWithData:(NSData *)data options:(NSUInteger)opt error:(NSError **)error;
|
+ (id)JSONObjectWithData:(NSData *)data options:(NSUInteger)opt error:(NSError **)error;
|
||||||
@end
|
@end
|
||||||
|
#endif
|
||||||
|
|
||||||
// Otherwise, if SBJSON is available, it is used for formatting JSON
|
// Otherwise, if SBJSON is available, it is used for formatting JSON
|
||||||
@interface GTMFetcherSBJSON
|
@interface GTMFetcherSBJSON
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
NSUInteger maxRunningFetchersPerHost_;
|
NSUInteger maxRunningFetchersPerHost_;
|
||||||
|
|
||||||
GTMHTTPFetchHistory *fetchHistory_;
|
GTMHTTPFetchHistory *fetchHistory_;
|
||||||
|
NSOperationQueue *delegateQueue_;
|
||||||
NSArray *runLoopModes_;
|
NSArray *runLoopModes_;
|
||||||
NSString *userAgent_;
|
NSString *userAgent_;
|
||||||
NSTimeInterval timeout_;
|
NSTimeInterval timeout_;
|
||||||
@ -83,12 +84,18 @@
|
|||||||
- (NSUInteger)numberOfRunningFetchers;
|
- (NSUInteger)numberOfRunningFetchers;
|
||||||
- (NSUInteger)numberOfDelayedFetchers;
|
- (NSUInteger)numberOfDelayedFetchers;
|
||||||
|
|
||||||
|
// Search for running or delayed fetchers with the specified URL.
|
||||||
|
//
|
||||||
|
// Returns an array of fetcher objects found, or nil if none found.
|
||||||
|
- (NSArray *)issuedFetchersWithRequestURL:(NSURL *)requestURL;
|
||||||
|
|
||||||
- (void)stopAllFetchers;
|
- (void)stopAllFetchers;
|
||||||
|
|
||||||
// Properties to be applied to each fetcher;
|
// Properties to be applied to each fetcher;
|
||||||
// see GTMHTTPFetcher.h for descriptions
|
// see GTMHTTPFetcher.h for descriptions
|
||||||
@property (copy) NSString *userAgent;
|
@property (copy) NSString *userAgent;
|
||||||
@property (assign) NSTimeInterval timeout;
|
@property (assign) NSTimeInterval timeout;
|
||||||
|
@property (retain) NSOperationQueue *delegateQueue;
|
||||||
@property (retain) NSArray *runLoopModes;
|
@property (retain) NSArray *runLoopModes;
|
||||||
@property (retain) NSURLCredential *credential;
|
@property (retain) NSURLCredential *credential;
|
||||||
@property (retain) NSURLCredential *proxyCredential;
|
@property (retain) NSURLCredential *proxyCredential;
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
@synthesize maxRunningFetchersPerHost = maxRunningFetchersPerHost_,
|
@synthesize maxRunningFetchersPerHost = maxRunningFetchersPerHost_,
|
||||||
userAgent = userAgent_,
|
userAgent = userAgent_,
|
||||||
timeout = timeout_,
|
timeout = timeout_,
|
||||||
|
delegateQueue = delegateQueue_,
|
||||||
runLoopModes = runLoopModes_,
|
runLoopModes = runLoopModes_,
|
||||||
credential = credential_,
|
credential = credential_,
|
||||||
proxyCredential = proxyCredential_,
|
proxyCredential = proxyCredential_,
|
||||||
@ -63,6 +64,7 @@
|
|||||||
[runningHosts_ release];
|
[runningHosts_ release];
|
||||||
[fetchHistory_ release];
|
[fetchHistory_ release];
|
||||||
[userAgent_ release];
|
[userAgent_ release];
|
||||||
|
[delegateQueue_ release];
|
||||||
[runLoopModes_ release];
|
[runLoopModes_ release];
|
||||||
[credential_ release];
|
[credential_ release];
|
||||||
[proxyCredential_ release];
|
[proxyCredential_ release];
|
||||||
@ -78,6 +80,7 @@
|
|||||||
GTMHTTPFetcher *fetcher = [fetcherClass fetcherWithRequest:request];
|
GTMHTTPFetcher *fetcher = [fetcherClass fetcherWithRequest:request];
|
||||||
|
|
||||||
fetcher.fetchHistory = self.fetchHistory;
|
fetcher.fetchHistory = self.fetchHistory;
|
||||||
|
fetcher.delegateQueue = self.delegateQueue;
|
||||||
fetcher.runLoopModes = self.runLoopModes;
|
fetcher.runLoopModes = self.runLoopModes;
|
||||||
fetcher.cookieStorageMethod = self.cookieStorageMethod;
|
fetcher.cookieStorageMethod = self.cookieStorageMethod;
|
||||||
fetcher.credential = self.credential;
|
fetcher.credential = self.credential;
|
||||||
@ -143,14 +146,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)isDelayingFetcher:(GTMHTTPFetcher *)fetcher {
|
- (BOOL)isDelayingFetcher:(GTMHTTPFetcher *)fetcher {
|
||||||
BOOL isDelayed;
|
|
||||||
@synchronized(self) {
|
@synchronized(self) {
|
||||||
NSString *host = [[[fetcher mutableRequest] URL] host];
|
NSString *host = [[[fetcher mutableRequest] URL] host];
|
||||||
NSArray *delayedForHost = [delayedHosts_ objectForKey:host];
|
NSArray *delayedForHost = [delayedHosts_ objectForKey:host];
|
||||||
NSUInteger idx = [delayedForHost indexOfObjectIdenticalTo:fetcher];
|
NSUInteger idx = [delayedForHost indexOfObjectIdenticalTo:fetcher];
|
||||||
isDelayed = (delayedForHost != nil) && (idx != NSNotFound);
|
BOOL isDelayed = (delayedForHost != nil) && (idx != NSNotFound);
|
||||||
|
return isDelayed;
|
||||||
}
|
}
|
||||||
return isDelayed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)fetcherShouldBeginFetching:(GTMHTTPFetcher *)fetcher {
|
- (BOOL)fetcherShouldBeginFetching:(GTMHTTPFetcher *)fetcher {
|
||||||
@ -194,23 +196,32 @@
|
|||||||
|
|
||||||
// Fetcher start and stop methods, invoked on the appropriate thread for
|
// Fetcher start and stop methods, invoked on the appropriate thread for
|
||||||
// the fetcher
|
// the fetcher
|
||||||
|
- (void)performSelector:(SEL)sel onStartThreadForFetcher:(GTMHTTPFetcher *)fetcher {
|
||||||
|
NSOperationQueue *delegateQueue = fetcher.delegateQueue;
|
||||||
|
NSThread *thread = fetcher.thread;
|
||||||
|
if (delegateQueue != nil || [thread isEqual:[NSThread currentThread]]) {
|
||||||
|
// The fetcher should run on the thread we're on now, or there's a delegate
|
||||||
|
// queue specified so it doesn't matter what thread the fetcher is started
|
||||||
|
// on, since it will call back on the queue.
|
||||||
|
[self performSelector:sel withObject:fetcher];
|
||||||
|
} else {
|
||||||
|
// Fetcher must run on a specified thread (and that thread must have a
|
||||||
|
// run loop.)
|
||||||
|
[self performSelector:sel
|
||||||
|
onThread:thread
|
||||||
|
withObject:fetcher
|
||||||
|
waitUntilDone:NO];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
- (void)startFetcherOnCurrentThread:(GTMHTTPFetcher *)fetcher {
|
- (void)startFetcherOnCurrentThread:(GTMHTTPFetcher *)fetcher {
|
||||||
[fetcher beginFetchMayDelay:NO
|
[fetcher beginFetchMayDelay:NO
|
||||||
mayAuthorize:YES];
|
mayAuthorize:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)startFetcher:(GTMHTTPFetcher *)fetcher {
|
- (void)startFetcher:(GTMHTTPFetcher *)fetcher {
|
||||||
NSThread *thread = [fetcher thread];
|
[self performSelector:@selector(startFetcherOnCurrentThread:)
|
||||||
if ([thread isEqual:[NSThread currentThread]]) {
|
onStartThreadForFetcher:fetcher];
|
||||||
// Same thread
|
|
||||||
[self startFetcherOnCurrentThread:fetcher];
|
|
||||||
} else {
|
|
||||||
// Different thread
|
|
||||||
[self performSelector:@selector(startFetcherOnCurrentThread:)
|
|
||||||
onThread:thread
|
|
||||||
withObject:fetcher
|
|
||||||
waitUntilDone:NO];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)stopFetcherOnCurrentThread:(GTMHTTPFetcher *)fetcher {
|
- (void)stopFetcherOnCurrentThread:(GTMHTTPFetcher *)fetcher {
|
||||||
@ -218,17 +229,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)stopFetcher:(GTMHTTPFetcher *)fetcher {
|
- (void)stopFetcher:(GTMHTTPFetcher *)fetcher {
|
||||||
NSThread *thread = [fetcher thread];
|
[self performSelector:@selector(stopFetcherOnCurrentThread:)
|
||||||
if ([thread isEqual:[NSThread currentThread]]) {
|
onStartThreadForFetcher:fetcher];
|
||||||
// Same thread
|
|
||||||
[self stopFetcherOnCurrentThread:fetcher];
|
|
||||||
} else {
|
|
||||||
// Different thread
|
|
||||||
[self performSelector:@selector(stopFetcherOnCurrentThread:)
|
|
||||||
onThread:thread
|
|
||||||
withObject:fetcher
|
|
||||||
waitUntilDone:NO];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)fetcherDidStop:(GTMHTTPFetcher *)fetcher {
|
- (void)fetcherDidStop:(GTMHTTPFetcher *)fetcher {
|
||||||
@ -282,47 +284,88 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (NSUInteger)numberOfFetchers {
|
- (NSUInteger)numberOfFetchers {
|
||||||
NSUInteger running = [self numberOfRunningFetchers];
|
@synchronized(self) {
|
||||||
NSUInteger delayed = [self numberOfDelayedFetchers];
|
NSUInteger running = [self numberOfRunningFetchers];
|
||||||
return running + delayed;
|
NSUInteger delayed = [self numberOfDelayedFetchers];
|
||||||
|
return running + delayed;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSUInteger)numberOfRunningFetchers {
|
- (NSUInteger)numberOfRunningFetchers {
|
||||||
NSUInteger sum = 0;
|
@synchronized(self) {
|
||||||
for (NSString *host in runningHosts_) {
|
NSUInteger sum = 0;
|
||||||
NSArray *fetchers = [runningHosts_ objectForKey:host];
|
for (NSString *host in runningHosts_) {
|
||||||
sum += [fetchers count];
|
NSArray *fetchers = [runningHosts_ objectForKey:host];
|
||||||
|
sum += [fetchers count];
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
}
|
}
|
||||||
return sum;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSUInteger)numberOfDelayedFetchers {
|
- (NSUInteger)numberOfDelayedFetchers {
|
||||||
NSUInteger sum = 0;
|
@synchronized(self) {
|
||||||
for (NSString *host in delayedHosts_) {
|
NSUInteger sum = 0;
|
||||||
NSArray *fetchers = [delayedHosts_ objectForKey:host];
|
for (NSString *host in delayedHosts_) {
|
||||||
sum += [fetchers count];
|
NSArray *fetchers = [delayedHosts_ objectForKey:host];
|
||||||
|
sum += [fetchers count];
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSArray *)issuedFetchersWithRequestURL:(NSURL *)requestURL {
|
||||||
|
@synchronized(self) {
|
||||||
|
NSMutableArray *array = nil;
|
||||||
|
NSString *host = [requestURL host];
|
||||||
|
if ([host length] == 0) return nil;
|
||||||
|
|
||||||
|
NSURL *absRequestURL = [requestURL absoluteURL];
|
||||||
|
|
||||||
|
NSArray *runningForHost = [runningHosts_ objectForKey:host];
|
||||||
|
for (GTMHTTPFetcher *fetcher in runningForHost) {
|
||||||
|
NSURL *fetcherURL = [[[fetcher mutableRequest] URL] absoluteURL];
|
||||||
|
if ([fetcherURL isEqual:absRequestURL]) {
|
||||||
|
if (array == nil) {
|
||||||
|
array = [NSMutableArray array];
|
||||||
|
}
|
||||||
|
[array addObject:fetcher];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NSArray *delayedForHost = [delayedHosts_ objectForKey:host];
|
||||||
|
for (GTMHTTPFetcher *fetcher in delayedForHost) {
|
||||||
|
NSURL *fetcherURL = [[[fetcher mutableRequest] URL] absoluteURL];
|
||||||
|
if ([fetcherURL isEqual:absRequestURL]) {
|
||||||
|
if (array == nil) {
|
||||||
|
array = [NSMutableArray array];
|
||||||
|
}
|
||||||
|
[array addObject:fetcher];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return array;
|
||||||
}
|
}
|
||||||
return sum;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)stopAllFetchers {
|
- (void)stopAllFetchers {
|
||||||
// Remove fetchers from the delayed list to avoid fetcherDidStop: from
|
@synchronized(self) {
|
||||||
// starting more fetchers running as a side effect of stopping one
|
// Remove fetchers from the delayed list to avoid fetcherDidStop: from
|
||||||
NSArray *delayedForHosts = [delayedHosts_ allValues];
|
// starting more fetchers running as a side effect of stopping one
|
||||||
[delayedHosts_ removeAllObjects];
|
NSArray *delayedForHosts = [delayedHosts_ allValues];
|
||||||
|
[delayedHosts_ removeAllObjects];
|
||||||
|
|
||||||
for (NSArray *delayedForHost in delayedForHosts) {
|
for (NSArray *delayedForHost in delayedForHosts) {
|
||||||
for (GTMHTTPFetcher *fetcher in delayedForHost) {
|
for (GTMHTTPFetcher *fetcher in delayedForHost) {
|
||||||
[self stopFetcher:fetcher];
|
[self stopFetcher:fetcher];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
NSArray *runningForHosts = [runningHosts_ allValues];
|
NSArray *runningForHosts = [runningHosts_ allValues];
|
||||||
[runningHosts_ removeAllObjects];
|
[runningHosts_ removeAllObjects];
|
||||||
|
|
||||||
for (NSArray *runningForHost in runningForHosts) {
|
for (NSArray *runningForHost in runningForHosts) {
|
||||||
for (GTMHTTPFetcher *fetcher in runningForHost) {
|
for (GTMHTTPFetcher *fetcher in runningForHost) {
|
||||||
[self stopFetcher:fetcher];
|
[self stopFetcher:fetcher];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -370,13 +413,19 @@
|
|||||||
|
|
||||||
- (void)waitForCompletionOfAllFetchersWithTimeout:(NSTimeInterval)timeoutInSeconds {
|
- (void)waitForCompletionOfAllFetchersWithTimeout:(NSTimeInterval)timeoutInSeconds {
|
||||||
NSDate* giveUpDate = [NSDate dateWithTimeIntervalSinceNow:timeoutInSeconds];
|
NSDate* giveUpDate = [NSDate dateWithTimeIntervalSinceNow:timeoutInSeconds];
|
||||||
|
BOOL isMainThread = [NSThread isMainThread];
|
||||||
|
|
||||||
while ([self numberOfFetchers] > 0
|
while ([self numberOfFetchers] > 0
|
||||||
&& [giveUpDate timeIntervalSinceNow] > 0) {
|
&& [giveUpDate timeIntervalSinceNow] > 0) {
|
||||||
// Run the current run loop 1/1000 of a second to give the networking
|
// Run the current run loop 1/1000 of a second to give the networking
|
||||||
// code a chance to work
|
// code a chance to work
|
||||||
NSDate *stopDate = [NSDate dateWithTimeIntervalSinceNow:0.001];
|
if (isMainThread || delegateQueue_ == nil) {
|
||||||
[[NSRunLoop currentRunLoop] runUntilDate:stopDate];
|
NSDate *stopDate = [NSDate dateWithTimeIntervalSinceNow:0.001];
|
||||||
|
[[NSRunLoop currentRunLoop] runUntilDate:stopDate];
|
||||||
|
} else {
|
||||||
|
// Sleep on the delegate queue's background thread.
|
||||||
|
[NSThread sleepForTimeInterval:0.001];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,16 @@
|
|||||||
#import <pthread.h>
|
#import <pthread.h>
|
||||||
|
|
||||||
|
|
||||||
|
#if !defined(__clang__) && (__GNUC__*10+__GNUC_MINOR__ >= 42)
|
||||||
|
// Some versions of GCC (4.2 and below AFAIK) aren't great about supporting
|
||||||
|
// -Wmissing-format-attribute
|
||||||
|
// when the function is anything more complex than foo(NSString *fmt, ...).
|
||||||
|
// You see the error inside the function when you turn ... into va_args and
|
||||||
|
// attempt to call another function (like vsprintf for example).
|
||||||
|
// So we just shut off the warning for this file. We reenable it at the end.
|
||||||
|
#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
|
||||||
|
#endif // !__clang__
|
||||||
|
|
||||||
// Reference to the shared GTMLogger instance. This is not a singleton, it's
|
// Reference to the shared GTMLogger instance. This is not a singleton, it's
|
||||||
// just an easy reference to one shared instance.
|
// just an easy reference to one shared instance.
|
||||||
static GTMLogger *gSharedLogger = nil;
|
static GTMLogger *gSharedLogger = nil;
|
||||||
@ -265,7 +275,6 @@ static GTMLogger *gSharedLogger = nil;
|
|||||||
|
|
||||||
@end // GTMLogger
|
@end // GTMLogger
|
||||||
|
|
||||||
|
|
||||||
@implementation GTMLogger (GTMLoggerMacroHelpers)
|
@implementation GTMLogger (GTMLoggerMacroHelpers)
|
||||||
|
|
||||||
- (void)logFuncDebug:(const char *)func msg:(NSString *)fmt, ... {
|
- (void)logFuncDebug:(const char *)func msg:(NSString *)fmt, ... {
|
||||||
@ -298,7 +307,6 @@ static GTMLogger *gSharedLogger = nil;
|
|||||||
|
|
||||||
@end // GTMLoggerMacroHelpers
|
@end // GTMLoggerMacroHelpers
|
||||||
|
|
||||||
|
|
||||||
@implementation GTMLogger (PrivateMethods)
|
@implementation GTMLogger (PrivateMethods)
|
||||||
|
|
||||||
- (void)logInternalFunc:(const char *)func
|
- (void)logInternalFunc:(const char *)func
|
||||||
@ -596,3 +604,9 @@ static BOOL IsVerboseLoggingEnabled(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@end // GTMLogMaximumLevelFilter
|
@end // GTMLogMaximumLevelFilter
|
||||||
|
|
||||||
|
#if !defined(__clang__) && (__GNUC__*10+__GNUC_MINOR__ >= 42)
|
||||||
|
// See comment at top of file.
|
||||||
|
#pragma GCC diagnostic error "-Wmissing-format-attribute"
|
||||||
|
#endif // !__clang__
|
||||||
|
|
||||||
|
@ -54,9 +54,11 @@ static BOOL ConformsToNSObjectProtocol(Class cls) {
|
|||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
// iPhone SDK does not define the |Object| class, so we instead test for the
|
// iPhone and Mac OS X 10.8 with Obj-C 2 SDKs do not define the |Object|
|
||||||
// |NSObject| class.
|
// class, so we instead test for the |NSObject| class.
|
||||||
#if GTM_IPHONE_SDK
|
#if GTM_IPHONE_SDK || \
|
||||||
|
(__OBJC2__ && defined(MAC_OS_X_VERSION_10_8) && \
|
||||||
|
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)
|
||||||
// Iterate through all the protocols |cls| supports looking for NSObject.
|
// Iterate through all the protocols |cls| supports looking for NSObject.
|
||||||
if (cls == [NSObject class]
|
if (cls == [NSObject class]
|
||||||
|| class_conformsToProtocol(cls, @protocol(NSObject))) {
|
|| class_conformsToProtocol(cls, @protocol(NSObject))) {
|
||||||
|
@ -44,9 +44,12 @@ static NSString *const kTokenFetchSelectorKey = @"sel";
|
|||||||
static NSString *const kRefreshFetchArgsKey = @"requestArgs";
|
static NSString *const kRefreshFetchArgsKey = @"requestArgs";
|
||||||
|
|
||||||
// If GTMNSJSONSerialization is available, it is used for formatting JSON
|
// If GTMNSJSONSerialization is available, it is used for formatting JSON
|
||||||
|
#if (TARGET_OS_MAC && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED < 1070)) || \
|
||||||
|
(TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MAX_ALLOWED < 50000))
|
||||||
@interface GTMNSJSONSerialization : NSObject
|
@interface GTMNSJSONSerialization : NSObject
|
||||||
+ (id)JSONObjectWithData:(NSData *)data options:(NSUInteger)opt error:(NSError **)error;
|
+ (id)JSONObjectWithData:(NSData *)data options:(NSUInteger)opt error:(NSError **)error;
|
||||||
@end
|
@end
|
||||||
|
#endif
|
||||||
|
|
||||||
@interface GTMOAuth2ParserClass : NSObject
|
@interface GTMOAuth2ParserClass : NSObject
|
||||||
// just enough of SBJSON to be able to parse
|
// just enough of SBJSON to be able to parse
|
||||||
@ -524,10 +527,24 @@ finishedRefreshWithFetcher:(GTMHTTPFetcher *)fetcher
|
|||||||
NSThread *targetThread = args.thread;
|
NSThread *targetThread = args.thread;
|
||||||
BOOL isSameThread = [targetThread isEqual:[NSThread currentThread]];
|
BOOL isSameThread = [targetThread isEqual:[NSThread currentThread]];
|
||||||
|
|
||||||
[self performSelector:@selector(invokeCallbackArgs:)
|
if (isSameThread) {
|
||||||
onThread:targetThread
|
[self invokeCallbackArgs:args];
|
||||||
withObject:args
|
} else {
|
||||||
waitUntilDone:isSameThread];
|
SEL sel = @selector(invokeCallbackArgs:);
|
||||||
|
NSOperationQueue *delegateQueue = self.fetcherService.delegateQueue;
|
||||||
|
if (delegateQueue) {
|
||||||
|
NSInvocationOperation *op;
|
||||||
|
op = [[[NSInvocationOperation alloc] initWithTarget:self
|
||||||
|
selector:sel
|
||||||
|
object:args] autorelease];
|
||||||
|
[delegateQueue addOperation:op];
|
||||||
|
} else {
|
||||||
|
[self performSelector:sel
|
||||||
|
onThread:targetThread
|
||||||
|
withObject:args
|
||||||
|
waitUntilDone:NO];
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL didAuth = (args.error == nil);
|
BOOL didAuth = (args.error == nil);
|
||||||
|
@ -154,9 +154,17 @@
|
|||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
|
||||||
// Revocation of an authorized token from Google
|
|
||||||
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
||||||
|
// Revocation of an authorized token from Google
|
||||||
+ (void)revokeTokenForGoogleAuthentication:(GTMOAuth2Authentication *)auth;
|
+ (void)revokeTokenForGoogleAuthentication:(GTMOAuth2Authentication *)auth;
|
||||||
|
|
||||||
|
// Create a fetcher for obtaining the user's Google email address or profile,
|
||||||
|
// according to the current auth scopes.
|
||||||
|
//
|
||||||
|
// The auth object must have been created with appropriate scopes.
|
||||||
|
//
|
||||||
|
// The fetcher's response data can be parsed with NSJSONSerialization.
|
||||||
|
+ (GTMHTTPFetcher *)userInfoFetcherWithAuth:(GTMOAuth2Authentication *)auth;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
@ -539,22 +539,15 @@ finishedWithFetcher:(GTMHTTPFetcher *)fetcher
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
||||||
- (void)fetchGoogleUserInfo {
|
+ (GTMHTTPFetcher *)userInfoFetcherWithAuth:(GTMOAuth2Authentication *)auth {
|
||||||
// fetch the user's email address
|
// create a fetcher for obtaining the user's email or profile
|
||||||
NSURL *infoURL = [[self class] googleUserInfoURL];
|
NSURL *infoURL = [[self class] googleUserInfoURL];
|
||||||
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:infoURL];
|
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:infoURL];
|
||||||
|
|
||||||
GTMOAuth2Authentication *auth = self.authentication;
|
|
||||||
|
|
||||||
NSString *userAgent = [auth userAgent];
|
NSString *userAgent = [auth userAgent];
|
||||||
[request setValue:userAgent forHTTPHeaderField:@"User-Agent"];
|
[request setValue:userAgent forHTTPHeaderField:@"User-Agent"];
|
||||||
|
|
||||||
[request setValue:@"no-cache" forHTTPHeaderField:@"Cache-Control"];
|
[request setValue:@"no-cache" forHTTPHeaderField:@"Cache-Control"];
|
||||||
|
|
||||||
// we can do a synchronous authorization since this method is called
|
|
||||||
// only immediately after a fresh access token has been obtained
|
|
||||||
[auth authorizeRequest:request];
|
|
||||||
|
|
||||||
GTMHTTPFetcher *fetcher;
|
GTMHTTPFetcher *fetcher;
|
||||||
id <GTMHTTPFetcherServiceProtocol> fetcherService = auth.fetcherService;
|
id <GTMHTTPFetcherServiceProtocol> fetcherService = auth.fetcherService;
|
||||||
if (fetcherService) {
|
if (fetcherService) {
|
||||||
@ -562,10 +555,17 @@ finishedWithFetcher:(GTMHTTPFetcher *)fetcher
|
|||||||
} else {
|
} else {
|
||||||
fetcher = [GTMHTTPFetcher fetcherWithRequest:request];
|
fetcher = [GTMHTTPFetcher fetcherWithRequest:request];
|
||||||
}
|
}
|
||||||
|
fetcher.authorizer = auth;
|
||||||
fetcher.retryEnabled = YES;
|
fetcher.retryEnabled = YES;
|
||||||
fetcher.maxRetryInterval = 15.0;
|
fetcher.maxRetryInterval = 15.0;
|
||||||
fetcher.comment = @"user info";
|
fetcher.comment = @"user info";
|
||||||
|
return fetcher;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)fetchGoogleUserInfo {
|
||||||
|
// fetch the user's email address or profile
|
||||||
|
GTMOAuth2Authentication *auth = self.authentication;
|
||||||
|
GTMHTTPFetcher *fetcher = [[self class] userInfoFetcherWithAuth:auth];
|
||||||
[fetcher beginFetchWithDelegate:self
|
[fetcher beginFetchWithDelegate:self
|
||||||
didFinishSelector:@selector(infoFetcher:finishedWithData:error:)];
|
didFinishSelector:@selector(infoFetcher:finishedWithData:error:)];
|
||||||
|
|
||||||
|
@ -53,6 +53,7 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
@private
|
@private
|
||||||
UIButton *backButton_;
|
UIButton *backButton_;
|
||||||
UIButton *forwardButton_;
|
UIButton *forwardButton_;
|
||||||
|
UIActivityIndicatorView *initialActivityIndicator_;
|
||||||
UIView *navButtonsView_;
|
UIView *navButtonsView_;
|
||||||
UIBarButtonItem *rightBarButtonItem_;
|
UIBarButtonItem *rightBarButtonItem_;
|
||||||
UIWebView *webView_;
|
UIWebView *webView_;
|
||||||
@ -73,6 +74,8 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
|
|
||||||
#if NS_BLOCKS_AVAILABLE
|
#if NS_BLOCKS_AVAILABLE
|
||||||
void (^completionBlock_)(GTMOAuth2ViewControllerTouch *, GTMOAuth2Authentication *, NSError *);
|
void (^completionBlock_)(GTMOAuth2ViewControllerTouch *, GTMOAuth2Authentication *, NSError *);
|
||||||
|
|
||||||
|
void (^popViewBlock_)(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
NSString *keychainItemName_;
|
NSString *keychainItemName_;
|
||||||
@ -82,6 +85,10 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
// of the web view
|
// of the web view
|
||||||
NSString *initialHTMLString_;
|
NSString *initialHTMLString_;
|
||||||
|
|
||||||
|
// set to 1 or -1 if the user sets the showsInitialActivityIndicator
|
||||||
|
// property
|
||||||
|
int mustShowActivityIndicator_;
|
||||||
|
|
||||||
// if non-nil, the URL for which cookies will be deleted when the
|
// if non-nil, the URL for which cookies will be deleted when the
|
||||||
// browser view is dismissed
|
// browser view is dismissed
|
||||||
NSURL *browserCookiesURL_;
|
NSURL *browserCookiesURL_;
|
||||||
@ -89,10 +96,12 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
id userData_;
|
id userData_;
|
||||||
NSMutableDictionary *properties_;
|
NSMutableDictionary *properties_;
|
||||||
|
|
||||||
|
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 60000
|
||||||
// We delegate the decision to our owning NavigationController (if any).
|
// We delegate the decision to our owning NavigationController (if any).
|
||||||
// But, the NavigationController will call us back, and ask us.
|
// But, the NavigationController will call us back, and ask us.
|
||||||
// BOOL keeps us from infinite looping.
|
// BOOL keeps us from infinite looping.
|
||||||
BOOL isInsideShouldAutorotateToInterfaceOrientation_;
|
BOOL isInsideShouldAutorotateToInterfaceOrientation_;
|
||||||
|
#endif
|
||||||
|
|
||||||
// YES, when view first shown in this signIn session.
|
// YES, when view first shown in this signIn session.
|
||||||
BOOL isViewShown_;
|
BOOL isViewShown_;
|
||||||
@ -132,6 +141,11 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
// initial view color
|
// initial view color
|
||||||
@property (nonatomic, copy) NSString *initialHTMLString;
|
@property (nonatomic, copy) NSString *initialHTMLString;
|
||||||
|
|
||||||
|
// an activity indicator shows during initial webview load when no initial HTML
|
||||||
|
// string is specified, but the activity indicator can be forced to be shown
|
||||||
|
// with this property
|
||||||
|
@property (nonatomic, assign) BOOL showsInitialActivityIndicator;
|
||||||
|
|
||||||
// the underlying object to hold authentication tokens and authorize http
|
// the underlying object to hold authentication tokens and authorize http
|
||||||
// requests
|
// requests
|
||||||
@property (nonatomic, retain, readonly) GTMOAuth2Authentication *authentication;
|
@property (nonatomic, retain, readonly) GTMOAuth2Authentication *authentication;
|
||||||
@ -142,10 +156,17 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
// user interface elements
|
// user interface elements
|
||||||
@property (nonatomic, retain) IBOutlet UIButton *backButton;
|
@property (nonatomic, retain) IBOutlet UIButton *backButton;
|
||||||
@property (nonatomic, retain) IBOutlet UIButton *forwardButton;
|
@property (nonatomic, retain) IBOutlet UIButton *forwardButton;
|
||||||
|
@property (nonatomic, retain) IBOutlet UIActivityIndicatorView *initialActivityIndicator;
|
||||||
@property (nonatomic, retain) IBOutlet UIView *navButtonsView;
|
@property (nonatomic, retain) IBOutlet UIView *navButtonsView;
|
||||||
@property (nonatomic, retain) IBOutlet UIBarButtonItem *rightBarButtonItem;
|
@property (nonatomic, retain) IBOutlet UIBarButtonItem *rightBarButtonItem;
|
||||||
@property (nonatomic, retain) IBOutlet UIWebView *webView;
|
@property (nonatomic, retain) IBOutlet UIWebView *webView;
|
||||||
|
|
||||||
|
#if NS_BLOCKS_AVAILABLE
|
||||||
|
// An optional block to be called when the view should be popped. If not set,
|
||||||
|
// the view controller will use its navigation controller to pop the view.
|
||||||
|
@property (nonatomic, copy) void (^popViewBlock)(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
// the default timeout for an unreachable network during display of the
|
// the default timeout for an unreachable network during display of the
|
||||||
// sign-in page is 10 seconds; set this to 0 to have no timeout
|
// sign-in page is 10 seconds; set this to 0 to have no timeout
|
||||||
@property (nonatomic, assign) NSTimeInterval networkLossTimeoutInterval;
|
@property (nonatomic, assign) NSTimeInterval networkLossTimeoutInterval;
|
||||||
@ -244,10 +265,6 @@ _EXTERN NSString* const kGTMOAuth2KeychainErrorDomain _INITIALIZE_AS(@"com
|
|||||||
completionHandler:(void (^)(GTMOAuth2ViewControllerTouch *viewController, GTMOAuth2Authentication *auth, NSError *error))handler;
|
completionHandler:(void (^)(GTMOAuth2ViewControllerTouch *viewController, GTMOAuth2Authentication *auth, NSError *error))handler;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Override default in UIViewController. If we have a navigationController, ask
|
|
||||||
// it. else default result (i.e., Portrait mode only).
|
|
||||||
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
|
|
||||||
|
|
||||||
// subclasses may override authNibName to specify a custom name
|
// subclasses may override authNibName to specify a custom name
|
||||||
+ (NSString *)authNibName;
|
+ (NSString *)authNibName;
|
||||||
|
|
||||||
|
@ -55,7 +55,8 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
forwardButton = forwardButton_,
|
forwardButton = forwardButton_,
|
||||||
navButtonsView = navButtonsView_,
|
navButtonsView = navButtonsView_,
|
||||||
rightBarButtonItem = rightBarButtonItem_,
|
rightBarButtonItem = rightBarButtonItem_,
|
||||||
webView = webView_;
|
webView = webView_,
|
||||||
|
initialActivityIndicator = initialActivityIndicator_;
|
||||||
|
|
||||||
@synthesize keychainItemName = keychainItemName_,
|
@synthesize keychainItemName = keychainItemName_,
|
||||||
keychainItemAccessibility = keychainItemAccessibility_,
|
keychainItemAccessibility = keychainItemAccessibility_,
|
||||||
@ -65,6 +66,10 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
userData = userData_,
|
userData = userData_,
|
||||||
properties = properties_;
|
properties = properties_;
|
||||||
|
|
||||||
|
#if NS_BLOCKS_AVAILABLE
|
||||||
|
@synthesize popViewBlock = popViewBlock_;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
#if !GTM_OAUTH2_SKIP_GOOGLE_SUPPORT
|
||||||
+ (id)controllerWithScope:(NSString *)scope
|
+ (id)controllerWithScope:(NSString *)scope
|
||||||
clientID:(NSString *)clientID
|
clientID:(NSString *)clientID
|
||||||
@ -153,7 +158,7 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
authorizationURL:authorizationURL
|
authorizationURL:authorizationURL
|
||||||
keychainItemName:keychainItemName
|
keychainItemName:keychainItemName
|
||||||
delegate:delegate
|
delegate:delegate
|
||||||
finishedSelector:finishedSelector] autorelease];
|
finishedSelector:finishedSelector] autorelease];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id)initWithAuthentication:(GTMOAuth2Authentication *)auth
|
- (id)initWithAuthentication:(GTMOAuth2Authentication *)auth
|
||||||
@ -178,7 +183,7 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
delegate:self
|
delegate:self
|
||||||
webRequestSelector:@selector(signIn:displayRequest:)
|
webRequestSelector:@selector(signIn:displayRequest:)
|
||||||
finishedSelector:@selector(signIn:finishedWithAuth:error:)];
|
finishedSelector:@selector(signIn:finishedWithAuth:error:)];
|
||||||
|
|
||||||
// if the user is signing in to a Google service, we'll delete the
|
// if the user is signing in to a Google service, we'll delete the
|
||||||
// Google authentication browser cookies upon completion
|
// Google authentication browser cookies upon completion
|
||||||
//
|
//
|
||||||
@ -230,6 +235,7 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
|
|
||||||
[backButton_ release];
|
[backButton_ release];
|
||||||
[forwardButton_ release];
|
[forwardButton_ release];
|
||||||
|
[initialActivityIndicator_ release];
|
||||||
[navButtonsView_ release];
|
[navButtonsView_ release];
|
||||||
[rightBarButtonItem_ release];
|
[rightBarButtonItem_ release];
|
||||||
[webView_ release];
|
[webView_ release];
|
||||||
@ -238,6 +244,7 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
[delegate_ release];
|
[delegate_ release];
|
||||||
#if NS_BLOCKS_AVAILABLE
|
#if NS_BLOCKS_AVAILABLE
|
||||||
[completionBlock_ release];
|
[completionBlock_ release];
|
||||||
|
[popViewBlock_ release];
|
||||||
#endif
|
#endif
|
||||||
[keychainItemName_ release];
|
[keychainItemName_ release];
|
||||||
[initialHTMLString_ release];
|
[initialHTMLString_ release];
|
||||||
@ -358,26 +365,32 @@ finishedWithAuth:(GTMOAuth2Authentication *)auth
|
|||||||
|
|
||||||
|
|
||||||
- (void)viewDidLoad {
|
- (void)viewDidLoad {
|
||||||
// the app may prefer some html other than blank white to be displayed
|
|
||||||
// before the sign-in web page loads
|
|
||||||
NSString *html = self.initialHTMLString;
|
|
||||||
if ([html length] > 0) {
|
|
||||||
[[self webView] loadHTMLString:html baseURL:nil];
|
|
||||||
}
|
|
||||||
|
|
||||||
rightBarButtonItem_.customView = navButtonsView_;
|
rightBarButtonItem_.customView = navButtonsView_;
|
||||||
self.navigationItem.rightBarButtonItem = rightBarButtonItem_;
|
self.navigationItem.rightBarButtonItem = rightBarButtonItem_;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)popView {
|
- (void)popView {
|
||||||
if (self.navigationController.topViewController == self) {
|
#if NS_BLOCKS_AVAILABLE
|
||||||
if (!self.view.isHidden) {
|
void (^popViewBlock)() = self.popViewBlock;
|
||||||
|
#else
|
||||||
|
id popViewBlock = nil;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (popViewBlock || self.navigationController.topViewController == self) {
|
||||||
|
if (!self.view.hidden) {
|
||||||
// Set the flag to our viewWillDisappear method so it knows
|
// Set the flag to our viewWillDisappear method so it knows
|
||||||
// this is a disappearance initiated by the sign-in object,
|
// this is a disappearance initiated by the sign-in object,
|
||||||
// not the user cancelling via the navigation controller
|
// not the user cancelling via the navigation controller
|
||||||
didDismissSelf_ = YES;
|
didDismissSelf_ = YES;
|
||||||
|
|
||||||
[self.navigationController popViewControllerAnimated:YES];
|
if (popViewBlock) {
|
||||||
|
#if NS_BLOCKS_AVAILABLE
|
||||||
|
popViewBlock();
|
||||||
|
self.popViewBlock = nil;
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
[self.navigationController popViewControllerAnimated:YES];
|
||||||
|
}
|
||||||
self.view.hidden = YES;
|
self.view.hidden = YES;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -488,6 +501,14 @@ static Class gSignInClass = Nil;
|
|||||||
return ([name length] > 0);
|
return ([name length] > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)showsInitialActivityIndicator {
|
||||||
|
return (mustShowActivityIndicator_ == 1 || initialHTMLString_ == nil);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)setShowsInitialActivityIndicator:(BOOL)flag {
|
||||||
|
mustShowActivityIndicator_ = (flag ? 1 : -1);
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark User Properties
|
#pragma mark User Properties
|
||||||
|
|
||||||
- (void)setProperty:(id)obj forKey:(NSString *)key {
|
- (void)setProperty:(id)obj forKey:(NSString *)key {
|
||||||
@ -514,8 +535,9 @@ static Class gSignInClass = Nil;
|
|||||||
#pragma mark SignIn callbacks
|
#pragma mark SignIn callbacks
|
||||||
|
|
||||||
- (void)signIn:(GTMOAuth2SignIn *)signIn displayRequest:(NSURLRequest *)request {
|
- (void)signIn:(GTMOAuth2SignIn *)signIn displayRequest:(NSURLRequest *)request {
|
||||||
// this is the signIn object's webRequest method, telling the controller
|
// This is the signIn object's webRequest method, telling the controller
|
||||||
// to either display the request in the webview, or close the window
|
// to either display the request in the webview, or if the request is nil,
|
||||||
|
// to close the window.
|
||||||
//
|
//
|
||||||
// All web requests and all window closing goes through this routine
|
// All web requests and all window closing goes through this routine
|
||||||
|
|
||||||
@ -535,12 +557,24 @@ static Class gSignInClass = Nil;
|
|||||||
if (isDateValid) {
|
if (isDateValid) {
|
||||||
// Display the request.
|
// Display the request.
|
||||||
self.request = request;
|
self.request = request;
|
||||||
BOOL shouldWaitForHTML = ([self.initialHTMLString length] > 0);
|
// The app may prefer some html other than blank white to be displayed
|
||||||
if (shouldWaitForHTML) {
|
// before the sign-in web page loads.
|
||||||
[self.webView performSelector:@selector(loadRequest:)
|
// The first fetch might be slow, so the client programmer may want
|
||||||
withObject:request
|
// to show a local "loading" message.
|
||||||
afterDelay:0.05];
|
// On iOS 5+, UIWebView will ignore loadHTMLString: if it's followed by
|
||||||
|
// a loadRequest: call, so if there is a "loading" message we defer
|
||||||
|
// the loadRequest: until after after we've drawn the "loading" message.
|
||||||
|
//
|
||||||
|
// If there is no initial html string, we show the activity indicator
|
||||||
|
// unless the user set showsInitialActivityIndicator to NO; if there
|
||||||
|
// is an initial html string, we hide the indicator unless the user set
|
||||||
|
// showsInitialActivityIndicator to YES.
|
||||||
|
NSString *html = self.initialHTMLString;
|
||||||
|
if ([html length] > 0) {
|
||||||
|
[initialActivityIndicator_ setHidden:(mustShowActivityIndicator_ < 1)];
|
||||||
|
[self.webView loadHTMLString:html baseURL:nil];
|
||||||
} else {
|
} else {
|
||||||
|
[initialActivityIndicator_ setHidden:(mustShowActivityIndicator_ < 0)];
|
||||||
[self.webView loadRequest:request];
|
[self.webView loadRequest:request];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -673,6 +707,10 @@ static Class gSignInClass = Nil;
|
|||||||
// this will indirectly call our signIn:finishedWithAuth:error: method
|
// this will indirectly call our signIn:finishedWithAuth:error: method
|
||||||
// for us
|
// for us
|
||||||
[signIn_ windowWasClosed];
|
[signIn_ windowWasClosed];
|
||||||
|
|
||||||
|
#if NS_BLOCKS_AVAILABLE
|
||||||
|
self.popViewBlock = nil;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// prevent the next sign-in from showing in the WebView that the user is
|
// prevent the next sign-in from showing in the WebView that the user is
|
||||||
@ -724,9 +762,16 @@ static Class gSignInClass = Nil;
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
[signIn_ cookiesChanged:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
|
if (self.request && [self.initialHTMLString length] > 0) {
|
||||||
|
// The request was pending.
|
||||||
|
[self setInitialHTMLString:nil];
|
||||||
|
[self.webView loadRequest:self.request];
|
||||||
|
} else {
|
||||||
|
[initialActivityIndicator_ setHidden:YES];
|
||||||
|
[signIn_ cookiesChanged:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
|
||||||
|
|
||||||
[self updateUI];
|
[self updateUI];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
|
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
|
||||||
@ -762,6 +807,17 @@ static Class gSignInClass = Nil;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 60000
|
||||||
|
// When running on a device with an OS version < 6, this gets called.
|
||||||
|
//
|
||||||
|
// Since it is never called in iOS 6 or greater, if your min deployment
|
||||||
|
// target is iOS6 or greater, then you don't need to have this method compiled
|
||||||
|
// into your app.
|
||||||
|
//
|
||||||
|
// When running on a device with an OS version 6 or greater, this code is
|
||||||
|
// not called. - (NSUInteger)supportedInterfaceOrientations; would be called,
|
||||||
|
// if it existed. Since it is absent,
|
||||||
|
// Allow the default orientations: All for iPad, all but upside down for iPhone.
|
||||||
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
|
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
|
||||||
BOOL value = YES;
|
BOOL value = YES;
|
||||||
if (!isInsideShouldAutorotateToInterfaceOrientation_) {
|
if (!isInsideShouldAutorotateToInterfaceOrientation_) {
|
||||||
@ -776,6 +832,8 @@ static Class gSignInClass = Nil;
|
|||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
@ -1,32 +1,32 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
|
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
|
||||||
<data>
|
<data>
|
||||||
<int key="IBDocument.SystemTarget">768</int>
|
<int key="IBDocument.SystemTarget">1024</int>
|
||||||
<string key="IBDocument.SystemVersion">10J869</string>
|
<string key="IBDocument.SystemVersion">12C60</string>
|
||||||
<string key="IBDocument.InterfaceBuilderVersion">851</string>
|
<string key="IBDocument.InterfaceBuilderVersion">2843</string>
|
||||||
<string key="IBDocument.AppKitVersion">1038.35</string>
|
<string key="IBDocument.AppKitVersion">1187.34</string>
|
||||||
<string key="IBDocument.HIToolboxVersion">461.00</string>
|
<string key="IBDocument.HIToolboxVersion">625.00</string>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
||||||
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string key="NS.object.0">141</string>
|
<string key="NS.object.0">1929</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
|
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<integer value="4"/>
|
<string>IBProxyObject</string>
|
||||||
<integer value="15"/>
|
<string>IBUIActivityIndicatorView</string>
|
||||||
|
<string>IBUIBarButtonItem</string>
|
||||||
|
<string>IBUIButton</string>
|
||||||
|
<string>IBUINavigationItem</string>
|
||||||
|
<string>IBUIView</string>
|
||||||
|
<string>IBUIWebView</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSArray" key="IBDocument.PluginDependencies">
|
<object class="NSArray" key="IBDocument.PluginDependencies">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.Metadata">
|
<object class="NSMutableDictionary" key="IBDocument.Metadata">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
|
||||||
<object class="NSArray" key="dict.sortedKeys" id="0">
|
<integer value="1" key="NS.object.0"/>
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
|
||||||
</object>
|
|
||||||
<object class="NSMutableArray" key="dict.values">
|
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
|
||||||
</object>
|
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
|
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
@ -56,16 +56,13 @@
|
|||||||
<int key="NSvFlags">292</int>
|
<int key="NSvFlags">292</int>
|
||||||
<string key="NSFrameSize">{30, 30}</string>
|
<string key="NSFrameSize">{30, 30}</string>
|
||||||
<reference key="NSSuperview" ref="808907889"/>
|
<reference key="NSSuperview" ref="808907889"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="981703116"/>
|
||||||
<bool key="IBUIOpaque">NO</bool>
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||||
<int key="IBUIContentVerticalAlignment">0</int>
|
<int key="IBUIContentVerticalAlignment">0</int>
|
||||||
<object class="NSFont" key="IBUIFont" id="530402572">
|
|
||||||
<string key="NSName">Helvetica-Bold</string>
|
|
||||||
<double key="NSSize">24</double>
|
|
||||||
<int key="NSfFlags">16</int>
|
|
||||||
</object>
|
|
||||||
<string key="IBUITitleShadowOffset">{0, -2}</string>
|
<string key="IBUITitleShadowOffset">{0, -2}</string>
|
||||||
<string key="IBUINormalTitle">◀</string>
|
<string key="IBUINormalTitle">◀</string>
|
||||||
<object class="NSColor" key="IBUIHighlightedTitleColor" id="193465259">
|
<object class="NSColor" key="IBUIHighlightedTitleColor" id="193465259">
|
||||||
@ -81,18 +78,30 @@
|
|||||||
<int key="NSColorSpace">3</int>
|
<int key="NSColorSpace">3</int>
|
||||||
<bytes key="NSWhite">MC41AA</bytes>
|
<bytes key="NSWhite">MC41AA</bytes>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBUIFontDescription" key="IBUIFontDescription" id="621440819">
|
||||||
|
<string key="name">Helvetica-Bold</string>
|
||||||
|
<string key="family">Helvetica</string>
|
||||||
|
<int key="traits">2</int>
|
||||||
|
<double key="pointSize">24</double>
|
||||||
|
</object>
|
||||||
|
<object class="NSFont" key="IBUIFont" id="530402572">
|
||||||
|
<string key="NSName">Helvetica-Bold</string>
|
||||||
|
<double key="NSSize">24</double>
|
||||||
|
<int key="NSfFlags">16</int>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBUIButton" id="981703116">
|
<object class="IBUIButton" id="981703116">
|
||||||
<reference key="NSNextResponder" ref="808907889"/>
|
<reference key="NSNextResponder" ref="808907889"/>
|
||||||
<int key="NSvFlags">292</int>
|
<int key="NSvFlags">292</int>
|
||||||
<string key="NSFrame">{{30, 0}, {30, 30}}</string>
|
<string key="NSFrame">{{30, 0}, {30, 30}}</string>
|
||||||
<reference key="NSSuperview" ref="808907889"/>
|
<reference key="NSSuperview" ref="808907889"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView"/>
|
||||||
<bool key="IBUIOpaque">NO</bool>
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||||
<int key="IBUIContentVerticalAlignment">0</int>
|
<int key="IBUIContentVerticalAlignment">0</int>
|
||||||
<reference key="IBUIFont" ref="530402572"/>
|
|
||||||
<string key="IBUITitleShadowOffset">{0, -2}</string>
|
<string key="IBUITitleShadowOffset">{0, -2}</string>
|
||||||
<string key="IBUINormalTitle">▶</string>
|
<string key="IBUINormalTitle">▶</string>
|
||||||
<reference key="IBUIHighlightedTitleColor" ref="193465259"/>
|
<reference key="IBUIHighlightedTitleColor" ref="193465259"/>
|
||||||
@ -102,10 +111,14 @@
|
|||||||
</object>
|
</object>
|
||||||
<reference key="IBUINormalTitleColor" ref="193465259"/>
|
<reference key="IBUINormalTitleColor" ref="193465259"/>
|
||||||
<reference key="IBUINormalTitleShadowColor" ref="999379443"/>
|
<reference key="IBUINormalTitleShadowColor" ref="999379443"/>
|
||||||
|
<reference key="IBUIFontDescription" ref="621440819"/>
|
||||||
|
<reference key="IBUIFont" ref="530402572"/>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<string key="NSFrameSize">{60, 30}</string>
|
<string key="NSFrameSize">{60, 30}</string>
|
||||||
<reference key="NSSuperview"/>
|
<reference key="NSSuperview"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="453250804"/>
|
||||||
<object class="NSColor" key="IBUIBackgroundColor">
|
<object class="NSColor" key="IBUIBackgroundColor">
|
||||||
<int key="NSColorSpace">3</int>
|
<int key="NSColorSpace">3</int>
|
||||||
<bytes key="NSWhite">MSAwAA</bytes>
|
<bytes key="NSWhite">MSAwAA</bytes>
|
||||||
@ -113,6 +126,7 @@
|
|||||||
<bool key="IBUIOpaque">NO</bool>
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||||
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
|
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
|
||||||
|
<int key="IBUIInterfaceOrientation">3</int>
|
||||||
<int key="interfaceOrientation">3</int>
|
<int key="interfaceOrientation">3</int>
|
||||||
</object>
|
</object>
|
||||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
@ -127,6 +141,8 @@
|
|||||||
<int key="NSvFlags">274</int>
|
<int key="NSvFlags">274</int>
|
||||||
<string key="NSFrameSize">{320, 460}</string>
|
<string key="NSFrameSize">{320, 460}</string>
|
||||||
<reference key="NSSuperview" ref="426018584"/>
|
<reference key="NSSuperview" ref="426018584"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="268967673"/>
|
||||||
<object class="NSColor" key="IBUIBackgroundColor">
|
<object class="NSColor" key="IBUIBackgroundColor">
|
||||||
<int key="NSColorSpace">1</int>
|
<int key="NSColorSpace">1</int>
|
||||||
<bytes key="NSRGB">MSAxIDEAA</bytes>
|
<bytes key="NSRGB">MSAxIDEAA</bytes>
|
||||||
@ -137,9 +153,25 @@
|
|||||||
<int key="IBUIDataDetectorTypes">1</int>
|
<int key="IBUIDataDetectorTypes">1</int>
|
||||||
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
|
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBUIActivityIndicatorView" id="268967673">
|
||||||
|
<reference key="NSNextResponder" ref="426018584"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{150, 115}, {20, 20}}</string>
|
||||||
|
<reference key="NSSuperview" ref="426018584"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<bool key="IBUIHidesWhenStopped">NO</bool>
|
||||||
|
<bool key="IBUIAnimating">YES</bool>
|
||||||
|
<int key="IBUIStyle">2</int>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<string key="NSFrameSize">{320, 460}</string>
|
<string key="NSFrameSize">{320, 460}</string>
|
||||||
<reference key="NSSuperview"/>
|
<reference key="NSSuperview"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="663477729"/>
|
||||||
<object class="NSColor" key="IBUIBackgroundColor">
|
<object class="NSColor" key="IBUIBackgroundColor">
|
||||||
<int key="NSColorSpace">3</int>
|
<int key="NSColorSpace">3</int>
|
||||||
<bytes key="NSWhite">MQA</bytes>
|
<bytes key="NSWhite">MQA</bytes>
|
||||||
@ -153,40 +185,6 @@
|
|||||||
<object class="IBObjectContainer" key="IBDocument.Objects">
|
<object class="IBObjectContainer" key="IBDocument.Objects">
|
||||||
<object class="NSMutableArray" key="connectionRecords">
|
<object class="NSMutableArray" key="connectionRecords">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<object class="IBConnectionRecord">
|
|
||||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
|
||||||
<string key="label">delegate</string>
|
|
||||||
<reference key="source" ref="663477729"/>
|
|
||||||
<reference key="destination" ref="372490531"/>
|
|
||||||
</object>
|
|
||||||
<int key="connectionID">9</int>
|
|
||||||
</object>
|
|
||||||
<object class="IBConnectionRecord">
|
|
||||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
|
||||||
<string key="label">rightBarButtonItem</string>
|
|
||||||
<reference key="source" ref="1047805472"/>
|
|
||||||
<reference key="destination" ref="961671599"/>
|
|
||||||
</object>
|
|
||||||
<int key="connectionID">14</int>
|
|
||||||
</object>
|
|
||||||
<object class="IBConnectionRecord">
|
|
||||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
|
||||||
<string key="label">goBack</string>
|
|
||||||
<reference key="source" ref="453250804"/>
|
|
||||||
<reference key="destination" ref="663477729"/>
|
|
||||||
<int key="IBEventType">7</int>
|
|
||||||
</object>
|
|
||||||
<int key="connectionID">18</int>
|
|
||||||
</object>
|
|
||||||
<object class="IBConnectionRecord">
|
|
||||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
|
||||||
<string key="label">goForward</string>
|
|
||||||
<reference key="source" ref="981703116"/>
|
|
||||||
<reference key="destination" ref="663477729"/>
|
|
||||||
<int key="IBEventType">7</int>
|
|
||||||
</object>
|
|
||||||
<int key="connectionID">19</int>
|
|
||||||
</object>
|
|
||||||
<object class="IBConnectionRecord">
|
<object class="IBConnectionRecord">
|
||||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
<string key="label">rightBarButtonItem</string>
|
<string key="label">rightBarButtonItem</string>
|
||||||
@ -235,13 +233,57 @@
|
|||||||
</object>
|
</object>
|
||||||
<int key="connectionID">29</int>
|
<int key="connectionID">29</int>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">initialActivityIndicator</string>
|
||||||
|
<reference key="source" ref="372490531"/>
|
||||||
|
<reference key="destination" ref="268967673"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">33</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">delegate</string>
|
||||||
|
<reference key="source" ref="663477729"/>
|
||||||
|
<reference key="destination" ref="372490531"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">9</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">rightBarButtonItem</string>
|
||||||
|
<reference key="source" ref="1047805472"/>
|
||||||
|
<reference key="destination" ref="961671599"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">14</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||||
|
<string key="label">goBack</string>
|
||||||
|
<reference key="source" ref="453250804"/>
|
||||||
|
<reference key="destination" ref="663477729"/>
|
||||||
|
<int key="IBEventType">7</int>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">18</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||||
|
<string key="label">goForward</string>
|
||||||
|
<reference key="source" ref="981703116"/>
|
||||||
|
<reference key="destination" ref="663477729"/>
|
||||||
|
<int key="IBEventType">7</int>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">19</int>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||||
<object class="NSArray" key="orderedObjects">
|
<object class="NSArray" key="orderedObjects">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<object class="IBObjectRecord">
|
<object class="IBObjectRecord">
|
||||||
<int key="objectID">0</int>
|
<int key="objectID">0</int>
|
||||||
<reference key="object" ref="0"/>
|
<object class="NSArray" key="object" id="0">
|
||||||
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
|
</object>
|
||||||
<reference key="children" ref="1000"/>
|
<reference key="children" ref="1000"/>
|
||||||
<nil key="parent"/>
|
<nil key="parent"/>
|
||||||
</object>
|
</object>
|
||||||
@ -295,6 +337,7 @@
|
|||||||
<object class="NSMutableArray" key="children">
|
<object class="NSMutableArray" key="children">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<reference ref="663477729"/>
|
<reference ref="663477729"/>
|
||||||
|
<reference ref="268967673"/>
|
||||||
</object>
|
</object>
|
||||||
<reference key="parent" ref="0"/>
|
<reference key="parent" ref="0"/>
|
||||||
</object>
|
</object>
|
||||||
@ -303,6 +346,11 @@
|
|||||||
<reference key="object" ref="663477729"/>
|
<reference key="object" ref="663477729"/>
|
||||||
<reference key="parent" ref="426018584"/>
|
<reference key="parent" ref="426018584"/>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">31</int>
|
||||||
|
<reference key="object" ref="268967673"/>
|
||||||
|
<reference key="parent" ref="426018584"/>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||||
@ -310,27 +358,29 @@
|
|||||||
<object class="NSArray" key="dict.sortedKeys">
|
<object class="NSArray" key="dict.sortedKeys">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>-1.CustomClassName</string>
|
<string>-1.CustomClassName</string>
|
||||||
|
<string>-1.IBPluginDependency</string>
|
||||||
<string>-2.CustomClassName</string>
|
<string>-2.CustomClassName</string>
|
||||||
|
<string>-2.IBPluginDependency</string>
|
||||||
<string>10.IBPluginDependency</string>
|
<string>10.IBPluginDependency</string>
|
||||||
<string>15.IBEditorWindowLastContentRect</string>
|
|
||||||
<string>15.IBPluginDependency</string>
|
<string>15.IBPluginDependency</string>
|
||||||
<string>16.IBPluginDependency</string>
|
<string>16.IBPluginDependency</string>
|
||||||
<string>17.IBPluginDependency</string>
|
<string>17.IBPluginDependency</string>
|
||||||
<string>27.IBEditorWindowLastContentRect</string>
|
|
||||||
<string>27.IBPluginDependency</string>
|
<string>27.IBPluginDependency</string>
|
||||||
|
<string>31.IBPluginDependency</string>
|
||||||
<string>4.IBPluginDependency</string>
|
<string>4.IBPluginDependency</string>
|
||||||
<string>6.IBPluginDependency</string>
|
<string>6.IBPluginDependency</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableArray" key="dict.values">
|
<object class="NSArray" key="dict.values">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>GTMOAuth2ViewControllerTouch</string>
|
<string>GTMOAuth2ViewControllerTouch</string>
|
||||||
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>UIResponder</string>
|
<string>UIResponder</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>{{34, 1031}, {60, 30}}</string>
|
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>{{214, 696}, {320, 460}}</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
@ -339,20 +389,16 @@
|
|||||||
<object class="NSMutableDictionary" key="unlocalizedProperties">
|
<object class="NSMutableDictionary" key="unlocalizedProperties">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<reference key="dict.sortedKeys" ref="0"/>
|
<reference key="dict.sortedKeys" ref="0"/>
|
||||||
<object class="NSMutableArray" key="dict.values">
|
<reference key="dict.values" ref="0"/>
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
|
||||||
</object>
|
|
||||||
</object>
|
</object>
|
||||||
<nil key="activeLocalization"/>
|
<nil key="activeLocalization"/>
|
||||||
<object class="NSMutableDictionary" key="localizations">
|
<object class="NSMutableDictionary" key="localizations">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<reference key="dict.sortedKeys" ref="0"/>
|
<reference key="dict.sortedKeys" ref="0"/>
|
||||||
<object class="NSMutableArray" key="dict.values">
|
<reference key="dict.values" ref="0"/>
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
|
||||||
</object>
|
|
||||||
</object>
|
</object>
|
||||||
<nil key="sourceID"/>
|
<nil key="sourceID"/>
|
||||||
<int key="maxID">29</int>
|
<int key="maxID">33</int>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||||
@ -365,21 +411,19 @@
|
|||||||
<object class="NSArray" key="dict.sortedKeys">
|
<object class="NSArray" key="dict.sortedKeys">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>backButton</string>
|
<string>backButton</string>
|
||||||
<string>delegate_</string>
|
|
||||||
<string>forwardButton</string>
|
<string>forwardButton</string>
|
||||||
|
<string>initialActivityIndicator</string>
|
||||||
<string>navButtonsView</string>
|
<string>navButtonsView</string>
|
||||||
<string>rightBarButtonItem</string>
|
<string>rightBarButtonItem</string>
|
||||||
<string>userData_</string>
|
|
||||||
<string>webView</string>
|
<string>webView</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableArray" key="dict.values">
|
<object class="NSArray" key="dict.values">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>UIButton</string>
|
<string>UIButton</string>
|
||||||
<string>id</string>
|
|
||||||
<string>UIButton</string>
|
<string>UIButton</string>
|
||||||
|
<string>UIActivityIndicatorView</string>
|
||||||
<string>UIView</string>
|
<string>UIView</string>
|
||||||
<string>UIBarButtonItem</string>
|
<string>UIBarButtonItem</string>
|
||||||
<string>id</string>
|
|
||||||
<string>UIWebView</string>
|
<string>UIWebView</string>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@ -388,27 +432,26 @@
|
|||||||
<object class="NSArray" key="dict.sortedKeys">
|
<object class="NSArray" key="dict.sortedKeys">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<string>backButton</string>
|
<string>backButton</string>
|
||||||
<string>delegate_</string>
|
|
||||||
<string>forwardButton</string>
|
<string>forwardButton</string>
|
||||||
|
<string>initialActivityIndicator</string>
|
||||||
<string>navButtonsView</string>
|
<string>navButtonsView</string>
|
||||||
<string>rightBarButtonItem</string>
|
<string>rightBarButtonItem</string>
|
||||||
<string>userData_</string>
|
|
||||||
<string>webView</string>
|
<string>webView</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableArray" key="dict.values">
|
<object class="NSArray" key="dict.values">
|
||||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||||
<object class="IBToOneOutletInfo">
|
<object class="IBToOneOutletInfo">
|
||||||
<string key="name">backButton</string>
|
<string key="name">backButton</string>
|
||||||
<string key="candidateClassName">UIButton</string>
|
<string key="candidateClassName">UIButton</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBToOneOutletInfo">
|
|
||||||
<string key="name">delegate_</string>
|
|
||||||
<string key="candidateClassName">id</string>
|
|
||||||
</object>
|
|
||||||
<object class="IBToOneOutletInfo">
|
<object class="IBToOneOutletInfo">
|
||||||
<string key="name">forwardButton</string>
|
<string key="name">forwardButton</string>
|
||||||
<string key="candidateClassName">UIButton</string>
|
<string key="candidateClassName">UIButton</string>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo">
|
||||||
|
<string key="name">initialActivityIndicator</string>
|
||||||
|
<string key="candidateClassName">UIActivityIndicatorView</string>
|
||||||
|
</object>
|
||||||
<object class="IBToOneOutletInfo">
|
<object class="IBToOneOutletInfo">
|
||||||
<string key="name">navButtonsView</string>
|
<string key="name">navButtonsView</string>
|
||||||
<string key="candidateClassName">UIView</string>
|
<string key="candidateClassName">UIView</string>
|
||||||
@ -417,10 +460,6 @@
|
|||||||
<string key="name">rightBarButtonItem</string>
|
<string key="name">rightBarButtonItem</string>
|
||||||
<string key="candidateClassName">UIBarButtonItem</string>
|
<string key="candidateClassName">UIBarButtonItem</string>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBToOneOutletInfo">
|
|
||||||
<string key="name">userData_</string>
|
|
||||||
<string key="candidateClassName">id</string>
|
|
||||||
</object>
|
|
||||||
<object class="IBToOneOutletInfo">
|
<object class="IBToOneOutletInfo">
|
||||||
<string key="name">webView</string>
|
<string key="name">webView</string>
|
||||||
<string key="candidateClassName">UIWebView</string>
|
<string key="candidateClassName">UIWebView</string>
|
||||||
@ -429,7 +468,7 @@
|
|||||||
</object>
|
</object>
|
||||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||||
<string key="majorKey">IBProjectSource</string>
|
<string key="majorKey">IBProjectSource</string>
|
||||||
<string key="minorKey">Touch/GTMOAuth2ViewControllerTouch.h</string>
|
<string key="minorKey">./Classes/GTMOAuth2ViewControllerTouch.h</string>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@ -438,19 +477,18 @@
|
|||||||
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
|
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
|
||||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
||||||
<integer value="768" key="NS.object.0"/>
|
<real value="1024" key="NS.object.0"/>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
|
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
|
||||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
||||||
<integer value="800" key="NS.object.0"/>
|
<real value="1536" key="NS.object.0"/>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
|
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
|
||||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
|
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
|
||||||
<integer value="3000" key="NS.object.0"/>
|
<integer value="3000" key="NS.object.0"/>
|
||||||
</object>
|
</object>
|
||||||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||||
<string key="IBDocument.LastKnownRelativeProjectPath">../GTMOAuth2.xcodeproj</string>
|
|
||||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||||
<string key="IBCocoaTouchPluginVersion">141</string>
|
<string key="IBCocoaTouchPluginVersion">1929</string>
|
||||||
</data>
|
</data>
|
||||||
</archive>
|
</archive>
|
||||||
|
12
External/google-plus-ios-sdk/README
vendored
12
External/google-plus-ios-sdk/README
vendored
@ -7,10 +7,12 @@ README -- This file.
|
|||||||
Changelog -- The versions and changes of the SDK.
|
Changelog -- The versions and changes of the SDK.
|
||||||
|
|
||||||
lib/ -- Header files and libraries.
|
lib/ -- Header files and libraries.
|
||||||
GooglePlusShare.h -- Header file to include for sharing with Google+.
|
GPPDeepLink.h -- Header file to include for sharing with Google+ with content
|
||||||
GooglePlusSignIn.h -- Header file to include for signing into Google+.
|
deep linking.
|
||||||
GooglePlusSignInButton.h -- Header file to include for showing a button to
|
GPPShare.h -- Header file to include for sharing with Google+.
|
||||||
sign in with Google+.
|
GPPSignIn.h -- Header file to include for signing into Google+.
|
||||||
|
GPPSignInButton.h -- Header file to include for showing a button to
|
||||||
|
sign in with Google+.
|
||||||
libGooglePlus.a -- Static library built for iOS device to link into your app.
|
libGooglePlus.a -- Static library built for iOS device to link into your app.
|
||||||
libGooglePlusUniversal.a -- Static library built for both iOS device and
|
libGooglePlusUniversal.a -- Static library built for both iOS device and
|
||||||
simulator to link into your app.
|
simulator to link into your app.
|
||||||
@ -23,7 +25,7 @@ OpenSource/ -- Google open source files used by the SDK. Add all files in this
|
|||||||
e.g. Add Moments.
|
e.g. Add Moments.
|
||||||
|
|
||||||
Resources/ -- Resources that can be used in your app.
|
Resources/ -- Resources that can be used in your app.
|
||||||
For |GooglePlusSignInButton|, the google_plus_sign_in*.png images
|
For |GPPSignInButton|, the google_plus_sign_in*.png images
|
||||||
are required.
|
are required.
|
||||||
google_plus_share.png -- 82x24 Google+ share button image.
|
google_plus_share.png -- 82x24 Google+ share button image.
|
||||||
google_plus_share_large.png -- 112x32 Google+ share button image.
|
google_plus_share_large.png -- 112x32 Google+ share button image.
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
D973B402158ABC1F0083A4B5 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D973B401158ABC1F0083A4B5 /* MessageUI.framework */; };
|
D973B402158ABC1F0083A4B5 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D973B401158ABC1F0083A4B5 /* MessageUI.framework */; };
|
||||||
D98254A815990D8D0060CA47 /* Icon_2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D98254A615990D8D0060CA47 /* Icon_2x.png */; };
|
D98254A815990D8D0060CA47 /* Icon_2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D98254A615990D8D0060CA47 /* Icon_2x.png */; };
|
||||||
D98254A915990D8D0060CA47 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D98254A715990D8D0060CA47 /* Icon.png */; };
|
D98254A915990D8D0060CA47 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D98254A715990D8D0060CA47 /* Icon.png */; };
|
||||||
D98254F2159937730060CA47 /* GTLPlusPerson.m in Sources */ = {isa = PBXBuildFile; fileRef = D98254F1159937730060CA47 /* GTLPlusPerson.m */; };
|
|
||||||
D9EE743D158A8BD400EC1D05 /* google_plus_share_large.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7435158A8BD400EC1D05 /* google_plus_share_large.png */; };
|
D9EE743D158A8BD400EC1D05 /* google_plus_share_large.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7435158A8BD400EC1D05 /* google_plus_share_large.png */; };
|
||||||
D9EE743E158A8BD400EC1D05 /* google_plus_share_large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7436158A8BD400EC1D05 /* google_plus_share_large@2x.png */; };
|
D9EE743E158A8BD400EC1D05 /* google_plus_share_large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7436158A8BD400EC1D05 /* google_plus_share_large@2x.png */; };
|
||||||
D9EE743F158A8BD400EC1D05 /* google_plus_share.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7437158A8BD400EC1D05 /* google_plus_share.png */; };
|
D9EE743F158A8BD400EC1D05 /* google_plus_share.png in Resources */ = {isa = PBXBuildFile; fileRef = D9EE7437158A8BD400EC1D05 /* google_plus_share.png */; };
|
||||||
@ -79,14 +78,13 @@
|
|||||||
00F70E98158007D90077799E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
|
00F70E98158007D90077799E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
|
||||||
00F70E9A158008040077799E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
|
00F70E9A158008040077799E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
|
||||||
0C52D6F7158BAB1F001510E6 /* button_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background.png; path = Resources/button_background.png; sourceTree = SOURCE_ROOT; };
|
0C52D6F7158BAB1F001510E6 /* button_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background.png; path = Resources/button_background.png; sourceTree = SOURCE_ROOT; };
|
||||||
|
294FD685163B67F500A9D5CA /* GPPDeepLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPPDeepLink.h; path = ../lib/GPPDeepLink.h; sourceTree = "<group>"; };
|
||||||
D973B401158ABC1F0083A4B5 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
|
D973B401158ABC1F0083A4B5 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
|
||||||
D98254A615990D8D0060CA47 /* Icon_2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_2x.png; path = Resources/Icon_2x.png; sourceTree = SOURCE_ROOT; };
|
D98254A615990D8D0060CA47 /* Icon_2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_2x.png; path = Resources/Icon_2x.png; sourceTree = SOURCE_ROOT; };
|
||||||
D98254A715990D8D0060CA47 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icon.png; sourceTree = SOURCE_ROOT; };
|
D98254A715990D8D0060CA47 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icon.png; sourceTree = SOURCE_ROOT; };
|
||||||
D98254F0159937730060CA47 /* GTLPlusPerson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusPerson.h; sourceTree = "<group>"; };
|
D9EE7431158A8BAE00EC1D05 /* GPPShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPPShare.h; path = ../lib/GPPShare.h; sourceTree = "<group>"; };
|
||||||
D98254F1159937730060CA47 /* GTLPlusPerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusPerson.m; sourceTree = "<group>"; };
|
D9EE7432158A8BAE00EC1D05 /* GPPSignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPPSignIn.h; path = ../lib/GPPSignIn.h; sourceTree = "<group>"; };
|
||||||
D9EE7431158A8BAE00EC1D05 /* GooglePlusShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GooglePlusShare.h; path = ../lib/GooglePlusShare.h; sourceTree = "<group>"; };
|
D9EE7433158A8BAE00EC1D05 /* GPPSignInButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPPSignInButton.h; path = ../lib/GPPSignInButton.h; sourceTree = "<group>"; };
|
||||||
D9EE7432158A8BAE00EC1D05 /* GooglePlusSignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GooglePlusSignIn.h; path = ../lib/GooglePlusSignIn.h; sourceTree = "<group>"; };
|
|
||||||
D9EE7433158A8BAE00EC1D05 /* GooglePlusSignInButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GooglePlusSignInButton.h; path = ../lib/GooglePlusSignInButton.h; sourceTree = "<group>"; };
|
|
||||||
D9EE7435158A8BD400EC1D05 /* google_plus_share_large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = google_plus_share_large.png; path = ../Resources/google_plus_share_large.png; sourceTree = "<group>"; };
|
D9EE7435158A8BD400EC1D05 /* google_plus_share_large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = google_plus_share_large.png; path = ../Resources/google_plus_share_large.png; sourceTree = "<group>"; };
|
||||||
D9EE7436158A8BD400EC1D05 /* google_plus_share_large@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "google_plus_share_large@2x.png"; path = "../Resources/google_plus_share_large@2x.png"; sourceTree = "<group>"; };
|
D9EE7436158A8BD400EC1D05 /* google_plus_share_large@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "google_plus_share_large@2x.png"; path = "../Resources/google_plus_share_large@2x.png"; sourceTree = "<group>"; };
|
||||||
D9EE7437158A8BD400EC1D05 /* google_plus_share.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = google_plus_share.png; path = ../Resources/google_plus_share.png; sourceTree = "<group>"; };
|
D9EE7437158A8BD400EC1D05 /* google_plus_share.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = google_plus_share.png; path = ../Resources/google_plus_share.png; sourceTree = "<group>"; };
|
||||||
@ -279,9 +277,10 @@
|
|||||||
D9EE7434158A8BB500EC1D05 /* GooglePlusSDK */ = {
|
D9EE7434158A8BB500EC1D05 /* GooglePlusSDK */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
D9EE7431158A8BAE00EC1D05 /* GooglePlusShare.h */,
|
D9EE7431158A8BAE00EC1D05 /* GPPShare.h */,
|
||||||
D9EE7432158A8BAE00EC1D05 /* GooglePlusSignIn.h */,
|
294FD685163B67F500A9D5CA /* GPPDeepLink.h */,
|
||||||
D9EE7433158A8BAE00EC1D05 /* GooglePlusSignInButton.h */,
|
D9EE7432158A8BAE00EC1D05 /* GPPSignIn.h */,
|
||||||
|
D9EE7433158A8BAE00EC1D05 /* GPPSignInButton.h */,
|
||||||
D9EE74AD158A8D1E00EC1D05 /* libGooglePlus.a */,
|
D9EE74AD158A8D1E00EC1D05 /* libGooglePlus.a */,
|
||||||
D9EE74AE158A8D1E00EC1D05 /* libGooglePlusUniversal.a */,
|
D9EE74AE158A8D1E00EC1D05 /* libGooglePlusUniversal.a */,
|
||||||
D9EE7445158A8BDB00EC1D05 /* Resources */,
|
D9EE7445158A8BDB00EC1D05 /* Resources */,
|
||||||
@ -386,8 +385,6 @@
|
|||||||
D9EE745E158A8C0E00EC1D05 /* GTLPlusItemScope.m */,
|
D9EE745E158A8C0E00EC1D05 /* GTLPlusItemScope.m */,
|
||||||
D9EE745F158A8C0E00EC1D05 /* GTLPlusMoment.h */,
|
D9EE745F158A8C0E00EC1D05 /* GTLPlusMoment.h */,
|
||||||
D9EE7460158A8C0E00EC1D05 /* GTLPlusMoment.m */,
|
D9EE7460158A8C0E00EC1D05 /* GTLPlusMoment.m */,
|
||||||
D98254F0159937730060CA47 /* GTLPlusPerson.h */,
|
|
||||||
D98254F1159937730060CA47 /* GTLPlusPerson.m */,
|
|
||||||
D9EE7463158A8C0E00EC1D05 /* GTLQueryPlus.h */,
|
D9EE7463158A8C0E00EC1D05 /* GTLQueryPlus.h */,
|
||||||
D9EE7464158A8C0E00EC1D05 /* GTLQueryPlus.m */,
|
D9EE7464158A8C0E00EC1D05 /* GTLQueryPlus.m */,
|
||||||
D9EE7465158A8C0E00EC1D05 /* GTLServicePlus.h */,
|
D9EE7465158A8C0E00EC1D05 /* GTLServicePlus.h */,
|
||||||
@ -510,7 +507,6 @@
|
|||||||
D9EE74C5158A8E0500EC1D05 /* GooglePlusSampleMomentsViewController.m in Sources */,
|
D9EE74C5158A8E0500EC1D05 /* GooglePlusSampleMomentsViewController.m in Sources */,
|
||||||
D9EE74C7158A8E0500EC1D05 /* GooglePlusSampleShareViewController.m in Sources */,
|
D9EE74C7158A8E0500EC1D05 /* GooglePlusSampleShareViewController.m in Sources */,
|
||||||
D9EE74C9158A8E0500EC1D05 /* GooglePlusSampleSignInViewController.m in Sources */,
|
D9EE74C9158A8E0500EC1D05 /* GooglePlusSampleSignInViewController.m in Sources */,
|
||||||
D98254F2159937730060CA47 /* GTLPlusPerson.m in Sources */,
|
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
Binary file not shown.
@ -1,84 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Scheme
|
|
||||||
version = "1.3">
|
|
||||||
<BuildAction
|
|
||||||
parallelizeBuildables = "YES"
|
|
||||||
buildImplicitDependencies = "YES">
|
|
||||||
<BuildActionEntries>
|
|
||||||
<BuildActionEntry
|
|
||||||
buildForTesting = "YES"
|
|
||||||
buildForRunning = "YES"
|
|
||||||
buildForProfiling = "YES"
|
|
||||||
buildForArchiving = "YES"
|
|
||||||
buildForAnalyzing = "YES">
|
|
||||||
<BuildableReference
|
|
||||||
BuildableIdentifier = "primary"
|
|
||||||
BlueprintIdentifier = "0043C7991580045B000DF02E"
|
|
||||||
BuildableName = "GooglePlusSample.app"
|
|
||||||
BlueprintName = "GooglePlusSample"
|
|
||||||
ReferencedContainer = "container:GooglePlusSample.xcodeproj">
|
|
||||||
</BuildableReference>
|
|
||||||
</BuildActionEntry>
|
|
||||||
</BuildActionEntries>
|
|
||||||
</BuildAction>
|
|
||||||
<TestAction
|
|
||||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
|
|
||||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
|
|
||||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
|
||||||
buildConfiguration = "Debug">
|
|
||||||
<Testables>
|
|
||||||
</Testables>
|
|
||||||
<MacroExpansion>
|
|
||||||
<BuildableReference
|
|
||||||
BuildableIdentifier = "primary"
|
|
||||||
BlueprintIdentifier = "0043C7991580045B000DF02E"
|
|
||||||
BuildableName = "GooglePlusSample.app"
|
|
||||||
BlueprintName = "GooglePlusSample"
|
|
||||||
ReferencedContainer = "container:GooglePlusSample.xcodeproj">
|
|
||||||
</BuildableReference>
|
|
||||||
</MacroExpansion>
|
|
||||||
</TestAction>
|
|
||||||
<LaunchAction
|
|
||||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
|
|
||||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
|
|
||||||
launchStyle = "0"
|
|
||||||
useCustomWorkingDirectory = "NO"
|
|
||||||
buildConfiguration = "Debug"
|
|
||||||
debugDocumentVersioning = "YES"
|
|
||||||
allowLocationSimulation = "YES">
|
|
||||||
<BuildableProductRunnable>
|
|
||||||
<BuildableReference
|
|
||||||
BuildableIdentifier = "primary"
|
|
||||||
BlueprintIdentifier = "0043C7991580045B000DF02E"
|
|
||||||
BuildableName = "GooglePlusSample.app"
|
|
||||||
BlueprintName = "GooglePlusSample"
|
|
||||||
ReferencedContainer = "container:GooglePlusSample.xcodeproj">
|
|
||||||
</BuildableReference>
|
|
||||||
</BuildableProductRunnable>
|
|
||||||
<AdditionalOptions>
|
|
||||||
</AdditionalOptions>
|
|
||||||
</LaunchAction>
|
|
||||||
<ProfileAction
|
|
||||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
|
||||||
savedToolIdentifier = ""
|
|
||||||
useCustomWorkingDirectory = "NO"
|
|
||||||
buildConfiguration = "Release"
|
|
||||||
debugDocumentVersioning = "YES">
|
|
||||||
<BuildableProductRunnable>
|
|
||||||
<BuildableReference
|
|
||||||
BuildableIdentifier = "primary"
|
|
||||||
BlueprintIdentifier = "0043C7991580045B000DF02E"
|
|
||||||
BuildableName = "GooglePlusSample.app"
|
|
||||||
BlueprintName = "GooglePlusSample"
|
|
||||||
ReferencedContainer = "container:GooglePlusSample.xcodeproj">
|
|
||||||
</BuildableReference>
|
|
||||||
</BuildableProductRunnable>
|
|
||||||
</ProfileAction>
|
|
||||||
<AnalyzeAction
|
|
||||||
buildConfiguration = "Debug">
|
|
||||||
</AnalyzeAction>
|
|
||||||
<ArchiveAction
|
|
||||||
buildConfiguration = "Release"
|
|
||||||
revealArchiveInOrganizer = "YES">
|
|
||||||
</ArchiveAction>
|
|
||||||
</Scheme>
|
|
@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>SchemeUserState</key>
|
|
||||||
<dict>
|
|
||||||
<key>GooglePlusSample.xcscheme</key>
|
|
||||||
<dict>
|
|
||||||
<key>orderHint</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
<key>SuppressBuildableAutocreation</key>
|
|
||||||
<dict>
|
|
||||||
<key>0043C7991580045B000DF02E</key>
|
|
||||||
<dict>
|
|
||||||
<key>primary</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
@ -18,8 +18,8 @@
|
|||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
@class GooglePlusShare;
|
@class GPPShare;
|
||||||
@class GooglePlusSignInButton;
|
@class GPPSignInButton;
|
||||||
@class GTMOAuth2Authentication;
|
@class GTMOAuth2Authentication;
|
||||||
|
|
||||||
@interface GooglePlusSampleAppDelegate : UIResponder<UIApplicationDelegate>
|
@interface GooglePlusSampleAppDelegate : UIResponder<UIApplicationDelegate>
|
||||||
@ -29,11 +29,14 @@
|
|||||||
// The navigation controller.
|
// The navigation controller.
|
||||||
@property (retain, nonatomic) UINavigationController *navigationController;
|
@property (retain, nonatomic) UINavigationController *navigationController;
|
||||||
// The Google+ sign-in button to handle the URL redirect.
|
// The Google+ sign-in button to handle the URL redirect.
|
||||||
@property (retain, nonatomic) GooglePlusSignInButton *signInButton;
|
@property (retain, nonatomic) GPPSignInButton *signInButton;
|
||||||
// The OAuth 2.0 authentication used in the application.
|
// The OAuth 2.0 authentication used in the application.
|
||||||
@property (retain, nonatomic) GTMOAuth2Authentication *auth;
|
@property (retain, nonatomic) GTMOAuth2Authentication *auth;
|
||||||
// The Google+ share object to handle the URL redirect.
|
// The Google+ share object to handle the URL redirect.
|
||||||
@property (retain, nonatomic) GooglePlusShare *share;
|
@property (retain, nonatomic) GPPShare *share;
|
||||||
|
// Whether or not to use Google+ history's
|
||||||
|
// https://www.googleapis.com/auth/plus.moments.write scope.
|
||||||
|
@property (assign, nonatomic) BOOL plusMomentsWriteScope;
|
||||||
|
|
||||||
// The OAuth 2.0 client ID to be used for Google+ sign-in, share, and moments.
|
// The OAuth 2.0 client ID to be used for Google+ sign-in, share, and moments.
|
||||||
+ (NSString *)clientID;
|
+ (NSString *)clientID;
|
||||||
|
@ -19,8 +19,9 @@
|
|||||||
#import "GooglePlusSampleAppDelegate.h"
|
#import "GooglePlusSampleAppDelegate.h"
|
||||||
|
|
||||||
#import "GooglePlusSampleMasterViewController.h"
|
#import "GooglePlusSampleMasterViewController.h"
|
||||||
#import "GooglePlusSignIn.h"
|
#import "GPPDeepLink.h"
|
||||||
#import "GooglePlusSignInButton.h"
|
#import "GPPSignIn.h"
|
||||||
|
#import "GPPSignInButton.h"
|
||||||
|
|
||||||
@implementation GooglePlusSampleAppDelegate
|
@implementation GooglePlusSampleAppDelegate
|
||||||
|
|
||||||
@ -29,11 +30,12 @@
|
|||||||
@synthesize signInButton = signInButton_;
|
@synthesize signInButton = signInButton_;
|
||||||
@synthesize auth = auth_;
|
@synthesize auth = auth_;
|
||||||
@synthesize share = share_;
|
@synthesize share = share_;
|
||||||
|
@synthesize plusMomentsWriteScope = plusMomentsWriteScope_;
|
||||||
|
|
||||||
// DO NOT USE THIS CLIENT ID. IT WILL NOT WORK FOR YOUR APP.
|
// DO NOT USE THIS CLIENT ID. IT WILL NOT WORK FOR YOUR APP.
|
||||||
// Please use the client ID created for you by Google.
|
// Please use the client ID created for you by Google.
|
||||||
static NSString * const kClientID = @"571459971810-"
|
static NSString * const kClientID =
|
||||||
@"2bpoda566pap5kkc0aqljqfjki8tgeb6.apps.googleusercontent.com";
|
@"122385832599-2mcvobo565un3ab7d6d06m6fjemocto9.apps.googleusercontent.com";
|
||||||
|
|
||||||
+ (NSString *)clientID {
|
+ (NSString *)clientID {
|
||||||
return kClientID;
|
return kClientID;
|
||||||
@ -52,6 +54,8 @@ static NSString * const kClientID = @"571459971810-"
|
|||||||
|
|
||||||
- (BOOL)application:(UIApplication *)application
|
- (BOOL)application:(UIApplication *)application
|
||||||
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
||||||
|
plusMomentsWriteScope_ = YES;
|
||||||
|
|
||||||
self.window = [[[UIWindow alloc]
|
self.window = [[[UIWindow alloc]
|
||||||
initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
|
initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
|
||||||
GooglePlusSampleMasterViewController *masterViewController =
|
GooglePlusSampleMasterViewController *masterViewController =
|
||||||
@ -63,6 +67,18 @@ static NSString * const kClientID = @"571459971810-"
|
|||||||
initWithRootViewController:masterViewController] autorelease];
|
initWithRootViewController:masterViewController] autorelease];
|
||||||
self.window.rootViewController = self.navigationController;
|
self.window.rootViewController = self.navigationController;
|
||||||
[self.window makeKeyAndVisible];
|
[self.window makeKeyAndVisible];
|
||||||
|
|
||||||
|
// Read Google+ deep-link data.
|
||||||
|
GPPDeepLink *deepLink = [GPPDeepLink readDeepLinkAfterInstall];
|
||||||
|
if (deepLink) {
|
||||||
|
UIAlertView *alert = [[[UIAlertView alloc]
|
||||||
|
initWithTitle:@"Read Deep-link Data"
|
||||||
|
message:[deepLink deepLinkID]
|
||||||
|
delegate:nil
|
||||||
|
cancelButtonTitle:@"OK"
|
||||||
|
otherButtonTitles:nil] autorelease];
|
||||||
|
[alert show];
|
||||||
|
}
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,6 +99,20 @@ static NSString * const kClientID = @"571459971810-"
|
|||||||
annotation:annotation]) {
|
annotation:annotation]) {
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle Google+ deep-link data URL.
|
||||||
|
GPPDeepLink *deepLink = [GPPDeepLink handleURL:url
|
||||||
|
sourceApplication:sourceApplication
|
||||||
|
annotation:annotation];
|
||||||
|
if (deepLink) {
|
||||||
|
UIAlertView *alert = [[[UIAlertView alloc]
|
||||||
|
initWithTitle:@"Handle Deep-link Data"
|
||||||
|
message:[deepLink deepLinkID]
|
||||||
|
delegate:nil
|
||||||
|
cancelButtonTitle:@"OK"
|
||||||
|
otherButtonTitles:nil] autorelease];
|
||||||
|
[alert show];
|
||||||
|
}
|
||||||
return NO;
|
return NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#import "GooglePlusSampleMasterViewController.h"
|
#import "GooglePlusSampleMasterViewController.h"
|
||||||
|
|
||||||
|
#import "GooglePlusSampleAppDelegate.h"
|
||||||
#import "GooglePlusSampleShareViewController.h"
|
#import "GooglePlusSampleShareViewController.h"
|
||||||
#import "GooglePlusSampleSignInViewController.h"
|
#import "GooglePlusSampleSignInViewController.h"
|
||||||
#import "GooglePlusSampleMomentsViewController.h"
|
#import "GooglePlusSampleMomentsViewController.h"
|
||||||
@ -25,10 +26,19 @@
|
|||||||
static const int kNumViewControllers = 3;
|
static const int kNumViewControllers = 3;
|
||||||
static NSString * const kMenuOptions[kNumViewControllers] = {
|
static NSString * const kMenuOptions[kNumViewControllers] = {
|
||||||
@"Sign In", @"Share", @"Moments" };
|
@"Sign In", @"Share", @"Moments" };
|
||||||
|
static NSString * const kUnselectableMenuOptions[kNumViewControllers] = {
|
||||||
|
@"", @"", @"Sign in to use moments" };
|
||||||
static NSString * const kNibNames[kNumViewControllers] = {
|
static NSString * const kNibNames[kNumViewControllers] = {
|
||||||
@"GooglePlusSampleSignInViewController",
|
@"GooglePlusSampleSignInViewController",
|
||||||
@"GooglePlusSampleShareViewController",
|
@"GooglePlusSampleShareViewController",
|
||||||
@"GooglePlusSampleMomentsViewController" };
|
@"GooglePlusSampleMomentsViewController" };
|
||||||
|
static const int kMomentsIndex = 2;
|
||||||
|
|
||||||
|
@interface GooglePlusSampleMasterViewController () {
|
||||||
|
NSIndexPath *momentsIndexPath_;
|
||||||
|
}
|
||||||
|
- (BOOL)isSelectable:(NSIndexPath *)indexPath;
|
||||||
|
@end
|
||||||
|
|
||||||
@implementation GooglePlusSampleMasterViewController
|
@implementation GooglePlusSampleMasterViewController
|
||||||
|
|
||||||
@ -47,6 +57,11 @@ static NSString * const kNibNames[kNumViewControllers] = {
|
|||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)dealloc {
|
||||||
|
[momentsIndexPath_ release];
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - View lifecycle
|
#pragma mark - View lifecycle
|
||||||
|
|
||||||
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)
|
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)
|
||||||
@ -58,6 +73,15 @@ static NSString * const kNibNames[kNumViewControllers] = {
|
|||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)viewWillAppear:(BOOL)animated {
|
||||||
|
[super viewWillAppear:animated];
|
||||||
|
if (momentsIndexPath_) {
|
||||||
|
[self.tableView
|
||||||
|
reloadRowsAtIndexPaths:[NSArray arrayWithObject:momentsIndexPath_]
|
||||||
|
withRowAnimation:UITableViewRowAnimationFade];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - UITableViewDelegate/UITableViewDataSource
|
#pragma mark - UITableViewDelegate/UITableViewDataSource
|
||||||
|
|
||||||
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
|
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
|
||||||
@ -71,22 +95,32 @@ static NSString * const kNibNames[kNumViewControllers] = {
|
|||||||
|
|
||||||
- (UITableViewCell *)tableView:(UITableView *)tableView
|
- (UITableViewCell *)tableView:(UITableView *)tableView
|
||||||
cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||||
static NSString * const kCellIdentifier = @"Cell";
|
BOOL selectable = [self isSelectable:indexPath];
|
||||||
|
NSString * const kCellIdentifier = selectable ? @"Cell" : @"GreyCell";
|
||||||
UITableViewCell *cell =
|
UITableViewCell *cell =
|
||||||
[tableView dequeueReusableCellWithIdentifier:kCellIdentifier];
|
[tableView dequeueReusableCellWithIdentifier:kCellIdentifier];
|
||||||
if (cell == nil) {
|
if (cell == nil) {
|
||||||
cell =
|
cell =
|
||||||
[[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
|
[[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
|
||||||
reuseIdentifier:kCellIdentifier] autorelease];
|
reuseIdentifier:kCellIdentifier] autorelease];
|
||||||
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
|
if (selectable) {
|
||||||
|
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
|
||||||
|
} else {
|
||||||
|
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||||
|
cell.textLabel.textColor = [UIColor lightGrayColor];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
cell.textLabel.text = (selectable ? kMenuOptions : kUnselectableMenuOptions)
|
||||||
|
[indexPath.row];
|
||||||
|
|
||||||
cell.textLabel.text = kMenuOptions[indexPath.row];
|
|
||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)tableView:(UITableView *)tableView
|
- (void)tableView:(UITableView *)tableView
|
||||||
didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||||
|
if (![self isSelectable:indexPath]) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Class nibClass = NSClassFromString(kNibNames[indexPath.row]);
|
Class nibClass = NSClassFromString(kNibNames[indexPath.row]);
|
||||||
UIViewController *controller =
|
UIViewController *controller =
|
||||||
[[[nibClass alloc] initWithNibName:nil bundle:nil] autorelease];
|
[[[nibClass alloc] initWithNibName:nil bundle:nil] autorelease];
|
||||||
@ -95,4 +129,19 @@ static NSString * const kNibNames[kNumViewControllers] = {
|
|||||||
[self.navigationController pushViewController:controller animated:YES];
|
[self.navigationController pushViewController:controller animated:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma mark - Helper methods
|
||||||
|
|
||||||
|
- (BOOL)isSelectable:(NSIndexPath *)indexPath {
|
||||||
|
if (indexPath.row == kMomentsIndex) {
|
||||||
|
if (!momentsIndexPath_) {
|
||||||
|
momentsIndexPath_ = [indexPath retain];
|
||||||
|
}
|
||||||
|
// To use Google+ History API, you need to sign in.
|
||||||
|
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
||||||
|
[[UIApplication sharedApplication] delegate];
|
||||||
|
return appDelegate.auth && appDelegate.plusMomentsWriteScope;
|
||||||
|
}
|
||||||
|
return YES;
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#import "GooglePlusSampleMomentsViewController.h"
|
#import "GooglePlusSampleMomentsViewController.h"
|
||||||
|
|
||||||
#import <QuartzCore/QuartzCore.h>
|
#import <QuartzCore/QuartzCore.h>
|
||||||
|
#import "GooglePlusSampleAppDelegate.h"
|
||||||
#import "GTLPlus.h"
|
#import "GTLPlus.h"
|
||||||
#import "GTLPlusConstants.h"
|
#import "GTLPlusConstants.h"
|
||||||
#import "GTLPlusItemScope.h"
|
#import "GTLPlusItemScope.h"
|
||||||
@ -27,7 +28,6 @@
|
|||||||
#import "GTLServicePlus.h"
|
#import "GTLServicePlus.h"
|
||||||
#import "GTMLogger.h"
|
#import "GTMLogger.h"
|
||||||
#import "GTMOAuth2Authentication.h"
|
#import "GTMOAuth2Authentication.h"
|
||||||
#import "GooglePlusSampleAppDelegate.h"
|
|
||||||
|
|
||||||
@interface GooglePlusSampleMomentsViewController ()
|
@interface GooglePlusSampleMomentsViewController ()
|
||||||
- (GTLPlusItemScope *)resultFor:(NSString *)selectedMoment;
|
- (GTLPlusItemScope *)resultFor:(NSString *)selectedMoment;
|
||||||
@ -162,7 +162,7 @@ static NSString * const kMomentURLFormat =
|
|||||||
NSString *selectedMoment = kMomentTypes[selectedRow];
|
NSString *selectedMoment = kMomentTypes[selectedRow];
|
||||||
|
|
||||||
GTLPlusMoment *moment = [[[GTLPlusMoment alloc] init] autorelease];
|
GTLPlusMoment *moment = [[[GTLPlusMoment alloc] init] autorelease];
|
||||||
moment.type = [NSString stringWithFormat:@"https://schemas.google.com/%@",
|
moment.type = [NSString stringWithFormat:@"http://schemas.google.com/%@",
|
||||||
selectedMoment];
|
selectedMoment];
|
||||||
GTLPlusItemScope *target = [[[GTLPlusItemScope alloc] init] autorelease];
|
GTLPlusItemScope *target = [[[GTLPlusItemScope alloc] init] autorelease];
|
||||||
target.url = momentURL_.text;
|
target.url = momentURL_.text;
|
||||||
@ -258,8 +258,8 @@ static NSString * const kMomentURLFormat =
|
|||||||
GTLPlusItemScope *result = [[[GTLPlusItemScope alloc] init] autorelease];
|
GTLPlusItemScope *result = [[[GTLPlusItemScope alloc] init] autorelease];
|
||||||
if ([selectedMoment isEqualToString:@"CommentActivity"]) {
|
if ([selectedMoment isEqualToString:@"CommentActivity"]) {
|
||||||
result.type = @"http://schema.org/Comment";
|
result.type = @"http://schema.org/Comment";
|
||||||
result.url =
|
result.url = @"https://developers.google.com/+/plugins/snippet/"
|
||||||
@"https://developers.google.com/+/plugins/snippet/examples/blog-entry#comment-1";
|
@"examples/blog-entry#comment-1";
|
||||||
result.name = @"This is amazing!";
|
result.name = @"This is amazing!";
|
||||||
result.text = @"I can't wait to use it on my site :)";
|
result.text = @"I can't wait to use it on my site :)";
|
||||||
return result;
|
return result;
|
||||||
@ -272,16 +272,15 @@ static NSString * const kMomentURLFormat =
|
|||||||
result.type = @"http://schema.org/Review";
|
result.type = @"http://schema.org/Review";
|
||||||
result.name = @"A Humble Review of Widget";
|
result.name = @"A Humble Review of Widget";
|
||||||
result.url =
|
result.url =
|
||||||
@"https://developers.google.com/+/plugins/snippet/examples/review";
|
@"https://developers.google.com/+/plugins/snippet/examples/review";
|
||||||
result.text =
|
result.text =
|
||||||
@"It's amazingly effective at whatever it is that it's supposed to do.";
|
@"It's amazingly effective at whatever it is that it's supposed to do.";
|
||||||
GTLPlusItemScope *rating = [[[GTLPlusItemScope alloc] init] autorelease];
|
GTLPlusItemScope *rating = [[[GTLPlusItemScope alloc] init] autorelease];
|
||||||
rating.type = @"http://schema.org/Rating";
|
rating.type = @"http://schema.org/Rating";
|
||||||
rating.ratingValue = @"100";
|
rating.ratingValue = @"100";
|
||||||
rating.bestRating = @"100";
|
rating.bestRating = @"100";
|
||||||
rating.worstRating = @"0";
|
rating.worstRating = @"0";
|
||||||
result.reviewRating =
|
result.reviewRating = rating;
|
||||||
[[[NSArray alloc] initWithObjects:rating, nil] autorelease];
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
return nil;
|
return nil;
|
||||||
|
@ -19,18 +19,22 @@
|
|||||||
#import <MessageUI/MFMailComposeViewController.h>
|
#import <MessageUI/MFMailComposeViewController.h>
|
||||||
#import <MessageUI/MessageUI.h>
|
#import <MessageUI/MessageUI.h>
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
#import "GooglePlusShare.h"
|
#import "GPPShare.h"
|
||||||
|
|
||||||
// A view controller for the Google+ share dialog which contains a text field
|
// A view controller for the Google+ share dialog which contains a text field
|
||||||
// to prefill the user comment, and a text field for an optional URL to share.
|
// to prefill the user comment, and a text field for an optional URL to share.
|
||||||
// A Google+ share button is provided to launch the share dialog.
|
// A Google+ share button is provided to launch the share dialog.
|
||||||
@interface GooglePlusSampleShareViewController : UIViewController<
|
@interface GooglePlusSampleShareViewController : UIViewController<
|
||||||
GooglePlusShareDelegate,
|
GPPShareDelegate,
|
||||||
UITextFieldDelegate,
|
UITextFieldDelegate,
|
||||||
UIActionSheetDelegate,
|
UIActionSheetDelegate,
|
||||||
MFMailComposeViewControllerDelegate> {
|
MFMailComposeViewControllerDelegate> {
|
||||||
// The Google+ share object to manage the share dialog.
|
// The Google+ share object to manage the share dialog.
|
||||||
GooglePlusShare *share_;
|
GPPShare *share_;
|
||||||
|
// Whether the keyboard is visible or not.
|
||||||
|
BOOL keyboardVisible_;
|
||||||
|
// The text field being edited.
|
||||||
|
UITextField *activeField_;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The text to prefill the user comment in the share dialog.
|
// The text to prefill the user comment in the share dialog.
|
||||||
@ -41,7 +45,36 @@
|
|||||||
@property (retain, nonatomic) IBOutlet UILabel *shareStatus;
|
@property (retain, nonatomic) IBOutlet UILabel *shareStatus;
|
||||||
// A toolbar to share via Google+ or email.
|
// A toolbar to share via Google+ or email.
|
||||||
@property (retain, nonatomic) IBOutlet UIToolbar *shareToolbar;
|
@property (retain, nonatomic) IBOutlet UIToolbar *shareToolbar;
|
||||||
|
// A switch to toggle Google+ share with deep linking.
|
||||||
|
@property (retain, nonatomic) IBOutlet UISwitch *attachDeepLinkSwitch;
|
||||||
|
// The deep-link ID to be attached with the Google+ share to qualify as
|
||||||
|
// a deep-link share.
|
||||||
|
@property (retain, nonatomic) IBOutlet UITextField *deepLinkID;
|
||||||
|
// The share's title.
|
||||||
|
@property (retain, nonatomic) IBOutlet UITextField *deepLinkTitle;
|
||||||
|
// The share's description.
|
||||||
|
@property (retain, nonatomic) IBOutlet UITextField *deepLinkDescription;
|
||||||
|
// The share's thumbnail URL.
|
||||||
|
@property (retain, nonatomic) IBOutlet UITextField *deepLinkThumbnailURL;
|
||||||
|
// The share view.
|
||||||
|
@property (retain, nonatomic) IBOutlet UIScrollView *shareScrollView;
|
||||||
|
@property (retain, nonatomic) IBOutlet UIView *shareView;
|
||||||
|
// Labels for Google+ share sample.
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *attachDeepLinkDataLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *urlToShareLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *prefillTextLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *deepLinkIDLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *deepLinkTitleLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *deepLinkDescriptionLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *deepLinkThumbnailURLLabel;
|
||||||
|
@property (retain, nonatomic) IBOutlet UIButton *shareButton;
|
||||||
|
@property (retain, nonatomic) IBOutlet UISwitch *urlForDeepLinkMetadataSwitch;
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *urlForDeepLinkMetadataLabel;
|
||||||
|
|
||||||
|
// Called when the switch for deep-link data is toggled.
|
||||||
|
- (IBAction)deepLinkSwitchToggle:(id)sender;
|
||||||
|
// Called when the switch for metadata from URL preview is toggled.
|
||||||
|
- (IBAction)urlForDeepLinkMetadataSwitchToggle:(id)sender;
|
||||||
// Called when the share button is pressed.
|
// Called when the share button is pressed.
|
||||||
- (IBAction)shareButton:(id)sender;
|
- (IBAction)shareButton:(id)sender;
|
||||||
// Called when the toolbar share button is pressed.
|
// Called when the toolbar share button is pressed.
|
||||||
|
@ -20,19 +20,61 @@
|
|||||||
|
|
||||||
#import "GooglePlusSampleAppDelegate.h"
|
#import "GooglePlusSampleAppDelegate.h"
|
||||||
|
|
||||||
|
@interface GooglePlusSampleShareViewController()
|
||||||
|
- (void)animateKeyboard:(NSNotification *)notification
|
||||||
|
shouldShow:(BOOL)shouldShow;
|
||||||
|
- (void)layout;
|
||||||
|
- (void)placeView:(UIView *)view x:(CGFloat)x y:(CGFloat)y;
|
||||||
|
- (void)populateTextFields;
|
||||||
|
@end
|
||||||
|
|
||||||
@implementation GooglePlusSampleShareViewController
|
@implementation GooglePlusSampleShareViewController
|
||||||
|
|
||||||
|
@synthesize attachDeepLinkSwitch = attachDeepLinkSwitch_;
|
||||||
|
@synthesize deepLinkDescription = deepLinkDescription_;
|
||||||
|
@synthesize deepLinkID = deepLinkID_;
|
||||||
|
@synthesize deepLinkTitle = deepLinkTitle_;
|
||||||
|
@synthesize deepLinkThumbnailURL = deepLinkThumbnailURL_;
|
||||||
@synthesize sharePrefillText = sharePrefillText_;
|
@synthesize sharePrefillText = sharePrefillText_;
|
||||||
@synthesize shareURL = shareURL_;
|
@synthesize shareURL = shareURL_;
|
||||||
@synthesize shareStatus = shareStatus_;
|
@synthesize shareStatus = shareStatus_;
|
||||||
@synthesize shareToolbar = shareToolbar_;
|
@synthesize shareToolbar = shareToolbar_;
|
||||||
|
@synthesize shareScrollView = shareScrollView_;
|
||||||
|
@synthesize shareView = shareView_;
|
||||||
|
@synthesize attachDeepLinkDataLabel = attachDeepLinkDataLabel_;
|
||||||
|
@synthesize urlToShareLabel = urlToShareLabel_;
|
||||||
|
@synthesize prefillTextLabel = prefillTextLabel_;
|
||||||
|
@synthesize deepLinkIDLabel = deepLinkIDLabel_;
|
||||||
|
@synthesize deepLinkTitleLabel = deepLinkTitleLabel_;
|
||||||
|
@synthesize deepLinkDescriptionLabel = deepLinkDescriptionLabel_;
|
||||||
|
@synthesize deepLinkThumbnailURLLabel = deepLinkThumbnailURLLabel_;
|
||||||
|
@synthesize shareButton = shareButton_;
|
||||||
|
@synthesize urlForDeepLinkMetadataSwitch = urlForDeepLinkMetadataSwitch_;
|
||||||
|
@synthesize urlForDeepLinkMetadataLabel = urlForDeepLinkMetadataLabel_;
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
|
[attachDeepLinkSwitch_ release];
|
||||||
|
[deepLinkID_ release];
|
||||||
|
[deepLinkTitle_ release];
|
||||||
|
[deepLinkDescription_ release];
|
||||||
|
[deepLinkThumbnailURL_ release];
|
||||||
[sharePrefillText_ release];
|
[sharePrefillText_ release];
|
||||||
[shareURL_ release];
|
[shareURL_ release];
|
||||||
[shareStatus_ release];
|
[shareStatus_ release];
|
||||||
[share_ release];
|
[share_ release];
|
||||||
[shareToolbar_ release];
|
[shareToolbar_ release];
|
||||||
|
[shareScrollView_ release];
|
||||||
|
[shareView_ release];
|
||||||
|
[attachDeepLinkDataLabel_ release];
|
||||||
|
[urlToShareLabel_ release];
|
||||||
|
[prefillTextLabel_ release];
|
||||||
|
[deepLinkIDLabel_ release];
|
||||||
|
[deepLinkTitleLabel_ release];
|
||||||
|
[deepLinkDescriptionLabel_ release];
|
||||||
|
[deepLinkThumbnailURLLabel_ release];
|
||||||
|
[shareButton_ release];
|
||||||
|
[urlForDeepLinkMetadataSwitch_ release];
|
||||||
|
[urlForDeepLinkMetadataLabel_ release];
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,10 +85,14 @@
|
|||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
||||||
[[UIApplication sharedApplication] delegate];
|
[[UIApplication sharedApplication] delegate];
|
||||||
NSString *clientID = [GooglePlusSampleAppDelegate clientID];
|
NSString *clientID = [GooglePlusSampleAppDelegate clientID];
|
||||||
share_ = [[GooglePlusShare alloc] initWithClientID:clientID];
|
share_ = [[GPPShare alloc] initWithClientID:clientID];
|
||||||
share_.delegate = self;
|
share_.delegate = self;
|
||||||
appDelegate.share = share_;
|
appDelegate.share = share_;
|
||||||
|
|
||||||
|
[attachDeepLinkSwitch_ setOn:NO];
|
||||||
|
|
||||||
|
[self layout];
|
||||||
|
[self populateTextFields];
|
||||||
[super viewDidLoad];
|
[super viewDidLoad];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,10 +103,69 @@
|
|||||||
share_.delegate = nil;
|
share_.delegate = nil;
|
||||||
[share_ release];
|
[share_ release];
|
||||||
share_ = nil;
|
share_ = nil;
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
removeObserver:self
|
||||||
|
name:UIKeyboardWillShowNotification
|
||||||
|
object:nil];
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
removeObserver:self
|
||||||
|
name:UIKeyboardWillHideNotification
|
||||||
|
object:nil];
|
||||||
|
|
||||||
|
[self setAttachDeepLinkSwitch:nil];
|
||||||
|
[self setDeepLinkID:nil];
|
||||||
|
[self setDeepLinkTitle:nil];
|
||||||
|
[self setDeepLinkDescription:nil];
|
||||||
|
[self setDeepLinkThumbnailURL:nil];
|
||||||
|
[self setShareScrollView:nil];
|
||||||
|
[self setShareView:nil];
|
||||||
|
[self setShareToolbar:nil];
|
||||||
|
[self setAttachDeepLinkDataLabel:nil];
|
||||||
|
[self setUrlToShareLabel:nil];
|
||||||
|
[self setPrefillTextLabel:nil];
|
||||||
|
[self setDeepLinkIDLabel:nil];
|
||||||
|
[self setDeepLinkTitleLabel:nil];
|
||||||
|
[self setDeepLinkDescriptionLabel:nil];
|
||||||
|
[self setDeepLinkThumbnailURLLabel:nil];
|
||||||
|
[self setShareButton:nil];
|
||||||
|
[self setUrlForDeepLinkMetadataSwitch:nil];
|
||||||
|
[self setUrlForDeepLinkMetadataLabel:nil];
|
||||||
[super viewDidUnload];
|
[super viewDidUnload];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)viewWillAppear:(BOOL)animated {
|
||||||
|
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad){
|
||||||
|
shareScrollView_.frame = self.view.frame;
|
||||||
|
}
|
||||||
|
[super viewWillAppear:animated];
|
||||||
|
|
||||||
|
// Register for keyboard notifications while visible.
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
addObserver:self
|
||||||
|
selector:@selector(keyboardWillShow:)
|
||||||
|
name:UIKeyboardWillShowNotification
|
||||||
|
object:nil];
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
addObserver:self
|
||||||
|
selector:@selector(keyboardWillHide:)
|
||||||
|
name:UIKeyboardWillHideNotification
|
||||||
|
object:nil];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)viewWillDisappear:(BOOL)animated {
|
||||||
|
// Unregister for keyboard notifications while not visible.
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
removeObserver:self
|
||||||
|
name:UIKeyboardWillShowNotification
|
||||||
|
object:nil];
|
||||||
|
[[NSNotificationCenter defaultCenter]
|
||||||
|
removeObserver:self
|
||||||
|
name:UIKeyboardWillHideNotification
|
||||||
|
object:nil];
|
||||||
|
|
||||||
|
[super viewWillDisappear:animated];
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - UITextFieldDelegate
|
#pragma mark - UITextFieldDelegate
|
||||||
|
|
||||||
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
|
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
|
||||||
@ -68,7 +173,15 @@
|
|||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - GooglePlusShareDelegate
|
- (void)textFieldDidBeginEditing:(UITextField *)textField {
|
||||||
|
activeField_ = textField;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)textFieldDidEndEditing:(UITextField *)textField {
|
||||||
|
activeField_ = nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - GPPShareDelegate
|
||||||
|
|
||||||
- (void)finishedSharing:(BOOL)shared {
|
- (void)finishedSharing:(BOOL)shared {
|
||||||
NSString *text = shared ? @"Success" : @"Canceled";
|
NSString *text = shared ? @"Success" : @"Canceled";
|
||||||
@ -120,15 +233,49 @@
|
|||||||
[self dismissModalViewControllerAnimated:YES];
|
[self dismissModalViewControllerAnimated:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma mark - UIKeyboard
|
||||||
|
|
||||||
|
- (void)keyboardWillShow:(NSNotification *)notification {
|
||||||
|
[self animateKeyboard:notification shouldShow:YES];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)keyboardWillHide:(NSNotification *)notification {
|
||||||
|
[self animateKeyboard:notification shouldShow:NO];
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - IBActions
|
#pragma mark - IBActions
|
||||||
|
|
||||||
- (IBAction)shareButton:(id)sender {
|
- (IBAction)shareButton:(id)sender {
|
||||||
|
shareStatus_.text = @"Status: Sharing...";
|
||||||
|
id<GPPShareBuilder> shareBuilder = [share_ shareDialog];
|
||||||
|
|
||||||
NSString *inputURL = shareURL_.text;
|
NSString *inputURL = shareURL_.text;
|
||||||
NSURL *urlToShare = [inputURL length] ? [NSURL URLWithString:inputURL] : nil;
|
NSURL *urlToShare = [inputURL length] ? [NSURL URLWithString:inputURL] : nil;
|
||||||
|
if (urlToShare) {
|
||||||
|
shareBuilder = [shareBuilder setURLToShare:urlToShare];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([deepLinkID_ text]) {
|
||||||
|
shareBuilder = [shareBuilder setContentDeepLinkID:[deepLinkID_ text]];
|
||||||
|
NSString *title = [deepLinkTitle_ text];
|
||||||
|
NSString *description = [deepLinkDescription_ text];
|
||||||
|
if (title && description) {
|
||||||
|
NSURL *thumbnailURL = [NSURL URLWithString:[deepLinkThumbnailURL_ text]];
|
||||||
|
shareBuilder = [shareBuilder setTitle:title
|
||||||
|
description:description
|
||||||
|
thumbnailURL:thumbnailURL];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
NSString *inputText = sharePrefillText_.text;
|
NSString *inputText = sharePrefillText_.text;
|
||||||
NSString *text = [inputText length] ? inputText : nil;
|
NSString *text = [inputText length] ? inputText : nil;
|
||||||
shareStatus_.text = @"Status: Sharing...";
|
if (text) {
|
||||||
[[[[share_ shareDialog] setURLToShare:urlToShare] setPrefillText:text] open];
|
shareBuilder = [shareBuilder setPrefillText:text];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (![shareBuilder open]) {
|
||||||
|
shareStatus_.text = @"Status: Error (see console).";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)shareToolbar:(id)sender {
|
- (IBAction)shareToolbar:(id)sender {
|
||||||
@ -142,4 +289,210 @@
|
|||||||
[actionSheet showFromToolbar:shareToolbar_];
|
[actionSheet showFromToolbar:shareToolbar_];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (IBAction)urlForDeepLinkMetadataSwitchToggle:(id)sender {
|
||||||
|
[self layout];
|
||||||
|
[self populateTextFields];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)deepLinkSwitchToggle:(id)sender {
|
||||||
|
if (!attachDeepLinkSwitch_.on) {
|
||||||
|
[urlForDeepLinkMetadataSwitch_ setOn:YES];
|
||||||
|
}
|
||||||
|
[self layout];
|
||||||
|
[self populateTextFields];
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma mark - helper methods
|
||||||
|
|
||||||
|
- (void) placeView:(UIView *)view x:(CGFloat)x y:(CGFloat)y {
|
||||||
|
CGSize frameSize = view.frame.size;
|
||||||
|
view.frame = CGRectMake(x, y, frameSize.width, frameSize.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void) layout {
|
||||||
|
CGFloat originX = 20.0;
|
||||||
|
CGFloat originY = 20.0;
|
||||||
|
CGFloat yPadding = 20.0;
|
||||||
|
CGFloat currentY = originY;
|
||||||
|
CGFloat middleX = 150;
|
||||||
|
|
||||||
|
// Place the switch for attaching deep-link data.
|
||||||
|
[self placeView:attachDeepLinkDataLabel_ x:originX y:currentY];
|
||||||
|
[self placeView:attachDeepLinkSwitch_ x:middleX + 50 y:currentY];
|
||||||
|
CGSize frameSize = attachDeepLinkSwitch_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
// Place the switch for preview URL.
|
||||||
|
if (attachDeepLinkSwitch_.on) {
|
||||||
|
[self placeView:urlForDeepLinkMetadataLabel_ x:originX y:currentY];
|
||||||
|
[self placeView:urlForDeepLinkMetadataSwitch_ x:middleX + 50 y:currentY];
|
||||||
|
frameSize = urlForDeepLinkMetadataSwitch_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
urlForDeepLinkMetadataSwitch_.hidden = NO;
|
||||||
|
urlForDeepLinkMetadataLabel_.hidden = NO;
|
||||||
|
} else {
|
||||||
|
urlForDeepLinkMetadataSwitch_.hidden = YES;
|
||||||
|
urlForDeepLinkMetadataLabel_.hidden = YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Place the field for URL to share.
|
||||||
|
if (urlForDeepLinkMetadataSwitch_.on) {
|
||||||
|
[self placeView:urlToShareLabel_ x:originX y:currentY];
|
||||||
|
frameSize = urlToShareLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
|
||||||
|
[self placeView:shareURL_ x:originX y:currentY];
|
||||||
|
frameSize = shareURL_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
urlToShareLabel_.hidden = NO;
|
||||||
|
shareURL_.hidden = NO;
|
||||||
|
} else {
|
||||||
|
urlToShareLabel_.hidden = YES;
|
||||||
|
shareURL_.hidden = YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Place the field for prefill text.
|
||||||
|
[self placeView:prefillTextLabel_ x:originX y:currentY];
|
||||||
|
frameSize = prefillTextLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
[self placeView:sharePrefillText_ x:originX y:currentY];
|
||||||
|
frameSize = sharePrefillText_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
// Place the content deep-link ID field.
|
||||||
|
if (attachDeepLinkSwitch_.on) {
|
||||||
|
[self placeView:deepLinkIDLabel_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkIDLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
[self placeView:deepLinkID_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkID_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
deepLinkIDLabel_.hidden = NO;
|
||||||
|
deepLinkID_.hidden = NO;
|
||||||
|
} else {
|
||||||
|
deepLinkIDLabel_.hidden = YES;
|
||||||
|
deepLinkID_.hidden = YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Place fields for content deep-link metadata.
|
||||||
|
if (attachDeepLinkSwitch_.on && !urlForDeepLinkMetadataSwitch_.on) {
|
||||||
|
[self placeView:deepLinkTitleLabel_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkTitleLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
[self placeView:deepLinkTitle_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkTitle_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
[self placeView:deepLinkDescriptionLabel_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkDescriptionLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
[self placeView:deepLinkDescription_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkDescription_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
[self placeView:deepLinkThumbnailURLLabel_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkThumbnailURLLabel_.frame.size;
|
||||||
|
currentY += frameSize.height + 0.5 * yPadding;
|
||||||
|
[self placeView:deepLinkThumbnailURL_ x:originX y:currentY];
|
||||||
|
frameSize = deepLinkThumbnailURL_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
deepLinkTitle_.hidden = NO;
|
||||||
|
deepLinkTitleLabel_.hidden = NO;
|
||||||
|
deepLinkDescriptionLabel_.hidden = NO;
|
||||||
|
deepLinkDescription_.hidden = NO;
|
||||||
|
deepLinkThumbnailURLLabel_.hidden = NO;
|
||||||
|
deepLinkThumbnailURL_.hidden = NO;
|
||||||
|
} else {
|
||||||
|
deepLinkTitle_.hidden = YES;
|
||||||
|
deepLinkTitleLabel_.hidden = YES;
|
||||||
|
deepLinkDescriptionLabel_.hidden = YES;
|
||||||
|
deepLinkDescription_.hidden = YES;
|
||||||
|
deepLinkThumbnailURLLabel_.hidden = YES;
|
||||||
|
deepLinkThumbnailURL_.hidden = YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Place the share button and status.
|
||||||
|
[self placeView:shareButton_ x:originX y:currentY];
|
||||||
|
frameSize = shareButton_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
[self placeView:shareStatus_ x:originX y:currentY];
|
||||||
|
frameSize = shareStatus_.frame.size;
|
||||||
|
currentY += frameSize.height + yPadding;
|
||||||
|
|
||||||
|
shareScrollView_.contentSize =
|
||||||
|
CGSizeMake(shareScrollView_.frame.size.width, currentY);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)populateTextFields {
|
||||||
|
// Pre-populate text fields for Google+ share sample.
|
||||||
|
if (sharePrefillText_.hidden) {
|
||||||
|
sharePrefillText_.text = @"";
|
||||||
|
} else {
|
||||||
|
sharePrefillText_.text = @"Welcome to Google+ Platform";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (shareURL_.hidden) {
|
||||||
|
shareURL_.text = @"";
|
||||||
|
} else {
|
||||||
|
shareURL_.text = @"http://developers.google.com";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deepLinkID_.hidden) {
|
||||||
|
deepLinkID_.text = @"";
|
||||||
|
} else {
|
||||||
|
deepLinkID_.text = @"reviews/314159265358";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deepLinkTitle_.hidden) {
|
||||||
|
deepLinkTitle_.text = @"";
|
||||||
|
} else {
|
||||||
|
deepLinkTitle_.text = @"Joe's Diner Review";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deepLinkDescription_.hidden) {
|
||||||
|
deepLinkDescription_.text = @"";
|
||||||
|
} else {
|
||||||
|
deepLinkDescription_.text = @"Check out my review of the awesome toast!";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deepLinkThumbnailURL_.hidden) {
|
||||||
|
deepLinkThumbnailURL_.text = @"";
|
||||||
|
} else {
|
||||||
|
deepLinkThumbnailURL_.text =
|
||||||
|
@"http://www.google.com/logos/2012/childrensday-2012-hp.jpg";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)animateKeyboard:(NSNotification *)notification
|
||||||
|
shouldShow:(BOOL)shouldShow {
|
||||||
|
if (!shouldShow) {
|
||||||
|
UIEdgeInsets contentInsets = UIEdgeInsetsZero;
|
||||||
|
shareScrollView_.contentInset = contentInsets;
|
||||||
|
shareScrollView_.scrollIndicatorInsets = contentInsets;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSDictionary *userInfo = [notification userInfo];
|
||||||
|
CGRect kbFrame =
|
||||||
|
[[userInfo objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue];
|
||||||
|
CGSize kbSize = kbFrame.size;
|
||||||
|
UIEdgeInsets contentInsets = UIEdgeInsetsMake(0.0, 0.0, kbSize.height, 0.0);
|
||||||
|
shareScrollView_.contentInset = contentInsets;
|
||||||
|
shareScrollView_.scrollIndicatorInsets = contentInsets;
|
||||||
|
|
||||||
|
// If active text field is hidden by keyboard, scroll so it's visible.
|
||||||
|
CGRect aRect = self.view.frame;
|
||||||
|
aRect.size.height -= kbSize.height;
|
||||||
|
CGPoint bottomLeft =
|
||||||
|
CGPointMake(0.0, activeField_.frame.origin.y +
|
||||||
|
activeField_.frame.size.height + 10);
|
||||||
|
if (!CGRectContainsPoint(aRect, bottomLeft)) {
|
||||||
|
CGPoint scrollPoint = CGPointMake(0.0, bottomLeft.y - aRect.size.height);
|
||||||
|
[shareScrollView_ setContentOffset:scrollPoint animated:YES];
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// GooglePlusSignInViewController.h
|
// GooglePlusSampleSignInViewController.h
|
||||||
//
|
//
|
||||||
// Copyright 2012 Google Inc.
|
// Copyright 2012 Google Inc.
|
||||||
//
|
//
|
||||||
@ -17,24 +17,39 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
#import "GooglePlusSignIn.h"
|
#import "GPPSignIn.h"
|
||||||
|
|
||||||
@class GooglePlusSignInButton;
|
@class GPPSignInButton;
|
||||||
|
|
||||||
// A view controller for the Google+ sign-in button which initiates a standard
|
// A view controller for the Google+ sign-in button which initiates a standard
|
||||||
// OAuth 2.0 flow and provides an access token and a refresh token. A "Sign out"
|
// OAuth 2.0 flow and provides an access token and a refresh token. A "Sign out"
|
||||||
// button is provided to allow users to sign out of this application.
|
// button is provided to allow users to sign out of this application.
|
||||||
@interface GooglePlusSampleSignInViewController : UIViewController<
|
@interface GooglePlusSampleSignInViewController : UIViewController<
|
||||||
GooglePlusSignInDelegate>
|
GPPSignInDelegate>
|
||||||
|
|
||||||
// The button that handles Google+ sign-in.
|
// The button that handles Google+ sign-in.
|
||||||
@property (retain, nonatomic) IBOutlet GooglePlusSignInButton *signInButton;
|
@property (retain, nonatomic) IBOutlet GPPSignInButton *signInButton;
|
||||||
// A label to display the result of the sign-in action.
|
// A label to display the result of the sign-in action.
|
||||||
@property (retain, nonatomic) IBOutlet UILabel *signInAuthStatus;
|
@property (retain, nonatomic) IBOutlet UILabel *signInAuthStatus;
|
||||||
|
// A label to display the signed-in user's display name.
|
||||||
|
@property (retain, nonatomic) IBOutlet UILabel *signInDisplayName;
|
||||||
// A button to sign out of this application.
|
// A button to sign out of this application.
|
||||||
@property (retain, nonatomic) IBOutlet UIButton *signOutButton;
|
@property (retain, nonatomic) IBOutlet UIButton *signOutButton;
|
||||||
|
// A switch for whether to request for Google+ History's
|
||||||
|
// https://www.googleapis.com/auth/plus.moments.write scope.
|
||||||
|
@property (retain, nonatomic) IBOutlet UISwitch *plusMomentsWriteScope;
|
||||||
|
// A switch for whether to request
|
||||||
|
// https://www.googleapis.com/auth/userinfo.email scope to get user's email
|
||||||
|
// address after the sign-in action.
|
||||||
|
@property (retain, nonatomic) IBOutlet UISwitch *userinfoEmailScope;
|
||||||
|
|
||||||
// Called when the user presses the "Sign out" button.
|
// Called when the user presses the "Sign out" button.
|
||||||
- (IBAction)signOut:(id)sender;
|
- (IBAction)signOut:(id)sender;
|
||||||
|
// Called when the user toggles Google+ History's
|
||||||
|
// https://www.googleapis.com/auth/plus.moments.write scope.
|
||||||
|
- (IBAction)plusMomentsWriteScopeToggle:(id)sender;
|
||||||
|
// Called when the user toggles the
|
||||||
|
// https://www.googleapis.com/auth/userinfo.email scope.
|
||||||
|
- (IBAction)userinfoEmailScopeToggle:(id)sender;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// GooglePlusSignInViewController.m
|
// GooglePlusSampleSignInViewController.m
|
||||||
//
|
//
|
||||||
// Copyright 2012 Google Inc.
|
// Copyright 2012 Google Inc.
|
||||||
//
|
//
|
||||||
@ -20,36 +20,50 @@
|
|||||||
|
|
||||||
#import <QuartzCore/QuartzCore.h>
|
#import <QuartzCore/QuartzCore.h>
|
||||||
#import "GooglePlusSampleAppDelegate.h"
|
#import "GooglePlusSampleAppDelegate.h"
|
||||||
#import "GooglePlusSignIn.h"
|
#import "GPPSignIn.h"
|
||||||
#import "GooglePlusSignInButton.h"
|
#import "GPPSignInButton.h"
|
||||||
|
#import "GTLPlus.h"
|
||||||
|
#import "GTLPlusConstants.h"
|
||||||
|
#import "GTLQueryPlus.h"
|
||||||
|
#import "GTLServicePlus.h"
|
||||||
|
#import "GTMLogger.h"
|
||||||
|
#import "GTMOAuth2Authentication.h"
|
||||||
|
|
||||||
|
@interface GooglePlusSampleSignInViewController () {
|
||||||
|
// Saved state of |userinfoEmailScope_.on|.
|
||||||
|
BOOL savedUserinfoEmailScopeState_;
|
||||||
|
}
|
||||||
|
- (GooglePlusSampleAppDelegate *)appDelegate;
|
||||||
|
- (void)setSignInScopes;
|
||||||
|
- (void)enableSignInSettings:(BOOL)enable;
|
||||||
|
- (void)reportAuthStatus;
|
||||||
|
- (void)retrieveUserInfo;
|
||||||
|
@end
|
||||||
|
|
||||||
@implementation GooglePlusSampleSignInViewController
|
@implementation GooglePlusSampleSignInViewController
|
||||||
|
|
||||||
@synthesize signInButton = signInButton_;
|
@synthesize signInButton = signInButton_;
|
||||||
@synthesize signInAuthStatus = signInAuthStatus_;
|
@synthesize signInAuthStatus = signInAuthStatus_;
|
||||||
|
@synthesize signInDisplayName = signInDisplayName_;
|
||||||
@synthesize signOutButton = signOutButton_;
|
@synthesize signOutButton = signOutButton_;
|
||||||
|
@synthesize plusMomentsWriteScope = plusMomentsWriteScope_;
|
||||||
|
@synthesize userinfoEmailScope = userinfoEmailScope_;
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
[signInButton_ release];
|
[signInButton_ release];
|
||||||
[signInAuthStatus_ release];
|
[signInAuthStatus_ release];
|
||||||
|
[signInDisplayName_ release];
|
||||||
[signOutButton_ release];
|
[signOutButton_ release];
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - View lifecycle
|
#pragma mark - View lifecycle
|
||||||
|
|
||||||
- (void)reportAuthStatus {
|
|
||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
|
||||||
[[UIApplication sharedApplication] delegate];
|
|
||||||
if (appDelegate.auth) {
|
|
||||||
signInAuthStatus_.text = @"Status: Authenticated";
|
|
||||||
} else {
|
|
||||||
// To authenticate, use Google+ sign-in button.
|
|
||||||
signInAuthStatus_.text = @"Status: Not authenticated";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)viewDidLoad {
|
- (void)viewDidLoad {
|
||||||
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
|
plusMomentsWriteScope_.on = appDelegate.plusMomentsWriteScope;
|
||||||
|
userinfoEmailScope_.on = savedUserinfoEmailScopeState_;
|
||||||
|
|
||||||
// Set up sign-out button.
|
// Set up sign-out button.
|
||||||
[[signOutButton_ layer] setCornerRadius:5];
|
[[signOutButton_ layer] setCornerRadius:5];
|
||||||
[[signOutButton_ layer] setMasksToBounds:YES];
|
[[signOutButton_ layer] setMasksToBounds:YES];
|
||||||
@ -60,27 +74,28 @@
|
|||||||
|
|
||||||
// Set up sample view of Google+ sign-in.
|
// Set up sample view of Google+ sign-in.
|
||||||
signInButton_.delegate = self;
|
signInButton_.delegate = self;
|
||||||
|
signInButton_.shouldFetchGoogleUserEmail = userinfoEmailScope_.on;
|
||||||
signInButton_.clientID = [GooglePlusSampleAppDelegate clientID];
|
signInButton_.clientID = [GooglePlusSampleAppDelegate clientID];
|
||||||
signInButton_.scope = [NSArray arrayWithObjects:
|
[self setSignInScopes];
|
||||||
@"https://www.googleapis.com/auth/plus.moments.write",
|
|
||||||
@"https://www.googleapis.com/auth/plus.me",
|
|
||||||
nil];
|
|
||||||
|
|
||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
|
||||||
[[UIApplication sharedApplication] delegate];
|
|
||||||
appDelegate.signInButton = signInButton_;
|
appDelegate.signInButton = signInButton_;
|
||||||
[self reportAuthStatus];
|
[self reportAuthStatus];
|
||||||
[super viewDidLoad];
|
[super viewDidLoad];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)viewWillDisappear:(BOOL)animated {
|
||||||
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
|
appDelegate.plusMomentsWriteScope = plusMomentsWriteScope_.on;
|
||||||
|
savedUserinfoEmailScopeState_ = userinfoEmailScope_.on;
|
||||||
|
}
|
||||||
|
|
||||||
- (void)viewDidUnload {
|
- (void)viewDidUnload {
|
||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
[[UIApplication sharedApplication] delegate];
|
|
||||||
appDelegate.signInButton = nil;
|
appDelegate.signInButton = nil;
|
||||||
[super viewDidUnload];
|
[super viewDidUnload];
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - GooglePlusSignInDelegate
|
#pragma mark - GPPSignInDelegate
|
||||||
|
|
||||||
- (void)finishedWithAuth:(GTMOAuth2Authentication *)auth
|
- (void)finishedWithAuth:(GTMOAuth2Authentication *)auth
|
||||||
error:(NSError *)error {
|
error:(NSError *)error {
|
||||||
@ -89,22 +104,78 @@
|
|||||||
[NSString stringWithFormat:@"Status: Authentication error: %@", error];
|
[NSString stringWithFormat:@"Status: Authentication error: %@", error];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
[[UIApplication sharedApplication] delegate];
|
|
||||||
appDelegate.auth = auth;
|
appDelegate.auth = auth;
|
||||||
[self reportAuthStatus];
|
[self reportAuthStatus];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma mark - Helper methods
|
||||||
|
|
||||||
|
- (GooglePlusSampleAppDelegate *)appDelegate {
|
||||||
|
return (GooglePlusSampleAppDelegate *)
|
||||||
|
[[UIApplication sharedApplication] delegate];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)setSignInScopes {
|
||||||
|
signInButton_.scope = plusMomentsWriteScope_.on ?
|
||||||
|
[NSArray arrayWithObjects:
|
||||||
|
@"https://www.googleapis.com/auth/plus.moments.write",
|
||||||
|
@"https://www.googleapis.com/auth/plus.me",
|
||||||
|
nil] :
|
||||||
|
[NSArray arrayWithObjects:
|
||||||
|
@"https://www.googleapis.com/auth/plus.me",
|
||||||
|
nil];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)enableSignInSettings:(BOOL)enable {
|
||||||
|
plusMomentsWriteScope_.enabled = enable;
|
||||||
|
userinfoEmailScope_.enabled = enable && !plusMomentsWriteScope_.on;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)reportAuthStatus {
|
||||||
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
|
if (appDelegate.auth) {
|
||||||
|
signInAuthStatus_.text = @"Status: Authenticated";
|
||||||
|
[self retrieveUserInfo];
|
||||||
|
[self enableSignInSettings:NO];
|
||||||
|
} else {
|
||||||
|
// To authenticate, use Google+ sign-in button.
|
||||||
|
signInAuthStatus_.text = @"Status: Not authenticated";
|
||||||
|
[self enableSignInSettings:YES];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)retrieveUserInfo {
|
||||||
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
|
if (appDelegate.auth.userEmail) {
|
||||||
|
signInDisplayName_.text = appDelegate.auth.userEmail;
|
||||||
|
} else {
|
||||||
|
signInDisplayName_.text = @"";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - IBActions
|
#pragma mark - IBActions
|
||||||
|
|
||||||
- (IBAction)signOut:(id)sender {
|
- (IBAction)signOut:(id)sender {
|
||||||
[[signInButton_ googlePlusSignIn] signOut];
|
[[signInButton_ googlePlusSignIn] signOut];
|
||||||
|
|
||||||
GooglePlusSampleAppDelegate *appDelegate = (GooglePlusSampleAppDelegate *)
|
GooglePlusSampleAppDelegate *appDelegate = [self appDelegate];
|
||||||
[[UIApplication sharedApplication] delegate];
|
|
||||||
appDelegate.auth = nil;
|
appDelegate.auth = nil;
|
||||||
|
|
||||||
[self reportAuthStatus];
|
[self reportAuthStatus];
|
||||||
|
signInDisplayName_.text = @"";
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)plusMomentsWriteScopeToggle:(id)sender {
|
||||||
|
[self setSignInScopes];
|
||||||
|
userinfoEmailScope_.enabled = !plusMomentsWriteScope_.on;
|
||||||
|
if (plusMomentsWriteScope_.on) {
|
||||||
|
userinfoEmailScope_.on = NO;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)userinfoEmailScopeToggle:(id)sender {
|
||||||
|
signInButton_.shouldFetchGoogleUserEmail = userinfoEmailScope_.on;
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
|
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
|
||||||
<data>
|
<data>
|
||||||
<int key="IBDocument.SystemTarget">1280</int>
|
<int key="IBDocument.SystemTarget">1536</int>
|
||||||
<string key="IBDocument.SystemVersion">10K549</string>
|
<string key="IBDocument.SystemVersion">12C54</string>
|
||||||
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
|
<string key="IBDocument.InterfaceBuilderVersion">2843</string>
|
||||||
<string key="IBDocument.AppKitVersion">1038.36</string>
|
<string key="IBDocument.AppKitVersion">1187.34</string>
|
||||||
<string key="IBDocument.HIToolboxVersion">461.00</string>
|
<string key="IBDocument.HIToolboxVersion">625.00</string>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
||||||
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string key="NS.object.0">933</string>
|
<string key="NS.object.0">1929</string>
|
||||||
</object>
|
</object>
|
||||||
<array key="IBDocument.IntegratedClassDependencies">
|
<array key="IBDocument.IntegratedClassDependencies">
|
||||||
<string>IBUIButton</string>
|
|
||||||
<string>IBUIView</string>
|
|
||||||
<string>IBUILabel</string>
|
|
||||||
<string>IBProxyObject</string>
|
<string>IBProxyObject</string>
|
||||||
|
<string>IBUIButton</string>
|
||||||
|
<string>IBUILabel</string>
|
||||||
|
<string>IBUISwitch</string>
|
||||||
|
<string>IBUIView</string>
|
||||||
</array>
|
</array>
|
||||||
<array key="IBDocument.PluginDependencies">
|
<array key="IBDocument.PluginDependencies">
|
||||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
@ -39,7 +40,7 @@
|
|||||||
<object class="IBUIButton" id="306965198">
|
<object class="IBUIButton" id="306965198">
|
||||||
<reference key="NSNextResponder" ref="191373211"/>
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
<int key="NSvFlags">292</int>
|
<int key="NSvFlags">292</int>
|
||||||
<string key="NSFrame">{{19, 93}, {119, 35}}</string>
|
<string key="NSFrame">{{19, 218}, {119, 35}}</string>
|
||||||
<reference key="NSSuperview" ref="191373211"/>
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
<reference key="NSWindow"/>
|
<reference key="NSWindow"/>
|
||||||
<reference key="NSNextKeyView" ref="419255470"/>
|
<reference key="NSNextKeyView" ref="419255470"/>
|
||||||
@ -77,7 +78,7 @@
|
|||||||
<object class="IBUIView" id="984977003">
|
<object class="IBUIView" id="984977003">
|
||||||
<reference key="NSNextResponder" ref="191373211"/>
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
<int key="NSvFlags">292</int>
|
<int key="NSvFlags">292</int>
|
||||||
<string key="NSFrame">{{18, 34}, {118, 32}}</string>
|
<string key="NSFrame">{{18, 159}, {118, 32}}</string>
|
||||||
<reference key="NSSuperview" ref="191373211"/>
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
<reference key="NSWindow"/>
|
<reference key="NSWindow"/>
|
||||||
<reference key="NSNextKeyView" ref="306965198"/>
|
<reference key="NSNextKeyView" ref="306965198"/>
|
||||||
@ -93,33 +94,144 @@
|
|||||||
<object class="IBUILabel" id="419255470">
|
<object class="IBUILabel" id="419255470">
|
||||||
<reference key="NSNextResponder" ref="191373211"/>
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
<int key="NSvFlags">290</int>
|
<int key="NSvFlags">290</int>
|
||||||
<string key="NSFrame">{{20, 163}, {280, 21}}</string>
|
<string key="NSFrame">{{20, 288}, {280, 21}}</string>
|
||||||
<reference key="NSSuperview" ref="191373211"/>
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
<reference key="NSWindow"/>
|
<reference key="NSWindow"/>
|
||||||
<reference key="NSNextKeyView"/>
|
<reference key="NSNextKeyView" ref="534305484"/>
|
||||||
<bool key="IBUIOpaque">NO</bool>
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
<bool key="IBUIClipsSubviews">YES</bool>
|
<bool key="IBUIClipsSubviews">YES</bool>
|
||||||
<int key="IBUIContentMode">7</int>
|
<int key="IBUIContentMode">7</int>
|
||||||
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
||||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
<string key="IBUIText">Status:</string>
|
<string key="IBUIText">Status:</string>
|
||||||
<object class="NSColor" key="IBUITextColor">
|
<object class="NSColor" key="IBUITextColor" id="515161017">
|
||||||
<int key="NSColorSpace">1</int>
|
<int key="NSColorSpace">1</int>
|
||||||
<bytes key="NSRGB">MCAwIDAAA</bytes>
|
<bytes key="NSRGB">MCAwIDAAA</bytes>
|
||||||
|
<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
|
||||||
</object>
|
</object>
|
||||||
<nil key="IBUIHighlightedColor"/>
|
<nil key="IBUIHighlightedColor"/>
|
||||||
<int key="IBUIBaselineAdjustment">1</int>
|
<int key="IBUIBaselineAdjustment">1</int>
|
||||||
<float key="IBUIMinimumFontSize">13</float>
|
<float key="IBUIMinimumFontSize">13</float>
|
||||||
<object class="IBUIFontDescription" key="IBUIFontDescription">
|
<object class="IBUIFontDescription" key="IBUIFontDescription" id="136904364">
|
||||||
<int key="type">1</int>
|
<int key="type">1</int>
|
||||||
<double key="pointSize">17</double>
|
<double key="pointSize">17</double>
|
||||||
</object>
|
</object>
|
||||||
<object class="NSFont" key="IBUIFont">
|
<object class="NSFont" key="IBUIFont" id="445796440">
|
||||||
<string key="NSName">Helvetica</string>
|
<string key="NSName">Helvetica</string>
|
||||||
<double key="NSSize">17</double>
|
<double key="NSSize">17</double>
|
||||||
<int key="NSfFlags">16</int>
|
<int key="NSfFlags">16</int>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBUILabel" id="534305484">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">290</int>
|
||||||
|
<string key="NSFrame">{{20, 317}, {280, 21}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="11644204"/>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<bool key="IBUIClipsSubviews">YES</bool>
|
||||||
|
<int key="IBUIContentMode">7</int>
|
||||||
|
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<string key="IBUIText"/>
|
||||||
|
<reference key="IBUITextColor" ref="515161017"/>
|
||||||
|
<nil key="IBUIHighlightedColor"/>
|
||||||
|
<int key="IBUIBaselineAdjustment">1</int>
|
||||||
|
<float key="IBUIMinimumFontSize">13</float>
|
||||||
|
<reference key="IBUIFontDescription" ref="136904364"/>
|
||||||
|
<reference key="IBUIFont" ref="445796440"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBUISwitch" id="167649888">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{191, 99}, {94, 27}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="175024995"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||||
|
<int key="IBUIContentVerticalAlignment">0</int>
|
||||||
|
<bool key="IBUIOn">YES</bool>
|
||||||
|
</object>
|
||||||
|
<object class="IBUILabel" id="11644204">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{18, 20}, {273, 21}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="929313605"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<bool key="IBUIClipsSubviews">YES</bool>
|
||||||
|
<int key="IBUIContentMode">7</int>
|
||||||
|
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<string key="IBUIText">Scopes setting (sign out to change)</string>
|
||||||
|
<reference key="IBUITextColor" ref="515161017"/>
|
||||||
|
<nil key="IBUIHighlightedColor"/>
|
||||||
|
<int key="IBUIBaselineAdjustment">0</int>
|
||||||
|
<reference key="IBUIFontDescription" ref="136904364"/>
|
||||||
|
<reference key="IBUIFont" ref="445796440"/>
|
||||||
|
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
|
||||||
|
</object>
|
||||||
|
<object class="IBUILabel" id="929313605">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{20, 99}, {177, 27}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="167649888"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<bool key="IBUIClipsSubviews">YES</bool>
|
||||||
|
<int key="IBUIContentMode">7</int>
|
||||||
|
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<string key="IBUIText">plus.moments.write</string>
|
||||||
|
<reference key="IBUITextColor" ref="515161017"/>
|
||||||
|
<nil key="IBUIHighlightedColor"/>
|
||||||
|
<int key="IBUIBaselineAdjustment">0</int>
|
||||||
|
<reference key="IBUIFontDescription" ref="136904364"/>
|
||||||
|
<reference key="IBUIFont" ref="445796440"/>
|
||||||
|
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
|
||||||
|
</object>
|
||||||
|
<object class="IBUILabel" id="175024995">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{19, 58}, {178, 27}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<reference key="NSNextKeyView" ref="300876298"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<bool key="IBUIClipsSubviews">YES</bool>
|
||||||
|
<int key="IBUIContentMode">7</int>
|
||||||
|
<bool key="IBUIUserInteractionEnabled">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<string key="IBUIText">userinfo.email</string>
|
||||||
|
<reference key="IBUITextColor" ref="515161017"/>
|
||||||
|
<nil key="IBUIHighlightedColor"/>
|
||||||
|
<int key="IBUIBaselineAdjustment">0</int>
|
||||||
|
<reference key="IBUIFontDescription" ref="136904364"/>
|
||||||
|
<reference key="IBUIFont" ref="445796440"/>
|
||||||
|
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
|
||||||
|
</object>
|
||||||
|
<object class="IBUISwitch" id="300876298">
|
||||||
|
<reference key="NSNextResponder" ref="191373211"/>
|
||||||
|
<int key="NSvFlags">292</int>
|
||||||
|
<string key="NSFrame">{{191, 58}, {94, 27}}</string>
|
||||||
|
<reference key="NSSuperview" ref="191373211"/>
|
||||||
|
<reference key="NSWindow"/>
|
||||||
|
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||||
|
<bool key="IBUIOpaque">NO</bool>
|
||||||
|
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<bool key="IBUIEnabled">NO</bool>
|
||||||
|
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||||
|
<int key="IBUIContentVerticalAlignment">0</int>
|
||||||
|
</object>
|
||||||
</array>
|
</array>
|
||||||
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
|
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
|
||||||
<reference key="NSSuperview"/>
|
<reference key="NSSuperview"/>
|
||||||
@ -168,6 +280,30 @@
|
|||||||
</object>
|
</object>
|
||||||
<int key="connectionID">24</int>
|
<int key="connectionID">24</int>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">signInDisplayName</string>
|
||||||
|
<reference key="source" ref="372490531"/>
|
||||||
|
<reference key="destination" ref="534305484"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">28</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">plusMomentsWriteScope</string>
|
||||||
|
<reference key="source" ref="372490531"/>
|
||||||
|
<reference key="destination" ref="167649888"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">35</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||||
|
<string key="label">userinfoEmailScope</string>
|
||||||
|
<reference key="source" ref="372490531"/>
|
||||||
|
<reference key="destination" ref="300876298"/>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">39</int>
|
||||||
|
</object>
|
||||||
<object class="IBConnectionRecord">
|
<object class="IBConnectionRecord">
|
||||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||||
<string key="label">signOut:</string>
|
<string key="label">signOut:</string>
|
||||||
@ -177,6 +313,24 @@
|
|||||||
</object>
|
</object>
|
||||||
<int key="connectionID">26</int>
|
<int key="connectionID">26</int>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||||
|
<string key="label">plusMomentsWriteScopeToggle:</string>
|
||||||
|
<reference key="source" ref="167649888"/>
|
||||||
|
<reference key="destination" ref="372490531"/>
|
||||||
|
<int key="IBEventType">13</int>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">36</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBConnectionRecord">
|
||||||
|
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||||
|
<string key="label">userinfoEmailScopeToggle:</string>
|
||||||
|
<reference key="source" ref="300876298"/>
|
||||||
|
<reference key="destination" ref="372490531"/>
|
||||||
|
<int key="IBEventType">13</int>
|
||||||
|
</object>
|
||||||
|
<int key="connectionID">40</int>
|
||||||
|
</object>
|
||||||
</array>
|
</array>
|
||||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||||
<array key="orderedObjects">
|
<array key="orderedObjects">
|
||||||
@ -193,6 +347,12 @@
|
|||||||
<reference ref="306965198"/>
|
<reference ref="306965198"/>
|
||||||
<reference ref="984977003"/>
|
<reference ref="984977003"/>
|
||||||
<reference ref="419255470"/>
|
<reference ref="419255470"/>
|
||||||
|
<reference ref="167649888"/>
|
||||||
|
<reference ref="929313605"/>
|
||||||
|
<reference ref="300876298"/>
|
||||||
|
<reference ref="175024995"/>
|
||||||
|
<reference ref="11644204"/>
|
||||||
|
<reference ref="534305484"/>
|
||||||
</array>
|
</array>
|
||||||
<reference key="parent" ref="0"/>
|
<reference key="parent" ref="0"/>
|
||||||
</object>
|
</object>
|
||||||
@ -222,6 +382,36 @@
|
|||||||
<reference key="object" ref="419255470"/>
|
<reference key="object" ref="419255470"/>
|
||||||
<reference key="parent" ref="191373211"/>
|
<reference key="parent" ref="191373211"/>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">27</int>
|
||||||
|
<reference key="object" ref="534305484"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">29</int>
|
||||||
|
<reference key="object" ref="167649888"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">30</int>
|
||||||
|
<reference key="object" ref="11644204"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">34</int>
|
||||||
|
<reference key="object" ref="929313605"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">37</int>
|
||||||
|
<reference key="object" ref="175024995"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
|
<object class="IBObjectRecord">
|
||||||
|
<int key="objectID">38</int>
|
||||||
|
<reference key="object" ref="300876298"/>
|
||||||
|
<reference key="parent" ref="191373211"/>
|
||||||
|
</object>
|
||||||
</array>
|
</array>
|
||||||
</object>
|
</object>
|
||||||
<dictionary class="NSMutableDictionary" key="flattenedProperties">
|
<dictionary class="NSMutableDictionary" key="flattenedProperties">
|
||||||
@ -231,26 +421,108 @@
|
|||||||
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
|
<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
<real value="0.0" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
|
<real value="0.0" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
|
||||||
<string key="7.CustomClassName">GooglePlusSignInButton</string>
|
<string key="7.CustomClassName">GPPSignInButton</string>
|
||||||
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||||
</dictionary>
|
</dictionary>
|
||||||
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
|
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
|
||||||
<nil key="activeLocalization"/>
|
<nil key="activeLocalization"/>
|
||||||
<dictionary class="NSMutableDictionary" key="localizations"/>
|
<dictionary class="NSMutableDictionary" key="localizations"/>
|
||||||
<nil key="sourceID"/>
|
<nil key="sourceID"/>
|
||||||
<int key="maxID">26</int>
|
<int key="maxID">40</int>
|
||||||
|
</object>
|
||||||
|
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||||
|
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||||
|
<object class="IBPartialClassDescription">
|
||||||
|
<string key="className">GPPSignInButton</string>
|
||||||
|
<string key="superclassName">UIView</string>
|
||||||
|
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||||
|
<string key="majorKey">IBProjectSource</string>
|
||||||
|
<string key="minorKey">./Classes/GPPSignInButton.h</string>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="IBPartialClassDescription">
|
||||||
|
<string key="className">GooglePlusSampleSignInViewController</string>
|
||||||
|
<string key="superclassName">UIViewController</string>
|
||||||
|
<dictionary class="NSMutableDictionary" key="actions">
|
||||||
|
<string key="plusMomentsWriteScopeToggle:">id</string>
|
||||||
|
<string key="signOut:">id</string>
|
||||||
|
<string key="userinfoEmailScopeToggle:">id</string>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary class="NSMutableDictionary" key="actionInfosByName">
|
||||||
|
<object class="IBActionInfo" key="plusMomentsWriteScopeToggle:">
|
||||||
|
<string key="name">plusMomentsWriteScopeToggle:</string>
|
||||||
|
<string key="candidateClassName">id</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBActionInfo" key="signOut:">
|
||||||
|
<string key="name">signOut:</string>
|
||||||
|
<string key="candidateClassName">id</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBActionInfo" key="userinfoEmailScopeToggle:">
|
||||||
|
<string key="name">userinfoEmailScopeToggle:</string>
|
||||||
|
<string key="candidateClassName">id</string>
|
||||||
|
</object>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary class="NSMutableDictionary" key="outlets">
|
||||||
|
<string key="plusMomentsWriteScope">UISwitch</string>
|
||||||
|
<string key="signInAuthStatus">UILabel</string>
|
||||||
|
<string key="signInButton">GPPSignInButton</string>
|
||||||
|
<string key="signInDisplayName">UILabel</string>
|
||||||
|
<string key="signOutButton">UIButton</string>
|
||||||
|
<string key="userinfoEmailScope">UISwitch</string>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||||
|
<object class="IBToOneOutletInfo" key="plusMomentsWriteScope">
|
||||||
|
<string key="name">plusMomentsWriteScope</string>
|
||||||
|
<string key="candidateClassName">UISwitch</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo" key="signInAuthStatus">
|
||||||
|
<string key="name">signInAuthStatus</string>
|
||||||
|
<string key="candidateClassName">UILabel</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo" key="signInButton">
|
||||||
|
<string key="name">signInButton</string>
|
||||||
|
<string key="candidateClassName">GPPSignInButton</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo" key="signInDisplayName">
|
||||||
|
<string key="name">signInDisplayName</string>
|
||||||
|
<string key="candidateClassName">UILabel</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo" key="signOutButton">
|
||||||
|
<string key="name">signOutButton</string>
|
||||||
|
<string key="candidateClassName">UIButton</string>
|
||||||
|
</object>
|
||||||
|
<object class="IBToOneOutletInfo" key="userinfoEmailScope">
|
||||||
|
<string key="name">userinfoEmailScope</string>
|
||||||
|
<string key="candidateClassName">UISwitch</string>
|
||||||
|
</object>
|
||||||
|
</dictionary>
|
||||||
|
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||||
|
<string key="majorKey">IBProjectSource</string>
|
||||||
|
<string key="minorKey">./Classes/GooglePlusSampleSignInViewController.h</string>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</array>
|
||||||
</object>
|
</object>
|
||||||
<object class="IBClassDescriber" key="IBDocument.Classes"/>
|
|
||||||
<int key="IBDocument.localizationMode">0</int>
|
<int key="IBDocument.localizationMode">0</int>
|
||||||
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||||
|
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
|
||||||
|
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
||||||
|
<real value="1536" key="NS.object.0"/>
|
||||||
|
</object>
|
||||||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||||
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
|
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
|
||||||
<string key="NS.key.0">button_background.png</string>
|
<string key="NS.key.0">button_background.png</string>
|
||||||
<string key="NS.object.0">{1, 1}</string>
|
<string key="NS.object.0">{1, 1}</string>
|
||||||
</object>
|
</object>
|
||||||
<string key="IBCocoaTouchPluginVersion">933</string>
|
<string key="IBCocoaTouchPluginVersion">1929</string>
|
||||||
</data>
|
</data>
|
||||||
</archive>
|
</archive>
|
||||||
|
39
External/google-plus-ios-sdk/lib/GPPDeepLink.h
vendored
Normal file
39
External/google-plus-ios-sdk/lib/GPPDeepLink.h
vendored
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
//
|
||||||
|
// GPPDeepLink.h
|
||||||
|
// Google+ iOS SDK
|
||||||
|
//
|
||||||
|
// Copyright 2012 Google Inc.
|
||||||
|
//
|
||||||
|
// Usage of this SDK is subject to the Google+ Platform Terms of Service:
|
||||||
|
// https://developers.google.com/+/terms
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
@interface GPPDeepLink : NSObject
|
||||||
|
|
||||||
|
// Returns a |GPPDeepLink| for your app to handle, or |nil| if not found. The
|
||||||
|
// deep-link ID can be obtained from |GPPDeepLink|. It is stored when a user
|
||||||
|
// clicks a link to your app from a Google+ post, but hasn't yet installed your
|
||||||
|
// app. The user will be redirected to the App Store to install your app. This
|
||||||
|
// method should be called on or near your app launch to take the user to
|
||||||
|
// deep-link ID within your app.
|
||||||
|
+ (GPPDeepLink *)readDeepLinkAfterInstall;
|
||||||
|
|
||||||
|
// This method should be called from your |UIApplicationDelegate|'s
|
||||||
|
// |application:openURL:sourceApplication:annotation|. Returns
|
||||||
|
// |GooglePlusDeepLink| if |GooglePlusDeepLink| handled this URL, |nil|
|
||||||
|
// otherwise.
|
||||||
|
+ (GPPDeepLink *)handleURL:(NSURL *)url
|
||||||
|
sourceApplication:(NSString *)sourceApplication
|
||||||
|
annotation:(id)annotation;
|
||||||
|
|
||||||
|
// The deep-link ID in |GPPDeepLink| that was passed to the app.
|
||||||
|
- (NSString *)deepLinkID;
|
||||||
|
|
||||||
|
// This indicates where the user came from before arriving in your app. This is
|
||||||
|
// provided for you to collect engagement metrics. For the possible values,
|
||||||
|
// see our developer docs at http://developers.google.com/+/mobile/ios/.
|
||||||
|
- (NSString *)source;
|
||||||
|
|
||||||
|
@end
|
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// GooglePlusShare.h
|
// GPPShare.h
|
||||||
// Google+ iOS SDK
|
// Google+ iOS SDK
|
||||||
//
|
//
|
||||||
// Copyright 2012 Google Inc.
|
// Copyright 2012 Google Inc.
|
||||||
@ -15,14 +15,13 @@
|
|||||||
// client ID as "Installed application" with the type "iOS", and
|
// client ID as "Installed application" with the type "iOS", and
|
||||||
// register the bundle ID of your application.
|
// register the bundle ID of your application.
|
||||||
//
|
//
|
||||||
// 1. Initialize a GooglePlusShare instance with your registered client ID:
|
// 1. Initialize a GPPShare instance with your registered client ID:
|
||||||
//
|
//
|
||||||
// GooglePlusShare *googlePlusShare =
|
// GPPShare *gppShare = [[GPPShare alloc] initWithClientID:myClientID];
|
||||||
// [[GooglePlusShare alloc] initWithClientID:myClientID];
|
|
||||||
//
|
//
|
||||||
// 2. In the code where the share dialog is to be opened:
|
// 2. In the code where the share dialog is to be opened:
|
||||||
//
|
//
|
||||||
// [[googlePlusShare shareDialog] open];
|
// [[gppShare shareDialog] open];
|
||||||
//
|
//
|
||||||
// You may optionally call |setURLToShare:| and/or |setPrefillText:| before
|
// You may optionally call |setURLToShare:| and/or |setPrefillText:| before
|
||||||
// calling |open|, if there is a particular URL resource to be shared, or
|
// calling |open|, if there is a particular URL resource to be shared, or
|
||||||
@ -30,7 +29,7 @@
|
|||||||
//
|
//
|
||||||
// NSURL *urlToShare = [NSURL URLWithString:@"http://www.google.com/"];
|
// NSURL *urlToShare = [NSURL URLWithString:@"http://www.google.com/"];
|
||||||
// NSString *prefillText = @"You probably already know this site...";
|
// NSString *prefillText = @"You probably already know this site...";
|
||||||
// [[[[googlePlusShare shareDialog] setURLToShare:urlToShare]
|
// [[[[gppShare shareDialog] setURLToShare:urlToShare]
|
||||||
// setPrefillText:prefillText] open];
|
// setPrefillText:prefillText] open];
|
||||||
//
|
//
|
||||||
// 3. In the 'YourApp-info.plist' settings for your application, add a URL
|
// 3. In the 'YourApp-info.plist' settings for your application, add a URL
|
||||||
@ -42,30 +41,30 @@
|
|||||||
// openURL:(NSURL *)url
|
// openURL:(NSURL *)url
|
||||||
// sourceApplication:(NSString*)sourceApplication
|
// sourceApplication:(NSString*)sourceApplication
|
||||||
// annotation:(id)annotation {
|
// annotation:(id)annotation {
|
||||||
// if ([googlePlusShare handleURL:url
|
// if ([gppShare handleURL:url
|
||||||
// sourceApplication:sourceApplication
|
// sourceApplication:sourceApplication
|
||||||
// annotation:annotation]) {
|
// annotation:annotation]) {
|
||||||
// return YES;
|
// return YES;
|
||||||
// }
|
// }
|
||||||
// // Other handling code here...
|
// // Other handling code here...
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// 5. Optionally, if you want to be notified of the result of the share action,
|
// 5. Optionally, if you want to be notified of the result of the share action,
|
||||||
// have a delegate class implement |GooglePlusShareDelegate|, e.g.
|
// have a delegate class implement |GPPShareDelegate|, e.g.
|
||||||
//
|
//
|
||||||
// @interface MyDelegateClass : NSObject<GooglePlusShareDelegate>;
|
// @interface MyDelegateClass : NSObject<GPPShareDelegate>;
|
||||||
//
|
//
|
||||||
// - (void)finishedSharing:(BOOL)shared {
|
// - (void)finishedSharing:(BOOL)shared {
|
||||||
// // The share action was successful if |shared| is YES.
|
// // The share action was successful if |shared| is YES.
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// MyDelegateClass *myDelegate = [[MyDelegateClass alloc] init];
|
// MyDelegateClass *myDelegate = [[MyDelegateClass alloc] init];
|
||||||
// googlePlusShare.delegate = myDelegate;
|
// gppShare.delegate = myDelegate;
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
// Protocol to receive the result of the share action.
|
// Protocol to receive the result of the share action.
|
||||||
@protocol GooglePlusShareDelegate
|
@protocol GPPShareDelegate
|
||||||
|
|
||||||
// Reports the status of the share action, |shared| is |YES| if user has
|
// Reports the status of the share action, |shared| is |YES| if user has
|
||||||
// successfully shared her post, |NO| otherwise, e.g. user canceled the post.
|
// successfully shared her post, |NO| otherwise, e.g. user canceled the post.
|
||||||
@ -74,24 +73,38 @@
|
|||||||
@end
|
@end
|
||||||
|
|
||||||
// The builder protocol to open the share dialog.
|
// The builder protocol to open the share dialog.
|
||||||
@protocol GooglePlusShareBuilder<NSCopying>
|
@protocol GPPShareBuilder<NSCopying>
|
||||||
|
|
||||||
// Sets the URL resource to be shared.
|
// Sets the URL resource to be shared.
|
||||||
- (id<GooglePlusShareBuilder>)setURLToShare:(NSURL *)urlToShare;
|
- (id<GPPShareBuilder>)setURLToShare:(NSURL *)urlToShare;
|
||||||
|
|
||||||
// Sets the text to prefill user comment in the share dialog.
|
// Sets the text to prefill user comment in the share dialog.
|
||||||
- (id<GooglePlusShareBuilder>)setPrefillText:(NSString *)prefillText;
|
- (id<GPPShareBuilder>)setPrefillText:(NSString *)prefillText;
|
||||||
|
|
||||||
// Opens the share dialog.
|
// Sets the title, description, and thumbnail URL of the shared content preview
|
||||||
- (void)open;
|
// in the share dialog. Only set these fields if you are sharing with a content
|
||||||
|
// deep link and don't have a URL resource. Title and description are required
|
||||||
|
// fields.
|
||||||
|
- (id<GPPShareBuilder>)setTitle:(NSString *)title
|
||||||
|
description:(NSString *)description
|
||||||
|
thumbnailURL:(NSURL *)thumbnailURL;
|
||||||
|
|
||||||
|
// Sets the content deep-link ID that takes the user straight to your shared
|
||||||
|
// content. Only set this field if you want the content deep-linking feature.
|
||||||
|
// The content deep-link ID can either be a fully qualified URI, or URI path,
|
||||||
|
// which can be up to 64 characters in length.
|
||||||
|
- (id<GPPShareBuilder>)setContentDeepLinkID:(NSString *)contentDeepLinkID;
|
||||||
|
|
||||||
|
// Opens the share dialog. Returns |NO| if there was an error, |YES| otherwise.
|
||||||
|
- (BOOL)open;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
// The primary class for the share action on Google+.
|
// The primary class for the share action on Google+.
|
||||||
@interface GooglePlusShare : NSObject
|
@interface GPPShare : NSObject
|
||||||
|
|
||||||
// The object to be notified when the share action has finished.
|
// The object to be notified when the share action has finished.
|
||||||
@property (nonatomic, assign) id<GooglePlusShareDelegate> delegate;
|
@property (nonatomic, assign) id<GPPShareDelegate> delegate;
|
||||||
|
|
||||||
// All Google+ objects must be initialized with a client ID registered
|
// All Google+ objects must be initialized with a client ID registered
|
||||||
// in the Google APIs console, https://code.google.com/apis/console/
|
// in the Google APIs console, https://code.google.com/apis/console/
|
||||||
@ -100,11 +113,11 @@
|
|||||||
|
|
||||||
// Returns a share dialog builder instance. Call its |open| method to
|
// Returns a share dialog builder instance. Call its |open| method to
|
||||||
// create the dialog after setting the parameters as needed.
|
// create the dialog after setting the parameters as needed.
|
||||||
- (id<GooglePlusShareBuilder>)shareDialog;
|
- (id<GPPShareBuilder>)shareDialog;
|
||||||
|
|
||||||
// This method should be called from your |UIApplicationDelegate|'s
|
// This method should be called from your |UIApplicationDelegate|'s
|
||||||
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
||||||
// |GooglePlusShare| handled this URL.
|
// |GPPShare| handled this URL.
|
||||||
- (BOOL)handleURL:(NSURL *)url
|
- (BOOL)handleURL:(NSURL *)url
|
||||||
sourceApplication:(NSString *)sourceApplication
|
sourceApplication:(NSString *)sourceApplication
|
||||||
annotation:(id)annotation;
|
annotation:(id)annotation;
|
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// GooglePlusSignIn.h
|
// GPPSignIn.h
|
||||||
// Google+ iOS SDK
|
// Google+ iOS SDK
|
||||||
//
|
//
|
||||||
// Copyright 2012 Google Inc.
|
// Copyright 2012 Google Inc.
|
||||||
@ -13,10 +13,10 @@
|
|||||||
@class GTMOAuth2Authentication;
|
@class GTMOAuth2Authentication;
|
||||||
@class GTMOAuth2ViewControllerTouch;
|
@class GTMOAuth2ViewControllerTouch;
|
||||||
|
|
||||||
// Protocol implemented by the client of GooglePlusSignIn to receive a refresh
|
// Protocol implemented by the client of GPPSignIn to receive a refresh
|
||||||
// token or an error. It is up to the client to present the OAuth 2.0 view
|
// token or an error. It is up to the client to present the OAuth 2.0 view
|
||||||
// controller if single sign-on is disabled via |attemptSSO| in |authenticate|.
|
// controller if single sign-on is disabled via |attemptSSO| in |authenticate|.
|
||||||
@protocol GooglePlusSignInDelegate
|
@protocol GPPSignInDelegate
|
||||||
|
|
||||||
// Authorization has finished and is successful if |error| is |nil|.
|
// Authorization has finished and is successful if |error| is |nil|.
|
||||||
- (void)finishedWithAuth:(GTMOAuth2Authentication *)auth
|
- (void)finishedWithAuth:(GTMOAuth2Authentication *)auth
|
||||||
@ -24,11 +24,11 @@
|
|||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
// |GooglePlusSignIn| signs the user in with Google+. It provides single sign-on
|
// |GPPSignIn| signs the user in with Google+. It provides single sign-on
|
||||||
// via the Google+ app, if installed, or Mobile Safari.
|
// via the Google+ app, if installed, or Mobile Safari.
|
||||||
// Here is sample code to use GooglePlusSignIn:
|
// Here is sample code to use GPPSignIn:
|
||||||
// 1) GooglePlusSignIn *signIn =
|
// 1) GPPSignIn *signIn =
|
||||||
// [[GooglePlusSignIn alloc] initForClientID:clientID
|
// [[GPPSignIn alloc] initForClientID:clientID
|
||||||
// language:@"en"
|
// language:@"en"
|
||||||
// scope:@"https://www.googleapis.com/auth/plus.me"
|
// scope:@"https://www.googleapis.com/auth/plus.me"
|
||||||
// keychainName:nil];
|
// keychainName:nil];
|
||||||
@ -36,10 +36,14 @@
|
|||||||
// 2) Setup delegate methods |finishedWithAuth|, etc.
|
// 2) Setup delegate methods |finishedWithAuth|, etc.
|
||||||
// 3) Call |handleURL| from |application:openUrl:...| in your app delegate.
|
// 3) Call |handleURL| from |application:openUrl:...| in your app delegate.
|
||||||
// 4) [auth authenticate:YES];
|
// 4) [auth authenticate:YES];
|
||||||
@interface GooglePlusSignIn : NSObject
|
@interface GPPSignIn : NSObject
|
||||||
|
|
||||||
// The object to be notified when authentication is finished.
|
// The object to be notified when authentication is finished.
|
||||||
@property (nonatomic, assign) id<GooglePlusSignInDelegate> delegate;
|
@property (nonatomic, assign) id<GPPSignInDelegate> delegate;
|
||||||
|
|
||||||
|
// Whether or not to fetch user email after signing in. The email is saved in
|
||||||
|
// the |GTMOAuth2Authentication| object.
|
||||||
|
@property (nonatomic, assign) BOOL shouldFetchGoogleUserEmail;
|
||||||
|
|
||||||
// Initializes with your |clientID| from the Google APIs console. Set |scope| to
|
// Initializes with your |clientID| from the Google APIs console. Set |scope| to
|
||||||
// an array of your API scopes. Set |keychainName| to |nil| to use the default
|
// an array of your API scopes. Set |keychainName| to |nil| to use the default
|
||||||
@ -56,7 +60,7 @@
|
|||||||
|
|
||||||
// This method should be called from your |UIApplicationDelegate|'s
|
// This method should be called from your |UIApplicationDelegate|'s
|
||||||
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
||||||
// |GooglePlusSignIn| handled this URL.
|
// |GPPSignIn| handled this URL.
|
||||||
- (BOOL)handleURL:(NSURL *)url
|
- (BOOL)handleURL:(NSURL *)url
|
||||||
sourceApplication:(NSString *)sourceApplication
|
sourceApplication:(NSString *)sourceApplication
|
||||||
annotation:(id)annotation;
|
annotation:(id)annotation;
|
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// GooglePlusSignInButton.h
|
// GPPSignInButton.h
|
||||||
// Google+ iOS SDK
|
// Google+ iOS SDK
|
||||||
//
|
//
|
||||||
// Copyright 2012 Google Inc.
|
// Copyright 2012 Google Inc.
|
||||||
@ -10,41 +10,45 @@
|
|||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
@class GooglePlusSignIn;
|
@class GPPSignIn;
|
||||||
@protocol GooglePlusSignInDelegate;
|
@protocol GPPSignInDelegate;
|
||||||
|
|
||||||
// The various visual styles supported by the GooglePlusSignInButton.
|
// The various visual styles supported by the GPPSignInButton.
|
||||||
typedef enum {
|
typedef enum {
|
||||||
kGooglePlusSignInButtonStyleNormal,
|
kGPPSignInButtonStyleNormal,
|
||||||
kGooglePlusSignInButtonStyleWide
|
kGPPSignInButtonStyleWide
|
||||||
} GooglePlusSignInButtonStyle;
|
} GPPSignInButtonStyle;
|
||||||
|
|
||||||
// A view that displays the Google+ sign-in button. You can instantiate this
|
// A view that displays the Google+ sign-in button. You can instantiate this
|
||||||
// class programmatically or from a NIB file. Once instantiated, you should
|
// class programmatically or from a NIB file. Once instantiated, you should
|
||||||
// set the client ID and delegate properties and add this view to your own view
|
// set the client ID and delegate properties and add this view to your own view
|
||||||
// hierarchy.
|
// hierarchy.
|
||||||
@interface GooglePlusSignInButton : UIView
|
@interface GPPSignInButton : UIView
|
||||||
|
|
||||||
// The OAuth 2.0 client ID of the application.
|
// The OAuth 2.0 client ID of the application.
|
||||||
@property(nonatomic, copy) NSString *clientID;
|
@property(nonatomic, copy) NSString *clientID;
|
||||||
|
|
||||||
// See GooglePlusSignIn.h for details on this delegate.
|
// See GPPSignIn.h for details on this delegate.
|
||||||
@property(nonatomic, assign) id<GooglePlusSignInDelegate> delegate;
|
@property(nonatomic, assign) id<GPPSignInDelegate> delegate;
|
||||||
|
|
||||||
// Actually does the work of signing in with Google+.
|
// Actually does the work of signing in with Google+.
|
||||||
@property(nonatomic, readonly) GooglePlusSignIn *googlePlusSignIn;
|
@property(nonatomic, readonly) GPPSignIn *googlePlusSignIn;
|
||||||
|
|
||||||
// The OAuth 2.0 scopes for the APIs that you are using. This is used to fetch
|
// The OAuth 2.0 scopes for the APIs that you are using. This is used to fetch
|
||||||
// an OAuth 2.0 token. By default, this is set to the
|
// an OAuth 2.0 token. By default, this is set to the
|
||||||
// https://www.googleapis.com/auth/plus.me scope.
|
// https://www.googleapis.com/auth/plus.me scope.
|
||||||
@property(nonatomic, copy) NSArray *scope;
|
@property(nonatomic, copy) NSArray *scope;
|
||||||
|
|
||||||
|
// Whether or not to fetch user email after signing in. The email is saved in
|
||||||
|
// the |GTMOAuth2Authentication| object.
|
||||||
|
@property (nonatomic, assign) BOOL shouldFetchGoogleUserEmail;
|
||||||
|
|
||||||
// Sets the sign-in button. The default style is normal.
|
// Sets the sign-in button. The default style is normal.
|
||||||
- (void)setStyle:(GooglePlusSignInButtonStyle)style;
|
- (void)setStyle:(GPPSignInButtonStyle)style;
|
||||||
|
|
||||||
// This method should be called from your |UIApplicationDelegate|'s
|
// This method should be called from your |UIApplicationDelegate|'s
|
||||||
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
// |application:openURL:sourceApplication:annotation|. Returns |YES| if
|
||||||
// |GooglePlusSignInButton| handled this URL.
|
// |GPPSignInButton| handled this URL.
|
||||||
- (BOOL)handleURL:(NSURL *)url
|
- (BOOL)handleURL:(NSURL *)url
|
||||||
sourceApplication:(NSString *)sourceApplication
|
sourceApplication:(NSString *)sourceApplication
|
||||||
annotation:(id)annotation;
|
annotation:(id)annotation;
|
BIN
External/google-plus-ios-sdk/lib/libGooglePlus.a
vendored
BIN
External/google-plus-ios-sdk/lib/libGooglePlus.a
vendored
Binary file not shown.
Binary file not shown.
8
Google+/Google+.plist
Normal file
8
Google+/Google+.plist
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>ClientID</key>
|
||||||
|
<string></string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
@ -55,39 +55,7 @@
|
|||||||
DA46826F15AB843200FB09E7 /* tip_basic_black_bottom_right.png in Resources */ = {isa = PBXBuildFile; fileRef = DA46826D15AB843200FB09E7 /* tip_basic_black_bottom_right.png */; };
|
DA46826F15AB843200FB09E7 /* tip_basic_black_bottom_right.png in Resources */ = {isa = PBXBuildFile; fileRef = DA46826D15AB843200FB09E7 /* tip_basic_black_bottom_right.png */; };
|
||||||
DA46827015AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA46826E15AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png */; };
|
DA46827015AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA46826E15AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png */; };
|
||||||
DA497B9815E8C90E00B52167 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
|
DA497B9815E8C90E00B52167 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
|
||||||
DA497BED15E8C94300B52167 /* GTLBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BA915E8C94300B52167 /* GTLBase64.m */; };
|
|
||||||
DA497BEE15E8C94300B52167 /* GTLBatchQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BAB15E8C94300B52167 /* GTLBatchQuery.m */; };
|
|
||||||
DA497BEF15E8C94300B52167 /* GTLBatchResult.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BAD15E8C94300B52167 /* GTLBatchResult.m */; };
|
|
||||||
DA497BF015E8C94300B52167 /* GTLDateTime.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BAF15E8C94300B52167 /* GTLDateTime.m */; };
|
|
||||||
DA497BF115E8C94300B52167 /* GTLErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BB215E8C94300B52167 /* GTLErrorObject.m */; };
|
|
||||||
DA497BF215E8C94300B52167 /* GTLFramework.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BB415E8C94300B52167 /* GTLFramework.m */; };
|
|
||||||
DA497BF315E8C94300B52167 /* GTLJSONParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BB615E8C94300B52167 /* GTLJSONParser.m */; };
|
|
||||||
DA497BF415E8C94300B52167 /* GTLObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BB815E8C94300B52167 /* GTLObject.m */; };
|
|
||||||
DA497BF515E8C94300B52167 /* GTLPlusConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BBC15E8C94300B52167 /* GTLPlusConstants.m */; };
|
|
||||||
DA497BF615E8C94300B52167 /* GTLPlusItemScope.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BBE15E8C94300B52167 /* GTLPlusItemScope.m */; };
|
|
||||||
DA497BF715E8C94300B52167 /* GTLPlusMoment.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BC015E8C94300B52167 /* GTLPlusMoment.m */; };
|
|
||||||
DA497BF815E8C94300B52167 /* GTLPlusPerson.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BC215E8C94300B52167 /* GTLPlusPerson.m */; };
|
|
||||||
DA497BF915E8C94300B52167 /* GTLQueryPlus.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BC415E8C94300B52167 /* GTLQueryPlus.m */; };
|
|
||||||
DA497BFA15E8C94300B52167 /* GTLServicePlus.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BC615E8C94300B52167 /* GTLServicePlus.m */; };
|
|
||||||
DA497BFB15E8C94300B52167 /* GTLQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BC815E8C94300B52167 /* GTLQuery.m */; };
|
|
||||||
DA497BFC15E8C94300B52167 /* GTLRuntimeCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BCA15E8C94300B52167 /* GTLRuntimeCommon.m */; };
|
|
||||||
DA497BFD15E8C94300B52167 /* GTLService.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BCC15E8C94300B52167 /* GTLService.m */; };
|
|
||||||
DA497BFE15E8C94300B52167 /* GTLUploadParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BCF15E8C94300B52167 /* GTLUploadParameters.m */; };
|
|
||||||
DA497BFF15E8C94300B52167 /* GTLUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BD115E8C94300B52167 /* GTLUtilities.m */; };
|
|
||||||
DA497C0015E8C94300B52167 /* GTMHTTPFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BD515E8C94300B52167 /* GTMHTTPFetcher.m */; };
|
|
||||||
DA497C0115E8C94300B52167 /* GTMHTTPFetcherLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BD715E8C94300B52167 /* GTMHTTPFetcherLogging.m */; };
|
|
||||||
DA497C0215E8C94300B52167 /* GTMHTTPFetcherService.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BD915E8C94300B52167 /* GTMHTTPFetcherService.m */; };
|
|
||||||
DA497C0315E8C94300B52167 /* GTMHTTPFetchHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BDB15E8C94300B52167 /* GTMHTTPFetchHistory.m */; };
|
|
||||||
DA497C0415E8C94300B52167 /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BDD15E8C94300B52167 /* GTMLogger.m */; };
|
|
||||||
DA497C0515E8C94300B52167 /* GTMMethodCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BDF15E8C94300B52167 /* GTMMethodCheck.m */; };
|
|
||||||
DA497C0615E8C94300B52167 /* GTMNSDictionary+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BE115E8C94300B52167 /* GTMNSDictionary+URLArguments.m */; };
|
|
||||||
DA497C0715E8C94300B52167 /* GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BE315E8C94300B52167 /* GTMNSString+URLArguments.m */; };
|
|
||||||
DA497C0815E8C94300B52167 /* GTMOAuth2Authentication.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BE515E8C94300B52167 /* GTMOAuth2Authentication.m */; };
|
|
||||||
DA497C0915E8C94300B52167 /* GTMOAuth2SignIn.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BE715E8C94300B52167 /* GTMOAuth2SignIn.m */; };
|
|
||||||
DA497C0A15E8C94300B52167 /* GTMOAuth2ViewControllerTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BE915E8C94300B52167 /* GTMOAuth2ViewControllerTouch.m */; };
|
|
||||||
DA497C0B15E8C94300B52167 /* GTMObjC2Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = DA497BEC15E8C94300B52167 /* GTMObjC2Runtime.m */; };
|
|
||||||
DA497C0C15E8C95700B52167 /* libGoogle+.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA497B9715E8C90E00B52167 /* libGoogle+.a */; };
|
DA497C0C15E8C95700B52167 /* libGoogle+.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA497B9715E8C90E00B52167 /* libGoogle+.a */; };
|
||||||
DA497C0F15E8C9CF00B52167 /* libGooglePlusUniversal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5587FC15E8B7B200860B4F /* libGooglePlusUniversal.a */; };
|
|
||||||
DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
|
DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
|
||||||
DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
|
DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
|
||||||
DA4DA1DB1564475E00F6F596 /* libscryptenc-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA79A9BB1557DB6F00BAA07A /* libscryptenc-ios.a */; };
|
DA4DA1DB1564475E00F6F596 /* libscryptenc-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA79A9BB1557DB6F00BAA07A /* libscryptenc-ios.a */; };
|
||||||
@ -102,14 +70,6 @@
|
|||||||
DA5587F015E83C3200860B4F /* social-twitter@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587EA15E83C3200860B4F /* social-twitter@2x.png */; };
|
DA5587F015E83C3200860B4F /* social-twitter@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587EA15E83C3200860B4F /* social-twitter@2x.png */; };
|
||||||
DA5587F415E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587F115E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png */; };
|
DA5587F415E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587F115E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png */; };
|
||||||
DA5587F615E8418200860B4F /* iTunesArtwork-Rounded.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587F315E8418200860B4F /* iTunesArtwork-Rounded.png */; };
|
DA5587F615E8418200860B4F /* iTunesArtwork-Rounded.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5587F315E8418200860B4F /* iTunesArtwork-Rounded.png */; };
|
||||||
DA55888415E8C0BA00860B4F /* google_plus_share.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55887C15E8C0BA00860B4F /* google_plus_share.png */; };
|
|
||||||
DA55888515E8C0BA00860B4F /* google_plus_share@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55887D15E8C0BA00860B4F /* google_plus_share@2x.png */; };
|
|
||||||
DA55888615E8C0BA00860B4F /* google_plus_share_large.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55887E15E8C0BA00860B4F /* google_plus_share_large.png */; };
|
|
||||||
DA55888715E8C0BA00860B4F /* google_plus_share_large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55887F15E8C0BA00860B4F /* google_plus_share_large@2x.png */; };
|
|
||||||
DA55888815E8C0BA00860B4F /* google_plus_sign_in.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55888015E8C0BA00860B4F /* google_plus_sign_in.png */; };
|
|
||||||
DA55888915E8C0BA00860B4F /* google_plus_sign_in@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55888115E8C0BA00860B4F /* google_plus_sign_in@2x.png */; };
|
|
||||||
DA55888A15E8C0BA00860B4F /* google_plus_sign_in_wide.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55888215E8C0BA00860B4F /* google_plus_sign_in_wide.png */; };
|
|
||||||
DA55888B15E8C0BA00860B4F /* google_plus_sign_in_wide@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA55888315E8C0BA00860B4F /* google_plus_sign_in_wide@2x.png */; };
|
|
||||||
DA5BFA49147E415C00F98B1E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA48147E415C00F98B1E /* UIKit.framework */; };
|
DA5BFA49147E415C00F98B1E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA48147E415C00F98B1E /* UIKit.framework */; };
|
||||||
DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
|
DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
|
||||||
DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */; };
|
DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */; };
|
||||||
@ -134,6 +94,39 @@
|
|||||||
DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DF16406BB400B61001 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; };
|
DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DF16406BB400B61001 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; };
|
||||||
DA672D2F14F92C6B004A189C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DA672D2E14F92C6B004A189C /* libz.dylib */; };
|
DA672D2F14F92C6B004A189C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DA672D2E14F92C6B004A189C /* libz.dylib */; };
|
||||||
DA672D3014F9413D004A189C /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; };
|
DA672D3014F9413D004A189C /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; };
|
||||||
|
DA692D9E16BB057500F14463 /* libGooglePlus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA692D5716BB057500F14463 /* libGooglePlus.a */; };
|
||||||
|
DA692D9F16BB057500F14463 /* libGooglePlusUniversal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA692D5816BB057500F14463 /* libGooglePlusUniversal.a */; };
|
||||||
|
DA692DA016BB057500F14463 /* GTLBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D5C16BB057500F14463 /* GTLBase64.m */; };
|
||||||
|
DA692DA116BB057500F14463 /* GTLBatchQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D5E16BB057500F14463 /* GTLBatchQuery.m */; };
|
||||||
|
DA692DA216BB057500F14463 /* GTLBatchResult.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6016BB057500F14463 /* GTLBatchResult.m */; };
|
||||||
|
DA692DA316BB057500F14463 /* GTLDateTime.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6216BB057500F14463 /* GTLDateTime.m */; };
|
||||||
|
DA692DA416BB057500F14463 /* GTLErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6516BB057500F14463 /* GTLErrorObject.m */; };
|
||||||
|
DA692DA516BB057500F14463 /* GTLFramework.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6716BB057500F14463 /* GTLFramework.m */; };
|
||||||
|
DA692DA616BB057500F14463 /* GTLJSONParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6916BB057500F14463 /* GTLJSONParser.m */; };
|
||||||
|
DA692DA716BB057500F14463 /* GTLObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6B16BB057500F14463 /* GTLObject.m */; };
|
||||||
|
DA692DA816BB057500F14463 /* GTLPlusConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D6F16BB057500F14463 /* GTLPlusConstants.m */; };
|
||||||
|
DA692DA916BB057500F14463 /* GTLPlusItemScope.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7116BB057500F14463 /* GTLPlusItemScope.m */; };
|
||||||
|
DA692DAA16BB057500F14463 /* GTLPlusMoment.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7316BB057500F14463 /* GTLPlusMoment.m */; };
|
||||||
|
DA692DAB16BB057500F14463 /* GTLQueryPlus.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7516BB057500F14463 /* GTLQueryPlus.m */; };
|
||||||
|
DA692DAC16BB057500F14463 /* GTLServicePlus.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7716BB057500F14463 /* GTLServicePlus.m */; };
|
||||||
|
DA692DAD16BB057500F14463 /* GTLQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7916BB057500F14463 /* GTLQuery.m */; };
|
||||||
|
DA692DAE16BB057500F14463 /* GTLRuntimeCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7B16BB057500F14463 /* GTLRuntimeCommon.m */; };
|
||||||
|
DA692DAF16BB057500F14463 /* GTLService.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D7D16BB057500F14463 /* GTLService.m */; };
|
||||||
|
DA692DB016BB057500F14463 /* GTLUploadParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8016BB057500F14463 /* GTLUploadParameters.m */; };
|
||||||
|
DA692DB116BB057500F14463 /* GTLUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8216BB057500F14463 /* GTLUtilities.m */; };
|
||||||
|
DA692DB216BB057500F14463 /* GTMHTTPFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8616BB057500F14463 /* GTMHTTPFetcher.m */; };
|
||||||
|
DA692DB316BB057500F14463 /* GTMHTTPFetcherLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8816BB057500F14463 /* GTMHTTPFetcherLogging.m */; };
|
||||||
|
DA692DB416BB057500F14463 /* GTMHTTPFetcherService.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8A16BB057500F14463 /* GTMHTTPFetcherService.m */; };
|
||||||
|
DA692DB516BB057500F14463 /* GTMHTTPFetchHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8C16BB057500F14463 /* GTMHTTPFetchHistory.m */; };
|
||||||
|
DA692DB616BB057500F14463 /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D8E16BB057500F14463 /* GTMLogger.m */; };
|
||||||
|
DA692DB716BB057500F14463 /* GTMMethodCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9016BB057500F14463 /* GTMMethodCheck.m */; };
|
||||||
|
DA692DB816BB057500F14463 /* GTMNSDictionary+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9216BB057500F14463 /* GTMNSDictionary+URLArguments.m */; };
|
||||||
|
DA692DB916BB057500F14463 /* GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9416BB057500F14463 /* GTMNSString+URLArguments.m */; };
|
||||||
|
DA692DBA16BB057500F14463 /* GTMOAuth2Authentication.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9616BB057500F14463 /* GTMOAuth2Authentication.m */; };
|
||||||
|
DA692DBB16BB057500F14463 /* GTMOAuth2SignIn.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9816BB057500F14463 /* GTMOAuth2SignIn.m */; };
|
||||||
|
DA692DBC16BB057500F14463 /* GTMOAuth2ViewControllerTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9A16BB057500F14463 /* GTMOAuth2ViewControllerTouch.m */; };
|
||||||
|
DA692DBD16BB057500F14463 /* GTMObjC2Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = DA692D9D16BB057500F14463 /* GTMObjC2Runtime.m */; };
|
||||||
|
DA692DBF16BB191100F14463 /* Google+.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA692DBE16BB191100F14463 /* Google+.plist */; };
|
||||||
DA81253516B8546A00F4732F /* MPElementEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253416B8546A00F4732F /* MPElementEntity.m */; };
|
DA81253516B8546A00F4732F /* MPElementEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253416B8546A00F4732F /* MPElementEntity.m */; };
|
||||||
DA81253816B8546B00F4732F /* MPElementStoredEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253716B8546B00F4732F /* MPElementStoredEntity.m */; };
|
DA81253816B8546B00F4732F /* MPElementStoredEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253716B8546B00F4732F /* MPElementStoredEntity.m */; };
|
||||||
DA81253B16B8546B00F4732F /* MPUserEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253A16B8546B00F4732F /* MPUserEntity.m */; };
|
DA81253B16B8546B00F4732F /* MPUserEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81253A16B8546B00F4732F /* MPUserEntity.m */; };
|
||||||
@ -1043,74 +1036,6 @@
|
|||||||
DA46826D15AB843200FB09E7 /* tip_basic_black_bottom_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip_basic_black_bottom_right.png; sourceTree = "<group>"; };
|
DA46826D15AB843200FB09E7 /* tip_basic_black_bottom_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip_basic_black_bottom_right.png; sourceTree = "<group>"; };
|
||||||
DA46826E15AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tip_basic_black_bottom_right@2x.png"; sourceTree = "<group>"; };
|
DA46826E15AB843200FB09E7 /* tip_basic_black_bottom_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tip_basic_black_bottom_right@2x.png"; sourceTree = "<group>"; };
|
||||||
DA497B9715E8C90E00B52167 /* libGoogle+.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libGoogle+.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
DA497B9715E8C90E00B52167 /* libGoogle+.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libGoogle+.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
DA497BA815E8C94300B52167 /* GTLBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBase64.h; sourceTree = "<group>"; };
|
|
||||||
DA497BA915E8C94300B52167 /* GTLBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBase64.m; sourceTree = "<group>"; };
|
|
||||||
DA497BAA15E8C94300B52167 /* GTLBatchQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBatchQuery.h; sourceTree = "<group>"; };
|
|
||||||
DA497BAB15E8C94300B52167 /* GTLBatchQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBatchQuery.m; sourceTree = "<group>"; };
|
|
||||||
DA497BAC15E8C94300B52167 /* GTLBatchResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBatchResult.h; sourceTree = "<group>"; };
|
|
||||||
DA497BAD15E8C94300B52167 /* GTLBatchResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBatchResult.m; sourceTree = "<group>"; };
|
|
||||||
DA497BAE15E8C94300B52167 /* GTLDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLDateTime.h; sourceTree = "<group>"; };
|
|
||||||
DA497BAF15E8C94300B52167 /* GTLDateTime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLDateTime.m; sourceTree = "<group>"; };
|
|
||||||
DA497BB015E8C94300B52167 /* GTLDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLDefines.h; sourceTree = "<group>"; };
|
|
||||||
DA497BB115E8C94300B52167 /* GTLErrorObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLErrorObject.h; sourceTree = "<group>"; };
|
|
||||||
DA497BB215E8C94300B52167 /* GTLErrorObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLErrorObject.m; sourceTree = "<group>"; };
|
|
||||||
DA497BB315E8C94300B52167 /* GTLFramework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLFramework.h; sourceTree = "<group>"; };
|
|
||||||
DA497BB415E8C94300B52167 /* GTLFramework.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLFramework.m; sourceTree = "<group>"; };
|
|
||||||
DA497BB515E8C94300B52167 /* GTLJSONParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLJSONParser.h; sourceTree = "<group>"; };
|
|
||||||
DA497BB615E8C94300B52167 /* GTLJSONParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLJSONParser.m; sourceTree = "<group>"; };
|
|
||||||
DA497BB715E8C94300B52167 /* GTLObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLObject.h; sourceTree = "<group>"; };
|
|
||||||
DA497BB815E8C94300B52167 /* GTLObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLObject.m; sourceTree = "<group>"; };
|
|
||||||
DA497BBA15E8C94300B52167 /* GTLPlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlus.h; sourceTree = "<group>"; };
|
|
||||||
DA497BBB15E8C94300B52167 /* GTLPlusConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusConstants.h; sourceTree = "<group>"; };
|
|
||||||
DA497BBC15E8C94300B52167 /* GTLPlusConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusConstants.m; sourceTree = "<group>"; };
|
|
||||||
DA497BBD15E8C94300B52167 /* GTLPlusItemScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusItemScope.h; sourceTree = "<group>"; };
|
|
||||||
DA497BBE15E8C94300B52167 /* GTLPlusItemScope.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusItemScope.m; sourceTree = "<group>"; };
|
|
||||||
DA497BBF15E8C94300B52167 /* GTLPlusMoment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusMoment.h; sourceTree = "<group>"; };
|
|
||||||
DA497BC015E8C94300B52167 /* GTLPlusMoment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusMoment.m; sourceTree = "<group>"; };
|
|
||||||
DA497BC115E8C94300B52167 /* GTLPlusPerson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusPerson.h; sourceTree = "<group>"; };
|
|
||||||
DA497BC215E8C94300B52167 /* GTLPlusPerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusPerson.m; sourceTree = "<group>"; };
|
|
||||||
DA497BC315E8C94300B52167 /* GTLQueryPlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLQueryPlus.h; sourceTree = "<group>"; };
|
|
||||||
DA497BC415E8C94300B52167 /* GTLQueryPlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLQueryPlus.m; sourceTree = "<group>"; };
|
|
||||||
DA497BC515E8C94300B52167 /* GTLServicePlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLServicePlus.h; sourceTree = "<group>"; };
|
|
||||||
DA497BC615E8C94300B52167 /* GTLServicePlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLServicePlus.m; sourceTree = "<group>"; };
|
|
||||||
DA497BC715E8C94300B52167 /* GTLQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLQuery.h; sourceTree = "<group>"; };
|
|
||||||
DA497BC815E8C94300B52167 /* GTLQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLQuery.m; sourceTree = "<group>"; };
|
|
||||||
DA497BC915E8C94300B52167 /* GTLRuntimeCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLRuntimeCommon.h; sourceTree = "<group>"; };
|
|
||||||
DA497BCA15E8C94300B52167 /* GTLRuntimeCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLRuntimeCommon.m; sourceTree = "<group>"; };
|
|
||||||
DA497BCB15E8C94300B52167 /* GTLService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLService.h; sourceTree = "<group>"; };
|
|
||||||
DA497BCC15E8C94300B52167 /* GTLService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLService.m; sourceTree = "<group>"; };
|
|
||||||
DA497BCD15E8C94300B52167 /* GTLTargetNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLTargetNamespace.h; sourceTree = "<group>"; };
|
|
||||||
DA497BCE15E8C94300B52167 /* GTLUploadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLUploadParameters.h; sourceTree = "<group>"; };
|
|
||||||
DA497BCF15E8C94300B52167 /* GTLUploadParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLUploadParameters.m; sourceTree = "<group>"; };
|
|
||||||
DA497BD015E8C94300B52167 /* GTLUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLUtilities.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD115E8C94300B52167 /* GTLUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLUtilities.m; sourceTree = "<group>"; };
|
|
||||||
DA497BD215E8C94300B52167 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD315E8C94300B52167 /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD415E8C94300B52167 /* GTMHTTPFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcher.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD515E8C94300B52167 /* GTMHTTPFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcher.m; sourceTree = "<group>"; };
|
|
||||||
DA497BD615E8C94300B52167 /* GTMHTTPFetcherLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcherLogging.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD715E8C94300B52167 /* GTMHTTPFetcherLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcherLogging.m; sourceTree = "<group>"; };
|
|
||||||
DA497BD815E8C94300B52167 /* GTMHTTPFetcherService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcherService.h; sourceTree = "<group>"; };
|
|
||||||
DA497BD915E8C94300B52167 /* GTMHTTPFetcherService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcherService.m; sourceTree = "<group>"; };
|
|
||||||
DA497BDA15E8C94300B52167 /* GTMHTTPFetchHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetchHistory.h; sourceTree = "<group>"; };
|
|
||||||
DA497BDB15E8C94300B52167 /* GTMHTTPFetchHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetchHistory.m; sourceTree = "<group>"; };
|
|
||||||
DA497BDC15E8C94300B52167 /* GTMLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMLogger.h; sourceTree = "<group>"; };
|
|
||||||
DA497BDD15E8C94300B52167 /* GTMLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMLogger.m; sourceTree = "<group>"; };
|
|
||||||
DA497BDE15E8C94300B52167 /* GTMMethodCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMMethodCheck.h; sourceTree = "<group>"; };
|
|
||||||
DA497BDF15E8C94300B52167 /* GTMMethodCheck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMMethodCheck.m; sourceTree = "<group>"; };
|
|
||||||
DA497BE015E8C94300B52167 /* GTMNSDictionary+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSDictionary+URLArguments.h"; sourceTree = "<group>"; };
|
|
||||||
DA497BE115E8C94300B52167 /* GTMNSDictionary+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSDictionary+URLArguments.m"; sourceTree = "<group>"; };
|
|
||||||
DA497BE215E8C94300B52167 /* GTMNSString+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+URLArguments.h"; sourceTree = "<group>"; };
|
|
||||||
DA497BE315E8C94300B52167 /* GTMNSString+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+URLArguments.m"; sourceTree = "<group>"; };
|
|
||||||
DA497BE415E8C94300B52167 /* GTMOAuth2Authentication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2Authentication.h; sourceTree = "<group>"; };
|
|
||||||
DA497BE515E8C94300B52167 /* GTMOAuth2Authentication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2Authentication.m; sourceTree = "<group>"; };
|
|
||||||
DA497BE615E8C94300B52167 /* GTMOAuth2SignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2SignIn.h; sourceTree = "<group>"; };
|
|
||||||
DA497BE715E8C94300B52167 /* GTMOAuth2SignIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2SignIn.m; sourceTree = "<group>"; };
|
|
||||||
DA497BE815E8C94300B52167 /* GTMOAuth2ViewControllerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2ViewControllerTouch.h; sourceTree = "<group>"; };
|
|
||||||
DA497BE915E8C94300B52167 /* GTMOAuth2ViewControllerTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2ViewControllerTouch.m; sourceTree = "<group>"; };
|
|
||||||
DA497BEA15E8C94300B52167 /* GTMOAuth2ViewTouch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GTMOAuth2ViewTouch.xib; sourceTree = "<group>"; };
|
|
||||||
DA497BEB15E8C94300B52167 /* GTMObjC2Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMObjC2Runtime.h; sourceTree = "<group>"; };
|
|
||||||
DA497BEC15E8C94300B52167 /* GTMObjC2Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMObjC2Runtime.m; sourceTree = "<group>"; };
|
|
||||||
DA4ECA26160D94A80012ABB9 /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = "<group>"; };
|
DA4ECA26160D94A80012ABB9 /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = "<group>"; };
|
||||||
DA4ECA27160D94A80012ABB9 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
|
DA4ECA27160D94A80012ABB9 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
|
||||||
DA4ECA28160D94A80012ABB9 /* release_notes.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.md; sourceTree = "<group>"; };
|
DA4ECA28160D94A80012ABB9 /* release_notes.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.md; sourceTree = "<group>"; };
|
||||||
@ -1125,19 +1050,6 @@
|
|||||||
DA5587EA15E83C3200860B4F /* social-twitter@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "social-twitter@2x.png"; sourceTree = "<group>"; };
|
DA5587EA15E83C3200860B4F /* social-twitter@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "social-twitter@2x.png"; sourceTree = "<group>"; };
|
||||||
DA5587F115E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork-Rounded-73@2x.png"; sourceTree = "<group>"; };
|
DA5587F115E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork-Rounded-73@2x.png"; sourceTree = "<group>"; };
|
||||||
DA5587F315E8418200860B4F /* iTunesArtwork-Rounded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork-Rounded.png"; sourceTree = "<group>"; };
|
DA5587F315E8418200860B4F /* iTunesArtwork-Rounded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork-Rounded.png"; sourceTree = "<group>"; };
|
||||||
DA5587F815E8B7B200860B4F /* GooglePlusShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GooglePlusShare.h; sourceTree = "<group>"; };
|
|
||||||
DA5587F915E8B7B200860B4F /* GooglePlusSignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GooglePlusSignIn.h; sourceTree = "<group>"; };
|
|
||||||
DA5587FA15E8B7B200860B4F /* GooglePlusSignInButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GooglePlusSignInButton.h; sourceTree = "<group>"; };
|
|
||||||
DA5587FB15E8B7B200860B4F /* libGooglePlus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGooglePlus.a; sourceTree = "<group>"; };
|
|
||||||
DA5587FC15E8B7B200860B4F /* libGooglePlusUniversal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGooglePlusUniversal.a; sourceTree = "<group>"; };
|
|
||||||
DA55887C15E8C0BA00860B4F /* google_plus_share.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = google_plus_share.png; sourceTree = "<group>"; };
|
|
||||||
DA55887D15E8C0BA00860B4F /* google_plus_share@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "google_plus_share@2x.png"; sourceTree = "<group>"; };
|
|
||||||
DA55887E15E8C0BA00860B4F /* google_plus_share_large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = google_plus_share_large.png; sourceTree = "<group>"; };
|
|
||||||
DA55887F15E8C0BA00860B4F /* google_plus_share_large@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "google_plus_share_large@2x.png"; sourceTree = "<group>"; };
|
|
||||||
DA55888015E8C0BA00860B4F /* google_plus_sign_in.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = google_plus_sign_in.png; sourceTree = "<group>"; };
|
|
||||||
DA55888115E8C0BA00860B4F /* google_plus_sign_in@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "google_plus_sign_in@2x.png"; sourceTree = "<group>"; };
|
|
||||||
DA55888215E8C0BA00860B4F /* google_plus_sign_in_wide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = google_plus_sign_in_wide.png; sourceTree = "<group>"; };
|
|
||||||
DA55888315E8C0BA00860B4F /* google_plus_sign_in_wide@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "google_plus_sign_in_wide@2x.png"; sourceTree = "<group>"; };
|
|
||||||
DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
DA5BFA44147E415C00F98B1E /* MasterPassword.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MasterPassword.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
DA5BFA48147E415C00F98B1E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
DA5BFA48147E415C00F98B1E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
||||||
DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
||||||
@ -1164,6 +1076,79 @@
|
|||||||
DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
|
DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
|
||||||
DA6701DF16406BB400B61001 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
|
DA6701DF16406BB400B61001 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
|
||||||
DA672D2E14F92C6B004A189C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
|
DA672D2E14F92C6B004A189C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
|
||||||
|
DA692D5316BB057500F14463 /* GPPDeepLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPPDeepLink.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5416BB057500F14463 /* GPPShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPPShare.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5516BB057500F14463 /* GPPSignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPPSignIn.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5616BB057500F14463 /* GPPSignInButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPPSignInButton.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5716BB057500F14463 /* libGooglePlus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGooglePlus.a; sourceTree = "<group>"; };
|
||||||
|
DA692D5816BB057500F14463 /* libGooglePlusUniversal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGooglePlusUniversal.a; sourceTree = "<group>"; };
|
||||||
|
DA692D5B16BB057500F14463 /* GTLBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBase64.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5C16BB057500F14463 /* GTLBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBase64.m; sourceTree = "<group>"; };
|
||||||
|
DA692D5D16BB057500F14463 /* GTLBatchQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBatchQuery.h; sourceTree = "<group>"; };
|
||||||
|
DA692D5E16BB057500F14463 /* GTLBatchQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBatchQuery.m; sourceTree = "<group>"; };
|
||||||
|
DA692D5F16BB057500F14463 /* GTLBatchResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLBatchResult.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6016BB057500F14463 /* GTLBatchResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLBatchResult.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6116BB057500F14463 /* GTLDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLDateTime.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6216BB057500F14463 /* GTLDateTime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLDateTime.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6316BB057500F14463 /* GTLDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLDefines.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6416BB057500F14463 /* GTLErrorObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLErrorObject.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6516BB057500F14463 /* GTLErrorObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLErrorObject.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6616BB057500F14463 /* GTLFramework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLFramework.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6716BB057500F14463 /* GTLFramework.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLFramework.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6816BB057500F14463 /* GTLJSONParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLJSONParser.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6916BB057500F14463 /* GTLJSONParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLJSONParser.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6A16BB057500F14463 /* GTLObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLObject.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6B16BB057500F14463 /* GTLObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLObject.m; sourceTree = "<group>"; };
|
||||||
|
DA692D6D16BB057500F14463 /* GTLPlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlus.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6E16BB057500F14463 /* GTLPlusConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusConstants.h; sourceTree = "<group>"; };
|
||||||
|
DA692D6F16BB057500F14463 /* GTLPlusConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusConstants.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7016BB057500F14463 /* GTLPlusItemScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusItemScope.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7116BB057500F14463 /* GTLPlusItemScope.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusItemScope.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7216BB057500F14463 /* GTLPlusMoment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLPlusMoment.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7316BB057500F14463 /* GTLPlusMoment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLPlusMoment.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7416BB057500F14463 /* GTLQueryPlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLQueryPlus.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7516BB057500F14463 /* GTLQueryPlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLQueryPlus.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7616BB057500F14463 /* GTLServicePlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLServicePlus.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7716BB057500F14463 /* GTLServicePlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLServicePlus.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7816BB057500F14463 /* GTLQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLQuery.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7916BB057500F14463 /* GTLQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLQuery.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7A16BB057500F14463 /* GTLRuntimeCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLRuntimeCommon.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7B16BB057500F14463 /* GTLRuntimeCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLRuntimeCommon.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7C16BB057500F14463 /* GTLService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLService.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7D16BB057500F14463 /* GTLService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLService.m; sourceTree = "<group>"; };
|
||||||
|
DA692D7E16BB057500F14463 /* GTLTargetNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLTargetNamespace.h; sourceTree = "<group>"; };
|
||||||
|
DA692D7F16BB057500F14463 /* GTLUploadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLUploadParameters.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8016BB057500F14463 /* GTLUploadParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLUploadParameters.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8116BB057500F14463 /* GTLUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTLUtilities.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8216BB057500F14463 /* GTLUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTLUtilities.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8316BB057500F14463 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8416BB057500F14463 /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8516BB057500F14463 /* GTMHTTPFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcher.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8616BB057500F14463 /* GTMHTTPFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcher.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8716BB057500F14463 /* GTMHTTPFetcherLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcherLogging.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8816BB057500F14463 /* GTMHTTPFetcherLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcherLogging.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8916BB057500F14463 /* GTMHTTPFetcherService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetcherService.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8A16BB057500F14463 /* GTMHTTPFetcherService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcherService.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8B16BB057500F14463 /* GTMHTTPFetchHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMHTTPFetchHistory.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8C16BB057500F14463 /* GTMHTTPFetchHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetchHistory.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8D16BB057500F14463 /* GTMLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMLogger.h; sourceTree = "<group>"; };
|
||||||
|
DA692D8E16BB057500F14463 /* GTMLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMLogger.m; sourceTree = "<group>"; };
|
||||||
|
DA692D8F16BB057500F14463 /* GTMMethodCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMMethodCheck.h; sourceTree = "<group>"; };
|
||||||
|
DA692D9016BB057500F14463 /* GTMMethodCheck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMMethodCheck.m; sourceTree = "<group>"; };
|
||||||
|
DA692D9116BB057500F14463 /* GTMNSDictionary+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSDictionary+URLArguments.h"; sourceTree = "<group>"; };
|
||||||
|
DA692D9216BB057500F14463 /* GTMNSDictionary+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSDictionary+URLArguments.m"; sourceTree = "<group>"; };
|
||||||
|
DA692D9316BB057500F14463 /* GTMNSString+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+URLArguments.h"; sourceTree = "<group>"; };
|
||||||
|
DA692D9416BB057500F14463 /* GTMNSString+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+URLArguments.m"; sourceTree = "<group>"; };
|
||||||
|
DA692D9516BB057500F14463 /* GTMOAuth2Authentication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2Authentication.h; sourceTree = "<group>"; };
|
||||||
|
DA692D9616BB057500F14463 /* GTMOAuth2Authentication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2Authentication.m; sourceTree = "<group>"; };
|
||||||
|
DA692D9716BB057500F14463 /* GTMOAuth2SignIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2SignIn.h; sourceTree = "<group>"; };
|
||||||
|
DA692D9816BB057500F14463 /* GTMOAuth2SignIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2SignIn.m; sourceTree = "<group>"; };
|
||||||
|
DA692D9916BB057500F14463 /* GTMOAuth2ViewControllerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMOAuth2ViewControllerTouch.h; sourceTree = "<group>"; };
|
||||||
|
DA692D9A16BB057500F14463 /* GTMOAuth2ViewControllerTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2ViewControllerTouch.m; sourceTree = "<group>"; };
|
||||||
|
DA692D9B16BB057500F14463 /* GTMOAuth2ViewTouch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GTMOAuth2ViewTouch.xib; sourceTree = "<group>"; };
|
||||||
|
DA692D9C16BB057500F14463 /* GTMObjC2Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMObjC2Runtime.h; sourceTree = "<group>"; };
|
||||||
|
DA692D9D16BB057500F14463 /* GTMObjC2Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMObjC2Runtime.m; sourceTree = "<group>"; };
|
||||||
|
DA692DBE16BB191100F14463 /* Google+.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Google+.plist"; path = "Google+/Google+.plist"; sourceTree = SOURCE_ROOT; };
|
||||||
DA79A9BB1557DB6F00BAA07A /* libscryptenc-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios.a"; sourceTree = "<group>"; };
|
DA79A9BB1557DB6F00BAA07A /* libscryptenc-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios.a"; sourceTree = "<group>"; };
|
||||||
DA79A9BD1557DDC700BAA07A /* scrypt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = scrypt.xcodeproj; path = External/Pearl/External/iOSPorts/ports/security/scrypt/scrypt.xcodeproj; sourceTree = "<group>"; };
|
DA79A9BD1557DDC700BAA07A /* scrypt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = scrypt.xcodeproj; path = External/Pearl/External/iOSPorts/ports/security/scrypt/scrypt.xcodeproj; sourceTree = "<group>"; };
|
||||||
DA81252E16B8544400F4732F /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
|
DA81252E16B8544400F4732F /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
|
||||||
@ -2054,7 +2039,8 @@
|
|||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
DA497B9815E8C90E00B52167 /* Foundation.framework in Frameworks */,
|
DA497B9815E8C90E00B52167 /* Foundation.framework in Frameworks */,
|
||||||
DA497C0F15E8C9CF00B52167 /* libGooglePlusUniversal.a in Frameworks */,
|
DA692D9E16BB057500F14463 /* libGooglePlus.a in Frameworks */,
|
||||||
|
DA692D9F16BB057500F14463 /* libGooglePlusUniversal.a in Frameworks */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@ -2172,129 +2158,17 @@
|
|||||||
path = External/iCloudStoreManager/iCloudStoreManager;
|
path = External/iCloudStoreManager/iCloudStoreManager;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
DA497BA615E8C94300B52167 /* OpenSource */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
DA497BA715E8C94300B52167 /* GTL */,
|
|
||||||
DA497BD215E8C94300B52167 /* GTMDefines.h */,
|
|
||||||
DA497BD315E8C94300B52167 /* GTMGarbageCollection.h */,
|
|
||||||
DA497BD415E8C94300B52167 /* GTMHTTPFetcher.h */,
|
|
||||||
DA497BD515E8C94300B52167 /* GTMHTTPFetcher.m */,
|
|
||||||
DA497BD615E8C94300B52167 /* GTMHTTPFetcherLogging.h */,
|
|
||||||
DA497BD715E8C94300B52167 /* GTMHTTPFetcherLogging.m */,
|
|
||||||
DA497BD815E8C94300B52167 /* GTMHTTPFetcherService.h */,
|
|
||||||
DA497BD915E8C94300B52167 /* GTMHTTPFetcherService.m */,
|
|
||||||
DA497BDA15E8C94300B52167 /* GTMHTTPFetchHistory.h */,
|
|
||||||
DA497BDB15E8C94300B52167 /* GTMHTTPFetchHistory.m */,
|
|
||||||
DA497BDC15E8C94300B52167 /* GTMLogger.h */,
|
|
||||||
DA497BDD15E8C94300B52167 /* GTMLogger.m */,
|
|
||||||
DA497BDE15E8C94300B52167 /* GTMMethodCheck.h */,
|
|
||||||
DA497BDF15E8C94300B52167 /* GTMMethodCheck.m */,
|
|
||||||
DA497BE015E8C94300B52167 /* GTMNSDictionary+URLArguments.h */,
|
|
||||||
DA497BE115E8C94300B52167 /* GTMNSDictionary+URLArguments.m */,
|
|
||||||
DA497BE215E8C94300B52167 /* GTMNSString+URLArguments.h */,
|
|
||||||
DA497BE315E8C94300B52167 /* GTMNSString+URLArguments.m */,
|
|
||||||
DA497BE415E8C94300B52167 /* GTMOAuth2Authentication.h */,
|
|
||||||
DA497BE515E8C94300B52167 /* GTMOAuth2Authentication.m */,
|
|
||||||
DA497BE615E8C94300B52167 /* GTMOAuth2SignIn.h */,
|
|
||||||
DA497BE715E8C94300B52167 /* GTMOAuth2SignIn.m */,
|
|
||||||
DA497BE815E8C94300B52167 /* GTMOAuth2ViewControllerTouch.h */,
|
|
||||||
DA497BE915E8C94300B52167 /* GTMOAuth2ViewControllerTouch.m */,
|
|
||||||
DA497BEA15E8C94300B52167 /* GTMOAuth2ViewTouch.xib */,
|
|
||||||
DA497BEB15E8C94300B52167 /* GTMObjC2Runtime.h */,
|
|
||||||
DA497BEC15E8C94300B52167 /* GTMObjC2Runtime.m */,
|
|
||||||
);
|
|
||||||
name = OpenSource;
|
|
||||||
path = "External/google-plus-ios-sdk/OpenSource";
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
DA497BA715E8C94300B52167 /* GTL */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
DA497BA815E8C94300B52167 /* GTLBase64.h */,
|
|
||||||
DA497BA915E8C94300B52167 /* GTLBase64.m */,
|
|
||||||
DA497BAA15E8C94300B52167 /* GTLBatchQuery.h */,
|
|
||||||
DA497BAB15E8C94300B52167 /* GTLBatchQuery.m */,
|
|
||||||
DA497BAC15E8C94300B52167 /* GTLBatchResult.h */,
|
|
||||||
DA497BAD15E8C94300B52167 /* GTLBatchResult.m */,
|
|
||||||
DA497BAE15E8C94300B52167 /* GTLDateTime.h */,
|
|
||||||
DA497BAF15E8C94300B52167 /* GTLDateTime.m */,
|
|
||||||
DA497BB015E8C94300B52167 /* GTLDefines.h */,
|
|
||||||
DA497BB115E8C94300B52167 /* GTLErrorObject.h */,
|
|
||||||
DA497BB215E8C94300B52167 /* GTLErrorObject.m */,
|
|
||||||
DA497BB315E8C94300B52167 /* GTLFramework.h */,
|
|
||||||
DA497BB415E8C94300B52167 /* GTLFramework.m */,
|
|
||||||
DA497BB515E8C94300B52167 /* GTLJSONParser.h */,
|
|
||||||
DA497BB615E8C94300B52167 /* GTLJSONParser.m */,
|
|
||||||
DA497BB715E8C94300B52167 /* GTLObject.h */,
|
|
||||||
DA497BB815E8C94300B52167 /* GTLObject.m */,
|
|
||||||
DA497BB915E8C94300B52167 /* GTLPlus */,
|
|
||||||
DA497BC715E8C94300B52167 /* GTLQuery.h */,
|
|
||||||
DA497BC815E8C94300B52167 /* GTLQuery.m */,
|
|
||||||
DA497BC915E8C94300B52167 /* GTLRuntimeCommon.h */,
|
|
||||||
DA497BCA15E8C94300B52167 /* GTLRuntimeCommon.m */,
|
|
||||||
DA497BCB15E8C94300B52167 /* GTLService.h */,
|
|
||||||
DA497BCC15E8C94300B52167 /* GTLService.m */,
|
|
||||||
DA497BCD15E8C94300B52167 /* GTLTargetNamespace.h */,
|
|
||||||
DA497BCE15E8C94300B52167 /* GTLUploadParameters.h */,
|
|
||||||
DA497BCF15E8C94300B52167 /* GTLUploadParameters.m */,
|
|
||||||
DA497BD015E8C94300B52167 /* GTLUtilities.h */,
|
|
||||||
DA497BD115E8C94300B52167 /* GTLUtilities.m */,
|
|
||||||
);
|
|
||||||
path = GTL;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
DA497BB915E8C94300B52167 /* GTLPlus */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
DA497BBA15E8C94300B52167 /* GTLPlus.h */,
|
|
||||||
DA497BBB15E8C94300B52167 /* GTLPlusConstants.h */,
|
|
||||||
DA497BBC15E8C94300B52167 /* GTLPlusConstants.m */,
|
|
||||||
DA497BBD15E8C94300B52167 /* GTLPlusItemScope.h */,
|
|
||||||
DA497BBE15E8C94300B52167 /* GTLPlusItemScope.m */,
|
|
||||||
DA497BBF15E8C94300B52167 /* GTLPlusMoment.h */,
|
|
||||||
DA497BC015E8C94300B52167 /* GTLPlusMoment.m */,
|
|
||||||
DA497BC115E8C94300B52167 /* GTLPlusPerson.h */,
|
|
||||||
DA497BC215E8C94300B52167 /* GTLPlusPerson.m */,
|
|
||||||
DA497BC315E8C94300B52167 /* GTLQueryPlus.h */,
|
|
||||||
DA497BC415E8C94300B52167 /* GTLQueryPlus.m */,
|
|
||||||
DA497BC515E8C94300B52167 /* GTLServicePlus.h */,
|
|
||||||
DA497BC615E8C94300B52167 /* GTLServicePlus.m */,
|
|
||||||
);
|
|
||||||
path = GTLPlus;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
DA5587F715E8B7B200860B4F /* Google+ */ = {
|
DA5587F715E8B7B200860B4F /* Google+ */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
DA497BA615E8C94300B52167 /* OpenSource */,
|
DA692DBE16BB191100F14463 /* Google+.plist */,
|
||||||
DA55887B15E8C0BA00860B4F /* Resources */,
|
DA692D5216BB057500F14463 /* lib */,
|
||||||
DA5587F815E8B7B200860B4F /* GooglePlusShare.h */,
|
DA692D5916BB057500F14463 /* OpenSource */,
|
||||||
DA5587F915E8B7B200860B4F /* GooglePlusSignIn.h */,
|
|
||||||
DA5587FA15E8B7B200860B4F /* GooglePlusSignInButton.h */,
|
|
||||||
DA5587FB15E8B7B200860B4F /* libGooglePlus.a */,
|
|
||||||
DA5587FC15E8B7B200860B4F /* libGooglePlusUniversal.a */,
|
|
||||||
);
|
);
|
||||||
name = "Google+";
|
name = "Google+";
|
||||||
path = "External/google-plus-ios-sdk/lib";
|
path = "External/google-plus-ios-sdk/lib";
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
DA55887B15E8C0BA00860B4F /* Resources */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
DA55887C15E8C0BA00860B4F /* google_plus_share.png */,
|
|
||||||
DA55887D15E8C0BA00860B4F /* google_plus_share@2x.png */,
|
|
||||||
DA55887E15E8C0BA00860B4F /* google_plus_share_large.png */,
|
|
||||||
DA55887F15E8C0BA00860B4F /* google_plus_share_large@2x.png */,
|
|
||||||
DA55888015E8C0BA00860B4F /* google_plus_sign_in.png */,
|
|
||||||
DA55888115E8C0BA00860B4F /* google_plus_sign_in@2x.png */,
|
|
||||||
DA55888215E8C0BA00860B4F /* google_plus_sign_in_wide.png */,
|
|
||||||
DA55888315E8C0BA00860B4F /* google_plus_sign_in_wide@2x.png */,
|
|
||||||
);
|
|
||||||
name = Resources;
|
|
||||||
path = "External/google-plus-ios-sdk/Resources";
|
|
||||||
sourceTree = SOURCE_ROOT;
|
|
||||||
};
|
|
||||||
DA5BFA39147E415C00F98B1E = {
|
DA5BFA39147E415C00F98B1E = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
@ -2395,6 +2269,109 @@
|
|||||||
path = MasterPassword;
|
path = MasterPassword;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
DA692D5216BB057500F14463 /* lib */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DA692D5316BB057500F14463 /* GPPDeepLink.h */,
|
||||||
|
DA692D5416BB057500F14463 /* GPPShare.h */,
|
||||||
|
DA692D5516BB057500F14463 /* GPPSignIn.h */,
|
||||||
|
DA692D5616BB057500F14463 /* GPPSignInButton.h */,
|
||||||
|
DA692D5716BB057500F14463 /* libGooglePlus.a */,
|
||||||
|
DA692D5816BB057500F14463 /* libGooglePlusUniversal.a */,
|
||||||
|
);
|
||||||
|
name = lib;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
|
DA692D5916BB057500F14463 /* OpenSource */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DA692D5A16BB057500F14463 /* GTL */,
|
||||||
|
DA692D8316BB057500F14463 /* GTMDefines.h */,
|
||||||
|
DA692D8416BB057500F14463 /* GTMGarbageCollection.h */,
|
||||||
|
DA692D8516BB057500F14463 /* GTMHTTPFetcher.h */,
|
||||||
|
DA692D8616BB057500F14463 /* GTMHTTPFetcher.m */,
|
||||||
|
DA692D8716BB057500F14463 /* GTMHTTPFetcherLogging.h */,
|
||||||
|
DA692D8816BB057500F14463 /* GTMHTTPFetcherLogging.m */,
|
||||||
|
DA692D8916BB057500F14463 /* GTMHTTPFetcherService.h */,
|
||||||
|
DA692D8A16BB057500F14463 /* GTMHTTPFetcherService.m */,
|
||||||
|
DA692D8B16BB057500F14463 /* GTMHTTPFetchHistory.h */,
|
||||||
|
DA692D8C16BB057500F14463 /* GTMHTTPFetchHistory.m */,
|
||||||
|
DA692D8D16BB057500F14463 /* GTMLogger.h */,
|
||||||
|
DA692D8E16BB057500F14463 /* GTMLogger.m */,
|
||||||
|
DA692D8F16BB057500F14463 /* GTMMethodCheck.h */,
|
||||||
|
DA692D9016BB057500F14463 /* GTMMethodCheck.m */,
|
||||||
|
DA692D9116BB057500F14463 /* GTMNSDictionary+URLArguments.h */,
|
||||||
|
DA692D9216BB057500F14463 /* GTMNSDictionary+URLArguments.m */,
|
||||||
|
DA692D9316BB057500F14463 /* GTMNSString+URLArguments.h */,
|
||||||
|
DA692D9416BB057500F14463 /* GTMNSString+URLArguments.m */,
|
||||||
|
DA692D9516BB057500F14463 /* GTMOAuth2Authentication.h */,
|
||||||
|
DA692D9616BB057500F14463 /* GTMOAuth2Authentication.m */,
|
||||||
|
DA692D9716BB057500F14463 /* GTMOAuth2SignIn.h */,
|
||||||
|
DA692D9816BB057500F14463 /* GTMOAuth2SignIn.m */,
|
||||||
|
DA692D9916BB057500F14463 /* GTMOAuth2ViewControllerTouch.h */,
|
||||||
|
DA692D9A16BB057500F14463 /* GTMOAuth2ViewControllerTouch.m */,
|
||||||
|
DA692D9B16BB057500F14463 /* GTMOAuth2ViewTouch.xib */,
|
||||||
|
DA692D9C16BB057500F14463 /* GTMObjC2Runtime.h */,
|
||||||
|
DA692D9D16BB057500F14463 /* GTMObjC2Runtime.m */,
|
||||||
|
);
|
||||||
|
name = OpenSource;
|
||||||
|
path = "External/google-plus-ios-sdk/OpenSource";
|
||||||
|
sourceTree = SOURCE_ROOT;
|
||||||
|
};
|
||||||
|
DA692D5A16BB057500F14463 /* GTL */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DA692D5B16BB057500F14463 /* GTLBase64.h */,
|
||||||
|
DA692D5C16BB057500F14463 /* GTLBase64.m */,
|
||||||
|
DA692D5D16BB057500F14463 /* GTLBatchQuery.h */,
|
||||||
|
DA692D5E16BB057500F14463 /* GTLBatchQuery.m */,
|
||||||
|
DA692D5F16BB057500F14463 /* GTLBatchResult.h */,
|
||||||
|
DA692D6016BB057500F14463 /* GTLBatchResult.m */,
|
||||||
|
DA692D6116BB057500F14463 /* GTLDateTime.h */,
|
||||||
|
DA692D6216BB057500F14463 /* GTLDateTime.m */,
|
||||||
|
DA692D6316BB057500F14463 /* GTLDefines.h */,
|
||||||
|
DA692D6416BB057500F14463 /* GTLErrorObject.h */,
|
||||||
|
DA692D6516BB057500F14463 /* GTLErrorObject.m */,
|
||||||
|
DA692D6616BB057500F14463 /* GTLFramework.h */,
|
||||||
|
DA692D6716BB057500F14463 /* GTLFramework.m */,
|
||||||
|
DA692D6816BB057500F14463 /* GTLJSONParser.h */,
|
||||||
|
DA692D6916BB057500F14463 /* GTLJSONParser.m */,
|
||||||
|
DA692D6A16BB057500F14463 /* GTLObject.h */,
|
||||||
|
DA692D6B16BB057500F14463 /* GTLObject.m */,
|
||||||
|
DA692D6C16BB057500F14463 /* GTLPlus */,
|
||||||
|
DA692D7816BB057500F14463 /* GTLQuery.h */,
|
||||||
|
DA692D7916BB057500F14463 /* GTLQuery.m */,
|
||||||
|
DA692D7A16BB057500F14463 /* GTLRuntimeCommon.h */,
|
||||||
|
DA692D7B16BB057500F14463 /* GTLRuntimeCommon.m */,
|
||||||
|
DA692D7C16BB057500F14463 /* GTLService.h */,
|
||||||
|
DA692D7D16BB057500F14463 /* GTLService.m */,
|
||||||
|
DA692D7E16BB057500F14463 /* GTLTargetNamespace.h */,
|
||||||
|
DA692D7F16BB057500F14463 /* GTLUploadParameters.h */,
|
||||||
|
DA692D8016BB057500F14463 /* GTLUploadParameters.m */,
|
||||||
|
DA692D8116BB057500F14463 /* GTLUtilities.h */,
|
||||||
|
DA692D8216BB057500F14463 /* GTLUtilities.m */,
|
||||||
|
);
|
||||||
|
path = GTL;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
|
DA692D6C16BB057500F14463 /* GTLPlus */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DA692D6D16BB057500F14463 /* GTLPlus.h */,
|
||||||
|
DA692D6E16BB057500F14463 /* GTLPlusConstants.h */,
|
||||||
|
DA692D6F16BB057500F14463 /* GTLPlusConstants.m */,
|
||||||
|
DA692D7016BB057500F14463 /* GTLPlusItemScope.h */,
|
||||||
|
DA692D7116BB057500F14463 /* GTLPlusItemScope.m */,
|
||||||
|
DA692D7216BB057500F14463 /* GTLPlusMoment.h */,
|
||||||
|
DA692D7316BB057500F14463 /* GTLPlusMoment.m */,
|
||||||
|
DA692D7416BB057500F14463 /* GTLQueryPlus.h */,
|
||||||
|
DA692D7516BB057500F14463 /* GTLQueryPlus.m */,
|
||||||
|
DA692D7616BB057500F14463 /* GTLServicePlus.h */,
|
||||||
|
DA692D7716BB057500F14463 /* GTLServicePlus.m */,
|
||||||
|
);
|
||||||
|
path = GTLPlus;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
DA79A9BE1557DDC700BAA07A /* Products */ = {
|
DA79A9BE1557DDC700BAA07A /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
@ -4591,14 +4568,6 @@
|
|||||||
DA5587F015E83C3200860B4F /* social-twitter@2x.png in Resources */,
|
DA5587F015E83C3200860B4F /* social-twitter@2x.png in Resources */,
|
||||||
DA5587F415E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png in Resources */,
|
DA5587F415E8418200860B4F /* iTunesArtwork-Rounded-73@2x.png in Resources */,
|
||||||
DA5587F615E8418200860B4F /* iTunesArtwork-Rounded.png in Resources */,
|
DA5587F615E8418200860B4F /* iTunesArtwork-Rounded.png in Resources */,
|
||||||
DA55888415E8C0BA00860B4F /* google_plus_share.png in Resources */,
|
|
||||||
DA55888515E8C0BA00860B4F /* google_plus_share@2x.png in Resources */,
|
|
||||||
DA55888615E8C0BA00860B4F /* google_plus_share_large.png in Resources */,
|
|
||||||
DA55888715E8C0BA00860B4F /* google_plus_share_large@2x.png in Resources */,
|
|
||||||
DA55888815E8C0BA00860B4F /* google_plus_sign_in.png in Resources */,
|
|
||||||
DA55888915E8C0BA00860B4F /* google_plus_sign_in@2x.png in Resources */,
|
|
||||||
DA55888A15E8C0BA00860B4F /* google_plus_sign_in_wide.png in Resources */,
|
|
||||||
DA55888B15E8C0BA00860B4F /* google_plus_sign_in_wide@2x.png in Resources */,
|
|
||||||
DA350A0615F11F9400C14A8E /* pull-down.png in Resources */,
|
DA350A0615F11F9400C14A8E /* pull-down.png in Resources */,
|
||||||
DA350A0715F11F9400C14A8E /* pull-down@2x.png in Resources */,
|
DA350A0715F11F9400C14A8E /* pull-down@2x.png in Resources */,
|
||||||
DA350A0815F11F9400C14A8E /* pull-up.png in Resources */,
|
DA350A0815F11F9400C14A8E /* pull-up.png in Resources */,
|
||||||
@ -4612,6 +4581,7 @@
|
|||||||
DA3EE946160145C700C68F6D /* Default-568h.png in Resources */,
|
DA3EE946160145C700C68F6D /* Default-568h.png in Resources */,
|
||||||
DA3EE947160145C700C68F6D /* Default-568h@2x.png in Resources */,
|
DA3EE947160145C700C68F6D /* Default-568h@2x.png in Resources */,
|
||||||
DA4ECA2E160D94A80012ABB9 /* TestFlight.plist in Resources */,
|
DA4ECA2E160D94A80012ABB9 /* TestFlight.plist in Resources */,
|
||||||
|
DA692DBF16BB191100F14463 /* Google+.plist in Resources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@ -4684,37 +4654,36 @@
|
|||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
DA497BED15E8C94300B52167 /* GTLBase64.m in Sources */,
|
DA692DA016BB057500F14463 /* GTLBase64.m in Sources */,
|
||||||
DA497BEE15E8C94300B52167 /* GTLBatchQuery.m in Sources */,
|
DA692DA116BB057500F14463 /* GTLBatchQuery.m in Sources */,
|
||||||
DA497BEF15E8C94300B52167 /* GTLBatchResult.m in Sources */,
|
DA692DA216BB057500F14463 /* GTLBatchResult.m in Sources */,
|
||||||
DA497BF015E8C94300B52167 /* GTLDateTime.m in Sources */,
|
DA692DA316BB057500F14463 /* GTLDateTime.m in Sources */,
|
||||||
DA497BF115E8C94300B52167 /* GTLErrorObject.m in Sources */,
|
DA692DA416BB057500F14463 /* GTLErrorObject.m in Sources */,
|
||||||
DA497BF215E8C94300B52167 /* GTLFramework.m in Sources */,
|
DA692DA516BB057500F14463 /* GTLFramework.m in Sources */,
|
||||||
DA497BF315E8C94300B52167 /* GTLJSONParser.m in Sources */,
|
DA692DA616BB057500F14463 /* GTLJSONParser.m in Sources */,
|
||||||
DA497BF415E8C94300B52167 /* GTLObject.m in Sources */,
|
DA692DA716BB057500F14463 /* GTLObject.m in Sources */,
|
||||||
DA497BF515E8C94300B52167 /* GTLPlusConstants.m in Sources */,
|
DA692DA816BB057500F14463 /* GTLPlusConstants.m in Sources */,
|
||||||
DA497BF615E8C94300B52167 /* GTLPlusItemScope.m in Sources */,
|
DA692DA916BB057500F14463 /* GTLPlusItemScope.m in Sources */,
|
||||||
DA497BF715E8C94300B52167 /* GTLPlusMoment.m in Sources */,
|
DA692DAA16BB057500F14463 /* GTLPlusMoment.m in Sources */,
|
||||||
DA497BF815E8C94300B52167 /* GTLPlusPerson.m in Sources */,
|
DA692DAB16BB057500F14463 /* GTLQueryPlus.m in Sources */,
|
||||||
DA497BF915E8C94300B52167 /* GTLQueryPlus.m in Sources */,
|
DA692DAC16BB057500F14463 /* GTLServicePlus.m in Sources */,
|
||||||
DA497BFA15E8C94300B52167 /* GTLServicePlus.m in Sources */,
|
DA692DAD16BB057500F14463 /* GTLQuery.m in Sources */,
|
||||||
DA497BFB15E8C94300B52167 /* GTLQuery.m in Sources */,
|
DA692DAE16BB057500F14463 /* GTLRuntimeCommon.m in Sources */,
|
||||||
DA497BFC15E8C94300B52167 /* GTLRuntimeCommon.m in Sources */,
|
DA692DAF16BB057500F14463 /* GTLService.m in Sources */,
|
||||||
DA497BFD15E8C94300B52167 /* GTLService.m in Sources */,
|
DA692DB016BB057500F14463 /* GTLUploadParameters.m in Sources */,
|
||||||
DA497BFE15E8C94300B52167 /* GTLUploadParameters.m in Sources */,
|
DA692DB116BB057500F14463 /* GTLUtilities.m in Sources */,
|
||||||
DA497BFF15E8C94300B52167 /* GTLUtilities.m in Sources */,
|
DA692DB216BB057500F14463 /* GTMHTTPFetcher.m in Sources */,
|
||||||
DA497C0015E8C94300B52167 /* GTMHTTPFetcher.m in Sources */,
|
DA692DB316BB057500F14463 /* GTMHTTPFetcherLogging.m in Sources */,
|
||||||
DA497C0115E8C94300B52167 /* GTMHTTPFetcherLogging.m in Sources */,
|
DA692DB416BB057500F14463 /* GTMHTTPFetcherService.m in Sources */,
|
||||||
DA497C0215E8C94300B52167 /* GTMHTTPFetcherService.m in Sources */,
|
DA692DB516BB057500F14463 /* GTMHTTPFetchHistory.m in Sources */,
|
||||||
DA497C0315E8C94300B52167 /* GTMHTTPFetchHistory.m in Sources */,
|
DA692DB616BB057500F14463 /* GTMLogger.m in Sources */,
|
||||||
DA497C0415E8C94300B52167 /* GTMLogger.m in Sources */,
|
DA692DB716BB057500F14463 /* GTMMethodCheck.m in Sources */,
|
||||||
DA497C0515E8C94300B52167 /* GTMMethodCheck.m in Sources */,
|
DA692DB816BB057500F14463 /* GTMNSDictionary+URLArguments.m in Sources */,
|
||||||
DA497C0615E8C94300B52167 /* GTMNSDictionary+URLArguments.m in Sources */,
|
DA692DB916BB057500F14463 /* GTMNSString+URLArguments.m in Sources */,
|
||||||
DA497C0715E8C94300B52167 /* GTMNSString+URLArguments.m in Sources */,
|
DA692DBA16BB057500F14463 /* GTMOAuth2Authentication.m in Sources */,
|
||||||
DA497C0815E8C94300B52167 /* GTMOAuth2Authentication.m in Sources */,
|
DA692DBB16BB057500F14463 /* GTMOAuth2SignIn.m in Sources */,
|
||||||
DA497C0915E8C94300B52167 /* GTMOAuth2SignIn.m in Sources */,
|
DA692DBC16BB057500F14463 /* GTMOAuth2ViewControllerTouch.m in Sources */,
|
||||||
DA497C0A15E8C94300B52167 /* GTMOAuth2ViewControllerTouch.m in Sources */,
|
DA692DBD16BB057500F14463 /* GTMObjC2Runtime.m in Sources */,
|
||||||
DA497C0B15E8C94300B52167 /* GTMObjC2Runtime.m in Sources */,
|
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@ -5056,7 +5025,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ARCHS = armv7;
|
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||||
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
||||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||||
CLANG_WARN_EMPTY_BODY = YES;
|
CLANG_WARN_EMPTY_BODY = YES;
|
||||||
@ -5119,7 +5088,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ARCHS = armv7;
|
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||||
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
||||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||||
CLANG_WARN_EMPTY_BODY = YES;
|
CLANG_WARN_EMPTY_BODY = YES;
|
||||||
@ -5271,7 +5240,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ARCHS = armv7;
|
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||||
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
CLANG_WARN_CXX0X_EXTENSIONS = YES;
|
||||||
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||||
CLANG_WARN_EMPTY_BODY = YES;
|
CLANG_WARN_EMPTY_BODY = YES;
|
||||||
@ -5359,7 +5328,6 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
DSTROOT = /tmp/Pearl.dst;
|
DSTROOT = /tmp/Pearl.dst;
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
|
||||||
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
||||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
@ -5460,7 +5428,6 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
DSTROOT = /tmp/Pearl.dst;
|
DSTROOT = /tmp/Pearl.dst;
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
|
||||||
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
||||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
@ -5478,7 +5445,6 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
DSTROOT = /tmp/Pearl.dst;
|
DSTROOT = /tmp/Pearl.dst;
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
|
||||||
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
GCC_PREFIX_HEADER = "Pearl/Pearl-Prefix.pch";
|
||||||
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
HEADER_SEARCH_PATHS = "$(SRCROOT)/External/Pearl/External/iOSPorts/include/**";
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
|
@ -18,8 +18,6 @@
|
|||||||
@property (strong, nonatomic) MPUserEntity *activeUser;
|
@property (strong, nonatomic) MPUserEntity *activeUser;
|
||||||
@property (strong, nonatomic) MPKey *key;
|
@property (strong, nonatomic) MPKey *key;
|
||||||
|
|
||||||
+ (MPAppDelegate_Shared *)get;
|
|
||||||
|
|
||||||
- (MPUserEntity *)activeUserInContext:(NSManagedObjectContext *)moc;
|
- (MPUserEntity *)activeUserInContext:(NSManagedObjectContext *)moc;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -16,6 +16,4 @@
|
|||||||
@property (nonatomic, retain) NSNumber *iCloud;
|
@property (nonatomic, retain) NSNumber *iCloud;
|
||||||
@property (nonatomic, retain) NSNumber *iCloudDecided;
|
@property (nonatomic, retain) NSNumber *iCloudDecided;
|
||||||
|
|
||||||
+ (MPConfig *)get;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -23,8 +23,6 @@
|
|||||||
@property (nonatomic, weak) IBOutlet NSMenuItem *createUserItem;
|
@property (nonatomic, weak) IBOutlet NSMenuItem *createUserItem;
|
||||||
@property (nonatomic, weak) IBOutlet NSMenuItem *usersItem;
|
@property (nonatomic, weak) IBOutlet NSMenuItem *usersItem;
|
||||||
|
|
||||||
+ (MPAppDelegate *)get;
|
|
||||||
|
|
||||||
- (IBAction)activate:(id)sender;
|
- (IBAction)activate:(id)sender;
|
||||||
- (IBAction)togglePreference:(NSMenuItem *)sender;
|
- (IBAction)togglePreference:(NSMenuItem *)sender;
|
||||||
- (IBAction)newUser:(NSMenuItem *)sender;
|
- (IBAction)newUser:(NSMenuItem *)sender;
|
||||||
|
@ -12,6 +12,4 @@
|
|||||||
|
|
||||||
@property (nonatomic, retain) NSString *usedUserName;
|
@property (nonatomic, retain) NSString *usedUserName;
|
||||||
|
|
||||||
+ (MPMacConfig *)get;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -8,11 +8,13 @@
|
|||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
#import <MessageUI/MessageUI.h>
|
#import <MessageUI/MessageUI.h>
|
||||||
|
|
||||||
#import "MPAppDelegate_Shared.h"
|
#import "MPAppDelegate_Shared.h"
|
||||||
|
#import "GPPShare.h"
|
||||||
|
|
||||||
@interface MPAppDelegate : MPAppDelegate_Shared
|
@interface MPAppDelegate : MPAppDelegate_Shared
|
||||||
|
|
||||||
+ (MPAppDelegate *)get;
|
@property (nonatomic, readonly) GPPShare *googlePlus;
|
||||||
|
|
||||||
- (void)showGuide;
|
- (void)showGuide;
|
||||||
- (void)showFeedbackWithLogs:(BOOL)logs forVC:(UIViewController *)viewController;
|
- (void)showFeedbackWithLogs:(BOOL)logs forVC:(UIViewController *)viewController;
|
||||||
|
@ -14,14 +14,7 @@
|
|||||||
|
|
||||||
@interface MPAppDelegate ()
|
@interface MPAppDelegate ()
|
||||||
|
|
||||||
- (NSDictionary *)testFlightInfo;
|
@property (nonatomic, readwrite) GPPShare *googlePlus;
|
||||||
- (NSString *)testFlightToken;
|
|
||||||
|
|
||||||
- (NSDictionary *)crashlyticsInfo;
|
|
||||||
- (NSString *)crashlyticsAPIKey;
|
|
||||||
|
|
||||||
- (NSDictionary *)localyticsInfo;
|
|
||||||
- (NSString *)localyticsKey;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@ -38,11 +31,6 @@
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (MPAppDelegate *)get {
|
|
||||||
|
|
||||||
return (MPAppDelegate *)[super get];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
||||||
|
|
||||||
[[[NSBundle mainBundle] mutableInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"];
|
[[[NSBundle mainBundle] mutableInfoDictionary] setObject:@"Master Password" forKey:@"CFBundleDisplayName"];
|
||||||
@ -83,6 +71,16 @@
|
|||||||
err(@"TestFlight: %@", exception);
|
err(@"TestFlight: %@", exception);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@try {
|
||||||
|
NSString *googlePlusClientID = [self googlePlusClientID];
|
||||||
|
if ([googlePlusClientID length]) {
|
||||||
|
inf(@"Initializing Google+");
|
||||||
|
self.googlePlus = [[GPPShare alloc] initWithClientID:googlePlusClientID];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@catch (id exception) {
|
||||||
|
err(@"Google+: %@", exception);
|
||||||
|
}
|
||||||
@try {
|
@try {
|
||||||
NSString *crashlyticsAPIKey = [self crashlyticsAPIKey];
|
NSString *crashlyticsAPIKey = [self crashlyticsAPIKey];
|
||||||
if ([crashlyticsAPIKey length]) {
|
if ([crashlyticsAPIKey length]) {
|
||||||
@ -280,6 +278,10 @@
|
|||||||
if (!url)
|
if (!url)
|
||||||
return NO;
|
return NO;
|
||||||
|
|
||||||
|
// Google+
|
||||||
|
if ([self.googlePlus handleURL:url sourceApplication:sourceApplication annotation:annotation])
|
||||||
|
return YES;
|
||||||
|
|
||||||
// Arbitrary URL to mpsites data.
|
// Arbitrary URL to mpsites data.
|
||||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||||
NSError *error;
|
NSError *error;
|
||||||
@ -658,8 +660,26 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - TestFlight
|
|
||||||
|
|
||||||
|
#pragma mark - Google+
|
||||||
|
|
||||||
|
- (NSDictionary *)googlePlusInfo {
|
||||||
|
|
||||||
|
static NSDictionary *googlePlusInfo = nil;
|
||||||
|
if (googlePlusInfo == nil)
|
||||||
|
googlePlusInfo = [[NSDictionary alloc] initWithContentsOfURL:
|
||||||
|
[[NSBundle mainBundle] URLForResource:@"Google+" withExtension:@"plist"]];
|
||||||
|
|
||||||
|
return googlePlusInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *)googlePlusClientID {
|
||||||
|
|
||||||
|
return NSNullToNil([[self googlePlusInfo] valueForKeyPath:@"ClientID"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#pragma mark - TestFlight
|
||||||
|
|
||||||
- (NSDictionary *)testFlightInfo {
|
- (NSDictionary *)testFlightInfo {
|
||||||
|
|
||||||
@ -679,7 +699,6 @@
|
|||||||
|
|
||||||
#pragma mark - Crashlytics
|
#pragma mark - Crashlytics
|
||||||
|
|
||||||
|
|
||||||
- (NSDictionary *)crashlyticsInfo {
|
- (NSDictionary *)crashlyticsInfo {
|
||||||
|
|
||||||
static NSDictionary *crashlyticsInfo = nil;
|
static NSDictionary *crashlyticsInfo = nil;
|
||||||
@ -698,7 +717,6 @@
|
|||||||
|
|
||||||
#pragma mark - Localytics
|
#pragma mark - Localytics
|
||||||
|
|
||||||
|
|
||||||
- (NSDictionary *)localyticsInfo {
|
- (NSDictionary *)localyticsInfo {
|
||||||
|
|
||||||
static NSDictionary *localyticsInfo = nil;
|
static NSDictionary *localyticsInfo = nil;
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
#import <QuartzCore/QuartzCore.h>
|
#import <QuartzCore/QuartzCore.h>
|
||||||
#import <Social/Social.h>
|
#import <Social/Social.h>
|
||||||
#import "GooglePlusShare.h"
|
|
||||||
|
|
||||||
#import "MPUnlockViewController.h"
|
#import "MPUnlockViewController.h"
|
||||||
#import "MPAppDelegate.h"
|
#import "MPAppDelegate.h"
|
||||||
@ -837,11 +836,9 @@
|
|||||||
|
|
||||||
- (IBAction)google:(UIButton *)sender {
|
- (IBAction)google:(UIButton *)sender {
|
||||||
|
|
||||||
GooglePlusShare *share = [[GooglePlusShare alloc] initWithClientID:[[PearlInfoPlist get] objectForKeyPath:@"GooglePlusClientID"]];
|
id<GPPShareBuilder> shareDialog = [[MPAppDelegate get].googlePlus shareDialog];
|
||||||
[[[[share shareDialog]
|
[[[shareDialog setURLToShare:[NSURL URLWithString:@"http://masterpasswordapp.com"]]
|
||||||
setURLToShare:[NSURL URLWithString:@"http://masterpasswordapp.com"]]
|
setPrefillText:@"I've started doing passwords properly thanks to Master Password for iOS."] open];
|
||||||
setPrefillText:@"I've secured my accounts with Master Password: Actually secure passwords that cannot get lost."]
|
|
||||||
open];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)mail:(UIButton *)sender {
|
- (IBAction)mail:(UIButton *)sender {
|
||||||
|
@ -17,6 +17,4 @@
|
|||||||
@property (nonatomic, retain) NSNumber *typeTipShown;
|
@property (nonatomic, retain) NSNumber *typeTipShown;
|
||||||
@property (nonatomic, retain) NSNumber *loginNameTipShown;
|
@property (nonatomic, retain) NSNumber *loginNameTipShown;
|
||||||
|
|
||||||
+ (MPiOSConfig *)get;
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -63,16 +63,6 @@
|
|||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleURLTypes</key>
|
<key>CFBundleURLTypes</key>
|
||||||
<array>
|
<array>
|
||||||
<dict>
|
|
||||||
<key>CFBundleTypeRole</key>
|
|
||||||
<string>Editor</string>
|
|
||||||
<key>CFBundleURLName</key>
|
|
||||||
<string>facebook</string>
|
|
||||||
<key>CFBundleURLSchemes</key>
|
|
||||||
<array>
|
|
||||||
<string>fb257095917745237</string>
|
|
||||||
</array>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundleTypeRole</key>
|
<key>CFBundleTypeRole</key>
|
||||||
<string>Editor</string>
|
<string>Editor</string>
|
||||||
@ -88,8 +78,6 @@
|
|||||||
<string>[auto]</string>
|
<string>[auto]</string>
|
||||||
<key>FacebookAppID</key>
|
<key>FacebookAppID</key>
|
||||||
<string>257095917745237</string>
|
<string>257095917745237</string>
|
||||||
<key>GooglePlusClientID</key>
|
|
||||||
<string>1098891429568.apps.googleusercontent.com</string>
|
|
||||||
<key>LSRequiresIPhoneOS</key>
|
<key>LSRequiresIPhoneOS</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
@ -119,10 +107,6 @@
|
|||||||
<string>MainStoryboard_iPhone</string>
|
<string>MainStoryboard_iPhone</string>
|
||||||
<key>UIPrerenderedIcon</key>
|
<key>UIPrerenderedIcon</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>UIRequiredDeviceCapabilities</key>
|
|
||||||
<array>
|
|
||||||
<string>armv7</string>
|
|
||||||
</array>
|
|
||||||
<key>UIStatusBarHidden</key>
|
<key>UIStatusBarHidden</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>UIStatusBarStyle</key>
|
<key>UIStatusBarStyle</key>
|
||||||
|
Loading…
Reference in New Issue
Block a user