Merge pull request #1 from songz/master

Merge opentok master

README.md

@@ -1,10 +1,12 @@
 Cordova Plugin for OpenTok iOS
 ===
 
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/songz/cordova-plugin-opentok?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Weave video chat into your web (and now mobile!) application.
 
 ## Using Cordova CLI
-Make sure You have Cordova 3.5.0 Installed. If you haven't, view [Cordova instructions](http://cordova.apache.org/docs/en/3.5.0/guide_cli_index.md.html) Page.  
+Make sure You have Cordova 3.5.0 or greater installed. If you haven't, view [Cordova instructions](http://cordova.apache.org/docs/en/3.5.0/guide_cli_index.md.html) Page.  
 [Bug filed](https://issues.apache.org/jira/browse/CB-6500) against Cordova.  
 
 Clone this repo to get the source code for OpenTok's Cordova plugin

plugin.xml

@@ -27,7 +27,7 @@
       </config-file>
 
       <!-- copy opentok sdk -->
-      <source-file src="src/android/libs/opentok-android-sdk-2.3.1.jar" target-dir="libs/" />
+      <source-file src="src/android/libs/opentok-android-sdk-2.5.0.jar" target-dir="libs/" />
       <source-file src="src/android/libs/armeabi/libopentok.so" target-dir="libs/armeabi" />
       <source-file src="src/android/libs/x86/libopentok.so" target-dir="libs/x86" />
 

src/android/com/tokbox/cordova/OpenTokAndroidPlugin.java

@@ -23,12 +23,14 @@
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.opentok.android.Connection;
 import com.opentok.android.OpentokError;
 import com.opentok.android.Publisher;
 import com.opentok.android.PublisherKit;
 import com.opentok.android.Session;
 import com.opentok.android.Stream;
+import com.opentok.android.Stream.StreamVideoType;
 import com.opentok.android.Subscriber;
 import com.opentok.android.SubscriberKit;
 
@@ -685,24 +687,31 @@ public void triggerJSEvent(String event, String type, JSONObject data ){
     myEventListeners.get(event).sendPluginResult(myResult);
   }
 
-@Override
-public void onError(PublisherKit arg0, OpentokError arg1) {
-  // TODO Auto-generated method stub
+  @Override
+  public void onError(PublisherKit arg0, OpentokError arg1) {
+    // TODO Auto-generated method stub
+
+  }
 
-}
-
-@Override
-public void onStreamCreated(PublisherKit arg0, Stream arg1) {
-  // TODO Auto-generated method stub
+  @Override
+  public void onStreamCreated(PublisherKit arg0, Stream arg1) {
+    // TODO Auto-generated method stub
+    
+  }
 
-}
-
-@Override
-public void onStreamDestroyed(PublisherKit arg0, Stream arg1) {
-    if(myPublisher != null){
-        myPublisher.destroyPublisher();
-        myPublisher = null;
-      }
-}
+  @Override
+  public void onStreamDestroyed(PublisherKit arg0, Stream arg1) {
+      if(myPublisher != null){
+          myPublisher.destroyPublisher();
+          myPublisher = null;
+        }
+  }
+
+  @Override
+  public void onStreamVideoTypeChanged(Session arg0, Stream arg1,
+      StreamVideoType arg2) {
+    // TODO Auto-generated method stub
+
+  }
 }
 

www/opentok.js

@@ -601,7 +601,7 @@ TBSession = (function() {
     element = streamElements[elementId];
     if (element) {
       element.parentNode.removeChild(element);
-      delete streamElements[streamId];
+      delete streamElements[elementId];
       TBUpdateObjects();
     }
     return Cordova.exec(TBSuccess, TBError, OTPlugin, "unsubscribe", [subscriber.streamId]);