From 4cf57db4d83a176949b9c7295c228e4c18e1a602 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Tue, 14 May 2013 11:46:37 -0700 Subject: [PATCH] Update BButton --- .gitmodules | 2 +- Media/onboarding_4@2x.png | Bin 23869 -> 0 bytes .../Model.xcdatamodel/contents | 3 +-- OpenWatch/OWAccountAPIClient.m | 1 - OpenWatch/_OWUser.h | 18 ------------------ OpenWatch/_OWUser.m | 8 -------- Submodules/BButton | 2 +- 7 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 Media/onboarding_4@2x.png diff --git a/.gitmodules b/.gitmodules index 4bee6b0..431cb7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,4 +51,4 @@ url = https://github.com/davbeck/TUSafariActivity.git [submodule "Submodules/BButton"] path = Submodules/BButton - url = https://github.com/jessesquires/BButton.git + url = https://github.com/mattlawer/BButton.git diff --git a/Media/onboarding_4@2x.png b/Media/onboarding_4@2x.png deleted file mode 100644 index 510f9aea42de5ce2e689993a5938ec675bc2cfe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23869 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 - @@ -85,6 +84,6 @@ - + \ No newline at end of file diff --git a/OpenWatch/OWAccountAPIClient.m b/OpenWatch/OWAccountAPIClient.m index 539a0de..1d51c3f 100644 --- a/OpenWatch/OWAccountAPIClient.m +++ b/OpenWatch/OWAccountAPIClient.m @@ -133,7 +133,6 @@ - (void) processLoginDictionary:(NSDictionary*)responseObject account:(OWAccount account.publicUploadToken = [responseObject objectForKey:kPubTokenKey]; account.privateUploadToken = [responseObject objectForKey:kPrivTokenKey]; account.accountID = [responseObject objectForKey:kServerIDKey]; - account.user.csrfToken = [responseObject objectForKey:kCSRFTokenKey]; } - (void) updateUserPushToken:(NSData*)token { diff --git a/OpenWatch/_OWUser.h b/OpenWatch/_OWUser.h index 8c6b808..424e526 100644 --- a/OpenWatch/_OWUser.h +++ b/OpenWatch/_OWUser.h @@ -5,7 +5,6 @@ #import "OWServerObject.h" extern const struct OWUserAttributes { - __unsafe_unretained NSString *csrfToken; __unsafe_unretained NSString *thumbnailURLString; __unsafe_unretained NSString *username; } OWUserAttributes; @@ -26,7 +25,6 @@ extern const struct OWUserFetchedProperties { - @interface OWUserID : NSManagedObjectID {} @end @@ -40,16 +38,6 @@ extern const struct OWUserFetchedProperties { -@property (nonatomic, strong) NSString* csrfToken; - - - -//- (BOOL)validateCsrfToken:(id*)value_ error:(NSError**)error_; - - - - - @property (nonatomic, strong) NSString* thumbnailURLString; @@ -116,12 +104,6 @@ extern const struct OWUserFetchedProperties { @interface _OWUser (CoreDataGeneratedPrimitiveAccessors) -- (NSString*)primitiveCsrfToken; -- (void)setPrimitiveCsrfToken:(NSString*)value; - - - - - (NSString*)primitiveThumbnailURLString; - (void)setPrimitiveThumbnailURLString:(NSString*)value; diff --git a/OpenWatch/_OWUser.m b/OpenWatch/_OWUser.m index 4fb74f1..d2a868e 100644 --- a/OpenWatch/_OWUser.m +++ b/OpenWatch/_OWUser.m @@ -4,7 +4,6 @@ #import "_OWUser.h" const struct OWUserAttributes OWUserAttributes = { - .csrfToken = @"csrfToken", .thumbnailURLString = @"thumbnailURLString", .username = @"username", }; @@ -51,13 +50,6 @@ + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key { -@dynamic csrfToken; - - - - - - @dynamic thumbnailURLString; diff --git a/Submodules/BButton b/Submodules/BButton index b1798d4..f927c8d 160000 --- a/Submodules/BButton +++ b/Submodules/BButton @@ -1 +1 @@ -Subproject commit b1798d42eff00cad26e0b63f8f9eb39c035d93af +Subproject commit f927c8d1e89b61caab9effcaaf91bf5002d423d5