Skip to content
This repository has been archived by the owner on Jan 18, 2023. It is now read-only.

[Feat](Previsit) add multi session management #209

Open
wants to merge 41 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3ccf844
chore(plugin.xml): :sparkles: declare the opentok file in the js-module
cadesalaberry Jan 7, 2021
d58d058
feat(cordova): :sparkles: expose OT as cordovaOT
cadesalaberry Jan 8, 2021
76c41f8
feat(devices): :alembic: return fake devices
cadesalaberry Jan 8, 2021
3891772
chore(cocoapods): :sparkles: switch over to cocoapods for iOS
cadesalaberry Jan 7, 2021
2f6423b
feat(dependencies): :arrow_up: bump to latest mobile SDKs
cadesalaberry Jan 9, 2021
eed0737
feat(log): :loud_sound: log received signal type
cadesalaberry Jan 9, 2021
d1f6891
feat(signal): :loud_sound: log signal event received
cadesalaberry Jan 9, 2021
c66b82b
feat(devices): :poop: mock getUserMedia
cadesalaberry Jan 9, 2021
fd6dc0f
Revert "feat(dependencies): :arrow_up: bump to latest mobile SDKs"
cadesalaberry Jan 9, 2021
2be3af4
chore(listeners): :loud_sound: log all listeners to the console
cadesalaberry Jan 10, 2021
bbe38c0
feat(events): :handle: undefined signals
cadesalaberry Jan 10, 2021
f545e5b
feat(events): :sparkles: allow overriding eventHandlerName
cadesalaberry Jan 10, 2021
9604fbf
feat(signal): :loud_sound: log type of signal sent
cadesalaberry Jan 10, 2021
d3432f5
feat(dependencies): :arrow_up: bump to latest mobile SDKs
cadesalaberry Jan 9, 2021
1189fa6
chore(signal): :mute: do not log all signals
cadesalaberry Jan 11, 2021
cc66d4c
test on subscriber
dufrenb Jan 11, 2021
80ab501
revert removes rtc functions
dufrenb Jan 11, 2021
b538cd4
add log on subscriber
dufrenb Jan 11, 2021
c14e586
try to fix connect callback + add logs
dufrenb Jan 11, 2021
50d2615
add logs to debug streamCreated event not sent
dufrenb Jan 11, 2021
2722376
revert subscriber modifications
dufrenb Jan 12, 2021
230112e
feat(publisher) :sparkles: add callback handling for initPublisher
dufrenb Jan 13, 2021
09999b8
add logs publisher
dufrenb Jan 13, 2021
db5a1a4
fix publisher destroy method when using 'append' insertMode
dufrenb Jan 13, 2021
15ae337
Revert "add logs publisher"
dufrenb Jan 13, 2021
5da1d2d
clean destroy publisher
dufrenb Jan 13, 2021
c196da6
feat(cordova): :alien: expose OT as cordovaOT to avoid conflict (#5)
MeddahAbdellah Jul 28, 2021
887b591
[TECH](plugin.xml): :sparkles: declare the opentok file in the js-mod…
cadesalaberry Jul 28, 2021
c72626d
fix(signals): :bug: support events of type signal:custom-suffix (#6)
cadesalaberry Jul 28, 2021
bb444da
refacto(visio) removed unnecessary global variabl
MeddahAbdellah Aug 4, 2021
17a60ae
refacto(visio) removed unnecessary global variabl grunt
MeddahAbdellah Aug 4, 2021
955b07b
feat(visio) make plugin use a different session object for each session
MeddahAbdellah Aug 4, 2021
061da44
fix(visio) initialize sessions array
MeddahAbdellah Aug 4, 2021
737f35a
fix(visio) initialize sessions array grunt
MeddahAbdellah Aug 4, 2021
9ed6556
fix(visio) put events in array
MeddahAbdellah Aug 4, 2021
e81cc47
feat(visio) manage multi-session events
MeddahAbdellah Aug 9, 2021
bfe623f
fix(visio) removed unnecessary logs
MeddahAbdellah Aug 9, 2021
cf79259
Merge branch 'main' into feat_add_multi_session_management
MeddahAbdellah Aug 9, 2021
eb98b14
review(visio) reviewed by @cadesalaberry
MeddahAbdellah Aug 17, 2021
fc326c9
review(visio) reviewed by @cadesalaberry
MeddahAbdellah Aug 17, 2021
924a7e4
fix(visio) fix subscriber
MeddahAbdellah Aug 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-extras.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ allprojects {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.opentok.android:opentok-android-sdk:2.15.3'
}
implementation 'com.opentok.android:opentok-android-sdk:2.18.1'
}
42 changes: 17 additions & 25 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
<license>Apache 2.0</license>
<keywords>opentok,tokbox</keywords>

<js-module src="www/opentok.js" name="opentok">
<runs />
</js-module>

<engines>
<engine name="cordova" version=">=6.4.0" />
<engine name="cordova-ios" version=">=4.3.0" />
</engines>

<platform name="android">
<framework src="build-extras.gradle" custom="true" type="gradleReference" />
<framework src="com.android.support:appcompat-v7:23.1.0" />
Expand Down Expand Up @@ -40,38 +49,21 @@

<!-- ios -->
<platform name="ios">
<hook type="before_plugin_install" src="scripts/downloadiOSSDK.js" />
<asset src="www/opentok.js" target="opentok.js" />

<header-file src="src/ios/UIView+Category.h" />
<source-file src="src/ios/UIView+Category.m" />
<header-file src="src/ios/OpenTokPlugin.h" />
<source-file src="src/ios/OpenTokPlugin.m" />

<framework src="libstdc++.dylib" />
<framework src="libc++.dylib" />
<framework src="libxml2.dylib" />
<framework src="libsqlite3.dylib" />
<framework src="libpthread.dylib" />
<framework src="VideoToolbox.framework" />
<framework src="src/ios/OpenTok.framework" custom="true" />
<framework src="AudioToolbox.framework" />
<framework src="CoreData.framework" />
<framework src="AVFoundation.framework" />
<framework src="CoreGraphics.framework" />
<framework src="CoreMedia.framework" />
<framework src="CoreVideo.framework" />
<framework src="OpenGLES.framework" />
<framework src="SystemConfiguration.framework" />
<framework src="CoreTelephony.framework" />
<framework src="GLKit.framework" />
<framework src="EventKit.framework" />
<framework src="QuartzCore.framework" />
<framework src="MapKit.framework" />
<framework src="UIKit.framework" />
<framework src="Foundation.framework" />
<framework src="Security.framework" />
<framework src="CFNetwork.framework" />
<podspec>
<config>
<source url="https://github.com/CocoaPods/Specs.git"/>
</config>
<pods>
<pod name="OpenTok" spec="2.18.1" />
</pods>
</podspec>

<!-- Add support for background audio to the plist -->
<!-- https://tokbox.com/developer/sdks/ios/background-state.html -->
Expand Down
2 changes: 1 addition & 1 deletion scripts/downloadiOSSDK.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

module.exports = function (context) {
var IosSDKVersion = "OpenTok-iOS-2.15.3";
var IosSDKVersion = "OpenTok-iOS-2.18.1";
var downloadFile = require('./downloadFile.js'),
exec = require('./exec/exec.js'),
Q = require('q'),
Expand Down
10 changes: 5 additions & 5 deletions src/android/OpenTokAndroidPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public void onError(PublisherKit arg0, OpentokError arg1) {
public void onStreamCreated(PublisherKit arg0, Stream arg1) {
Log.i(TAG, "publisher stream received");
streamCollection.put(arg1.getStreamId(), arg1);

streamHasAudio.put(arg1.getStreamId(), arg1.hasAudio());
streamHasVideo.put(arg1.getStreamId(), arg1.hasVideo());
JSONObject videoDimensions = new JSONObject();
Expand Down Expand Up @@ -906,7 +906,7 @@ public void onStreamHasVideoChanged(Session session, Stream stream, boolean newV
@Override
public void onStreamVideoDimensionsChanged(Session session, Stream stream, int width, int height) {
JSONObject oldValue = this.streamVideoDimensions.get(stream.getStreamId());

JSONObject newValue = new JSONObject();
try {
newValue.put("width", width);
Expand Down Expand Up @@ -989,11 +989,11 @@ 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.3");
params.put("build", "2.18.1");
params.put("session_id", sessionId);
if (connectionId != null) {
params.put("action", "cp_on_connect");
params.put("connectionId", connectionId);
params.put("connectionId", connectionId);
} else {
params.put("action", "cp_initialize");
}
Expand Down Expand Up @@ -1090,4 +1090,4 @@ public void onStreamVideoTypeChanged(Session arg0, Stream arg1,
// TODO Auto-generated method stub

}
}
}
Loading