Merge pull request #256 from barijaona/bugfixes

Password related bugfixes
ViennaRSS · Mar 27, 2014 · a87dd53 · a87dd53
2 parents a9eb864 + b1da4ed
commit a87dd53
Show file tree

Hide file tree

Showing 39 changed files with 2,594 additions and 13,551 deletions.
diff --git a/lproj/cs.lproj/FeedCredentials.nib/designable.nib b/lproj/cs.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/cs.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/cs.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/da.lproj/FeedCredentials.nib/designable.nib b/lproj/da.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/da.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/da.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/de.lproj/FeedCredentials.nib/designable.nib b/lproj/de.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/de.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/de.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/en.lproj/FeedCredentials.nib/designable.nib b/lproj/en.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/en.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/en.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/es.lproj/FeedCredentials.nib/designable.nib b/lproj/es.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/es.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/es.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/eus.lproj/FeedCredentials.nib/designable.nib b/lproj/eus.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/eus.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/eus.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/fr.lproj/FeedCredentials.nib/designable.nib b/lproj/fr.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/fr.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/fr.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/it.lproj/FeedCredentials.nib/designable.nib b/lproj/it.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/it.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/it.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/ja.lproj/FeedCredentials.nib/designable.nib b/lproj/ja.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/ja.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/ja.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/ko.lproj/FeedCredentials.nib/designable.nib b/lproj/ko.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/ko.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/ko.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/nl.lproj/FeedCredentials.nib/designable.nib b/lproj/nl.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/nl.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/nl.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/pt.lproj/FeedCredentials.nib/designable.nib b/lproj/pt.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/pt.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/pt.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/pt_BR.lproj/FeedCredentials.nib/designable.nib b/lproj/pt_BR.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/pt_BR.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/pt_BR.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/ru.lproj/FeedCredentials.nib/designable.nib b/lproj/ru.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/ru.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/ru.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/sv.lproj/FeedCredentials.nib/designable.nib b/lproj/sv.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/sv.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/sv.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/tr.lproj/FeedCredentials.nib/designable.nib b/lproj/tr.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/tr.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/tr.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/uk.lproj/FeedCredentials.nib/designable.nib b/lproj/uk.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/uk.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/uk.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/zh_CN.lproj/FeedCredentials.nib/designable.nib b/lproj/zh_CN.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/zh_CN.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/zh_CN.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/lproj/zh_TW.lproj/FeedCredentials.nib/designable.nib b/lproj/zh_TW.lproj/FeedCredentials.nib/designable.nib
diff --git a/lproj/zh_TW.lproj/FeedCredentials.nib/keyedobjects.nib b/lproj/zh_TW.lproj/FeedCredentials.nib/keyedobjects.nib
diff --git a/src/RefreshManager.m b/src/RefreshManager.m
@@ -467,12 +467,12 @@ -(void)refreshFeed:(Folder *)folder fromURL:(NSURL *)url withLog:(ActivityItem *
             [myRequest addRequestHeader:@"If-Modified-Since" value:theLastUpdateString];
         }
 		[myRequest setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:folder, @"folder", aItem, @"log", [NSNumber numberWithInt:MA_Refresh_Feed], @"type", nil]];
-		if ([folder username] != nil)
+		if (![[folder username] isEqualToString:@""])
 		{
 			[myRequest setUsername:[folder username]];
 			[myRequest setPassword:[folder password]];
+			[myRequest setUseCookiePersistence:NO];
 		}
-		[myRequest setUseCookiePersistence:NO];
 		[myRequest setDelegate:self];
 		[myRequest setDidFinishSelector:@selector(folderRefreshCompleted:)];
 		[myRequest setDidFailSelector:@selector(folderRefreshFailed:)];
@@ -491,6 +491,12 @@ - (void)folderRefreshFailed:(ASIHTTPRequest *)request
 
 {	LOG_EXPR([request error]);
 	Folder * folder = (Folder *)[[request userInfo] objectForKey:@"folder"];
+	if ([[request error] code] == ASIAuthenticationErrorType) //Error caused by lack of authentication
+	{
+		if (![authQueue containsObject:folder])
+			[authQueue addObject:folder];
+		[self getCredentialsForFolder];
+	}
     ActivityItem * aItem = (ActivityItem *)[[request userInfo] objectForKey:@"log"];
 	[self setFolderErrorFlag:folder flag:YES];
 	[aItem appendDetail:[NSString stringWithFormat:@"%@ %@",NSLocalizedString(@"Error retrieving RSS feed:", nil),[[request error] localizedDescription ]]];