Make sure we're using the new account system everywhere

WordPress/Classes/Blog+Jetpack.m

@@ -10,6 +10,7 @@
 
 #import "Blog+Jetpack.h"
 #import "WPAccount.h"
+#import "Note.h"
 #import "WordPressAppDelegate.h"
 #import "ContextManager.h"
 #import "WordPressComOAuthClient.h"
@@ -147,7 +148,7 @@ - (void)saveJetpackUsername:(NSString *)username andPassword:(NSString *)passwor
 
                                      // Sadly we don't care if this succeeds or not
                                      [account syncBlogsWithSuccess:nil failure:nil];
-                                     [account.restApi getNotificationsSince:nil success:nil failure:nil];
+                                     [Note fetchNewNotificationsWithSuccess:nil failure:nil];
                                  }
                              } failure:^(NSError *error) {
                                  DDLogError(@"Error while obtaining OAuth2 token after enabling JetPack: %@", error);

WordPress/Classes/Blog.m

@@ -541,7 +541,7 @@ - (WPXMLRPCClient *)api {
         // Enable compression for wp.com only, as some self hosted have connection issues
         if (self.isWPcom) {
             [_api setDefaultHeader:@"gzip, deflate" value:@"Accept-Encoding"];
-            [_api setAuthorizationHeaderWithToken:[WordPressComApi sharedApi].authToken];
+            [_api setAuthorizationHeaderWithToken:self.account.authToken];
         }
     }
     return _api;

WordPress/Classes/BlogListViewController.m

@@ -82,9 +82,6 @@ - (void)viewDidLoad {
                                                           target:self
                                                           action:@selector(showSettings:)];
     self.navigationItem.rightBarButtonItem = self.settingsButton;
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wordPressComApiDidLogin:) name:WordPressComApiDidLoginNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wordPressComApiDidLogout:) name:WordPressComApiDidLogoutNotification object:nil];
 
     // Remove one-pixel gap resulting from a top-aligned grouped table view
     if (IS_IPHONE) {

WordPress/Classes/BlogSelectorViewController.m

@@ -60,8 +60,7 @@ - (void)viewDidLoad {
 
     self.navigationItem.leftBarButtonItem = cancelButtonItem;
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wordPressComApiDidLogin:) name:WordPressComApiDidLoginNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wordPressComApiDidLogout:) name:WordPressComApiDidLogoutNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wordPressComAccountChanged) name:WPAccountDefaultWordPressComAccountChangedNotification object:nil];
 
     // Remove one-pixel gap resulting from a top-aligned grouped table view
     if (IS_IPHONE) {
@@ -100,15 +99,10 @@ - (BOOL)hasDotComAndSelfHosted {
 
 #pragma mark - Notifications
 
-- (void)wordPressComApiDidLogin:(NSNotification *)notification {
+- (void)wordPressComAccountChanged {
     [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade];
 }
 
-- (void)wordPressComApiDidLogout:(NSNotification *)notification {
-    [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade];
-}
-
-
 #pragma mark - Actions
 
 - (IBAction)cancelButtonTapped:(id)sender {

WordPress/Classes/BlogToAccount.m

@@ -12,6 +12,7 @@
 #import "WPAccount.h"
 
 static NSString * const DefaultDotcomAccountDefaultsKey = @"AccountDefaultDotcom";
+static NSString * const WPComXMLRPCUrl = @"https://wordpress.com/xmlrpc.php";
 
 @implementation BlogToAccount {
     NSString *_defaultWpcomUsername;

WordPress/Classes/BlogToJetpackAccount.m

@@ -11,6 +11,7 @@
 #import "WPAccount.h"
 
 static NSString * const BlogJetpackKeychainPrefix = @"jetpackblog-";
+static NSString * const WPComXMLRPCUrl = @"https://wordpress.com/xmlrpc.php";
 
 @implementation BlogToJetpackAccount
 

WordPress/Classes/Constants.h

@@ -9,4 +9,4 @@ static NSString *const kMobileReaderURL	= @"https://en.wordpress.com/reader/mobi
 static NSString *const kMobileReaderDetailURL = @"https://en.wordpress.com/reader/mobile/v2/?template=details";
 static NSString *const kMobileReaderFFURL = @"https://en.wordpress.com/reader/mobile/v2/?template=friendfinder";
 
-static NSString *const kXML_RPC_ERROR_OCCURS = @"kXML_RPC_ERROR_OCCURS";
+static NSString *const kXML_RPC_ERROR_OCCURS = @"kXML_RPC_ERROR_OCCURS";

WordPress/Classes/EditSiteViewController.m

@@ -15,6 +15,7 @@
 #import "ReachabilityUtils.h"
 #import "WPAccount.h"
 #import "WPTableViewSectionHeaderView.h"
+#import "NotificationsManager.h"
 #import <WPXMLRPC/WPXMLRPC.h>
 #import <SVProgressHUD/SVProgressHUD.h>
 #import <NSDictionary+SafeExpectations.h>
@@ -69,7 +70,7 @@ - (void)viewDidLoad {
 
         _notificationPreferences = [[[NSUserDefaults standardUserDefaults] objectForKey:@"notification_preferences"] mutableCopy];
         if (!_notificationPreferences) {
-            [[WordPressComApi sharedApi] fetchNotificationSettings:^{
+            [NotificationsManager fetchNotificationSettingsWithSuccess:^{
                 [self reloadNotificationSettings];
             } failure:^(NSError *error) {
                 [WPError showAlertWithTitle:NSLocalizedString(@"Error", @"") message:error.localizedDescription];
@@ -375,8 +376,8 @@ - (void)configureTextField:(UITextField *)textField asPassword:(BOOL)asPassword
 - (BOOL)canTogglePushNotifications {
     return self.blog &&
         ([self.blog isWPcom] || [self.blog hasJetpack]) &&
-        [[WordPressComApi sharedApi] hasCredentials] &&
-        [[NSUserDefaults standardUserDefaults] objectForKey:NotificationsDeviceToken] != nil;
+        [[[WPAccount defaultWordPressComAccount] restApi] hasCredentials] &&
+        [NotificationsManager deviceRegisteredForPushNotifications];
 }
 
 - (void)toggleGeolocation:(id)sender {
@@ -408,7 +409,7 @@ - (void)togglePushNotifications:(id)sender {
                 [[NSUserDefaults standardUserDefaults] setValue:_notificationPreferences forKey:@"notification_preferences"];
 
                 // Send these settings optimistically since they're low-impact (not ideal but works for now)
-                [[WordPressComApi sharedApi] saveNotificationSettings:nil failure:nil];
+                [NotificationsManager saveNotificationSettings];
                 return;
             }
         }

WordPress/Classes/FollowButton.m

@@ -8,6 +8,7 @@
 
 #import "FollowButton.h"
 #import "NSString+XMLExtensions.h"
+#import "WPToast.h"
 
 @interface FollowButton ()
 @property (nonatomic, strong) UIButton *button;
@@ -82,6 +83,11 @@ - (void)toggleFollowState:(id)sender {
     [self.user followBlog:[self.siteID intValue] isFollowing:isFollowing success:^(AFHTTPRequestOperation *operation, id followResponse){
         BOOL following = [[followResponse objectForKey:@"is_following"] intValue] == 1;
         self.followState = following ? FollowButtonStateFollowing : FollowButtonStateNotFollowing;
+
+        NSString *message = following ? NSLocalizedString(@"Unfollowed", @"User unfollowed a blog") : NSLocalizedString(@"Followed", @"User followed a blog");
+        NSString *imageName = [NSString stringWithFormat:@"action_icon_%@", (following) ? @"unfollowed" : @"followed"];
+        [WPToast showToastWithMessage:message andImage:[UIImage imageNamed:imageName]];
+
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
         // flip the button back since it failed
         self.followState = isFollowing ? FollowButtonStateNotFollowing : FollowButtonStateFollowing;

WordPress/Classes/JetpackSettingsViewController.m

@@ -16,6 +16,7 @@
 #import "WPWalkthroughTextField.h"
 #import "WPNUXSecondaryButton.h"
 #import "UILabel+SuggestSize.h"
+#import "WordPressComOAuthClient.h"
 
 CGFloat const JetpackiOS7StatusBarOffset = 20.0;
 CGFloat const JetpackStandardOffset = 16;
@@ -305,6 +306,14 @@ - (void)saveAction:(id)sender {
     [_blog validateJetpackUsername:_usernameField.text
                           password:_passwordField.text
                            success:^{
+                               if (![[[WPAccount defaultWordPressComAccount] restApi] hasCredentials]) {
+                                   [[WordPressComOAuthClient client] authenticateWithUsername:_usernameField.text password:_passwordField.text success:^(NSString *authToken) {
+                                       WPAccount *account = [WPAccount createOrUpdateWordPressComAccountWithUsername:_usernameField.text password:_passwordField.text authToken:authToken];
+                                       [WPAccount setDefaultWordPressComAccount:account];
+                                   } failure:^(NSError *error) {
+                                       DDLogWarn(@"Unabled to obtain OAuth token for account credentials provided for Jetpack blog. %@", error);
+                                   }];
+                               }
                                [self setAuthenticating:NO];
                                if (self.completionBlock) {
                                    self.completionBlock(YES);

WordPress/Classes/LoginViewController.m

@@ -773,7 +773,7 @@ - (void)createWordPressComAccountForUsername:(NSString *)username password:(NSSt
         [self setAuthenticating:NO withStatusMessage:nil];
         [self displayRemoteError:error];
     }];
-    [account.restApi getNotificationsSince:nil success:nil failure:nil];
+    [Note fetchNewNotificationsWithSuccess:nil failure:nil];
 }
 
 - (void)createSelfHostedAccountAndBlogWithUsername:(NSString *)username password:(NSString *)password xmlrpc:(NSString *)xmlrpc options:(NSDictionary *)options

WordPress/Classes/Note.h

@@ -30,10 +30,8 @@
 - (BOOL)isUnread;
 
 - (void)syncAttributes:(NSDictionary *)data;
-- (NSDictionary *)getNoteData;
 
-+ (void)syncNotesWithResponse:(NSArray *)notesData;
-+ (void)refreshUnreadNotesWithContext:(NSManagedObjectContext *)context;
++ (void)mergeNewNotes:(NSArray *)notesData;
 
 /**
  Remove old notes from Core Data storage
@@ -43,6 +41,16 @@
  @param context The context which contains the notes to delete.
  */
 + (void)pruneOldNotesBefore:(NSNumber *)timestamp withContext:(NSManagedObjectContext *)context;
-+ (void)getNewNotificationswithContext:(NSManagedObjectContext *)context success:(void (^)(BOOL hasNewNotes))success failure:(void (^)(NSError *error))failure;
+
+@end
+
+@interface Note (WordPressComApi)
+
++ (void)fetchNewNotificationsWithSuccess:(void (^)(BOOL hasNewNotes))success failure:(void (^)(NSError *error))failure;
++ (void)refreshUnreadNotesWithContext:(NSManagedObjectContext *)context;
++ (void)fetchNotificationsSince:(NSNumber *)timestamp success:(void (^)())success failure:(void (^)(NSError *error))failure;
++ (void)fetchNotificationsBefore:(NSNumber *)timestamp success:(void (^)())success failure:(void (^)(NSError *error))failure;
+- (void)refreshNoteDataWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure;
+- (void)markAsReadWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure;
 
 @end

WordPress/Classes/Note.m

@@ -50,7 +50,7 @@ @implementation Note
 @synthesize commentText = _commentText, noteData = _noteData;
 
 
-+ (void)syncNotesWithResponse:(NSArray *)notesData {
++ (void)mergeNewNotes:(NSArray *)notesData {
     NSManagedObjectContext *context = [[ContextManager sharedInstance] backgroundContext];
     [context performBlock:^{
         NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:@"Note"];
@@ -81,15 +81,6 @@ + (void)syncNotesWithResponse:(NSArray *)notesData {
     }];
 }
 
-+ (void)refreshUnreadNotesWithContext:(NSManagedObjectContext *)context {
-    NSFetchRequest *request = [[ContextManager sharedInstance].managedObjectModel fetchRequestTemplateForName:@"UnreadNotes"];
-    NSError *error = nil;
-    NSArray *notes = [context executeFetchRequest:request error:&error];
-    if ([notes count] > 0) {
-        [[WordPressComApi sharedApi] refreshNotifications:notes fields:@"id,unread" success:nil failure:nil];
-    }
-}
-
 + (void)pruneOldNotesBefore:(NSNumber *)timestamp withContext:(NSManagedObjectContext *)context {
     NSError *error;
 
@@ -128,21 +119,6 @@ + (void)pruneOldNotesBefore:(NSNumber *)timestamp withContext:(NSManagedObjectCo
     [context save:&error];
 }
 
-+ (void)getNewNotificationswithContext:(NSManagedObjectContext *)context success:(void (^)(BOOL hasNewNotes))success failure:(void (^)(NSError *error))failure {
-    NSNumber *timestamp = [self lastNoteTimestampWithContext:context];
-
-    [[WordPressComApi sharedApi] getNotificationsSince:timestamp success:^(AFHTTPRequestOperation *operation, id responseObject) {
-        NSArray *notes = [responseObject arrayForKey:@"notes"];
-        if (success) {
-            success([notes count] > 0);
-        }
-    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        if (failure) {
-            failure(error);
-        }
-    }];
-}
-
 + (NSNumber *)lastNoteTimestampWithContext:(NSManagedObjectContext *)context {
     NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:@"Note"];
     request.resultType = NSDictionaryResultType;
@@ -158,10 +134,6 @@ + (NSNumber *)lastNoteTimestampWithContext:(NSManagedObjectContext *)context {
     return timestamp;
 }
 
-- (NSDictionary *)getNoteData {
-    return self.noteData;
-}
-
 - (void)syncAttributes:(NSDictionary *)noteData {
     self.payload = [NSJSONSerialization dataWithJSONObject:noteData options:0 error:nil];
     self.noteData = [NSJSONSerialization JSONObjectWithData:self.payload options:NSJSONReadingMutableContainers error:nil];
@@ -251,3 +223,85 @@ - (void)parseComment {
 }
 
 @end
+
+@implementation Note (WordPressComApi)
+
++ (void)fetchNewNotificationsWithSuccess:(void (^)(BOOL hasNewNotes))success failure:(void (^)(NSError *error))failure {
+    NSNumber *timestamp = [self lastNoteTimestampWithContext:[ContextManager sharedInstance].backgroundContext];
+
+    [[[WPAccount defaultWordPressComAccount] restApi] fetchNotificationsSince:timestamp success:^(NSArray *notes) {
+        [Note mergeNewNotes:notes];
+        if (success) {
+            success([notes count] > 0);
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        if (failure) {
+            failure(error);
+        }
+    }];
+}
+
++ (void)refreshUnreadNotesWithContext:(NSManagedObjectContext *)context {
+    NSFetchRequest *request = [[ContextManager sharedInstance].managedObjectModel fetchRequestTemplateForName:@"UnreadNotes"];
+    NSError *error = nil;
+    NSArray *notes = [context executeFetchRequest:request error:&error];
+    if ([notes count] > 0) {
+        [[[WPAccount defaultWordPressComAccount] restApi] refreshNotifications:notes fields:@"id,unread" success:nil failure:nil];
+    }
+}
+
++ (void)fetchNotificationsBefore:(NSNumber *)timestamp success:(void (^)())success failure:(void (^)(NSError *))failure {
+    [[[WPAccount defaultWordPressComAccount] restApi] fetchNotificationsBefore:timestamp success:^(NSArray *notes) {
+        [self mergeNewNotes:notes];
+        if (success) {
+            success();
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        if (failure) {
+            failure(error);
+        }
+    }];
+}
+
++ (void)fetchNotificationsSince:(NSNumber *)timestamp success:(void (^)())success failure:(void (^)(NSError *))failure {
+    [[[WPAccount defaultWordPressComAccount] restApi] fetchNotificationsSince:timestamp success:^(NSArray *notes) {
+        [self mergeNewNotes:notes];
+        if (success) {
+            success();
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        if (failure) {
+            failure(error);
+        }
+    }];
+}
+
+- (void)refreshNoteDataWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
+    [[[WPAccount defaultWordPressComAccount] restApi] refreshNotifications:@[self.noteID] fields:nil success:^(NSArray *updatedNotes){
+            if ([updatedNotes count] > 0 && ![self isDeleted] && self.managedObjectContext) {
+                [self syncAttributes:updatedNotes[0]];
+            }
+            [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
+            if (success) {
+                success();
+            }
+        } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+            if (failure) {
+                failure(error);
+            }
+        }];
+}
+
+- (void)markAsReadWithSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
+    [[[WPAccount defaultWordPressComAccount] restApi] markNoteAsRead:self.noteID success:^(AFHTTPRequestOperation *operation, id responseObject) {
+        if (success) {
+            success();
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        if (failure) {
+            failure(error);
+        }
+    }];
+}
+
+@end

WordPress/Classes/NotificationSettingsViewController.m

@@ -15,6 +15,8 @@
 #import "NSString+XMLExtensions.h"
 #import "DateUtils.h"
 #import "WPTableViewSectionHeaderView.h"
+#import "WPAccount.h"
+#import "NotificationsManager.h"
 
 @interface NotificationSettingsViewController () <EGORefreshTableHeaderDelegate, UIActionSheetDelegate>
 
@@ -74,10 +76,10 @@ - (void)viewWillAppear:(BOOL)animated {
 }
 
 - (void)getNotificationSettings {
-    [[WordPressComApi sharedApi] fetchNotificationSettings:^{
-        [self notificationsDidFinishRefreshingWithError: nil];
+    [NotificationsManager fetchNotificationSettingsWithSuccess:^{
+        [self notificationsDidFinishRefreshingWithError:nil];
     } failure:^(NSError *error) {
-        [self notificationsDidFinishRefreshingWithError: error];
+        [self notificationsDidFinishRefreshingWithError:error];
     }];
 }
 
@@ -251,8 +253,9 @@ - (void)dismiss {
 
 - (void)viewWillDisappear:(BOOL)animated {
     self.navigationController.toolbarHidden = YES;
-    if (hasChanges)
-        [[WordPressComApi sharedApi] saveNotificationSettings:nil failure:nil];
+    if (hasChanges){
+        [NotificationsManager saveNotificationSettings];
+    }
     [super viewWillDisappear:animated];
 }