Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -545,7 +545,7 @@ class Settings : FragmentedStorageFileJson() {
     class Browsing {
         @FormField(R.string.enable_video_cache, FieldForm.TOGGLE, R.string.cache_to_quickly_load_previously_fetched_videos, 0)
         @Serializable(with = FlexibleBooleanSerializer::class)
-        var videoCache: Boolean = true;
+        var videoCache: Boolean = false; //Temporary default disabled to prevent ui freeze?
     }
 
     @FormField(R.string.casting, "group", R.string.configure_casting, 9)

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -1298,12 +1298,12 @@ class VideoDetailView : ConstraintLayout {
             setTabIndex(0, true)
         } else {
             if (Settings.instance.comments.recommendationsDefault) {
-                setTabIndex(2)
+                setTabIndex(2, true)
             } else {
                 when(Settings.instance.comments.defaultCommentSection) {
-                    0 -> if(Settings.instance.other.polycentricEnabled) setTabIndex(0) else setTabIndex(1);
-                    1 -> setTabIndex(1);
-                    2 -> setTabIndex(StateMeta.instance.getLastCommentSection())
+                    0 -> if(Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true);
+                    1 -> setTabIndex(1, true);
+                    2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
                 }
             }
         }
@@ -1334,6 +1334,7 @@ class VideoDetailView : ConstraintLayout {
         setDescription(video.description.fixHtmlLinks());
         _creatorThumbnail.setThumbnail(video.author.thumbnail, false);
 
+
         val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(video.author.url, true);
         if (cachedPolycentricProfile != null) {
             setPolycentricProfile(cachedPolycentricProfile, animate = false);
@@ -1493,6 +1494,7 @@ class VideoDetailView : ConstraintLayout {
         if(video.isLive && video.live == null && !video.video.videoSources.any())
             startLiveTry(video);
 
+
         _player.updateNextPrevious();
         updateMoreButtons();
 
@@ -1618,7 +1620,6 @@ class VideoDetailView : ConstraintLayout {
                         });
                 else
                     _player.setArtwork(null);
-
                 _player.setSource(videoSource, audioSource, _playWhenReady, false);
                 if(subtitleSource != null)
                     _player.swapSubtitles(fragment.lifecycleScope, subtitleSource);