Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

[NEW] WebRTC-call in new tab for mobile devices #629

Merged
merged 9 commits into from
Aug 19, 2021
Merged

[NEW] WebRTC-call in new tab for mobile devices #629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4fd889
open webrtc call in new tab for mobile devices
Deepak-learner Aug 9, 2021
bdde5fd
improve codebase
Deepak-learner Aug 10, 2021
a5cdd71
add helper function
Deepak-learner Aug 12, 2021
875b7e6
update one file
Deepak-learner Aug 13, 2021
2b6a279
Merge branch 'livechat-calls' into support-webrtc-call-for-mobile-device
murtaza98 Aug 17, 2021
cf1413e
checking call status from room object
Deepak-learner Aug 18, 2021
2b18405
update one file
Deepak-learner Aug 18, 2021
27ddcd6
handle refresh case
Deepak-learner Aug 19, 2021
a653c0e
change message filter condition
Deepak-learner Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/components/Calls/CallIFrame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@ import { createClassName } from '../helpers';
import styles from './styles.scss';


export const CallIframe = () => {
export const CallIframe = (props) => {
const { token, room } = store.state;
const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }`;
const callInNewTab = async () => {
window.open(url);
await store.setState({ ongoingCall: { callStatus: 'ongoingCallInNewTab', time: props.time } });
await store.setState({ incomingCallAlert: { show: false, callProvider: props.callProvider } });
};
return (
<div className={createClassName(styles, 'call-iframe')}>
<iframe className={createClassName(styles, 'call-iframe__content')} allow='camera;microphone' src={url} />
<div>
{(window.innerWidth <= 800) && (window.innerHeight <= 630)
murtaza98 marked this conversation as resolved.
Show resolved Hide resolved
? <div className={createClassName(styles, 'call-iframe')}> <iframe className={createClassName(styles, 'call-iframe__content')} allow='camera;microphone' src={url} />
</div> : callInNewTab() }
</div>
);
};
2 changes: 1 addition & 1 deletion src/components/Calls/JoinCallButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const JoinCallButton = (props) => {
}
};
return (<div>
{ props.callStatus === 'accept'
{ props.callStatus === 'accept' || props.callStatus === 'ongoingCallInNewTab'
? <div className={createClassName(styles, 'joinCall')}>
<div className={createClassName(styles, 'joinCall__content')} >
<div className={createClassName(styles, 'joinCall__content-videoIcon')} >
Expand Down
6 changes: 5 additions & 1 deletion src/lib/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const processMessage = async (message) => {
closeChat(message);
} else if (message.t === 'command') {
commands[message.msg] && commands[message.msg]();
} else if (message.endTs && ((ongoingCall && ongoingCall.callStatus === 'declined') || incomingCallAlert)) {
} else if (message.endTs && ((ongoingCall && (ongoingCall.callStatus === 'declined' || ongoingCall.callStatus === 'ongoingCallInNewTab')) || incomingCallAlert)) {
await store.setState({ ongoingCall: { callStatus: 'ended', time: message.ts }, incomingCallAlert: null });
} else if (!incomingCallAlert && (message.t === constants.webrtcCallStartedMessageType || message.t === constants.jitsiCallStartedMessageType)) {
await processCallMessage(message);
Expand Down Expand Up @@ -209,6 +209,10 @@ export const loadMessages = async () => {
await store.setState({ ongoingCall: { callStatus: 'ended', time: lastMessage.ts }, incomingCallAlert: null });
return;
}
if (window.innerWidth <= 800 && window.innerHeight >= 630) {
await store.setState({ ongoingCall: { callStatus: 'ongoingCallInNewTab', time: lastMessage.ts }, incomingCallAlert: null });
return;
}
await processCallMessage(lastMessage);
}
}
Expand Down