Changeset 782

Timestamp:

07/26/08 22:28:39 (4 months ago)

Author:

kaz

Message:

• Refactoring twitter network client

Location:

trunk/TwitterFon

Files:

• Classes/Controllers/PostViewController.h (modified) (2 diffs)
• Classes/Controllers/PostViewController.m (modified) (3 diffs)
• Classes/Controllers/TimelineViewController.m (modified) (1 diff)
• Classes/Network/PostTweet.h (deleted)
• Classes/Network/PostTweet.m (deleted)
• Classes/Network/TwitterClient.h (moved) (moved from trunk/TwitterFon/Classes/Network/TimelineDownloader.h) (1 diff)
• Classes/Network/TwitterClient.m (moved) (moved from trunk/TwitterFon/Classes/Network/TimelineDownloader.m) (5 diffs)
• Classes/Twitter/Timeline.h (modified) (2 diffs)
• Classes/Twitter/Timeline.m (modified) (5 diffs)
• TwitterFon.xcodeproj/project.pbxproj (modified) (7 diffs)

trunk/TwitterFon/Classes/Controllers/PostViewController.h

@@ -8 +8 @@
 
 #import <UIKit/UIKit.h>
-#import "PostTweet.h"
+#import "TwitterClient.h"
 #import "Message.h"
 #import "SendingWindow.h"
@@ -18 +18 @@
     IBOutlet NSObject*   delegate;
     IBOutlet NSObject*   appDelegate;
-    PostTweet*           post;
+    TwitterClient*       post;
     BOOL                 didPost;
     NSRange              textRange;

trunk/TwitterFon/Classes/Controllers/PostViewController.m

@@ -121 +121 @@
 - (IBAction) send: (id) sender
 {
-    post = [[PostTweet alloc] initWithDelegate:self];
+    post = [[TwitterClient alloc] initWithDelegate:self];
     [post post:text.text];
     [sendingWindow show];
@@ -143 +143 @@
 }
 
-- (void)postTweetDidSucceed:(NSDictionary*)dic
-{
+- (void)twitterClientDidSucceed:(TwitterClient*)sender messages:(NSObject*)obj;
+{
+    NSDictionary *dic = nil;
+    if ([obj isKindOfClass:[NSDictionary class]]) {
+        dic = (NSDictionary*)obj;    
+    }
+    
     [sendingWindow hide];
     
@@ -156 +161 @@
     [post autorelease];
     [self cancel:self];
-    didPost = true;
-}
-
-- (void)postTweetDidFail:(NSString*)error
+    didPost = (dic) ? true : false;
+}
+
+- (void)twitterClientDidFail:(TwitterClient*)sender error:(NSString*)error
 {
     [sendingWindow fail:error];

trunk/TwitterFon/Classes/Controllers/TimelineViewController.m

@@ -244 +244 @@
 
 //
-// TimelineDownloaderDelegate
+// TimelineDelegate
 //
 - (void)timelineDidReceiveNewMessage:(Message*)msg

trunk/TwitterFon/Classes/Network/TwitterClient.h

@@ -3 +3 @@
 #import "Message.h"
 
-@interface TimelineDownloader : TFConnection
+@interface TwitterClient : TFConnection
 {
 }
 
 - (void)get:(MessageType)type since:(NSString*)since;
+- (void)post:(NSString*)tweet;
 
 @end

trunk/TwitterFon/Classes/Network/TwitterClient.m

@@ -1 +1 @@
 //
-//  TimelineDownloader.m
-//  TwitterPhox
+//  TwitterClient.m
+//  TwitterFon
 //
 //  Created by kaz on 7/13/08.
@@ -7 +7 @@
 //
 
-#import "TimelineDownloader.h"
+#import "TwitterClient.h"
+#import "StringUtil.h"
 #import "JSON.h"
 #import "Message.h"
@@ -20 +21 @@
 //#define DEBUG_WITH_PUBLIC_TIMELINE
 
-@interface NSObject (TimelineDownloaderDelegate)
-- (void)timelineDownloaderDidSucceed:(TimelineDownloader*)sender messages:(NSArray*)messages;
-- (void)timelineDownloaderDidFail:(TimelineDownloader*)sender error:(NSError*)error;
+@interface NSObject (TwitterClientDelegate)
+- (void)twitterClientDidSucceed:(TwitterClient*)sender messages:(NSObject*)messages;
+- (void)twitterClientDidFail:(TwitterClient*)sender error:(NSString*)error;
 @end
 
-@implementation TimelineDownloader
+@implementation TwitterClient
 
 - (void)get:(MessageType)type since:(NSString*)since
@@ -57 +58 @@
 }
 
