Commit db2d2706 by Kim Peace

Merge branch 'bug/#44334_recoding_related_in_collaboration' into debug/console_logs

parents 435d6dc8 9d625253
...@@ -115,6 +115,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) { ...@@ -115,6 +115,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) { if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
FermiWebSocketMessageHandler.apiWelcome(); FermiWebSocketMessageHandler.apiWelcome();
} else { } else {
// when collaboration type is invited it should be dm room also
roomInfo.roomType = ChatRoomType.DM;
FermiWebSocketBridge.getCollaborationType(); FermiWebSocketBridge.getCollaborationType();
} }
CollaborationFeature.updateHost(); CollaborationFeature.updateHost();
......
...@@ -209,6 +209,9 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () { ...@@ -209,6 +209,9 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
NativeBridgeDelegate.showPhotoSelection(); NativeBridgeDelegate.showPhotoSelection();
}, 100); }, 100);
} }
if (globalUserInfo.joinType == COLLABORATION_JOIN_TYPE.INVITED) {
roomInfo.roomType = ChatRoomType.DM;
}
} catch (err) { } catch (err) {
// if the user denied the permission, it goes back to chat room // if the user denied the permission, it goes back to chat room
if (err.name == "NotAllowedError") { if (err.name == "NotAllowedError") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment