Merge branch 'communication/develop_44186' into 'communication/develop'

Bug #44186【ABook Communication Android 1.4.200】チャットのメッセージがプッシュ通知されない

See merge request !224

ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java

@@ -113,6 +113,7 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
      */
     private void showChatRoomPopupMessage(Map<String, String> messageMap) {
         String messageBody = messageMap.get(AppDefType.PushMessageKey.message);
+        Logger.d("messageBody = " + messageBody);
         PushMessageJSON json;
         if (StringUtil.isNullOrEmpty(messageBody)) {
             return;
@@ -120,14 +121,6 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
         json = new PushMessageJSON(messageBody);
 
         Activity currentActivity = ActivityHandlingHelper.getInstance().getCurrentActivity();
-        if (currentActivity.getClass().equals(ChatWebViewActivity.class)) {
-            ChatWebViewActivity chatWebViewActivity = (ChatWebViewActivity) currentActivity;
-            if (chatWebViewActivity.getRoomID().equals(json.getRoomId())) {
-                // push messageと同じ部屋にいる場合はpushmessageを送信しない。
-                return;
-            }
-        }
-
         String baseActivityName = currentActivity.getClass().getName();
         if (currentActivity.getClass().equals(HTMLWebViewActivity.class) ||
                 currentActivity.getClass().equals(ContentViewActivity.class) ||