- Ran a code formatter to sort out my spacing
 - Refactored hasMediaPlayerAudioTracks(..)
 - Injected UserAgent rather than hardcoding a string
master
Alex Eyre 7 years ago
parent 0bbc3372b9
commit 6c23e4238f
  1. 12
      Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java

@ -52,6 +52,7 @@ import org.floens.chan.core.cache.FileCache;
import org.floens.chan.core.cache.FileCacheDownloader; import org.floens.chan.core.cache.FileCacheDownloader;
import org.floens.chan.core.cache.FileCacheListener; import org.floens.chan.core.cache.FileCacheListener;
import org.floens.chan.core.cache.FileCacheProvider; import org.floens.chan.core.cache.FileCacheProvider;
import org.floens.chan.core.di.UserAgentProvider;
import org.floens.chan.core.model.PostImage; import org.floens.chan.core.model.PostImage;
import org.floens.chan.core.settings.ChanSettings; import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.utils.AndroidUtils; import org.floens.chan.utils.AndroidUtils;
@ -80,6 +81,9 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener
@Inject @Inject
ImageLoader imageLoader; ImageLoader imageLoader;
@Inject
UserAgentProvider userAgent;
private ImageView playView; private ImageView playView;
private PostImage postImage; private PostImage postImage;
@ -413,7 +417,7 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener
exoPlayer = ExoPlayerFactory.newSimpleInstance(getContext()); exoPlayer = ExoPlayerFactory.newSimpleInstance(getContext());
exoVideoView.setPlayer(exoPlayer); exoVideoView.setPlayer(exoPlayer);
DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getContext(), DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getContext(),
Util.getUserAgent(getContext(),"Clover")); Util.getUserAgent(getContext(), userAgent.getUserAgent()));
MediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) MediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory)
.createMediaSource(android.net.Uri.fromFile(file)); .createMediaSource(android.net.Uri.fromFile(file));
@ -484,11 +488,7 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener
} }
private boolean hasMediaPlayerAudioTracks(ExoPlayer mediaPlayer) { private boolean hasMediaPlayerAudioTracks(ExoPlayer mediaPlayer) {
if(mediaPlayer.getAudioComponent() == null) { return mediaPlayer.getAudioComponent() != null;
return false;
} else {
return true;
}
} }
private void onVideoError() { private void onVideoError() {

Loading…
Cancel
Save