Merge pull request #1064 from wordpress-mobile/fix/avoid-update-posts-if-locally-changed-take2

Only overwrite Posts that don't have local changes

Author: oguzkocer

fluxc/src/main/java/org/wordpress/android/fluxc/store/PostStore.java

@@ -605,8 +605,9 @@ private void handleFetchedPostList(FetchPostListResponsePayload payload) {
             Map<Long, PostModel> posts = getPostsByRemotePostIds(postIds, site);
             for (PostListItem item : payload.postListItems) {
                 PostModel post = posts.get(item.remotePostId);
-                // Dispatch a fetch action for the posts that are changed
-                if (post != null && !post.getLastModified().equals(item.lastModified)) {
+                // Dispatch a fetch action for the posts that are changed, but not for posts with local changes
+                // as we'd otherwise overwrite and lose these local changes forever
+                if (post != null && !post.getLastModified().equals(item.lastModified) && !post.isLocallyChanged()) {
                     mDispatcher.dispatch(PostActionBuilder.newFetchPostAction(new RemotePostPayload(post, site)));
                 }
             }