+- (void)post:(NSString*)tweet
+{
+    
+        NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username"];
+        NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password"];
+    
+        NSString* url = [NSString stringWithFormat:@"https://%@:%@@twitter.com/statuses/update.json",
+                     username, password];
+    
+    NSLog(@"%@", url);
+    
+    NSString *postString = [NSString stringWithFormat:@"status=%@&source=TwitterFon", [tweet encodeAsURIComponent]];
+    
+    [self post:url body:postString];
+    
+}
+
 - (void)TFConnectionDidFailWithError:(NSError*)error
 {
     [self alertError:@"Connection Failed" withMessage:[error localizedDescription]];
-    [delegate timelineDownloaderDidFail:self error:error];
+    [delegate twitterClientDidFail:self error:[error localizedDescription]];
 }
 
@@ -93 +111 @@
     
     if ([obj isKindOfClass:[NSDictionary class]]) {
+        NSDictionary* dic = (NSDictionary*)obj;
+        NSString *msg = [dic objectForKey:@"error"];
+        if (msg) {
+            NSLog(@"Twitter returns an error: %@", msg);
+            [self alertError:@"Server error" withMessage:msg];
+            [delegate twitterClientDidFail:self error:msg];
+        }
+        else {
+            [delegate twitterClientDidSucceed:self messages:obj];
+        }
+    }
+    else if ([obj isKindOfClass:[NSArray class]]) {
+        [delegate twitterClientDidSucceed:self messages:obj];
+    }
+    else {
+        NSLog(@"Null or wrong response: %@", content);
+        [delegate twitterClientDidSucceed:self messages:nil];
+    }
+    
+#if 0
+    if ([obj isKindOfClass:[NSDictionary class]]) {
         NSLog(@"%@", content);
         NSDictionary* dic = (NSDictionary*)obj;
         NSString *msg = [dic objectForKey:@"error"];
-        if (msg == nil) msg = @"";
+        if (msg == nil) {
+            msg = @"";
+        }
         NSLog(@"Twitter returns an error: %@", msg);
-        [self alertError:@"Server error" withMessage:msg];
-                [delegate timelineDownloaderDidFail:self error:nil];
+//        [self alertError:@"Server error" withMessage:msg];
+                [delegate twitterClientDidFail:self error:nil];
     }
     else if ([obj isKindOfClass:[NSArray class]]) {
         NSArray *ary = (NSArray*)obj;
         NSLog(@"received %d objects", [ary count]);
-        [delegate timelineDownloaderDidSucceed:self messages:ary];
+        [delegate twitterClientDidSucceed:self messages:ary];
     }
     else {
         NSLog(@"Null or wrong response: %@", content);
-        [delegate timelineDownloaderDidSucceed:self messages:nil];
+        [delegate twitterClientDidSucceed:self messages:nil];
     }
+#endif
 }
 

trunk/TwitterFon/Classes/Twitter/Timeline.h

@@ -1 +1 @@
 #import <UIKit/UIKit.h>
 #import "Message.h"
-#import "TimelineDownloader.h"
+#import "TwitterClient.h"
 
 @interface Timeline : NSObject
@@ -7 +7 @@
         IBOutlet NSObject*  delegate;
         NSMutableArray*     messages;
