Merge pull request #144 from opentok/342

v3.4.2

build-extras.gradle

@@ -18,5 +18,5 @@ allprojects {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.opentok.android:opentok-android-sdk:2.15.1'
+    implementation 'com.opentok.android:opentok-android-sdk:2.15.2'
 } 

package.json

@@ -11,7 +11,7 @@
     ]
   },
   "dependencies": {
-    "@opentok/client": "2.15.3",
+    "@opentok/client": "2.15.5",
     "exec": "^0.2.0",
     "tar": "^2.0.0"
   },

scripts/downloadiOSSDK.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 module.exports = function (context) {
-    var IosSDKVersion = "OpenTok-iOS-2.15.1";
+    var IosSDKVersion = "OpenTok-iOS-2.15.2";
     var downloadFile = require('./downloadFile.js'),
         exec = require('./exec/exec.js'),
         Q = context.requireCordovaModule('q'),

src/android/OpenTokAndroidPlugin.java

@@ -988,7 +988,7 @@ protected Map<String, String> getParams()
                     params.put("partner_id", apiKey);
                     params.put("payload", payload.toString());
                     params.put("source", "https://github.com/opentok/cordova-plugin-opentok");
-                    params.put("build", "2.15.1");
+                    params.put("build", "2.15.2");
                     params.put("session_id", sessionId);
                     if (connectionId != null) {
                         params.put("action", "cp_on_connect");

src/ios/OpenTokPlugin.h

@@ -11,8 +11,7 @@
 #import <OpenTok/OpenTok.h>
 #import "UIView+Category.h"
 
-@interface OpenTokPlugin : CDVPlugin <OTSessionDelegate, OTPublisherDelegate, OTSubscriberKitDelegate>
-
+@interface OpenTokPlugin : CDVPlugin <OTSessionDelegate, OTPublisherDelegate, OTPublisherKitAudioLevelDelegate, OTPublisherKitNetworkStatsDelegate, OTSubscriberKitDelegate, OTSubscriberKitAudioLevelDelegate, OTSubscriberKitNetworkStatsDelegate>
 @property(nonatomic, copy) NSString* exceptionId;
 
 // OpenTok Logging

src/ios/OpenTokPlugin.m

@@ -57,7 +57,7 @@ -(void)logOT:(NSString*)connectionId{
     [payload setObject:@"3.4.1" forKey:@"cp_version"];
     NSMutableDictionary *logData = [[NSMutableDictionary alloc]init];
     [logData setObject:apiKey forKey:@"partner_id"];
-    [logData setObject:@"2.15.1" forKey:@"build"];
+    [logData setObject:@"2.15.2" forKey:@"build"];
     [logData setObject:@"https://github.com/opentok/cordova-plugin-opentok" forKey:@"source"];
     [logData setObject:@"info" forKey:@"payload_type"];
     [logData setObject:payload forKey:@"payload"];
@@ -168,6 +168,8 @@ - (void)initPublisher:(CDVInvokedUrlCommand *)command{
 
     // Publish and set View
     _publisher = [[OTPublisher alloc] initWithDelegate:self settings:_publisherSettings];
+    _publisher.networkStatsDelegate = self;
+    _publisher.audioLevelDelegate = self;
     [_publisher setPublishAudio:bpubAudio];
     [_publisher setPublishVideo:bpubVideo];
     [_publisher setAudioFallbackEnabled:baudioFallbackEnabled];
@@ -386,6 +388,8 @@ - (void)subscribe:(CDVInvokedUrlCommand*)command{
     // Acquire Stream, then create a subscriber object and put it into dictionary
     OTStream* myStream = [streamDictionary objectForKey:sid];
     OTSubscriber* sub = [[OTSubscriber alloc] initWithStream:myStream delegate:self];
+    sub.audioLevelDelegate = self;
+    sub.networkStatsDelegate = self;
     [_session subscribe:sub error:nil];
 
     if ([[command.arguments objectAtIndex:6] isEqualToString:@"false"]) {

src/js/OTPublisher.coffee

@@ -110,6 +110,7 @@ class TBPublisher
   audioLevelUpdated: (event) ->
     streamEvent = new TBEvent("audioLevelUpdated")
     streamEvent.audioLevel = event.audioLevel
+    @dispatchEvent(streamEvent)
     return @ 
 
   publishMedia: (media, state) ->

src/js/OTSubscriber.coffee

@@ -120,6 +120,7 @@ class TBSubscriber
   audioLevelUpdated: (event) =>
     streamEvent = new TBEvent("audioLevelUpdated")
     streamEvent.audioLevel = event.audioLevel
+    @dispatchEvent(streamEvent)
     return @
 
   # deprecating

www/opentok.js

@@ -467,6 +467,7 @@ TBPublisher = (function() {
     var streamEvent;
     streamEvent = new TBEvent("audioLevelUpdated");
     streamEvent.audioLevel = event.audioLevel;
+    this.dispatchEvent(streamEvent);
     return this;
   };
 
@@ -1119,6 +1120,7 @@ TBSubscriber = (function() {
     var streamEvent;
     streamEvent = new TBEvent("audioLevelUpdated");
     streamEvent.audioLevel = event.audioLevel;
+    this.dispatchEvent(streamEvent);
     return this;
   };