Add onParticipantAdded/RemovedAudioTrack on Android (#169)

* Add onParticipantAdded/RemovedAudioTrack on Android * Bugfixes * Another bugfix * Update CustomTwilioVideoView.java

Author: slycoder

android/src/main/java/com/twiliorn/library/CustomTwilioVideoView.java

@@ -71,13 +71,15 @@
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_CONNECTED;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_CONNECT_FAILURE;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_DISCONNECTED;
+import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ADDED_AUDIO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ADDED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_CONNECTED;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_DISABLED_AUDIO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_DISABLED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_DISCONNECTED;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ENABLED_AUDIO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ENABLED_VIDEO_TRACK;
+import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_REMOVED_AUDIO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_REMOVED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_STATS_RECEIVED;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_VIDEO_CHANGED;
@@ -96,6 +98,8 @@ public class CustomTwilioVideoView extends View implements LifecycleEventListene
  Events.ON_PARTICIPANT_DISCONNECTED,
  Events.ON_PARTICIPANT_ADDED_VIDEO_TRACK,
  Events.ON_PARTICIPANT_REMOVED_VIDEO_TRACK,
+ Events.ON_PARTICIPANT_ADDED_AUDIO_TRACK,
+ Events.ON_PARTICIPANT_REMOVED_AUDIO_TRACK,
  Events.ON_PARTICIPANT_ENABLED_VIDEO_TRACK,
  Events.ON_PARTICIPANT_DISABLED_VIDEO_TRACK,
  Events.ON_PARTICIPANT_ENABLED_AUDIO_TRACK,
@@ -112,6 +116,8 @@ public class CustomTwilioVideoView extends View implements LifecycleEventListene
  String ON_PARTICIPANT_DISCONNECTED = "onRoomParticipantDidDisconnect";
  String ON_PARTICIPANT_ADDED_VIDEO_TRACK = "onParticipantAddedVideoTrack";
  String ON_PARTICIPANT_REMOVED_VIDEO_TRACK = "onParticipantRemovedVideoTrack";
+ String ON_PARTICIPANT_ADDED_AUDIO_TRACK = "onParticipantAddedAudioTrack";
+ String ON_PARTICIPANT_REMOVED_AUDIO_TRACK = "onParticipantRemovedAudioTrack";
  String ON_PARTICIPANT_ENABLED_VIDEO_TRACK = "onParticipantEnabledVideoTrack";
  String ON_PARTICIPANT_DISABLED_VIDEO_TRACK = "onParticipantDisabledVideoTrack";
  String ON_PARTICIPANT_ENABLED_AUDIO_TRACK = "onParticipantEnabledAudioTrack";
@@ -699,12 +705,14 @@ private RemoteParticipant.Listener mediaListener() {
  return new RemoteParticipant.Listener() {
  @Override
  public void onAudioTrackSubscribed(RemoteParticipant participant, RemoteAudioTrackPublication publication, RemoteAudioTrack audioTrack) {
-
+ WritableMap event = buildParticipantVideoEvent(participant, publication);
+ pushEvent(CustomTwilioVideoView.this, ON_PARTICIPANT_ADDED_AUDIO_TRACK, event);
  }
 
  @Override
  public void onAudioTrackUnsubscribed(RemoteParticipant participant, RemoteAudioTrackPublication publication, RemoteAudioTrack audioTrack) {
-
+ WritableMap event = buildParticipantVideoEvent(participant, publication);
+ pushEvent(CustomTwilioVideoView.this, ON_PARTICIPANT_REMOVED_AUDIO_TRACK, event);
  }
 
  @Override

android/src/main/java/com/twiliorn/library/CustomTwilioVideoViewManager.java

@@ -28,6 +28,8 @@
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_VIDEO_CHANGED;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ADDED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_REMOVED_VIDEO_TRACK;
+import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ADDED_AUDIO_TRACK;
+import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_REMOVED_AUDIO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ENABLED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_DISABLED_VIDEO_TRACK;
 import static com.twiliorn.library.CustomTwilioVideoView.Events.ON_PARTICIPANT_ENABLED_AUDIO_TRACK;
@@ -109,12 +111,14 @@ public Map getExportedCustomDirectEventTypeConstants() {
  ON_PARTICIPANT_DISCONNECTED, MapBuilder.of("registrationName", ON_PARTICIPANT_DISCONNECTED),
  ON_PARTICIPANT_ADDED_VIDEO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_ADDED_VIDEO_TRACK),
  ON_PARTICIPANT_REMOVED_VIDEO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_REMOVED_VIDEO_TRACK),
+ ON_PARTICIPANT_ADDED_AUDIO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_ADDED_AUDIO_TRACK),
+ ON_PARTICIPANT_REMOVED_AUDIO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_REMOVED_AUDIO_TRACK)
+ ));
+ map.putAll(MapBuilder.of(
  ON_PARTICIPANT_ENABLED_VIDEO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_ENABLED_VIDEO_TRACK),
  ON_PARTICIPANT_DISABLED_VIDEO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_DISABLED_VIDEO_TRACK),
  ON_PARTICIPANT_ENABLED_AUDIO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_ENABLED_AUDIO_TRACK),
- ON_PARTICIPANT_DISABLED_AUDIO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_DISABLED_AUDIO_TRACK)
- ));
- map.putAll(MapBuilder.of(
+ ON_PARTICIPANT_DISABLED_AUDIO_TRACK, MapBuilder.of("registrationName", ON_PARTICIPANT_DISABLED_AUDIO_TRACK),
  ON_STATS_RECEIVED, MapBuilder.of("registrationName", ON_STATS_RECEIVED)
  ));
 

src/TwilioVideo.android.js

@@ -63,6 +63,20 @@ const propTypes = {
  */
  onParticipantRemovedVideoTrack: PropTypes.func,
 
+ /**
+ * Called when a new audio track has been added
+ *
+ * @param {{participant, track}}
+ */
+ onParticipantAddedAudioTrack: PropTypes.func,
+
+ /**
+ * Called when a audio track has been removed
+ *
+ * @param {{participant, track}}
+ */
+ onParticipantRemovedAudioTrack: PropTypes.func,
+
  /**
  * Callback called a participant enters a room.
  */
@@ -172,6 +186,8 @@ class CustomTwilioVideoView extends Component {
  'onRoomDidDisconnect',
  'onParticipantAddedVideoTrack',
  'onParticipantRemovedVideoTrack',
+ 'onParticipantAddedAudioTrack',
+ 'onParticipantRemovedAudioTrack',
  'onRoomParticipantDidConnect',
  'onRoomParticipantDidDisconnect',
  'onParticipantEnabledVideoTrack',