#44459 文書協業接続開始時に、「ホストが文書を選択中です」が2回表示される。
Showing
... | @@ -851,11 +851,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements | ... | @@ -851,11 +851,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){ | ||
... | @@ -1056,7 +1051,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements | ... | @@ -1056,7 +1051,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements |
unregisterReceiver(receiver); | unregisterReceiver(receiver); | ||
receiver = null; | receiver = null; | ||
} | } | ||
finishBeforeContentListActivity(); | |||
} | } | ||
@Override | @Override | ||
... | @@ -1325,6 +1319,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements | ... | @@ -1325,6 +1319,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements |
} | } | ||
public void joinMeetingRoom(int newMeetingId) { | public void joinMeetingRoom(int newMeetingId) { | ||
if (startPIP) { | |||
// すでにstartPIPModeしていたら実行しない | |||
return; | |||
} | |||
Please
register
or
sign in
to reply
|
|||
finishBeforeContentListActivity(); | finishBeforeContentListActivity(); | ||
startPIPMode(); | startPIPMode(); | ||
meetingManager.close(); | meetingManager.close(); | ||
... | ... |