adium 5407:55fda25d96ca: Fix STTwitter to use ivars and @synthes...
commits at adium.im
commits at adium.im
Thu Mar 21 13:08:38 UTC 2013
details: http://hg.adium.im/adium/rev/55fda25d96ca
revision: 5407:55fda25d96ca
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Thu Mar 21 14:06:17 2013 +0100
Fix STTwitter to use ivars and @synthesize all properties, and not use [] syntax for dictionaries or arrays, so it can work on 32 bit Macs.
diffs (328 lines):
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.h
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.h Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.h Thu Mar 21 14:06:17 2013 +0100
@@ -20,7 +20,7 @@
//
#import <Foundation/Foundation.h>
-
+#import "STTwitterOAuth.h"
/*
Partial Objective-C front-end for https://dev.twitter.com/docs/api/1.1
*/
@@ -42,7 +42,11 @@
https://dev.twitter.com/blog/new-withheld-content-fields-api-responses
*/
- at interface STTwitterAPIWrapper : NSObject
+ at interface STTwitterAPIWrapper : NSObject {
+ NSObject <STTwitterOAuthProtocol> *_oauth;
+ NSString *_consumerName;
+ NSString *_userName;
+}
+ (STTwitterAPIWrapper *)twitterAPIWithOAuthConsumerName:(NSString *)consumerName
consumerKey:(NSString *)consumerKey
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m Thu Mar 21 14:06:17 2013 +0100
@@ -18,6 +18,10 @@
@implementation STTwitterAPIWrapper
+ at synthesize oauth = _oauth;
+ at synthesize consumerName = _consumerName;
+ at synthesize userName = _userName;
+
#if TARGET_OS_IPHONE
#else
@@ -183,8 +187,8 @@
if (!mparams)
mparams = [NSMutableDictionary new];
- if (optionalSinceID) mparams[@"since_id"] = optionalSinceID;
- if (optionalCount != NSNotFound) mparams[@"count"] = [@(optionalCount) stringValue];
+ if (optionalSinceID) [mparams setObject:optionalSinceID forKey:@"since_id"];
+ if (optionalCount != NSNotFound) [mparams setObject:[@(optionalCount) stringValue] forKey:@"count"];
__block NSMutableArray *statuses = [NSMutableArray new];
__block void (^requestHandler)(id response) = nil;
@@ -200,7 +204,7 @@
if (lastID) {
NSUInteger maxID = [[NSDecimalNumber decimalNumberWithString:lastID] unsignedIntegerValue];
if (maxID != NSNotFound)
- mparams[@"max_id"] = [@(--maxID) stringValue];
+ [mparams setObject:[@(--maxID) stringValue] forKey:@"max_id"];
}
[_oauth getResource:timeline parameters:mparams
@@ -293,16 +297,16 @@
NSMutableDictionary *md = [NSMutableDictionary dictionaryWithObject:status forKey:@"status"];
if(optionalExistingStatusID) {
- md[@"in_reply_to_status_id"] = optionalExistingStatusID;
+ [md setObject:optionalExistingStatusID forKey:@"in_reply_to_status_id"];
}
if(optionalPlaceID) {
- md[@"place_id"] = optionalPlaceID;
- md[@"display_coordinates"] = @"true";
+ [md setObject:optionalPlaceID forKey:@"place_id"];
+ [md setObject:@"true" forKey:@"display_coordinates"];
} else if(optionalLat && optionalLon) {
- md[@"lat"] = optionalLat;
- md[@"lon"] = optionalLon;
- md[@"display_coordinates"] = @"true";
+ [md setObject:optionalLat forKey:@"lat"];
+ [md setObject:optionalLon forKey:@"lon"];
+ [md setObject:@"true" forKey:@"display_coordinates"];
}
[_oauth postResource:@"statuses/update.json" parameters:md successBlock:^(id response) {
@@ -326,16 +330,16 @@
NSMutableDictionary *md = [[ @{ @"status":status, @"media[]":data, @"postDataKey":@"media[]" } mutableCopy] autorelease];
if(optionalExistingStatusID) {
- md[@"in_reply_to_status_id"] = optionalExistingStatusID;
+ [md setObject:optionalExistingStatusID forKey:@"in_reply_to_status_id"];
}
if(optionalPlaceID) {
- md[@"place_id"] = optionalPlaceID;
- md[@"display_coordinates"] = @"true";
+ [md setObject:optionalPlaceID forKey:@"place_id"];
+ [md setObject:@"true" forKey:@"display_coordinates"];
} else if(optionalLat && optionalLon) {
- md[@"lat"] = optionalLat;
- md[@"lon"] = optionalLon;
- md[@"display_coordinates"] = @"true";
+ [md setObject:optionalLat forKey:@"lat"];
+ [md setObject:optionalLon forKey:@"lon"];
+ [md setObject:@"true" forKey:@"display_coordinates"];
}
[_oauth postResource:@"statuses/update_with_media.json" parameters:md successBlock:^(id response) {
@@ -431,7 +435,7 @@
if (response) {
[ids addObjectsFromArray:[response objectForKey:@"users"]];
cursor = [[response objectForKey:@"next_cursor_str"] copy];
- d[@"cursor"] = cursor;
+ [d setObject:cursor forKey:@"cursor"];
}
if ([cursor isEqualToString:@"0"]) {
@@ -487,7 +491,7 @@
successBlock:(void(^)(NSDictionary *relationship))successBlock
errorBlock:(void(^)(NSError *error))errorBlock {
NSMutableDictionary *d = [NSMutableDictionary dictionaryWithObject:screenName forKey:@"screen_name"];
- d[@"device"] = notify ? @"true" : @"false";
+ [d setObject:notify ? @"true" : @"false" forKey:@"device"];
[_oauth getResource:@"friendships/update.json" parameters:d successBlock:^(id response) {
successBlock(removeNull(response));
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.h
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.h Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.h Thu Mar 21 14:06:17 2013 +0100
@@ -10,7 +10,9 @@
#import "STTwitterOAuthProtocol.h"
@interface STTwitterAppOnly : NSObject <STTwitterOAuthProtocol> {
-
+ NSString *_consumerKey;
+ NSString *_consumerSecret;
+ NSString *_bearerToken;
}
@property (nonatomic, retain) NSString *consumerKey;
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.m
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.m Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.m Thu Mar 21 14:06:17 2013 +0100
@@ -16,6 +16,11 @@
@implementation STTwitterAppOnly
+ at synthesize consumerKey = _consumerKey;
+ at synthesize consumerSecret = _consumerSecret;
+ at synthesize bearerToken = _bearerToken;
+
+
- (void)dealloc {
[_consumerKey release];
[_consumerSecret release];
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.h
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.h Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.h Thu Mar 21 14:06:17 2013 +0100
@@ -20,7 +20,19 @@
...
*/
- at interface STTwitterOAuth : NSObject <STTwitterOAuthProtocol>
+ at interface STTwitterOAuth : NSObject <STTwitterOAuthProtocol> {
+ NSString *_username;
+ NSString *_password;
+ NSString *_oauthConsumerName;
+ NSString *_oauthConsumerKey;
+ NSString *_oauthConsumerSecret;
+ NSString *_oauthRequestToken;
+ NSString *_oauthRequestTokenSecret;
+ NSString *_oauthAccessToken;
+ NSString *_oauthAccessTokenSecret;
+ NSString *_testOauthNonce;
+ NSString *_testOauthTimestamp;
+}
+ (STTwitterOAuth *)twitterServiceWithConsumerName:(NSString *)consumerName
consumerKey:(NSString *)consumerKey
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m Thu Mar 21 14:06:17 2013 +0100
@@ -38,6 +38,18 @@
@implementation STTwitterOAuth
+ at synthesize username = _username;
+ at synthesize password = _password;
+ at synthesize oauthConsumerName = _oauthConsumerName;
+ at synthesize oauthConsumerKey = _oauthConsumerKey;
+ at synthesize oauthConsumerSecret = _oauthConsumerSecret;
+ at synthesize oauthRequestToken = _oauthRequestToken;
+ at synthesize oauthRequestTokenSecret = _oauthRequestTokenSecret;
+ at synthesize oauthAccessToken = _oauthAccessToken;
+ at synthesize oauthAccessTokenSecret = _oauthAccessTokenSecret;
+ at synthesize testOauthNonce = _testOauthNonce;
+ at synthesize testOauthTimestamp = _testOauthTimestamp;
+
- (void)dealloc {
[_username release];
[_password release];
@@ -276,8 +288,8 @@
NSURL *url = [NSURL URLWithString:s];
- self.oauthRequestToken = d[@"oauth_token"];
- self.oauthRequestTokenSecret = d[@"oauth_token_secret"]; // unused
+ self.oauthRequestToken = [d objectForKey:@"oauth_token"];
+ self.oauthRequestTokenSecret = [d objectForKey:@"oauth_token_secret"]; // unused
successBlock(url, _oauthRequestToken);
@@ -303,10 +315,10 @@
// https://api.twitter.com/oauth/authorize?oauth_token=OAUTH_TOKEN&oauth_token_secret=OAUTH_TOKEN_SECRET&user_id=USER_ID&screen_name=SCREEN_NAME
- self.oauthAccessToken = dict[@"oauth_token"];
- self.oauthAccessTokenSecret = dict[@"oauth_token_secret"];
+ self.oauthAccessToken = [dict objectForKey:@"oauth_token"];
+ self.oauthAccessTokenSecret = [dict objectForKey:@"oauth_token_secret"];
- successBlock(_oauthAccessToken, _oauthAccessTokenSecret, dict[@"user_id"], dict[@"screen_name"]);
+ successBlock(_oauthAccessToken, _oauthAccessTokenSecret, [dict objectForKey:@"user_id"], [dict objectForKey:@"screen_name"]);
} errorBlock:^(NSError *error) {
errorBlock(error);
}];
@@ -333,10 +345,10 @@
// https://api.twitter.com/oauth/authorize?oauth_token=OAUTH_TOKEN&oauth_token_secret=OAUTH_TOKEN_SECRET&user_id=USER_ID&screen_name=SCREEN_NAME
- self.oauthAccessToken = dict[@"oauth_token"];
- self.oauthAccessTokenSecret = dict[@"oauth_token_secret"];
+ self.oauthAccessToken = [dict objectForKey:@"oauth_token"];
+ self.oauthAccessTokenSecret = [dict objectForKey:@"oauth_token_secret"];
- successBlock(_oauthAccessToken, _oauthAccessTokenSecret, dict[@"user_id"], dict[@"screen_name"]);
+ successBlock(_oauthAccessToken, _oauthAccessTokenSecret, [dict objectForKey:@"user_id"], [dict objectForKey:@"screen_name"]);
} errorBlock:^(NSError *error) {
errorBlock(error);
@@ -554,7 +566,7 @@
NSArray *kv = [s componentsSeparatedByString:@"="];
NSAssert([kv count] == 2, @"-- bad length");
if([kv count] != 2) continue;
- [ma addObject:@{kv[0] : kv[1]}];
+ [ma addObject:@{[kv objectAtIndex:0] : [kv objectAtIndex:1]}];
}
return ma;
@@ -603,7 +615,7 @@
continue;
}
- [md setObject:keyValue[1] forKey:keyValue[0]];
+ [md setObject:[keyValue objectAtIndex:1] forKey:[keyValue objectAtIndex:0]];
}
return md;
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.h
--- a/Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.h Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.h Thu Mar 21 14:06:17 2013 +0100
@@ -22,7 +22,33 @@
typedef void (^completionBlock_t)(NSDictionary *headers, NSString *body);
typedef void (^errorBlock_t)(NSError *error);
- at interface STHTTPRequest : NSObject <NSURLConnectionDelegate>
+ at interface STHTTPRequest : NSObject <NSURLConnectionDelegate> {
+ NSURLConnection *_connection;
+ NSMutableData *_responseData;
+ NSString *_responseStringEncodingName;
+ NSDictionary *_responseHeaders;
+ NSURL *_url;
+ NSError *_error;
+ NSString *_POSTFilePath;
+ NSData *_POSTFileData;
+ NSString *_POSTFileMimeType;
+ NSString *_POSTFileName;
+ NSString *_POSTFileParameter;
+
+ uploadProgressBlock_t _uploadProgressBlock;
+ completionBlock_t _completionBlock;
+ errorBlock_t _errorBlock;
+ NSStringEncoding _postDataEncoding;
+ NSDictionary *_POSTDictionary;
+ NSData *_POSTData;
+ NSMutableDictionary *_requestHeaders;
+ NSInteger _responseStatus;
+ NSString *_responseString;
+ NSStringEncoding _forcedResponseEncoding;
+ BOOL _encodePOSTDictionary;
+ NSUInteger _timeoutSeconds;
+ BOOL _addCredentialsToURL;
+}
@property (copy) uploadProgressBlock_t uploadProgressBlock;
@property (copy) completionBlock_t completionBlock;
diff -r 3b1818acba35 -r 55fda25d96ca Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.m
--- a/Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.m Thu Mar 21 11:36:41 2013 +0100
+++ b/Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.m Thu Mar 21 14:06:17 2013 +0100
@@ -36,6 +36,31 @@
@implementation STHTTPRequest
+ at synthesize connection = _connection;
+ at synthesize responseData = _responseData;
+ at synthesize responseStringEncodingName = _responseStringEncodingName;
+ at synthesize responseHeaders = _responseHeaders;
+ at synthesize url = _url;
+ at synthesize error = _error;
+ at synthesize POSTFilePath = _POSTFilePath;
+ at synthesize POSTFileData = _POSTFileData;
+ at synthesize POSTFileMimeType = _POSTFileMimeType;
+ at synthesize POSTFileName = _POSTFileName;
+ at synthesize POSTFileParameter = _POSTFileParameter;
+ at synthesize uploadProgressBlock = _uploadProgressBlock;
+ at synthesize completionBlock = _completionBlock;
+ at synthesize errorBlock = _errorBlock;
+ at synthesize postDataEncoding = _postDataEncoding;
+ at synthesize POSTDictionary = _POSTDictionary;
+ at synthesize POSTData = _POSTData;
+ at synthesize requestHeaders = _requestHeaders;
+ at synthesize responseStatus = _responseStatus;
+ at synthesize responseString = _responseString;
+ at synthesize forcedResponseEncoding = _forcedResponseEncoding;
+ at synthesize encodePOSTDictionary = _encodePOSTDictionary;
+ at synthesize timeoutSeconds = _timeoutSeconds;
+ at synthesize addCredentialsToURL = _addCredentialsToURL;
+
#pragma mark Initializers
+ (STHTTPRequest *)requestWithURL:(NSURL *)url {
More information about the commits
mailing list