Added support for moderation actions when CommentDetailFragment doesn't have a comment action listener.

Author: roundhill

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentActions.java

@@ -243,6 +243,68 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.getRestClientUtils().replyToComment(reply.getContent(), reply.getRestPath(), listener, errorListener);
     }
 
+    /**
+     * reply to an individual comment via the WP.com REST API
+     */
+    public static void submitReplyToCommentRestApi(long siteId, long commentId,
+                                                   final String replyText,
+                                                   final CommentActionListener actionListener) {
+        if (TextUtils.isEmpty(replyText)) {
+            if (actionListener != null)
+                actionListener.onActionResult(false);
+            return;
+        }
+
+        RestRequest.Listener listener = new RestRequest.Listener() {
+            @Override
+            public void onResponse(JSONObject jsonObject) {
+                if (actionListener != null)
+                    actionListener.onActionResult(true);
+            }
+        };
+        RestRequest.ErrorListener errorListener = new RestRequest.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError volleyError) {
+                if (volleyError != null)
+                    AppLog.e(T.COMMENTS, volleyError.getMessage(), volleyError);
+                if (actionListener != null)
+                    actionListener.onActionResult(false);
+            }
+        };
+
+        WordPress.getRestClientUtils().replyToComment(siteId, commentId, replyText, listener, errorListener);
+    }
+
+    /**
+     * Moderate a comment from a WPCOM notification
+     */
+    public static void moderateCommentRestApi(long siteId,
+                                              long commentId,
+                                              CommentStatus newStatus,
+                                              final CommentActionListener actionListener) {
+
+        WordPress.getRestClientUtils().moderateComment(
+                String.valueOf(siteId),
+                String.valueOf(commentId),
+                CommentStatus.toRESTString(newStatus),
+                new RestRequest.Listener() {
+                    @Override
+                    public void onResponse(JSONObject response) {
+                        if (actionListener != null) {
+                            actionListener.onActionResult(true);
+                        }
+                    }
+                }, new RestRequest.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError error) {
+                        if (actionListener != null) {
+                            actionListener.onActionResult(false);
+                        }
+                    }
+                }
+        );
+    }
+
     /**
      * Moderate a comment from a WPCOM notification
      */

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java

@@ -97,6 +97,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
 
     private boolean mIsUsersBlog = false;
     private boolean mIsCommentReply = false;
+    private boolean mIsSubmittingReply = false;
 
     private NotificationsDetailListFragment mNotificationsDetailListFragment;
 
@@ -625,19 +626,41 @@ private void moderateComment(final CommentStatus newStatus) {
         if (!NetworkUtils.checkConnection(getActivity()))
             return;
 
-        // Fire the appropriate listener
+        // Fire the appropriate listener if we have one
         if (mNote != null && mOnNoteCommentActionListener != null) {
             mOnNoteCommentActionListener.onModerateCommentForNote(mNote, newStatus);
+            return;
         } else if (mOnCommentActionListener != null) {
             mOnCommentActionListener.onModerateComment(mLocalBlogId, mComment, newStatus);
+            return;
         }
+
+        if (mNote == null) return;
+
+        // Basic moderation support, currently only used when this Fragment is in a CommentDetailActivity
+        // Uses WP.com REST API and requires a note object
+        final CommentStatus oldStatus = mComment.getStatusEnum();
+        mComment.setStatus(CommentStatus.toString(newStatus));
+        updateStatusViews();
+        CommentActions.moderateCommentRestApi(mNote.getSiteId(), mComment.commentID, newStatus, new CommentActions.CommentActionListener() {
+            @Override
+            public void onActionResult(boolean succeeded) {
+                if (!isAdded()) return;
+
+                if (!succeeded) {
+                    mComment.setStatus(CommentStatus.toString(oldStatus));
+                    updateStatusViews();
+                    ToastUtils.showToast(getActivity(), R.string.error_moderate_comment);
+                }
+            }
+        });
     }
 
     /*
      * post comment box text as a reply to the current comment
      */
     private void submitReply() {
-        if (!isAdded())
+        if (!isAdded() || mIsSubmittingReply)
             return;
 
         if (!NetworkUtils.checkConnection(getActivity()))
@@ -653,15 +676,46 @@ private void submitReply() {
         mEditReply.setEnabled(false);
         EditTextUtils.hideSoftInput(mEditReply);
         mImgSubmitReply.setVisibility(View.GONE);
-        ProgressBar progress = (ProgressBar) getView().findViewById(R.id.progress_submit_comment);
-        progress.setVisibility(View.VISIBLE);
+        final ProgressBar progressBar = getView() != null ? (ProgressBar) getView().findViewById(R.id.progress_submit_comment) : null;
+        if (getView() != null) {
+            progressBar.setVisibility(View.VISIBLE);
+        }
 
-        // Fire the appropriate action listener
+        // Fire the appropriate action listener if we have one
         if (mNote != null && mOnNoteCommentActionListener != null) {
             mOnNoteCommentActionListener.onReplyToNote(mNote, replyText);
+            return;
         } else if (mOnCommentActionListener != null) {
             mOnCommentActionListener.onReplyToComment(mLocalBlogId, mComment, replyText);
+            return;
         }
+
+        if (mNote == null) return;
+
+        // Handle the reply here if no OnCommentActionListener was provided. Uses WP.com REST API
+        mIsSubmittingReply = true;
+        CommentActions.submitReplyToCommentRestApi(mNote.getSiteId(), mComment.commentID, replyText, new CommentActions.CommentActionListener() {
+            @Override
+            public void onActionResult(boolean succeeded) {
+                if (!isAdded()) return;
+
+                mIsSubmittingReply = false;
+                mEditReply.setEnabled(true);
+                mImgSubmitReply.setVisibility(View.VISIBLE);
+                if (progressBar != null) {
+                    progressBar.setVisibility(View.GONE);
+                }
+                updateStatusViews();
+                if (succeeded) {
+                    ToastUtils.showToast(getActivity(), getString(R.string.note_reply_successful));
+                    mEditReply.setText(null);
+                } else {
+                    ToastUtils.showToast(getActivity(), R.string.reply_failed, ToastUtils.Duration.LONG);
+                    // refocus editor on failure and show soft keyboard
+                    EditTextUtils.showSoftInput(mEditReply);
+                }
+            }
+        });
     }
 
     /*
@@ -827,7 +881,7 @@ private boolean canEdit() {
         return (mLocalBlogId > 0 && canModerate());
     }
     private boolean canLike() {
-        return (mEnabledActions != null && mEnabledActions.contains(EnabledActions.ACTION_LIKE));
+        return (!mIsCommentReply && mEnabledActions != null && mEnabledActions.contains(EnabledActions.ACTION_LIKE));
     }
 
     /*

libs/networking/WordPressNetworking/src/main/java/org/wordpress/android/networking/RestClientUtils.java

@@ -76,11 +76,11 @@ public void replyToComment(String reply, String path, Listener listener, ErrorLi
      * <p/>
      * https://developer.wordpress.com/docs/api/1/post/sites/%24site/posts/%24post_ID/replies/new/
      */
-    public void replyToComment(String siteId, String commentId, String content, Listener listener,
+    public void replyToComment(long siteId, long commentId, String content, Listener listener,
                                ErrorListener errorListener) {
         Map<String, String> params = new HashMap<String, String>();
         params.put(COMMENT_REPLY_CONTENT_FIELD, content);
-        String path = String.format("sites/%s/comments/%s/replies/new", siteId, commentId);
+        String path = String.format("sites/%d/comments/%d/replies/new", siteId, commentId);
         post(path, params, null, listener, errorListener);
     }