Make some refactors

wordpress-mobile · Jun 10, 2024 · d0fa51a · d0fa51a
1 parent 1735251
commit d0fa51a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
@@ -14,6 +14,7 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.gravatar.AvatarQueryOptions;
 import com.gravatar.AvatarUrl;
@@ -138,6 +139,8 @@ public abstract class CommentDetailFragment extends ViewPagerFragment implements
 
     @Nullable protected CommentDetailFragmentBinding mBinding = null;
 
+    private CommentDetailViewModel mViewModel;
+
     private final OnActionClickListener mOnActionClickListener = new OnActionClickListener() {
         @Override public void onEditCommentClicked() {
             editComment();
@@ -168,7 +171,7 @@ public abstract class CommentDetailFragment extends ViewPagerFragment implements
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) requireActivity().getApplication()).component().inject(this);
-
+        mViewModel = new ViewModelProvider(this).get(CommentDetailViewModel.class);
         mCommentSource = (CommentSource) requireArguments().getSerializable(KEY_MODE);
         setHasOptionsMenu(true);
     }
@@ -687,33 +690,14 @@ protected void moderateComment(
         // Fire the appropriate listener if we have one
         if (note != null && mOnNoteCommentActionListener != null) {
             mOnNoteCommentActionListener.onModerateCommentForNote(note, newStatus);
-            dispatchModerationAction(site, comment, newStatus);
+            mViewModel.dispatchModerationAction(site, comment, newStatus);
         } else if (mOnCommentActionListener != null) {
             mOnCommentActionListener.onModerateComment(comment, newStatus);
             // Sad, but onModerateComment does the moderation itself (due to the undo bar), this should be refactored,
             // That's why we don't call dispatchModerationAction() here.
         }
     }
 
-    private void dispatchModerationAction(
-            @NonNull SiteModel site,
-            @NonNull CommentModel comment,
-            CommentStatus newStatus
-    ) {
-        if (newStatus == CommentStatus.DELETED) {
-            // For deletion, we need to dispatch a specific action.
-            mCommentsStoreAdapter.dispatch(
-                    CommentActionBuilder.newDeleteCommentAction(new RemoteCommentPayload(site, comment))
-            );
-        } else {
-            // Actual moderation (push the modified comment).
-            comment.setStatus(newStatus.toString());
-            mCommentsStoreAdapter.dispatch(
-                    CommentActionBuilder.newPushCommentAction(new RemoteCommentPayload(site, comment))
-            );
-        }
-    }
-
     /*
      * display the comment associated with the passed notification
      */

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailViewModel.kt
@@ -63,8 +63,10 @@ class CommentDetailViewModel @Inject constructor(
         comment.apply { this.status = status.toString() }
         commentsStoreAdapter.dispatch(
             if (status == CommentStatus.DELETED) {
+                // For deletion, we need to dispatch a specific action.
                 CommentActionBuilder.newDeleteCommentAction(CommentStore.RemoteCommentPayload(site, comment))
             } else {
+                // Actual moderation (push the modified comment).
                 CommentActionBuilder.newPushCommentAction(CommentStore.RemoteCommentPayload(site, comment))
             }
         )

diff --git a/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
@@ -568,7 +568,10 @@ public void onModerateCommentForNote(@NonNull Note note, @NonNull CommentStatus
         resultIntent.putExtra(NotificationsListFragment.NOTE_MODERATE_STATUS_EXTRA, newStatus.toString());
 
         setResult(RESULT_OK, resultIntent);
-        finish();
+
+        if (newStatus == CommentStatus.DELETED) {
+            finish();
+        }
     }
 
     @SuppressWarnings("unused")