diff --git a/app/CallManager.js b/app/CallManager.js index 80fec65..3ead09b 100644 --- a/app/CallManager.js +++ b/app/CallManager.js @@ -1,295 +1,282 @@ import events from 'events'; import Logger from '../Logger'; import uuid from 'react-native-uuid'; import { Platform } from 'react-native'; const logger = new Logger('CallManager'); import { CONSTANTS as CK_CONSTANTS } from 'react-native-callkeep'; // https://github.com/react-native-webrtc/react-native-callkeep export default class CallManager extends events.EventEmitter { constructor(RNCallKeep, acceptFunc, rejectFunc, hangupFunc, _sylkConferenceCallFunc) { logger.debug('constructor()'); super(); this.setMaxListeners(Infinity); // Set of current SIP sessions this._calls = new Map(); this._conferences = new Map(); this._waitingCalls = new Map(); this._timeouts = new Map(); this._RNCallKeep = RNCallKeep; console.log(RNCallKeep); this._sylkAnswerCall = acceptFunc; this._sylkRejectCall = rejectFunc; this._sylkHangupCall = hangupFunc; this._sylkConferenceCall = _sylkConferenceCallFunc; this._boundRnAccept = this._rnAccept.bind(this); this._boundRnEnd = this._rnEnd.bind(this); this._boundRnMute = this._rnMute.bind(this); this._boundRnActiveAudioCall = this._rnActiveAudioSession.bind(this); this._boundRnDeactiveAudioCall = this._rnDeactiveAudioSession.bind(this); this._boundRnDTMF = this._rnDTMF.bind(this); this._boundRnProviderReset = this._rnProviderReset.bind(this); this._RNCallKeep.addEventListener('answerCall', this._boundRnAccept); this._RNCallKeep.addEventListener('endCall', this._boundRnEnd); this._RNCallKeep.addEventListener('didPerformSetMutedCallAction', this._boundRnMute); this._RNCallKeep.addEventListener('didActivateAudioSession', this._boundRnActiveAudioCall); this._RNCallKeep.addEventListener('didDeactivateAudioSession', this._boundRnDeactiveAudioCall.bind(this)); this._RNCallKeep.addEventListener('didPerformDTMFAction', this._boundRnDTMF); this._RNCallKeep.addEventListener('didResetProvider', this._boundRnProviderReset); } get callKeep() { return this._RNCallKeep; } get count() { return this._calls.size; } get waitingCount() { return this._timeouts.size; } get callUUIDS() { return Array.from( this._calls.keys() ); } get calls() { return [...this._calls.values()]; } get activeCall() { for (let call of this.calls) { if (call.active) { return call; } } } - // there can only be one active one.... so just empty it for now - remove(callUUID) { - console.log('Callkeep: remove call', callUUID); - this._calls.delete(callUUID); - } - backToForeground() { console.log('Callkeep: bring app to the foreground'); this.callKeep.backToForeground(); } acceptIncomingCall(callUUID) { console.log('Callkeep: accept incoming call', callUUID); this.callKeep.acceptIncomingCall(callUUID); } setMutedCall(callUUID, mute) { console.log('Callkeep: set muted: ', mute); this.callKeep.setMutedCall(callUUID, mute); } startCall(callUUID, targetUri, targetName, hasVideo) { console.log('Callkeep: start call', callUUID); if (Platform.OS === 'ios') { this.callKeep.startCall(callUUID, targetUri, targetUri, 'email', hasVideo); } else if (Platform.OS === 'android') { this.callKeep.startCall(callUUID, targetUri, targetUri); } this.callKeep.startCall(callUUID, targetUri, targetName); } updateDisplay(callUUID, displayName, uri) { console.log('Callkeep: update display', displayName, uri); this.callKeep.updateDisplay(callUUID, displayName, uri); } sendDTMF(callUUID, digits) { console.log('Callkeep: send DTMF: ', digits); this.callKeep.sendDTMF(callUUID, digits); } setCurrentCallActive(callUUID) { console.log('Callkeep: set call active', callUUID); this.callKeep.setCurrentCallActive(callUUID); } rejectCall(callUUID) { console.log('Callkeep: reject call', callUUID); this.callKeep.rejectCall(callUUID); } endCall(callUUID, reason) { + console.log('Callkeep: end call', callUUID); if (reason) { this.callKeep.reportEndCallWithUUID(callUUID, reason); } else { this.callKeep.endCall(callUUID); } - this.remove(callUUID); + this._calls.delete(callUUID); } _rnActiveAudioSession(data) { console.log('Callkeep: activated audio call'); } _rnDeactiveAudioSession(data) { console.log('Callkeep: deactivated audio call'); } _rnAccept(data) { let callUUID = data.callUUID.toLowerCase(); - console.log('Callkeep: accept call for UUID', callUUID); + console.log('Callkeep: accept call callback', callUUID); if (this._conferences.has(callUUID)) { console.log('Accept conference invite', callUUID); let room = this._conferences.get(callUUID); - console.log('Callkeep: hangup for incoming conference UUID', callUUID); + console.log('Callkeep: hangup for incoming conference', callUUID); this.callKeep.endCall(callUUID); this._conferences.delete(callUUID); console.log('Will start conference to', room); this._sylkConferenceCall(room); // start an outgoing conference call } else if (this._calls.has(callUUID)) { // if we have audio only we must skip video from get local media this._sylkAnswerCall(); } else { this._waitingCalls.set(callUUID, '_sylkAnswerCall'); } } _rnEnd(data) { //get the uuid, find the call with that uuid and ccept it let callUUID = data.callUUID.toLowerCase(); - console.log('Callkeep: end call for UUID', callUUID); + console.log('Callkeep: end call callback', callUUID); if (this._conferences.has(callUUID)) { - console.log('Reject conference invite', callUUID); + console.log('Callkeep: Reject conference invite', callUUID); let room = this._conferences.get(callUUID); - console.log('Callkeep: hangup for incoming conference UUID', callUUID); + console.log('Callkeep: hangup for incoming conference', callUUID); this.callKeep.endCall(callUUID); this._conferences.delete(callUUID); } else if (this._calls.has(callUUID)) { - console.log('Callkeep: hangup for call UUID', callUUID); + console.log('Callkeep: hangup call', callUUID); let call = this._calls.get(callUUID); - console.log('Call', callUUID, 'state is', call.state); + console.log('Callkeep: call', callUUID, 'state is', call.state); if (call.state === 'incoming') { this._sylkRejectCall(callUUID); } else { this._sylkHangupCall(callUUID); } } else { - console.log('Callkeep: add to waitings list call UUID', callUUID); + console.log('Callkeep: add to waitings list call', callUUID); this._waitingCalls.set(callUUID, '_sylkHangupCall'); } } _rnMute(data) { - console.log('Callkeep: mute ' + data.muted + ' for call UUID', data.callUUID); + console.log('Callkeep: mute ' + data.muted + ' for call', data.callUUID); //get the uuid, find the call with that uuid and mute/unmute it if (this._calls.has(data.callUUID.toLowerCase())) { let call = this._calls.get(data.callUUID.toLowerCase()); const localStream = call.getLocalStreams()[0]; localStream.getAudioTracks()[0].enabled = !data.muted; } } _rnDTMF(data) { - console.log('Callkeep: got dtmf for call UUID', data.callUUID); + console.log('Callkeep: got dtmf for call', data.callUUID); if (this._calls.has(data.callUUID.toLowerCase())) { let call = this._calls.get(data.callUUID.toLowerCase()); console.log('sending webrtc dtmf', data.digits) call.sendDtmf(data.digits); } } _rnProviderReset() { console.log('Callkeep: got a provider reset, clearing down all calls'); this._calls.forEach((call) => { call.terminate(); }) } handleCallLater(callUUID, notificationContent) { - console.log('Callkeep: handle later incoming call UUID', callUUID); + console.log('Callkeep: handle later incoming call', callUUID); let reason; if (this._waitingCalls.has(callUUID)) { reason = 1; } else { reason = 2; } this._timeouts.set(callUUID, setTimeout(() => { - this.reportEndCallWithUUID(callUUID, reason); + this.callKeep.reportEndCallWithUUID(callUUID, reason); this._timeouts.delete(callUUID); - }, 10000)); + }, 60000)); } handleConference(callUUID, room) { if (this._conferences.has(callUUID)) { return; } console.log('CallKeep: handle conference', callUUID, 'to room', room); this._conferences.set(callUUID, room); this._emitSessionsChange(true); } handleCall(call, callUUID) { // callUUID is present only for outgoing calls if (callUUID) { call._callkeepUUID = callUUID; - console.log('Callkeep: handle outgoing call UUID', call._callkeepUUID); + + this._calls.set(call._callkeepUUID, call); + console.log('Callkeep: start outgoing call', call._callkeepUUID); + this._calls.set(call._callkeepUUID, call); } else if (call.id) { call._callkeepUUID = call.id; - console.log('Callkeep: handle incoming call UUID', call._callkeepUUID); - } else { - console.log('Callkeep: no incoming or outgoing call detected'); - } - - if (this._timeouts.has(call._callkeepUUID)) { - // push notification arrived first - clearTimeout(this._timeouts.get(call._callkeepUUID)); - this._timeouts.delete(call._callkeepUUID); - } - - call.on('close', () => { - // Remove from the set. - this._calls.delete(call._callkeepUUID); - }); + this._calls.set(call._callkeepUUID, call); + console.log('Callkeep: start incoming call', call._callkeepUUID); + if (this._timeouts.has(call.id)) { + clearTimeout(this._timeouts.get(call.id)); + this._timeouts.delete(call.id); + } - //if the call is in waiting then accept it (or decline it) - if (this._waitingCalls.get(call._callkeepUUID)) { - let action = this._waitingCalls.get(call._callkeepUUID); - this[action](); - this._waitingCalls.delete(call._callkeepUUID); + //if the call is in waiting then accept it (or decline it) + if (this._waitingCalls.get(call._callkeepUUID)) { + let action = this._waitingCalls.get(call._callkeepUUID); + this[action](); + this._waitingCalls.delete(call._callkeepUUID); + } } - // Add to the set. - this._calls.set(call._callkeepUUID, call); - // Emit event. this._emitSessionsChange(true); } _emitSessionsChange(countChanged) { this.emit('sessionschange', countChanged); } destroy() { this._RNCallKeep.removeEventListener('acceptCall', this._boundRnAccept); this._RNCallKeep.removeEventListener('endCall', this._boundRnEnd); this._RNCallKeep.removeEventListener('didPerformSetMutedCallAction', this._boundRnMute); this._RNCallKeep.removeEventListener('didActivateAudioSession', this._boundRnActiveAudioCall); this._RNCallKeep.removeEventListener('didDeactivateAudioSession', this._boundRnDeactiveAudioCall); this._RNCallKeep.removeEventListener('didPerformDTMFAction', this._boundRnDTMF); this._RNCallKeep.removeEventListener('didResetProvider', this._boundRnProviderReset); } } diff --git a/app/app.js b/app/app.js index 0d845b7..a17622f 100644 --- a/app/app.js +++ b/app/app.js @@ -1,1773 +1,1742 @@ import React, { Component, Fragment } from 'react'; import { View, SafeAreaView, ImageBackground, PermissionsAndroid, AppState, Linking, Platform, StyleSheet} from 'react-native'; import { DeviceEventEmitter } from 'react-native'; import { Provider as PaperProvider, DefaultTheme } from 'react-native-paper'; import { BreadProvider } from "material-bread"; import { registerGlobals } from 'react-native-webrtc'; import { Router, Route, Link, Switch } from 'react-router-native'; import history from './history'; import Logger from "../Logger"; import DigestAuthRequest from 'digest-auth-request'; import autoBind from 'auto-bind'; import { firebase } from '@react-native-firebase/messaging'; import VoipPushNotification from 'react-native-voip-push-notification'; import uuid from 'react-native-uuid'; import { getUniqueId, getBundleId } from 'react-native-device-info'; import RNDrawOverlay from 'react-native-draw-overlay'; import PushNotificationIOS from "@react-native-community/push-notification-ios"; registerGlobals(); import * as sylkrtc from 'sylkrtc'; import InCallManager from 'react-native-incall-manager'; import RNCallKeep, { CONSTANTS as CK_CONSTANTS } from 'react-native-callkeep'; import RegisterBox from './components/RegisterBox'; import ReadyBox from './components/ReadyBox'; import Call from './components/Call'; import CallByUriBox from './components/CallByUriBox'; import Conference from './components/Conference'; import ConferenceByUriBox from './components/ConferenceByUriBox'; // import AudioPlayer from './components/AudioPlayer'; // import ErrorPanel from './components/ErrorPanel'; import FooterBox from './components/FooterBox'; import StatusBox from './components/StatusBox'; //import IncomingCallModal from './components/IncomingCallModal'; import NotificationCenter from './components/NotificationCenter'; import LoadingScreen from './components/LoadingScreen'; import NavigationBar from './components/NavigationBar'; import Preview from './components/Preview'; import CallManager from "./CallManager"; import utils from './utils'; import config from './config'; import storage from './storage'; import styles from './assets/styles/blink/root.scss'; const backgroundImage = require('./assets/images/dark_linen.png'); const logger = new Logger("App"); function checkIosPermissions() { return new Promise(resolve => PushNotificationIOS.checkPermissions(resolve)); } const theme = { ...DefaultTheme, dark: true, roundness: 2, colors: { ...DefaultTheme.colors, primary: '#337ab7', // accent: '#f1c40f', }, }; let bundleId = `${getBundleId()}`; const deviceId = getUniqueId(); if (Platform.OS == 'ios') { bundleId = `${bundleId}.${__DEV__ ? 'dev' : 'prod'}`; // bundleId = `${bundleId}.dev`; } const callkeepOptions = { ios: { appName: 'Sylk', maximumCallGroups: 2, maximumCallsPerCallGroup: 10, supportsVideo: true, imageName: "Image-1" }, android: { alertTitle: 'Calling account permission', alertDescription: 'Please allow Sylk inside All calling accounts', cancelButton: 'Deny', okButton: 'Allow', imageName: 'phone_account_icon', additionalPermissions: [PermissionsAndroid.PERMISSIONS.CAMERA, PermissionsAndroid.PERMISSIONS.RECORD_AUDIO] } }; const mainStyle = StyleSheet.create({ MainContainer: { flex: 1, justifyContent: 'center', alignItems: 'center', margin: 0 } }); RNCallKeep.setup(callkeepOptions); // Application modes const MODE_NORMAL = Symbol('mode-normal'); const MODE_PRIVATE = Symbol('mode-private'); const MODE_GUEST_CALL = Symbol('mode-guest-call'); const MODE_GUEST_CONFERENCE = Symbol('mode-guest-conference'); class Sylk extends Component { constructor() { super(); autoBind(this) this._loaded = false; this._initialSstate = { accountId: '', password: '', displayName: '', account: null, registrationState: null, registrationKeepalive: false, inboundCall: null, currentCall: null, isConference: false, connection: null, showIncomingModal: false, showScreenSharingModal: false, status: null, targetUri: '', missedTargetUri: '', loading: null, mode: MODE_PRIVATE, localMedia: null, generatedVideoTrack: false, history: [], serverHistory: [], devices: {}, pushtoken: null, pushkittoken: null, speakerPhoneEnabled: null, orientation : '', Height_Layout : '', Width_Layout : '', outgoingCallUUID: null }; this.state = Object.assign({}, this._initialSstate); this.__notificationCenter = null; this.participantsToInvite = null; this.redirectTo = null; this.prevPath = null; this.shouldUseHashRouting = false; this.muteIncoming = false; this.conferencePushes = new Map(); storage.initialize(); RNCallKeep.addEventListener('checkReachability', () => { RNCallKeep.setReachable(); }); this._callKeepManager = new CallManager(RNCallKeep, this.acceptCall, this.rejectCall, this.hangupCall, this.callKeepStartConference); if (InCallManager.recordPermission !== 'granted') { InCallManager.requestRecordPermission() .then((requestedRecordPermissionResult) => { console.log("InCallManager.requestRecordPermission() requestedRecordPermissionResult: ", requestedRecordPermissionResult); }) .catch((err) => { console.log("InCallManager.requestRecordPermission() catch: ", err); }); } // Load camera/mic preferences storage.get('devices').then((devices) => { if (devices) { this.setState({devices: devices}); } }); } get _notificationCenter() { // getter to lazy-load the NotificationCenter ref if (!this.__notificationCenter) { this.__notificationCenter = this.refs.notificationCenter; } return this.__notificationCenter; } _detectOrientation() { if(this.state.Width_Layout > this.state.Height_Layout) { console.log("Orientation is landcape") this.setState({ orientation : 'landscape' }); } else { console.log("Orientation is portrait") this.setState({ orientation : 'portrait' }); } this.forceUpdate(); } async componentDidMount() { this._loaded = true; try { await RNDrawOverlay.askForDispalayOverOtherAppsPermission(); await RNCallKeep.hasPhoneAccount(); } catch(err) { console.log('error'); } history.push('/login'); // prime the ref logger.debug('NotificationCenter ref: %o', this._notificationCenter); this._boundOnPushkitRegistered = this._onPushkitRegistered.bind(this); this._boundOnPushRegistered = this._onPushRegistered.bind(this); if (Platform.OS === 'android') { Linking.getInitialURL().then((url) => { if (url) { console.log('Initial url is: ' + url); } }).catch(err => { logger.error({ err }, 'Error getting initial URL'); }); firebase.messaging().getToken() .then(fcmToken => { if (fcmToken) { this._onPushRegistered(fcmToken); } }); } else if (Platform.OS === 'ios') { VoipPushNotification.addEventListener('register', this._boundOnPushkitRegistered); VoipPushNotification.registerVoipToken(); PushNotificationIOS.addEventListener('register', this._boundOnPushRegistered); //let permissions = await checkIosPermissions(); //if (!permissions.alert) { PushNotificationIOS.requestPermissions(); //} } this.boundRnStartAction = this._callkeepStartedCall.bind(this); this.boundRnDisplayIncomingCall = this._callkeepDisplayIncomingCall.bind(this); this.boundProximityDetect = this._proximityDetect.bind(this); RNCallKeep.addEventListener('didReceiveStartCallAction', this.boundRnStartAction); RNCallKeep.addEventListener('didDisplayIncomingCall', this.boundRnDisplayIncomingCall); DeviceEventEmitter.addListener('Proximity', this.boundProximityDetect); AppState.addEventListener('change', this._handleAppStateChange); if (Platform.OS === 'ios') { this._boundOnNotificationReceivedBackground = this._onNotificationReceivedBackground.bind(this); this._boundOnLocalNotificationReceivedBackground = this._onLocalNotificationReceivedBackground.bind(this); VoipPushNotification.addEventListener('notification', this._boundOnNotificationReceivedBackground); VoipPushNotification.addEventListener('localNotification', this._boundOnLocalNotificationReceivedBackground); } else if (Platform.OS === 'android') { firebase .messaging() .requestPermission() .then(() => { // User has authorised }) .catch(error => { // User has rejected permissions }); this.messageListener = firebase .messaging() .onMessage((message: RemoteMessage) => { // this will just wake up the app to receive // the web-socket invite handled by this.incomingCall() let event = message.data.event; console.log('Handle Firebase', event, 'push notification'); if (event === 'incoming_conference_request') { - this.incomingConferenceFromPush(message.data['session-id'], message.data['to_uri'], message.data['from_uri']); + this.incomingConference(message.data['session-id'], message.data['to_uri'], message.data['from_uri']); } }); } this._detectOrientation(); } _proximityDetect(data) { console.log('Proximity changed', data); return; if (data.isNear) { this.speakerphoneOff(); } else { this.speakerphoneOn(); } } _callkeepDisplayIncomingCall(data) { console.log('Incoming alert panel displayed'); } _callkeepStartedCall(data) { console.log("_callkeepStartedCall", data); if (!this._tmpCallStartInfo || ! this._tmpCallStartInfo.options) { // we dont have options in the tmp var, which means this likely came from the native dialer // for now, we only do audio calls from the native dialer. let callUUID = data.callUUID || uuid.v4(); this._tmpCallStartInfo = { uuid: callUUID }; let is_conf = data.handle.search('videoconference.') === -1 ? false: true; //this._notificationCenter.postSystemNotification('Waiting for server connection', {body: '', timeout: 2}); this.setState({targetUri: data.handle}); if (is_conf) { console.log("CallKeep started conference call from native dialer to", data.handle, 'with UUID', callUUID); } else { console.log("CallKeep started call from native dialer to", data.handle, 'with uuid', callUUID); } this.startCallWhenConnected(data.handle, {audio: true, video: true, conference: is_conf}); } else { console.log("CallKeep started call from within the app to", data.handle, this._tmpCallStartInfo); if (this._tmpCallStartInfo.options && this._tmpCallStartInfo.options.conference) { this.startConference(data.handle); } else if (this._tmpCallStartInfo.options) { this.startCall(data.handle, this._tmpCallStartInfo.options); } } this._notificationCenter.removeNotification(); } async startCallWhenConnected(targetUri, options) { console.log('Start call when connected to', targetUri, 'options', options); var n = 0; while (n < 7) { if (this.state.connection) { console.log('Connection state is', this.state.connection.state); } else { console.log('Connection is down'); } if (!this.state.connection || this.state.connection.state !== 'ready') { console.log('Waiting for connection...'); this._notificationCenter.postSystemNotification('Waiting for connection...', {timeout: 1}); await this._sleep(1000); } else { console.log('Connection is ready'); if (options.conference) { this.startConference(targetUri, options); } else { this.startCall(targetUri, options); } return; } n++; } this._notificationCenter.postSystemNotification('No internet connection', {body: '', timeout: 3}); } _sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); } _onPushkitRegistered(token) { console.log('Set VoIP pushkit token', token); this.setState({ pushkittoken: token }); } _onPushRegistered(token) { console.log('Set background push token', token); this.setState({ pushtoken: token }); } _sendPushToken() { if (this.state.account && this.state.pushtoken) { let token = null; if (Platform.OS === 'ios') { token = `${this.state.pushkittoken}#${this.state.pushtoken}`; } else if (Platform.OS === 'android') { token = this.state.pushtoken; } console.log('Push token', token, 'sent to server'); this.state.account.setDeviceToken(token, Platform.OS, deviceId, true, bundleId); } } componentWillUnmount() { RNCallKeep.removeEventListener('didReceiveStartCallAction', this.boundRnStartAction); AppState.removeEventListener('change', this._handleAppStateChange); } _handleAppStateChange = nextAppState => { //TODO - stop if we havent been backgrounded because of becoming active from a push notification and then going background again // if (nextAppState.match(/background/)) { // logger.debug('app moving to background so we should stop the client sylk client if we dont have an active call'); // if (this._callKeepManager.count === 0) { // logger.debug('callmanager count is 0 so closing connection'); // this.state.connection.close(); // } // } if (nextAppState === 'active') { if (this._callKeepManager.count === 0 && this.state.connection) { this.state.connection.reconnect(); } } } connectionStateChanged(oldState, newState) { console.log('Websocket connection state changed: ', oldState, ' ->' , newState); switch (newState) { case 'closed': this.setState({connection: null, loading: null}); this._notificationCenter.postSystemNotification('Connection failed', {body: '', timeout: 5000}); break; case 'ready': //this._notificationCenter.postSystemNotification('Connected to server', {body: '', timeout: 3}); this.processRegistration(this.state.accountId, this.state.password, this.state.displayName); break; case 'disconnected': if (this.state.localMedia) { sylkrtc.utils.closeMediaStream(this.state.localMedia); } if (this.state.currentCall || this.state.inboundCall) { InCallManager.stop({busytone: '_BUNDLE_'}); - this.callKeepHangupCall(); history.push('/ready'); } this.setState({ registrationState: 'failed', currentCall: null, inboundCall: null, localMedia: null, generatedVideoTrack: false, showIncomingModal: false }); // this._notificationCenter.postSystemNotification('Connecting to server...', {body: '', timeout: 5000}); break; default: if (this.state.registrationKeepalive !== true) { this.setState({loading: 'Connecting...'}); } break; } } notificationCenter() { return this._notificationCenter; } registrationStateChanged(oldState, newState, data) { logger.debug('Registration state changed! ', oldState, newState, data); this.setState({registrationState: newState}); if (newState === 'failed') { RNCallKeep.setAvailable(false); let reason = data.reason; if (reason.match(/904/)) { // Sofia SIP: WAT reason = 'Wrong account or password'; } else { reason = 'Connection failed'; } this.setState({ loading : null, status : { msg : 'Sign In failed: ' + reason, level : 'danger' } }); if (this.state.registrationKeepalive === true) { if (this.state.connection !== null) { logger.debug('Retry to register...'); //this.setState({loading: 'Register...'}); this._notificationCenter.postSystemNotification('Registering', {body: 'now', timeout: 10000}); this.state.account.register(); } else { // add a timer to retry register after awhile logger.debug('Retry to register after a delay...'); setTimeout(this.state.account.register(), 5000); } } } else if (newState === 'registered') { this.getServerHistory(); RNCallKeep.setAvailable(true); this.setState({loading: null, registrationKeepalive: true, registrationState: 'registered'}); history.push('/ready'); this._notificationCenter.postSystemNotification('Ready to receive calls', {body: '', timeout: 1}); return; } else { this.setState({status: null }); RNCallKeep.setAvailable(false); } } showCalls(prefix) { console.log('Current calls', prefix, 'currentCall:', this.state.currentCall ? (this.state.currentCall._callkeepUUID + ' ' + this.state.currentCall.direction): 'None'); console.log('Current calls', prefix, 'inboundCall:', this.state.inboundCall ? (this.state.inboundCall._callkeepUUID + ' ' + this.state.inboundCall.direction): 'None'); } callStateChanged(oldState, newState, data) { // outgoing accepted: null -> progress -> accepted -> established -> terminated // incoming accepted: null -> incoming -> accepted -> established -> terminated // 2nd incoming call is automatically rejected by sylkrtc library - console.log("callStateChanged", oldState, '->', newState); + console.log('callStateChanged for', data.id, oldState, '->', newState); this.showCalls('Begin callStateChanged'); - let call; // we must figure out which call has changed as we have no internal id + let call = this._callKeepManager._calls.get(data.id); + + if (!call) { + console.log("callStateChanged error: call", data.id, 'not found in callkeep manager'); + return; + } + + let callUUID = call._callkeepUUID; + console.log('Call state changed:', call.direction, 'call', callUUID, '-', oldState, '->', newState); + let newCurrentCall; let newInboundCall; if (this.state.inboundCall && this.state.currentCall) { - console.log('We have two calls'); + if (this.state.inboundCall != this.state.currentCall) { + console.log('We have two calls'); + } + if (newState === 'terminated') { if (this.state.inboundCall == this.state.currentCall) { - call = this.state.currentCall; newCurrentCall = null; newInboundCall = null; } else { if (oldState === 'incoming') { - call = this.state.inboundCall; - console.log("We have two calls, new call must be cancelled"); + console.log('Call state changed:', 'We have two calls, new call must be cancelled'); // new call must be cancelled newInboundCall = null; newCurrentCall = this.state.currentCall; } else if (oldState === 'established') { - call = this.state.newCurrentCall; - console.log("Old call must be closed"); + console.log('Call state changed:', 'Old call must be closed'); // old call must be closed newCurrentCall = null; newInboundCall = null; } else { - console.log('Error: unclear call state') + console.log('Call state changed:', 'Error: unclear call state') } } } else if (newState === 'accepted') { if (this.state.inboundCall == this.state.currentCall) { - call = this.state.currentCall; newCurrentCall = this.state.inboundCall; newInboundCall = this.state.inboundCall; } else { - console.log('Error: we have two different calls and unhandled state transition'); + console.log('Call state changed:', 'Error: we have two different calls and unhandled state transition'); } } else if (newState === 'established') { if (this.state.inboundCall == this.state.currentCall) { - call = this.state.currentCall; newCurrentCall = this.state.inboundCall; newInboundCall = this.state.inboundCall; } else { - console.log('Error: we have two different calls and unhandled state transition'); + console.log('Call state changed:', 'Error: we have two different calls and unhandled state transition'); } } else { - console.log('We have two calls and unhandled state', newState) + console.log('Call state changed:', 'We have two calls and unhandled state'); } } else if (this.state.inboundCall) { - console.log('We have one inbound call'); if (oldState === 'incoming' && newState === 'terminated') { - call = this.state.inboundCall; console.log("New call must be cancelled"); newInboundCall = null; newCurrentCall = this.state.currentCall; } else if (oldState === 'incoming' && newState === 'accepted') { - call = this.state.inboundCall; console.log("New call is accepted"); newCurrentCall = this.state.inboundCall; newInboundCall = this.state.inboundCall; } else if (oldState === 'established' && newState === 'terminated') { // old call was hangup to accept a new incoming calls newCurrentCall = null; newInboundCall = this.state.inboundCall; } else { - console.log('We have one inbound call and unhandled state', newState) + console.log('Call state changed:', 'we have one inbound call and unhandled state'); } } else { - console.log('We have one outgoing call'); - call = this.state.currentCall; newCurrentCall = newState === 'terminated' ? null : this.state.currentCall; newInboundCall = null; } - if (!call) { - console.log("No calls in progress"); - return; - } - - let callUUID = call._callkeepUUID; - console.log('Call UUID ' + callUUID + ' state changed: ' + oldState + ' -> ' + newState); - switch (newState) { case 'progress': InCallManager.startRingback('_BUNDLE_'); break; case 'established': this._callKeepManager.setCurrentCallActive(callUUID); case 'accepted': if (this.state.isConference) { // allow ringtone to play once as connection is too fast setTimeout(() => {InCallManager.stopRingback();}, 2000); } else { InCallManager.stopRingback(); } if (this.state.isConference) { - console.log('Conference call started'); + console.log('Call state changed:', 'Conference call started'); this._callKeepManager.backToForeground(); this.speakerphoneOn(); } else if (this.state.currentCall && this.state.currentCall.remoteMediaDirections) { const videoTracks = this.state.currentCall.remoteMediaDirections.video; if (videoTracks && videoTracks.length > 0) { - console.log('Video call started') + console.log('Call state changed:', 'Video call started') this._callKeepManager.backToForeground(); this.speakerphoneOn(); } } else { this.speakerphoneOff(); } break; case 'terminated': let callSuccesfull = false; let reason = data.reason; let play_busy_tone = true; let CALLKEEP_REASON; - console.log('Call UUID ' + callUUID + ' terminated reason: ' + reason); + console.log('Call state changed:', 'call', callUUID, 'terminated reason:' + reason); if (!reason || reason.match(/200/)) { if (oldState == 'progress') { reason = 'Cancelled'; play_busy_tone = false; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.UNANSWERED; } else { reason = 'Hangup'; callSuccesfull = true; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.REMOTE_ENDED; } } else if (reason.match(/403/)) { reason = 'This domain is not served here'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else if (reason.match(/404/)) { reason = 'User not found'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else if (reason.match(/408/)) { reason = 'Timeout'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else if (reason.match(/480/)) { reason = 'User not online'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.UNANSWERED; } else if (reason.match(/486/) || reason.match(/60[036]/)) { reason = 'Busy'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.UNANSWERED; } else if (reason.match(/487/)) { reason = 'Cancelled'; play_busy_tone = false; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.MISSED; } else if (reason.match(/488/)) { reason = 'Unacceptable media'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else if (reason.match(/5\d\d/)) { reason = 'Server failure'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else if (reason.match(/904/)) { // Sofia SIP: WAT reason = 'Wrong account or password'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } else { reason = 'Connection failed'; CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED; } if (play_busy_tone) { InCallManager.stop({busytone: '_BUNDLE_'}); } else { InCallManager.stop(); } console.log('Call', callUUID, 'ended:', reason); this._callKeepManager.endCall(callUUID, CALLKEEP_REASON); if (this.state.currentCall === null) { - console.log('Turn off speakerphone'); + console.log('Call state changed:', 'Turn off speakerphone'); this.speakerphoneOff(); } if (play_busy_tone && oldState !== 'established') { this._notificationCenter.postSystemNotification('Call ended:', {body: reason, timeout: callSuccesfull ? 5 : 10}); } this.setState({ - currentCall : newCurrentCall, - inboundCall : newInboundCall, targetUri : callSuccesfull || config.useServerCallHistory ? '' : this.state.targetUri, showIncomingModal : false, isConference : false, localMedia : null, generatedVideoTrack : false }); this.setFocusEvents(false); if (!newCurrentCall && !newInboundCall) { this.participantsToInvite = null; history.push('/ready'); setTimeout(() => { this.getServerHistory(); }, 3000); } break; default: break; } this.setState({ currentCall : newCurrentCall, inboundCall : newInboundCall }); this.showCalls('End callStateChanged'); } -// inboundCallStateChanged(oldState, newState, data) { -// logger.debug('Inbound call state changed! ' + newState); -// if (newState === 'terminated') { -// this.setState({ inboundCall: null, showIncomingModal: false }); -// this.setFocusEvents(false); -// } -// } - handleCallByUri(displayName, targetUri) { const accountId = `${utils.generateUniqueId()}@${config.defaultGuestDomain}`; this.setState({ accountId : accountId, password : '', displayName : displayName, //mode : MODE_GUEST_CALL, targetUri : utils.normalizeUri(targetUri, config.defaultDomain), loading : 'Connecting...' }); if (this.state.connection === null) { let connection = sylkrtc.createConnection({server: config.wsServer}); connection.on('stateChanged', this.connectionStateChanged); this.setState({connection: connection}); } } handleConferenceByUri(displayName, targetUri) { const accountId = `${utils.generateUniqueId()}@${config.defaultGuestDomain}`; this.setState({ accountId : accountId, password : '', displayName : displayName, //mode : MODE_GUEST_CONFERENCE, targetUri : targetUri, loading : 'Connecting...' }); if (this.state.connection === null) { let connection = sylkrtc.createConnection({server: config.wsServer}); connection.on('stateChanged', this.connectionStateChanged); this.setState({connection: connection}); } } handleRegistration(accountId, password, remember) { this.setState({ accountId : accountId, password : password, mode : remember ? MODE_NORMAL : MODE_PRIVATE, loading : 'Connecting...' }); if (this.state.connection === null) { let connection = sylkrtc.createConnection({server: config.wsServer}); connection.on('stateChanged', this.connectionStateChanged); this.setState({connection: connection}); } else { console.log('Websocket connection active, try to register'); this.processRegistration(accountId, password, ''); } } processRegistration(accountId, password, displayName) { /* if (this.state.account !== null) { logger.debug('We already have an account, removing it'); this.state.connection.removeAccount(this.state.account, (error) => { if (error) { logger.debug(error); } this.setState({registrationState: null, registrationKeepalive: false}); } ); } */ const options = { account: accountId, password: password, displayName: displayName }; try { const account = this.state.connection.addAccount(options, (error, account) => { if (!error) { account.on('outgoingCall', this.outgoingCall); account.on('conferenceCall', this.outgoingCall); switch (this.state.mode) { case MODE_PRIVATE: case MODE_NORMAL: account.on('registrationStateChanged', this.registrationStateChanged); account.on('incomingCall', this.incomingCall); account.on('missedCall', this.missedCall); account.on('conferenceInvite', this.conferenceInvite); this.setState({account: account}); this._sendPushToken(); account.register(); logger.debug(this.state.mode); if (this.state.mode !== MODE_PRIVATE) { storage.set('account', { accountId: this.state.accountId, password: this.state.password }); } else { // Wipe storage if private login //storage.remove('account'); // lets try this out // history.clear().then(() => { // this.setState({history: []}); // }); } break; case MODE_GUEST_CALL: this.setState({account: account, loading: null, registrationState: 'registered'}); logger.debug(`${accountId} (guest) signed in`); // Start the call immediately, this is call started with "Call by URI" this.startGuestCall(this.state.targetUri, {audio: true, video: true}); break; case MODE_GUEST_CONFERENCE: this.setState({account: account, loading: null, registrationState: 'registered'}); logger.debug(`${accountId} (conference guest) signed in`); // Start the call immediately, this is call started with "Conference by URI" this.startGuestConference(this.state.targetUri); break; default: logger.debug(`Unknown mode: ${this.state.mode}`); break; } } else { logger.debug('Add account error: ' + error); this.setState({loading: null, status: {msg: error.message, level:'danger'}}); } }); } catch(error) { console.log('Add account error: ', error); this.setState({loading: null, status: {msg: error.message, level:'danger'}}); } } setDevice(device) { const oldDevices = Object.assign({}, this.state.devices); if (device.kind === 'videoinput') { oldDevices['camera'] = device; } else if (device.kind === 'audioinput') { oldDevices['mic'] = device; } this.setState({devices: oldDevices}); storage.set('devices', oldDevices); sylkrtc.utils.closeMediaStream(this.state.localMedia); this.getLocalMedia(); } getLocalMedia(mediaConstraints={audio: true, video: true}, nextRoute=null) { // eslint-disable-line space-infix-ops console.log('Get local media', mediaConstraints, 'next route', nextRoute); const constraints = Object.assign({}, mediaConstraints); if (constraints.video === true) { if ((nextRoute === '/conference' || this.state.mode === MODE_GUEST_CONFERENCE)) { constraints.video = { 'width': { 'ideal': 1280 }, 'height': { 'ideal': 720 } }; // TODO: remove this, workaround so at least safari works when joining a video conference } else if ((nextRoute === '/conference' || this.state.mode === MODE_GUEST_CONFERENCE) && isSafari) { constraints.video = false; } else { // ask for 720p video constraints.video = { 'width': { 'ideal': 1280 }, 'height': { 'ideal': 720 } }; } } logger.debug('getLocalMedia(), (modified) mediaConstraints=%o', constraints); navigator.mediaDevices.enumerateDevices() .then((devices) => { devices.forEach((device) => { if ('video' in constraints && 'camera' in this.state.devices) { if (constraints.video !== false && (device.deviceId === this.state.devices.camera.deviceId || device.label === this.state.devices.camera.label)) { constraints.video.deviceId = { exact: device.deviceId }; } } if ('mic' in this.state.devices) { if (device.deviceId === this.state.devices.mic.deviceId || device.label === this.state.devices.mic.Label) { // constraints.audio = { // deviceId: { // exact: device.deviceId // } // }; } } }); }) .catch((error) => { console.log('Error: device enumeration failed:', error); }) .then(() => { return navigator.mediaDevices.getUserMedia(constraints) }) .then((localStream) => { clearTimeout(this.loadScreenTimer); console.log('Got local media', localStream, 'next route is', nextRoute); this.setState({status: null, loading: null, localMedia: localStream}); if (nextRoute !== null) { history.push(nextRoute); } }) .catch((error) => { console.log('Access to local media failed, trying audio only', error); navigator.mediaDevices.getUserMedia({ audio: true, video: false }) .then((localStream) => { clearTimeout(this.loadScreenTimer); /* logger.debug('Audio only media, but video was requested, creating generated video track'); const generatedVideoTrack = utils.generateVideoTrack(localStream); localStream.addTrack(generatedVideoTrack); console.log('Next route', nextRoute); this.setState({status: null, loading: null, localMedia: localStream, generatedVideoTrack: true}); */ if (nextRoute !== null) { history.push(nextRoute); } }) .catch((error) => { console.log('Access to local media failed:', error); clearTimeout(this.loadScreenTimer); this._notificationCenter.postSystemNotification("Can't access camera or microphone", {timeout: 10}); this.setState({ loading: null }); console.log('Go to ready screen'); history.push('/ready'); }); }); } callKeepStartCall(targetUri, options) { // this is how we start an outgoing call this._tmpCallStartInfo = { uuid: uuid.v4(), options, }; this.setState({outgoingCallUUID: this._tmpCallStartInfo .uuid}); this._callKeepManager.startCall(this._tmpCallStartInfo.uuid, targetUri, targetUri, options.video ? true : false); } startCall(targetUri, options) { this.setState({targetUri: targetUri}); //this.addCallHistoryEntry(targetUri); this.getLocalMedia(Object.assign({audio: true, video: true}, options), '/call'); } startGuestCall(targetUri, options) { this.setState({targetUri: targetUri}); this.getLocalMedia(Object.assign({audio: true, video: true}, this._tmpCallStartInfo.options)); } acceptCall() { console.log('Alert panel answer call'); this.showCalls('acceptCall') this.setState({showIncomingModal: false }); this.setFocusEvents(false); if (this.state.currentCall) { - this.callKeepHangupCall(this.state.currentCall._callkeepUUID); + this.hangupCall(this.state.currentCall._callkeepUUID); this.setState({currentCall: null}); /* if (this.state.localMedia != null) { sylkrtc.utils.closeMediaStream(this.state.localMedia); console.log('Sylkrtc close local media'); } */ } this.setState({localMedia: null}); this.state.inboundCall.on('stateChanged', this.callStateChanged); let hasVideo = this.state.inboundCall.mediaTypes.video ? true : false; this.getLocalMedia(Object.assign({audio: true, video: hasVideo}), '/call'); this.forceUpdate(); } callKeepAcceptCall(callUUID) { + // called from user interaction console.log('CallKeep answer call', callUUID); this._callKeepManager.answerIncomingCall(callUUID); this.acceptCall(); } callKeepRejectCall(callUUID) { + // called from user interaction console.log('CallKeep must reject call', callUUID); this._callKeepManager.rejectCall(callUUID); this.rejectCall(callUUID); } rejectCall(callUUID) { console.log('Alert panel reject call', callUUID); this.setState({showIncomingModal: false}); if (this.state.inboundCall && this.state.inboundCall._callkeepUUID === callUUID) { this.state.inboundCall.terminate(); console.log('Sylkrtc reject call', callUUID); this.forceUpdate(); } } - callKeepHangupCall(callUUID) { - console.log('Call Keep hangup call', callUUID); - if (!callUUID) { - if (this.state.currentCall) { - this._callKeepManager.endCall(this.state.currentCall._callkeepUUID); - this.hangupCall(this.state.currentCall._callkeepUUID); - } - - if (this.state.inboundCall) { - this._callKeepManager.endCall(this.state.inboundCall._callkeepUUID); - this.hangupCall(this.state.inboundCall._callkeepUUID); - } - - } else { - this._callKeepManager.endCall(callUUID); - this.hangupCall(callUUID); - } - } - hangupCall(callUUID) { console.log('User hangup call', callUUID); - this.showCalls('hangupCall'); + //this.showCalls('hangupCall'); - if (this.state.currentCall && this.state.currentCall._callkeepUUID === callUUID) { - console.log('Hangup current call'); - this.state.currentCall.terminate(); - } - - if (this.state.inboundCall && this.state.inboundCall._callkeepUUID === callUUID) { - console.log('Hangup inbound call'); - this.state.inboundCall.terminate(); - } + let call = this._callKeepManager._calls.get(callUUID); - /* - if (this.state.localMedia != null) { - sylkrtc.utils.closeMediaStream(this.state.localMedia); - console.log('Sylkrtc close media'); + if (call) { + call.terminate(); + } else { + if (this.state.localMedia != null) { + sylkrtc.utils.closeMediaStream(this.state.localMedia); + console.log('Sylkrtc close media'); + } } - */ - + console.log('Go to ready screen'); history.push('/ready'); this.forceUpdate(); } callKeepSendDtmf(digits) { console.log('Send DTMF', digits); if (this.state.currentCall) { this._callKeepManager.sendDTMF(this.state.currentCall._callkeepUUID, digits); } } callKeepToggleMute(mute) { console.log('Toggle mute %s', mute); if (this.state.currentCall) { this._callKeepManager.setMutedCall(this.state.currentCall._callkeepUUID, mute); } } toggleSpeakerPhone() { if (this.state.speakerPhoneEnabled === true) { this.speakerphoneOff(); } else { this.speakerphoneOn(); } } speakerphoneOn() { console.log('Speakerphone On'); this.setState({speakerPhoneEnabled: true}); InCallManager.setForceSpeakerphoneOn(true); } speakerphoneOff() { console.log('Speakerphone Off'); this.setState({speakerPhoneEnabled: false}); InCallManager.setForceSpeakerphoneOn(false); } startGuestConference(targetUri) { this.setState({targetUri: targetUri}); this.getLocalMedia({audio: true, video: true}); } toggleMute() { this.muteIncoming = !this.muteIncoming; } outgoingCall(call) { console.log('New outgoing call to', call.remoteIdentity.uri, 'with options', this._tmpCallStartInfo); this._callKeepManager.handleCall(call, this._tmpCallStartInfo.uuid); InCallManager.start({media: this._tmpCallStartInfo.options && this._tmpCallStartInfo.options.video ? 'video' : 'audio'}); this._tmpCallStartInfo = {}; call.on('stateChanged', this.callStateChanged); this.setState({currentCall: call}); //this._callKeepManager.updateDisplay(call._callkeepUUID, call.remoteIdentity.displayName, call.remoteIdentity.uri); } _onLocalNotificationReceivedBackground(notification) { let notificationContent = notification.getData(); console.log('Handle local iOS push notification: ', notificationContent); } _onNotificationReceivedBackground(notification) { let notificationContent = notification.getData(); // get the uuid from the notification // have we already got a waiting call in call manager? if we do, then its been "answered" and we're waiting for the invite // we may still never get the invite if theres network issues... so still need a timeout // no waiting call, so that means its still "ringing" (it may have been cancelled) so set a timer and if we havent recieved // an invite within 10 seconds then clear it down let event = notificationContent['event']; console.log('Handle iOS', event, 'push notification'); if (notificationContent['event'] === 'incoming_session') { let callUUID = notificationContent['session-id']; - console.log('Incoming call for push mobile notification for call UUID', callUUID); + console.log('Incoming call for push mobile notification for call', callUUID); this._callKeepManager.handleCallLater(callUUID, notificationContent); if (VoipPushNotification.wakeupByPush) { console.log('We wake up by a push notification'); VoipPushNotification.wakeupByPush = false; } VoipPushNotification.onVoipNotificationCompleted(callUUID); } else if (notificationContent['event'] === 'incoming_conference_request') { let callUUID = notificationContent['session-id']; - console.log('Incoming conference for push mobile notification for call UUID', callUUID); - this.incomingConferenceFromPush(callUUID, notificationContent['to_uri'], notificationContent['from_uri']); + console.log('Incoming conference for push mobile notification for call', callUUID); + this.incomingConference(callUUID, notificationContent['to_uri'], notificationContent['from_uri']); VoipPushNotification.onVoipNotificationCompleted(callUUID); } /* if (notificationContent['event'] === 'incoming_session') { VoipPushNotification.presentLocalNotification({ alertBody:'Incoming ' + notificationContent['media-type'] + ' call from ' + notificationContent['from_display_name'] }); } */ if (notificationContent['event'] === 'cancel') { VoipPushNotification.presentLocalNotification({ alertBody:'Call cancelled' }); } if (VoipPushNotification.wakeupByPush) { console.log('We wake up by push notification'); VoipPushNotification.wakeupByPush = false; } } - incomingConferenceFromPush(callUUID, to_uri, from_uri) { + incomingConference(callUUID, to_uri, from_uri) { + console.log('Incoming conference', callUUID); // this works for iOS when app is in the background // this works for Android when is in the foreground // this does not work for Android when is in the background // this does not work for iOS when app is in the foreground // TODO: for iOS we need to start from websocket invite but we need session-id // TODO: for Android we need to handle background notifications if (this.state.isConference && this.state.targetUri === to_uri) { return; } if (this.conferencePushes.has(callUUID)) { return; } // somehow we can get pushes later again this.conferencePushes.set(callUUID, to_uri); this._callKeepManager.handleConference(callUUID, to_uri); console.log('Show alert panel for conference invite'); let room = to_uri.split('@')[0]; let title = 'Join conference ' + room + '?'; if (Platform.OS === 'ios') { console.log('Show iOS alert panel for conference invite, uri=', to_uri, "title=", title); RNCallKeep.displayIncomingCall(callUUID, to_uri, '', 'email', 'true'); } else if (Platform.OS === 'android') { console.log('Show Android alert panel for conference invite, uri=', to_uri, "title=", title); RNCallKeep.displayIncomingCall(callUUID, to_uri, ''); } this.setFocusEvents(true); // if call is accepted this.callKeepStartConference is called } callKeepStartConference(room, options={audio: true, video: true}) { if (!room) { return; } console.log('CallKeep start conference to', room, 'options', options); this._tmpCallStartInfo = { uuid: uuid.v4() }; this.setState({outgoingCallUUID: this._tmpCallStartInfo .uuid}); this.startCallWhenConnected(room, {audio: options.audio, video: options.video, conference: true}); } startConference(targetUri, options={audio: true, video: true}) { console.log('New outgoing conference to room', targetUri, 'options', options); this.addCallHistoryEntry(targetUri); this.setState({targetUri: targetUri, isConference: true}); this.getLocalMedia({audio: options.audio, video: options.video}, '/conference'); } escalateToConference(participants) { - this.state.currentCall.removeListener('stateChanged', this.callStateChanged); - this.state.currentCall.terminate(); + const uri = `${utils.generateSillyName()}@${config.defaultConferenceDomain}`; + console.log('Move current call to conference', uri, 'with participants', participants); + if (this.state.currentCall) { + this.hangupCall(this.state.currentCall._callkeepUUID); + this.setState({currentCall: null}); + } + + if (this.state.inboundCall) { + this.hangupCall(this.state.inboundCall._callkeepUUID); + this.setState({inboundCall: null}); + } + + this.setState({localMedia: null}); + history.push('/ready'); - this.setState({currentCall: null, localMedia: null}); + this.participantsToInvite = participants; - const uri = `${utils.generateSillyName()}@${config.defaultConferenceDomain}`; - this.callKeepStartCall(uri, { conference: true }); + this.callKeepStartConference(uri); } conferenceInvite(data) { // comes from web socket - console.log('Conference invite from %o to %s', data.originator, data.room); + console.log('Conference invite', data.id, 'from', data.originator, data.room); //this._notificationCenter.postSystemNotification('Conference invite', {body: `From ${data.originator.displayName || data.originator.uri} for room ${data.room}`, timeout: 15, silent: false}); - - /* - this._notificationCenter.postConferenceInvite(data.originator, data.room, () => { - if (this.state.currentCall !== null) { - this.state.currentCall.removeListener('stateChanged', this.callStateChanged); - this.state.currentCall.terminate(); - this.setState({currentCall: null, showIncomingModal: false, localMedia: null, generatedVideoTrack: false}); - } - this.callKeepStartCall(data.room, {conference: true}); - }); - */ - + this.incomingConference(data.id, data.room, data.originator); } incomingCall(call, mediaTypes) { // because of limitation in Sofia stack, we cannot have more then two calls at a time // we can have one outgoing call and one incoming call but not two incoming calls // we cannot have two incoming calls, second one is automatically rejected by sylkrtc.js if (!mediaTypes.audio && !mediaTypes.video) { console.log('Call rejected because unsupported media', mediaTypes); - this.callKeepHangupCall(); + this.hangupCall(); return; } let media_type = mediaTypes.video ? 'video' : 'audio'; console.log('New', media_type, 'incoming call from', call.remoteIdentity['_displayName'], call.remoteIdentity['_uri']); call.mediaTypes = mediaTypes; InCallManager.start({media: media_type}); this._callKeepManager.handleCall(call); console.log('Show alert panel'); if (Platform.OS === 'ios') { RNCallKeep.displayIncomingCall(call._callkeepUUID, call.remoteIdentity.uri, call.remoteIdentity.displayName, 'email', mediaTypes.video); } else if (Platform.OS === 'android') { RNCallKeep.displayIncomingCall(call._callkeepUUID, call.remoteIdentity.uri, call.remoteIdentity.displayName); } this.setFocusEvents(true); call.on('stateChanged', this.callStateChanged); - this.setState({inboundCall: call, showIncomingModal: false}); + this.setState({inboundCall: call, showIncomingModal: true}); // if (!this.shouldUseHashRouting) { // this._notificationCenter.postSystemNotification('Incoming call', {body: `From ${call.remoteIdentity.displayName || call.remoteIdentity.uri}`, timeout: 15, silent: false}); // } } setFocusEvents(enabled) { // if (this.shouldUseHashRouting) { // const remote = window.require('electron').remote; // if (enabled) { // const currentWindow = remote.getCurrentWindow(); // currentWindow.on('focus', this.hasFocus); // currentWindow.on('blur', this.hasNoFocus); // this.setState({haveFocus: currentWindow.isFocused()}); // } else { // const currentWindow = remote.getCurrentWindow(); // currentWindow.removeListener('focus', this.hasFocus); // currentWindow.removeListener('blur', this.hasNoFocus); // } // } } // hasFocus() { // this.setState({haveFocus: true}); // } // hasNoFocus() { // this.setState({haveFocus: false}); // } missedCall(data) { console.log('Missed call from ' + data.originator); if (!this.state.currentCall) { console.log('Update snackbar'); let from = data.originator.display_name || data.originator.uri; this._notificationCenter.postSystemNotification('Missed call', {body: `from ${from}`, timeout: 180, silent: false}); } } startPreview() { this.getLocalMedia({audio: true, video: true}, '/preview'); } addCallHistoryEntry(uri) { console.log('Add history entry for', uri, 'mode', this.state.mode) if (this.state.mode === MODE_NORMAL || this.state.mode === MODE_PRIVATE) { console.log('Add history entry for', uri) let entries = this.state.history.slice(); if (entries.length !== 0) { const idx = entries.indexOf(uri); if (idx !== -1) { entries.splice(idx, 1); } entries.unshift(uri); // keep just the last 50 entries = entries.slice(0, 100); } else { entries = [uri]; } this.setState({history: entries}); console.log(this.state.history); } else { // history.add(uri).then((entries) => { // this.setState({history: entries}); // }); } } getServerHistory() { if (!config.useServerCallHistory) { return; } if (!this.state.account|| !this.state.account.id) { return; } console.log('Requesting call history from server'); let getServerCallHistory = new DigestAuthRequest( 'GET', `${config.serverCallHistoryUrl}?action=get_history&realm=${this.state.account.id.split('@')[1]}`, this.state.account.id.split('@')[0], this.state.password ); // Disable logging getServerCallHistory.loggingOn = false; getServerCallHistory.request((data) => { if (data.success !== undefined && data.success === false) { logger.debug('Error getting call history from server: %o', data.error_message) return; } let history = []; if (data.placed) { data.placed.map(elem => {elem.direction = 'placed'; return elem}); } if (data.received) { data.received.map(elem => {elem.direction = 'received'; return elem}); } history = data.placed; if (data.received && history) { history = history.concat(data.received); } if (history) { history.sort((a,b) => { return new Date(b.startTime) - new Date(a.startTime); }); const known = []; history = history.filter((elem) => { if (known.indexOf(elem.remoteParty) <= -1) { if (!this.state.account || !this.state.account.id) { return; } if ((elem.media.indexOf('audio') > -1 || elem.media.indexOf('video') > -1) && (elem.remoteParty !== this.state.account.id || elem.direction !== 'placed')) { known.push(elem.remoteParty); return elem; } } }); this.setState({serverHistory: history}); } }, (errorCode) => { logger.debug('Error getting call history from server: %o', errorCode) }); } // checkRoute(nextPath, navigation, match) { // if (nextPath !== this.prevPath) { // logger.debug(`Transition from ${this.prevPath} to ${nextPath}`); // // // Press back in ready after a login, prevent initial navigation // // don't deny if there is no registrationState (connection fail) // if (this.prevPath === '/ready' && nextPath === '/login' && this.state.registrationState !== null) { // logger.debug('Transition denied redirecting to /logout'); // history.push('/logout'); // return false; // // Press back in ready after a call // } else if ((nextPath === '/call' || nextPath === '/conference') && this.state.localMedia === null && this.state.registrationState === 'registered') { // return false; // // Press back from within a call/conference, don't navigate terminate the call and // // let termination take care of navigating // } else if (nextPath === '/ready' && this.state.registrationState === 'registered' && this.state.currentCall !== null) { // this.state.currentCall.terminate(); // return false; // // Guest call ended, needed to logout and display msg and logout // } else if (nextPath === '/ready' && (this.state.mode === MODE_GUEST_CALL || this.state.mode === MODE_GUEST_CONFERENCE)) { // history.push('/logout'); // this.forceUpdate(); // } // } // this.prevPath = nextPath; // } render() { - let footerBox = ; let extraStyles = {}; if (this.state.localMedia || this.state.registrationState === 'registered') { footerBox = null; } return ( this.setState({ Width_Layout : event.nativeEvent.layout.width, Height_Layout : event.nativeEvent.layout.height }, ()=> this._detectOrientation())}> + {/* + {} + */} + {/* */} {/* */} {/* */} ); } notFound(match) { const status = { title : '404', message : 'Oops, the page your looking for can\'t found', level : 'danger', width : 'large' } return ( ); } ready() { if (!this.state.account) { return null; } return ( ); } preview() { return ( ); } call() { return ( ) } callByUri(urlParameters) { // check if the uri contains a domain if (urlParameters.targetUri.indexOf('@') === -1) { const status = { title : 'Invalid user', message : `Oops, the domain of the user is not set in '${urlParameters.targetUri}'`, level : 'danger', width : 'large' } return ( ); } return ( ); } conference() { return ( ) } conferenceByUri(urlParameters) { const targetUri = utils.normalizeUri(urlParameters.targetUri, config.defaultConferenceDomain); const idx = targetUri.indexOf('@'); const uri = {}; const pattern = /^[A-Za-z0-9\-\_]+$/g; uri.user = targetUri.substring(0, idx); // check if the uri.user is valid if (!pattern.test(uri.user)) { const status = { title : 'Invalid conference', message : `Oops, the conference ID is invalid: ${targetUri}`, level : 'danger', width : 'large' } return ( ); } return ( ); } login() { let registerBox; let statusBox; if (this.state.status !== null) { statusBox = ( ); } if (this.state.registrationState !== 'registered') { registerBox = ( ); } return ( {registerBox} {statusBox} ); } logout() { RNCallKeep.setAvailable(false); if (this.state.registrationState !== null && (this.state.mode === MODE_NORMAL || this.state.mode === MODE_PRIVATE)) { this.state.account.unregister(); } if (this.state.account !== null) { this.state.connection.removeAccount(this.state.account, (error) => { if (error) { logger.debug(error); } }); } storage.set('account', {accountId: this.state.accountId, password: ''}); this.setState({account: null, registrationState: null, status: null, serverHistory: []}); history.push('/login'); return null; } main() { return null; } } export default Sylk; diff --git a/app/assets/styles/blink/_ConferenceModal.scss b/app/assets/styles/blink/_ConferenceModal.scss index 6f8dcda..c724639 100644 --- a/app/assets/styles/blink/_ConferenceModal.scss +++ b/app/assets/styles/blink/_ConferenceModal.scss @@ -1,30 +1,30 @@ .container { padding: 5px; margin: 10px; flex-direction: column; justify-content: center; align-items: center; } .title { padding: 5px; font-size: 24px; text-align: center; } .body { padding: 10px; font-size: 18px; width: 100%; } .button { margin: 10px; - width: 145; + width: 130; } .buttonRow { flex-direction: row; justify-content: center; } diff --git a/app/assets/styles/blink/_EscalateConferenceModal.scss b/app/assets/styles/blink/_EscalateConferenceModal.scss index 3521125..f91eda6 100644 --- a/app/assets/styles/blink/_EscalateConferenceModal.scss +++ b/app/assets/styles/blink/_EscalateConferenceModal.scss @@ -1,16 +1,16 @@ .container { - padding: 30px; - margin: 30px; + padding: 10px; + margin: 10px; } .title { padding: 5px; font-size: 20px; text-align: center; } .body { padding: 10px; font-size: 16px; text-align: center; } diff --git a/app/assets/styles/blink/_InviteParticipantsModal.scss b/app/assets/styles/blink/_InviteParticipantsModal.scss index 3521125..9e82977 100644 --- a/app/assets/styles/blink/_InviteParticipantsModal.scss +++ b/app/assets/styles/blink/_InviteParticipantsModal.scss @@ -1,16 +1,26 @@ .container { padding: 30px; - margin: 30px; + margin: 00px; } .title { padding: 5px; - font-size: 20px; + font-size: 24px; text-align: center; } .body { padding: 10px; - font-size: 16px; + font-size: 18px; text-align: center; } + +.button { + margin: 10px; + width: 130; +} + +.buttonRow { + flex-direction: row; + justify-content: center; +} diff --git a/app/assets/styles/blink/_LoadingScreen.scss b/app/assets/styles/blink/_LoadingScreen.scss index f6beb5e..cf04072 100644 --- a/app/assets/styles/blink/_LoadingScreen.scss +++ b/app/assets/styles/blink/_LoadingScreen.scss @@ -1,13 +1,13 @@ .portraitContainer { - margin-top: 350px; + margin-top: 380px; align-items: center; } .landscapeContainer { margin-left: 250px; align-items: center; } .title { color: white; } diff --git a/app/components/Call.js b/app/components/Call.js index be55e26..8ef576c 100644 --- a/app/components/Call.js +++ b/app/components/Call.js @@ -1,195 +1,196 @@ import React, { Component } from 'react'; import { View } from 'react-native'; import PropTypes from 'prop-types'; import assert from 'assert'; import debug from 'react-native-debug'; import autoBind from 'auto-bind'; import Logger from "../../Logger"; import AudioCallBox from './AudioCallBox'; import LocalMedia from './LocalMedia'; import VideoBox from './VideoBox'; import config from '../config'; const logger = new Logger("Call"); class Call extends Component { constructor(props) { super(props); autoBind(this); if (this.props.localMedia && this.props.localMedia.getVideoTracks().length === 0) { logger.debug('Will send audio only'); this.state = {audioOnly: true}; } else { this.state = {audioOnly: false}; } // If current call is available on mount we must have incoming if (this.props.currentCall != null) { this.props.currentCall.on('stateChanged', this.callStateChanged); } } componentWillReceiveProps(nextProps) { // Needed for switching to incoming call while in a call if (this.props.currentCall != null && this.props.currentCall != nextProps.currentCall) { if (nextProps.currentCall != null) { nextProps.currentCall.on('stateChanged', this.callStateChanged); } else { this.props.currentCall.removeListener('stateChanged', this.callStateChanged); } } } callStateChanged(oldState, newState, data) { // console.log('Call: callStateChanged', newState, '->', newState); if (newState === 'established') { // Check the media type again, remote can choose to not accept all offered media types const currentCall = this.props.currentCall; const remoteHasStreams = currentCall.getRemoteStreams().length > 0; const remoteHasNoVideoTracks = currentCall.getRemoteStreams()[0].getVideoTracks().length === 0; const remoteIsRecvOnly = currentCall.remoteMediaDirections.video[0] === 'recvonly'; const remoteIsInactive = currentCall.remoteMediaDirections.video[0] === 'inactive'; if (remoteHasStreams && (remoteHasNoVideoTracks || remoteIsRecvOnly || remoteIsInactive) && !this.state.audioOnly) { console.log('Media type changed to audio'); // Stop local video if (this.props.localMedia.getVideoTracks().length !== 0) { currentCall.getLocalStreams()[0].getVideoTracks()[0].stop(); } this.setState({audioOnly: true}); this.props.speakerphoneOff(); } else { this.forceUpdate(); } currentCall.removeListener('stateChanged', this.callStateChanged); // Switch to video earlier. The callOverlay has a handle on // 'established'. It starts a timer. To prevent a state updating on // unmounted component we try to switch on 'accept'. This means we get // to localMedia first. } else if (newState === 'accepted') { // Switch if we have audioOnly and local videotracks. This means // the call object switched and we are transitioning to an // incoming call. if (this.state.audioOnly && this.props.localMedia && this.props.localMedia.getVideoTracks().length !== 0) { console.log('Media type changed to video on accepted'); this.setState({audioOnly: false}); this.props.speakerphoneOn(); } } this.forceUpdate(); } call() { assert(this.props.currentCall === null, 'currentCall is not null'); - console.log('Call: starting call', this.props.callUUID, 'to', this.props.targetUri); + //console.log('Call: starting call', this.props.callUUID, 'to', this.props.targetUri); let options = {pcConfig: {iceServers: config.iceServers}, id: this.props.callUUID}; options.localStream = this.props.localMedia; let call = this.props.account.call(this.props.targetUri, options); call.on('stateChanged', this.callStateChanged); } answerCall() { console.log('Call: answer call'); assert(this.props.currentCall !== null, 'currentCall is null'); let options = {pcConfig: {iceServers: config.iceServers}}; options.localStream = this.props.localMedia; this.props.currentCall.answer(options); } hangupCall() { - this.props.hangupCall(); + console.log('Call: hangup call'); + let callUUID = this.props.currentCall._callkeepUUID; + this.props.hangupCall(callUUID); } mediaPlaying() { - console.log('Call: mediaPlaying'); if (this.props.currentCall === null) { this.call(); } else { this.answerCall(); } } render() { //console.log('Call: render'); let box = null; let remoteIdentity; if (this.props.currentCall !== null) { remoteIdentity = this.props.currentCall.remoteIdentity.displayName || this.props.currentCall.remoteIdentity.uri; } else { remoteIdentity = this.props.targetUri; } if (this.props.localMedia !== null) { if (this.state.audioOnly) { box = ( ); } else { if (this.props.currentCall != null && this.props.currentCall.state === 'established') { box = ( ); } else { if (this.props.currentCall && this.props.currentCall.state && this.props.currentCall.state === 'terminated') { // do not render } else { box = ( ); } } } } return box; } } Call.propTypes = { account : PropTypes.object.isRequired, hangupCall : PropTypes.func.isRequired, shareScreen : PropTypes.func, currentCall : PropTypes.object, escalateToConference : PropTypes.func, localMedia : PropTypes.object, targetUri : PropTypes.string, generatedVideoTrack : PropTypes.bool, callKeepSendDtmf : PropTypes.func, callKeepToggleMute : PropTypes.func, speakerphoneOn : PropTypes.func, speakerphoneOff : PropTypes.func, callUUID : PropTypes.string }; export default Call; diff --git a/app/components/Conference.js b/app/components/Conference.js index cb74d0d..4686635 100644 --- a/app/components/Conference.js +++ b/app/components/Conference.js @@ -1,107 +1,107 @@ import React from 'react'; import { View } from 'react-native'; import PropTypes from 'prop-types'; import assert from 'assert'; import debug from 'react-native-debug'; import autoBind from 'auto-bind'; import ConferenceBox from './ConferenceBox'; import LocalMedia from './LocalMedia'; import config from '../config'; const DEBUG = debug('blinkrtc:Conference'); debug.enable('*'); class Conference extends React.Component { constructor(props) { super(props); autoBind(this); } confStateChanged(oldState, newState, data) { DEBUG(`Conference state changed ${oldState} -> ${newState}`); if (newState === 'established') { this.forceUpdate(); } } start() { if (this.props.currentCall === null) { const options = { pcConfig: {iceServers: config.iceServers}, localStream: this.props.localMedia, audio: true, video: true, offerOptions: { offerToReceiveAudio: false, offerToReceiveVideo: false }, initialParticipants: this.props.participantsToInvite }; - DEBUG('Creating conference call', this.props.targetUri.toLowerCase(), options); + console.log('Creating conference call', this.props.targetUri.toLowerCase(), options); const confCall = this.props.account.joinConference(this.props.targetUri.toLowerCase(), options); confCall.on('stateChanged', this.confStateChanged); } else { - DEBUG('CALL ALREADY STARTED'); + console.log('Cannot start conference, there is already a call in progress'); } } hangup() { this.props.hangupCall(); } mediaPlaying() { if (this.props.currentCall === null) { this.start(); } else { DEBUG('CALL ALREADY STARTED'); } } render() { let box = null; if (this.props.localMedia !== null) { if (this.props.currentCall != null && this.props.currentCall.state === 'established') { box = ( ); } else { box = ( ); } } return box; } } Conference.propTypes = { notificationCenter : PropTypes.func.isRequired, account : PropTypes.object.isRequired, hangupCall : PropTypes.func.isRequired, currentCall : PropTypes.object, localMedia : PropTypes.object, targetUri : PropTypes.string, participantsToInvite : PropTypes.array, generatedVideoTrack : PropTypes.bool }; export default Conference; diff --git a/app/components/InviteParticipantsModal.js b/app/components/InviteParticipantsModal.js index 9620006..8bfb151 100644 --- a/app/components/InviteParticipantsModal.js +++ b/app/components/InviteParticipantsModal.js @@ -1,75 +1,82 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import autoBind from 'auto-bind'; +import { View } from 'react-native'; import { Dialog, Portal, Text, Button, Surface, TextInput } from 'react-native-paper'; import KeyboardAwareDialog from './KeyBoardAwareDialog'; const DialogType = Platform.OS === 'ios' ? KeyboardAwareDialog : Dialog; import config from '../config'; import styles from '../assets/styles/blink/_InviteParticipantsModal.scss'; class InviteParticipantsModal extends Component { constructor(props) { super(props); autoBind(this); this.state = { users: null } } invite(event) { event.preventDefault(); const uris = []; if (this.state.users) { this.state.users.split(',').forEach((item) => { item = item.trim(); if (item.indexOf('@') === -1) { item = `${item}@${config.defaultDomain}`; } uris.push(item); }); } if (uris && this.props.call) { this.props.call.inviteParticipants(uris); } this.props.close(); } onInputChange(value) { this.setState({users: value}); } render() { return ( - Invite Online Users - - Enter the users you wish to invite + Invite Participants + Enter users to invite - + + + ); } } InviteParticipantsModal.propTypes = { show: PropTypes.bool.isRequired, close: PropTypes.func.isRequired, call: PropTypes.object }; export default InviteParticipantsModal; diff --git a/app/components/ReadyBox.js b/app/components/ReadyBox.js index 14e650d..4805d1e 100644 --- a/app/components/ReadyBox.js +++ b/app/components/ReadyBox.js @@ -1,203 +1,203 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; // import VizSensor = require('react-visibility-sensor').default; import autoBind from 'auto-bind'; import { View, Platform} from 'react-native'; import { IconButton, Title } from 'react-native-paper'; import ConferenceModal from './ConferenceModal'; import HistoryCard from './HistoryCard'; import HistoryTileBox from './HistoryTileBox'; import FooterBox from './FooterBox'; import URIInput from './URIInput'; import config from '../config'; import utils from '../utils'; import styles from '../assets/styles/blink/_ReadyBox.scss'; class ReadyBox extends Component { constructor(props) { super(props); autoBind(this); this.state = { targetUri: this.props.missedTargetUri, showConferenceModal: false, sticky: false, }; } getTargetUri() { const defaultDomain = this.props.account.id.substring(this.props.account.id.indexOf('@') + 1); return utils.normalizeUri(this.state.targetUri, defaultDomain); } handleTargetChange(value) { if (this.state.targetUri) { let currentUri = this.getTargetUri(); if (currentUri.trim() === value.trim()) { this.setState({targetUri: ''}); } else { this.setState({targetUri: value}); } } else { this.setState({targetUri: value}); } this.forceUpdate(); } handleTargetSelect() { if (this.props.connection === null) { this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2}); return; } // the user pressed enter, start a video call by default if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) { this.props.startConference(this.state.targetUri, {audio: true, video: true}); } else { this.props.startCall(this.getTargetUri(), {audio: true, video: true}); } } showConferenceModal(event) { event.preventDefault(); if (this.state.targetUri.length !== 0) { const uri = `${this.state.targetUri.split('@')[0].replace(/[\s()-]/g, '')}@${config.defaultConferenceDomain}`; this.handleConferenceCall(uri.toLowerCase()); } else { this.setState({showConferenceModal: true}); } } handleAudioCall(event) { if (this.props.connection === null) { this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2}); return; } event.preventDefault(); if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) { this.props.startConference(this.state.targetUri, {audio: true, video: false}); } else { this.props.startCall(this.getTargetUri(), {audio: true, video: false}); } } handleVideoCall(event) { if (this.props.connection === null) { this.props._notificationCenter.postSystemNotification("Server unreachable", {timeout: 2}); return; } event.preventDefault(); if (this.state.targetUri.endsWith(`@${config.defaultConferenceDomain}`)) { this.props.startConference(this.state.targetUri, {audio: true, video: false}); } else { this.props.startCall(this.getTargetUri(), {audio: true, video: true}); } } handleConferenceCall(targetUri, options={audio: true, video: true}) { if (targetUri) { if (!options.video) { console.log('Handle audio only conference call to',targetUri); } else { console.log('Handle video conference call to',targetUri); } this.props.startConference(targetUri, options); } this.setState({showConferenceModal: false}); } render() { const buttonClass = (Platform.OS === 'ios') ? styles.iosButton : styles.androidButton; const uriGroupClass = this.props.orientation === 'landscape' ? styles.landscapeUriButtonGroup : styles.portraitUriButtonGroup; const uriClass = this.props.orientation === 'landscape' ? styles.landscapeUriInputBox : styles.portraitUriInputBox; const titleClass = this.props.orientation === 'landscape' ? styles.landscapeTitle : styles.portraitTitle; // Join URIs from local and server history for input let history = this.props.history.concat( this.props.serverHistory.map(e => e.remoteParty) ); history = [...new Set(history)]; //console.log('history from server is', this.props.serverHistory); return ( Enter address or phone number {this.props.serverHistory.filter(historyItem => historyItem.remoteParty.startsWith(this.state.targetUri)).map((historyItem, idx) => () )} ); } } ReadyBox.propTypes = { account : PropTypes.object.isRequired, startCall : PropTypes.func.isRequired, startConference : PropTypes.func.isRequired, missedTargetUri : PropTypes.string, history : PropTypes.array, serverHistory : PropTypes.array, orientation : PropTypes.string }; export default ReadyBox;