Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #42 from barijaona/experimental

Bug fixes
  • Loading branch information...
commit 88c7a1636dcca4843828a409a2a977efcbe684a3 2 parents a882a0a + c735358
@mstroeck mstroeck authored
View
1  AppController.m
@@ -2502,7 +2502,6 @@ -(void)viewArticlePages:(id)sender inPreferredBrowser:(BOOL)usePreferredBrowser
if ([articleArray count] > 0)
{
- Preferences * prefs = [Preferences standardPreferences];
NSMutableArray * articlesWithLinks = [NSMutableArray arrayWithCapacity:[articleArray count]];
NSMutableArray * urls = [NSMutableArray arrayWithCapacity:[articleArray count]];
View
6 ArticleController.m
@@ -338,9 +338,8 @@ -(void)reloadArrayOfArticles
[[RefreshManager articlesUpdateSemaphore] lock];
Folder * folder = [[Database sharedDatabase] folderFromID:currentFolderId];
- [[RefreshManager articlesUpdateSemaphore] unlock];
-
folderArrayOfArticles = [[folder articlesWithFilter:[[NSApp delegate] filterString]] retain];
+ [[RefreshManager articlesUpdateSemaphore] unlock];
[self refilterArrayOfArticles];
}
@@ -724,9 +723,10 @@ -(NSArray *)wrappedMarkAllReadInArray:(NSArray *)folderArray withUndo:(BOOL)undo
}
else
{
+ // Google Reader feeds and smart folders
// For smart folders, we only mark all read the current folder to
// simplify things.
- if (undoFlag && (folderId == currentFolderId))
+ if (undoFlag && (IsGoogleReaderFolder(folder) || folderId == currentFolderId))
{
[refArray addObjectsFromArray:currentArrayOfArticles];
[self innerMarkReadByArray:currentArrayOfArticles readFlag:YES];
View
5 GoogleReader.m
@@ -30,6 +30,7 @@
#import "Message.h"
#import "AppController.h"
#import "RefreshManager.h"
+#import "Preferences.h"
//Vienna keychain Google Reader name
static NSString *const kKeychainItemName = @"OAuth2 Vienna: Google Reader";
@@ -268,6 +269,8 @@ - (void)feedRequestDone:(ASIHTTPRequest *)request
// Set the last update date for this folder.
[db setFolderLastUpdate:[refreshedFolder itemId] lastUpdate:[NSDate date]];
+ // Set the HTML homepage for this folder.
+ [db setFolderHomePage:[refreshedFolder itemId] newHomePage:[[[dict objectForKey:@"alternate"] objectAtIndex:0] objectForKey:@"href"]];
[[RefreshManager articlesUpdateSemaphore] unlock];
// Add to count of new articles so far
@@ -452,6 +455,8 @@ -(void)handleGoogleLoginRequest
-(void)authenticate
{
+ if (![[Preferences standardPreferences] syncGoogleReader])
+ return;
if (googleReaderStatus != notAuthenticated) {
LLog(@"Another instance is authenticating...");
return;
View
2  RefreshManager.h
@@ -38,7 +38,7 @@
}
+(RefreshManager *)sharedManager;
-+ (NSLock *)articlesUpdateSemaphore;
++ (NSRecursiveLock *)articlesUpdateSemaphore;
-(void)refreshFolderIconCacheForSubscriptions:(NSArray *)foldersArray;
//-(void)refreshSubscriptions:(NSArray *)foldersArray ignoringSubscriptionStatus:(BOOL)ignoreSubStatus;
-(void)refreshSubscriptionsAfterRefresh:(NSArray *)foldersArray ignoringSubscriptionStatus:(BOOL)ignoreSubStatus;
View
6 RefreshManager.m
@@ -36,7 +36,7 @@
// Singleton
static RefreshManager * _refreshManager = nil;
-static NSLock * articlesUpdate_lock;
+static NSRecursiveLock * articlesUpdate_lock;
// Private functions
@interface RefreshManager (Private)
@@ -62,10 +62,10 @@ @implementation RefreshManager
+ (void)initialize
{
// Initializes our multi-thread lock
- articlesUpdate_lock = [[NSLock alloc] init];
+ articlesUpdate_lock = [[NSRecursiveLock alloc] init];
}
-+ (NSLock *)articlesUpdateSemaphore
++ (NSRecursiveLock *)articlesUpdateSemaphore
{
return articlesUpdate_lock;
}
View
1  SyncPreferences.m
@@ -46,6 +46,7 @@ -(IBAction)changeSyncGoogleReader:(id)sender
BOOL sync = [sender state] == NSOnState;
[[Preferences standardPreferences] setSyncGoogleReader:sync];
if (sync) {
+ [[GoogleReader sharedManager] authenticate];
[[GoogleReader sharedManager] loadSubscriptions:nil];
}
}
View
4 Vienna.xcodeproj/project.pbxproj
@@ -4047,7 +4047,7 @@
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
- VIENNA_VERSION_NUMBER = 2807;
+ VIENNA_VERSION_NUMBER = 2808;
WRAPPER_EXTENSION = app;
};
name = Development;
@@ -4075,7 +4075,7 @@
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
- VIENNA_VERSION_NUMBER = 2807;
+ VIENNA_VERSION_NUMBER = 2808;
WRAPPER_EXTENSION = app;
};
name = Deployment;
Please sign in to comment.
Something went wrong with that request. Please try again.