Permalink
Browse files

Resolved conflict with the merge

  • Loading branch information...
1 parent be95e10 commit fcba84d1d43396ccf0f492e70e56ed5d1ab3b20f @lucascorrea committed Jul 6, 2012
Showing with 0 additions and 39 deletions.
  1. +0 −39 SCTwitter/SCTwitter/SCTwitter.m
@@ -43,7 +43,6 @@ - (void)getUserInformationFor:(NSString *)username callback:(void (^)(BOOL succe
- (void)directMessage:(NSString *)message to:(NSString *)username callback:(void (^)(BOOL success, id result))aCallback;
- (void)retweetMessageUpdateID:(NSString *)updateID callback:(void (^)(BOOL success, id result))aCallback;
- (void)postWithMessage:(NSString *)message uploadPhoto:(UIImage *)image latitude:(double)lat longitude:(double)lng callback:(void (^)(BOOL success, id result))aCallback;
-- (void)postWithMessage:(NSString *)message replyToStatusId:(unsigned long)replyTo latitude:(double)lat longitude:(double)lng callback:(void (^)(BOOL success, id result))aCallback;
@end
@@ -139,16 +138,6 @@ + (void)postWithMessage:(NSString *)message uploadPhoto:(UIImage *)image latitud
[[SCTwitter shared] postWithMessage:message uploadPhoto:image latitude:lat longitude:lng callback:aCallback];
}
-+ (void)postWithMessage:(NSString *)message latitude:(double)lat longitude:(double)lng callback:(void (^)(BOOL success, id result))aCallback
-{
- [[SCTwitter shared] postWithMessage:message replyToStatusId:0 latitude:lat longitude:lng callback:aCallback];
-}
-
-+ (void)postWithMessage:(NSString *)message replyToStatusId:(unsigned long)replyTo latitude:(double)lat longitude:(double)lng callback:(void (^)(BOOL success, id result))aCallback
-{
- [[SCTwitter shared] postWithMessage:message replyToStatusId:replyTo latitude:lat longitude:lng callback:aCallback];
-}
-
@@ -335,23 +324,6 @@ - (void)postWithMessage:(NSString *)message uploadPhoto:(UIImage *)image latitud
}
}
-- (void)postWithMessage:(NSString *)message replyToStatusId:(unsigned long)replyTo latitude:(double)lat longitude:(double)lng callback:(void (^)(BOOL success, id result))aCallback
-{
- if (![self isSessionValid]) {
-
- // Call the login callback if we have one
- if (aCallback) {
- aCallback(NO, @"Error");
- }
-
- }else{
-
- self.statusCallback = aCallback;
- [_engine sendUpdate:message inReplyTo:replyTo latitude:lat longitude:lng];
- }
-}
-
-
#pragma mark -
@@ -383,17 +355,6 @@ - (void) OAuthTwitterControllerCanceled: (SA_OAuthTwitterController *) controlle
}
-
-- (void)OAuthTwitterControllerCanceled:(SA_OAuthTwitterController *)controller
-{
- // Call the login callback
- if (self.loginCallback) {
- self.loginCallback(NO);
- self.loginCallback = nil;
- }
-}
-
-
#pragma mark -
#pragma mark - SA_OAuthTwitterEngineDelegate Methods

0 comments on commit fcba84d

Please sign in to comment.