Merge pull request #25 from sean-perkins/1.6-upgrade

1.6 upgrade
TeamMaestro · Dec 9, 2016 · 53ccd4b · 53ccd4b
2 parents fd5fb9e + f7ddab9
commit 53ccd4b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-opentok",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Integrates OpenTok for NativeScript.",
   "main": "opentok.js",
   "typings": "./opentok.d.ts",
@@ -53,5 +53,6 @@
     "@types/es6-promise": "0.0.28"
   },
   "dependencies": {
+    "nativescript-permissions": "^1.2.1"
   }
-}
+}
diff --git a/src/android/session.ts b/src/android/session.ts
@@ -30,37 +30,20 @@ export class TNSOTSession {
     private _sessionEvents: Observable;
     private options: any;
 
-    /*
-     constructor(apiKey: string, config: any, options?: any) {
-     this.apiKey = apiKey;
-     this.config = config;
-     this._sessionEvents = new Observable();
-     this.options = options;
-     /*if (currentapiVersion >= MARSHMALLOW) {
-
-     const perms = [android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.MODIFY_AUDIO_SETTINGS, android.Manifest.permission.BLUETOOTH, android.Manifest.permission.BROADCAST_STICKY];
-     if (options && options.explanation) {
-     permissions.requestPermission(perms, this.options.explanation)
-     .then(function () {
-
-     })
-     .catch(function (ex) {
-
-     });
-     } else {
-     permissions.requestPermission(perms)
-     .then(function () {
-
-     })
-     .catch(function (ex) {
-
-     });
-     }
-     }
-     else {}
-     }
 
-     */
+    constructor() {
+        if (currentapiVersion >= MARSHMALLOW) {
+            const perms = [android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.MODIFY_AUDIO_SETTINGS, android.Manifest.permission.BLUETOOTH, android.Manifest.permission.BROADCAST_STICKY];
+            permissions.requestPermission(perms)
+            .then(function () {
+
+            })
+            .catch(function (ex) {
+
+            });
+        }
+    }
+
     public static initWithApiKeySessionId(apiKey: string, sessionId: string) {
         let tnsSession = new TNSOTSession();
         tnsSession._sessionEvents = new Observable();

diff --git a/src/ios/subscriber.ts b/src/ios/subscriber.ts
@@ -8,7 +8,8 @@ import {TNSOTPublisher} from './publisher';
 declare var OTSubscriber: any,
             OTStream: any,
             OTSubscriberKitDelegate: any,
-            interop: any;
+            interop: any,
+            CGRectMake: any;
 
 export class TNSOTSubscriber extends ContentView {
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -27,6 +27,13 @@
         "types": [
         ]
     },
+    "files": [
+      "node_modules/tns-core-modules/tns-core-modules.d.ts",
+      "node_modules/tns-platform-declarations/ios/ios.d.ts",
+      "node_modules/tns-platform-declarations/android/android17.d.ts",
+      "opentok.android.ts",
+      "opentok.ios.ts"
+    ],
     "exclude": [
         "demo",
         "node_modules"