Skip to content

Commit 0d42a8d

Browse files
authored
Merge pull request #1064 from barijaona/issue-1063
Fix OpenReader error handling
2 parents de35311 + f59b44e commit 0d42a8d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/OpenReader.m

+1-5
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ -(void)addClientTokenToRequest:(ASIHTTPRequest *)clientRequest
197197
__strong typeof(weakRequest)strongRequest = weakRequest;
198198
LOG_EXPR([strongRequest responseHeaders]);
199199
LOG_EXPR([[NSString alloc] initWithData:[strongRequest responseData] encoding:NSUTF8StringEncoding]);
200-
[strongRequest clearDelegatesAndCancel];
200+
[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"MA_Notify_GoogleAuthFailed" object:nil];
201201
for (id obj in [self.clientAuthWaitQueue reverseObjectEnumerator]) {
202202
[(ASIHTTPRequest *)obj cancel];
203203
[self.clientAuthWaitQueue removeObject:obj];
@@ -211,7 +211,6 @@ -(void)addClientTokenToRequest:(ASIHTTPRequest *)clientRequest
211211
LOG_EXPR([strongRequest responseStatusCode]);
212212
LOG_EXPR([strongRequest responseHeaders]);
213213
[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:@"MA_Notify_GoogleAuthFailed" object:nil];
214-
[strongRequest clearDelegatesAndCancel];
215214
self.openReaderStatus = notAuthenticated;
216215
for (id obj in [self.clientAuthWaitQueue reverseObjectEnumerator]) {
217216
[(ASIHTTPRequest *)obj cancel];
@@ -348,7 +347,6 @@ -(void)getTokenForRequest:(ASIFormDataRequest *)clientRequest;
348347
LOG_EXPR([strongRequest responseHeaders]);
349348
LOG_EXPR([[NSString alloc] initWithData:[strongRequest responseData] encoding:NSUTF8StringEncoding]);
350349
self.tToken = nil;
351-
[strongRequest clearDelegatesAndCancel];
352350
self.openReaderStatus = missingTToken;
353351
for (id obj in [self.tTokenWaitQueue reverseObjectEnumerator]) {
354352
[(ASIFormDataRequest *)obj cancel];
@@ -934,7 +932,6 @@ -(void)subscribeToFeed:(NSString *)feedURL
934932
// Needs to be synchronous so UI doesn't refresh too soon.
935933
request.delegate = nil;
936934
[request startSynchronous];
937-
[request clearDelegatesAndCancel];
938935
}
939936

940937
-(void)unsubscribeFromFeed:(NSString *)feedURL
@@ -960,7 +957,6 @@ -(void)setFolderName:(NSString *)folderName forFeed:(NSString *)feedURL set:(BOO
960957
[request setPostValue:[NSString stringWithFormat:@"user/-/label/%@", folderName] forKey:flag ? @"a" : @"r"];
961958
request.delegate = nil;
962959
[request startSynchronous];
963-
[request clearDelegatesAndCancel];
964960
}
965961

966962
-(void)markRead:(Article *)article readFlag:(BOOL)flag

0 commit comments

Comments
 (0)