Merge pull request #1466 from wordpress-mobile/issue/gb-rollout-phase2

Add a setOnlyIfEmpty option to the DesignateMobileEditorForAllSites payload

Author: hypest

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.java

@@ -332,12 +332,17 @@ public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
         add(request);
     }
 
-    public void designateMobileEditorForAllSites(final String mobileEditorName) {
+    public void designateMobileEditorForAllSites(final String mobileEditorName, final boolean setOnlyIfEmpty) {
         Map<String, Object> params = new HashMap<>();
         String url = WPCOMV2.me.gutenberg.getUrl();
         params.put("editor", mobileEditorName);
         params.put("platform", "mobile");
-        params.put("set_only_if_empty", "true");
+        if (setOnlyIfEmpty) {
+            params.put("set_only_if_empty", "true");
+        }
+        // Else, omit the "set_only_if_empty" parameters.
+        // There is an issue in the API implementation. It only checks
+        // for "set_only_if_empty" presence but don't check for its value.
 
         add(WPComGsonRequest
                 .buildPostRequest(url, params, Map.class,

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

@@ -115,9 +115,16 @@ public FetchedPostFormatsPayload(@NonNull SiteModel site, @NonNull List<PostForm
 
     public static class DesignateMobileEditorForAllSitesPayload extends Payload<SiteEditorsError> {
         public String editor;
+        public boolean setOnlyIfEmpty;
 
         public DesignateMobileEditorForAllSitesPayload(@NonNull String editorName) {
             this.editor = editorName;
+            this.setOnlyIfEmpty = true;
+        }
+
+        public DesignateMobileEditorForAllSitesPayload(@NonNull String editorName, boolean setOnlyIfEmpty) {
+            this.editor = editorName;
+            this.setOnlyIfEmpty = setOnlyIfEmpty;
         }
     }
 
@@ -1754,7 +1761,7 @@ private void designateMobileEditorForAllSites(DesignateMobileEditorForAllSitesPa
         }
 
         if (wpcomPostRequestRequired) {
-            mSiteRestClient.designateMobileEditorForAllSites(payload.editor);
+            mSiteRestClient.designateMobileEditorForAllSites(payload.editor, payload.setOnlyIfEmpty);
             event.isNetworkResponse = false;
         } else {
             event.isNetworkResponse = true;