Minor fixes

Author: diegolmello

app/definitions/rest/v1/push.ts

@@ -6,7 +6,7 @@ type TPushInfo = {
 
 export type PushEndpoints = {
 	'push.token': {
-		POST: (params: { value: string; type: string; appName: string; voipToken?: string }) => {
+		POST: (params: { id: string; value: string; type: string; appName: string; voipToken?: string }) => {
 			result: {
 				id: string;
 				token: string;

app/lib/services/restApi.ts

@@ -1017,6 +1017,10 @@ export const registerPushToken = async (): Promise<void> => {
 	// Always returns an empty string on Android
 	const voipToken = NativeVoipModule.getLastVoipToken();
 
+	if (!token) {
+		return;
+	}
+
 	if (token === lastToken && voipToken === lastVoipToken) {
 		return;
 	}
@@ -1027,18 +1031,17 @@ export const registerPushToken = async (): Promise<void> => {
 	}
 
 	let data: TRegisterPushTokenData = {
-		id: '',
+		id: await getUniqueId(),
 		value: '',
 		type: '',
-		appName: ''
+		appName: getBundleId
 	};
 	if (token) {
 		const type = isIOS ? 'apn' : 'gcm';
 		data = {
-			id: await getUniqueId(),
+			...data,
 			value: token,
-			type,
-			appName: getBundleId
+			type
 		};
 	}
 	if (voipToken) {

app/lib/services/voip/MediaSessionInstance.ts

@@ -8,6 +8,7 @@ import {
 } from '@rocket.chat/media-signaling';
 import RNCallKeep from 'react-native-callkeep';
 import { registerGlobals } from 'react-native-webrtc';
+import { getUniqueId } from 'react-native-device-info';
 
 import { mediaSessionStore } from './MediaSessionStore';
 import { useCallStore } from './useCallStore';
@@ -61,6 +62,11 @@ class MediaSessionInstance {
 			}
 			const signal = ddpMessage.fields.args[0];
 			this.instance.processSignal(signal);
+
+			// If the call was accepted from another device, end the call
+			if (signal.type === 'notification' && signal.notification === 'accepted' && signal.signedContractId !== getUniqueId()) {
+				// TODO: pop from call view, end callkeep and remove incoming call notification
+			}
 		});
 
 		this.instance?.on('newCall', ({ call }: { call: IClientMediaCall }) => {

app/lib/services/voip/useCallStore.ts

@@ -172,6 +172,7 @@ export const useCallStore = create<CallStore>((set, get) => ({
 		set({ dialpadValue: newValue });
 	},
 
+	// TODO: do it here or in MediaSessionInstance?
 	endCall: () => {
 		const { call, callId } = get();
 

ios/Libraries/AppDelegate+Voip.swift

@@ -21,15 +21,19 @@ extension AppDelegate: PKPushRegistryDelegate {
     let payloadDict = payload.dictionaryPayload
 
     guard let voipPayload = VoipPayload.fromDictionary(payloadDict) else {
-      print("Failed to parse incoming VoIP payload")
+      #if DEBUG
+      print("[\(TAG)] Failed to parse incoming VoIP payload")
+      #endif
       completion()
       return
     }
 
     let callId = voipPayload.callId
     let caller = voipPayload.caller
     guard !voipPayload.isExpired() else {
-      print("Skipping expired or invalid VoIP payload for callId: \(callId)")
+      #if DEBUG
+      print("[\(TAG)] Skipping expired or invalid VoIP payload for callId: \(callId)")
+      #endif
       completion()
       return
     }

ios/Libraries/VoipService.swift

@@ -303,7 +303,6 @@ public final class VoipService: NSObject {
         }
 
         client.connect(host: payload.host) { connected in
-            print("[\(TAG)] DDP connection callback")
             guard ddpClient === client else {
                 return
             }