Merge branch 'communication/develop_onuma' into 'communication/develop'

#43368 文書協業中にプッシュメッセージからチャットルーム及びコラボレーション開始する時、チェックしてエラー表示する。

See merge request !197

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java

@@ -3,15 +3,10 @@ package jp.agentec.abook.abv.ui.common.activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import java.util.Date;
-import java.util.List;
-
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
-import jp.agentec.abook.abv.bl.dto.PushMessageDto;
 import jp.agentec.abook.abv.bl.logic.AbstractLogic;
 import jp.agentec.abook.abv.bl.logic.OperationLogic;
-import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
 import jp.agentec.abook.abv.bl.websocket.MeetingManager;
 import jp.agentec.abook.abv.launcher.android.R;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
@@ -22,8 +17,6 @@ import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
 import jp.agentec.abook.abv.ui.home.activity.OperationListActivity;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
-import jp.agentec.adf.util.DateTimeFormat;
-import jp.agentec.adf.util.DateTimeUtil;
 import jp.agentec.adf.util.StringUtil;
 
 public class ShowPushMessageDailogActivity extends ABVUIActivity {
@@ -31,6 +24,7 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
 
     OperationLogic mOperationLogic = AbstractLogic.getLogic(OperationLogic.class);
     boolean isMeetingRoomConnected = false;
+    boolean isCollabration = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -126,13 +120,13 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             isMeetingRoomConnected = MeetingManager.getInstance().isConnected();
-                            // Check PushMessage
+                            isCollabration = MeetingManager.getInstance().isCollaboration();
                             Bundle extras = getIntent().getExtras();
                             if (extras != null && !isMeetingRoomConnected) {
                                 moveChatRoom(extras);
                                 finish();
                             }
-                            if (isMeetingRoomConnected) {
+                            if (isMeetingRoomConnected || isCollabration) {
                                 showCannotMoveChatRoomDialog();
                             }
                         }
@@ -175,9 +169,15 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
         handler.post(new Runnable() {
             @Override
             public void run() {
+                String dialogMessage = null;
+                if (isCollabration) {
+                    dialogMessage = getRString(R.string.chat_open_fail_collaborattion_connected);
+                } else if (isMeetingRoomConnected) {
+                    dialogMessage = getRString(R.string.chat_open_fail_meeting_connected);
+                }
                 final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this,
                         getRString(R.string.app_name),
-                        getRString(R.string.chat_open_fail_meeting_connected));
+                        dialogMessage);
                 alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {