Skip to content

Commit

Permalink
Merge branch 'develop' into feature/introduce-player-adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
stonko1994 committed Aug 26, 2024
2 parents 1988b97 + 1c6d2f5 commit 252f8cd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 33 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Removed
- Unintentionally public initializers from `ConvivaAnalyticsIntegration` which were not intended to be public and only meant for testing

## 2.6.0 - 2024-08-13
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,42 +51,23 @@ public ConvivaAnalyticsIntegration(Player player, String customerKey, Context co
this(player, customerKey, context, new ConvivaConfig());
}

public ConvivaAnalyticsIntegration(Player player,
String customerKey,
Context context,
ConvivaConfig config) {
this(player, customerKey, context, config, null);
}

public ConvivaAnalyticsIntegration(Player player,
String customerKey,
Context context,
ConvivaConfig config,
ConvivaVideoAnalytics videoAnalytics
public ConvivaAnalyticsIntegration(
Player player,
String customerKey,
Context context,
ConvivaConfig config
) {
this(player, customerKey, context, config, videoAnalytics, null);
this(player, customerKey, context, config, null, null, null);
}

public ConvivaAnalyticsIntegration(Player player,
String customerKey,
Context context,
ConvivaConfig config,
ConvivaVideoAnalytics videoAnalytics,
ConvivaAdAnalytics adAnalytics
) {
this(player, customerKey, context, config, videoAnalytics, adAnalytics, null);
}

/**
* For testing purposes only.
*/
ConvivaAnalyticsIntegration(Player player,
String customerKey,
Context context,
ConvivaConfig config,
ConvivaVideoAnalytics videoAnalytics,
ConvivaAdAnalytics adAnalytics,
DefaultSsaiApi ssai
ConvivaAnalyticsIntegration(
Player player,
String customerKey,
Context context,
ConvivaConfig config,
ConvivaVideoAnalytics videoAnalytics,
ConvivaAdAnalytics adAnalytics,
DefaultSsaiApi ssai
) {
this.player = new DefaultPlayerDecorator(player);
Map<String, Object> settings = new HashMap<>();
Expand Down

0 comments on commit 252f8cd

Please sign in to comment.