#43045対応（文書協業で、他の協業に変更し、再度文書協業に切り替えると、「Loading」表示のままとなる）

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

@@ -1501,9 +1501,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         public int createContentView() {
         public int createContentView() {
             Integer meetingId = null;
             Integer meetingId = null;
             meetingManager.close();
             meetingManager.close();
-            Stack<ABVAuthenticatedActivity> stack = activityHandlingHelper.getCurrentActivityStack();
-            activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
-            Stack<ABVAuthenticatedActivity> stack2 = activityHandlingHelper.getCurrentActivityStack();
             try {
             try {
                 connectMeetingServer();
                 connectMeetingServer();
                 List<MeetingDto> meetingList= meetingManager.getMeetingList(mSkey);
                 List<MeetingDto> meetingList= meetingManager.getMeetingList(mSkey);
@@ -1525,7 +1522,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
 
         @JavascriptInterface
         @JavascriptInterface
         public void startContentView() {
         public void startContentView() {
-            activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
             meetingManager.close();
             meetingManager.close();
             try {
             try {
                 connectMeetingServer();
                 connectMeetingServer();
@@ -1541,8 +1537,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
 
         @JavascriptInterface
         @JavascriptInterface
         public void joinMeetingRoom(int newMeetingId) {
         public void joinMeetingRoom(int newMeetingId) {
-            activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
-            finishBeforeContentListActivity();
             meetingManager.close();
             meetingManager.close();
             try {
             try {
                 connectMeetingServer();
                 connectMeetingServer();
@@ -1655,7 +1649,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                 targetActivity = stack.get(stack.size()-2);
                 targetActivity = stack.get(stack.size()-2);
             }
             }
         }
         }
-
         Intent intent = new Intent();
         Intent intent = new Intent();
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.setClass(targetActivity, OperationRelatedContentActivity.class);
         intent.setClass(targetActivity, OperationRelatedContentActivity.class);

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

@@ -96,7 +96,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
         mAllSaveButton.setVisibility(View.GONE);
         mAllSaveButton.setVisibility(View.GONE);
         setOnButtonEvent();
         setOnButtonEvent();
         settingBottomToolbar();
         settingBottomToolbar();
-
+        refreshCollaborationUI();
     }
     }
 
 
     // 下辺のツールバー設定
     // 下辺のツールバー設定
@@ -506,25 +506,39 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
         });
         });
     }
     }
 
 
-
-
-    @Override
-    public void onResume() {
-        Logger.i(TAG, "onResume:start");
-        super.onResume();
+   private void refreshCollaborationUI() {
        if (isCollaboration) {
        if (isCollaboration) {
+           activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
            hideBottomToolbar();
            hideBottomToolbar();
-            if (!isCollaborationOwner) {
+           if (isCollaborationOwner) {
+               closeProgressPopup();
+               showContentList();
+           } else {
                showProgressPopup();
                showProgressPopup();
                hideContentList();
                hideContentList();
            }
            }
        } else {
        } else {
+           closeProgressPopup();
            showBottomToolbar();
            showBottomToolbar();
            showContentList();
            showContentList();
        }
        }
+   }
+
+    @Override
+    public void onResume() {
+        Logger.i(TAG, "onResume:start");
+        super.onResume();
         showOperationRelatedContentList();
         showOperationRelatedContentList();
     }
     }
 
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        isCollaboration = intent.getBooleanExtra("isCollaboration", false);
+        isCollaborationOwner = intent.getBooleanExtra("isCollaborationOwner", false);
+        refreshCollaborationUI();
+        super.onNewIntent(intent);
+    }
+
     // 設定画面へ遷移
     // 設定画面へ遷移
     public void onClickSetting(View v) {
     public void onClickSetting(View v) {
         showSetting();
         showSetting();