Merge branch 'bug/#44046_1on1_from_contact' into 'develop'

Bug/#44046 1on1 from contact

See merge request !244

public_new/js/common/common.js

@@ -73,7 +73,6 @@ document.addEventListener("DOMContentLoaded", function () {
 });
 });
 
 
 document.addEventListener("readystatechange", () => {
 document.addEventListener("readystatechange", () => {
-  
   switch (document.readyState) {
   switch (document.readyState) {
     case "interactive":
     case "interactive":
       break;
       break;
@@ -146,7 +145,12 @@ Common.getProfileImgUrl = function (path) {
       if (receivedString == "" || receivedString == undefined) {
       if (receivedString == "" || receivedString == undefined) {
         return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
         return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
       }
       }
-      return "data:image/"+userInfo[0].split('.').pop()+";base64," + receivedString;
+      return (
+        "data:image/" +
+        userInfo[0].split(".").pop() +
+        ";base64," +
+        receivedString
+      );
     }
     }
     return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
     return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
   } else {
   } else {
@@ -186,7 +190,9 @@ Common.startCollaboration = function (collaborationType) {
     }
     }
   }
   }
 
 
+  if (typeof CHAT_SOCKET != "undefined") {
     CHAT_SOCKET.emitCollaborationFinishMessage();
     CHAT_SOCKET.emitCollaborationFinishMessage();
+  }
   NativeBridgeDelegate.finishAllCollaboration();
   NativeBridgeDelegate.finishAllCollaboration();
   NativeBridgeDelegate.startCollaboration(collaborationType);
   NativeBridgeDelegate.startCollaboration(collaborationType);
   Common.dismissLoadingIndicator();
   Common.dismissLoadingIndicator();