Own Thread for API access in MainMenu. Pref Window still networking in main thread.

RedditBar.xcodeproj/project.pbxproj

@@ -37,10 +37,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		E90E74B3184FAA0F00F38929 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E90E74B3184FAA0F00F38929 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E90E74B6184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		E90E74B7184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Prefs.strings; sourceTree = "<group>"; };
-		E90E74B8184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E90E74B8184FAADE00F38929 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E90E74B9184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E90E74BA184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/Credits.rtf; sourceTree = "<group>"; };
 		E90E74BB184FAADE00F38929 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };

RedditBar/AppDelegate.h

@@ -30,6 +30,12 @@
 -(IBAction)showAbout:(id)sender;
 -(IBAction)linkToOpen:(id)sender;
 
+-(void)reloadListWithOptions;
+-(void)reloadListIsAuthenticatedCallback;
+-(void)reloadListNotAuthenticatedCallback;
+-(void)reloadListHasSubredditsCallback:(NSArray *)items;
+-(void)reloadListHasFrontpageCallback:(NSArray *)items;
+
 -(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length;
 
 @end

RedditBar/AppDelegate.m

@@ -57,54 +57,60 @@
     [currentState setLength:[store integerForKey:@"length"]];
 }
 
--(void)reloadListWithOptions {
-    if ([currentState.modhash isEqualToString:@""]) {
-        [firstMenuItem setTitle:NSLocalizedString(@"Not logged in!", @"Statusitem when no modhash is stored")];
+-(void)reloadListNotAuthenticatedCallback {
+    [firstMenuItem setTitle:NSLocalizedString(@"Login Error!", @"Statusitem when API is not authenticated")];
+    [self clearMenuItems];
+    [firstMenuItem setHidden:NO];
+}
+
+-(void)reloadListHasFrontpageCallback:(NSArray *)items {
+    if (items == nil) {
+        [firstMenuItem setTitle:NSLocalizedString(@"Error reading Frontpage!", @"Status api Read error")];
         [self clearMenuItems];
         [firstMenuItem setHidden:NO];
-        [self showPreferences:nil];
         return;
     }
-    api = [[Reddit alloc] initWithUsername:currentState.username Modhash:currentState.modhash];
-    NSString *tmp = @"";
-    if (![api isAuthenticatedNewModhash:&tmp]) {
-        [firstMenuItem setTitle:NSLocalizedString(@"Login Error!", @"Statusitem when API is not authenticated")];
+    redditItems = items;
+    [self clearMenuItems];
+    [firstMenuItem setHidden:YES];
+    [self putItemArrayInMenu:redditItems];
+}
+
+-(void)reloadListHasSubredditsCallback:(NSArray *)items {
+    if (items == nil) {
+        [firstMenuItem setTitle:NSLocalizedString(@"Error reading Subreddits!", @"Status api read error")];
         [self clearMenuItems];
         [firstMenuItem setHidden:NO];
         return;
     }
-    
-    // Reddit gives out new modhashes all the time??
-    //if (![tmp isEqualToString:@""]) {
-    //    NSLog(@"Modhash has changed!\n");
-    //    currentState.modhash = tmp; // We got a new modhash from reddit
-    //    [self savePreferences];
-    //}
-    
-    if (currentState.useSubscriptions) {
-        NSArray *items = [api readFrontpageLength:currentState.length];
-        if (items == nil) {
-            [firstMenuItem setTitle:NSLocalizedString(@"Error reading Frontpage!", @"Status api Read error")];
-            [self clearMenuItems];
-            [firstMenuItem setHidden:NO];
-            return;
-        }
-        redditItems = items;
-    } else {
-        NSArray *items = [api readSubreddits:currentState.subreddits Length:currentState.length];
-        if (items == nil) {
-            [firstMenuItem setTitle:NSLocalizedString(@"Error reading Subreddits!", @"Status api read error")];
-            [self clearMenuItems];
-            [firstMenuItem setHidden:NO];
-            return;
-        }
-        redditItems = items;
-    }
+    redditItems = items;
     [self clearMenuItems];
     [firstMenuItem setHidden:YES];
     [self putItemArrayInMenu:redditItems];
 }
 
+-(void)reloadListIsAuthenticatedCallback {
+    if (currentState.useSubscriptions) {
+        [NSThread detachNewThreadSelector:@selector(readFrontpage:) toTarget:api withObject:self];
+    } else {
+        [api setSubreddits:currentState.subreddits];
+        [NSThread detachNewThreadSelector:@selector(readSubreddits:) toTarget:api withObject:self];
+    }
+}
+
+-(void)reloadListWithOptions {
+    if ([currentState.modhash isEqualToString:@""]) {
+        [firstMenuItem setTitle:NSLocalizedString(@"Not logged in!", @"Statusitem when no modhash is stored")];
+        [self clearMenuItems];
+        [firstMenuItem setHidden:NO];
+        [self showPreferences:nil];
+        return;
+    }
+    
+    api = [[Reddit alloc] initWithUsername:currentState.username Modhash:currentState.modhash Length:currentState.length];
+    [NSThread detachNewThreadSelector:@selector(isAuthenticatedNewModhash:) toTarget:api withObject:self];
+}
+
 -(IBAction)linkToOpen:(id)sender {
     NSString *title = [(NSMenuItem *)sender title];
     if ([title isEqualToString:NSLocalizedString(@"Link...", nil)]) {

RedditBar/Reddit.h

@@ -14,16 +14,22 @@
 @property (atomic, retain) NSString *username;
 @property (atomic, retain) NSString *modhash;
 @property (atomic, retain) NSString *password;
+@property (atomic) NSInteger length;
+@property (atomic, retain) NSArray *subreddits;
 
+// Used by Pref Window, unthreaded
 -(id)initWithUsername:(NSString *)name Password:(NSString *)pass;
 -(NSString *)queryModhash;
 
--(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash;
--(BOOL)isAuthenticatedNewModhash:(NSString **)newModHash;
+// Used by MainMenu
+-(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash Length:(NSInteger)leng;
 
--(NSArray *)readFrontpageLength:(NSInteger)length;
--(NSArray *)readSubreddits:(NSArray *)source Length:(NSInteger)length;
+// Use Threaded!
+-(void)isAuthenticatedNewModhash:(id)parent;
+-(void)readFrontpage:(id)parent;
+-(void)readSubreddits:(id)parent;
 
+// Internal
 -(NSData *)queryAPI:(NSString *)api withData:(NSString *)string andResponse:(NSHTTPURLResponse **)res;
 -(NSString *)urlencode:(NSString *)string;
 

RedditBar/Reddit.m

@@ -7,6 +7,7 @@
 //
 
 #import "Reddit.h"
+#import "AppDelegate.h"
 
 @implementation Reddit
 
@@ -14,14 +15,18 @@ NSString *version = @"1.0.0";
 NSString *author = @"xythobuz";
 NSString *appName = @"RedditBar";
 
-@synthesize username, modhash, password;
+NSInteger maxTitleLength = 50;
+NSString *replaceTextForTitle = @"...";
 
--(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash {
+@synthesize username, modhash, password, length, subreddits;
+
+-(id)initWithUsername:(NSString *)name Modhash:(NSString *)hash Length:(NSInteger)leng {
     self = [super init];
     if (self) {
         username = name;
         modhash = hash;
         password = nil;
+        length = leng;
     }
     return self;
 }
@@ -36,28 +41,6 @@ NSString *appName = @"RedditBar";
     return self;
 }
 
--(BOOL)isAuthenticatedNewModhash:(NSString **)newModHash {
-    NSHTTPURLResponse *response;
-    NSData *data = [self queryAPI:@"api/me.json" withResponse:&response];
-    if ((data != nil) && ([response statusCode] == 200)) {
-        NSError *error;
-        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-        NSDictionary *data = [json valueForKey:@"data"];
-        if (data == nil)
-            return FALSE;
-        NSString *newHash = [data valueForKey:@"modhash"];
-        if ((newHash == nil) || ([newHash isEqualToString:@""]))
-            return FALSE;
-        if (![newHash isEqualToString:modhash]) {
-            modhash = newHash;
-            *newModHash = newHash;
-        }
-        return TRUE;
-        
-    }
-    return FALSE;
-}
-
 -(NSString *)queryModhash {
     NSMutableString *stringData = [NSMutableString stringWithString:@"api_type=json"];
     [stringData appendFormat:@"&user=%@", [self urlencode: username]];
@@ -92,13 +75,7 @@ NSString *appName = @"RedditBar";
     }
 }
 
--(NSArray *)readFrontpageLength:(NSInteger)length {
-    NSHTTPURLResponse *response;
-    NSString *url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
-    NSData *data = [self queryAPI:url withResponse:&response];
-    if ((data == nil) || ([response statusCode] != 200)) {
-        return nil;
-    }
+-(NSArray *)convertJSONToItemArray:(NSData *)data {
     NSError *error;
     NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
     NSDictionary *dat = [json valueForKey:@"data"];
@@ -120,21 +97,61 @@ NSString *appName = @"RedditBar";
         if (!isSelf) {
             comments = [NSString stringWithFormat:@"http://www.reddit.com%@", [current valueForKey:@"permalink"]];
         }
+        if ([name length] > maxTitleLength) {
+            name = [NSString stringWithFormat:@"%@%@", [name substringToIndex:(maxTitleLength - [replaceTextForTitle length])], replaceTextForTitle];
+        }
         RedditItem *r = [RedditItem itemWithName:name Link:link Comments:comments Self:isSelf];
         [array insertObject:r atIndex:i];
     }
     return array;
 }
 
--(NSArray *)readSubreddits:(NSArray *)source Length:(NSInteger)length {
+-(void)readFrontpage:(id)parent {
+    NSHTTPURLResponse *response;
+    NSString *url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
+    NSData *data = [self queryAPI:url withResponse:&response];
+    if ((data == nil) || ([response statusCode] != 200)) {
+        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:nil waitUntilDone:false];
+    } else {
+        [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:[self convertJSONToItemArray:data] waitUntilDone:false];
+    }
+}
+
+-(void)readSubreddits:(id)parent {
     // TODO read subreddits (as multireddit?)
-    return nil;
+    // TODO if implemented, enable checkbox in prefs
+}
+
+-(void)isAuthenticatedNewModhash:(id)parent {
+    NSHTTPURLResponse *response;
+    NSData *data = [self queryAPI:@"api/me.json" withResponse:&response];
+    if ((data != nil) && ([response statusCode] == 200)) {
+        NSError *error;
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+        NSDictionary *data = [json valueForKey:@"data"];
+        if (data == nil) {
+            [parent performSelectorOnMainThread:@selector(reloadListNotAuthenticatedCallback) withObject:nil waitUntilDone:false];
+            return;
+        }
+        NSString *newHash = [data valueForKey:@"modhash"];
+        if ((newHash == nil) || ([newHash isEqualToString:@""])) {
+            [parent performSelectorOnMainThread:@selector(reloadListNotAuthenticatedCallback) withObject:nil waitUntilDone:false];
+            return;
+        }
+        if (![newHash isEqualToString:modhash]) {
+            modhash = newHash;
+        }
+        [parent performSelectorOnMainThread:@selector(reloadListIsAuthenticatedCallback) withObject:nil waitUntilDone:false];
+        return;
+        
+    }
+    [parent performSelectorOnMainThread:@selector(reloadListNotAuthenticatedCallback) withObject:nil waitUntilDone:false];
 }
 
 -(NSData *)queryAPI:(NSString *)api withResponse:(NSHTTPURLResponse **)res {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[self getAPIPoint:api]];
     [request setTimeoutInterval:5.0];
-    [request setCachePolicy:NSURLCacheStorageNotAllowed];
+    [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     [request setValue:@"application/x-www-form-urlencoded; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
     [request setValue:[NSString stringWithFormat:@"%@/%@ by %@", appName, version, author] forHTTPHeaderField:@"User-Agent"];
     if ((modhash != nil) && (![modhash isEqualToString:@""]))
@@ -153,7 +170,7 @@ NSString *appName = @"RedditBar";
     NSString *requestBodyLength = [NSString stringWithFormat:@"%lu", (unsigned long)[requestBodyData length]];
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[self getAPIPoint:api]];
     [request setTimeoutInterval:5.0];
-    [request setCachePolicy:NSURLCacheStorageNotAllowed];
+    [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     [request setValue:@"application/x-www-form-urlencoded; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
     [request setValue:requestBodyLength forHTTPHeaderField:@"Content-Length"];
     [request setValue:[NSString stringWithFormat:@"%@/%@ by %@", appName, version, author] forHTTPHeaderField:@"User-Agent"];
@@ -170,8 +187,7 @@ NSString *appName = @"RedditBar";
 }
 
 -(NSURL *)getAPIPoint:(NSString *)where {
-    NSString *url = @"https://ssl.reddit.com";
-    return [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", url, where]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"https://ssl.reddit.com/%@", where]];
 }
 
 -(NSString *)urlencode:(NSString *)string {

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>137</string>
+	<string>150</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>