Removed and Fixed chat-add-user

public_new/chat_add_user.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link rel="stylesheet" href="./fontawesome/css/all.css" >
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">
@@ -21,7 +21,7 @@
   <!-- ナビメニュー -->
   <nav>
     <div class="row h-100 align-items-center">
-      <div class="col-4 pr-0">
+      <div class="col-10 pr-0">
         <div class="nav-item">
           <div class="nav_prev">
             <a href="chat_room.html"><span>ルーム</span></a>
@@ -66,18 +66,19 @@
             <div id="myGroupListForMakeRoom"></div>
           </div>
         </div>
-      </div>
-      <div class="tab_content" id="tab2_content">
-        <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
-        <div class="chat_list">
-          <!-- 全グループ -->
-          <ul class="p-0 chat_make_room_list">
-            <li class="d-flex align-items-center" id="rootGroupArea">
-              <a href="#" class="w-100" id="rootGroupBtnForAddUser">
-                <div class="chat_item d-flex flex-row align-items-center">
-                  <div class="chat_item_l">
-                    <div class="thumbnail-icon">
-                      <img src="icon/icon_prev_top.svg" alt="トップグループに戻る" />
+
+        <div class="tab_content" id="tab2_content">
+          <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
+          <div class="chat_list">
+            <!-- 全グループ -->
+            <ul class="p-0 chat_make_room_list">
+              <li class="d-flex align-items-center" id="rootGroupArea">
+                <a href="#" class="w-100" id="rootGroupBtnForAddUser">
+                  <div class="chat_item d-flex flex-row align-items-center">
+                    <div class="chat_item_l">
+                      <div class="thumbnail-icon">
+                        <img src="icon/icon_prev_top.svg" alt="トップグループに戻る" />
+                      </div>
                     </div>
                     <div class="chat_item_m px-0">
                       <div class="d-flex flex-column">
@@ -87,15 +88,15 @@
                       </div>
                     </div>
                   </div>
-                </div>
-              </a>
-            </li>
-            <li class="d-flex align-items-center" id="parentGroupArea">
-              <a href="#" class="w-100" id="parentGroupBtnForAddUser">
-                <div class="chat_item d-flex flex-row align-items-center">
-                  <div class="chat_item_l">
-                    <div class="thumbnail-icon">
-                      <img src="icon/icon_prev.svg" alt="上位グループに戻る" />
+                </a>
+              </li>
+              <li class="d-flex align-items-center" id="parentGroupArea">
+                <a href="#" class="w-100" id="parentGroupBtnForAddUser">
+                  <div class="chat_item d-flex flex-row align-items-center">
+                    <div class="chat_item_l">
+                      <div class="thumbnail-icon">
+                        <img src="icon/icon_prev.svg" alt="上位グループに戻る" />
+                      </div>
                     </div>
                     <div class="chat_item_m px-0">
                       <div class="d-flex flex-column">
@@ -105,14 +106,14 @@
                       </div>
                     </div>
                   </div>
-              </a>
-            </li>
-            <div id="childGroupListAreaForAddUser"></div>
-            <div id="userInGroupListForAddUser"></div>
-          </ul>
+                </a>
+              </li>
+              <div id="childGroupListAreaForAddUser"></div>
+              <div id="userInGroupListForAddUser"></div>
+            </ul>
+          </div>
         </div>
       </div>
-      </div>
       <div class="chat_make_room">
         <ul class="overlay_src_msg" style="padding-inline-start: 20px;">
         </ul>

public_new/js/common/native-bridge-delegate.js

@@ -117,7 +117,7 @@ NativeBridgeDelegate.joinCollaboration = function (
 
 NativeBridgeDelegate.inviteUsers = function (userIDList) {
   if (typeof android != "undefined") {
-    android.inviteUsers(userIDList, false);
+    android.inviteUsers(userIDList);
   } else {
     webkit.messageHandlers.inviteUsers.postMessage({
       userIdList: userIDList,
@@ -146,7 +146,7 @@ NativeBridgeDelegate.finishPIPMode = function (needsAndroid = false) {
   if (deviceInfo.isiOS()) {
     webkit.messageHandlers.finishPipMode.postMessage({});
   } else if (needsAndroid && typeof android != "undefined") {
-    android.finishPip();
+    android.finishPIP();
   }
 };
 

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

@@ -32,34 +32,6 @@ CoviewBridge.bindStartEvent = function () {
   });
 };
 
-CollaborationFeature.checkAndRetryCamera = async function () {
-  if (!deviceInfo.isAndroid()) {
-    return;
-  }
-  if (globalUserInfo.collaborationType != COLLABORATION_TYPE.VIDEO) {
-    return;
-  }
-  if (g_newStream != null) {
-    return;
-  }
-  try {
-    const cameraStream = await navigator.mediaDevices.getUserMedia(
-      options.constraints
-    );
-    if (cameraStream != null && options.isMainMan) {
-      ORGcreateLocalVideo(options.constraints);
-    } else {
-      setTimeout(() => {
-        CollaborationFeature.checkAndRetryCamera();
-      }, 1000);
-    }
-  } catch (error) {
-    setTimeout(() => {
-      CollaborationFeature.checkAndRetryCamera();
-    }, 1000);
-  }
-};
-
 /**************
  * Scroll Lock
  **************/
@@ -143,7 +115,6 @@ CoviewBridge.bindMessageEvent = function () {
       case "CreateRoomResponse":
         if (json.resultCode == 200) {
           CollaborationFeature.didReceiveCreateRoomResponseMessage();
-          CollaborationFeature.checkAndRetryCamera();
         }
         break;
       case "joinRoomInfoResponse":