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

Removing ASI.

Browse source
This commit is contained in:
Samuel Clay 2017-03-09 20:29:30 -08:00
parent 391140a8be
commit 0571fe2d50
8 changed files with 64 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/ios/Classes/AddSiteViewController.h
View file

@ -8,16 +8,14 @@
#import <UIKit/UIKit.h>
#import "NewsBlurAppDelegate.h"
#import "ASIHTTPRequest.h"
@class NewsBlurAppDelegate;
@interface AddSiteViewController : UIViewController
<UITextFieldDelegate, UITableViewDelegate, UITableViewDataSource, ASIHTTPRequestDelegate>
<UITextFieldDelegate, UITableViewDelegate, UITableViewDataSource>
- (void)reload;
- (IBAction)addSite;
- (void)autocompleteSite:(ASIHTTPRequest *)request;
- (IBAction)doCancelButton;
- (IBAction)doAddButton;
- (NSString *)extractParentFolder;

2
clients/ios/Classes/AddSiteViewController.m
View file

@ -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"

6
clients/ios/Classes/FeedDetailViewController.h
View file

@ -8,7 +8,6 @@
#import <UIKit/UIKit.h>
#import "NewsBlurAppDelegate.h"
#import "ASIHTTPRequest.h"
#import "BaseViewController.h"
#import "Utilities.h"
#import "NBNotifier.h"
@ -20,7 +19,7 @@
@interface FeedDetailViewController : BaseViewController
<UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate,
UIPopoverControllerDelegate, ASIHTTPRequestDelegate,
UIPopoverControllerDelegate,
MCSwipeTableViewCellDelegate,
UIGestureRecognizerDelegate, UISearchBarDelegate> {
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;

4
clients/ios/Classes/LoginViewController.h
View file

@ -8,12 +8,10 @@
#import <UIKit/UIKit.h>
#import "NewsBlurAppDelegate.h"
#import "ASIHTTPRequest.h"
#define LANDSCAPE_MARGIN 128
@interface LoginViewController : UIViewController
<ASIHTTPRequestDelegate> {
@interface LoginViewController : BaseViewController {
NewsBlurAppDelegate *appDelegate;
BOOL isOnSignUpScreen;

141
clients/ios/Classes/LoginViewController.m
View file

@ -7,7 +7,6 @@
//
#import "LoginViewController.h"
#import "ASIFormDataRequest.h"
#import "../Other Sources/OnePasswordExtension/OnePasswordExtension.h"
//#import <QuartzCore/QuartzCore.h>
@ -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];

10
clients/ios/Classes/NewsBlurViewController.h
View file

@ -9,7 +9,6 @@
#import <UIKit/UIKit.h>
#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
<UITableViewDelegate, UITableViewDataSource,
UIAlertViewDelegate,
ASIHTTPRequestDelegate, NSCacheDelegate,
NSCacheDelegate,
UIPopoverControllerDelegate,
IASKSettingsDelegate,
MCSwipeTableViewCellDelegate,
@ -84,10 +83,7 @@ UIGestureRecognizerDelegate> {
- (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;

1
clients/ios/Classes/NewsBlurViewController.m
View file

@ -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"

3
clients/ios/Classes/UserProfileViewController.h
View file

@ -7,13 +7,12 @@
//
#import <UIKit/UIKit.h>
#import "ASIHTTPRequest.h"
@class NewsBlurAppDelegate;
@class ProfileBadge;
@interface UserProfileViewController : UIViewController
<UITableViewDataSource, UITableViewDelegate, ASIHTTPRequestDelegate> {
<UITableViewDataSource, UITableViewDelegate> {
NewsBlurAppDelegate *appDelegate;
UILabel *followingCount;