-        TimelineDownloader* timelineConn;
+        TwitterClient*      twitterClient;
     MessageType         type;
 }

trunk/TwitterFon/Classes/Twitter/Timeline.m

@@ -26 +26 @@
 {
         [messages release];
-        [timelineConn release];
+        [twitterClient release];
         [super dealloc];
 }
@@ -47 +47 @@
 - (void)update:(MessageType)aType
 {
-        if (timelineConn) return;
+        if (twitterClient) return;
     
     type = aType;
 
-        timelineConn = [[TimelineDownloader alloc] initWithDelegate:self];
+        twitterClient = [[TwitterClient alloc] initWithDelegate:self];
 
         NSString* lastMessageDate = nil;
@@ -57 +57 @@
             lastMessageDate = ((Message*)[messages lastObject]).createdAt;
     }
-        [timelineConn get:type since:lastMessageDate];
+        [twitterClient get:type since:lastMessageDate];
 }
 
@@ -80 +80 @@
 }
 
-- (void)timelineDownloaderDidSucceed:(TimelineDownloader*)sender messages:(NSArray*)ary
+- (void)twitterClientDidSucceed:(TwitterClient*)sender messages:(NSObject*)obj
 {
-        [timelineConn autorelease];
-        timelineConn = nil;
+        [twitterClient autorelease];
+        twitterClient = nil;
+
+    if (obj == nil) return;
     
-    if (ary == nil) {
+    NSArray *ary = nil;
+    if ([obj isKindOfClass:[NSArray class]]) {
+        ary = (NSArray*)obj;
+    }
+    else {
         return;
     }
@@ -115 +121 @@
 }
 
-- (void)timelineDownloaderDidFail:(TimelineDownloader*)sender error:(NSError*)error
+- (void)twitterClientDidFail:(TwitterClient*)sender error:(NSString*)error
 {
-        [timelineConn autorelease];
-        timelineConn = nil;
+        [twitterClient autorelease];
+        twitterClient = nil;
 }
 

trunk/TwitterFon/TwitterFon.xcodeproj/project.pbxproj

@@ -16 +16 @@
                 6E2BD0C10E35AE04003A8F69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E2BD0C00E35AE04003A8F69 /* QuartzCore.framework */; };
                 6E2BD11F0E35B3D2003A8F69 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E2BD11E0E35B3D2003A8F69 /* Default.png */; };
+                6E335EA40E3BBE0C008B15BB /* TwitterClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E335EA30E3BBE0C008B15BB /* TwitterClient.m */; };
                 6EAF29400E36F97E00129692 /* alert.png in Resources */ = {isa = PBXBuildFile; fileRef = 6EAF293F0E36F97E00129692 /* alert.png */; };
                 6ED17FA70E38D3A0006E8AB7 /* forward.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED17FA50E38D3A0006E8AB7 /* forward.png */; };
@@ -25 +26 @@
                 6EDD27740E3B5429002E09A0 /* TinyURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDD27730E3B5429002E09A0 /* TinyURL.m */; };
                 6EEBF7000E3B1F390003EA63 /* ImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEBF6FA0E3B1F390003EA63 /* ImageDownloader.m */; };
-                6EEBF7010E3B1F390003EA63 /* PostTweet.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEBF6FC0E3B1F390003EA63 /* PostTweet.m */; };
-                6EEBF7020E3B1F390003EA63 /* TimelineDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEBF6FE0E3B1F390003EA63 /* TimelineDownloader.m */; };
                 6EEBF70C0E3B1FD40003EA63 /* ColorUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEBF7040E3B1FD40003EA63 /* ColorUtils.m */; };
                 6EEBF70D0E3B1FD40003EA63 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EEBF7050E3B1FD40003EA63 /* main.m */; };
@@ -71 +70 @@
                 6E2BD0C00E35AE04003A8F69 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
                 6E2BD11E0E35B3D2003A8F69 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
