about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-02-14 11:37:48 +0300
committerfox <fox@fakecake.org>2026-02-14 11:37:48 +0300
commitb1b861d008fc8a0fca76a1cb1062e6ad574bf3d1 (patch)
tree04a63bfe92eec5295c0d9861f7a76089c5dda524
parente9eed993b8df03227754a9d423c82bf803574640 (diff)
parent6928b1c93692e9229a2b1c67117eb24da51adfc7 (diff)
downloadtt-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
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java10
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java7
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/strings.xml1
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml4
4 files changed, 19 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());
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index f6e76a77..670cc68e 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -320,4 +320,5 @@
     <string name="prefs_mutual_tls">Mutual TLS</string>
     <string name="prefs_mtls_enabled">Enable mTLS</string>
     <string name="prefs_mtls_pick_certificate">Choose client certificate</string>
+    <string name="prefs_loop_videos">Loop videos</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 9688a3c3..36777fec 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -194,6 +194,10 @@
             android:key="article_javascript_enabled"
             android:summary="@string/article_enable_javascript_summary"
             android:title="@string/article_enable_javascript" />
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="loop_videos"
+            android:title="@string/prefs_loop_videos" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/prefs_opening_links" >
         <SwitchPreferenceCompat