diff --git a/app/CallManager.js b/app/CallManager.js
index 46ff01d..c39dbdf 100644
--- a/app/CallManager.js
+++ b/app/CallManager.js
@@ -1,432 +1,444 @@
import events from 'events';
import Logger from '../Logger';
import uuid from 'react-native-uuid';
import { Platform, PermissionsAndroid } from 'react-native';
import utils from './utils';
const logger = new Logger('CallManager');
import { CONSTANTS as CK_CONSTANTS } from 'react-native-callkeep';
// https://github.com/react-native-webrtc/react-native-callkeep
/*
const CONSTANTS = {
END_CALL_REASONS: {
FAILED: 1,
REMOTE_ENDED: 2,
UNANSWERED: 3,
ANSWERED_ELSEWHERE: 4,
DECLINED_ELSEWHERE: 5,
MISSED: 6
}
};
*/
const options = {
ios: {
appName: 'Sylk',
maximumCallGroups: 1,
maximumCallsPerCallGroup: 2,
supportsVideo: true,
includesCallsInRecents: 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, PermissionsAndroid.PERMISSIONS.READ_CONTACTS]
}
};
export default class CallManager extends events.EventEmitter {
constructor(RNCallKeep, acceptFunc, rejectFunc, hangupFunc, timeoutFunc, conferenceCallFunc, startCallFromCallKeeper) {
//logger.debug('constructor()');
super();
this.setMaxListeners(Infinity);
this._RNCallKeep = RNCallKeep;
this._calls = new Map();
this._conferences = new Map();
this._rejectedCalls = new Map();
+ this._acceptedCalls = new Map();
this._alertedCalls = new Map();
- this._decideWhenWebSocketInviteArrives = new Map();
+ this.webSocketActions = new Map();
this._timeouts = new Map();
this.sylkAcceptCall = acceptFunc;
this.sylkRejectCall = rejectFunc;
this.sylkHangupCall = hangupFunc;
this.timeoutCall = timeoutFunc;
this.conferenceCall = conferenceCallFunc;
this.startCallFromOutside = startCallFromCallKeeper;
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.boundRnStartAction = this._startedCall.bind(this);
this.boundRnDisplayIncomingCall = this._displayIncomingCall.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);
this._RNCallKeep.addEventListener('didReceiveStartCallAction', this.boundRnStartAction);
this._RNCallKeep.addEventListener('didDisplayIncomingCall', this.boundRnDisplayIncomingCall);
this._RNCallKeep.setup(options);
this._RNCallKeep.addEventListener('checkReachability', () => {
this._RNCallKeep.setReachable();
});
}
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;
}
}
}
setAvailable(available) {
this.callKeep.setAvailable(available);
}
backToForeground() {
- utils.timestampedLog('Callkeep: bring app to the foreground');
+ //utils.timestampedLog('Callkeep: bring app to the foreground');
this.callKeep.backToForeground();
}
setMutedCall(callUUID, mute) {
utils.timestampedLog('Callkeep: set call', callUUID, 'muted =', mute);
this.callKeep.setMutedCall(callUUID, mute);
}
- startCall(callUUID, targetUri, targetName, hasVideo) {
+ startCall(callUUID, targetUri, hasVideo) {
utils.timestampedLog('Callkeep: start outgoing 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.backToForeground();
}
updateDisplay(callUUID, displayName, uri) {
utils.timestampedLog('Callkeep: update display', displayName, uri);
this.callKeep.updateDisplay(callUUID, displayName, uri);
}
sendDTMF(callUUID, digits) {
utils.timestampedLog('Callkeep: send DTMF: ', digits);
this.callKeep.sendDTMF(callUUID, digits);
}
setCurrentCallActive(callUUID) {
- utils.timestampedLog('Callkeep: set call active', callUUID);
+ //utils.timestampedLog('Callkeep: set call active', callUUID);
this.callKeep.setCurrentCallActive(callUUID);
}
- rejectCall(callUUID) {
- utils.timestampedLog('Callkeep: reject call', callUUID);
- this.callKeep.rejectCall(callUUID);
- this._rejectedCalls.set(callUUID, true);
- }
-
endCalls() {
utils.timestampedLog('Callkeep: end all calls');
this.callKeep.endAllCalls();
}
endCall(callUUID, reason) {
- utils.timestampedLog('Callkeep: end call', callUUID, ' with reason', reason);
+ utils.timestampedLog('Callkeep: end call', callUUID, 'with reason', reason);
if (reason) {
this.callKeep.reportEndCallWithUUID(callUUID, reason);
} else {
this.callKeep.endCall(callUUID);
}
this._calls.delete(callUUID);
}
_rnActiveAudioSession() {
- utils.timestampedLog('Callkeep: activated audio call');
+ //utils.timestampedLog('Callkeep: activated call');
}
_rnDeactiveAudioSession() {
- utils.timestampedLog('Callkeep: deactivated audio call');
+ //utils.timestampedLog('Callkeep: deactivated call');
}
_rnAccept(data) {
utils.timestampedLog('Callkeep: accept callback', callUUID);
let callUUID = data.callUUID.toLowerCase();
- this.acceptCall(callUUID);
+ if (!this._acceptedCalls.has(callUUID)) {
+ this.acceptCall(callUUID);
+ } else {
+ utils.timestampedLog('Callkeep: already accepted callback', callUUID);
+ }
}
acceptCall(callUUID) {
utils.timestampedLog('Callkeep: accept call', callUUID);
+ this._acceptedCalls.set(callUUID, true);
+
+ if (this._timeouts.has(callUUID)) {
+ clearTimeout(this._timeouts.get(callUUID));
+ this._timeouts.delete(callUUID);
+ }
+
if (this._conferences.has(callUUID)) {
let room = this._conferences.get(callUUID);
+
utils.timestampedLog('Callkeep: accept incoming conference', callUUID);
this.callKeep.endCall(callUUID);
this._conferences.delete(callUUID);
- if (this._timeouts.has(callUUID)) {
- clearTimeout(this._timeouts.get(callUUID));
- this._timeouts.delete(callUUID);
- }
-
utils.timestampedLog('Will start conference to', room);
- this.conferenceCall(room);
- // this is app callKeepStartConference()
+ this.conferenceCall(room); // this is app callKeepStartConference()
- // start an outgoing conference call
} else if (this._calls.has(callUUID)) {
this.sylkAcceptCall();
+
} else {
// We accepted the call before it arrived on web socket
- // from iOS push notifications
- this._decideWhenWebSocketInviteArrives.set(callUUID, 'accept');
+ this.webSocketActions.set(callUUID, 'accept');
}
- this.backToForeground();
+ this.backToForeground();
}
_rnEnd(data) {
utils.timestampedLog('Callkeep: end callback', callUUID);
let callUUID = data.callUUID.toLowerCase();
this.rejectCall(callUUID);
-
}
rejectCall(callUUID) {
utils.timestampedLog('Callkeep: reject call', callUUID);
+
+ this.callKeep.rejectCall(callUUID);
+
+ this._rejectedCalls.set(callUUID, true);
+
+ if (this._timeouts.has(callUUID)) {
+ clearTimeout(this._timeouts.get(callUUID));
+ this._timeouts.delete(callUUID);
+ }
+
if (this._conferences.has(callUUID)) {
utils.timestampedLog('Callkeep: reject conference invite', callUUID);
let room = this._conferences.get(callUUID);
- this.callKeep.endCall(callUUID);
this._conferences.delete(callUUID);
- if (this._timeouts.has(callUUID)) {
- clearTimeout(this._timeouts.get(callUUID));
- this._timeouts.delete(callUUID);
- }
-
} else if (this._calls.has(callUUID)) {
let call = this._calls.get(callUUID);
if (call.state === 'incoming') {
- utils.timestampedLog('Callkeep: cancel call', callUUID);
+ utils.timestampedLog('Callkeep: reject call', callUUID);
this.sylkRejectCall(callUUID);
} else {
utils.timestampedLog('Callkeep: hangup call', callUUID);
this.sylkHangupCall(callUUID);
}
} else {
// We rejected the call before it arrived on web socket
// from iOS push notifications
utils.timestampedLog('Callkeep: add call', callUUID, 'to the waitings list');
- this._decideWhenWebSocketInviteArrives.set(callUUID, 'reject');
- this._rejectedCalls.set(callUUID, true);
+ this.webSocketActions.set(callUUID, 'reject');
}
}
_rnMute(data) {
utils.timestampedLog('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) {
utils.timestampedLog('Callkeep: got dtmf for call', data.callUUID);
if (this._calls.has(data.callUUID.toLowerCase())) {
let call = this._calls.get(data.callUUID.toLowerCase());
utils.timestampedLog('sending webrtc dtmf', data.digits)
call.sendDtmf(data.digits);
}
}
_rnProviderReset() {
utils.timestampedLog('Callkeep: got a provider reset, clearing down all calls');
this._calls.forEach((call) => {
call.terminate();
})
}
incomingCallFromPush(callUUID, from) {
utils.timestampedLog('Callkeep: handle incoming push call', callUUID);
// call is received by push notification
+
+ if (this._rejectedCalls.has(callUUID)) {
+ this.callKeep.reportEndCallWithUUID(callUUID, CK_CONSTANTS.END_CALL_REASONS.UNANSWERED);
+ return;
+ }
+
if (Platform.OS === 'ios') {
if (this._calls.has(callUUID)) {
- utils.timestampedLog('Callkeep: call', callUUID, 'already handled');
- return;
+ utils.timestampedLog('Callkeep: call', callUUID, 'already received on web socket');
}
} else {
this.showAlertPanelforPush(callUUID, from);
}
- if (this._rejectedCalls.has(callUUID)) {
- this.callKeep.reportEndCallWithUUID(callUUID, CK_CONSTANTS.END_CALL_REASONS.UNANSWERED);
- return;
- }
-
- let reason = this._decideWhenWebSocketInviteArrives.has(callUUID) ? CK_CONSTANTS.END_CALL_REASONS.FAILED : CK_CONSTANTS.END_CALL_REASONS.UNANSWERED;
+ let reason = this.webSocketActions.has(callUUID) ? CK_CONSTANTS.END_CALL_REASONS.FAILED : CK_CONSTANTS.END_CALL_REASONS.UNANSWERED;
// if user does not decide anything this will be handled later
this._timeouts.set(callUUID, setTimeout(() => {
- utils.timestampedLog('Callkeep: end call later', callUUID);
+ utils.timestampedLog('Callkeep: end call because user did not react', callUUID);
this.callKeep.reportEndCallWithUUID(callUUID, reason);
this._timeouts.delete(callUUID);
}, 45000));
}
incomingCallFromWebSocket(call) {
call._callkeepUUID = call.id;
this._calls.set(call._callkeepUUID, call);
- utils.timestampedLog('Callkeep: handle incoming call', call._callkeepUUID);
-
- if (this._timeouts.has(call.id)) {
- clearTimeout(this._timeouts.get(call.id));
- this._timeouts.delete(call.id);
- }
+ utils.timestampedLog('Callkeep: handle incoming websocket call', call._callkeepUUID);
// if the call came via push and was already accepted or rejected
- if (this._decideWhenWebSocketInviteArrives.get(call._callkeepUUID)) {
- let action = this._decideWhenWebSocketInviteArrives.get(call._callkeepUUID);
- utils.timestampedLog('Callkeep: execute action', action);
+ if (this.webSocketActions.get(call._callkeepUUID)) {
+ let action = this.webSocketActions.get(call._callkeepUUID);
+ utils.timestampedLog('Callkeep: execute action decided earlier', action);
+
if (action === 'accept') {
this.sylkAcceptCall(call.id);
} else {
this.sylkRejectCall(call.id);
}
- this._decideWhenWebSocketInviteArrives.delete(call._callkeepUUID);
- } else if (this._rejectedCalls.has(call._callkeepUUID)) {
- this.sylkRejectCall(call.id);
+
+ this.webSocketActions.delete(call._callkeepUUID);
+
+ if (this._timeouts.has(call.id)) {
+ clearTimeout(this._timeouts.get(call.id));
+ this._timeouts.delete(call.id);
+ }
+
} else {
+ // iOS invite push does not arrive if app is in the foreground
+ // If the push arrived, we would be above this else
if (Platform.OS === 'ios') {
this.showAlertPanelforCall(call);
+ } else {
+ // Andoid always receives the invite push and we must show the alert
+ // at that time, if we do it here, the previously shown alert panel
+ // will vanish and the app will go to the foregound leaving the user confused
+ // the alert panel is hidden somewhere in the notifications bar
}
}
// Emit event.
this._emitSessionsChange(true);
}
handleOutgoingCall(call) {
// this is an outgoing call
call._callkeepUUID = call.id;
this._calls.set(call._callkeepUUID, call);
utils.timestampedLog('Callkeep: start outgoing call', call._callkeepUUID);
// Emit event.
this._emitSessionsChange(true);
}
handleConference(callUUID, room, from_uri) {
if (this._conferences.has(callUUID)) {
return;
}
- utils.timestampedLog('CallKeep: handle conference', callUUID, 'from', from_uri, 'to room', room);
this._conferences.set(callUUID, room);
+ utils.timestampedLog('CallKeep: handle conference', callUUID, 'from', from_uri, 'to room', room);
+
this.showAlertPanelforPush(callUUID, from_uri);
// there is no cancel, so we add a timer
this._timeouts.set(callUUID, setTimeout(() => {
utils.timestampedLog('Callkeep: conference timeout', callUUID);
this.timeoutCall(callUUID, from_uri);
this.callKeep.reportEndCallWithUUID(callUUID, CK_CONSTANTS.END_CALL_REASONS.MISSED);
this._timeouts.delete(callUUID);
}, 45000));
this._emitSessionsChange(true);
}
showAlertPanelforPush(callUUID, uri) {
utils.timestampedLog('Callkeep: show alert panel for push', callUUID, 'from', uri);
if (Platform.OS === 'ios') {
this.callKeep.displayIncomingCall(callUUID, uri, uri, 'email', true);
} else if (Platform.OS === 'android') {
this.callKeep.displayIncomingCall(callUUID, uri, uri);
}
}
_startedCall(data) {
- utils.timestampedLog("Callkeep: started call from outside");
+ utils.timestampedLog("Callkeep: started call from native dialer");
console.log(data);
this.startCallFromOutside(data);
}
_displayIncomingCall(data) {
utils.timestampedLog('Incoming alert panel displayed');
this._alertedCalls.set(data.callUUID.toLowerCase(), true);
}
showAlertPanelforCall(call, force=false) {
if (this._alertedCalls.has(call._callkeepUUID) && !force) {
utils.timestampedLog('Callkeep: alert panel was already shown for call', call._callkeepUUID);
return;
}
utils.timestampedLog('Callkeep: show alert panel for call', call._callkeepUUID);
let hasVideo = call.mediaTypes && call.mediaTypes.video;
if (Platform.OS === 'ios') {
this.callKeep.displayIncomingCall(call._callkeepUUID, call.remoteIdentity.uri, call.remoteIdentity.displayName, 'email', hasVideo);
} else if (Platform.OS === 'android') {
this.callKeep.displayIncomingCall(call._callkeepUUID, call.remoteIdentity.uri, call.remoteIdentity.displayName);
}
}
_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);
this._RNCallKeep.removeEventListener('didReceiveStartCallAction', this.boundRnStartAction);
this._RNCallKeep.removeEventListener('didDisplayIncomingCall', this.boundRnDisplayIncomingCall);
}
}
diff --git a/app/app.js b/app/app.js
index 686e115..d91941e 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,2180 +1,2168 @@
import React, { Component, Fragment } from 'react';
import { Alert, View, SafeAreaView, ImageBackground, 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 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, isTablet, getPhoneNumber} from 'react-native-device-info';
import RNDrawOverlay from 'react-native-draw-overlay';
import PushNotificationIOS from "@react-native-community/push-notification-ios";
import Contacts from 'react-native-contacts';
registerGlobals();
import * as sylkrtc from 'react-native-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();
const version = '1.0.0';
if (Platform.OS == 'ios') {
bundleId = `${bundleId}.${__DEV__ ? 'dev' : 'prod'}`;
// bundleId = `${bundleId}.dev`;
}
const mainStyle = StyleSheet.create({
MainContainer: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
margin: 0
}
});
// 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,
contacts: [],
devices: {},
speakerPhoneEnabled: null,
orientation : 'portrait',
Height_Layout : '',
Width_Layout : '',
outgoingCallUUID: null,
outgoingMedia: null,
hardware: '',
phoneNumber: '',
isTablet: isTablet(),
refreshHistory: false,
myDisplayName: null,
myPhoneNumber: null,
localHistory: [],
favoriteUris: [],
blockedUris: [],
initialUrl: null,
reconnectingCall: false
};
this.currentRoute = null;
this.pushtoken = null;
this.pushkittoken = null;
this.intercomDtmfTone = null;
this.registrationFailureTimer = null;
this.cachedHistory = []; // used for caching server history
this.state = Object.assign({}, this._initialSstate);
this.myParticipants = {};
this.myInvitedParties = {};
this._historyConferenceParticipants = new Map(); // for saving to local history
this.__notificationCenter = null;
this.participantsToInvite = null;
this.redirectTo = null;
this.prevPath = null;
this.shouldUseHashRouting = false;
this.muteIncoming = false;
+ this.gotToReadyTimer = null;
storage.initialize();
this._callKeepManager = new CallManager(RNCallKeep, this.acceptCall, this.rejectCall, this.hangupCall, this.timeoutCall, this.callKeepStartConference, this.startCallFromCallKeeper);
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});
}
});
storage.get('history').then((history) => {
if (history) {
- console.log('Loaded', history.length, 'local history entries');
+ //console.log('Loaded', history.length, 'local history entries');
this.setState({localHistory: history});
- } else {
- console.log('Loaded 0 local history entries');
}
});
storage.get('cachedHistory').then((history) => {
if (history) {
- console.log('Loaded', history.length, 'cached history entries');
+ //console.log('Loaded', history.length, 'cached history entries');
this.cachedHistory = history;
}
});
storage.get('myParticipants').then((myParticipants) => {
if (myParticipants) {
this.myParticipants = myParticipants;
- console.log('My participants', this.myParticipants);
+ //console.log('My participants', this.myParticipants);
}
});
storage.get('myInvitedParties').then((myInvitedParties) => {
if (myInvitedParties) {
this.myInvitedParties = myInvitedParties;
- console.log('My invited parties', this.myInvitedParties);
+ //console.log('My invited parties', this.myInvitedParties);
}
});
storage.get('favoriteUris').then((favoriteUris) => {
if (favoriteUris) {
this.setState({favoriteUris: favoriteUris});
- console.log('My favorite Uris', favoriteUris);
+ //console.log('My favorite Uris', favoriteUris);
}
});
storage.get('blockedUris').then((blockedUris) => {
if (blockedUris) {
this.setState({blockedUris: blockedUris});
- console.log('My blocked Uris', blockedUris);
+ //console.log('My blocked Uris', blockedUris);
}
});
}
async loadContacts() {
Contacts.checkPermission((err, permission) => {
if (permission === Contacts.PERMISSION_UNDEFINED) {
Contacts.requestPermission((err, requestedContactsPermissionResult) => {
if (err) {
console.log("Contacts.requestPermission()catch: ", err);
}
console.log("Contacts.requestPermission() requestPermission: ", requestedContactsPermissionResult);
})
}
})
Contacts.getAll((err, contacts) => {
if (err === 'denied'){
console.log('Access to contacts denied')
} else {
// contacts returned in Array
let contact_cards = [];
let name;
let photo;
let seen_uris = new Map();
var arrayLength = contacts.length;
for (var i = 0; i < arrayLength; i++) {
photo = null;
contact = contacts[i];
if (contact['givenName'] && contact['familyName']) {
name = contact['givenName'] + ' ' + contact['familyName'];
} else if (contact['givenName']) {
name = contact['givenName'];
} else if (contact['familyName']) {
name = contact['familyName'];
} else if (contact['company']) {
name = contact['company'];
} else {
continue;
}
if (contact.hasThumbnail) {
photo = contact.thumbnailPath;
}
//console.log(name);
contact['phoneNumbers'].forEach(function (number, index) {
let number_stripped = number['number'].replace(/\s|\-|\(|\)/g, '');
if (number_stripped) {
if (!seen_uris.has(number_stripped)) {
//console.log(' ----> ', number['label'], number_stripped);
var contact_card = {id: uuid.v4(), displayName:
name, remoteParty: number_stripped,
type: 'contact',
photo: photo,
label: number['label'],
tags: ['contact']};
contact_cards.push(contact_card);
seen_uris.set(number_stripped, true);
var contact_card = {id: uuid.v4(),
displayName: name,
remoteParty: number_stripped,
type: 'contact',
photo: photo,
label: number['label'],
tags: ['contact']
};
}
}
});
contact['emailAddresses'].forEach(function (email, index) {
let email_stripped = email['email'].replace(/\s|\(|\)/g, '');
if (!seen_uris.has(email_stripped)) {
//console.log(name, email['label'], email_stripped);
//console.log(' ----> ', email['label'], email_stripped);
var contact_card = {id: uuid.v4(),
displayName: name,
remoteParty: email_stripped,
type: 'contact',
photo: photo,
label: email['label'],
tags: ['contact']
};
contact_cards.push(contact_card);
seen_uris.set(email_stripped, true);
}
});
}
this.contacts = contact_cards;
if (this.state.myPhoneNumber) {
var myContact = this.findObjectByKey(contact_cards, 'remoteParty', this.state.myPhoneNumber);
if (myContact) {
this.setState({myDisplayName: myContact.displayName});
}
}
}
})
}
get _notificationCenter() {
// getter to lazy-load the NotificationCenter ref
if (!this.__notificationCenter) {
this.__notificationCenter = this.refs.notificationCenter;
}
return this.__notificationCenter;
}
findObjectByKey(array, key, value) {
for (var i = 0; i < array.length; i++) {
if (array[i][key] === value) {
return array[i];
}
}
return null;
}
_detectOrientation() {
if(this.state.Width_Layout > this.state.Height_Layout && this.state.orientation !== 'landscape') {
this.setState({orientation: 'landscape'});
} else {
this.setState({orientation: 'portrait'});
}
}
- changeRoute(route) {
+ changeRoute(route, reason) {
if (this.currentRoute === route) {
return;
}
- utils.timestampedLog('Change route:', this.currentRoute, '->', route);
+ utils.timestampedLog('Change route:', this.currentRoute, '->', route, 'for reason:', reason);
this.currentRoute = route;
history.push(route);
}
async componentDidMount() {
this._loaded = true;
try {
await RNCallKeep.hasPhoneAccount();
} catch(err) {
utils.timestampedLog(err);
}
if (Platform.OS === 'android') {
RNDrawOverlay.askForDispalayOverOtherAppsPermission()
.then(res => {
utils.timestampedLog("Display over other apps was granted");
// res will be true if permission was granted
})
.catch(e => {
utils.timestampedLog("Display over other apps was declined");
// permission was declined
})
}
- this.changeRoute('/login');
+ this.changeRoute('/login', 'application start');
// 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) {
- utils.timestampedLog('Initial Linking URL: ' + url);
+ utils.timestampedLog('Wake up by push url', url);
this.incomingCallFromUrl(url);
}
}).catch(err => {
logger.error({ err }, 'Error getting initial URL');
});
firebase.messaging().getToken()
.then(fcmToken => {
if (fcmToken) {
this._onPushRegistered(fcmToken);
}
});
Linking.addEventListener('url', this.updateLinkingURL);
} 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.boundProximityDetect = this._proximityDetect.bind(this);
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;
- utils.timestampedLog('Handle Firebase', event, 'push notification for', message.data['session-id']);
+ utils.timestampedLog('Push: Firebase', event, 'notification for', message.data['session-id']);
if (event === 'incoming_conference_request') {
this.incomingConference(message.data['session-id'], message.data['to_uri'], message.data['from_uri']);
} else if (event === 'incoming_session') {
this.incomingCallFromPush(message.data['session-id'], message.data['from_uri']);
} else if (event === 'cancel') {
this.cancelIncomingCall(message.data['session-id']);
}
});
}
this._detectOrientation();
getPhoneNumber().then(phoneNumber => {
this.setState({myPhoneNumber: phoneNumber});
this.loadContacts();
});
}
cancelIncomingCall(callUUID) {
this._callKeepManager.endCall(callUUID, 6);
}
_proximityDetect(data) {
return;
if (data.isNear) {
this.speakerphoneOff();
} else {
this.speakerphoneOn();
}
}
updateLinkingURL = (event) => {
// this handles the use case where the app is running in the background and is activated by the listener...
- console.log('Updated Linking url', event.url);
+ utils.timestampedLog('Wake up by push url', event.url);
this.incomingCallFromUrl(event.url);
}
- startCallWhenReady(targetUri, options) {
- utils.timestampedLog('Start call when ready to', targetUri);
- if (options.conference) {
- this.startConference(targetUri, options);
- } else {
- this.startCall(targetUri, options);
- }
- }
-
_sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
_onPushkitRegistered(token) {
utils.timestampedLog('Set VoIP pushkit token', token);
this.pushkittoken = token;
}
_onPushRegistered(token) {
utils.timestampedLog('Set background push token', token);
this.pushtoken = token;
}
_sendPushToken() {
if (this.state.account && this.pushtoken) {
let token = null;
if (Platform.OS === 'ios') {
token = `${this.pushkittoken}#${this.pushtoken}`;
} else if (Platform.OS === 'android') {
token = this.pushtoken;
}
utils.timestampedLog('Push token', token, 'sent to server');
this.state.account.setDeviceToken(token, Platform.OS, deviceId, true, bundleId);
}
}
componentWillUnmount() {
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();
}
}
}
startCallFromCallKeeper(data) {
// like from native iOS history
- utils.timestampedLog("CallKeep started call from outside the app to", data.handle);
+ //utils.timestampedLog("CallKeep started call to", data.handle);
// 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();
let is_conf = data.handle.search('videoconference.') === -1 ? false: true;
if (is_conf) {
this.callKeepStartConference(data.handle, {audio: true, video: true, callUUID: callUUID});
} else {
this.callKeepStartCall(data.handle, {audio: true, video: false, callUUID: callUUID});
}
this._notificationCenter.removeNotification();
}
connectionStateChanged(oldState, newState) {
utils.timestampedLog('Web socket state changed:', oldState, '->' , newState);
switch (newState) {
case 'closed':
this.setState({connection: null, loading: null});
//this._notificationCenter.postSystemNotification('Connection failed', {body: '', timeout: 3000});
break;
case 'ready':
this._notificationCenter.removeNotification();
//this._notificationCenter.postSystemNotification('Connection OK', {body: '', timeout: 1});
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.hangupCall(this.state.currentCall._callkeepUUID, 'connection_failed');
}
if (this.state.inboundCall) {
this.hangupCall(this.state.inboundCall._callkeepUUID, 'connection_failed');
}
this.setState({
registrationState: 'failed',
generatedVideoTrack: false,
});
//this._notificationCenter.postSystemNotification('Connection lost', {body: '', timeout: 3000});
break;
default:
if (this.state.registrationKeepalive !== true) {
this.setState({loading: 'Connecting...'});
}
break;
}
}
notificationCenter() {
return this._notificationCenter;
}
showRegisterFailure(reason) {
logger.debug('Registration error: ' + reason);
this.setState({
loading : null,
registrationState: 'failed',
status : {
msg : 'Sign In failed: ' + reason,
level : 'danger'
}
});
}
registrationStateChanged(oldState, newState, data) {
utils.timestampedLog('Registration state changed:', oldState, '->', newState);
if (newState === 'failed') {
this._callKeepManager.setAvailable(false);
let reason = data.reason;
if (reason.match(/904|408/)) {
// Sofia SIP: WAT
reason = 'Wrong account or password';
}
this.showRegisterFailure(reason);
if (this.state.registrationKeepalive === true) {
if (this.state.connection !== null) {
utils.timestampedLog('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
utils.timestampedLog('Retry to register after a delay...');
setTimeout(this.state.account.register(), 5000);
}
}
} else if (newState === 'registered') {
if (this.registrationFailureTimer) {
clearTimeout(this.registrationFailureTimer);
this.registrationFailureTimer = null;
}
this._callKeepManager.setAvailable(true);
this.setState({loading: null, registrationKeepalive: true, registrationState: 'registered'});
//if (!this.state.currentCall) {
if (this.currentRoute === '/login') {
- this.changeRoute('/ready');
+ this.changeRoute('/ready', 'login completed');
}
//this._notificationCenter.postSystemNotification('Ready to receive calls', {body: '', timeout: 1});
return;
} else {
this.setState({status: null, registrationState: newState });
this._callKeepManager.setAvailable(false);
}
}
showCalls(prefix) {
if (this.state.currentCall) {
utils.timestampedLog('Current calls', prefix, 'currentCall:', this.state.currentCall ? (this.state.currentCall._callkeepUUID + ' ' + this.state.currentCall.direction): 'None');
}
if (this.state.inboundCall) {
utils.timestampedLog('Current calls', prefix, 'inboundCall:', this.state.inboundCall ? (this.state.inboundCall._callkeepUUID + ' ' + this.state.inboundCall.direction): 'None');
}
if (this._callKeepManager.callUUIDS.length > 0) {
utils.timestampedLog('Current calls', prefix, 'callkeep sessions:', this._callKeepManager.callUUIDS);
}
}
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
//this.showCalls('Begin callStateChanged');
let call = this._callKeepManager._calls.get(data.id);
if (!call) {
utils.timestampedLog("callStateChanged error: call", data.id, 'not found in callkeep manager');
return;
}
let callUUID = call._callkeepUUID;
utils.timestampedLog(call.direction, 'call', callUUID, 'state change:', oldState, '->', newState);
let newCurrentCall;
let newInboundCall;
let direction = call.direction;
let goToReady = direction === 'incoming' ? true : false;
if (this.state.inboundCall && this.state.currentCall) {
if (this.state.inboundCall != this.state.currentCall) {
- utils.timestampedLog('We have two calls');
+ utils.timestampedLog('Call state changed: We have two calls');
+ } else {
+ utils.timestampedLog('Call state changed: We have two calls the same');
}
if (newState === 'terminated') {
if (this.state.inboundCall == this.state.currentCall) {
newCurrentCall = null;
newInboundCall = null;
} else {
if (oldState === 'incoming') {
utils.timestampedLog('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') {
utils.timestampedLog('Call state changed:', 'Old call must be closed');
// old call must be closed
newCurrentCall = null;
newInboundCall = null;
} else {
utils.timestampedLog('Call state changed:', 'Error: unclear call combination')
}
}
} else if (newState === 'accepted') {
if (this.state.inboundCall == this.state.currentCall) {
newCurrentCall = this.state.inboundCall;
newInboundCall = this.state.inboundCall;
} else {
utils.timestampedLog('Call state changed:', 'Error: we have two different calls and unhandled state transition');
}
} else if (newState === 'established') {
if (this.state.inboundCall == this.state.currentCall) {
newCurrentCall = this.state.inboundCall;
newInboundCall = this.state.inboundCall;
} else {
utils.timestampedLog('Call state changed:', 'Error: we have two different calls and unhandled state transition');
}
} else {
utils.timestampedLog('Call state changed:', 'We have two calls and unhandled state');
}
} else if (this.state.inboundCall) {
+ utils.timestampedLog('Call state changed: We have an inbound call');
+
if (oldState === 'incoming' && newState === 'terminated') {
utils.timestampedLog("Incoming call was cancelled");
this.setState({showIncomingModal: false});
newInboundCall = null;
newCurrentCall = null;
} else if (oldState === 'incoming' && newState === 'accepted') {
utils.timestampedLog("Incoming call is accepted");
newCurrentCall = this.state.inboundCall;
newInboundCall = this.state.inboundCall;
this.setState({showIncomingModal: false});
} else if (oldState === 'established' && newState === 'terminated') {
// old call was hangup to accept a new incoming calls
newCurrentCall = null;
newInboundCall = this.state.inboundCall;
} else {
utils.timestampedLog('Call state changed:', 'we have one inbound call and unhandled state');
}
} else {
+ utils.timestampedLog('Call state changed: We have an outbound call');
newCurrentCall = newState === 'terminated' ? null : this.state.currentCall;
newInboundCall = null;
}
switch (newState) {
case 'progress':
//utils.timestampedLog('Play ringback tone');
InCallManager.startRingback('_BUNDLE_');
this.setState({
currentCall: newCurrentCall,
inboundCall: newInboundCall
});
break;
+ if (this.gotToReadyTimer) {
+ clearTimeout(this.gotToReadyTimer);
+ this.gotToReadyTimer = null;
+ }
case 'established':
this.setState({
currentCall: newCurrentCall,
inboundCall: newInboundCall
});
+ if (this.gotToReadyTimer) {
+ clearTimeout(this.gotToReadyTimer);
+ this.gotToReadyTimer = null;
+ }
case 'accepted':
this._callKeepManager.backToForeground();
this._callKeepManager.setCurrentCallActive(callUUID);
if (this.state.isConference) {
// allow ringtone to play once as connection is too fast
setTimeout(() => {InCallManager.stopRingback();}, 1500);
} else {
- utils.timestampedLog('Stop ringback tone');
InCallManager.stopRingback();
}
if (this.state.isConference) {
//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) {
utils.timestampedLog('Call state changed:', 'Video call started')
//this._callKeepManager.backToForeground();
this.speakerphoneOn();
}
} else {
this.speakerphoneOff();
}
this.setState({
currentCall: newCurrentCall,
inboundCall: newInboundCall
});
break;
+
+ if (this.gotToReadyTimer) {
+ clearTimeout(this.gotToReadyTimer);
+ this.gotToReadyTimer = null;
+ }
case 'terminated':
let callSuccesfull = false;
let reason = data.reason;
let play_busy_tone = true;
let CALLKEEP_REASON;
- utils.timestampedLog('Call state changed:', 'call', callUUID, 'terminated reason:', reason);
+ //utils.timestampedLog('Call state changed:', 'call', callUUID, 'terminated reason:', reason);
if (!reason || reason.match(/200/)) {
- if (oldState == 'progress') {
+ if (oldState == 'progress' || oldState == 'incoming') {
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;
}
goToReady = true;
} else if (reason.match(/403/)) {
reason = 'This domain is not served here';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else if (reason.match(/404/)) {
reason = 'User not found';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else if (reason.match(/408/)) {
reason = 'Timeout';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else if (reason.match(/480/)) {
reason = 'User not online';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.UNANSWERED;
goToReady = true;
} else if (reason.match(/486/) || reason.match(/60[036]/)) {
reason = 'Busy';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.REMOTE_ENDED;
goToReady = true;
} else if (reason.match(/487/)) {
reason = 'Cancelled';
play_busy_tone = false;
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.MISSED;
goToReady = true;
} else if (reason.match(/488/)) {
reason = 'Unacceptable media';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else if (reason.match(/5\d\d/)) {
reason = 'Server failure';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else if (reason.match(/904/)) {
// Sofia SIP: WAT
reason = 'Wrong account or password';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
goToReady = true;
} else {
reason = 'Connection failed';
CALLKEEP_REASON = CK_CONSTANTS.END_CALL_REASONS.FAILED;
}
- utils.timestampedLog('Call', callUUID, 'ended:', reason);
this._callKeepManager.endCall(callUUID, CALLKEEP_REASON);
if (this.state.currentCall === null) {
- utils.timestampedLog('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.setFocusEvents(false);
if (newCurrentCall) {
// we had an old active call that must be revived
this._callKeepManager.setCurrentCallActive(newCurrentCall._callkeepUUID);
}
if (!newCurrentCall && !newInboundCall) {
if (play_busy_tone) {
this.playBusyTone();
} else {
- utils.timestampedLog('Stop InCall manager');
InCallManager.stop();
}
this.participantsToInvite = null;
if (goToReady) {
- setTimeout(() => {
+ this.gotToReadyTimer = setTimeout(() => {
+ utils.timestampedLog('Go to ready later');
this.setState({
localMedia: null,
currentCall: newCurrentCall,
inboundCall: newInboundCall
});
- this.changeRoute('/ready');
+ this.changeRoute('/ready', 'call_terminated');
}, 4000);
}
setTimeout(() => {
this.setState({refreshHistory: !this.state.refreshHistory});
}, 2000);
}
this.updateHistoryEntry(callUUID);
break;
default:
break;
}
// console.log('newCurrentCall', newCurrentCall);
// console.log('inboundCall', newInboundCall);
/*
this.setState({
currentCall: newCurrentCall,
inboundCall: newInboundCall
});
*/
}
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) {
const userAgent = 'Sylk Mobile';
console.log('User Agent:', userAgent);
if (this.state.phoneNumber) {
console.log('Phone number:', this.state.phoneNumber);
}
let connection = sylkrtc.createConnection({server: config.wsServer, userAgent: {name: userAgent, version: version}});
connection.on('stateChanged', this.connectionStateChanged);
this.setState({connection: connection});
} else {
utils.timestampedLog('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) => {
this.setState({registrationState: null, registrationKeepalive: false});
}
);
}
const options = {
account: accountId,
password: password,
displayName: displayName
};
this.registrationFailureTimer = setTimeout(this.showRegisterFailure, 6000, 'Wrong account or password');
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.incomingCallFromWebSocket);
account.on('missedCall', this.missedCall);
account.on('conferenceInvite', this.conferenceInviteFromWebSocket);
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 {
this.showRegisterFailure(408);
}
});
}
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
let callType = mediaConstraints.video ? 'video': 'audio';
utils.timestampedLog('Get local media for', callType, 'call, 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) => {
//console.log(device);
if ('video' in constraints && 'camera' in this.state.devices) {
if (constraints.video && 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) => {
utils.timestampedLog('Error: device enumeration failed:', error);
})
.then(() => {
return navigator.mediaDevices.getUserMedia(constraints)
})
.then((localStream) => {
clearTimeout(this.loadScreenTimer);
- utils.timestampedLog('Got local media done, next route is', nextRoute);
+ //utils.timestampedLog('Got local media done, next route is', nextRoute);
this.setState({status: null, loading: null, localMedia: localStream});
if (nextRoute !== null) {
- this.changeRoute(nextRoute);
+ this.changeRoute(nextRoute, 'media aquired');
}
})
.catch((error) => {
utils.timestampedLog('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);
utils.timestampedLog('Next route', nextRoute);
this.setState({status: null, loading: null, localMedia: localStream, generatedVideoTrack: true});
*/
if (nextRoute !== null) {
this.changeRoute(nextRoute);
}
})
.catch((error) => {
utils.timestampedLog('Access to local media failed:', error);
clearTimeout(this.loadScreenTimer);
this._notificationCenter.postSystemNotification("Can't access camera or microphone", {timeout: 10});
this.setState({
loading: null
});
- this.changeRoute('/ready');
+ this.changeRoute('/ready', 'media failed');
});
});
}
callKeepStartConference(targetUri, options={audio: true, video: true}) {
let callUUID = options.callUUID || uuid.v4();
+ options.callUUID = callUUID;
+ options.conference = true;
+
this.addHistoryEntry(targetUri, callUUID);
- this.setState({outgoingCallUUID: callUUID, outgoingMedia: options, reconnectingCall: false});
- utils.timestampedLog('CallKeep will start conference', callUUID, 'to', targetUri);
- this._callKeepManager.backToForeground();
- this.startCallWhenReady(targetUri, {audio: options.audio, video: options.video, conference: true, callUUID: callUUID});
+
+ this.setState({
+ outgoingCallUUID: callUUID,
+ outgoingMedia: options,
+ reconnectingCall: false
+ });
+
+ utils.timestampedLog('CallKeep will start outgoing conference', callUUID, 'to', targetUri);
+ this._callKeepManager.startCall(options.callUUID, targetUri, options.video);
+ this.startConference(targetUri, options);
}
- callKeepStartCall(targetUri, options) {
+ callKeepStartCall(targetUri, options={audio: true, video: false}) {
let callUUID = options.callUUID || uuid.v4();
- this.setState({outgoingCallUUID: callUUID, reconnectingCall: false});
- utils.timestampedLog('CallKeep will start call', callUUID, 'to', targetUri);
- this._callKeepManager.backToForeground();
- this.startCallWhenReady(targetUri, {audio: options.audio, video: options.video, callUUID: callUUID});
+ options.callUUID = callUUID;
+
+ this.setState({outgoingCallUUID: callUUID,
+ outgoingMedia: options,
+ reconnectingCall: false});
+
+ utils.timestampedLog('CallKeep will start outgoing call', callUUID, 'to', targetUri);
+ this._callKeepManager.startCall(options.callUUID, targetUri, options.video);
+ this.startCall(targetUri, options);
}
startCall(targetUri, options) {
utils.timestampedLog('startCall', targetUri);
this.setState({targetUri: targetUri});
//this.addHistoryEntry(targetUri);
this.getLocalMedia(Object.assign({audio: true, video: true}, options), '/call');
}
callKeepAcceptCall(callUUID) {
// called from user interaction with Old alert panel
// options used to be media to accept audio only but native panels do not have this feature
utils.timestampedLog('CallKeep will answer call', callUUID);
this._callKeepManager.acceptCall(callUUID);
}
callKeepRejectCall(callUUID) {
// called from user interaction with Old alert panel
utils.timestampedLog('CallKeep will reject call', callUUID);
this._callKeepManager.rejectCall(callUUID);
}
acceptCall() {
utils.timestampedLog('User accepted call');
//this.showCalls('acceptCall')
this.setFocusEvents(false);
if (this.state.currentCall) {
this.hangupCall(this.state.currentCall._callkeepUUID, 'accept_new_call');
this.setState({currentCall: null});
/*
if (this.state.localMedia != null) {
sylkrtc.utils.closeMediaStream(this.state.localMedia);
utils.timestampedLog('Sylkrtc close local media');
}
*/
}
this.setState({localMedia: null});
let hasVideo = (this.state.inboundCall && this.state.inboundCall.mediaTypes && this.state.inboundCall.mediaTypes.video) ? true : false;
this.getLocalMedia(Object.assign({audio: true, video: hasVideo}), '/call');
}
rejectCall(callUUID) {
// called by Call Keep when user rejects call
utils.timestampedLog('User rejected call', callUUID);
if (!this.state.currentCall) {
- this.changeRoute('/ready');
+ this.changeRoute('/ready', 'call rejected');
}
if (this.state.inboundCall && this.state.inboundCall._callkeepUUID === callUUID) {
this.state.inboundCall.terminate();
utils.timestampedLog('Sylkrtc reject call', callUUID);
}
this.forceUpdate();
}
timeoutCall(callUUID, uri) {
utils.timestampedLog('Timeout answering call', callUUID);
this.addHistoryEntry(uri, callUUID, direction='received');
this.forceUpdate();
}
hangupCall(callUUID, reason) {
utils.timestampedLog('Hangup call', callUUID, 'reason:', reason);
- utils.timestampedLog('Stop ringback tone');
InCallManager.stopRingback();
let call = this._callKeepManager._calls.get(callUUID);
let direction = null;
let targetUri = null;
if (call) {
let direction = call.direction;
targetUri = call.remoteIdentity.uri;
call.terminate();
} else {
if (this.state.localMedia != null) {
sylkrtc.utils.closeMediaStream(this.state.localMedia);
utils.timestampedLog('Sylkrtc close media');
}
}
if (this.busyToneInterval) {
clearInterval(this.busyToneInterval);
this.busyToneInterval = null;
}
if (reason !== 'connection_failed') {
this.setState({reconnectingCall: false});
if (reason === 'user_cancelled' || reason === 'timeout') {
- this.changeRoute('/ready');
+ this.changeRoute('/ready', 'timeout');
this.setState({
refreshHistory: !this.state.refreshHistory,
currentCall: null,
localMedia: null
});
} else {
- setTimeout(() => {
- this.setState({localMedia: null});
- this.changeRoute('/ready');
- }, 4000);
+ if (reason !== 'accept_new_call') {
+ setTimeout(() => {
+ this.setState({localMedia: null});
+ this.changeRoute('/ready');
+ }, 4000);
+ }
}
} else {
this.setState({reconnectingCall: true});
utils.timestampedLog('Call', callUUID, 'failed due to connection');
}
}
playBusyTone() {
- utils.timestampedLog('Play busy tone');
+ //utils.timestampedLog('Play busy tone');
InCallManager.stop({busytone: '_BUNDLE_'});
}
callKeepSendDtmf(digits) {
utils.timestampedLog('Send DTMF', digits);
if (this.state.currentCall) {
this._callKeepManager.sendDTMF(this.state.currentCall._callkeepUUID, digits);
}
}
callKeepToggleMute(mute) {
utils.timestampedLog('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() {
utils.timestampedLog('Speakerphone On');
this.setState({speakerPhoneEnabled: true});
InCallManager.setForceSpeakerphoneOn(true);
}
speakerphoneOff() {
utils.timestampedLog('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) {
// called by sylrtc.js when an outgoig call or conference starts
const localStreams = call.getLocalStreams();
let mediaType = 'audio';
if (localStreams.length > 0) {
const localStream = call.getLocalStreams()[0];
mediaType = localStream.getVideoTracks().length > 0 ? 'video' : 'audio';
}
utils.timestampedLog('Outgoing', mediaType, 'call', call.id, 'started to', call.remoteIdentity.uri);
this._callKeepManager.handleOutgoingCall(call);
- utils.timestampedLog('Start InCall manager:', mediaType);
+ //utils.timestampedLog('Start InCall manager:', mediaType);
InCallManager.start({media: mediaType});
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();
utils.timestampedLog('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'];
let callUUID = notificationContent['session-id'];
utils.timestampedLog('Handle iOS', event, 'push notification for', callUUID);
logger.debug(notificationContent);
if (notificationContent['event'] === 'incoming_session') {
utils.timestampedLog('Incoming call for push mobile notification for call', callUUID);
this.incomingCallFromPush(callUUID, notificationContent['from_uri']);
if (VoipPushNotification.wakeupByPush) {
utils.timestampedLog('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'];
utils.timestampedLog('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') {
this.cancelIncomingCall(callUUID);
VoipPushNotification.presentLocalNotification({
alertBody:'Call cancelled'
});
}
if (VoipPushNotification.wakeupByPush) {
utils.timestampedLog('We wake up by push notification');
VoipPushNotification.wakeupByPush = false;
}
}
async incomingConference(callUUID, to_uri, from_uri) {
utils.timestampedLog('Handle incoming conference', callUUID, 'when ready');
var n = 0;
let wait_interval = 15;
while (n < wait_interval) {
if (!this.state.connection || this.state.connection.state !== 'ready' || this.state.account === null) {
utils.timestampedLog('Waiting for connection...');
this._notificationCenter.postSystemNotification('Waiting for connection...', {timeout: 1});
await this._sleep(1000);
} else {
utils.timestampedLog('Web socket is ready');
utils.timestampedLog('Using account', this.state.account.id);
// answer here
this._callKeepManager.handleConference(callUUID, to_uri, from_uri);
this.setFocusEvents(true);
return;
}
if (n === wait_interval - 1) {
utils.timestampedLog('Terminating call', callUUID, 'that did not start yet');
this._callKeepManager.endCall(callUUID, 6);
}
n++;
}
}
startConference(targetUri, options={audio: true, video: true}) {
utils.timestampedLog('New outgoing conference to room', targetUri);
this.setState({targetUri: targetUri, isConference: true});
this.getLocalMedia({audio: options.audio, video: options.video}, '/conference');
}
escalateToConference(participants) {
const uri = `${utils.generateSillyName()}@${config.defaultConferenceDomain}`;
utils.timestampedLog('Move current call to conference', uri, 'with participants', participants);
if (this.state.currentCall) {
this.hangupCall(this.state.currentCall._callkeepUUID, 'escalate_to_conference');
this.setState({currentCall: null});
}
if (this.state.inboundCall) {
this.hangupCall(this.state.inboundCall._callkeepUUID, 'escalate_to_conference');
this.setState({inboundCall: null});
}
this.setState({localMedia: null});
this.participantsToInvite = participants;
this.callKeepStartConference(uri);
}
conferenceInviteFromWebSocket(data) {
// comes from web socket
utils.timestampedLog('Conference invite from websocket', data.id, 'from', data.originator, 'for room', data.room);
//this._notificationCenter.postSystemNotification('Conference invite', {body: `From ${data.originator.displayName || data.originator.uri} for room ${data.room}`, timeout: 15, silent: false});
if (Platform.OS === 'android') {
this.incomingConference(data.id, data.room, data.originator.uri);
}
}
incomingCallFromPush(callUUID, from) {
- utils.timestampedLog('Handle incoming push call', callUUID, 'from', from);
+ utils.timestampedLog('Push: handle incoming call', callUUID, 'from', from);
if (this.state.account && from === this.state.account.id && this.state.currentCall && this.state.currentCall.remoteIdentity.uri === from) {
utils.timestampedLog('Reject call to myself', callUUID);
this._callKeepManager.rejectCall(callUUID);
} else {
this._callKeepManager.incomingCallFromPush(callUUID, from);
}
}
incomingCallFromUrl(url) {
try {
var url_parts = url.split("/");
const direction = url_parts[2];
const event = url_parts[3];
const callUUID = url_parts[4];
const uri = url_parts[5];
const to = url_parts[6];
utils.timestampedLog('Parsed URL:', direction, event, 'from', uri, 'to', to);
if (direction === 'outgoing' && event === 'conference' && uri && to) {
this.incomingConference(callUUID, uri, to);
} else if (direction === 'incoming' && event === 'call' && uri) {
//this.setState({showIncomingModal: true});
this.incomingCallFromPush(callUUID, uri);
} else if (direction === 'outgoing' && event === 'call' && uri) {
// from native dialer
this.callKeepStartCall(uri, {audio: true, video: false, callUUID: callUUID});
} else {
utils.timestampedLog('Unclear URL structure');
}
} catch (err) {
utils.timestampedLog('Error parsing url', url, ":", err);
}
}
incomingCallFromWebSocket(call, mediaTypes) {
utils.timestampedLog('New incoming call from WebSocket', call.id);
// this is called by the websocket invite
// 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 (call.remoteIdentity.uri === this.state.account.id && this.state.currentCall && this.state.currentCall.remoteIdentity.uri) {
utils.timestampedLog('Reject call to myself', call.id);
this._callKeepManager.rejectCall(call.id);
call.terminate();
return;
}
if (this.state.blockedUris && this.state.blockedUris.indexOf(call.remoteIdentity.uri) > -1) {
utils.timestampedLog('Reject call from blocked URI', call.remoteIdentity.uri);
this._callKeepManager.rejectCall(call.id);
call.terminate();
let from = call.remoteIdentity.displayName || call.remoteIdentity.uri;
this._notificationCenter.postSystemNotification('Call rejected', {body: `from ${from}`, timeout: 5000, silent: true});
return;
}
let mediaType = mediaTypes.video ? 'video' : 'audio';
call.mediaTypes = mediaTypes;
utils.timestampedLog('New', mediaType, 'incoming call from', call.remoteIdentity['_displayName'], call.remoteIdentity['_uri']);
call.on('stateChanged', this.callStateChanged);
this.setState({inboundCall: call});
- utils.timestampedLog('Start InCall manager:', mediaType);
InCallManager.start({media: mediaType});
this._callKeepManager.incomingCallFromWebSocket(call);
this.setFocusEvents(true);
}
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) {
utils.timestampedLog('Missed call from ' + data.originator);
if (!this.state.currentCall) {
//utils.timestampedLog('Update snackbar');
let from = data.originator.display_name || data.originator.uri;
this._notificationCenter.postSystemNotification('Missed call', {body: `from ${from}`, timeout: 180, silent: false});
}
this.forceUpdate();
}
startPreview() {
this.getLocalMedia({audio: true, video: true}, '/preview');
}
updateHistoryEntry(callUUID) {
let newHistory = this.state.localHistory;
var historyItem = this.findObjectByKey(newHistory, 'sessionId', callUUID);
if (historyItem) {
let current_datetime = new Date();
let stopTime = current_datetime.getFullYear() + "-" + utils.appendLeadingZeroes(current_datetime.getMonth() + 1) + "-" + utils.appendLeadingZeroes(current_datetime.getDate()) + " " + utils.appendLeadingZeroes(current_datetime.getHours()) + ":" + utils.appendLeadingZeroes(current_datetime.getMinutes()) + ":" + utils.appendLeadingZeroes(current_datetime.getSeconds());
historyItem.stopTime = stopTime;
var diff = current_datetime.getTime() - historyItem.startTimeObject.getTime();
historyItem.duration = parseInt(diff/1000);
delete historyItem['startTimeObject'];
if (this._historyConferenceParticipants.has(callUUID)) {
historyItem.participants = this._historyConferenceParticipants.get(callUUID);
} else {
historyItem.participants = [];
}
//console.log('Save history', historyItem);
this.setState({localHistory: newHistory});
storage.set('history', newHistory);
}
}
setFavoriteUri(uri) {
let favoriteUris = this.state.favoriteUris;
let idx = favoriteUris.indexOf(uri);
let ret;
console.log('idx', idx);
if (idx === -1) {
favoriteUris.push(uri);
ret = true;
} else {
let removed = favoriteUris.splice(idx, 1);
ret = false;
}
storage.set('favoriteUris', favoriteUris);
this.setState({favoriteUris: favoriteUris, refreshHistory: !this.state.refreshHistory});
return ret;
}
setBlockedUri(uri) {
let blockedUris = this.state.blockedUris;
console.log('Old blocked Uris:', blockedUris);
let ret;
let idx = blockedUris.indexOf(uri);
console.log('idx', idx);
if (idx === -1) {
blockedUris.push(uri);
ret = true;
} else {
let removed = blockedUris.splice(idx, 1);
console.log('Removed', removed);
ret = false;
}
console.log('New blocked Uris:', blockedUris);
storage.set('blockedUris', blockedUris);
this.setState({blockedUris: blockedUris, refreshHistory: !this.state.refreshHistory});
return ret;
}
saveParticipant(callUUID, room, uri) {
console.log('Save participant', uri, 'for conference', room);
if (this._historyConferenceParticipants.has(callUUID)) {
let old_participants = this._historyConferenceParticipants.get(callUUID);
if (old_participants.indexOf(uri) === -1) {
old_participants.push(uri);
}
} else {
let new_participants = [uri];
this._historyConferenceParticipants.set(callUUID, new_participants);
}
if (!this.myParticipants) {
this.myParticipants = new Object();
}
if (this.myParticipants.hasOwnProperty(room)) {
let old_uris = this.myParticipants[room];
if (old_uris.indexOf(uri) === -1 && uri !== this.state.account.id && (uri + '@' + config.defaultDomain) !== this.state.account.id) {
this.myParticipants[room].push(uri);
}
} else {
let new_uris = [];
if (uri !== this.state.account.id && (uri + '@' + config.defaultDomain) !== this.state.account.id) {
new_uris.push(uri);
}
if (new_uris) {
this.myParticipants[room] = new_uris;
}
}
storage.set('myParticipants', this.myParticipants);
}
saveInvitedParties(callUUID, room, uris) {
if (!this.myInvitedParties) {
this.myInvitedParties = new Object();
}
if (this.myInvitedParties.hasOwnProperty(room)) {
let old_uris = this.myInvitedParties[room];
uris.forEach((uri) => {
if (old_uris.indexOf(uri) === -1 && uri !== this.state.account.id && (uri + '@' + config.defaultDomain) !== this.state.account.id) {
this.myInvitedParties[room].push(uri);
}
});
} else {
let new_uris = [];
uris.forEach((uri) => {
if (uri !== this.state.account.id && (uri + '@' + config.defaultDomain) !== this.state.account.id) {
new_uris.push(uri);
}
});
if (new_uris) {
this.myInvitedParties[room] = new_uris;
}
}
storage.set('myInvitedParties', this.myInvitedParties);
}
deleteHistoryEntry(uri) {
let history = this.state.localHistory;
for (var i = history.length - 1; i >= 0; --i) {
if (history[i].remoteParty === uri) {
history.splice(i,1);
}
}
storage.set('history', history);
this.setState({localHistory: history,
refreshHistory: !this.state.refreshHistory});
}
addHistoryEntry(uri, callUUID, direction='placed') {
if (this.state.mode === MODE_NORMAL || this.state.mode === MODE_PRIVATE) {
let current_datetime = new Date();
let startTime = current_datetime.getFullYear() + "-" + utils.appendLeadingZeroes(current_datetime.getMonth() + 1) + "-" + utils.appendLeadingZeroes(current_datetime.getDate()) + " " + utils.appendLeadingZeroes(current_datetime.getHours()) + ":" + utils.appendLeadingZeroes(current_datetime.getMinutes()) + ":" + utils.appendLeadingZeroes(current_datetime.getSeconds());
let item = {
remoteParty: uri,
direction: direction,
type: 'history',
conference: true,
media: ['audio', 'video'],
displayName: 'Conference ' + uri.split('@')[0],
sessionId: callUUID,
startTime: startTime,
stopTime: startTime,
startTimeObject: current_datetime,
duration: 0,
tags: ['history', 'local']
};
const historyItem = Object.assign({}, item);
console.log('Added history item', historyItem);
let newHistory = this.state.localHistory;
newHistory.push(historyItem);
this.setState({localHistory: newHistory});
storage.set('history', newHistory);
}
}
- // 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');
- // this.changeRoute('/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)) {
- // this.changeRoute('/logout');
- // this.forceUpdate();
- // }
- // }
- // this.prevPath = nextPath;
- // }
-
render() {
//utils.timestampedLog('Render main app');
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 (
);
}
saveHistoryForLater(history) {
//console.log('Cache history for later', history.length)
this.cachedHistory = history;
storage.set('cachedHistory', history);
}
ready() {
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() {
let _previousParticipants = new Set();
if (this.myParticipants) {
let room = this.state.targetUri.split('@')[0];
if (this.myParticipants.hasOwnProperty(room)) {
let uris = this.myParticipants[room];
if (uris) {
uris.forEach((uri) => {
if (uri.search(config.defaultDomain) > -1) {
let user = uri.split('@')[0];
_previousParticipants.add(user);
} else {
_previousParticipants.add(uri);
}
});
}
}
}
if (this.myInvitedParties) {
let room = this.state.targetUri.split('@')[0];
if (this.myInvitedParties.hasOwnProperty(room)) {
let uris = this.myInvitedParties[room];
if (uris) {
uris.forEach((uri) => {
if (uri.search(config.defaultDomain) > -1) {
let user = uri.split('@')[0];
_previousParticipants.add(user);
} else {
_previousParticipants.add(uri);
}
});
}
}
}
let previousParticipants = Array.from(_previousParticipants);
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() {
this._callKeepManager.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.serverHistory = [];
this.setState({account: null,
registrationState: null,
registrationKeepalive: false,
status: null,
history: [],
localHistory: [],
cachedHistory: []
});
- this.changeRoute('/login');
+ this.changeRoute('/login', 'logout');
return null;
}
main() {
return null;
}
}
export default Sylk;
diff --git a/app/components/ConferenceModal.js b/app/components/ConferenceModal.js
index 9e28426..a65838e 100644
--- a/app/components/ConferenceModal.js
+++ b/app/components/ConferenceModal.js
@@ -1,98 +1,98 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { View } from 'react-native';
import { Portal, Dialog, Button, Text, TextInput, Surface, Chip } 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/_ConferenceModal.scss';
class ConferenceModal extends Component {
constructor(props) {
super(props);
this.state = {
conferenceTargetUri: props.targetUri.split('@')[0],
managed: false
};
this.handleConferenceTargetChange = this.handleConferenceTargetChange.bind(this);
this.onHide = this.onHide.bind(this);
this.joinAudio = this.joinAudio.bind(this);
this.joinVideo = this.joinVideo.bind(this);
}
//getDerivedStateFromProps(nextProps, state) {
UNSAFE_componentWillReceiveProps(nextProps) {
this.setState({conferenceTargetUri: nextProps.targetUri.split('@')[0]});
}
handleConferenceTargetChange(value) {
this.setState({conferenceTargetUri: value});
}
joinAudio(event) {
event.preventDefault();
const uri = `${this.state.conferenceTargetUri.replace(/[\s()-]/g, '')}@${config.defaultConferenceDomain}`;
- this.props.handleConferenceCall(uri.toLowerCase(), {audio: true, video: false});
+ this.props.handleConferenceCall(uri.toLowerCase(), {audio: true, video: false, conference: true});
}
joinVideo(event) {
event.preventDefault();
const uri = `${this.state.conferenceTargetUri.replace(/[\s()-]/g, '')}@${config.defaultConferenceDomain}`;
- this.props.handleConferenceCall(uri.toLowerCase(), {audio: true, video: true});
+ this.props.handleConferenceCall(uri.toLowerCase(), {audio: true, video: true, conference: true});
}
onHide() {
this.props.handleConferenceCall(null);
}
render() {
const validUri = this.state.conferenceTargetUri.length > 0 && this.state.conferenceTargetUri.indexOf('@') === -1;
return (
Join Conference
);
}
}
ConferenceModal.propTypes = {
show: PropTypes.bool.isRequired,
handleConferenceCall: PropTypes.func.isRequired,
targetUri: PropTypes.string.isRequired
};
export default ConferenceModal;
diff --git a/app/components/HistoryTileBox.js b/app/components/HistoryTileBox.js
index f3fc8e6..dad7e5b 100644
--- a/app/components/HistoryTileBox.js
+++ b/app/components/HistoryTileBox.js
@@ -1,482 +1,480 @@
import React, { Component} from 'react';
import autoBind from 'auto-bind';
import PropTypes from 'prop-types';
import { SafeAreaView, ScrollView, View, FlatList, Text } from 'react-native';
import HistoryCard from './HistoryCard';
import utils from '../utils';
import DigestAuthRequest from 'digest-auth-request';
import uuid from 'react-native-uuid';
import styles from '../assets/styles/blink/_HistoryTileBox.scss';
class HistoryTileBox extends Component {
constructor(props) {
super(props);
autoBind(this);
this.state = {
serverHistory: this.props.serverHistory,
localHistory: this.props.localHistory,
accountId: this.props.account ? this.props.account.id : '',
password: this.props.password,
targetUri: this.props.targetUri,
favoriteUris: this.props.favoriteUris,
blockedUris: this.props.blockedUris
}
const echoTest = {
remoteParty: '4444@sylk.link',
displayName: 'Echo test',
type: 'contact',
label: 'Call to test microphone',
id: uuid.v4(),
tags: ['test']
};
this.echoTest = Object.assign({}, echoTest);
const videoTest = {
remoteParty: '3333@sylk.link',
displayName: 'Video test',
type: 'contact',
label: 'Call to test video',
id: uuid.v4(),
tags: ['test']
};
this.videoTest = Object.assign({}, videoTest);
}
componentDidMount() {
this.getServerHistory();
}
setTargetUri(uri, contact) {
//console.log('Set target uri uri in history list', uri);
this.props.setTargetUri(uri, contact);
}
deleteHistoryEntry(uri) {
this.props.deleteHistoryEntry(uri);
this.props.setTargetUri(uri);
}
setFavoriteUri(uri) {
return this.props.setFavoriteUri(uri);
this.props.setTargetUri();
}
setBlockedUri(uri) {
return this.props.setBlockedUri(uri);
}
renderItem(item) {
return(
);
}
findObjectByKey(array, key, value) {
for (var i = 0; i < array.length; i++) {
if (array[i][key] === value) {
return array[i];
}
}
return null;
}
//getDerivedStateFromProps(nextProps, state) {
UNSAFE_componentWillReceiveProps(props) {
const { refreshHistory } = this.props;
if (props.refreshHistory !== refreshHistory) {
this.getServerHistory();
}
}
getLocalHistory() {
let history = this.state.localHistory;
history.sort((a, b) => (a.startTime < b.startTime) ? 1 : -1)
let known = [];
history = history.filter((elem) => {
if (known.indexOf(elem.remoteParty) <= -1) {
elem.type = 'history';
if (!elem.tags) {
elem.tags = [];
}
if (elem.tags.indexOf('history') === -1) {
elem.tags.push('history');
}
if (elem.tags.indexOf('local') === -1) {
elem.tags.push('local');
}
known.push(elem.remoteParty);
return elem;
}
});
return history;
}
getFavoriteContacts() {
let favoriteContacts = [];
let displayName;
let label;
let conference;
let contacts= this.props.contacts
contacts = contacts.concat(this.videoTest);
contacts = contacts.concat(this.echoTest);
this.state.favoriteUris.forEach((uri) => {
const contact_obj = this.findObjectByKey(contacts, 'remoteParty', uri);
displayName = contact_obj ? contact_obj.displayName : uri;
label = contact_obj ? contact_obj.label: null;
conference = false;
let tags = ['favorite'];
const history_obj = this.findObjectByKey(this.state.serverHistory, 'remoteParty', uri);
const startTime = history_obj? history_obj.startTime : null;
const stopTime = history_obj? history_obj.stopTime : null;
const duration = history_obj? history_obj.duration : 0;
const media = history_obj? history_obj.media : 'audio';
tags.push('history');
if (uri.indexOf('@videoconference.') > -1) {
displayName = 'Conference ' + uri.split('@')[0];
uri = uri.split('@')[0] + '@' + this.props.config.defaultConferenceDomain;
conference = true;
media = ['audio', 'video', 'chat'];
}
const item = {
remoteParty: uri,
displayName: displayName,
conference: conference,
media: media,
type: 'contact',
startTime: startTime,
startTime: startTime,
duration: duration,
label: label,
id: uuid.v4(),
tags: tags
};
favoriteContacts.push(item);
});
return favoriteContacts;
}
getBlockedContacts() {
let blockedContacts = [];
let contact_obj;
let displayName;
let label;
let contacts= this.props.contacts
contacts = contacts.concat(this.videoTest);
contacts = contacts.concat(this.echoTest);
this.state.blockedUris.forEach((uri) => {
contact_obj = this.findObjectByKey(contacts, 'remoteParty', uri);
displayName = contact_obj ? contact_obj.displayName : uri;
label = contact_obj ? contact_obj.label: null;
const item = {
remoteParty: uri,
displayName: displayName,
conference: false,
type: 'contact',
label: label,
id: uuid.v4(),
tags: ['blocked']
};
blockedContacts.push(item);
});
return blockedContacts;
}
getServerHistory() {
- utils.timestampedLog('Requesting call history from server');
+ //utils.timestampedLog('Requesting call history from server');
let history = [];
let getServerCallHistory = new DigestAuthRequest(
'GET',
`${this.props.config.serverCallHistoryUrl}?action=get_history&realm=${this.state.accountId.split('@')[1]}`,
this.state.accountId.split('@')[0],
this.state.password
);
// Disable logging
getServerCallHistory.loggingOn = false;
getServerCallHistory.request((data) => {
if (data.success !== undefined && data.success === false) {
console.log('Error getting call history from server', data.error_message);
return;
}
if (data.placed) {
data.placed.map(elem => {elem.direction = 'placed'; return elem});
history = history.concat(data.placed);
}
if (data.received) {
data.received.map(elem => {elem.direction = 'received'; return elem});
history = history.concat(data.received);
}
if (history) {
const known = [];
history = history.filter((elem) => {
elem.conference = false;
if (!elem.tags) {
elem.tags = [];
}
if (elem.remoteParty.indexOf('@conference.sip2sip.info') > -1) {
return null;
}
let username = elem.remoteParty.split('@')[0];
let isPhoneNumber = username.match(/^(\+|0)(\d+)$/);
let contact_obj;
if (this.props.contacts) {
if (isPhoneNumber) {
contact_obj = this.findObjectByKey(this.props.contacts, 'remoteParty', username);
} else {
contact_obj = this.findObjectByKey(this.props.contacts, 'remoteParty', elem.remoteParty);
}
}
if (contact_obj) {
elem.displayName = contact_obj.displayName;
elem.photo = contact_obj.photo;
if (isPhoneNumber) {
elem.remoteParty = username;
}
// TODO update icon here
} else {
elem.photo = null;
}
if (elem.remoteParty.indexOf('@videoconference.') > -1) {
elem.displayName = 'Conference ' + elem.remoteParty.split('@')[0];
elem.remoteParty = elem.remoteParty.split('@')[0] + '@' + this.props.config.defaultConferenceDomain;
elem.conference = true;
elem.media = ['audio', 'video', 'chat'];
}
if (elem.remoteParty === this.state.accountId) {
elem.displayName = this.props.myDisplayName || 'Myself';
}
elem.type = 'history';
elem.id = uuid.v4();
if (elem.tags.indexOf('history') === -1) {
elem.tags.push('history');
}
elem.label = elem.direction;
if (!elem.displayName) {
elem.displayName = elem.remoteParty;
}
if (!elem.media || !Array.isArray(elem.media)) {
elem.media = ['audio'];
}
if (elem.remoteParty.indexOf('3333@') > -1) {
// see Call.js as well if we change this
elem.displayName = 'Video Test';
}
if (elem.remoteParty.indexOf('4444@') > -1) {
// see Call.js as well if we change this
elem.displayName = 'Echo Test';
}
if (known.indexOf(elem.remoteParty) <= -1) {
known.push(elem.remoteParty);
return elem;
}
});
this.props.cacheHistory(history);
this.setState({serverHistory: history});
}
}, (errorCode) => {
console.log('Error getting call history from server', errorCode);
});
}
render() {
- console.log('Render history');
-
if (!this.state.accountId) {
return null;
}
// TODO: render blocked and favorites also when there is no history
//console.log('Favorite URIs', this.state.favoriteUris);
//console.log('blockedUris URIs', this.state.blockedUris);
let history = [];
let searchExtraItems = [];
let items = [];
if (this.props.filter === 'favorite') {
let favoriteContacts = this.getFavoriteContacts();
items = favoriteContacts.filter(historyItem => historyItem.remoteParty.startsWith(this.props.targetUri));
} else if (this.props.filter === 'blocked') {
let blockedContacts = this.getBlockedContacts();
items = blockedContacts.filter(historyItem => historyItem.remoteParty.startsWith(this.props.targetUri));
} else {
history = this.getLocalHistory();
history = history.concat(this.state.serverHistory);
searchExtraItems = this.props.contacts;
searchExtraItems.concat(this.videoTest);
searchExtraItems.concat(this.echoTest);
items = history.filter(historyItem => historyItem.remoteParty.startsWith(this.props.targetUri));
/*
if (!this.props.targetUri && !this.props.filter) {
if (!this.findObjectByKey(items, 'remoteParty', this.echoTest.remoteParty)) {
items.push(this.echoTest);
}
if (!this.findObjectByKey(items, 'remoteParty', this.videoTest.remoteParty)) {
items.push(this.videoTest);
}
}
*/
let matchedContacts = [];
if (this.props.targetUri && this.props.targetUri.length > 2 && !this.props.selectedContact) {
matchedContacts = searchExtraItems.filter(contact => (contact.remoteParty.toLowerCase().search(this.props.targetUri) > -1 || contact.displayName.toLowerCase().search(this.props.targetUri) > -1));
} else if (this.props.selectedContact && this.props.selectedContact.type === 'contact') {
matchedContacts.push(this.props.selectedContact);
}
items = items.concat(matchedContacts);
}
items.sort((a, b) => (a.startTime < b.startTime) ? 1 : -1)
const known = [];
items = items.filter((elem) => {
if (known.indexOf(elem.remoteParty) <= -1) {
known.push(elem.remoteParty);
return elem;
}
});
items.forEach((item) => {
item.showActions = false;
if (!item.tags) {
item.tags = [];
}
if (this.state.favoriteUris.indexOf(item.remoteParty) > -1 && item.tags.indexOf('favorite') === -1) {
item.tags.push('favorite');
}
if (this.state.blockedUris.indexOf(item.remoteParty) > -1 && item.tags.indexOf('blocked') === -1) {
item.tags.push('blocked');
}
let idx = item.tags.indexOf('blocked');
if (this.state.blockedUris.indexOf(item.remoteParty) === -1 && idx > -1) {
item.tags.splice(idx, 1);
}
idx = item.tags.indexOf('favorite');
if (this.state.favoriteUris.indexOf(item.remoteParty) === -1 && idx > -1) {
item.tags.splice(idx, 1);
}
});
let filteredItems = [];
items.forEach((item) => {
if (this.props.filter && item.tags.indexOf(this.props.filter) > -1) {
filteredItems.push(item);
} else if (this.state.blockedUris.indexOf(item.remoteParty) === -1) {
filteredItems.push(item);
}
});
items = filteredItems;
if (items.length === 1) {
items[0].showActions = true;
}
let columns = 1;
if (this.props.isTablet) {
columns = this.props.orientation === 'landscape' ? 3 : 2;
} else {
columns = this.props.orientation === 'landscape' ? 2 : 1;
}
return (
item.id}
key={this.props.orientation}
/>
);
}
}
HistoryTileBox.propTypes = {
account : PropTypes.object.isRequired,
password : PropTypes.string.isRequired,
config : PropTypes.object.isRequired,
targetUri : PropTypes.string,
selectedContact : PropTypes.object,
contacts : PropTypes.array,
orientation : PropTypes.string,
setTargetUri : PropTypes.func,
isTablet : PropTypes.bool,
refreshHistory : PropTypes.bool,
cacheHistory : PropTypes.func,
serverHistory : PropTypes.array,
localHistory : PropTypes.array,
myDisplayName : PropTypes.string,
myPhoneNumber : PropTypes.string,
setFavoriteUri : PropTypes.func,
setBlockedUri : PropTypes.func,
deleteHistoryEntry : PropTypes.func,
favoriteUris : PropTypes.array,
blockedUris : PropTypes.array,
filter : PropTypes.string
};
export default HistoryTileBox;
diff --git a/app/components/ReadyBox.js b/app/components/ReadyBox.js
index a96e69b..2f2719c 100644
--- a/app/components/ReadyBox.js
+++ b/app/components/ReadyBox.js
@@ -1,279 +1,265 @@
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, Button } from 'react-native-paper';
import ConferenceModal from './ConferenceModal';
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,
contacts: this.props.contacts,
selectedContact: null,
showConferenceModal: false,
sticky: false,
favoriteUris: this.props.favoriteUris,
blockedUris: this.props.blockedUris,
historyFilter: null
};
}
getTargetUri() {
const defaultDomain = this.props.account.id.substring(this.props.account.id.indexOf('@') + 1);
return utils.normalizeUri(this.state.targetUri, defaultDomain);
}
async componentDidMount() {
//console.log('Ready now');
if (this.state.targetUri) {
console.log('We must call', this.state.targetUri);
}
}
filterHistory(filter) {
//console.log('set historyFilter', filter);
this.setState({'historyFilter': filter});
this.handleTargetChange('');
}
handleTargetChange(value, contact) {
let new_value = value;
if (contact) {
if (this.state.targetUri === contact.uri) {
new_value = '';
}
}
if (this.state.targetUri === value) {
new_value = '';
}
if (new_value === '') {
contact = null;
}
this.setState({targetUri: new_value, selectedContact: contact});
}
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});
}
+ event.preventDefault();
}
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});
}
+ event.preventDefault();
}
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});
}
+ event.preventDefault();
}
- handleConferenceCall(targetUri, options={audio: true, video: true}) {
+ handleConferenceCall(targetUri, options={audio: true, video: true, conference: true}) {
if (targetUri) {
- if (!options.video) {
- console.log('ReadyBox: Handle audio only conference call to',targetUri);
- } else {
- console.log('ReadyBox: Handle video conference call to',targetUri);
- }
this.props.startConference(targetUri, options);
}
-
this.setState({showConferenceModal: false});
}
render() {
//utils.timestampedLog('Render ready');
const defaultDomain = `${config.defaultDomain}`;
let uriClass = styles.portraitUriInputBox;
let uriGroupClass = styles.portraitUriButtonGroup;
let titleClass = styles.portraitTitle;
const buttonClass = (Platform.OS === 'ios') ? styles.iosButton : styles.androidButton;
if (this.props.isTablet) {
titleClass = this.props.orientation === 'landscape' ? styles.landscapeTabletTitle : styles.portraitTabletTitle;
} else {
titleClass = this.props.orientation === 'landscape' ? styles.landscapeTitle : styles.portraitTitle;
}
if (this.props.isTablet) {
uriGroupClass = this.props.orientation === 'landscape' ? styles.landscapeTabletUriButtonGroup : styles.portraitTabletUriButtonGroup;
} else {
uriGroupClass = this.props.orientation === 'landscape' ? styles.landscapeUriButtonGroup : styles.portraitUriButtonGroup;
}
if (this.props.isTablet) {
uriClass = this.props.orientation === 'landscape' ? styles.landscapeTabletUriInputBox : styles.portraitTabletUriInputBox;
} else {
uriClass = this.props.orientation === 'landscape' ? styles.landscapeUriInputBox : styles.portraitUriInputBox;
}
const historyClass = this.props.orientation === 'landscape' ? styles.landscapeHistory : styles.portraitHistory;
return (
{((this.state.favoriteUris.length > 0 || this.state.blockedUris.length > 0 ) ||
(this.state.favoriteUris.length === 0 && this.state.historyFilter === 'favorite') ||
(this.state.blockedUris.length === 0 && this.state.historyFilter === 'blocked')
) ?
{(this.state.favoriteUris.length > 0 && this.state.historyFilter !== 'favorite')? : null}
{(this.state.blockedUris.length > 0 && this.state.historyFilter !== 'blocked')? : null}
: null}
{this.props.isTablet && 0?
: null}
);
}
}
ReadyBox.propTypes = {
account : PropTypes.object.isRequired,
password : PropTypes.string.isRequired,
config : PropTypes.object.isRequired,
startCall : PropTypes.func.isRequired,
startConference : PropTypes.func.isRequired,
missedTargetUri : PropTypes.string,
contacts : PropTypes.array,
orientation : PropTypes.string,
isTablet : PropTypes.bool,
refreshHistory : PropTypes.bool,
cacheHistory : PropTypes.func,
serverHistory : PropTypes.array,
localHistory : PropTypes.array,
myDisplayName : PropTypes.string,
myPhoneNumber : PropTypes.string,
deleteHistoryEntry: PropTypes.func,
setFavoriteUri : PropTypes.func,
setBlockedUri : PropTypes.func,
favoriteUris : PropTypes.array,
blockedUris : PropTypes.array
};
export default ReadyBox;
diff --git a/bgMessaging.js b/bgMessaging.js
index 314275f..401dce0 100644
--- a/bgMessaging.js
+++ b/bgMessaging.js
@@ -1,31 +1,31 @@
//@flow
import { NativeModules, AppState } from 'react-native';
const { SylkNative } = NativeModules;
export default async (remoteMessage) => {
console.log('Push notification received', remoteMessage.data.event);
if (AppState.currentState == "background" &&
(remoteMessage.data.event === 'incoming_session' || remoteMessage.data.event === 'incoming_conference_request')
) {
let event = remoteMessage.data.event;
let callUUID = remoteMessage.data['session-id'];
let to = remoteMessage.data['to_uri']
let from = remoteMessage.data['from_uri']
let url;
if (event === 'incoming_conference_request') {
url = 'sylk://outgoing/conference/' + callUUID + '/' + from + '/' + to;
} else if (event === 'incoming_session') {
url = 'sylk://incoming/call/' + callUUID + '/' + from + '/' + to;
}
if (url) {
- console.log('Wake up from push with URL', url);
+ //console.log('Wake up from push with URL', url);
SylkNative.launchMainActivity(url);
}
}
return Promise.resolve();
}