+                6E335EA20E3BBE0C008B15BB /* TwitterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwitterClient.h; path = Network/TwitterClient.h; sourceTree = "<group>"; };
+                6E335EA30E3BBE0C008B15BB /* TwitterClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TwitterClient.m; path = Network/TwitterClient.m; sourceTree = "<group>"; };
                 6EAF293F0E36F97E00129692 /* alert.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = alert.png; sourceTree = "<group>"; };
                 6ED17FA50E38D3A0006E8AB7 /* forward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward.png; sourceTree = "<group>"; };
@@ -83 +84 @@
                 6EEBF6F90E3B1F390003EA63 /* ImageDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageDownloader.h; path = Network/ImageDownloader.h; sourceTree = "<group>"; };
                 6EEBF6FA0E3B1F390003EA63 /* ImageDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageDownloader.m; path = Network/ImageDownloader.m; sourceTree = "<group>"; };
-                6EEBF6FB0E3B1F390003EA63 /* PostTweet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PostTweet.h; path = Network/PostTweet.h; sourceTree = "<group>"; };
-                6EEBF6FC0E3B1F390003EA63 /* PostTweet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PostTweet.m; path = Network/PostTweet.m; sourceTree = "<group>"; };
-                6EEBF6FD0E3B1F390003EA63 /* TimelineDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimelineDownloader.h; path = Network/TimelineDownloader.h; sourceTree = "<group>"; };
-                6EEBF6FE0E3B1F390003EA63 /* TimelineDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TimelineDownloader.m; path = Network/TimelineDownloader.m; sourceTree = "<group>"; };
                 6EEBF7030E3B1FD40003EA63 /* ColorUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorUtils.h; path = Classes/OtherSources/ColorUtils.h; sourceTree = "<group>"; };
                 6EEBF7040E3B1FD40003EA63 /* ColorUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorUtils.m; path = Classes/OtherSources/ColorUtils.m; sourceTree = "<group>"; };
@@ -301 +298 @@
                                 6EEBF6F90E3B1F390003EA63 /* ImageDownloader.h */,
                                 6EEBF6FA0E3B1F390003EA63 /* ImageDownloader.m */,
-                                6EEBF6FB0E3B1F390003EA63 /* PostTweet.h */,
-                                6EEBF6FC0E3B1F390003EA63 /* PostTweet.m */,
-                                6EEBF6FD0E3B1F390003EA63 /* TimelineDownloader.h */,
-                                6EEBF6FE0E3B1F390003EA63 /* TimelineDownloader.m */,
                                 6E092C390E3B41D40039FEE3 /* TFConnection.h */,
                                 6E092C3A0E3B41D40039FEE3 /* TFConnection.m */,
+                                6E335EA20E3BBE0C008B15BB /* TwitterClient.h */,
+                                6E335EA30E3BBE0C008B15BB /* TwitterClient.m */,
                                 6EDD27720E3B5429002E09A0 /* TinyURL.h */,
                                 6EDD27730E3B5429002E09A0 /* TinyURL.m */,
@@ -450 +445 @@
                                 6EDC01D10E344B5600FF142E /* DBConnection.m in Sources */,
                                 6EEBF7000E3B1F390003EA63 /* ImageDownloader.m in Sources */,
-                                6EEBF7010E3B1F390003EA63 /* PostTweet.m in Sources */,
-                                6EEBF7020E3B1F390003EA63 /* TimelineDownloader.m in Sources */,
                                 6EEBF70C0E3B1FD40003EA63 /* ColorUtils.m in Sources */,
                                 6EEBF70D0E3B1FD40003EA63 /* main.m in Sources */,
@@ -467 +460 @@
                                 6E092C3B0E3B41D40039FEE3 /* TFConnection.m in Sources */,
                                 6EDD27740E3B5429002E09A0 /* TinyURL.m in Sources */,
+                                6E335EA40E3BBE0C008B15BB /* TwitterClient.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;