fix():

Author: triniwiz

src/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nativescript-webrtc-plugin",
-    "version": "2.0.0-alpha.7",
+    "version": "2.0.0-alpha.9",
     "description": "WebRTC for NativeScript",
     "main": "webrtc",
     "typings": "index.d.ts",

src/platforms/android/fancywebrtc-release.aar

@@ -150,11 +150,13 @@ export class TNSRTCPeerConnection {
     }
 
     public addTrack(track: TNSRTCMediaStreamTrack, streamIds: Array<string>) {
-        const ids = new java.util.ArrayList();
-        for (let id of streamIds) {
-            ids.add(id);
+        if(streamIds){
+            const ids = new java.util.ArrayList();
+            for (let id of streamIds) {
+                ids.add(id);
+            }
+            this.android.addTrack(track.mediaStreamTrack, ids);
         }
-        this.android.addTrack(track.mediaStreamTrack, ids);
     }
 
     public close() {

src/src/android/TNSRTCPeerConnection.ts

@@ -6,35 +6,47 @@ import { TNSRTCMediaStream } from './TNSRTCMediaStream';
 
 export class TNSRTCTrackEvent extends TNSRTCTrackEventBase {
     private _event;
+    private _mediaTrack: TNSRTCMediaStreamTrack;
+    private _transceiver: TNSRTCRtpTransceiver;
+    private _receiver: TNSRTCRtpReceiver;
+    private _streams: Array<TNSRTCMediaStream>;
 
     constructor(event) {
         super(event);
         this._event = event;
+        this._mediaTrack = TNSRTCMediaStreamTrack.fromNative(this._event.getMediaTrack());
+        this._transceiver = this._event.getTransceiver() ? TNSRTCRtpTransceiver.fromNative(this._event.getTransceiver()) : null;
+        this._receiver = this._event.getReceiver() ? TNSRTCRtpReceiver.fromNative(this._event.getReceiver()) : null;
+        const array = [];
+        const nativeArray = this._event.getStreams();
+        if (nativeArray) {
+            const size = nativeArray.size();
+            for (let i = 0; i < size; i++) {
+                const stream = nativeArray.get(i);
+                array.push(TNSRTCMediaStream.fromNative(stream));
+            }
+        }
+        this._streams = array;
+    }
 
+    public get track(): TNSRTCMediaStreamTrack {
+        return this.mediaTrack;
     }
 
     public get mediaTrack(): TNSRTCMediaStreamTrack {
-        return TNSRTCMediaStreamTrack.fromNative(this._event.getMediaTrack());
+        return this._mediaTrack;
     }
 
     public get transceiver(): TNSRTCRtpTransceiver {
-        return TNSRTCRtpTransceiver.fromNative(this._event.getTransceiver());
+        return this._transceiver;
     }
 
     public get receiver(): TNSRTCRtpReceiver {
-        return TNSRTCRtpReceiver.fromNative(this._event.getReceiver());
+        return this._receiver;
     }
 
     public get streams(): Array<TNSRTCMediaStream> {
-        const array = [];
-        const nativeArray = this._event.getStreams();
-        const size = nativeArray.size();
-        for (let i = 0; i < size; i++) {
-            const stream = nativeArray.get(i);
-            array.push(TNSRTCMediaStream.fromNative(stream));
-        }
-        return array;
-
+        return this._streams;
     }
 
     public static fromNative(event) {

src/src/android/TNSRTCTrackEvent.ts

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

src/src/base/TNSRTCTrackEventBase.ts

@@ -88,63 +88,63 @@ export class TNSRTCPeerConnection {
     }
 
     public onConnectionStateChange(callback: () => void): void {
-        this.ios.onConnectionStateChange = () => {
+        this.ios.onConnectionStateChange(() => {
             callback();
-        };
+        });
     }
 
     public onTrack(callback: (track: TNSRTCTrackEvent) => void): void {
-        this.ios.onTrack = (track) => {
+        this.ios.onTrack(track => {
             callback(TNSRTCTrackEvent.fromNative(track));
-        };
+        });
     }
 
     public onRemoveTrackListener(callback: () => void): void {
-        this.ios.onRemoveTrack = () => {
+        this.ios.onRemoveTrack(() => {
             callback();
-        };
+        });
     }
 
     public onRemoveStream(callback: (stream: TNSRTCMediaStream) => void): void {
-        this.ios.onRemoveStream = (nativeStream) => {
+        this.ios.onRemoveStream((nativeStream) => {
             callback(TNSRTCMediaStream.fromNative(nativeStream));
-        };
+        });
     }
 
     public onIceGatheringStateChange(callback: any): void {
-        this.ios.onIceGatheringStateChange = () => {
+        this.ios.onIceGatheringStateChange(() => {
             callback();
-        };
+        });
     }
 
     public onAddStream(callback: any): void {
-        this.ios.onAddStream = (nativeStream) => {
+        this.ios.onAddStream((nativeStream) => {
             callback(TNSRTCMediaStream.fromNative(nativeStream));
-        };
+        });
     }
 
     public onNegotiationNeeded(callback: () => void): void {
-        this.ios.onNegotiationNeeded = () => {
+        this.ios.onNegotiationNeeded(() => {
             callback();
-        };
+        });
     }
 
     public onSignalingStateChange(callback: () => void): void {
-        this.ios.onSignalingStateChange = () => {
+        this.ios.onSignalingStateChange(() => {
             callback();
-        };
+        });
     }
 
     public onIceCandidate(callback: (candidate: TNSRTCIceCandidate) => void): void {
-        this.ios.onIceCandidate = (nativeCandidate) => {
+        this.ios.onIceCandidate((nativeCandidate) => {
             callback(TNSRTCIceCandidate.fromNative(nativeCandidate));
-        };
+        });
     }
 
     public onDataChannel(callback: (channel: TNSRTCDataChannelEvent) => void): any {
-        this.ios.onDataChannel = (event) => {
+        this.ios.onDataChannel((event) => {
             callback(TNSRTCDataChannelEvent.fromNative(event));
-        };
+        });
     }
 
 

src/src/ios/TNSRTCPeerConnection.ts

@@ -13,6 +13,10 @@ export class TNSRTCTrackEvent extends TNSRTCTrackEventBase {
 
     }
 
+    public get track(): TNSRTCMediaStreamTrack {
+        return this.mediaTrack;
+    }
+
     public get mediaTrack(): TNSRTCMediaStreamTrack {
         return TNSRTCMediaStreamTrack.fromNative(this._event.mediaTrack);
     }
@@ -28,6 +32,7 @@ export class TNSRTCTrackEvent extends TNSRTCTrackEventBase {
     public get streams(): Array<TNSRTCMediaStream> {
         const array = [];
         const nativeArray = this._event.streams;
+        if (!nativeArray) return array;
         const size = nativeArray.count;
         for (let i = 0; i < size; i++) {
             const stream = nativeArray.objectAtIndex(i);