Commit a8a16c26 by Lee Munkyeong

文書協業不具合対応

parent 991b4885
......@@ -1404,7 +1404,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
meetingManager.close();
Stack<ABVAuthenticatedActivity> stack = activityHandlingHelper.getCurrentActivityStack();
activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
finishBeforeContentListActivity();
Stack<ABVAuthenticatedActivity> stack2 = activityHandlingHelper.getCurrentActivityStack();
try {
connectMeetingServer();
......@@ -1428,7 +1427,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface
public void startContentView() {
activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
finishBeforeContentListActivity();
meetingManager.close();
try {
connectMeetingServer();
......
......@@ -521,13 +521,6 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
MeetingManager meetingManager = MeetingManager.getInstance();
}
MeetingManager meetingManager = MeetingManager.getInstance();
if (!meetingManager.isConnected()) {
ChatWebViewActivity chatWebViewActivity = activityHandlingHelper.getActivity(ChatWebViewActivity.class);
if (chatWebViewActivity != null && chatWebViewActivity.isInPictureInPictureMode()) {
getApplication().startActivity(new Intent(chatWebViewActivity, ChatWebViewActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK));
}
}
} else {
showBottomToolbar();
showContentList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment