Merge branch 'develop_43227' into 'develop'

Bug #43227 新規インストールやアップデート後に文書協業を開くと「会議室サーバに接続できませんでした」と、アラート表示される

See merge request !193

public_new/js/views/collaboration/share-event-listener.js

@@ -160,6 +160,24 @@ CoviewBridge.bindMessageEvent = function () {
 CollaborationFeature.didReceiveLoginResponseMessage = async function () {
 CollaborationFeature.didReceiveLoginResponseMessage = async function () {
   CollaborationFeature.searchHostIntervally();
   CollaborationFeature.searchHostIntervally();
 
 
+  const isDocument =
+    globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT;
+  const isAttendee =
+    globalUserInfo.joinType == COLLABORATION_JOIN_TYPE.ATTENDEE;
+  const isHost = globalUserInfo.joinType == COLLABORATION_JOIN_TYPE.HOST;
+
+  if (isDocument) {
+    if (isAttendee) {
+      NativeBridgeDelegate.startContentView();
+    } else if (isHost) {
+      globalUserInfo.meetingID = NativeBridgeDataSource.createContentView();
+      if (globalUserInfo.meetingID == "-1") { //会議室作成失敗
+        CoviewBridge.finishCollaboration();
+        return;
+      }
+    }
+  }
+
   switch (globalUserInfo.joinType) {
   switch (globalUserInfo.joinType) {
     case COLLABORATION_JOIN_TYPE.INVITED:
     case COLLABORATION_JOIN_TYPE.INVITED:
     // fall through
     // fall through
@@ -179,19 +197,7 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
       break;
       break;
   }
   }
 
 
-  const isDocument =
-    globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT;
-  const isAttendee =
-    globalUserInfo.joinType == COLLABORATION_JOIN_TYPE.ATTENDEE;
-  const isHost = globalUserInfo.joinType == COLLABORATION_JOIN_TYPE.HOST;
 
 
-  if (isDocument) {
-    if (isAttendee) {
-      NativeBridgeDelegate.startContentView();
-    } else if (isHost) {
-      globalUserInfo.meetingID = NativeBridgeDataSource.createContentView();
-    }
-  }
 
 
   CollaborationUI.moveToVideoShareArea();
   CollaborationUI.moveToVideoShareArea();
 };
 };

public_new/js/views/collaboration/share.js

@@ -52,6 +52,10 @@ function changeCollaboration(collaborationType) {
       case COLLABORATION_TYPE.DOCUMENT:
       case COLLABORATION_TYPE.DOCUMENT:
         coview_api.ChangeCollaboration("audio");
         coview_api.ChangeCollaboration("audio");
         newMeetingID = NativeBridgeDataSource.createContentView();
         newMeetingID = NativeBridgeDataSource.createContentView();
+        if (newMeetingID == "-1") { //会議室作成失敗
+            CoviewBridge.finishCollaboration();
+            return;
+        }
         break;
         break;
       case COLLABORATION_TYPE.BOARD:
       case COLLABORATION_TYPE.BOARD:
         coview_api.ChangeCollaboration("audio");
         coview_api.ChangeCollaboration("audio");