Merge pull request #3003 from wordpress-mobile/issue/17375

Fixes: publish post when device time is set manually

Author: zwarm

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRestClient.java

@@ -646,7 +646,9 @@ private Map<String, Object> postModelToParams(
             params.put("author", String.valueOf(post.getAuthorId()));
         }
 
-        if (!TextUtils.isEmpty(post.getDateCreated())) {
+        if (!TextUtils.isEmpty(post.getDateCreated())
+            && post.getStatus().equals(PostStatus.SCHEDULED.toString())
+        ) {
             params.put("date", post.getDateCreated());
         }
 

fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/post/PostXMLRPCClient.java

@@ -507,7 +507,7 @@ private static Map<String, Object> postModelToContentStruct(
 
         String dateCreated = post.getDateCreated();
         Date date = DateTimeUtils.dateUTCFromIso8601(dateCreated);
-        if (date != null) {
+        if (date != null && post.getStatus().equals(PostStatus.SCHEDULED.toString())) {
             contentStruct.put("post_date", date);
             // Redundant, but left in just in case
             // Note: XML-RPC sends the same value for dateCreated and date_created_gmt in the first place