From 6297bb8d4e9097889ce5bd977b5be4b5fddb8f6a Mon Sep 17 00:00:00 2001
From: John O'Neil <johnoneil@gmail.com>
Date: Wed, 13 Nov 2013 22:37:44 -0700
Subject: [PATCH] Fix for issue #170 "Edit Page always asks to save changes".
 The save dialog will no longer pop when post/page content is not modified.

---
 src/org/wordpress/android/models/Post.java    | 21 +++++++++++++++++++
 .../android/ui/posts/EditPostActivity.java    | 12 +++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/org/wordpress/android/models/Post.java b/src/org/wordpress/android/models/Post.java
index 06d9a217ac20..470e9d18605c 100644
--- a/src/org/wordpress/android/models/Post.java
+++ b/src/org/wordpress/android/models/Post.java
@@ -429,6 +429,27 @@ public String getQuickPostType() {
         return quickPostType;
     }
 
+    /**
+     * Checks if this post currently has data differing from another post.
+     *
+     * @param otherPost The post to compare to this post's editable data.
+     * @return True if this post's data differs from otherPost's data, False otherwise.
+     */
+    public boolean hasChanges(Post otherPost) {
+        return(!(this.title.equals(otherPost.title) &&
+                this.description.equals(otherPost.description) &&
+                this.mt_excerpt.equals(otherPost.mt_excerpt) &&
+                this.date_created_gmt == otherPost.date_created_gmt &&
+                this.categories.equals(otherPost.categories) &&
+                this.mt_keywords.equals(otherPost.mt_keywords) &&
+                this.post_status.equals(otherPost.post_status) &&
+                this.wp_password.equals(otherPost.wp_password) &&
+                this.wp_post_format.equals(otherPost.wp_post_format) &&
+                this.latitude == otherPost.latitude &&
+                this.longitude == otherPost.longitude)
+        );
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index 7381c74616f8..9c032cd3edbb 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -975,6 +975,18 @@ private void showCancelAlert(final boolean isUpPress) {
             return;
         }
 
+        // Save the current Post
+        savePost(false, true);
+
+        // Compare the current Post to the original and if no changes have been made,
+        // set the Post back to the original and go back to the previous view
+        if (mOriginalPost != null && !mPost.hasChanges(mOriginalPost)) {
+            mOriginalPost.update();
+            WordPress.currentPost = mOriginalPost;
+            finish();
+            return;
+        }
+
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(EditPostActivity.this);
         dialogBuilder.setTitle(getString((mIsPage) ? R.string.edit_page : R.string.edit_post));
         dialogBuilder.setMessage(getString(R.string.prompt_save_changes));