Move unsubscribe logic to subscriber class

Author: Sean Perkins

demo/package.json

@@ -1,11 +1,11 @@
 {
   "nativescript": {
     "id": "com.mobileagility.opentok",
-    "tns-android": {
-      "version": "2.4.1"
-    },
     "tns-ios": {
       "version": "2.4.0"
+    },
+    "tns-android": {
+      "version": "2.4.1"
     }
   },
   "dependencies": {
@@ -23,4 +23,4 @@
     "tns-platform-declarations": "^2.4.0",
     "typescript": "^2.0.7"
   }
-}
+}

src/android/session.ts

@@ -230,17 +230,6 @@ export class TNSOTSession {
         this.session.subscribe(subInstance);
     }
 
-    public unsubscribe(): Promise<any> {
-        return new Promise((resolve, reject) => {
-            try {
-                this.session.unsubscribe(this.subscriber);
-                resolve();
-            } catch (err) {
-                reject(err);
-            }
-        });
-    }
-
     get sessionEvents(): Observable {
         return this._sessionEvents;
     }

src/android/subscriber.ts

@@ -1,5 +1,6 @@
 import {Observable} from "data/observable";
 import {ContentView} from 'ui/content-view';
+import {TNSOTSession} from "./session";
 declare var com: any, android: any;
 const StreamListener = com.opentok.android.SubscriberKit.StreamListener;
 const SubscriberListener = com.opentok.android.SubscriberKit.SubscriberListener;
@@ -111,5 +112,11 @@ export class TNSOTSubscriber extends ContentView {
         this._subscriber.setSubscribeToAudio(state);
     }
 
+    unsubscribe(session: TNSOTSession) {
+        if(this._subscriber) {
+            session.session.unsubscribe(this._subscriber);
+        }
+    }
+
 
 }