From 14ca32a624d874051e680c3843b837d70266caee Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 25 Jul 2018 23:19:25 +0200 Subject: Simplifications --- .../java/de/danoeh/antennapod/activity/AudioplayerActivity.java | 7 +------ .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 9 ++++++--- .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java | 6 +----- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java index 2651a1527..67dda01cf 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -26,12 +26,7 @@ public class AudioplayerActivity extends MediaplayerInfoActivity { protected void onResume() { super.onResume(); if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) { - Intent intent = getIntent(); - if (intent.getData() == null) { - return; - } - playExternalMedia(intent.getData().getPath(), MediaType.AUDIO); - + playExternalMedia(getIntent(), MediaType.AUDIO); } else if (PlaybackService.isCasting()) { Intent intent = PlaybackService.getPlayerActivityIntent(this); if (intent.getComponent() != null && diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index e88b2be7b..be9d60c93 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -964,7 +964,10 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements } } - void playExternalMedia(String path, MediaType type) { + void playExternalMedia(Intent intent, MediaType type) { + if (intent == null || intent.getData() == null) { + return; + } if (Build.VERSION.SDK_INT >= 23 && ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { @@ -978,8 +981,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements return; } - Log.d(TAG, "Received VIEW intent: " + path); - ExternalMedia media = new ExternalMedia(path, type); + Log.d(TAG, "Received VIEW intent: " + intent.getData().getPath()); + ExternalMedia media = new ExternalMedia(intent.getData().getPath(), type); new PlaybackServiceStarter(this, media) .startWhenPrepared(true) diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index 1392292a3..ea408c650 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -77,11 +77,7 @@ public class VideoplayerActivity extends MediaplayerActivity { protected void onResume() { super.onResume(); if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) { - Intent intent = getIntent(); - if (intent.getData() == null) { - return; - } - playExternalMedia(intent.getData().getPath(), MediaType.VIDEO); + playExternalMedia(getIntent(), MediaType.VIDEO); } else if (PlaybackService.isCasting()) { Intent intent = PlaybackService.getPlayerActivityIntent(this); if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) { -- cgit v1.2.3