Ticket #1498 - Conflict detection and resolution + use wp.editPost instead of metaWeblog.editPost

WordPress/Classes/AbstractPost.m

@@ -23,14 +23,14 @@ - (void)remove {
 
 - (void)awakeFromFetch {
     [super awakeFromFetch];
-    
+
     if (self.remoteStatus == AbstractPostRemoteStatusPushing) {
         // If we've just been fetched and our status is AbstractPostRemoteStatusPushing then something
         // when wrong saving -- the app crashed for instance. So change our remote status to failed.
         // Do this after a delay since property changes and saves are ignored during awakeFromFetch. See docs.
         [self performSelector:@selector(markRemoteStatusFailed) withObject:nil afterDelay:0.1];
     }
-    
+
 }
 
 - (void)markRemoteStatusFailed {
@@ -72,7 +72,7 @@ - (AbstractPost *)createRevision {
         NSLog(@"!!! Already have revision");
         return self.revision;
     }
-	
+
     AbstractPost *post = [NSEntityDescription insertNewObjectForEntityForName:[[self entity] name] inManagedObjectContext:[self managedObjectContext]];
     [post cloneFrom:self];
     [post setValue:self forKey:@"original"];
@@ -121,62 +121,54 @@ - (AbstractPost *)original {
 - (BOOL)hasChanges {
     if (![self isRevision])
         return NO;
-    
+
     //Do not move the Featured Image check below in the code.
     if ((self.post_thumbnail != self.original.post_thumbnail)
         && (![self.post_thumbnail  isEqual:self.original.post_thumbnail])){
         self.isFeaturedImageChanged = YES;
         return YES;
     } else
         self.isFeaturedImageChanged = NO;
-	
-    
+
+
     //first let's check if there's no post title or content (in case a cheeky user deleted them both)
     if ((self.postTitle == nil || [self.postTitle isEqualToString:@""]) && (self.content == nil || [self.content isEqualToString:@""]))
         return NO;
-	
+
     // We need the extra check since [nil isEqual:nil] returns NO
     if ((self.postTitle != self.original.postTitle)
         && (![self.postTitle isEqual:self.original.postTitle]))
         return YES;
     if ((self.content != self.original.content)
         && (![self.content isEqual:self.original.content]))
         return YES;
-	
+
     if ((self.status != self.original.status)
         && (![self.status isEqual:self.original.status]))
         return YES;
-	
+
     if ((self.password != self.original.password)
         && (![self.password isEqual:self.original.password]))
         return YES;
-	
+
     if ((self.dateCreated != self.original.dateCreated)
         && (![self.dateCreated isEqual:self.original.dateCreated]))
         return YES;
-	
+
 	if ((self.permaLink != self.original.permaLink)
         && (![self.permaLink  isEqual:self.original.permaLink]))
         return YES;
-	
+
     if (self.hasRemote == NO) {
         return YES;
     }
-    
+
     // Relationships are not going to be nil, just empty sets,
     // so we can avoid the extra check
     if (![self.media isEqual:self.original.media])
         return YES;
-
-    return NO;
-}
 
-- (void)findComments {
-    NSSet *comments = [self.blog.comments filteredSetUsingPredicate:
-                       [NSPredicate predicateWithFormat:@"(postID == %@) AND (post == NULL)", self.postID]];
-    if (comments && [comments count] > 0) {
-        [self.comments unionSet:comments];
-    }
+    return NO;
 }
 
 - (void)autosave {

WordPress/Classes/BasePost.h

@@ -12,8 +12,9 @@
 
 typedef enum {
     AbstractPostRemoteStatusPushing,    // Uploading post
-    AbstractPostRemoteStatusFailed,      // Upload failed
-    AbstractPostRemoteStatusLocal,       // Only local version
+    AbstractPostRemoteStatusFailed,     // Upload failed
+    AbstractPostRemoteStatusConflicted, // Upload conflicts with a newer server revision
+    AbstractPostRemoteStatusLocal,      // Only local version
     AbstractPostRemoteStatusSync,       // Post uploaded
 } AbstractPostRemoteStatus;
 
@@ -25,6 +26,7 @@ typedef enum {
 @property (nonatomic, strong) NSNumber * postID;
 @property (nonatomic, strong) NSString * author;
 @property (nonatomic, strong) NSDate * date_created_gmt;
+@property (nonatomic, strong) NSDate * date_modified_gmt;
 @property (nonatomic, strong) NSString * postTitle;
 @property (nonatomic, strong) NSString * content;
 @property (nonatomic, strong) NSString * status;
@@ -40,6 +42,7 @@ typedef enum {
 
 @property (readonly) BOOL hasChanges;
 @property (nonatomic, assign) BOOL isFeaturedImageChanged;
+@property (nonatomic, assign) BOOL ignoreConflictCheck;
 
 - (NSArray *)availableStatuses;
 // Does the post exist on the blog?
@@ -63,5 +66,6 @@ typedef enum {
 #pragma mark     Data Management
 - (void)uploadWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure;
 - (void)deletePostWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure;
+- (void)getPostWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure;
 
 @end

WordPress/Classes/BasePost.m

@@ -17,10 +17,10 @@ - (void)markRemoteStatusFailed;
 @end
 
 @implementation BasePost
-@dynamic author, content, date_created_gmt, postID, postTitle, status, password, remoteStatusNumber, permaLink, 
-		mt_excerpt, mt_text_more, wp_slug, post_thumbnail;
+@dynamic author, content, date_created_gmt, date_modified_gmt, postID, postTitle, status, password, remoteStatusNumber, 
+		permaLink, mt_excerpt, mt_text_more, wp_slug, post_thumbnail;
 
-@synthesize isFeaturedImageChanged;
+@synthesize isFeaturedImageChanged, ignoreConflictCheck;
 
 + (NSString *)titleForStatus:(NSString *)status {
     if ([status isEqualToString:@"draft"]) {
@@ -111,6 +111,9 @@ + (NSString *)titleForRemoteStatus:(NSNumber *)remoteStatus {
         case AbstractPostRemoteStatusFailed:
             return NSLocalizedString(@"Failed", @"");
             break;
+        case AbstractPostRemoteStatusConflicted:
+            return NSLocalizedString(@"Conflicted", @"");
+            break;
         case AbstractPostRemoteStatusSync:
             return NSLocalizedString(@"Posts", @"");
             break;
@@ -141,41 +144,42 @@ - (void)setDateCreated:(NSDate *)localDate {
 
 
 - (void)findComments {
-
 }
 
 - (void)uploadWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure {
 }
 
 - (void)deletePostWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure {
-
+}
+
+- (void)getPostWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failure {
 }
 
 - (NSDictionary *)XMLRPCDictionary {
     NSMutableDictionary *postParams = [NSMutableDictionary dictionary];
-    
-    [postParams setValueIfNotNil:self.postTitle forKey:@"title"];
-    [postParams setValueIfNotNil:self.content forKey:@"description"];    
-    [postParams setValueIfNotNil:self.date_created_gmt forKey:@"date_created_gmt"];
-    [postParams setValueIfNotNil:self.password forKey:@"wp_password"];
-    [postParams setValueIfNotNil:self.permaLink forKey:@"permalink"];
-    [postParams setValueIfNotNil:self.mt_excerpt forKey:@"mt_excerpt"];
-    [postParams setValueIfNotNil:self.wp_slug forKey:@"wp_slug"];
+
+    [postParams setValueIfNotNil:self.postTitle forKey:@"post_title"];
+    [postParams setValueIfNotNil:self.content forKey:@"post_content"];
+    [postParams setValueIfNotNil:self.date_created_gmt forKey:@"post_date_gmt"];
+    [postParams setValueIfNotNil:self.password forKey:@"post_password"];
+    [postParams setValueIfNotNil:self.permaLink forKey:@"link"];
+    [postParams setValueIfNotNil:self.mt_excerpt forKey:@"post_excerpt"];
+    [postParams setValueIfNotNil:self.wp_slug forKey:@"post_name"];
     // To remove a featured image, you have to send an empty string to the API
     if (self.post_thumbnail == nil) {
         // Including an empty string for wp_post_thumbnail generates
         // an "Invalid attachment ID" error in the call to wp.newPage
-        if ([self.postID intValue] > 0) {
-            [postParams setValue:@"" forKey:@"wp_post_thumbnail"];
+        if ([self.postID longLongValue] > 0) {
+            [postParams setValue:@"" forKey:@"post_thumbnail"];
         }
 
     } else {
-        [postParams setValue:self.post_thumbnail forKey:@"wp_post_thumbnail"];
+        [postParams setValue:self.post_thumbnail forKey:@"post_thumbnail"];
 	}
-    
+
 	if (self.mt_text_more != nil && [self.mt_text_more length] > 0)
-        [postParams setObject:self.mt_text_more forKey:@"mt_text_more"];
-	
+        [postParams setObject:self.mt_text_more forKey:@"post_more"];
+
     return postParams;
 }
 

WordPress/Classes/Blog.m

@@ -553,7 +553,7 @@ - (WPXMLRPCRequestOperation *)operationForOptionsWithSuccess:(void (^)())success
             return;
 
         self.options = [NSDictionary dictionaryWithDictionary:(NSDictionary *)responseObject];
-        NSString *minimumVersion = @"3.1";
+        NSString *minimumVersion = @"3.4";
         float version = [[self version] floatValue];
         if (version < [minimumVersion floatValue]) {
             if (self.lastUpdateWarning == nil || [self.lastUpdateWarning floatValue] < [minimumVersion floatValue]) {

WordPress/Classes/EditPostViewController.m

@@ -5,6 +5,7 @@
 #import "NSString+XMLExtensions.h"
 #import "WPPopoverBackgroundView.h"
 #import "WPAddCategoryViewController.h"
+#import "RevisionSelectorViewController.h"
 
 NSTimeInterval kAnimationDuration = 0.3f;
 
@@ -127,10 +128,6 @@ - (void)viewDidLoad {
         [self addChildViewController:self.postMediaViewController];
     }
 
-    self.postSettingsViewController.view.frame = editView.frame;
-    self.postMediaViewController.view.frame = editView.frame;
-    self.postPreviewViewController.view.frame = editView.frame;
-
     self.title = [self editorTitle];
 
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
@@ -578,8 +575,7 @@ - (void)newCategoryCreatedNotificationReceived:(NSNotification *)notification {
 }
 
 
-- (IBAction)showAddNewCategoryView:(id)sender
-{
+- (IBAction)showAddNewCategoryView:(id)sender {
     WPFLogMethod();
     WPAddCategoryViewController *addCategoryViewController = [[WPAddCategoryViewController alloc] initWithNibName:@"WPAddCategoryViewController" bundle:nil];
     addCategoryViewController.blog = self.post.blog;
@@ -643,15 +639,14 @@ - (void)savePost:(BOOL)upload{
         } failure:^(NSError *error) {
             WPFLog(@"post failed: %@", [error localizedDescription]);
         }];
-	} else {
+    } else {
 		[self.apost.original save];
 	}
 
     [self dismissEditView];
 }
 
-- (void)logSavePostStats
-{
+- (void)logSavePostStats {
     NSString *buttonTitle = self.navigationItem.rightBarButtonItem.title;
     NSString *event;
     if ([buttonTitle isEqualToString:NSLocalizedString(@"Schedule", nil)]) {
@@ -1433,7 +1428,7 @@ - (void)wrapSelectionWithTag:(NSString *)tag {
         suffix = [NSString stringWithFormat:@"</%@>\n", tag];
     } else {
         prefix = [NSString stringWithFormat:@"<%@>", tag];
-        suffix = [NSString stringWithFormat:@"</%@>", tag];        
+        suffix = [NSString stringWithFormat:@"</%@>", tag];
     }
     textView.scrollEnabled = NO;
     NSString *replacement = [NSString stringWithFormat:@"%@%@%@",prefix,selection,suffix];

WordPress/Classes/Page.m

@@ -75,8 +75,10 @@ + (NSString *)titleForRemoteStatus:(NSNumber *)remoteStatus {
 
 - (void )updateFromDictionary:(NSDictionary *)postInfo {
 	self.postTitle      = [postInfo objectForKey:@"title"];
+    self.author         = [postInfo objectForKey:@"wp_author_display_name"];
     self.postID         = [[postInfo objectForKey:@"page_id"] numericValue];
     self.content        = [postInfo objectForKey:@"description"];
+    self.date_modified_gmt = [postInfo objectForKey:@"date_modified_gmt"];
     self.date_created_gmt    = [postInfo objectForKey:@"date_created_gmt"];
     NSString *status = [postInfo objectForKey:@"page_status"];
     if ([status isEqualToString:@"future"]) {