Merge branch 'communication/develop_44459' into 'communication/develop'

#44459 文書協業接続開始時に、「ホストが文書を選択中です」が2回表示される。

See merge request !227

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java

@@ -849,11 +849,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
 
 
     public void startContentListActivity(boolean isOwner) {
     public void startContentListActivity(boolean isOwner) {
         Activity targetActivity = activityHandlingHelper.getCurrentActivity();
         Activity targetActivity = activityHandlingHelper.getCurrentActivity();
-        OperationRelatedContentActivity beforeActiryty = activityHandlingHelper.getActivity(OperationRelatedContentActivity.class);
-        if (beforeActiryty != null) {
-            // すでにあるなら作らない。
-            return;
-        }
         if (targetActivity instanceof ChatWebViewActivity) {
         if (targetActivity instanceof ChatWebViewActivity) {
             Stack<ABVAuthenticatedActivity> stack = activityHandlingHelper.getCurrentActivityStack();
             Stack<ABVAuthenticatedActivity> stack = activityHandlingHelper.getCurrentActivityStack();
             if (stack.size() > 1){
             if (stack.size() > 1){
@@ -1054,7 +1049,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
             unregisterReceiver(receiver);
             unregisterReceiver(receiver);
             receiver = null;
             receiver = null;
         }
         }
-        finishBeforeContentListActivity();
     }
     }
 
 
     @Override
     @Override
@@ -1323,6 +1317,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
     }
     }
 
 
     public void joinMeetingRoom(int newMeetingId) {
     public void joinMeetingRoom(int newMeetingId) {
+        if (meetingManager.isConnected()) {
+            // すでに会議室に入室していたら、何もしない。
+            return;
+        }
         finishBeforeContentListActivity();
         finishBeforeContentListActivity();
         startPIPMode();
         startPIPMode();
         meetingManager.close();
         meetingManager.close();