public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into offline

Browse source 
* master:
  Correcting iOS delete and rotation on ipad.
  Attempting to fix delete on ios.
This commit is contained in:
Samuel Clay 2013-06-04 18:06:28 -07:00
commit cde3b1600d
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
media/ios/Classes/FeedDetailViewController.m
View file

@ -1172,13 +1172,11 @@
NEWSBLUR_URL]; NEWSBLUR_URL];
NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL]; NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL];
__weak ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:urlFeedDetail]; __block ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:urlFeedDetail];
[request setDelegate:self]; [request setDelegate:self];
[request addPostValue:[[appDelegate activeFeed] objectForKey:@"id"] forKey:@"feed_id"]; [request addPostValue:[[appDelegate activeFeed] objectForKey:@"id"] forKey:@"feed_id"];
[request addPostValue:[appDelegate extractFolderName:appDelegate.activeFolder] forKey:@"in_folder"]; [request addPostValue:[appDelegate extractFolderName:appDelegate.activeFolder] forKey:@"in_folder"];
[request setFailedBlock:^(void) { [request setDidFailSelector:@selector(requestFailed:)];
[self informError:[request error]];
}];
[request setCompletionBlock:^(void) { [request setCompletionBlock:^(void) {
[appDelegate reloadFeedsView:YES]; [appDelegate reloadFeedsView:YES];
[appDelegate.navigationController [appDelegate.navigationController
@ -1201,15 +1199,13 @@
NEWSBLUR_URL]; NEWSBLUR_URL];
NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL]; NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL];
__weak ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:urlFeedDetail]; __block ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:urlFeedDetail];
[request setDelegate:self]; [request setDelegate:self];
[request addPostValue:[appDelegate extractFolderName:appDelegate.activeFolder] [request addPostValue:[appDelegate extractFolderName:appDelegate.activeFolder]
forKey:@"folder_to_delete"]; forKey:@"folder_to_delete"];
[request addPostValue:[appDelegate extractFolderName:[appDelegate extractParentFolderName:appDelegate.activeFolder]] [request addPostValue:[appDelegate extractFolderName:[appDelegate extractParentFolderName:appDelegate.activeFolder]]
forKey:@"in_folder"]; forKey:@"in_folder"];
[request setFailedBlock:^(void) { [request setDidFailSelector:@selector(requestFailed:)];
[self informError:[request error]];
}];
[request setCompletionBlock:^(void) { [request setCompletionBlock:^(void) {
[appDelegate reloadFeedsView:YES]; [appDelegate reloadFeedsView:YES];
[appDelegate.navigationController [appDelegate.navigationController
@ -1271,7 +1267,7 @@
NEWSBLUR_URL, NEWSBLUR_URL,
[appDelegate.activeFeed objectForKey:@"id"]]; [appDelegate.activeFeed objectForKey:@"id"]];
[self cancelRequests]; [self cancelRequests];
__block ASIHTTPRequest *request = [self requestWithURL:urlString]; ASIHTTPRequest *request = [self requestWithURL:urlString];
[request setDelegate:self]; [request setDelegate:self];
[request setResponseEncoding:NSUTF8StringEncoding]; [request setResponseEncoding:NSUTF8StringEncoding];
[request setDefaultResponseEncoding:NSUTF8StringEncoding]; [request setDefaultResponseEncoding:NSUTF8StringEncoding];