Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplifications

This commit is contained in:
ByteHamster 2018-07-25 23:19:25 +02:00
parent 0d43cc8658
commit 14ca32a624
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
View File

@ -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 &&

9
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -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)

6
app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
View File

@ -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())) {