Return with no action if reply text is empty

Opening comments screen when there's an empty message looks like a fail-safe. We cannot reply with an empty message either from the app or from the website as send button is disabled till we enter a text. Even in the case of voice reply from a wearable, an empty voice reply doesn't make sense.

User can tap the notification itself to go straight to the comments screen in case there's ever an empty reply and so this logic to open comments activity from service on empty reply is removed.

Author: ashiagr

WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java

@@ -1,7 +1,6 @@
 package org.wordpress.android.push;
 
 import android.content.Context;
-import android.content.Intent;
 
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
@@ -64,9 +63,4 @@ public static void dismissNotification(int pushId, Context context) {
             notificationManager.cancel(pushId);
         }
     }
-
-    public static void hideStatusBar(Context context) {
-        Intent closeIntent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-        context.sendBroadcast(closeIntent);
-    }
 }

WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java

@@ -36,8 +36,6 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.Note;
 import org.wordpress.android.ui.comments.unified.CommentsStoreAdapter;
-import org.wordpress.android.ui.main.WPMainActivity;
-import org.wordpress.android.ui.notifications.NotificationsListFragment;
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker;
 import org.wordpress.android.ui.notifications.receivers.NotificationsPendingDraftsReceiver;
 import org.wordpress.android.ui.notifications.utils.NotificationsActions;
@@ -612,49 +610,31 @@ private void replyToComment() {
                 return;
             }
 
-            if (!TextUtils.isEmpty(mReplyText)) {
-                SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
-                if (site == null) {
-                    AppLog.e(T.NOTIFS, "Impossible to reply to a comment on a site that is not in the App."
-                                       + " SiteId: " + mNote.getSiteId());
-                    requestFailed(ARG_ACTION_APPROVE);
-                    return;
-                }
+            if (TextUtils.isEmpty(mReplyText)) return;
 
-                // Pseudo comment (built from the note)
-                CommentModel comment = mNote.buildComment();
+            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+            if (site == null) {
+                AppLog.e(T.NOTIFS, "Impossible to reply to a comment on a site that is not in the App."
+                                   + " SiteId: " + mNote.getSiteId());
+                requestFailed(ARG_ACTION_APPROVE);
+                return;
+            }
 
-                // Pseudo comment reply
-                CommentModel reply = new CommentModel();
-                reply.setContent(mReplyText);
+            // Pseudo comment (built from the note)
+            CommentModel comment = mNote.buildComment();
 
-                // Push the reply
-                RemoteCreateCommentPayload payload = new RemoteCreateCommentPayload(site, comment, reply);
-                mCommentsStoreAdapter.dispatch(CommentActionBuilder.newCreateNewCommentAction(payload));
+            // Pseudo comment reply
+            CommentModel reply = new CommentModel();
+            reply.setContent(mReplyText);
 
-                // Bump analytics
-                AnalyticsUtils.trackCommentReplyWithDetails(true,
-                        site, comment, AnalyticsCommentActionSource.NOTIFICATIONS);
-                AnalyticsUtils.trackQuickActionTouched(QuickActionTrackPropertyValue.REPLY_TO, site, comment);
-            } else {
-                // cancel the current notification
-                NativeNotificationsUtils.dismissNotification(mPushId, mContext);
-                NativeNotificationsUtils.hideStatusBar(mContext);
-                // and just trigger the Activity to allow the user to write a reply
-                startReplyToCommentActivity();
-            }
-        }
+            // Push the reply
+            RemoteCreateCommentPayload payload = new RemoteCreateCommentPayload(site, comment, reply);
+            mCommentsStoreAdapter.dispatch(CommentActionBuilder.newCreateNewCommentAction(payload));
 
-        private void startReplyToCommentActivity() {
-            Intent intent = new Intent(mContext, WPMainActivity.class);
-            intent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
-                            | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            intent.setAction("android.intent.action.MAIN");
-            intent.addCategory("android.intent.category.LAUNCHER");
-            intent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, mNoteId);
-            intent.putExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, true);
-            startActivity(intent);
+            // Bump analytics
+            AnalyticsUtils.trackCommentReplyWithDetails(true,
+                    site, comment, AnalyticsCommentActionSource.NOTIFICATIONS);
+            AnalyticsUtils.trackQuickActionTouched(QuickActionTrackPropertyValue.REPLY_TO, site, comment);
         }
 
         private void resetOriginalNotification() {