POST fix.

app/build.gradle

@@ -162,14 +162,14 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
     //HTTP
-    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     //JSON
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" //Used for structured json
     implementation 'com.google.code.gson:gson:2.10.1' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
 
     //JS
-    implementation("com.caoccao.javet:javet-android:3.0.3")
+    implementation("com.caoccao.javet:javet-android:3.0.2")
 
     //Exoplayer
     implementation 'androidx.media3:media3-exoplayer:1.2.1'
@@ -179,8 +179,8 @@ dependencies {
     implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.1'
     implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.1'
     implementation 'androidx.media3:media3-transformer:1.2.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
     implementation 'androidx.media:media:1.7.0'
 
     //Other
@@ -189,7 +189,7 @@ dependencies {
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.arthenica:ffmpeg-kit-full:5.1'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.21'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
     implementation 'com.google.zxing:core:3.4.1'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
@@ -214,7 +214,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.9.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.8.22"
     testImplementation "org.xmlunit:xmlunit-core:2.9.1"
     testImplementation "org.mockito:mockito-core:5.4.0"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/src/main/assets/devportal/plugin.d.ts

@@ -243,7 +243,9 @@ declare class DashSource implements IVideoSource {
 
 declare interface IRequest {
     url: string,
-    headers: Map<string, string>
+    headers: Map<string, string>,
+    method: string,
+    body?: string
 }
 declare interface IRequestModifierDef {
     allowByteSkip: boolean
@@ -251,7 +253,7 @@ declare interface IRequestModifierDef {
 declare class RequestModifier {
     constructor(obj: IRequestModifierDef) { }
 
-    modifyRequest(url: string, headers: Map<string, string>): IRequest;
+    modifyRequest(url: string, headers: Map<string, string>, method: string, body?: string): IRequest;
 }
 
 //Channel

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

@@ -1,4 +1,4 @@
-import androidx.annotation.OptIn
+
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.datasource.HttpDataSource

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -38,17 +37,11 @@ import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
-import com.futo.platformplayer.states.StateSubscriptionGroups
-import com.futo.platformplayer.states.StateSubscriptions
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
 import com.futo.platformplayer.views.LoaderView
-import com.futo.platformplayer.views.adapters.viewholders.SubscriptionGroupBarViewHolder
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuFilters
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
-import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuRecycler
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTextInput
 import com.futo.platformplayer.views.pills.RoundButton
 import com.futo.platformplayer.views.pills.RoundButtonGroup
@@ -94,37 +87,7 @@ class UISlideOverlays {
                         SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
                             subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
                         }, false),
-                        if(StateSubscriptionGroups.instance.getSubscriptionGroups().isNotEmpty())
-                            SlideUpMenuGroup(container.context, "Subscription Groups",
-                                "You can select which groups this subscription is part of.",
-                                -1, listOf()) else null,
-                        if(StateSubscriptionGroups.instance.getSubscriptionGroups().isNotEmpty())
-                            SlideUpMenuRecycler(container.context, "as") {
-                                val groups = ArrayList<SubscriptionGroup>(StateSubscriptionGroups.instance.getSubscriptionGroups()
-                                    .map { SubscriptionGroup.Selectable(it, it.urls.contains(subscription.channel.url)) }
-                                    .sortedBy { !it.selected });
-                                var adapter: AnyAdapterView<SubscriptionGroup, SubscriptionGroupBarViewHolder>? = null;
-                                adapter = it.asAny(groups, RecyclerView.HORIZONTAL) {
-                                    it.onClick.subscribe {
-                                        if(it is SubscriptionGroup.Selectable) {
-                                            val actualGroup = StateSubscriptionGroups.instance.getSubscriptionGroup(it.id)
-                                                ?: return@subscribe;
-                                            groups.clear();
-                                            if(it.selected)
-                                                actualGroup.urls.remove(subscription.channel.url);
-                                            else
-                                                actualGroup.urls.add(subscription.channel.url);
 
-                                            StateSubscriptionGroups.instance.updateSubscriptionGroup(actualGroup);
-                                            groups.addAll(StateSubscriptionGroups.instance.getSubscriptionGroups()
-                                                .map { SubscriptionGroup.Selectable(it, it.urls.contains(subscription.channel.url)) }
-                                                .sortedBy { !it.selected });
-                                            adapter?.notifyContentChanged();
-                                        }
-                                    }
-                                };
-                                return@SlideUpMenuRecycler adapter;
-                            } else null,
                         SlideUpMenuGroup(container.context, "Fetch Settings",
                             "Depending on the platform you might not need to enable a type for it to be available.",
                             -1, listOf()),
@@ -683,17 +646,9 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.actions), "actions",
                 (listOf(
-                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), "download", {
-                        showDownloadVideoOverlay(video, container, true);
-                    }, false),
-                    SlideUpMenuItem(container.context, R.drawable.ic_share, container.context.getString(R.string.share), "Share the video", "share", {
-                        val url = if(video.shareUrl.isNotEmpty()) video.shareUrl else video.url;
-                        container.context.startActivity(Intent.createChooser(Intent().apply {
-                            action = Intent.ACTION_SEND;
-                            putExtra(Intent.EXTRA_TEXT, url);
-                            type = "text/plain";
-                        }, null));
-                    }, false),
+                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), container.context.getString(R.string.download), {
+                            showDownloadVideoOverlay(video, container, true);
+                        }, false),
                     SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, container.context.getString(R.string.hide_creator_from_home), "", "hide_creator", {
                         StateMeta.instance.addHiddenCreator(video.author.url);
                         UIDialogs.toast(container.context, "[${video.author.name}] hidden, you may need to reload home");

app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt

@@ -12,7 +12,6 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
@@ -71,12 +70,6 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                         processHandle = ProcessHandle.create();
                         Store.instance.addProcessSecret(processHandle.processSecret);
 
-                        try {
-                            PolycentricStorage.instance.addProcessSecret(processHandle.processSecret)
-                        } catch (e: Throwable) {
-                            Logger.e(TAG, "Failed to save process secret to secret storage.", e)
-                        }
-
                         processHandle.addServer("https://srv1-stg.polycentric.io");
                         processHandle.setUsername(username);
                         StatePolycentric.instance.setProcessHandle(processHandle);

app/src/main/java/com/futo/platformplayer/activities/PolycentricImportProfileActivity.kt

@@ -13,7 +13,6 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
@@ -127,12 +126,6 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                 val processSecret = ProcessSecret(keyPair, Process.random());
                 Store.instance.addProcessSecret(processSecret);
 
-                try {
-                    PolycentricStorage.instance.addProcessSecret(processSecret)
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to save process secret to secret storage.", e)
-                }
-
                 val processHandle = processSecret.toProcessHandle();
 
                 for (e in exportBundle.events.eventsList) {

app/src/main/java/com/futo/platformplayer/api/media/models/modifier/AdhocRequestModifier.kt

@@ -1,14 +1,14 @@
 package com.futo.platformplayer.api.media.models.modifier
 
 class AdhocRequestModifier: IRequestModifier {
-    val _handler: (String, Map<String,String>)->IRequest;
+    val _handler: (String, Map<String,String>, String, String?)->IRequest;
     override var allowByteSkip: Boolean = false;
 
-    constructor(modifyReq: (String, Map<String,String>)->IRequest) {
+    constructor(modifyReq: (String, Map<String,String>, String, String?)->IRequest) {
         _handler = modifyReq;
     }
 
-    override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
-        return _handler(url, headers);
+    override fun modifyRequest(url: String, headers: Map<String, String>, method: String, body: String?): IRequest {
+        return _handler(url, headers, method, body);
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/modifier/IRequest.kt

@@ -1,6 +1,8 @@
 package com.futo.platformplayer.api.media.models.modifier
 
 interface IRequest {
+    val method: String?;
     val url: String?;
-    val headers: Map<String, String>;
+    val headers: Map<String, String>?;
+    val body: String?;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/modifier/IRequestModifier.kt

@@ -3,5 +3,5 @@ package com.futo.platformplayer.api.media.models.modifier
 
 interface IRequestModifier {
     var allowByteSkip: Boolean;
-    fun modifyRequest(url: String, headers: Map<String, String>): IRequest
+    fun modifyRequest(url: String, headers: Map<String, String>, method: String, body: String?): IRequest
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequest.kt

@@ -12,31 +12,40 @@ import com.futo.platformplayer.getOrDefault
 class JSRequest : IRequest {
     private val _v8Url: String?;
     private val _v8Headers: Map<String, String>?;
+    private val _v8Method: String?;
+    private val _v8Body: String?;
     private val _v8Options: Options?;
 
     override var url: String? = null;
     override lateinit var headers: Map<String, String>;
+    override var method: String? = null;
+    override var body: String? = null;
 
-    constructor(plugin: JSClient, url: String?, headers: Map<String, String>?, options: Options?, originalUrl: String?, originalHeaders: Map<String, String>?) {
+    constructor(plugin: JSClient, url: String?, headers: Map<String, String>?, method: String?, body: String?, options: Options?, originalUrl: String?, originalHeaders: Map<String, String>?, originalMethod: String?, originalBody: String?) {
         _v8Url = url;
         _v8Headers = headers;
+        _v8Method = method;
+        _v8Body = body;
         _v8Options = options;
-        initialize(plugin, originalUrl, originalHeaders);
+        initialize(plugin, originalUrl, originalHeaders, originalMethod, originalBody);
     }
-    constructor(plugin: JSClient, obj: V8ValueObject, originalUrl: String?, originalHeaders: Map<String, String>?, applyOtherHeadersByDefault: Boolean = false) {
+    constructor(plugin: JSClient, obj: V8ValueObject, originalUrl: String?, originalHeaders: Map<String, String>?, originalMethod: String?, originalBody: String?, applyOtherHeadersByDefault: Boolean = false) {
         val contextName = "ModifyRequestResponse";
         val config = plugin.config;
         _v8Url = obj.getOrDefault<String>(config, "url", contextName, null);
         _v8Headers = obj.getOrDefault<Map<String, String>>(config, "headers", contextName, null);
+        _v8Method = obj.getOrDefault<String>(config, "method", contextName, null);
+        _v8Body = obj.getOrDefault<String>(config, "body", contextName, null);
         _v8Options = obj.getOrDefault<V8ValueObject>(config, "options", "JSRequestModifier.options", null)?.let {
             Options(config, it, applyOtherHeadersByDefault);
         } ?: Options(null, null, applyOtherHeadersByDefault);
-        initialize(plugin, originalUrl, originalHeaders);
+        initialize(plugin, originalUrl, originalHeaders, originalMethod, originalBody);
     }
 
-    private fun initialize(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?) {
-        val config = plugin.config;
+    private fun initialize(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?, originalMethod: String?, originalBody: String?) {
         url = _v8Url ?: originalUrl;
+        method = _v8Method ?: originalMethod;
+        body = _v8Body ?: originalBody;
 
         if(_v8Options?.applyOtherHeaders ?: false) {
             val headersToSet = _v8Headers?.toMutableMap() ?: mutableMapOf();
@@ -69,8 +78,8 @@ class JSRequest : IRequest {
         }
     }
 
-    fun modify(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?): JSRequest {
-        return JSRequest(plugin, _v8Url, _v8Headers, _v8Options, originalUrl, originalHeaders);
+    fun modify(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?, originalMethod: String?, originalBody: String?): JSRequest {
+        return JSRequest(plugin, _v8Url, _v8Headers, _v8Method, _v8Body, _v8Options, originalUrl, originalHeaders, originalMethod, originalBody);
     }
 
 

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequestModifier.kt

@@ -1,6 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
-import android.net.Uri
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.modifier.IRequest
 import com.futo.platformplayer.api.media.models.modifier.IRequestModifier
@@ -8,9 +7,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrNull
-import com.futo.platformplayer.getOrThrow
 
 class JSRequestModifier: IRequestModifier {
     private val _plugin: JSClient;
@@ -30,20 +27,20 @@ class JSRequestModifier: IRequestModifier {
             throw ScriptImplementationException(config, "RequestModifier is missing modifyRequest", null);
     }
 
-    override fun modifyRequest(url: String, headers: Map<String, String>): IRequest {
+    override fun modifyRequest(url: String, headers: Map<String, String>, method: String, body: String?): IRequest {
         if (_modifier.isClosed) {
-            return Request(url, headers);
+            return Request(url, headers, method, body);
         }
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
-            _modifier.invoke("modifyRequest", url, headers);
+            _modifier.invoke("modifyRequest", url, headers, method, body);
         } as V8ValueObject;
 
-        val req = JSRequest(_plugin, result, url, headers);
+        val req = JSRequest(_plugin, result, url, headers, method, body);
         result.close();
         return req;
     }
 
 
-    data class Request(override val url: String, override val headers: Map<String, String>) : IRequest;
+    data class Request(override val url: String, override val headers: Map<String, String>, override val method: String, override val body: String?) : IRequest;
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSSource.kt

@@ -1,7 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.js.models.sources
 
-import androidx.media3.datasource.DefaultHttpDataSource
-import androidx.media3.datasource.HttpDataSource
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.models.modifier.AdhocRequestModifier
@@ -15,7 +13,6 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.orNull
-import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
 
 abstract class JSSource {
     protected val _plugin: JSClient;
@@ -33,15 +30,15 @@ abstract class JSSource {
         this.type = type;
 
         _requestModifier = obj.getOrDefault<V8ValueObject>(_config, "requestModifier", "JSSource.requestModifier", null)?.let {
-            JSRequest(plugin, it, null, null, true);
+            JSRequest(plugin, it, null, null, null, null, true);
         }
         hasRequestModifier = _requestModifier != null || obj.has("getRequestModifier");
     }
 
     fun getRequestModifier(): IRequestModifier? {
         if(_requestModifier != null)
-            return AdhocRequestModifier { url, headers ->
-                  return@AdhocRequestModifier _requestModifier.modify(_plugin, url, headers);
+            return AdhocRequestModifier { url, headers, method, body ->
+                  return@AdhocRequestModifier _requestModifier.modify(_plugin, url, headers, method, body);
             };
 
         if (!hasRequestModifier || _obj.isClosed) {

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

@@ -25,7 +25,6 @@ import com.futo.platformplayer.models.SearchType
 import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateCache
-import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -198,7 +197,6 @@ class SubscriptionsFeedFragment : MainFragment() {
             val allowContentTypes: MutableList<ContentType> = mutableListOf(ContentType.MEDIA, ContentType.POST);
             var allowLive: Boolean = true;
             var allowPlanned: Boolean = false;
-            var allowWatched: Boolean = true;
             override fun encode(): String {
                 return Json.encodeToString(this);
             }
@@ -306,8 +304,7 @@ class SubscriptionsFeedFragment : MainFragment() {
                     SubscriptionBar.Toggle(context.getString(R.string.videos), _filterSettings.allowContentTypes.contains(ContentType.MEDIA)) { toggleFilterContentTypes(listOf(ContentType.MEDIA, ContentType.NESTED_VIDEO), it);  },
                     SubscriptionBar.Toggle(context.getString(R.string.posts),  _filterSettings.allowContentTypes.contains(ContentType.POST)) { toggleFilterContentType(ContentType.POST, it); },
                     SubscriptionBar.Toggle(context.getString(R.string.live), _filterSettings.allowLive) { _filterSettings.allowLive = it; _filterSettings.save(); loadResults(false); },
-                    SubscriptionBar.Toggle(context.getString(R.string.planned), _filterSettings.allowPlanned) { _filterSettings.allowPlanned = it; _filterSettings.save(); loadResults(false); },
-                    SubscriptionBar.Toggle(context.getString(R.string.watched), _filterSettings.allowWatched) { _filterSettings.allowWatched = it; _filterSettings.save(); loadResults(false); }
+                    SubscriptionBar.Toggle(context.getString(R.string.planned), _filterSettings.allowPlanned) { _filterSettings.allowPlanned = it; _filterSettings.save(); loadResults(false); }
                 );
             }
 
@@ -339,9 +336,6 @@ class SubscriptionsFeedFragment : MainFragment() {
             return results.filter {
                 val allowedContentType = _filterSettings.allowContentTypes.contains(if(it.contentType == ContentType.NESTED_VIDEO || it.contentType == ContentType.LOCKED) ContentType.MEDIA else it.contentType);
 
-                if(it is IPlatformVideo && it.duration > 0 && !_filterSettings.allowWatched && StateHistory.instance.isHistoryWatched(it.url, it.duration))
-                    return@filter false;
-
                 //TODO: Check against a sub cache
                 if(filterGroup != null && !filterGroup.urls.contains(it.author.url))
                     return@filter false;

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

@@ -398,10 +398,6 @@ class VideoDetailView : ConstraintLayout {
                 }
             }
         };
-        _monetization.onUrlTap.subscribe {
-            fragment.navigate<BrowserFragment>(it);
-            onMinimize.emit();
-        }
 
         _player.attachPlayer();
 
@@ -1039,10 +1035,10 @@ class VideoDetailView : ConstraintLayout {
 
         switchContentView(_container_content_main);
     }
-    fun setVideoOverview(video: IPlatformVideo, fetch: Boolean = true, resumeSeconds: Long = 0, bypassSameVideoCheck: Boolean = false) {
+    fun setVideoOverview(video: IPlatformVideo, fetch: Boolean = true, resumeSeconds: Long = 0) {
         Logger.i(TAG, "setVideoOverview")
 
-        if(!bypassSameVideoCheck && this.video?.url == video.url)
+        if(this.video?.url == video.url)
             return;
 
         val cachedVideo = StateDownloads.instance.getCachedVideo(video.id);
@@ -1667,7 +1663,7 @@ class VideoDetailView : ConstraintLayout {
         Logger.i(TAG, "prevVideo")
         val next = StatePlayer.instance.prevQueueItem(withoutRemoval || _player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9);
         if(next != null) {
-            setVideoOverview(next, true, 0, true);
+            setVideoOverview(next);
         }
     }
 
@@ -1677,7 +1673,7 @@ class VideoDetailView : ConstraintLayout {
         if(next == null && forceLoop)
             next = StatePlayer.instance.restartQueue();
         if(next != null) {
-            setVideoOverview(next, true, 0, true);
+            setVideoOverview(next);
             return true;
         }
         else
@@ -2566,7 +2562,7 @@ class VideoDetailView : ConstraintLayout {
                 }
                 else
                     withContext(Dispatchers.Main) {
-                        setVideoDetails(videoDetail, false);
+                        setVideoDetails(videoDetail, true);
                         _liveTryJob = null;
                     }
             }

app/src/main/java/com/futo/platformplayer/polycentric/PolycentricStorage.kt

@@ -1,42 +0,0 @@
-package com.futo.platformplayer.polycentric
-
-import com.futo.platformplayer.encryption.GEncryptionProviderV1
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.stores.StringArrayStorage
-import com.futo.polycentric.core.ProcessSecret
-import com.futo.polycentric.core.base64ToByteArray
-import com.futo.polycentric.core.toBase64
-import userpackage.Protocol
-
-class PolycentricStorage {
-    private val _processSecrets = FragmentedStorage.get<StringArrayStorage>("processSecrets");
-
-    fun addProcessSecret(processSecret: ProcessSecret) {
-        _processSecrets.addDistinct(GEncryptionProviderV1.instance.encrypt(processSecret.toProto().toByteArray()).toBase64())
-        _processSecrets.saveBlocking()
-    }
-
-    fun getProcessSecrets(): List<ProcessSecret> {
-        val processSecrets = arrayListOf<ProcessSecret>()
-        for (p in _processSecrets.getAllValues()) {
-            try {
-                processSecrets.add(ProcessSecret.fromProto(Protocol.StorageTypeProcessSecret.parseFrom(GEncryptionProviderV1.instance.decrypt(p.base64ToByteArray()))))
-            } catch (e: Throwable) {
-                Logger.i(TAG, "Failed to decrypt process secret", e);
-            }
-        }
-        return processSecrets
-    }
-
-    companion object {
-        val TAG = "PolycentricStorage";
-        private var _instance : PolycentricStorage? = null;
-        val instance : PolycentricStorage
-            get(){
-                if(_instance == null)
-                    _instance = PolycentricStorage();
-                return _instance!!;
-            };
-    }
-}

app/src/main/java/com/futo/platformplayer/services/DownloadService.kt

@@ -37,7 +37,6 @@ class DownloadService : Service() {
     private val DOWNLOAD_NOTIF_ID = 3;
     private val DOWNLOAD_NOTIF_TAG = "download";
     private val DOWNLOAD_NOTIF_CHANNEL_ID = "downloadChannel";
-    private val DOWNLOAD_NOTIF_CHANNEL_NAME = "Downloads";
 
     //Context
     private val _scope: CoroutineScope = CoroutineScope(Dispatchers.Default);
@@ -96,7 +95,7 @@ class DownloadService : Service() {
     }
     fun setupNotificationRequirements() {
         _notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-        _notificationChannel = NotificationChannel(DOWNLOAD_NOTIF_CHANNEL_ID, DOWNLOAD_NOTIF_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
+        _notificationChannel = NotificationChannel(DOWNLOAD_NOTIF_CHANNEL_ID, "Temp", NotificationManager.IMPORTANCE_DEFAULT).apply {
             this.enableVibration(false);
             this.setSound(null, null);
         };

app/src/main/java/com/futo/platformplayer/services/ExportingService.kt

@@ -36,7 +36,6 @@ class ExportingService : Service() {
     private val EXPORT_NOTIF_ID = 4;
     private val EXPORT_NOTIF_TAG = "export";
     private val EXPORT_NOTIF_CHANNEL_ID = "exportChannel";
-    private val EXPORT_NOTIF_CHANNEL_NAME = "Export";
 
     //Context
     private val _scope: CoroutineScope = CoroutineScope(Dispatchers.Default);
@@ -89,7 +88,7 @@ class ExportingService : Service() {
     }
     fun setupNotificationRequirements() {
         _notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-        _notificationChannel = NotificationChannel(EXPORT_NOTIF_CHANNEL_ID, EXPORT_NOTIF_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
+        _notificationChannel = NotificationChannel(EXPORT_NOTIF_CHANNEL_ID, "Temp", NotificationManager.IMPORTANCE_DEFAULT).apply {
             this.enableVibration(false);
             this.setSound(null, null);
         };

app/src/main/java/com/futo/platformplayer/states/StateHistory.kt

@@ -50,9 +50,6 @@ class StateHistory {
     fun getHistoryPosition(url: String): Long {
         return historyIndex[url]?.position ?: 0;
     }
-    fun isHistoryWatched(url: String, duration: Long): Boolean {
-        return getHistoryPosition(url) > duration * 0.7;
-    }
 
 
     fun updateHistoryPosition(liveObj: IPlatformVideo, index: DBHistory.Index, updateExisting: Boolean, position: Long = -1L): Long {

app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt

@@ -23,7 +23,6 @@ import com.futo.platformplayer.dp
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
-import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.resolveChannelUrl
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -68,40 +67,28 @@ class StatePolycentric {
             return
         }
 
-        for (i in 0 .. 1) {
-            try {
-                val db = SqlLiteDbHelper(context);
-                Store.initializeSqlLiteStore(db);
+        try {
+            val db = SqlLiteDbHelper(context);
+            Store.initializeSqlLiteStore(db);
 
-                val activeProcessHandleString = _activeProcessHandle.value;
-                if (activeProcessHandleString.isNotEmpty()) {
-                    try {
-                        val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
-                        setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
-                    } catch (e: Throwable) {
-                        db.upgradeOldSecrets(db.writableDatabase);
+            val activeProcessHandleString = _activeProcessHandle.value;
+            if (activeProcessHandleString.isNotEmpty()) {
+                try {
+                    val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
+                    setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
+                } catch (e: Throwable) {
+                    db.upgradeOldSecrets(db.writableDatabase);
 
-                        val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
-                        setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
+                    val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
+                    setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
 
-                        Log.i(TAG, "Failed to initialize Polycentric.", e)
-                    }
-                }
-
-                getProcessHandles()
-
-                break;
-            } catch (e: Throwable) {
-                if (i == 0) {
-                    Logger.i(TAG, "Clearing Polycentric database due to corruption");
-                    val db = SqlLiteDbHelper(context);
-                    db.recreate()
-                } else {
-                    _transientEnabled = false
-                    UIDialogs.showGeneralErrorDialog(context, "Failed to initialize Polycentric.", e);
                     Log.i(TAG, "Failed to initialize Polycentric.", e)
                 }
             }
+        } catch (e: Throwable) {
+            _transientEnabled = false
+            UIDialogs.showGeneralErrorDialog(context, "Failed to initialize Polycentric.", e);
+            Log.i(TAG, "Failed to initialize Polycentric.", e)
         }
     }
 
@@ -116,32 +103,7 @@ class StatePolycentric {
             return listOf()
         }
 
-        val storeProcessSecrets = Store.instance.getProcessSecrets().toMutableList()
-        val processSecrets = PolycentricStorage.instance.getProcessSecrets()
-
-        for (processSecret in processSecrets)
-        {
-            if (!storeProcessSecrets.contains(processSecret)) {
-                try {
-                    Store.instance.addProcessSecret(processSecret)
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to backfill process secret.")
-                }
-            }
-        }
-
-        for (processSecret in storeProcessSecrets)
-        {
-            if (!processSecrets.contains(processSecret)) {
-                try {
-                    PolycentricStorage.instance.addProcessSecret(processSecret)
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to backfill process secret.")
-                }
-            }
-        }
-
-        return (storeProcessSecrets + processSecrets).distinct().map { it.toProcessHandle() }
+        return Store.instance.getProcessSecrets().map { it.toProcessHandle(); };
     }
 
     fun setProcessHandle(processHandle: ProcessHandle?) {

app/src/main/java/com/futo/platformplayer/views/MonetizationView.kt

@@ -8,13 +8,11 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.HorizontalSpaceItemDecoration
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
@@ -63,7 +61,6 @@ class MonetizationView : LinearLayout {
 
     val onSupportTap = Event0();
     val onStoreTap = Event0();
-    val onUrlTap = Event1<String>();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.view_monetization, this);
@@ -73,12 +70,10 @@ class MonetizationView : LinearLayout {
         _membershipPlatform = findViewById(R.id.membership_platform);
         _buttonMembership.setOnClickListener {
             _membershipUrl?.let {
-                /*
                 val uri = Uri.parse(it);
                 val intent = Intent(Intent.ACTION_VIEW);
                 intent.data = uri;
-                context.startActivity(intent);*/
-                onUrlTap.emit(it);
+                context.startActivity(intent);
             }
         }
 
@@ -134,18 +129,9 @@ class MonetizationView : LinearLayout {
                 _buttonStore.visibility = View.GONE;
             }
 
-            if(profile.systemState.donationDestinations.isNotEmpty() ||
-                profile.systemState.membershipUrls.isNotEmpty() ||
-                profile.systemState.store.isNotEmpty() ||
-                profile.systemState.promotion.isNotEmpty())
-                _buttonSupport.isVisible = true;
-            else
-                _buttonSupport.isVisible = false;
-
             _root.visibility = View.VISIBLE;
         } else {
             _root.visibility = View.GONE;
-            _buttonSupport.isVisible = false;
         }
 
         setMerchandise(null);

app/src/main/java/com/futo/platformplayer/views/SupportView.kt

@@ -10,8 +10,6 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.view.isVisible
-import androidx.core.view.size
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
@@ -35,13 +33,6 @@ class SupportView : LinearLayout {
     private var _textNoSupportOptionsSet: TextView
     private var _polycentricProfile: PolycentricProfile? = null
 
-    val hasSupportItems: Boolean get() {
-        return (_layoutPromotions.isVisible && _buttonPromotion.isVisible) ||
-                (_layoutMemberships.isVisible && _layoutMembershipEntries.isVisible && _layoutMembershipEntries.size > 0) ||
-                (_layoutDonation.isVisible && _layoutDonationEntries.isVisible && _layoutDonationEntries.size > 0) ||
-                _buttonStore.isVisible;
-    };
-
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.view_support, this);
 

app/src/main/java/com/futo/platformplayer/views/overlays/RepliesOverlay.kt

@@ -51,11 +51,9 @@ class RepliesOverlay : LinearLayout {
     private var _onCommentAdded: ((comment: IPlatformComment) -> Unit)? = null;
     private val _loaderOverlay: LoaderOverlay
     private val _client = ManagedHttpClient()
-    private val _layoutItems: LinearLayout
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.overlay_replies, this)
-        _layoutItems = findViewById(R.id.layout_items)
         _topbar = findViewById(R.id.topbar);
         _commentsList = findViewById(R.id.comments_list);
         _addCommentView = findViewById(R.id.add_comment_view);
@@ -67,9 +65,6 @@ class RepliesOverlay : LinearLayout {
         _loaderOverlay = findViewById(R.id.loader_overlay)
         setLoading(false);
 
-        _layoutItems.removeView(_layoutParentComment)
-        _commentsList.setPrependedView(_layoutParentComment)
-
         _addCommentView.onCommentAdded.subscribe {
             _commentsList.addComment(it);
             _onCommentAdded?.invoke(it);

app/src/main/java/com/futo/platformplayer/views/overlays/SupportOverlay.kt

@@ -14,10 +14,6 @@ class SupportOverlay : LinearLayout {
     private val _topbar: OverlayTopbar;
     private val _support: SupportView;
 
-    val hasSupportItems: Boolean get() {
-        return _support.hasSupportItems;
-    }
-
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.overlay_support, this)
         _topbar = findViewById(R.id.topbar);

app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuRecycler.kt

@@ -1,38 +0,0 @@
-package com.futo.platformplayer.views.overlays.slideup
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.futo.platformplayer.R
-import com.futo.platformplayer.views.AnyAdapterView
-import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
-import com.futo.platformplayer.views.adapters.AnyAdapter
-
-class SlideUpMenuRecycler<T : Any, VType : AnyAdapter.AnyViewHolder<T>> : LinearLayout {
-
-    private lateinit var recyclerView: RecyclerView;
-    private val adapter: AnyAdapterView<T, VType>?;
-
-    var groupTag: Any? = null;
-
-    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
-        init();
-        adapter = null;
-    }
-
-    constructor(context: Context, tag: Any, creation: (RecyclerView)->AnyAdapterView<T, VType>) : super(context){
-        init();
-        groupTag = tag;
-        adapter = creation(recyclerView);
-    }
-
-    private fun init(){
-        LayoutInflater.from(context).inflate(R.layout.overlay_slide_up_menu_recycler, this, true);
-
-        recyclerView = findViewById(R.id.slide_up_menu_recycler);
-    }
-}

app/src/main/java/com/futo/platformplayer/views/segments/CommentsList.kt

@@ -71,9 +71,6 @@ class CommentsList : ConstraintLayout {
         override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
             super.onScrolled(recyclerView, dx, dy);
             onScrolled();
-
-            val totalScrollDistance = recyclerView.computeVerticalScrollOffset()
-            _layoutScrollToTop.visibility = if (totalScrollDistance > recyclerView.height) View.VISIBLE else View.GONE
         }
     };
 
@@ -85,7 +82,6 @@ class CommentsList : ConstraintLayout {
     private var _loading = false;
     private val _prependedView: FrameLayout;
     private var _readonly: Boolean = false;
-    private val _layoutScrollToTop: FrameLayout;
 
     var onRepliesClick = Event1<IPlatformComment>();
     var onCommentsLoaded = Event1<Int>();
@@ -94,13 +90,6 @@ class CommentsList : ConstraintLayout {
         LayoutInflater.from(context).inflate(R.layout.view_comments_list, this, true);
 
         _recyclerComments = findViewById(R.id.recycler_comments);
-
-        _layoutScrollToTop = findViewById(R.id.layout_scroll_to_top);
-        _layoutScrollToTop.setOnClickListener {
-            _recyclerComments.smoothScrollToPosition(0)
-        }
-        _layoutScrollToTop.visibility = View.GONE
-
         _textMessage = TextView(context).apply {
             layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT).apply {
                 setMargins(0, 30, 0, 0)

app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt

@@ -582,7 +582,6 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
             _videoControls_fullscreen.show();
             videoControls.hideImmediately();
-            videoControls.visibility = View.GONE;
         }
         else {
             val lp = background.layoutParams as ConstraintLayout.LayoutParams;
@@ -595,7 +594,6 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
             videoControls.show();
             _videoControls_fullscreen.hideImmediately();
-            _videoControls_fullscreen.visibility = View.GONE;
         }
 
         fitOrFill(fullScreen);

app/src/main/java/com/futo/platformplayer/views/video/datasources/JSHttpDataSource.java

@@ -6,11 +6,13 @@ import static androidx.media3.datasource.HttpUtil.buildRangeRequestHeader;
 import static java.lang.Math.min;
 
 import android.net.Uri;
+import android.util.Base64;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
+import com.futo.platformplayer.api.http.ManagedHttpClient;
 import com.futo.platformplayer.api.media.models.modifier.IRequest;
 import com.futo.platformplayer.api.media.models.modifier.IRequestModifier;
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier;
@@ -24,6 +26,7 @@ import androidx.media3.datasource.DataSpec;
 import androidx.media3.datasource.HttpDataSource;
 import androidx.media3.datasource.HttpUtil;
 import androidx.media3.datasource.TransferListener;
+import androidx.work.impl.utils.PackageManagerHelper;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ForwardingMap;
@@ -39,12 +42,16 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.NoRouteToHostException;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
 
+import okhttp3.OkHttpClient;
+
 /*
  * Based on the default ExoPlayer DefaultHttpDataSource
  */
@@ -315,6 +322,12 @@ public class JSHttpDataSource extends BaseDataSource implements HttpDataSource {
             responseMessage = connection.getResponseMessage();
         } catch (IOException e) {
             closeConnectionQuietly();
+            Log.e(TAG, "Failed to open: " + dataSpec.uri, e);
+
+            ManagedHttpClient client = new ManagedHttpClient(new OkHttpClient.Builder());
+            ManagedHttpClient.Response response = client.head(dataSpec.uri.toString(), new HashMap<>());
+            Log.i(TAG, "ManagedHttpClient response code: " + response.getCode());
+
             throw HttpDataSourceException.createForIOException(
                     e, dataSpec, HttpDataSourceException.TYPE_OPEN);
         }
@@ -574,12 +587,26 @@ public class JSHttpDataSource extends BaseDataSource implements HttpDataSource {
 
         requestHeaders.put(HttpHeaders.ACCEPT_ENCODING, allowGzip ? "gzip" : "identity");
 
+        String requestMethod = DataSpec.getStringForHttpMethod(httpMethod);
         String requestUrl = url.toString();
         if (requestModifier != null) {
-            IRequest result = requestModifier.modifyRequest(requestUrl, requestHeaders);
+            IRequest result = requestModifier.modifyRequest(requestUrl, requestHeaders, requestMethod, httpBody != null ? new String(httpBody, StandardCharsets.UTF_8) : null);
+
             String modifiedUrl = result.getUrl();
-            requestUrl = (modifiedUrl != null) ? modifiedUrl : requestUrl;
-            requestHeaders = result.getHeaders();
+            if (modifiedUrl != null)
+                requestUrl = modifiedUrl;
+
+            Map<String, String> modifiedHeaders = result.getHeaders();
+            if (modifiedHeaders != null)
+                requestHeaders = modifiedHeaders;
+
+            String modifiedMethod = result.getMethod();
+            if (modifiedMethod != null)
+                requestMethod = modifiedMethod;
+
+            String modifiedBody = result.getBody();
+            if (modifiedBody != null)
+                httpBody = modifiedBody.getBytes(StandardCharsets.UTF_8);
         }
 
         HttpURLConnection connection = openConnection(new URL(requestUrl));
@@ -592,7 +619,7 @@ public class JSHttpDataSource extends BaseDataSource implements HttpDataSource {
 
         connection.setInstanceFollowRedirects(followRedirects);
         connection.setDoOutput(httpBody != null);
-        connection.setRequestMethod(DataSpec.getStringForHttpMethod(httpMethod));
+        connection.setRequestMethod(requestMethod);
 
         if (httpBody != null) {
             connection.setFixedLengthStreamingMode(httpBody.length);

app/src/main/res/layout/overlay_replies.xml

@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/black"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/black"
-        android:orientation="vertical"
-        android:id="@+id/layout_items">
+    <com.futo.platformplayer.views.overlays.OverlayTopbar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        app:title="Replies"
+        app:metadata="3 replies"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 
-        <com.futo.platformplayer.views.overlays.OverlayTopbar
-            android:id="@+id/topbar"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            app:title="Replies"
-            app:metadata="3 replies" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_parent_comment"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        app:layout_constraintTop_toBottomOf="@id/topbar"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="6dp"
+        android:padding="12dp"
+        android:background="@drawable/background_16_round_4dp">
 
-        <com.futo.platformplayer.views.comments.AddCommentView
-            android:id="@+id/add_comment_view"
-            android:layout_width="match_parent"
+        <com.futo.platformplayer.views.others.CreatorThumbnail
+            android:id="@+id/image_thumbnail"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:contentDescription="@string/channel_image"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/placeholder_channel_thumbnail" />
+
+        <TextView
+            android:id="@+id/text_author"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp" />
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:fontFamily="@font/inter_regular"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintLeft_toRightOf="@id/image_thumbnail"
+            app:layout_constraintTop_toTopOf="@id/image_thumbnail"
+            tools:text="ShortCircuit" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/layout_parent_comment"
+        <TextView
+            android:id="@+id/text_metadata"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="12dp"
-            android:padding="12dp"
-            android:background="@drawable/background_16_round_4dp">
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:fontFamily="@font/inter_regular"
+            android:textColor="@color/gray_ac"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="@id/text_author"
+            app:layout_constraintLeft_toRightOf="@id/text_author"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@id/text_author"
+            tools:text=" • 3 years ago" />
 
-            <com.futo.platformplayer.views.others.CreatorThumbnail
-                android:id="@+id/image_thumbnail"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:contentDescription="@string/channel_image"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/placeholder_channel_thumbnail" />
+        <com.futo.platformplayer.views.behavior.NonScrollingTextView
+            android:id="@+id/text_body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="10dp"
+            android:background="@color/transparent"
+            android:fontFamily="@font/inter_regular"
+            android:isScrollContainer="false"
+            android:textColor="#CCCCCC"
+            android:textSize="13sp"
+            android:maxLines="3"
+            android:ellipsize="end"
+            app:layout_constraintTop_toBottomOf="@id/text_metadata"
+            app:layout_constraintLeft_toRightOf="@id/image_thumbnail"
+            app:layout_constraintRight_toRightOf="parent"
+            tools:text="@string/lorem_ipsum" />
 
-            <TextView
-                android:id="@+id/text_author"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:fontFamily="@font/inter_regular"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                app:layout_constraintLeft_toRightOf="@id/image_thumbnail"
-                app:layout_constraintTop_toTopOf="@id/image_thumbnail"
-                tools:text="ShortCircuit" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <TextView
-                android:id="@+id/text_metadata"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:fontFamily="@font/inter_regular"
-                android:textColor="@color/gray_ac"
-                android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="@id/text_author"
-                app:layout_constraintLeft_toRightOf="@id/text_author"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="@id/text_author"
-                tools:text=" • 3 years ago" />
+    <com.futo.platformplayer.views.comments.AddCommentView
+        android:id="@+id/add_comment_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        app:layout_constraintTop_toBottomOf="@id/layout_parent_comment"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 
-            <com.futo.platformplayer.views.behavior.NonScrollingTextView
-                android:id="@+id/text_body"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginStart="10dp"
-                android:background="@color/transparent"
-                android:fontFamily="@font/inter_regular"
-                android:isScrollContainer="false"
-                android:textColor="#CCCCCC"
-                android:textSize="13sp"
-                android:ellipsize="end"
-                app:layout_constraintTop_toBottomOf="@id/text_metadata"
-                app:layout_constraintLeft_toRightOf="@id/image_thumbnail"
-                app:layout_constraintRight_toRightOf="parent"
-                tools:text="@string/lorem_ipsum" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <com.futo.platformplayer.views.segments.CommentsList
-            android:id="@+id/comments_list"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_marginTop="12dp" />
-    </LinearLayout>
+    <com.futo.platformplayer.views.segments.CommentsList
+        android:id="@+id/comments_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/add_comment_view"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="12dp" />
 
     <com.futo.platformplayer.views.overlays.LoaderOverlay
         android:id="@+id/loader_overlay"
@@ -110,4 +113,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clickable="true" />
-</FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/overlay_slide_up_menu_recycler.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="10dp">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/slide_up_menu_recycler"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>

app/src/main/res/layout/view_comments_list.xml

@@ -7,25 +7,5 @@
         android:id="@+id/recycler_comments"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="12dp"
-        android:paddingBottom="7dp"
-        android:paddingEnd="14dp"
-        android:paddingTop="7dp"
-        android:paddingStart="14dp"
-        android:background="@drawable/background_pill"
-        android:id="@+id/layout_scroll_to_top">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_to_top"
-            android:textColor="@color/white"
-            android:fontFamily="@font/inter_regular"
-            android:textSize="14dp"/>
-    </FrameLayout>
+    
 </FrameLayout>

app/src/main/res/values/strings.xml

@@ -625,7 +625,6 @@
     <string name="you_have_too_many_subscriptions_for_the_following_plugins">\n\nYou have too many subscriptions for the following plugins:\n</string>
     <string name="posts">Posts</string>
     <string name="planned">Planned</string>
-    <string name="watched">Watched</string>
     <string name="no_results_found_swipe_down_to_refresh">No results found\nSwipe down to refresh</string>
     <string name="overlay">Overlay</string>
     <string name="reload">Reload</string>
@@ -751,7 +750,6 @@
     <string name="select">Select</string>
     <string name="zoom">Zoom</string>
     <string name="check_to_see_if_an_update_is_available">Check to see if an update is available.</string>
-    <string name="scroll_to_top">Scroll to top</string>
     <string-array name="home_screen_array">
         <item>Recommendations</item>
         <item>Subscriptions</item>