diff options
| author | fox <fox@fakecake.org> | 2026-02-14 11:37:48 +0300 |
|---|---|---|
| committer | fox <fox@fakecake.org> | 2026-02-14 11:37:48 +0300 |
| commit | b1b861d008fc8a0fca76a1cb1062e6ad574bf3d1 (patch) | |
| tree | 04a63bfe92eec5295c0d9861f7a76089c5dda524 /org.fox.ttrss/src/main/java | |
| parent | e9eed993b8df03227754a9d423c82bf803574640 (diff) | |
| parent | 6928b1c93692e9229a2b1c67117eb24da51adfc7 (diff) | |
| download | tt-rss-android-b1b861d008fc8a0fca76a1cb1062e6ad574bf3d1.tar.gz tt-rss-android-b1b861d008fc8a0fca76a1cb1062e6ad574bf3d1.tar.xz | |
Merge branch 'dev' into 'master' 26.02-b1b861d0-signed
make looping videos optional See merge request git/tt-rss/tt-rss-android!64
Diffstat (limited to 'org.fox.ttrss/src/main/java')
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java | 10 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index 8e2a19f9..05677eec 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -1,5 +1,6 @@ package org.fox.ttrss; +import android.content.SharedPreferences; import android.media.MediaPlayer; import android.os.Bundle; import android.util.Log; @@ -17,6 +18,7 @@ import androidx.media3.common.Player; import androidx.media3.common.util.UnstableApi; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.ui.PlayerView; +import androidx.preference.PreferenceManager; public class GalleryVideoFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); @@ -24,10 +26,13 @@ public class GalleryVideoFragment extends GalleryBaseFragment { String m_url; String m_coverUrl; MediaPlayer m_mediaPlayer; + private SharedPreferences m_prefs; public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); + if (savedInstanceState != null) { m_url = savedInstanceState.getString("m_url"); m_coverUrl = savedInstanceState.getString("m_coverUrl"); @@ -70,7 +75,10 @@ public class GalleryVideoFragment extends GalleryBaseFragment { player.setMediaItem(MediaItem.fromUri(m_url)); player.prepare(); player.setPlayWhenReady(true); - player.setRepeatMode(Player.REPEAT_MODE_ONE); + + if (m_prefs.getBoolean("loop_videos", false)) + player.setRepeatMode(Player.REPEAT_MODE_ONE); + player.addListener(new Player.Listener() { @Override public void onPlayerError(PlaybackException error) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 295a6dd7..1f90b57d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1147,7 +1147,10 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { player.setMediaItem(MediaItem.fromUri(article.flavorStreamUri)); player.prepare(); player.setPlayWhenReady(false); - player.setRepeatMode(Player.REPEAT_MODE_ONE); + + // should this be a separate setting? + if (m_prefs.getBoolean("loop_videos", false)) + player.setRepeatMode(Player.REPEAT_MODE_ONE); holder.flavorVideoView.setVisibility(View.VISIBLE); @@ -1158,7 +1161,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { player.addListener(new Player.Listener() { @Override - public void onPlayerError(PlaybackException error) { + public void onPlayerError(@NonNull PlaybackException error) { Log.d(TAG, "onPlayerError:" + error); m_activity.toast(error.getMessage()); |
