diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhClient.kt b/app/src/main/java/com/hippo/ehviewer/client/EhClient.kt
index a894f088b..2c1cb8498 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhClient.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhClient.kt
@@ -46,12 +46,6 @@ object EhClient {
 
     suspend fun execute(method: Int, vararg params: Any?): Any? {
         return when (method) {
-            METHOD_GET_COMMENT_GALLERY -> EhEngine.commentGallery(
-                params[0] as String?,
-                params[1] as String,
-                params[2] as String?,
-            )
-
             METHOD_GET_FAVORITES -> EhEngine.getFavorites(
                 params[0] as String,
             )
@@ -92,7 +86,6 @@ object EhClient {
         fun onCancel()
     }
 
-    const val METHOD_GET_COMMENT_GALLERY = 6
     const val METHOD_GET_FAVORITES = 8
     const val METHOD_ADD_FAVORITES_RANGE = 10
     const val METHOD_MODIFY_FAVORITES = 11
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
index 7d16cf1d3..d9e38643a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
@@ -65,10 +65,8 @@ import com.hippo.easyrecyclerview.EasyRecyclerView
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.UrlOpener
 import com.hippo.ehviewer.WindowInsetsAnimationHelper
-import com.hippo.ehviewer.client.EhClient
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhFilter
-import com.hippo.ehviewer.client.EhRequest
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.GalleryComment
 import com.hippo.ehviewer.client.data.GalleryCommentList
@@ -677,22 +675,26 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
             }
         } else if (mSendImage === v) {
             if (!mInAnimation) {
-                val comment = mEditText!!.text.toBBCode()
-                if (TextUtils.isEmpty(comment)) {
-                    // Comment is empty
-                    return
-                }
+                val comment = mEditText?.text?.toBBCode()?.takeIf { it.isNotBlank() } ?: return
                 val url = galleryDetailUrl ?: return
-                // Request
-                val request = EhRequest()
-                    .setMethod(EhClient.METHOD_GET_COMMENT_GALLERY)
-                    .setArgs(
-                        url,
-                        comment,
-                        if (mCommentId != 0L) mCommentId.toString() else null,
-                    )
-                    .setCallback(CommentGalleryListener(context, mCommentId))
-                request.enqueue(this)
+                lifecycleScope.launchIO {
+                    runSuspendCatching {
+                        EhEngine.commentGallery(url, comment, if (mCommentId != 0L) mCommentId.toString() else null)
+                    }.onSuccess {
+                        showTip(if (mCommentId != 0L) R.string.edit_comment_successfully else R.string.comment_successfully, LENGTH_SHORT)
+                        withUIContext {
+                            onCommentGallerySuccess(it)
+                        }
+                    }.onFailure {
+                        showTip(
+                            """
+    ${getString(if (mCommentId != 0L) R.string.edit_comment_failed else R.string.comment_failed)}
+    ${ExceptionUtils.getReadableString(it)}
+                            """.trimIndent(),
+                            LENGTH_LONG,
+                        )
+                    }
+                }
                 hideSoftInput()
                 hideEditPanel(true)
             }
@@ -797,30 +799,6 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
     private class ProgressCommentHolder(inflater: LayoutInflater, parent: ViewGroup?) :
         CommentHolder(inflater, R.layout.item_gallery_comment_progress, parent)
 
-    private inner class CommentGalleryListener(context: Context, private val mCommentId: Long) :
-        EhCallback<GalleryCommentsScene?, GalleryCommentList>(context) {
-        override fun onSuccess(result: GalleryCommentList) {
-            showTip(
-                if (mCommentId != 0L) R.string.edit_comment_successfully else R.string.comment_successfully,
-                LENGTH_SHORT,
-            )
-            val scene = this@GalleryCommentsScene
-            scene.onCommentGallerySuccess(result)
-        }
-
-        override fun onFailure(e: Exception) {
-            showTip(
-                """
-    ${content.getString(if (mCommentId != 0L) R.string.edit_comment_failed else R.string.comment_failed)}
-    ${ExceptionUtils.getReadableString(e)}
-                """.trimIndent(),
-                LENGTH_LONG,
-            )
-        }
-
-        override fun onCancel() {}
-    }
-
     private inner class ActualCommentHolder(inflater: LayoutInflater, parent: ViewGroup?) :
         CommentHolder(inflater, R.layout.item_gallery_comment, parent) {
         private val user: TextView = itemView.findViewById(R.id.user)