Move request methods into messageHandler #14

sosmessage · Nov 18, 2011 · 2c55fbe · 2c55fbe
1 parent bb779f3
commit 2c55fbe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/iOS/sosmessage/sosmessage/SMDetailViewController.m b/iOS/sosmessage/sosmessage/SMDetailViewController.m
@@ -194,7 +194,7 @@ - (void)renderTitle {
 }
 
 -(void)fetchAMessage {
-    [self.messageHandler requestUrl:[NSString stringWithFormat:@"%@/api/v1/category/%@/message",SM_URL,[self.category objectForKey:@"id"]]];
+    [self.messageHandler requestRandomMessageForCategory:[self.category objectForKey:@"id"]];
 }
 
 #pragma mark NSMessageHandlerDelegate

diff --git a/iOS/sosmessage/sosmessage/SMMessagesHandler.h b/iOS/sosmessage/sosmessage/SMMessagesHandler.h
@@ -17,6 +17,9 @@
 - (id)initWithDelegate:(id)delegate;
 - (void)requestUrl:(NSString*)url;
 
+- (void)requestCategories;
+- (void)requestRandomMessageForCategory:(NSString*)aCategoryId;
+
 @end
 
 @protocol SMMessageDelegate

diff --git a/iOS/sosmessage/sosmessage/SMMessagesHandler.m b/iOS/sosmessage/sosmessage/SMMessagesHandler.m
@@ -64,6 +64,8 @@ -(void)resetData {
     }
 }
 
+#pragma mark Requesting ....
+
 - (void)requestUrl:(NSString*)url {
     if (receiving && currentConnection) {
         [currentConnection cancel];
@@ -80,6 +82,15 @@ - (void)requestUrl:(NSString*)url {
     [nsUrl release];
 }
 
+- (void)requestCategories {
+    [self requestUrl:[NSString stringWithFormat:@"%@/api/v1/categories", SM_URL]];
+}
+
+- (void)requestRandomMessageForCategory:(NSString*)aCategoryId {
+    [self requestUrl:[NSString stringWithFormat:@"%@/api/v1/category/%@/message", SM_URL, aCategoryId]];
+}
+
+#pragma mark -
 #pragma mark NSURLConnection methods
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
     [self resetData];

diff --git a/iOS/sosmessage/sosmessage/ViewController.m b/iOS/sosmessage/sosmessage/ViewController.m
@@ -31,7 +31,7 @@ - (void)viewDidLoad
     self.messageHandler = iMessageHandler;
     [iMessageHandler release];
 
-    [self.messageHandler requestUrl:[NSString stringWithFormat:@"%@/api/v1/categories", SM_URL]];
+    [self.messageHandler requestCategories];
 }
 
 - (void)viewDidUnload