Skip to content

fix(Webphone): fix the 🐛 when double-click on answer button in coming page, it won't navigate to call control page #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2018
Merged

fix(Webphone): fix the 🐛 when double-click on answer button in coming page, it won't navigate to call control page #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b458be
fix(Webphone): fix the bug when double-click on answer button in comi…
Sep 11, 2018
3ff95e7
fix(Phone): fix bug when accept incoming call, it won't navigate to c…
Sep 11, 2018
e956171
chore: cleancode
Sep 11, 2018
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
25 changes: 16 additions & 9 deletions packages/ringcentral-integration/modules/Webphone/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const FOURTH_RETRIES_DELAY = 30 * 1000;
const FIFTH_RETRIES_DELAY = 60 * 1000;
const MAX_RETRIES_DELAY = 2 * 60 * 1000;

const INCOMING_CALL_INVALID_STATE_ERROR_CODE = 2;

/**
* @constructor
* @description Web phone module to handle phone interaction with WebRTC.
Expand Down Expand Up @@ -725,30 +727,35 @@ export default class Webphone extends RcModule {

@proxify
async answer(sessionId) {
const session = this._sessions.get(sessionId);
if (!session) {
const sipSession = this._sessions.get(sessionId);
const session = this.sessions.find(session => session.id === sessionId);
if (!session || !isRing(session)) {
return;
}
try {
this._holdOtherSession(session.id);
this._onAccepted(session, 'inbound');
this._beforeCallStart(session);
await session.accept(this.acceptOptions);
this._onCallStart(session);
this._holdOtherSession(sessionId);
this._onAccepted(sipSession, 'inbound');
this._beforeCallStart(sipSession);
await sipSession.accept(this.acceptOptions);
this._onCallStart(sipSession);
this.store.dispatch({ // for track
type: this.actionTypes.callAnswer,
});
} catch (e) {
console.log('Accept failed');
console.error(e);
this._onCallEnd(session);
if (e.code !== INCOMING_CALL_INVALID_STATE_ERROR_CODE) {
// FIXME:
// 2 means the call is answered
this._onCallEnd(sipSession);
}
}
}

@proxify
async reject(sessionId) {
const session = this._sessions.get(sessionId);
if (!session) {
if (!session || session.__rc_callStatus === sessionStatus.finished) {
return;
}
try {
Expand Down
6 changes: 1 addition & 5 deletions packages/ringcentral-widgets-demo/dev-server/Phone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,7 @@ export default class BasePhone extends RcModule {
});

webphone.onCallStart(() => {
if (
routerInteraction.currentPath.indexOf('/calls/active') !== 0
) {
routerInteraction.push('/calls/active');
}
routerInteraction.push('/calls/active');
});

webphone.onCallRing(() => {
Expand Down