Fixed for NS 7/8

demo-ng-firestore/src/app/webrtc/firebase.provider.ts

@@ -213,8 +213,8 @@ export class FirebaseProvider {
 
         snapshot.forEach((doc) => {
           iceCandidates.push(<WebRTCIceCandidate>doc.data());
-          resolve(iceCandidates);
         });
+        resolve(iceCandidates);
       })
       .catch((error) => { reject(error); });
     });

demo-ng-firestore/src/app/webrtc/webrtc.model.ts

@@ -18,7 +18,7 @@ export interface WebRTCRoom {
 
 export interface WebRTCOffer {
   sdp: any;
-  type: string; // e.g. "offer"
+  type: string; // e.g. "offer" or "answer"
 }
 
 export interface WebRTCIceCandidate {

src/angular/index.ts

@@ -1,5 +1,5 @@
 import { Directive, NgModule } from '@angular/core';
-import { registerElement } from 'nativescript-angular/element-registry';
+import { registerElement } from '@nativescript/angular';
 import { WebRTCView } from '../';
 
 registerElement('WebRTCView', () => WebRTCView);

src/index.d.ts

@@ -1,7 +1,7 @@
 export { IceConnectionState, IceServer, IceGatheringState, Quality, SignalingState, WebRTCDataChannelMessageType, WebRTCDataChannelState, WebRTCIceCandidate, WebRTCOptions, WebRTCSdp, WebRTCSdpType, WebRTCState } from './webrtc.common';
 
+import { View } from '@nativescript/core';
 import { Common, Quality, WebRTCDataChannelMessageType, WebRTCIceCandidate, WebRTCOptions, WebRTCSdp } from './webrtc.common';
-import { View } from 'tns-core-modules/ui/core/view';
 
 export declare class WebRTC extends Common {
     private webrtc;

src/package.json

@@ -59,12 +59,13 @@
         "@angular/platform-browser": "~8.0.0",
         "@angular/platform-browser-dynamic": "~8.0.0",
         "@angular/router": "~8.0.0",
-        "nativescript-angular": "~8.0.0",
+        "@angular/animations": "^12.0.5",
+        "@nativescript/angular": "^12.0.2",
+        "@nativescript/core": "^8.0.8",
         "prompt": "^1.0.0",
         "rimraf": "^2.6.2",
         "rxjs": "~6.3.3",
         "semver": "^5.5.0",
-        "tns-core-modules": "^6.0.7",
         "tns-platform-declarations": "^6.0.7",
         "tslint": "~5.4.3",
         "typescript": "~3.4.5",

src/platforms/android/include.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'org.webrtc:google-webrtc:1.0.30039'
+    implementation 'org.webrtc:google-webrtc:1.0.32006'
     implementation 'com.google.code.gson:gson:2.8.5'
 }

src/platforms/ios/Podfile

@@ -1,6 +1,6 @@
 platform :ios, '10.0'
 pod 'GoogleWebRTC', '~> 1.1.29400'
-pod 'FancyWebRTC', :git => 'https://github.com/triniwiz/fancy-webrtc-ios.git'
+pod 'FancyWebRTC', :git => 'https://github.com/ksteuer/fancy-webrtc-ios.git'
 
 post_install do |installer|
     installer.pods_project.targets.each do |target|

src/src/android/TNSRTCMediaDevices.ts

@@ -1,4 +1,4 @@
-import * as app from 'tns-core-modules/application';
+import * as app from '@nativescript/core/application';
 import { TNSRTCMediaStreamConstraints } from './TNSRTCMediaStreamConstraints';
 import { TNSRTCMediaStream } from './TNSRTCMediaStream';
 import { TNSMediaDevicesInfo } from '../core/TNSMediaDevicesInfo';

src/src/android/TNSRTCPeerConnection.ts

@@ -13,7 +13,7 @@ import {
     TNSRTCTrackEvent
 } from './';
 import { TNSRTCPeerConnectionState } from '../core/TNSRTCPeerConnectionState';
-import * as utils from 'tns-core-modules/utils/utils';
+import * as utils from '@nativescript/core/utils';
 
 declare var co;
 
@@ -248,7 +248,7 @@ export class TNSRTCPeerConnection {
     }
 
     public setLocalDescription(sdp: TNSRTCSessionDescription): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             const ref = new WeakRef(this);
             this.android.setLocalDescription(sdp.instance, new co.fitcom.fancywebrtc.FancyRTCPeerConnection.SdpSetListener({
                 onSuccess(): void {
@@ -265,7 +265,7 @@ export class TNSRTCPeerConnection {
     }
 
     public setRemoteDescription(sdp: TNSRTCSessionDescription): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             const ref = new WeakRef(this);
             this.android.setRemoteDescription(sdp.instance, new co.fitcom.fancywebrtc.FancyRTCPeerConnection.SdpSetListener({
                 onSuccess(): void {

src/src/android/TNSRTCVideoTrack.ts

@@ -22,7 +22,7 @@ export class TNSRTCVideoTrack extends TNSRTCMediaStreamTrack {
     }
 
     public applyConstraints(constraints: TNSMediaTrackConstraints): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             const nativeMap = new java.util.HashMap();
             if (constraints.facingMode) {
                 nativeMap.put('facingMode', constraints.facingMode);

src/src/base/TNSRTCDTMFSenderBase.ts

@@ -3,7 +3,7 @@ export abstract class TNSRTCDTMFSenderBase {
     constructor(sender) {
     }
 
-    public toneBuffer: string;
+    public get toneBuffer(): string { return undefined; }
 
 
     public abstract dispose(): void;

src/src/base/TNSRTCIceCandidateBase.ts

@@ -1,11 +1,11 @@
 export abstract class TNSRTCIceCandidateBase {
     _iceCandidate;
-    candidate: string;
-    sdp: string;
-    sdpMid: string | null;
-    sdpMLineIndex: number;
-    usernameFragment: string;
-    serverUrl: string;
+    get candidate(): string { return undefined; }
+    get sdp(): string { return undefined; }
+    get sdpMid(): string | null { return undefined; }
+    get sdpMLineIndex(): number { return undefined; }
+    get usernameFragment(): string { return undefined; }
+    get serverUrl(): string { return undefined; }
 
     constructor(sdp: string, sdpMid: string | null, sdpMLineIndex: number) {
     }

src/src/base/TNSRTCIceServerBase.ts

@@ -8,12 +8,12 @@ export abstract class TNSRTCIceServerBase {
 
     public abstract toWebRtc(): void;
 
-    public iceServer;
+    public get iceServer() { return undefined; }
 
-    public credentialType;
+    public get credentialType() { return undefined; }
 
-    public urls: Array<String>;
+    public get urls(): Array<String> { return undefined; }
 
-    public username: string;
+    public get username(): string { return undefined; }
 
 }

src/src/base/TNSRTCMediaStreamTrackBase.ts

@@ -1,15 +1,15 @@
 export abstract class TNSRTCMediaStreamTrackBase {
-    public id: string;
+    public get id(): string { return undefined; }
 
-    public enabled: boolean;
+    public get enabled(): boolean { return undefined; }
 
-    public kind: string;
+    public get kind(): string { return undefined; }
 
-    public mute: boolean;
+    public get mute(): boolean { return undefined; }
 
     public abstract dispose(): void;
 
-    public readyState: string;
+    public get readyState(): string { return undefined; }
 
     constructor(mediaStreamTrack: any) {
     }

src/src/base/TNSRTCRtpSenderBase.ts

@@ -6,15 +6,15 @@ export abstract class TNSRTCRtpSenderBase {
     constructor(sender) {
     }
 
-    public dtmf: TNSRTCDTMFSenderBase;
+    public get dtmf(): TNSRTCDTMFSenderBase { return undefined; }
 
-    public id: string;
+    public get id(): string { return undefined; } 
 
     public abstract dispose(): void;
 
-    public track: TNSRTCMediaStreamTrackBase;
+    public get track(): TNSRTCMediaStreamTrackBase { return undefined; }
 
-    public parameters: TNSRTCRtpParametersBase;
+    public get parameters(): TNSRTCRtpParametersBase { return undefined; }
 
     public abstract replaceTrack(track: TNSRTCMediaStreamTrackBase): void ;
 }

src/src/base/TNSRTCRtpTransceiverBase.ts

@@ -6,18 +6,17 @@ export abstract class TNSRTCRtpTransceiverBase {
     constructor(transceiver) {
     }
 
-    public direction: TNSRTCRtpTransceiverDirection;
+    public get direction(): TNSRTCRtpTransceiverDirection { return undefined; }
 
-    public currentDirection: TNSRTCRtpTransceiverDirection;
+    public get currentDirection(): TNSRTCRtpTransceiverDirection { return undefined; }
 
-    public mid: string;
+    public get mid(): string { return undefined; }
 
-    public receiver: TNSRTCRtpReceiverBase;
+    public get receiver(): TNSRTCRtpReceiverBase { return undefined; }
 
-    public sender: TNSRTCRtpSenderBase;
+    public get sender(): TNSRTCRtpSenderBase { return undefined; }
 
-
-    public stopped: boolean;
+    public get stopped(): boolean { return undefined; }
 
     public abstract stop(): void;
 }

src/src/base/TNSRTCTrackEventBase.ts

@@ -4,10 +4,10 @@ import { TNSRTCRtpReceiverBase } from './TNSRTCRtpReceiverBase';
 import { TNSRTCRtpTransceiverBase } from './TNSRTCRtpTransceiverBase';
 
 export class TNSRTCTrackEventBase {
-    mediaTrack: TNSRTCMediaStreamTrackBase;
-    transceiver: TNSRTCRtpTransceiverBase;
-    receiver?: TNSRTCRtpReceiverBase;
-    streams?: Array<TNSRTCMediaStreamBase>;
+    public get mediaTrack(): TNSRTCMediaStreamTrackBase { return undefined; }
+    public get transceiver(): TNSRTCRtpTransceiverBase { return undefined; }
+    public get receiver(): TNSRTCRtpReceiverBase { return undefined; }
+    public get streams(): Array<TNSRTCMediaStreamBase> { return undefined; }
 
     constructor(event) {
     }

src/src/ios/TNSRTCPeerConnection.ts

@@ -254,7 +254,7 @@ export class TNSRTCPeerConnection {
     }
 
     public setLocalDescription(sdp: TNSRTCSessionDescription): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             this.ios.localDescriptionWithSdpListener(sdp.instance, (error) => {
                 if (error) {
                     reject(error);
@@ -266,7 +266,7 @@ export class TNSRTCPeerConnection {
     }
 
     public setRemoteDescription(sdp: TNSRTCSessionDescription): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             this.ios.remoteDescriptionWithSdpListener(sdp.instance, (error) => {
                 if (error) {
                     reject(error);

src/src/ios/TNSRTCVideoTrack.ts

@@ -22,7 +22,7 @@ export class TNSRTCVideoTrack extends TNSRTCMediaStreamTrack {
     }
 
     public applyConstraints(constraints: TNSMediaTrackConstraints): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             const obj = {};
             if (constraints.facingMode) {
                 obj['facingMode'] = constraints.facingMode;

src/webrtc.android.ts

@@ -12,12 +12,11 @@ import {
     WebRTCSdpType
 } from './webrtc.common';
 
-import { fromObject } from 'tns-core-modules/data/observable';
-import { View } from 'tns-core-modules/ui/core/view';
-import { ad } from 'tns-core-modules/utils/utils';
+import { fromObject,View } from '@nativescript/core';
 import * as permissions from 'nativescript-permissions';
 import { TNSRTCMediaStream, TNSRTCMediaStreamTrack } from './src/android';
-import * as app from 'tns-core-modules/application';
+import { ad } from '@nativescript/core/utils';
+import { AndroidApplication, AndroidActivityResultEventData, android as androidApp } from '@nativescript/core/application'
 
 export * from './src/android';
 export {
@@ -374,7 +373,7 @@ export class WebRTC extends Common {
         );
     }
 
-    private static _callbackFn(args: app.AndroidActivityResultEventData) {
+    private static _callbackFn(args: AndroidActivityResultEventData) {
         co.fitcom.fancywebrtc.FancyRTCApplicationHelper.getInstance().handleResult(args.requestCode, args.resultCode, args.intent);
     }
 
@@ -385,8 +384,8 @@ export class WebRTC extends Common {
         if (!this.callback) {
             this.callback = this._callbackFn.bind(this);
         }
-        app.android.off(app.AndroidApplication.activityResultEvent, this.callback);
-        app.android.on(app.AndroidApplication.activityResultEvent, this.callback);
+        androidApp.off(AndroidApplication.activityResultEvent, this.callback);
+        androidApp.on(AndroidApplication.activityResultEvent, this.callback);
     }
 
     public dataChannelSend(

src/webrtc.common.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'tns-core-modules/data/observable';
+import { Observable } from '@nativescript/core';
 
 export class Common extends Observable {
   defaultServers: Array<string> = [

src/webrtc.ios.ts

@@ -11,8 +11,8 @@ import {
     WebRTCSdp,
     WebRTCSdpType
 } from './webrtc.common';
-import { layout, View } from 'tns-core-modules/ui/core/view';
-import { fromObject } from 'tns-core-modules/data/observable';
+import { layout } from '@nativescript/core/utils';
+import { fromObject, View } from '@nativescript/core';
 import './async-await';
 
 import { TNSRTCMediaStream, TNSRTCMediaStreamTrack } from './src/ios';
@@ -132,7 +132,7 @@ export class WebRTC extends Common {
     }
 
     private static requestCameraPermission() {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             AVCaptureDevice.requestAccessForMediaTypeCompletionHandler(
                 AVMediaTypeVideo,
                 granted => {
@@ -147,7 +147,7 @@ export class WebRTC extends Common {
     }
 
     private static requestAudioPermission() {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             AVCaptureDevice.requestAccessForMediaTypeCompletionHandler(
                 AVMediaTypeAudio,
                 granted => {
@@ -162,7 +162,7 @@ export class WebRTC extends Common {
     }
 
     public static requestPermissions(explanation?: string): Promise<any> {
-        return new Promise(async (resolve, reject) => {
+        return new Promise<void>(async (resolve, reject) => {
             try {
                 await WebRTC.requestCameraPermission();
                 await WebRTC.requestAudioPermission();