Merge pull request #26 from sean-perkins/ios-10-bugs

Ios 10 bugs

Author: Sean Perkins

README.md

@@ -70,12 +70,12 @@ initSubscriber() {
 }
 ```
 
-
 ### Special Articles
 - [Overlay UI on the Video Stream](https://github.com/sean-perkins/nativescript-opentok/wiki/Overlay-UI-on-Video-Stream)
 - [Angular 2 Integration Guide](https://github.com/sean-perkins/nativescript-opentok/wiki/Angular-2-Integration-Guide)
 - [Controlling Resolution and FPS](https://github.com/sean-perkins/nativescript-opentok/wiki/Controlling-Frame-Rate-and-Resolution)
 - [Event Hooks](https://github.com/sean-perkins/nativescript-opentok/wiki/Event-Hooks)
+- [iOS 10 Notice](https://github.com/sean-perkins/nativescript-opentok/wiki/iOS-10-Notice)
 
 ### Images
 |iPhone|iPad|

demo/app/App_Resources/iOS/Info.plist

@@ -41,5 +41,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSCameraUsageDescription</key>
+	<string>We need your camera to display your feed.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>We need your microphone to hear your voice.</string>
+	<key>UIBackgroundModes</key>
+	<string>audio</strong>
 </dict>
 </plist>

demo/app/main-view-model.ts

@@ -7,9 +7,9 @@ import {TNSOTSession, TNSOTPublisher, TNSOTSubscriber} from 'nativescript-opento
 
 export class Demo extends Observable {
 
-    public _apiKey:string = '45720082';
-    private _sessionId: string = '1_MX40NTcyMDA4Mn5-MTQ3OTQwMDk0NDcyN35XdmdkZjlnazN2UytPYk1mNW1aWVZSZmh-fg';
-    private _publisherToken: string = 'T1==cGFydG5lcl9pZD00NTcyMDA4MiZzaWc9YjUxN2NlZmU0MjEyYjU4YTcxMzY0MWU5M2JkZTYyOTIyY2E4OTNhNTpzZXNzaW9uX2lkPTFfTVg0ME5UY3lNREE0TW41LU1UUTNPVFF3TURrME5EY3lOMzVYZG1ka1pqbG5hek4yVXl0UFlrMW1OVzFhV1ZaU1ptaC1mZyZjcmVhdGVfdGltZT0xNDc5NDAwOTU1Jm5vbmNlPTAuOTAzNTUwODk1ODE3Mzk4MyZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNDgxOTkyOTU0';
+    public _apiKey:string = '45743242';
+    private _sessionId: string = '1_MX40NTc0MzI0Mn5-MTQ4MzQwMzM1NzM5N34rUTZFS1JSY0E0Z3hXMXhlYlZYblk5amh-fg';
+    private _publisherToken: string = 'T1==cGFydG5lcl9pZD00NTc0MzI0MiZzaWc9Y2VkNjE3YmM4NzA0ZWY0M2FjOGNjOWNlMGM3ZWI0MGRjZDI4OWQ1YzpzZXNzaW9uX2lkPTFfTVg0ME5UYzBNekkwTW41LU1UUTRNelF3TXpNMU56TTVOMzRyVVRaRlMxSlNZMEUwWjNoWE1YaGxZbFpZYmxrNWFtaC1mZyZjcmVhdGVfdGltZT0xNDgzNDAzMzY1Jm5vbmNlPTAuMTM1MzI5MjkzNzEwNzEzNTYmcm9sZT1wdWJsaXNoZXImZXhwaXJlX3RpbWU9MTQ4NTk5NTM2Ng==';
 
     private publisher: TNSOTPublisher;
     private subscriber: TNSOTSubscriber;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-opentok",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Integrates OpenTok for NativeScript.",
   "main": "opentok.js",
   "typings": "./opentok.d.ts",

src/ios/publisher.ts

@@ -20,8 +20,8 @@ export class TNSOTPublisher extends ContentView {
 
     constructor() {
         super();
-        this._publisherKitDelegate = TNSPublisherKitDelegateImpl.initWithOwner(new WeakRef(this));
         this._view = UIView.alloc().init();
+        this._publisherKitDelegate = TNSPublisherKitDelegateImpl.initWithOwner(new WeakRef(this));
     }
 
     publish(session: TNSOTSession, name?:string, cameraResolution?: string, cameraFrameRate?: string): void {
@@ -33,14 +33,15 @@ export class TNSOTPublisher extends ContentView {
         );
         this._ios.view.frame = CGRectMake(0, 0, this.width, this.height);
         // this._view.frame = CGRectMake(this.originX, this.originY, this.width, this.height);
+
         this._view.addSubview(this._ios.view);
 
         session.events.on('sessionDidConnect', (result) => {
             this._ios.publishAudio = true;
+            let stream: any = result.object;
+            this.setIdleTimer(true);
             try {
-                let stream: any = result.object;
-                this.setIdleTimer(true);
-                stream.publish(this._ios);
+                stream.session.publish(this._ios);
             } catch(error) {
                 console.log(error);
             }
@@ -72,13 +73,19 @@ export class TNSOTPublisher extends ContentView {
     }
 
     private setIdleTimer(idleTimerDisabled: boolean) {
-        let app = UIApplication.sharedApplication();
+        let app: any;
+        if(UIApplication.sharedApplication) {
+            app = UIApplication.sharedApplication;
+        }
+        else {
+            app = UIApplication.sharedApplication();
+        }
         app.idleTimerDisabled = idleTimerDisabled;
     }
 
     private getCameraResolution(cameraResolution: string): any {
         if(cameraResolution) {
-            switch(cameraResolution.toString().toUpperCase()) {
+            switch(cameraResolution) {
                 case 'LOW':
                     return OTCameraCaptureResolution.OTCameraCaptureResolutionLow;
                 case 'MEDIUM':
@@ -183,6 +190,7 @@ class TNSPublisherKitDelegateImpl extends NSObject {
                 })
             });
         }
+        console.log(error);
     }
 
     get events(): Observable {

src/ios/session.ts

@@ -69,7 +69,7 @@ export class TNSOTSession extends NSObject {
         return this._events;
     }
 
-    public sessionDidConnect(session: any) {
+    sessionDidConnect(session: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'sessionDidConnect',
@@ -80,7 +80,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionDidDisconnect(session: any) {
+    sessionDidDisconnect(session: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'sessionDidDisconnect',
@@ -91,7 +91,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionDidReconnect(session: any) {
+    sessionDidReconnect(session: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'sessionDidReconnect',
@@ -102,7 +102,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionDidBeginReconnecting(session: any) {
+    sessionDidBeginReconnecting(session: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'sessionDidBeginReconnecting',
@@ -113,7 +113,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionStreamCreated(session: any, stream: any) {
+    sessionStreamCreated(session: any, stream: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'streamCreated',
@@ -128,7 +128,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionStreamDestroyed(session: any, stream: any) {
+    sessionStreamDestroyed(session: any, stream: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'streamDestroyed',
@@ -140,7 +140,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionDidFailWithError(session: any, error: any) {
+    sessionDidFailWithError(session: any, error: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'didFailWithError',
@@ -152,7 +152,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionConnectionDestroyed(session: any, connection: any) {
+    sessionConnectionDestroyed(session: any, connection: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'connectionDestroyed',
@@ -164,7 +164,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionConnectionCreated(session: any, connection: any) {
+    sessionConnectionCreated(session: any, connection: any) {
         if (this.events) {
             this.events.notify({
                 eventName: 'connectionCreated',
@@ -176,7 +176,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionArchiveStartedWithId(session: any, archiveId: string, name?: string) {
+    sessionArchiveStartedWithId(session: any, archiveId: string, name?: string) {
         if (this.events) {
             this.events.notify({
                 eventName: 'archiveStartedWithId',
@@ -189,7 +189,7 @@ export class TNSOTSession extends NSObject {
         }
     }
 
-    public sessionArchiveStoppedWithId(session: any, archiveId: string) {
+    sessionArchiveStoppedWithId(session: any, archiveId: string) {
         if (this.events) {
             this.events.notify({
                 eventName: 'archiveStoppedWithId',