Skip to content

Commit

Permalink
Patch - 4.13.4 -FEC-11127
Browse files Browse the repository at this point in the history
  • Loading branch information
giladna committed Apr 21, 2021
2 parents fbd5a87 + 1d06f69 commit 4cd8f97
Show file tree
Hide file tree
Showing 14 changed files with 2,359 additions and 655 deletions.
3 changes: 2 additions & 1 deletion youboraplugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
implementation 'com.kaltura.playkit:playkit:4.13.3'
//implementation project(":playkit")

api 'com.npaw.youbora:youboralib:6.7.24'
api 'com.nicepeopleatwork:youboralib:6.7.32'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.3.0'
Expand All @@ -42,6 +42,7 @@ repositories {
google()
jcenter()
mavenCentral()
maven { url "https://npaw.jfrog.io/artifactory/youbora/" }
maven { url "https://jitpack.io" }
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
package com.kaltura.playkit.plugins.youbora.pluginconfig;

import com.google.gson.annotations.SerializedName;

public class AdCustomDimensions {
@SerializedName(value="adCustomDimension1", alternate={"param1"})
private String adCustomDimension1;
@SerializedName(value="adCustomDimension2", alternate={"param2"})
private String adCustomDimension2;
@SerializedName(value="adCustomDimension3", alternate={"param3"})
private String adCustomDimension3;
@SerializedName(value="adCustomDimension4", alternate={"param4"})
private String adCustomDimension4;
@SerializedName(value="adCustomDimension5", alternate={"param5"})
private String adCustomDimension5;
@SerializedName(value="adCustomDimension6", alternate={"param6"})
private String adCustomDimension6;
@SerializedName(value="adCustomDimension7", alternate={"param7"})
private String adCustomDimension7;
@SerializedName(value="adCustomDimension8", alternate={"param8"})
private String adCustomDimension8;
@SerializedName(value="adCustomDimension9", alternate={"param9"})
private String adCustomDimension9;
@SerializedName(value="adCustomDimension10", alternate={"param10"})
private String adCustomDimension10;

public String getAdCustomDimension1() {
return adCustomDimension1;
}

public void setAdCustomDimension1(String adCustomDimension1) {
this.adCustomDimension1 = adCustomDimension1;
}

public String getAdCustomDimension2() {
return adCustomDimension2;
}

public void setAdCustomDimension2(String adCustomDimension2) {
this.adCustomDimension2 = adCustomDimension2;
}

public String getAdCustomDimension3() {
return adCustomDimension3;
}

public void setAdCustomDimension3(String adCustomDimension3) {
this.adCustomDimension3 = adCustomDimension3;
}

public String getAdCustomDimension4() {
return adCustomDimension4;
}

public void setAdCustomDimension4(String adCustomDimension4) {
this.adCustomDimension4 = adCustomDimension4;
}

public String getAdCustomDimension5() {
return adCustomDimension5;
}

public void setAdCustomDimension5(String adCustomDimension5) {
this.adCustomDimension5 = adCustomDimension5;
}

public String getAdCustomDimension6() {
return adCustomDimension6;
}

public void setAdCustomDimension6(String adCustomDimension6) {
this.adCustomDimension6 = adCustomDimension6;
}

public String getAdCustomDimension7() {
return adCustomDimension7;
}

public void setAdCustomDimension7(String adCustomDimension7) {
this.adCustomDimension7 = adCustomDimension7;
}

public String getAdCustomDimension8() {
return adCustomDimension8;
}

public void setAdCustomDimension8(String adCustomDimension8) {
this.adCustomDimension8 = adCustomDimension8;
}

public String getAdCustomDimension9() {
return adCustomDimension9;
}

public void setAdCustomDimension9(String adCustomDimension9) {
this.adCustomDimension9 = adCustomDimension9;
}

public String getAdCustomDimension10() {
return adCustomDimension10;
}

public void setAdCustomDimension10(String adCustomDimension10) {
this.adCustomDimension10 = adCustomDimension10;
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,95 @@
package com.kaltura.playkit.plugins.youbora.pluginconfig;

import com.google.gson.annotations.SerializedName;

import java.util.ArrayList;

public class Ads {

private String campaign;
private ExtraParams extraParams;
private ArrayList<Integer> adBreaksTime;
@SerializedName(value="adCampaign", alternate={"campaign"})
private String adCampaign;
private String adCreativeId;
private Integer adExpectedBreaks;
//private Bundle adExpectedPattern;
private Integer adGivenBreaks;
//private Bundle adMetadata;
private String adProvider;
private String adResource;
private String adTitle;

@SerializedName(value="adCustomDimensions", alternate={"extraParams"})
private AdCustomDimensions adCustomDimensions;

public ArrayList<Integer> getAdBreaksTime() {
return adBreaksTime;
}

public void setAdBreaksTime(ArrayList<Integer> adBreaksTime) {
this.adBreaksTime = adBreaksTime;
}

public String getAdCampaign() {
return adCampaign;
}

public void setAdCampaign(String adCampaign) {
this.adCampaign = adCampaign;
}

public String getAdCreativeId() {
return adCreativeId;
}

public void setAdCreativeId(String adCreativeId) {
this.adCreativeId = adCreativeId;
}

public Integer getAdExpectedBreaks() {
return adExpectedBreaks;
}

public void setAdExpectedBreaks(Integer adExpectedBreaks) {
this.adExpectedBreaks = adExpectedBreaks;
}

public Integer getAdGivenBreaks() {
return adGivenBreaks;
}

public void setAdGivenBreaks(Integer adGivenBreaks) {
this.adGivenBreaks = adGivenBreaks;
}

public String getAdProvider() {
return adProvider;
}

public void setAdProvider(String adProvider) {
this.adProvider = adProvider;
}

public String getAdResource() {
return adResource;
}

public void setAdResource(String adResource) {
this.adResource = adResource;
}

public String getCampaign() {
return campaign;
public String getAdTitle() {
return adTitle;
}

public void setCampaign(String campaign) {
this.campaign = campaign;
public void setAdTitle(String adTitle) {
this.adTitle = adTitle;
}

public ExtraParams getExtraParams() {
return extraParams;
public AdCustomDimensions getAdCustomDimensions() {
return adCustomDimensions;
}

public void setExtraParams(ExtraParams extraParams) {
this.extraParams = extraParams;
public void setAdCustomDimensions(AdCustomDimensions adCustomDimensions) {
this.adCustomDimensions = adCustomDimensions;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.kaltura.playkit.plugins.youbora.pluginconfig;

public class App {
private String appName = "";
private String appReleaseVersion = "";

public String getAppName() {
return appName;
}

public void setAppName(String appName) {
this.appName = appName;
}

public String getAppReleaseVersion() {
return appReleaseVersion;
}

public void setAppReleaseVersion(String appReleaseVersion) {
this.appReleaseVersion = appReleaseVersion;
}
}
Loading

0 comments on commit 4cd8f97

Please sign in to comment.