Skip to content

Commit

Permalink
[PLAYER-4828] [PLAYER-4832] Fixed regression from PLAYER-4818, update…
Browse files Browse the repository at this point in the history
…d CompleteSamp… …leApp with Android 9 fixes (#401)

* [PLAYER-4828] Fix for http url of VAST AD

* [PLAYER-4832] Fixed regression from PLAYER-4818, updated CompleteSampleApp with Android 9 fixes
  • Loading branch information
SergeyBicarte authored Nov 30, 2018
1 parent 0c2fa02 commit 927d0f4
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 2 deletions.
3 changes: 2 additions & 1 deletion AdvancedPlaybackSampleApp/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat">
android:theme="@style/Theme.AppCompat"
android:usesCleartextTraffic="true">

<activity
android:name="com.ooyala.sample.lists.AdvancedPlaybackListActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ void completePlayerSetup(boolean asked) {
Options options = new Options.Builder().setUseExoPlayer(true).build();
player = new OoyalaPlayer(pcode, new PlayerDomain(domain), options);
playerLayoutController = new OoyalaPlayerLayoutController(playerLayout, player);
player.enableSSL(false);
player.addObserver(this);

// Set up performance monitoring to watch standard events and ads events.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ public void setVisible(boolean visible) {
}
}

@Override
public void refresh() {

}

protected abstract void updateButtonStates();

protected abstract void setupControls();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,10 @@ public void setVisible(boolean b) {
public void update(Observable observable, Object o) {

}

@Override
public void refresh() {

}

}
5 changes: 4 additions & 1 deletion CompleteSampleApp/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat">
android:theme="@style/Theme.AppCompat"
android:usesCleartextTraffic="true">

<uses-library android:name="org.apache.http.legacy" android:required="false" />

<service android:name="com.adobe.adobepass.accessenabler.api.AccessEnablerService"
android:label="AccessEnabler service"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ void completePlayerSetup(boolean asked) {
Options options = new Options.Builder().setUseExoPlayer(true).build();
player = new OoyalaPlayer(PCODE, new PlayerDomain(DOMAIN), options);
playerLayoutController = new OoyalaPlayerLayoutController(playerLayout, player);
player.enableSSL(false);
player.addObserver(this);

// Set up performance monitoring to watch standard events and ads events.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ public void setVisible(boolean visible) {
}
}

@Override
public void refresh() {

}

protected abstract void updateButtonStates();

protected abstract void setupControls();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public void setVisible(boolean b) {

}

@Override
public void refresh() {

}

@Override
public void update(Observable observable, Object o) {

Expand Down

0 comments on commit 927d0f4

Please sign in to comment.