diff options
author | ByteHamster <info@bytehamster.com> | 2021-05-22 20:31:37 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-05-22 20:31:37 +0200 |
commit | ea47118a981215b408f8aef44ed5c1bcd616908b (patch) | |
tree | 0d472e8d7a3bf7224a630052ba39ddfe339d2cad /app | |
parent | 65b5efb4f22d5146091e1b6e7d6bf85fe913f773 (diff) | |
parent | d9fdca4d03e14061d324498ca4d385d810cf7c12 (diff) | |
download | AntennaPod-ea47118a981215b408f8aef44ed5c1bcd616908b.zip |
Merge branch 'master' into develop
Diffstat (limited to 'app')
-rw-r--r-- | app/build.gradle | 4 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle index 658e52a0e..5db6f00a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { // Version code schema: // "1.2.3-beta4" -> 1020304 // "1.2.3" -> 1020395 - versionCode 2020003 - versionName "2.2.0-beta3" + versionCode 2020195 + versionName "2.2.1" def commit = "" try { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java index 370c4c301..8e070738c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java @@ -80,17 +80,17 @@ public class ExternalPlayerFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); butPlay.setOnClickListener(v -> { - if (controller != null) { - if (controller.getMedia().getMediaType() == MediaType.VIDEO - && controller.getStatus() != PlayerStatus.PLAYING) { - controller.playPause(); - getContext().startActivity(PlaybackService - .getPlayerActivityIntent(getContext(), controller.getMedia())); - } else { - controller.playPause(); - } + if (controller == null) { + return; + } + if (controller.getMedia() != null && controller.getMedia().getMediaType() == MediaType.VIDEO + && controller.getStatus() != PlayerStatus.PLAYING) { + controller.playPause(); + getContext().startActivity(PlaybackService + .getPlayerActivityIntent(getContext(), controller.getMedia())); + } else { + controller.playPause(); } - }); loadMediaInfo(); } |