diff --git a/build-extras.gradle b/build-extras.gradle index 1836c179..074c8fb0 100644 --- a/build-extras.gradle +++ b/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' } diff --git a/package-lock.json b/package-lock.json index 542854ce..adc952c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@opentok/client": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/@opentok/client/-/client-2.14.2.tgz", - "integrity": "sha512-zDUn5JtRBo6LQl+fLCVcaEjCdFBOBCARiyWSRdVhbcYWb8Zfq7rljUQIZo6W0Rko+vTcME2RdJb5VAFGDL2iQQ==" + "version": "2.15.5", + "resolved": "https://registry.npmjs.org/@opentok/client/-/client-2.15.5.tgz", + "integrity": "sha512-8OtFHQxvgF6rr+XxQ187M3rpKLFW7rJASVQzvtTOB8Uv9keh01ZLWO5q9wDO6yiBhOoCuHWlhwvuRF6/B/PWUQ==" }, "abbrev": { "version": "1.1.1", diff --git a/package.json b/package.json index d2448ea7..fba47f55 100644 --- a/package.json +++ b/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" }, diff --git a/scripts/downloadiOSSDK.js b/scripts/downloadiOSSDK.js index be7ed654..47f50009 100755 --- a/scripts/downloadiOSSDK.js +++ b/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'), diff --git a/src/android/OpenTokAndroidPlugin.java b/src/android/OpenTokAndroidPlugin.java index 6a1fc6cb..10f08de5 100644 --- a/src/android/OpenTokAndroidPlugin.java +++ b/src/android/OpenTokAndroidPlugin.java @@ -988,7 +988,7 @@ protected Map 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"); diff --git a/src/ios/OpenTokPlugin.h b/src/ios/OpenTokPlugin.h index 61c6d93d..d3a874c7 100644 --- a/src/ios/OpenTokPlugin.h +++ b/src/ios/OpenTokPlugin.h @@ -11,8 +11,7 @@ #import #import "UIView+Category.h" -@interface OpenTokPlugin : CDVPlugin - +@interface OpenTokPlugin : CDVPlugin @property(nonatomic, copy) NSString* exceptionId; // OpenTok Logging diff --git a/src/ios/OpenTokPlugin.m b/src/ios/OpenTokPlugin.m index d18c0852..65e493bc 100644 --- a/src/ios/OpenTokPlugin.m +++ b/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"]) { diff --git a/src/js/OTPublisher.coffee b/src/js/OTPublisher.coffee index 10ecacea..c271b407 100644 --- a/src/js/OTPublisher.coffee +++ b/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) -> diff --git a/src/js/OTSubscriber.coffee b/src/js/OTSubscriber.coffee index 8bd4cc75..63f8b218 100644 --- a/src/js/OTSubscriber.coffee +++ b/src/js/OTSubscriber.coffee @@ -120,6 +120,7 @@ class TBSubscriber audioLevelUpdated: (event) => streamEvent = new TBEvent("audioLevelUpdated") streamEvent.audioLevel = event.audioLevel + @dispatchEvent(streamEvent) return @ # deprecating diff --git a/www/opentok.js b/www/opentok.js index 5d73b17c..f6aceeb2 100644 --- a/www/opentok.js +++ b/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; };