diff --git a/clients/ios/Classes/AddSiteViewController.h b/clients/ios/Classes/AddSiteViewController.h index 2b9459463..3c232256c 100644 --- a/clients/ios/Classes/AddSiteViewController.h +++ b/clients/ios/Classes/AddSiteViewController.h @@ -8,16 +8,14 @@ #import #import "NewsBlurAppDelegate.h" -#import "ASIHTTPRequest.h" @class NewsBlurAppDelegate; @interface AddSiteViewController : UIViewController - + - (void)reload; - (IBAction)addSite; -- (void)autocompleteSite:(ASIHTTPRequest *)request; - (IBAction)doCancelButton; - (IBAction)doAddButton; - (NSString *)extractParentFolder; diff --git a/clients/ios/Classes/AddSiteViewController.m b/clients/ios/Classes/AddSiteViewController.m index 2f054df5b..8da1c577f 100644 --- a/clients/ios/Classes/AddSiteViewController.m +++ b/clients/ios/Classes/AddSiteViewController.m @@ -10,8 +10,6 @@ #import "AddSiteAutocompleteCell.h" #import "NewsBlurAppDelegate.h" #import "NewsBlurViewController.h" -#import "ASIHTTPRequest.h" -#import "ASIFormDataRequest.h" #import "NBContainerViewController.h" #import "MenuViewController.h" #import "SBJson4.h" diff --git a/clients/ios/Classes/FeedDetailViewController.h b/clients/ios/Classes/FeedDetailViewController.h index 109813a82..1e3662602 100644 --- a/clients/ios/Classes/FeedDetailViewController.h +++ b/clients/ios/Classes/FeedDetailViewController.h @@ -8,7 +8,6 @@ #import #import "NewsBlurAppDelegate.h" -#import "ASIHTTPRequest.h" #import "BaseViewController.h" #import "Utilities.h" #import "NBNotifier.h" @@ -20,7 +19,7 @@ @interface FeedDetailViewController : BaseViewController { NewsBlurAppDelegate *appDelegate; @@ -72,7 +71,6 @@ - (void)loadOfflineStories; - (void)fetchRiver; - (void)fetchRiverPage:(int)page withCallback:(void(^)())callback; -- (void)finishedLoadingFeed:(ASIHTTPRequest *)request; - (void)testForTryFeed; - (void)cacheStoryImages:(NSArray *)storyImageUrls; - (void)showStoryImage:(NSString *)imageUrl; @@ -106,8 +104,6 @@ - (void)changeActiveStoryTitleCellLayout; - (void)loadFaviconsFromActiveFeed; - (void)markFeedsReadFromTimestamp:(NSInteger)cutoffTimestamp andOlder:(BOOL)older; -- (void)saveAndDrawFavicons:(ASIHTTPRequest *)request; -- (void)requestFailed:(ASIHTTPRequest *)request; - (void)finishMarkAsSaved:(NSURLSessionDataTask *)request; - (void)failedMarkAsSaved:(NSURLSessionDataTask *)request; - (void)finishMarkAsUnsaved:(NSURLSessionDataTask *)request; diff --git a/clients/ios/Classes/LoginViewController.h b/clients/ios/Classes/LoginViewController.h index 439a6d2f7..c6aa3150a 100644 --- a/clients/ios/Classes/LoginViewController.h +++ b/clients/ios/Classes/LoginViewController.h @@ -8,12 +8,10 @@ #import #import "NewsBlurAppDelegate.h" -#import "ASIHTTPRequest.h" #define LANDSCAPE_MARGIN 128 -@interface LoginViewController : UIViewController - { +@interface LoginViewController : BaseViewController { NewsBlurAppDelegate *appDelegate; BOOL isOnSignUpScreen; diff --git a/clients/ios/Classes/LoginViewController.m b/clients/ios/Classes/LoginViewController.m index ace73624e..22f845b62 100644 --- a/clients/ios/Classes/LoginViewController.m +++ b/clients/ios/Classes/LoginViewController.m @@ -7,7 +7,6 @@ // #import "LoginViewController.h" -#import "ASIFormDataRequest.h" #import "../Other Sources/OnePasswordExtension/OnePasswordExtension.h" //#import @@ -199,46 +198,35 @@ NSString *urlString = [NSString stringWithFormat:@"%@/api/login", self.appDelegate.url]; - NSURL *url = [NSURL URLWithString:urlString]; [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways]; - ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:url]; - [request setPostValue:[usernameInput text] forKey:@"username"]; - [request setPostValue:[passwordInput text] forKey:@"password"]; - [request setPostValue:@"login" forKey:@"submit"]; - [request setPostValue:@"1" forKey:@"api"]; - [request setDelegate:self]; - [request setDidFinishSelector:@selector(requestFinished:)]; - [request setDidFailSelector:@selector(requestFailed:)]; - [request startAsynchronous]; -} - - -- (void)requestFinished:(ASIHTTPRequest *)request { - [MBProgressHUD hideHUDForView:self.view animated:YES]; - NSString *responseString = [request responseString]; - NSData *responseData=[responseString dataUsingEncoding:NSUTF8StringEncoding]; - NSError *error; - NSDictionary *results = [NSJSONSerialization - JSONObjectWithData:responseData - options:kNilOptions - error:&error]; - // int statusCode = [request responseStatusCode]; - int code = [[results valueForKey:@"code"] intValue]; - if (code == -1) { - NSDictionary *errors = [results valueForKey:@"errors"]; - if ([errors valueForKey:@"username"]) { - [self showError:[[errors valueForKey:@"username"] firstObject]]; - } else if ([errors valueForKey:@"__all__"]) { - [self showError:[[errors valueForKey:@"__all__"] firstObject]]; - } - } else { - [self.passwordInput setText:@""]; - [self.signUpPasswordInput setText:@""]; - [appDelegate reloadFeedsView:YES]; - [self dismissViewControllerAnimated:YES completion:nil]; - } + NSMutableDictionary *params = [NSMutableDictionary dictionary]; + [params setObject:[usernameInput text] forKey:@"username"]; + [params setObject:[passwordInput text] forKey:@"password"]; + [params setObject:@"login" forKey:@"submit"]; + [params setObject:@"1" forKey:@"api"]; + + [manager POST:urlString parameters:params progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + + int code = [[responseObject valueForKey:@"code"] intValue]; + if (code == -1) { + NSDictionary *errors = [responseObject valueForKey:@"errors"]; + if ([errors valueForKey:@"username"]) { + [self showError:[[errors valueForKey:@"username"] firstObject]]; + } else if ([errors valueForKey:@"__all__"]) { + [self showError:[[errors valueForKey:@"__all__"] firstObject]]; + } + } else { + [self.passwordInput setText:@""]; + [self.signUpPasswordInput setText:@""]; + [appDelegate reloadFeedsView:YES]; + [self dismissViewControllerAnimated:YES completion:nil]; + } + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { + [self requestFailed:error]; + }]; } @@ -249,59 +237,48 @@ [self showError:nil]; NSString *urlString = [NSString stringWithFormat:@"%@/api/signup", self.appDelegate.url]; - NSURL *url = [NSURL URLWithString:urlString]; [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways]; - ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:url]; + + NSMutableDictionary *params = [NSMutableDictionary dictionary]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - [request setPostValue:[signUpUsernameInput text] forKey:@"username"]; - [request setPostValue:[signUpPasswordInput text] forKey:@"password"]; + [params setObject:[signUpUsernameInput text] forKey:@"username"]; + [params setObject:[signUpPasswordInput text] forKey:@"password"]; } else { - [request setPostValue:[usernameInput text] forKey:@"username"]; - [request setPostValue:[passwordInput text] forKey:@"password"]; + [params setObject:[usernameInput text] forKey:@"username"]; + [params setObject:[passwordInput text] forKey:@"password"]; } - [request setPostValue:[emailInput text] forKey:@"email"]; - [request setPostValue:@"login" forKey:@"submit"]; - [request setPostValue:@"1" forKey:@"api"]; - [request setDelegate:self]; - [request setDidFinishSelector:@selector(finishRegistering:)]; - [request setDidFailSelector:@selector(requestFailed:)]; - [request startAsynchronous]; -} - -- (void)finishRegistering:(ASIHTTPRequest *)request { - [MBProgressHUD hideHUDForView:self.view animated:YES]; - NSString *responseString = [request responseString]; - NSData *responseData=[responseString dataUsingEncoding:NSUTF8StringEncoding]; - NSError *error; - NSDictionary *results = [NSJSONSerialization - JSONObjectWithData:responseData - options:kNilOptions - error:&error]; - // int statusCode = [request responseStatusCode]; + [params setObject:[emailInput text] forKey:@"email"]; + [params setObject:@"login" forKey:@"submit"]; + [params setObject:@"1" forKey:@"api"]; - int code = [[results valueForKey:@"code"] intValue]; - if (code == -1) { - NSDictionary *errors = [results valueForKey:@"errors"]; - if ([errors valueForKey:@"email"]) { - [self showError:[[errors valueForKey:@"email"] objectAtIndex:0]]; - } else if ([errors valueForKey:@"username"]) { - [self showError:[[errors valueForKey:@"username"] objectAtIndex:0]]; - } else if ([errors valueForKey:@"__all__"]) { - [self showError:[[errors valueForKey:@"__all__"] objectAtIndex:0]]; + [manager POST:urlString parameters:params progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + + int code = [[responseObject valueForKey:@"code"] intValue]; + if (code == -1) { + NSDictionary *errors = [responseObject valueForKey:@"errors"]; + if ([errors valueForKey:@"email"]) { + [self showError:[[errors valueForKey:@"email"] objectAtIndex:0]]; + } else if ([errors valueForKey:@"username"]) { + [self showError:[[errors valueForKey:@"username"] objectAtIndex:0]]; + } else if ([errors valueForKey:@"__all__"]) { + [self showError:[[errors valueForKey:@"__all__"] objectAtIndex:0]]; + } + } else { + [self.passwordInput setText:@""]; + [self.signUpPasswordInput setText:@""]; + // [appDelegate showFirstTimeUser]; + [appDelegate reloadFeedsView:YES]; + [self dismissViewControllerAnimated:YES completion:nil]; } - } else { - [self.passwordInput setText:@""]; - [self.signUpPasswordInput setText:@""]; -// [appDelegate showFirstTimeUser]; - [appDelegate reloadFeedsView:YES]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { + [self requestFailed:error]; + }]; + } -- (void)requestFailed:(ASIHTTPRequest *)request { - NSError *error = [request error]; +- (void)requestFailed:(NSError *)error { NSLog(@"Error: %@", error); [appDelegate informError:error]; diff --git a/clients/ios/Classes/NewsBlurViewController.h b/clients/ios/Classes/NewsBlurViewController.h index b2946d808..541c8ac69 100644 --- a/clients/ios/Classes/NewsBlurViewController.h +++ b/clients/ios/Classes/NewsBlurViewController.h @@ -9,7 +9,6 @@ #import #import "NewsBlurAppDelegate.h" #import "FolderTitleView.h" -#import "ASIHTTPRequest.h" #import "BaseViewController.h" #import "NBNotifier.h" #import "IASKAppSettingsViewController.h" @@ -20,7 +19,7 @@ @interface NewsBlurViewController : BaseViewController { - (void)layoutForInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation; - (void)returnToApp; - (void)fetchFeedList:(BOOL)showLoader; -- (void)finishedWithError:(ASIHTTPRequest *)request; -- (void)finishLoadingFeedList:(ASIHTTPRequest *)request; - (void)finishLoadingFeedListWithDict:(NSDictionary *)results finished:(BOOL)finished; -- (void)finishRefreshingFeedList:(ASIHTTPRequest *)request; - (void)didSelectSectionHeader:(UIButton *)button; - (void)didSelectSectionHeaderWithTag:(NSInteger)tag; - (IBAction)selectIntelligence; @@ -95,8 +91,6 @@ UIGestureRecognizerDelegate> { - (void)markFeedsRead:(NSArray *)feedIds cutoffDays:(NSInteger)days; - (void)markEverythingReadWithDays:(NSInteger)days; - (void)markVisibleStoriesRead; -- (void)requestFailedMarkStoryRead:(ASIFormDataRequest *)request; -- (void)finishMarkAllAsRead:(ASIHTTPRequest *)request; - (void)didCollapseFolder:(UIButton *)button; - (BOOL)isFeedVisible:(id)feedId; - (void)changeToAllMode; @@ -109,8 +103,6 @@ UIGestureRecognizerDelegate> { + (int)computeMaxScoreForFeed:(NSDictionary *)feed; - (void)loadFavicons; - (void)loadAvatars; -- (void)saveAndDrawFavicons:(ASIHTTPRequest *)request; -- (void)requestFailed:(ASIHTTPRequest *)request; - (void)refreshFeedList; - (void)refreshFeedList:(id)feedId; - (void)loadOfflineFeeds:(BOOL)failed; diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m index d9bff0306..99268527f 100644 --- a/clients/ios/Classes/NewsBlurViewController.m +++ b/clients/ios/Classes/NewsBlurViewController.m @@ -20,7 +20,6 @@ #import "UserProfileViewController.h" #import "StoryDetailViewController.h" #import "StoryPageControl.h" -#import "ASIHTTPRequest.h" #import "AFHTTPRequestOperation.h" #import "MBProgressHUD.h" #import "Base64.h" diff --git a/clients/ios/Classes/UserProfileViewController.h b/clients/ios/Classes/UserProfileViewController.h index 8cb93adf0..b739aa1c1 100644 --- a/clients/ios/Classes/UserProfileViewController.h +++ b/clients/ios/Classes/UserProfileViewController.h @@ -7,13 +7,12 @@ // #import -#import "ASIHTTPRequest.h" @class NewsBlurAppDelegate; @class ProfileBadge; @interface UserProfileViewController : UIViewController - { + { NewsBlurAppDelegate *appDelegate; UILabel *followingCount;