Merge branch 'hotfix/v2.0.1' into develop

packages/client/src/store/FilesActionsStore.js

@@ -2453,10 +2453,16 @@ class FilesActionStore {
           removeFiles(null, [roomId]);
         }
       } else {
-        const newFolders = folders;
-        const folderIndex = newFolders.findIndex((r) => r.id === roomId);
-        newFolders[folderIndex].inRoom = false;
-        setFolders(newFolders);
+        if (!isRoot) {
+          this.selectedFolderStore.setInRoom(false);
+        } else {
+          const newFolders = folders;
+          const folderIndex = newFolders.findIndex((r) => r.id === roomId);
+          if (folderIndex > -1) {
+            newFolders[folderIndex].inRoom = false;
+            setFolders(newFolders);
+          }
+        }
       }
 
       isOwner
@@ -2468,7 +2474,8 @@ class FilesActionStore {
   changeRoomOwner = (t, userId, isLeaveChecked = false) => {
     const { setRoomOwner, setFolder, setSelected, selection, bufferSelection } =
       this.filesStore;
-    const { isRootFolder, setCreatedBy, id } = this.selectedFolderStore;
+    const { isRootFolder, setCreatedBy, id, setInRoom } =
+      this.selectedFolderStore;
 
     const roomId = selection.length
       ? selection[0].id
@@ -2482,6 +2489,9 @@ class FilesActionStore {
           setFolder(res[0]);
         } else {
           setCreatedBy(res[0].createdBy);
+
+          const isMe = userId === this.authStore.userStore.user.id;
+          if (isMe) setInRoom(true);
         }
 
         if (isLeaveChecked) await this.onLeaveRoom(t);

packages/client/src/store/FilesStore.js

@@ -1519,12 +1519,8 @@ class FilesStore {
             .reverse();
         });
 
-        const isRoom = !!data.current.roomType;
-        const inRoom = data.current.inRoom;
-
         this.selectedFolderStore.setSelectedFolder({
           folders: data.folders,
-          inRoom: inRoom ? inRoom : isRoom ? true : false,
           ...data.current,
           pathParts: data.pathParts,
           navigationPath,
@@ -3036,7 +3032,7 @@ class FilesStore {
         security,
         viewAccessibility,
         mute,
-        inRoom = true,
+        inRoom,
       } = item;
 
       const thirdPartyIcon = this.thirdPartyStore.getThirdPartyIcon(

packages/client/src/store/SelectedFolderStore.js

@@ -139,6 +139,10 @@ class SelectedFolderStore {
     this.tags = tags;
   };
 
+  setInRoom = (inRoom) => {
+    this.inRoom = inRoom;
+  };
+
   addDefaultLogoPaths = () => {
     const cachebreaker = new Date().getTime();
     this.logo = {

packages/editor/src/client/components/Editor.js

@@ -138,6 +138,8 @@ function Editor({
     const androidID = portalSettings?.deepLink?.androidPackageName;
     const iOSId = portalSettings?.deepLink?.iosPackageId;
     const deepLinkUrl = portalSettings?.deepLink?.url;
+    const isAndroidWebView =
+      window.navigator.userAgent.includes("AscAndroidWebView");
 
     const defaultOpenDocument = localStorage.getItem("defaultOpenDocument");
     const params = new URLSearchParams(window.location.search);
@@ -149,7 +151,8 @@ function Editor({
       androidID &&
       iOSId &&
       deepLinkUrl &&
-      !withoutRedirect
+      !withoutRedirect &&
+      !isAndroidWebView
     ) {
       setIsShowDeepLink(true);
     }