Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 22:57:29 +00:00
Code Issues Releases Wiki Activity

Remove null check for player

Browse Source
This commit is contained in:
Ammar Githam 2020-08-22 16:27:47 +09:00
parent f6a224ec01
commit 972c3f371c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/awais/instagrabber/customviews/helpers/VideoAwareRecyclerScroller.java
View File

@ -20,7 +20,6 @@ import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory; import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
import com.google.android.exoplayer2.upstream.cache.SimpleCache; import com.google.android.exoplayer2.upstream.cache.SimpleCache;
import com.google.android.exoplayer2.video.VideoListener;
import java.util.List; import java.util.List;
@ -237,28 +236,26 @@ public class VideoAwareRecyclerScroller extends RecyclerView.OnScrollListener {
if (playerView == null) return; if (playerView == null) return;
playerView.setPlayer(player); playerView.setPlayer(player);
if (player != null) { btnMute = itemView.findViewById(R.id.btnMute);
btnMute = itemView.findViewById(R.id.btnMute);
float vol = settingsHelper.getBoolean(Constants.MUTED_VIDEOS) ? 0f : 1f; float vol = settingsHelper.getBoolean(Constants.MUTED_VIDEOS) ? 0f : 1f;
if (vol == 0f && Utils.sessionVolumeFull) vol = 1f; if (vol == 0f && Utils.sessionVolumeFull) vol = 1f;
player.setVolume(vol); player.setVolume(vol);
if (btnMute != null) { if (btnMute != null) {
btnMute.setVisibility(View.VISIBLE); btnMute.setVisibility(View.VISIBLE);
btnMute.setImageResource(vol == 0f ? R.drawable.vol : R.drawable.mute); btnMute.setImageResource(vol == 0f ? R.drawable.vol : R.drawable.mute);
btnMute.setOnClickListener(muteClickListener); btnMute.setOnClickListener(muteClickListener);
}
final DataSource.Factory factory = cacheDataSourceFactory != null ? cacheDataSourceFactory : dataSourceFactory;
final ProgressiveMediaSource.Factory sourceFactory = new ProgressiveMediaSource.Factory(factory);
final ProgressiveMediaSource mediaSource = sourceFactory.createMediaSource(Uri.parse(feedModels.get(itemPos).getDisplayUrl()));
player.setRepeatMode(Player.REPEAT_MODE_ALL);
player.prepare(mediaSource);
player.setVolume(vol);
playerView.setOnClickListener(v -> player.setPlayWhenReady(!player.getPlayWhenReady()));
} }
final DataSource.Factory factory = cacheDataSourceFactory != null ? cacheDataSourceFactory : dataSourceFactory;
final ProgressiveMediaSource.Factory sourceFactory = new ProgressiveMediaSource.Factory(factory);
final ProgressiveMediaSource mediaSource = sourceFactory.createMediaSource(Uri.parse(feedModels.get(itemPos).getDisplayUrl()));
player.setRepeatMode(Player.REPEAT_MODE_ALL);
player.prepare(mediaSource);
player.setVolume(vol);
playerView.setOnClickListener(v -> player.setPlayWhenReady(!player.getPlayWhenReady()));
} }
if (videoChangeCallback != null) videoChangeCallback.playerChanged(itemPos, player); if (videoChangeCallback != null) videoChangeCallback.playerChanged(itemPos, player);