Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2856 from AntennaPod/bugfix/2855-ias-external-player

Browse Source 
2855 Cancel UI media info update when fragment is destroyed
This commit is contained in:
H. Lehmann 2018-10-14 19:54:33 +02:00 committed by GitHub
commit a637725093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -150,7 +150,7 @@ dependencies {
implementation "com.android.support:gridlayout-v7:$supportVersion" implementation "com.android.support:gridlayout-v7:$supportVersion"
implementation "com.android.support:percent:$supportVersion" implementation "com.android.support:percent:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion" implementation "com.android.support:recyclerview-v7:$supportVersion"
provided 'com.google.android.wearable:wearable:2.2.0' compileOnly 'com.google.android.wearable:wearable:2.2.0'
implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") { implementation("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
exclude group: "org.json", module: "json" exclude group: "org.json", module: "json"

22
app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
View File

@ -20,10 +20,10 @@ import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.MediaType; import de.danoeh.antennapod.core.feed.MediaType;
import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.core.glide.ApGlideSettings;
import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.service.playback.PlaybackService;
import de.danoeh.antennapod.core.util.Converter;
import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.Playable;
import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.core.util.playback.PlaybackController;
import rx.Single; import rx.Single;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers; import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers; import rx.schedulers.Schedulers;
@ -41,6 +41,7 @@ public class ExternalPlayerFragment extends Fragment {
private TextView mFeedName; private TextView mFeedName;
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private PlaybackController controller; private PlaybackController controller;
private Subscription subscription;
public ExternalPlayerFragment() { public ExternalPlayerFragment() {
super(); super();
@ -81,7 +82,7 @@ public class ExternalPlayerFragment extends Fragment {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
controller = setupPlaybackController(); controller = setupPlaybackController();
butPlay.setOnClickListener(v -> { butPlay.setOnClickListener(v -> {
if(controller != null) { if (controller != null) {
controller.playPause(); controller.playPause();
} }
}); });
@ -142,6 +143,9 @@ public class ExternalPlayerFragment extends Fragment {
if (controller != null) { if (controller != null) {
controller.release(); controller.release();
} }
if (subscription != null) {
subscription.unsubscribe();
}
} }
@Override @Override
@ -162,7 +166,7 @@ public class ExternalPlayerFragment extends Fragment {
controller = setupPlaybackController(); controller = setupPlaybackController();
if (butPlay != null) { if (butPlay != null) {
butPlay.setOnClickListener(v -> { butPlay.setOnClickListener(v -> {
if(controller != null) { if (controller != null) {
controller.playPause(); controller.playPause();
} }
}); });
@ -177,7 +181,10 @@ public class ExternalPlayerFragment extends Fragment {
return false; return false;
} }
Single.create(subscriber -> subscriber.onSuccess(controller.getMedia())) if (subscription != null) {
subscription.unsubscribe();
}
subscription = Single.create(subscriber -> subscriber.onSuccess(controller.getMedia()))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(media -> updateUi((Playable) media)); .subscribe(media -> updateUi((Playable) media));
@ -206,15 +213,10 @@ public class ExternalPlayerFragment extends Fragment {
butPlay.setVisibility(View.VISIBLE); butPlay.setVisibility(View.VISIBLE);
} }
} else { } else {
Log.w(TAG, "loadMediaInfo was called while the media object of playbackService was null!"); Log.w(TAG, "loadMediaInfo was called while the media object of playbackService was null!");
} }
} }
private String getPositionString(int position, int duration) {
return Converter.getDurationStringLong(position) + " / "
+ Converter.getDurationStringLong(duration);
}
public PlaybackController getPlaybackControllerTestingOnly() { public PlaybackController getPlaybackControllerTestingOnly() {
return controller; return controller;
} }