http promises (wip)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,80 +0,0 @@
-name: Bug Report
-description: Let us know about an unexpected error, a crash, or an incorrect behavior.
-labels: ["bug", "new"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Thank you for taking the time to fill out this bug report.
-        
-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
-
-        For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
-
-        ## Filing a bug report
-
-        To fix your issues faster, we need clear reproduction cases - ideally allowing us to make it happen locally. 
-        * Please include all needed context. For example, Device, OS, Application, your Grayjay Configurations and Plugin versioning info.
-        * if you've found out a particular series of UI interactions can introduce buggy behavior, please label those steps 1-n with markdown
-
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: What did you expect to happen?
-      placeholder: Tell us what you see!
-    validations:
-      required: true
-
-  - type: input
-    id: grayjay-version
-    attributes:
-      label: Grayjay Version
-      description: In the application, select More > Settings, scroll to the bottom and locate the value next to "Version Name".
-      placeholder: "242"
-    validations:
-      required: true
-
-  - type: dropdown
-    id: plugin
-    attributes:
-      label: What plugins are you seeing the problem on?
-      multiple: true
-      options:
-        - All
-        - Youtube
-        - BiliBili (CN)
-        - Twitch
-        - Odysee
-        - Rumble
-        - Kick
-        - PeerTube
-        - Patreon
-        - Nebula
-        - SoundCloud
-        - Other
-    validations:
-      required: true
-
-  - type: input
-    id: plugin-version
-    attributes:
-      label: Plugin Version
-      description: In the application, select Sources > [the broken plugin], write down the value under "Version".
-      placeholder: "12"
-
-  - type: checkboxes
-    id: login
-    attributes:
-      label: When do you experience the issue?
-      options:
-      - label: While logged in
-      - label: While logged out
-      - label: N/A
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Need a Grayjay License?
-    url: https://pay.futo.org/api/PaymentPortal
-    about: Purchase a Grayjay license with FutoPay
-  - name: Plugin Building, Usage, or other Questions
-    url: https://chat.futo.org/#narrow/stream/46-Grayjay
-    about: Grayjays Community Chat

.github/ISSUE_TEMPLATE/documentation_issue.yml

@@ -1,63 +0,0 @@
-name: Documentation Issue
-description: Report an issue or suggest a change in the documentation.
-labels: ["documentation", "new"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Thank you for opening a documentation change request.
-
-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application. Use the `Documentation` issue type to report problems with the documentation in our code repositories, inside the application, or on [https://grayjay.app](https://grayjay.app) 
-        Technical writers monitor this issue type, so report Grayjay bugs or feature requests with the `Bug report` or `Feature Request` issue types instead to get engineering attention.
-
-        For general usage questions, please see: [The Official FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
-
-  - type: textarea
-    id: grayjay-affected-pages
-    attributes:
-      label: Affected Pages
-      description: |
-          Link to or describe the pages relevant to your documentation change request.
-      placeholder:
-      value:
-    validations:
-      required: false
-
-  - type: textarea
-    id: grayjay-problem
-    attributes:
-      label: What is the docs issue?
-      description: What problems or suggestions do you have about the documentation?
-      placeholder:
-      value:
-    validations:
-      required: true
-
-  - type: textarea
-    id: grayjay-proposal
-    attributes:
-      label: Proposal
-      description: What documentation changes would fix this issue and where would you expect to find them? Are one or more page headings unclear? Do one or more pages need additional context, examples, or warnings? Do we need a new page or section dedicated to a specific topic?  Your ideas help us understand what you and other users need from our documentation and how we can improve the content.
-      placeholder:
-      value:
-    validations:
-      required: false
-
-  - type: textarea
-    id: grayjay-references
-    attributes:
-      label: References
-      description: |
-        Are there any other open or closed GitLab/GitHub issues related to the problem or solution you described? If so, list them below. For example:
-        ```
-          - #6017
-        ```
-      placeholder:
-      value:
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: |
-        **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,58 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or other enhancement.
-labels: ["enhancement", "new"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Thank you for opening a feature request.
-
-        The [grayjay-android](https://github.com/futo-org/grayjay-android) issue tracker is reserved for issues relating to the Grayjay Android Application
-
-        [External Contributions are closed at this time](https://github.com/tom-futo/grayjay-android/blob/master/CONTRIBUTION.md#contributing-to-core)
-
-        For discussion related to enhancements, please see: [The FUTO Grayjay Zulip Channel](https://chat.futo.org/#narrow/stream/46-Grayjay)
-
-  - type: textarea
-    id: grayjay-use-case
-    attributes:
-      label: Use Cases
-      description: |
-        In order to properly evaluate a feature request, it is necessary to understand the use cases for it. Please describe below the _end goal_ you are trying to achieve that has led you to request this feature. Please keep this section focused on the problem and not on the suggested solution.
-      placeholder:
-      value:
-    validations:
-      required: true
-
-  - type: textarea
-    id: grayjay-proposal
-    attributes:
-      label: Proposal
-      description: |
-          If you have an idea for a way to address the problem via a change to Grayjay features, please describe it below.
-
-          In this section, it's helpful to include specific examples of how what you are suggesting might look in the application, this allows us to understand the full picture of what you are proposing. If you're not sure of some details, don't worry! When we evaluate the feature request we may suggest modifications as necessary to work within the design constraints of the Grayjay Core Application.
-      placeholder:
-      value:
-    validations:
-      required: false
-
-  - type: textarea
-    id: grayjay-references
-    attributes:
-      label: References
-      description: |
-        Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above or to the suggested solution? If so, please create a list below that mentions each of them. For example:
-        ```
-          - #10
-        ```
-      placeholder:
-      value:
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: |
-        **Note:** If the submit button is disabled and you have filled out all required fields, please check that you did not forget a **Title** for the issue.
-        

.github/workflows/labeler.yml

@@ -1,34 +0,0 @@
-name: Issue labeler
-on:
-  issues:
-    types: [ opened ]
-
-permissions:
-  contents: read
-
-jobs:
-  label-component:
-    runs-on: ubuntu-latest
-
-    permissions:
-      # required for all workflows
-      issues: write
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Parse issue form
-        uses: stefanbuck/github-issue-parser@v3
-        id: issue-parser
-        with:
-          template-path: .github/ISSUE_TEMPLATE/bug_report.yml
-
-      - name: Set labels based on plugin field
-        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
-        with:
-          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
-          section: plugin
-          block-list: |
-            None
-            Other
-          token: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "dep/polycentricandroid"]
 	path = dep/polycentricandroid
 	url = ../polycentricandroid.git
+[submodule "app/src/playstore/assets/sources/peertube"]
+	path = app/src/playstore/assets/sources/peertube
+	url = ../plugins/peertube.git
 [submodule "app/src/stable/assets/sources/kick"]
 	path = app/src/stable/assets/sources/kick
 	url = ../plugins/kick.git
@@ -58,27 +61,3 @@
 [submodule "dep/futopay"]
 	path = dep/futopay
 	url = ../futopayclientlibraries.git
-[submodule "app/src/unstable/assets/sources/bilibili"]
-	path = app/src/unstable/assets/sources/bilibili
-	url = ../plugins/bilibili.git
-[submodule "app/src/stable/assets/sources/bilibili"]
-	path = app/src/stable/assets/sources/bilibili
-	url = ../plugins/bilibili.git
-[submodule "app/src/stable/assets/sources/spotify"]
-	path = app/src/stable/assets/sources/spotify
-	url = ../plugins/spotify.git
-[submodule "app/src/unstable/assets/sources/spotify"]
-	path = app/src/unstable/assets/sources/spotify
-	url = ../plugins/spotify.git
-[submodule "app/src/stable/assets/sources/bitchute"]
-	path = app/src/stable/assets/sources/bitchute
-	url = ../plugins/bitchute.git
-[submodule "app/src/unstable/assets/sources/bitchute"]
-	path = app/src/unstable/assets/sources/bitchute
-	url = ../plugins/bitchute.git
-[submodule "app/src/unstable/assets/sources/dailymotion"]
-	path = app/src/unstable/assets/sources/dailymotion
-	url = ../plugins/dailymotion.git
-[submodule "app/src/stable/assets/sources/dailymotion"]
-	path = app/src/stable/assets/sources/dailymotion
-	url = ../plugins/dailymotion.git

LICENSE

@@ -0,0 +1,32 @@
+# FUTO TEMPORARY LICENSE
+This license grants you the rights, and only the rights, set out below in respect of the source code provided. If you take advantage of these rights, you accept this license. If you do not accept the license, do not access the code.
+
+Words used in the Terms of Service have the same meaning in this license. Where there is any inconsistency between this license and those Terms of Service, these terms prevail.
+
+## Section 1: Definitions
+- "code" means the source code made available from time, in our sole discretion, for access under this license. Reference to code in this license means the code and any part of it and any derivative of it.
+- “compilation” means to compile the code from ‘source code’ to ‘machine code’.
+- "defect" means a defect, bug, backdoor, security issue or other deficiency in the code.
+- “non-commercial distribution” means distribution of the code or any compilation of the code, or of any other application or program containing the code or any compilation of the code, where such distribution is not intended for or directed towards commercial advantage or monetary compensation.
+- "review" means to access, analyse, test and otherwise review the code as a reference, for the sole purpose of analysing it for defects.
+- "you" means the licensee of rights set out in this license.
+
+## Section 2: Grant of Rights
+1. Subject to the terms of this license, we grant you a non-transferable, non-exclusive, worldwide, royalty-free license to access and use the code solely for the purposes of review, compilation and non-commercial distribution.
+2. You may provide the code to anyone else and publish excerpts of it for the purposes of review, compilation and non-commercial distribution, provided that when you do so you make any recipient of the code aware of the terms of this license, they must agree to be bound by the terms of this license and you must attribute the code to the provider.
+3. Other than in respect of those parts of the code that were developed by other parties and as specified strictly in accordance with the open source and other licenses under which those parts of the code have been made available, as set out on our website or in those items of code, you are not entitled to use or do anything with the code for any commercial or other purpose, other than review, compilation and non-commercial distribution in accordance with the terms of this license.
+4. Subject to the terms of this license, you must at all times comply with and shall be bound by our Terms of Use, Privacy and Data Policy.
+
+## Section 3: Limitations
+1. This license does not grant you any rights to use the provider's name, logo, or trademarks and you must not in any way indicate you are authorised to speak on behalf of the provider.
+2. If you issue proceedings in any jurisdiction against the provider because you consider the provider has infringed copyright or any patent right in respect of the code (including any joinder or counterclaim), your license to the code is automatically terminated.
+3. THE CODE IS MADE AVAILABLE "AS-IS" AND WITHOUT ANY EXPRESS OR IMPLIED GUARANTEES AS TO FITNESS, MERCHANTABILITY, NON-INFRINGEMENT OR OTHERWISE. IT IS NOT BEING PROVIDED IN TRADE BUT ON A VOLUNTARY BASIS ON OUR PART AND IS NOT MADE AVAILABLE FOR ANY USE OUTSIDE THE TERMS OF THIS LICENSE. ANYONE ACCESSING THE CODE MUST ENSURE THEY HAVE THE REQUISITE EXPERTISE TO SECURE THEIR OWN SYSTEM AND DEVICES AND TO ACCESS AND USE THE CODE IN ACCORDANCE WITH THE TERMS OF THIS LICENSE. YOU BEAR THE RISK OF ACCESSING AND USING THE CODE. IN PARTICULAR, THE PROVIDER BEARS NO LIABILITY FOR ANY INTERFERENCE WITH OR ADVERSE EFFECT ON YOUR SYSTEM OR DEVICES AS A RESULT OF YOUR ACCESSING AND USING THE CODE IN ACCORDANCE WITH THE TERMS OF THIS LICENSE OR OTHERWISE.
+
+## Section 4: Termination, suspension and variation
+1. We may suspend, terminate or vary the terms of this license and any access to the code at any time, without notice, for any reason or no reason, in respect of any licensee, group of licensees or all licensees including as may be applicable any sub-licensees.
+
+## Section 5: General
+1. This license and its interpretation and operation are governed solely by the local law. You agree to submit to the exclusive jurisdiction of the local arbitral tribunals as further described in our Terms of Service and you agree not to raise any jurisdictional issue if we need to enforce an arbitral award or judgment in our jurisdiction or another country.
+2. Questions and comments regarding this license are welcomed and should be addressed at https://chat.futo.org/login/.
+
+Last updated 7 June 2023.

LICENSE.md

@@ -1,43 +0,0 @@
-# Grayjay Core License 1.0
-
-## Acceptance
-By using the software, you agree to all of the terms and conditions below.
-
-## Copyright License
-FUTO Holdings, Inc. (the “Licensor”) grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations below.
-
-## Limitations
-You may use or modify the software only for non-commercial purposes such as personal use for research, experiment, and testing for the benefit of public knowledge, personal study, private entertainment, hobby projects, amateur pursuits, or religious observance, all without any anticipated commercial application.
-
-You may distribute the software or provide it to others only if you do so free of charge for non-commercial purposes.
-
-Notwithstanding the above, you may not remove or obscure any functionality in the software related to payment to the Licensor in any copy you distribute to others.
-
-You may not alter, remove, or obscure any licensing, copyright, or other notices of the Licensor in the software. Any use of the Licensor’s trademarks is subject to applicable law.
-
-## Patents
-If you make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
-
-## Notices
-You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms. If you modify the software, you must include in any modified copies of the software a prominent notice stating that you have modified the software, such as but not limited to, a statement in a readme file or an in-application about section.
-
-## Fair Use
-You may have "fair use" rights for the software under the law. These terms do not limit them.
-
-## No Other Rights
-These terms do not allow you to sublicense or transfer any of your licenses to anyone else, or prevent the Licensor from granting licenses to anyone else. These terms do not imply any other licenses.
-
-## Termination
-If you use the software in violation of these terms, such use is not licensed, and your license will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your license will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your license to terminate automatically and permanently.
-
-## No Liability
-As far as the law allows, the software comes as is, without any warranty or condition, and the Licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
-
-## Definitions
-- The “Licensor” is the entity offering these terms, FUTO Holdings, Inc.
-- The “software” is the software the licensor makes available under these terms, including any portion of it.
-- “You” refers to the individual or entity agreeing to these terms.
-- “Your company” is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. Control means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
-- “Your license” is the license granted to you for the software under these terms.
-- “Use” means anything you do with the software requiring your license.
-- “Trademark” means trademarks, service marks, and similar rights.

app/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21'
-    id 'org.ajoberstar.grgit' version '5.2.2'
+    id 'org.ajoberstar.grgit' version '1.7.2'
     id 'com.google.protobuf'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
@@ -144,24 +144,14 @@ android {
     buildFeatures {
         buildConfig true
     }
-    sourceSets {
-        main {
-            assets {
-                srcDirs 'src/main/assets', 'src/tests/assets', 'src/test/assets'
-            }
-        }
-    }
 }
 
 dependencies {
-    implementation 'com.google.dagger:dagger:2.48'
-    implementation 'androidx.test:monitor:1.7.2'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
 
     //Core
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //Images
@@ -179,21 +169,22 @@ dependencies {
     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.2")
+    implementation("com.caoccao.javet:javet-android:2.2.1")
 
     //Exoplayer
-    implementation 'androidx.media3:media3-exoplayer:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.2.1'
-    implementation 'androidx.media3:media3-ui:1.2.1'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
-    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.6'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'
+    implementation 'androidx.media3:media3-ui:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.2.0'
+    implementation 'androidx.media3:media3-transformer:1.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.5'
     implementation 'androidx.media:media:1.7.0'
 
     //Other
+    implementation 'org.jmdns:jmdns:3.5.1'
     implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

app/src/main/AndroidManifest.xml

@@ -11,10 +11,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-    <!--<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
 
     <application
         android:allowBackup="true"
@@ -26,8 +24,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FutoVideo"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31"
-        android:largeHeap="true">
+        tools:targetApi="31">
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/authority"
@@ -42,6 +39,9 @@
         <service android:name=".services.DownloadService"
             android:enabled="true"
             android:foregroundServiceType="dataSync" />
+        <service android:name=".services.ExportingService"
+            android:enabled="true"
+            android:foregroundServiceType="dataSync" />
 
         <receiver android:name=".receivers.MediaControlReceiver" />
         <receiver android:name=".receivers.AudioNoisyReceiver" />
@@ -51,7 +51,7 @@
             android:name=".activities.MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
             android:exported="true"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
@@ -153,27 +153,27 @@
 
         <activity
             android:name=".activities.SettingsActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.DeveloperActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ExceptionActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.CaptchaActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.LoginActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.AddSourceActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:exported="true"
             android:theme="@style/Theme.FutoVideo.NoActionBar">
             <intent-filter>
@@ -187,44 +187,44 @@
         </activity>
         <activity
             android:name=".activities.AddSourceOptionsActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricHomeActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricBackupActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricCreateProfileActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricProfileActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricWhyActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricImportProfileActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ManageTabsActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
 
         <activity
             android:name=".activities.QRCaptureActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.FCastGuideActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
     </application>
 </manifest>

app/src/main/assets/devportal/dependencies/favicon.svg

@@ -1,15 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_287_2206)">
-<path d="M22.0557 38.25L43.1117 6H1L22.0557 38.25Z" fill="url(#paint0_linear_287_2206)"/>
-<path d="M6 28.2444C6.85811 27.3291 8.98625 25.2353 10.6338 24.1827C12.2814 23.13 14.257 20.1209 15.0388 18.7479C17.4224 15.2392 22.7618 7.91286 25.0501 6.67716C25.462 6.35678 26.0608 5.85718 26.3087 5.64745C27.1668 3.7405 30.0844 0.498738 34.8898 2.78706C35.3017 2.64974 36.32 2.61542 36.7777 2.61542C36.4153 2.86334 35.6564 3.58795 35.5191 4.50328C35.153 7.02039 33.7647 8.48874 33.1164 8.90825C32.6587 11.8259 32.0294 14.4002 30.6564 15.3155L31.915 17.5466C33.8029 19.5489 37.7159 23.8737 38.2649 25.1552C36.4344 24.5603 35.2521 23.992 34.8898 23.7822L38.2649 28.416C36.2818 28.2635 31.8235 26.9744 29.8556 23.0385C30.6336 25.1438 31.4001 27.7677 31.6862 28.8165C30.6183 27.9393 28.3224 25.3955 27.6816 22.2376C27.8647 25.304 27.8342 27.4816 27.7961 28.1872C27.2812 27.7105 26.0913 26.2307 25.4505 24.1255V27.6723C24.6821 26.604 23.1363 24.0104 22.9967 22.0533C23.1255 24.2716 23.047 25.3115 22.9906 25.5556L20.0731 22.8097C19.2912 23.2292 17.1898 24.1827 15.0388 24.6403C13.5743 25.876 11.797 28.969 11.0915 30.3611V28.5877L9.14643 30.5327L9.83291 28.4733L8.57433 29.5602C8.28828 29.7318 7.62468 30.0751 7.25857 30.0751C7.39585 29.7547 7.65904 29.4076 7.77345 29.2741L6.11441 29.9034C6.3051 29.3504 6.90388 28.13 7.77345 27.6723C6.58351 28.13 6.09536 28.2444 6 28.2444Z" fill="white"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_287_2206" x1="22.0557" y1="38.25" x2="22.0557" y2="-4.75" gradientUnits="userSpaceOnUse">
-<stop stop-color="#01D6E6"/>
-<stop offset="1" stop-color="#0182E7"/>
-</linearGradient>
-<clipPath id="clip0_287_2206">
-<rect width="44" height="44" fill="white"/>
-</clipPath>
-</defs>
-</svg>

app/src/main/assets/devportal/dev_bridge.js

@@ -233,9 +233,6 @@ function pluginRemoteProp(objID, propName) {
 function pluginRemoteCall(objID, methodName, args) {
     return JSON.parse(syncPOST("/plugin/remoteCall?id=" + objID + "&method=" + methodName, {}, JSON.stringify(args)));
 }
-function pluginRemoteTest(methodName, args) {
-    return JSON.parse(syncPOST("/plugin/remoteTest?method=" + methodName, {}, JSON.stringify(args)));
-}
 
 function pluginIsLoggedIn(cb, err) {
     fetch("/plugin/isLoggedIn", {
@@ -262,17 +259,6 @@ function getDevLogs(lastIndex, cb) {
         .then(x=>x.json())
         .then(y=> cb && cb(y));
 }
-function getDevHttpExchanges(cb) {
-    fetch("/plugin/getDevHttpExchanges", {
-        timeout: 1000
-    })
-        .then(x=>x.json())
-        .then(y=> cb && cb(y));
-}
-function setDevHttpProxy(url, port) {
-    return fetch("/dev/setDevProxy?url=" + encodeURIComponent(url) + "&port=" + port)
-        .then(x=>x.json());
-}
 function sendFakeDevLog(devId, msg) {
     return syncGET("/plugin/fakeDevLog?devId=" + devId + "&msg=" + msg, {});
 }

app/src/main/assets/devportal/index.html

@@ -7,9 +7,6 @@
 	    <!--<link href="./dependencies/vuetify.min.css" rel="stylesheet">-->
 		<link href="https://cdn.jsdelivr.net/npm/vuetify@2.7.1/dist/vuetify.min.css" rel="stylesheet">
 
-		<title>DevPortal</title>
-		<link rel="icon" type="image/x-icon" href="/favicon.svg">
-
 	  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 	
 		<style>
@@ -153,7 +150,7 @@
 			.pastPluginUrl {
 			    margin-left: auto;
 				margin-right: auto;
-				width: 700px;
+				width: 500px;
 				text-align: center;
 				margin-top: 10px;
 				margin-bottom: 10px;
@@ -163,122 +160,13 @@
 				box-shadow: 0px 1px 2px #131313;
 				font-weight: lighter;
 				cursor: pointer;
-				position: relative;
-			}
-			.pastPluginUrl .deleteButton {
-				position: absolute;
-				right: 15px;
-				height: 100%;
-				width: 30px;
-				top: 0px;
-				padding-top: 2px;
-				display: grid;
-				justify-items: center;
-				align-items: center;
-				cursor: pointer;
-				font-weight: 400;
-				transform: scaleX(1.5);
-			}
-
-			[v-cloak] {
-				display: none;
-			}
-			#cloakLoader {
-				display: block;
-				position: absolute;
-				text-align: center;
-				left: 0px;
-				top: 0px;
-				width: 100%;
-				height: 100%;
-				background-color: black;
-				color: white;
-				padding-top: 50px;
-				font-family: sans-serif;
-			}
-			.httpContainer {
-				position: relative;
-			}
-			.httpLine {
-			}
-			.httpLine .request {
-				height: 50px;
-				position: relative;
-				cursor: pointer;
-			}
-			.httpLine .request .status {
-				position: absolute;
-				left: 10px;
-				width: 40px;
-				top: 10px;
-				padding: 5px;
-				background-color: #333;
-				border-radius: 5px;
-				text-align: center;
-			}
-			.httpLine .request .status.error {
-				background-color: #880000;
-			}
-			.httpLine .request .status.success {
-				background-color: #008800;
-			}
-			.httpLine .request .status.warn {
-				background-color: #803500;
-			}
-			.httpLine .request .method {
-				position: absolute;
-				left: 55px;
-				top: 10px;
-				padding: 5px;
-				background-color: #333;
-				border-radius: 5px;
-				width: 50px;
-				text-align: center;
-			}
-			.httpLine .request .url {
-				position: absolute;
-				left: 110px;
-				top: 10px;
-				padding: 5px;
-				background-color: #333;
-				border-radius: 5px;
-			}
-			.httpLine .response {
-				background-color: #111;
-    			margin-left: 55px;
-    			border-radius: 6px;
-    			padding: 10px;
-			}
-			.httpLine .response .body{
-				white-space: pre-wrap;
-				font-family: monospace;
-				background-color: black;
-				padding: 10px;
-			}
-			.httpLine .response .headers {
-				margin: 10px;
-			}
-			.httpLine .response .headers .key {
-				display: inline-block;
-				font-weight: bold;
-				font-size: 14px;
-				color: #FFF;
-			}
-			.httpLine .response .headers .value {
-				display: inline-block;
-				font-size: 14px;
-				color: #AAA;
 			}
 		</style>
 	</head>
 	<body>
 	  <div id="app">
 		<v-app>
-			<div v-cloak id="cloakLoader" v-if="!page">
-				<h2>Loading..</h2>
-				First load may take longer
-			</div>
-		  <v-main v-cloak>
+		  <v-main>
 			<div id="topMenu">
 				<div style="height: 100%; display: inline-block; padding-left: 10px; padding-right: 20px;">
 					<img src="./dependencies/FutoMainLogo.svg"
@@ -362,13 +250,10 @@
 						</div>
 
 
-						<div v-if="pastPluginUrls" style="margin-top: 60px; margin-left: 25px;">
+						<div v-if="pastPluginUrls" style="margin-top: 60px;">
 							<h2 style="font-weight: lighter; text-align: center;">Past Plugins</h2>
 							<div class="pastPluginUrl" v-for="pastPluginUrl in pastPluginUrls" @click="this.Plugin.newPluginUrl = pastPluginUrl; loadPlugin(pastPluginUrl)">
 								{{pastPluginUrl}}
-								<div class="deleteButton" @click="(ev)=>{ev.stopPropagation(); deletePastPlugin(pastPluginUrl)}">
-									X
-								</div>
 							</div>
 						</div>
 					</div>
@@ -500,8 +385,8 @@
 						</v-card-text>
 					</v-card>
 					<div style="width: 50%" v-if="Plugin.currentPlugin">
-						<v-text-field v-model="searchTestMethods" label="Search for source methods.." style="margin-left: 35px; margin-right: 35px;"></v-text-field>
-						<v-card class="requestCard" v-for="req in Testing.requests" v-show="req.title.indexOf(searchTestMethods) >= 0">
+						<!--Get Home-->
+						<v-card class="requestCard" v-for="req in Testing.requests">
 							<v-card-text>
 								<div class="title">
 									<span v-if="req.isOptional">(Optional)</span>
@@ -517,11 +402,6 @@
 								<div class="code">
 									{{req.code}}
 								</div>
-								<div class="documentation" v-if="req.docUrl" style="position: absolute; right: 15px; top: 15px;">
-									<a :href="req.docUrl" target="_blank">
-										Documentation
-									</a>
-								</div>
 								<div>
 									<div class="parameter" v-for="parameter in req.parameters">
 										<div class="name">
@@ -536,9 +416,6 @@
 							</v-card-text>
 							<v-card-actions>
 								<v-spacer></v-spacer>
-								<v-btn @click="testSourceRemotely(req)">
-									Test Android
-								</v-btn>
 								<v-btn @click="testSource(req)">
 									Test
 								</v-btn>
@@ -620,62 +497,7 @@
 						</v-card-text>
 						<v-card-actions>
 							<v-spacer></v-spacer>
-							<v-btn @click="Integration.logs = []">Clear</v-btn>
-						</v-card-actions>
-					</v-card>
-					<v-card style="margin: 20px;" v-if="Plugin.currentPlugin && Integration.httpExchanges">
-						<v-card-title>
-							Http Logs
-						</v-card-title>
-						</v-card-header>
-						<v-card-text>
-							<div style="position: absolute; top: 0px; right: 15px;">
-								<v-checkbox v-model="Integration.showHttpRequests" label="Show Http Requests"></v-checkbox>
-							</div>
-							<div class="httpContainer" v-if="Integration.showHttpRequests">
-								<div class="httpLine" v-for="exchange of Integration.httpExchanges">
-									<div class="request" @click="toggleHttpExchange(exchange)">
-										<div :class="[{ success: exchange.response.status < 300, warn: exchange.response.status >= 300 && exchange.response.status < 400, error: exchange.response.status >= 400 }, 'status']">
-											{{exchange.response.status}}
-										</div>
-										<div class="method">
-											{{exchange.request.method}}
-										</div>
-										<div class="url">
-											{{exchange.request.url}}
-										</div>
-									</div>
-									<div class="response" v-if="exchange.response.show">
-										<h2>Request Headers</h2>
-										<div class="headers">
-											<div class="header" v-for="(headerValue, header) in exchange.request.headers">
-												<div class="key">
-													{{header}}
-												</div>
-												<div class="value">
-													{{headerValue}}
-												</div>
-											</div>
-										</div>
-										<h2>Response</h2>
-										<div class="headers">
-											<div class="header" v-for="(headerValue, header) in exchange.response.headers">
-												<div class="key">
-													{{header}}
-												</div>
-												<div class="value">
-													{{headerValue}}
-												</div>
-											</div>
-										</div>
-										<div class="body">{{exchange.response.body}}</div>
-									</div>
-								</div>
-							</div>
-						</v-card-text>
-						<v-card-actions>
-							<v-spacer></v-spacer>
-							<v-btn v-if="Integration.showHttpRequests" @click="Integration.httpExchanges = []">Clear</v-btn>
+							<v-btn>Clear</v-btn>
 						</v-card-actions>
 					</v-card>
 				</div>
@@ -713,7 +535,6 @@
 	  <!--<script src="./dependencies/vue.js"></script>-->
 	  <!--<script src="./dependencies/vuetify.js"></script>-->
 	  <script src="./source_docs.js"></script>
-	  <script src="./source_doc_urls.js"></script>
 	  <script src="./source.js"></script>
 	  <script src="./dev_bridge.js"></script>
 	  <script>
@@ -724,7 +545,6 @@
 		new Vue({
 		  el: '#app',
 		  data: {
-		  	searchTestMethods: "",
 			page: "Plugin",
 			pastPluginUrls: [],
 			settings: {},
@@ -732,9 +552,7 @@
 				lastLogIndex: -1,
 				lastLogDevID: "",
 				logs: [],
-				httpExchanges: [],
-				lastInjectTime: "",
-				showHttpRequests: false
+				lastInjectTime: ""
 			},
 			Plugin: {
 				loadUsingTag: false,
@@ -752,9 +570,6 @@
 			Testing: {
 				requests: sourceDocs.map(x=>{
 					x.parameters.forEach(y=>y.value = null);
-
-					if(sourceDocUrls[x.title])
-						x.docUrl = sourceDocUrls[x.title];
 					return x;
 				}),
 				lastResult: "",
@@ -818,16 +633,6 @@
 							});
 						}
 					});
-					if(this.Integration.showHttpRequests) {
-						getDevHttpExchanges((exchanges)=>{
-							Vue.nextTick(()=>{
-								for(i = 0; i < exchanges.length; i++) {
-									exchanges[i].response.show = false;
-									this.Integration.httpExchanges.unshift(exchanges[i]);
-								}
-							});
-						});
-					}
 				}
 				catch(ex) {
 					console.error("Failed update", ex);
@@ -869,12 +674,6 @@
 					this.reloadPlugin();
 				});
 			},
-			deletePastPlugin(url) {
-				let currentPastPlugins = this.pastPluginUrls;
-				currentPastPlugins = currentPastPlugins.filter(x=>x.toLowerCase() != url.toLowerCase());
-				this.pastPluginUrls = currentPastPlugins;
-				localStorage.setItem("pastPlugins", JSON.stringify(currentPastPlugins));
-			},
 			loginTestPlugin() {
 				pluginLoginTestPlugin();
 				setTimeout(()=>{
@@ -1061,58 +860,8 @@
 							"Error: " + ex;
 				}
 			},
-			testSourceRemotely(req) {
-				const name = req.title;
-				const parameterVals = req.parameters.map(x=>{
-					if(x.value && x.value.startsWith && x.value.startsWith("json:"))
-						return JSON.parse(x.value.substring(5));
-					return x.value
-				});
-
-				if(name == "enable") {
-					if(parameterVals.length > 0)
-						parameterVals[0] = this.Plugin.currentPlugin;
-					else
-						parameterVals.push(this.Plugin.currentPlugin);
-					if(parameterVals.length > 1)
-						parameterVals[1] = __DEV_SETTINGS;
-					else
-						parameterVals.push(__DEV_SETTINGS);
-				}
-
-				const func = source[name];
-				if(!func)
-					alert("Test func not found");
-
-				try {
-					const remoteResult = pluginRemoteTest(name, parameterVals);
-					console.log("Result for " + req.title, remoteResult);
-					this.Testing.lastResult = "//Results [" + name + "]\n" +
-						JSON.stringify(remoteResult, null, 3);
-					this.Testing.lastResultError = "";
-				}
-				catch(ex) {
-					if(ex.plugin_type == "CaptchaRequiredException") {
-						let shouldCaptcha = confirm("Do you want to request captcha?");
-						if(shouldCaptcha) {
-							pluginCaptchaTestPlugin(ex.url, ex.body);
-						}
-					}
-					console.error("Failed to run test for " + req.title, ex);
-					this.Testing.lastResult = ""
-					if(ex.message)
-						this.Testing.lastResultError = "//Results [" + name + "]\n\n" +
-							"Error: " + ex.message + "\n\n" + ex.stack;
-					else
-						this.Testing.lastResultError = "//Results [" + name + "]\n\n" +
-							"Error: " + ex;
-				}
-			},
 			showTestResults(results) {
 			
-			},
-			toggleHttpExchange(exchange) {
-				exchange.response.show = !exchange.response.show;
 			},
 			copyClipboard(cpy) {
 				if(navigator.clipboard)

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

@@ -1,37 +1,13 @@
 
 declare class ScriptException extends Error {
-    //If only one parameter is provided, acts as msg
     constructor(type: string, msg: string);
 }
-
-declare class LoginRequiredException extends ScriptException {
-    constructor(msg: string);
-}
-//Alias
-declare class ScriptLoginRequiredException extends ScriptException {
-    constructor(msg: string);
-}
-
-declare class CaptchaRequiredException extends ScriptException {
-    constructor(url: string, body: string);
-}
-
-declare class CriticalException extends ScriptException {
-    constructor(msg: string);
-}
-
-declare class UnavailableException extends ScriptException {
-    constructor(msg: string);
-}
-
-declare class AgeException extends ScriptException {
-    constructor(msg: string);
-}
-
 declare class TimeoutException extends ScriptException {
     constructor(msg: string);
 }
-
+declare class UnavailableException extends ScriptException {
+    constructor(msg: string);
+}
 declare class ScriptImplementationException extends ScriptException {
     constructor(msg: string);
 }
@@ -62,23 +38,16 @@ declare class FilterCapability {
 
 
 declare class PlatformAuthorLink {
-    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?, membershipUrl: string?);
-}
-
-declare class PlatformAuthorMembershipLink {
-    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?, membershipUrl: string?);
+    constructor(id: PlatformID, name: string, url: string, thumbnail: string, subscribers: integer?);
 }
 
 declare interface PlatformContentDef {
     id: PlatformID,
     name: string,
-    thumbnails: Thumbnails,
     author: PlatformAuthorLink,
     datetime: integer,
     url: string
 }
-declare interface PlatformContent {}
-
 declare interface PlatformNestedMediaContentDef extends PlatformContentDef {
     contentUrl: string,
     contentName: string?,
@@ -90,26 +59,16 @@ declare class PlatformNestedMediaContent {
     constructor(obj: PlatformNestedMediaContentDef);
 }
 
-declare interface PlatformLockedContentDef extends PlatformContentDef {
-    contentName: string?,
-    contentThumbnails: Thumbnails?,
-    unlockUrl: string,
-    lockDescription: string?,
-}
-declare class PlatformLockedContent {
-    constructor(obj: PlatformLockedContentDef);
-}
-
-
 declare interface PlatformVideoDef extends PlatformContentDef {
     thumbnails: Thumbnails,
     author: PlatformAuthorLink,
 
     duration: int,
     viewCount: long,
-    isLive: boolean,
-    shareUrl: string?
+    isLive: boolean
 }
+declare interface PlatformContent {}
+
 declare class PlatformVideo implements PlatformContent {
     constructor(obj: PlatformVideoDef);
 }
@@ -118,16 +77,15 @@ declare class PlatformVideo implements PlatformContent {
 declare interface PlatformVideoDetailsDef extends PlatformVideoDef {
     description: string,
     video: VideoSourceDescriptor,
-    live: IVideoSource,
-    rating: IRating,
-    subtitles: SubtitleSource[]
+    live: SubtitleSource[],
+    rating: IRating
 }
 declare class PlatformVideoDetails extends PlatformVideo {
     constructor(obj: PlatformVideoDetailsDef);
 }
 
-declare interface PlatformPostDef extends PlatformContentDef {
-    thumbnails: Thumbnails[],
+declare class PlatformPostDef extends PlatformContentDef {
+    thumbnails: string[],
     images: string[],
     description: string
 }
@@ -135,7 +93,7 @@ declare class PlatformPost extends PlatformContent {
     constructor(obj: PlatformPostDef)
 }
 
-declare interface PlatformPostDetailsDef extends PlatformPostDef {
+declare class PlatformPostDetailsDef extends PlatformPostDef {
     rating: IRating,
     textType: int,
     content: String
@@ -152,8 +110,8 @@ declare interface MuxVideoSourceDescriptorDef {
     isUnMuxed: boolean,
     videoSources: VideoSource[]
 }
-declare class VideoSourceDescriptor implements IVideoSourceDescriptor {
-    constructor(videoSourcesOrObj: VideoSource[]);
+declare class MuxVideoSourceDescriptor implements IVideoSourceDescriptor {
+    constructor(obj: VideoSourceDescriptorDef);
 }
 
 declare interface UnMuxVideoSourceDescriptorDef {
@@ -171,7 +129,7 @@ declare interface IVideoSource {
 declare interface IAudioSource {
 
 }
-declare interface VideoUrlSourceDef implements IVideoSource {
+interface VideoUrlSourceDef implements IVideoSource {
     width: integer,
     height: integer,
     container: string,
@@ -181,22 +139,22 @@ declare interface VideoUrlSourceDef implements IVideoSource {
     duration: integer,
     url: string
 }
-declare class VideoUrlSource {
+class VideoUrlSource {
     constructor(obj: VideoUrlSourceDef);
 
     getRequestModifier(): RequestModifier?;
 }
-declare interface VideoUrlRangeSourceDef extends VideoUrlSource {
+interface VideoUrlRangeSourceDef extends VideoUrlSource {
     itagId: integer,
     initStart: integer,
     initEnd: integer,
     indexStart: integer,
     indexEnd: integer,
 }
-declare class VideoUrlRangeSource extends VideoUrlSource {
+class VideoUrlRangeSource extends VideoUrlSource {
     constructor(obj: YTVideoSourceDef);
 }
-declare interface AudioUrlSourceDef {
+interface AudioUrlSourceDef {
     name: string,
     bitrate: integer,
     container: string,
@@ -205,12 +163,24 @@ declare interface AudioUrlSourceDef {
     url: string,
     language: string
 }
-declare class AudioUrlSource implements IAudioSource {
+class AudioUrlSource implements IAudioSource {
     constructor(obj: AudioUrlSourceDef);
 
     getRequestModifier(): RequestModifier?;
 }
-declare interface AudioUrlRangeSourceDef extends AudioUrlSource {
+interface IRequest {
+    url: string,
+    headers: Map<string, string>
+}
+interface IRequestModifierDef {
+    allowByteSkip: boolean
+}
+class RequestModifier {
+    constructor(obj: IRequestModifierDef) { }
+
+    modifyRequest(url: string, headers: Map<string, string>): IRequest;
+}
+interface AudioUrlRangeSourceDef extends AudioUrlSource {
     itagId: integer,
     initStart: integer,
     initEnd: integer,
@@ -218,44 +188,28 @@ declare interface AudioUrlRangeSourceDef extends AudioUrlSource {
     indexEnd: integer,
     audioChannels: integer
 }
-declare class AudioUrlRangeSource extends AudioUrlSource {
+class AudioUrlRangeSource extends AudioUrlSource {
     constructor(obj: AudioUrlRangeSourceDef);
 }
-declare interface HLSSourceDef {
+interface HLSSourceDef {
     name: string,
     duration: integer,
-    url: string,
-    priority: boolean?,
-    language: string?
+    url: string
 }
-declare class HLSSource implements IVideoSource {
+class HLSSource implements IVideoSource {
     constructor(obj: HLSSourceDef);
 }
-declare interface DashSourceDef {
+interface DashSourceDef {
     name: string,
     duration: integer,
-    url: string,
-    language: string?
+    url: string
 }
-declare class DashSource implements IVideoSource {
+class DashSource implements IVideoSource {
     constructor(obj: DashSourceDef)
 }
 
-declare interface IRequest {
-    url: string,
-    headers: Map<string, string>
-}
-declare interface IRequestModifierDef {
-    allowByteSkip: boolean
-}
-declare class RequestModifier {
-    constructor(obj: IRequestModifierDef) { }
-
-    modifyRequest(url: string, headers: Map<string, string>): IRequest;
-}
-
 //Channel
-declare interface PlatformChannelDef {
+interface PlatformChannelDef {
     id: PlatformID,
     name: string,
     thumbnail: string,
@@ -263,29 +217,12 @@ declare interface PlatformChannelDef {
     subscribers: integer,
     description: string,
     url: string,
-    urlAlternatives: string[],
     links: Map<string>?
 }
-declare class PlatformChannel {
+class PlatformChannel {
     constructor(obj: PlatformChannelDef);
 }
 
-//Playlist
-declare interface PlatformPlaylistDef implements PlatformContent {
-    videoCount: integer,
-    thumbnail: string
-}
-declare class PlatformPlaylist extends PlatformContent {
-    constructor(obj: PlatformPlaylistDef);
-}
-declare interface PlatformPlaylistDetailsDef implements PlatformPlaylistDef {
-    contents: ContentPager
-}
-declare class PlatformPlaylistDetails extends PlatformContent {
-    constructor(obj: PlatformPlaylistDetailsDef);
-}
-
-
 //Ratings
 interface IRating {
     type: integer
@@ -313,11 +250,7 @@ declare class PlatformComment {
     constructor(obj: CommentDef);
 }
 
-declare class PlaybackTracker {
-    constructor(interval: integer);
 
-    setProgress(seconds: integer);
-}
 
 declare class LiveEventPager {
     nextRequest = 4000;
@@ -328,8 +261,8 @@ declare class LiveEventPager {
     nextPage(): LiveEventPager; //Could be self
 }
 
-declare class LiveEvent {
-    constructor(type: integer);
+class LiveEvent {
+    type: String
 }
 declare class LiveEventComment extends LiveEvent {
     constructor(name: string, message: string, thumbnail: string?, colorName: string?, badges: string[]);
@@ -354,31 +287,25 @@ declare class ContentPager {
     constructor(results: PlatformContent[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): ContentPager?; //Could be self
+    nextPage(): VideoPager; //Could be self
 }
 declare class VideoPager {
     constructor(results: PlatformVideo[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): VideoPager?; //Could be self
+    nextPage(): VideoPager; //Could be self
 }
 declare class ChannelPager {
     constructor(results: PlatformChannel[], hasMore: boolean);
 
     hasMorePagers(): boolean;
-    nextPage(): ChannelPager?; //Could be self
-}
-declare class PlaylistPager {
-    constructor(results: PlatformPlaylist[], hasMore: boolean);
-
-    hasMorePagers(): boolean;
-    nextPage(): PlaylistPager?;
+    nextPage(): ChannelPager; //Could be self
 }
 declare class CommentPager {
     constructor(results: PlatformComment[], hasMore: boolean);
 
     hasMorePagers(): boolean
-    nextPage(): CommentPager?; //Could be self
+    nextPage(): CommentPager; //Could be self
 }
 
 interface Map<T> {
@@ -414,9 +341,8 @@ interface Source {
     getChannelCapabilities(): ResultCapabilities;
 
     isContentDetailsUrl(url: string): boolean;
-    getContentDetails(url: string): PlatformContentDetails;
+    getContentDetails(url: string): PlatformVideoDetails;
 
-    //Optional
     getLiveEvents(url: string): LiveEventPager;
 
     //Optional

app/src/main/assets/scripts/source.js

@@ -37,8 +37,7 @@ let Type = {
         NORMAL: 0,
 
         SKIPPABLE: 5,
-        SKIP: 6,
-        SKIPONCE: 7
+        SKIP: 6
     }
 };
 
@@ -78,11 +77,6 @@ class ScriptLoginRequiredException extends ScriptException {
         super("ScriptLoginRequiredException", msg);
     }
 }
-class LoginRequiredException extends ScriptException {
-    constructor(msg) {
-        super("ScriptLoginRequiredException", msg);
-    }
-}
 class CaptchaRequiredException extends Error {
     constructor(url, body) {
         super(JSON.stringify({ 'plugin_type': 'CaptchaRequiredException', url, body }));
@@ -201,7 +195,7 @@ class PlatformContent {
         obj = obj ?? {};
         this.id = obj.id ?? PlatformID();   //PlatformID
         this.name = obj.name ?? ""; //string
-        this.thumbnails = obj.thumbnails ?? new Thumbnails([]); //Thumbnail[]
+        this.thumbnails = obj.thumbnails; //Thumbnail[]
         this.author = obj.author; //PlatformAuthorLink
         this.datetime = obj.datetime ?? obj.uploadDate ?? 0; //OffsetDateTime (Long)
         this.url = obj.url ?? ""; //String
@@ -254,8 +248,8 @@ class PlatformVideoDetails extends PlatformVideo {
 
         this.description = obj.description ?? "";//String
         this.video = obj.video ?? {}; //VideoSourceDescriptor
-        this.dash = obj.dash ?? null; //DashSource, deprecated
-        this.hls = obj.hls ?? null; //HLSSource, deprecated
+        this.dash = obj.dash ?? null; //DashSource
+        this.hls = obj.hls ?? null; //HLSSource
         this.live = obj.live ?? null; //VideoSource
 
         this.rating = obj.rating ?? null; //IRating
@@ -278,49 +272,12 @@ class PlatformPostDetails extends PlatformPost {
         super(obj);
         obj = obj ?? {};
         this.plugin_type = "PlatformPostDetails";
-        this.rating = obj.rating ?? new RatingLikes(-1);
+        this.rating = obj.rating ?? RatingLikes(-1);
         this.textType = obj.textType ?? 0;
         this.content = obj.content ?? "";
     }
 }
 
-class PlatformArticleDetails extends PlatformContent {
-    constructor(obj) {
-        super(obj, 3);
-        obj = obj ?? {};
-        this.plugin_type = "PlatformArticleDetails";
-        this.rating = obj.rating ?? new RatingLikes(-1);
-        this.summary = obj.summary ?? "";
-        this.segments = obj.segments ?? [];
-        this.thumbnails = obj.thumbnails ?? new Thumbnails([]);
-    }
-}
-class ArticleSegment {
-    constructor(type) {
-        this.type = type;
-    }
-}
-class ArticleTextSegment extends ArticleSegment {
-    constructor(content, textType) {
-        super(1);
-        this.textType = textType;
-        this.content = content;
-    }
-}
-class ArticleImagesSegment extends ArticleSegment {
-    constructor(images) {
-        super(2);
-        this.images = images;
-    }
-}
-class ArticleNestedSegment extends ArticleSegment {
-    constructor(nested) {
-        super(9);
-        this.nested = nested;
-    }
-}
-
-
 //Sources
 class VideoSourceDescriptor {
     constructor(obj) {
@@ -363,8 +320,6 @@ class VideoUrlSource {
         this.bitrate = obj.bitrate ?? 0;
         this.duration = obj.duration ?? 0;
         this.url = obj.url;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
     }
 }
 class VideoUrlRangeSource extends VideoUrlSource {
@@ -390,17 +345,6 @@ class AudioUrlSource {
         this.duration = obj.duration ?? 0;
         this.url = obj.url;
         this.language = obj.language ?? Language.UNKNOWN;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
-    }
-}
-class AudioUrlWidevineSource extends AudioUrlSource {
-    constructor(obj) {
-        super(obj);
-        this.plugin_type = "AudioUrlWidevineSource";
-
-        this.bearerToken = obj.bearerToken;
-        this.licenseUri = obj.licenseUri;
     }
 }
 class AudioUrlRangeSource extends AudioUrlSource {
@@ -426,8 +370,6 @@ class HLSSource {
         this.priority = obj.priority ?? false;
         if(obj.language)
             this.language = obj.language;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
     }
 }
 class DashSource {
@@ -439,48 +381,13 @@ class DashSource {
         this.url = obj.url;
         if(obj.language)
             this.language = obj.language;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
     }
 }
-class DashManifestRawSource {
-    constructor(obj) {
-        obj = obj ?? {};
-        this.plugin_type = "DashRawSource";
-        this.name = obj.name ?? "";
-        this.bitrate = obj.bitrate ?? 0;
-        this.container = obj.container ?? "";
-        this.codec = obj.codec ?? "";
-        this.duration = obj.duration ?? 0;
-        this.url = obj.url;
-        this.language = obj.language ?? Language.UNKNOWN;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
-    }
-}
-
-class DashManifestRawAudioSource {
-    constructor(obj) {
-        obj = obj ?? {};
-        this.plugin_type = "DashRawAudioSource";
-        this.name = obj.name ?? "";
-        this.bitrate = obj.bitrate ?? 0;
-        this.container = obj.container ?? "";
-        this.codec = obj.codec ?? "";
-        this.duration = obj.duration ?? 0;
-        this.url = obj.url;
-        this.language = obj.language ?? Language.UNKNOWN;
-        this.manifest = obj.manifest ?? null;
-        if(obj.requestModifier)
-            this.requestModifier = obj.requestModifier;
-    }
-}
-
 
 class RequestModifier {
     constructor(obj) {
         obj = obj ?? {};
-        this.allowByteSkip = obj.allowByteSkip; //Kinda deprecated.. wip
+        this.allowByteSkip = obj.allowByteSkip;
     }
 }
 
@@ -506,7 +413,7 @@ class PlatformPlaylist extends PlatformContent {
     constructor(obj) {
         super(obj, 4);
         this.plugin_type = "PlatformPlaylist";
-        this.videoCount = obj.videoCount ?? -1;
+        this.videoCount = obj.videoCount ?? 0;
         this.thumbnail = obj.thumbnail;
     }
 }
@@ -832,99 +739,3 @@ class URLSearchParams {
         return searchString;
     }
 }
-
-
-var __REGEX_SPACE_CHARACTERS = /<%= spaceCharacters %>/g;
-var __btoa_TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-function btoa(input) {
-	input = String(input);
-	if (/[^\0-\xFF]/.test(input)) {
-		// Note: no need to special-case astral symbols here, as surrogates are
-		// matched, and the input is supposed to only contain ASCII anyway.
-		error(
-			'The string to be encoded contains characters outside of the ' +
-			'Latin1 range.'
-		);
-	}
-	var padding = input.length % 3;
-	var output = '';
-	var position = -1;
-	var a;
-	var b;
-	var c;
-	var buffer;
-	// Make sure any padding is handled outside of the loop.
-	var length = input.length - padding;
-
-	while (++position < length) {
-		// Read three bytes, i.e. 24 bits.
-		a = input.charCodeAt(position) << 16;
-		b = input.charCodeAt(++position) << 8;
-		c = input.charCodeAt(++position);
-		buffer = a + b + c;
-		// Turn the 24 bits into four chunks of 6 bits each, and append the
-		// matching character for each of them to the output.
-		output += (
-			__btoa_TABLE.charAt(buffer >> 18 & 0x3F) +
-			__btoa_TABLE.charAt(buffer >> 12 & 0x3F) +
-			__btoa_TABLE.charAt(buffer >> 6 & 0x3F) +
-			__btoa_TABLE.charAt(buffer & 0x3F)
-		);
-	}
-
-	if (padding == 2) {
-		a = input.charCodeAt(position) << 8;
-		b = input.charCodeAt(++position);
-		buffer = a + b;
-		output += (
-			__btoa_TABLE.charAt(buffer >> 10) +
-			__btoa_TABLE.charAt((buffer >> 4) & 0x3F) +
-			__btoa_TABLE.charAt((buffer << 2) & 0x3F) +
-			'='
-		);
-	} else if (padding == 1) {
-		buffer = input.charCodeAt(position);
-		output += (
-			__btoa_TABLE.charAt(buffer >> 2) +
-			__btoa_TABLE.charAt((buffer << 4) & 0x3F) +
-			'=='
-		);
-	}
-
-	return output;
-};
-function atob(input) {
-	input = String(input)
-		.replace(__REGEX_SPACE_CHARACTERS, '');
-	var length = input.length;
-	if (length % 4 == 0) {
-		input = input.replace(/==?$/, '');
-		length = input.length;
-	}
-	if (
-		length % 4 == 1 ||
-		// http://whatwg.org/C#alphanumeric-ascii-characters
-		/[^+a-zA-Z0-9/]/.test(input)
-	) {
-		error(
-			'Invalid character: the string to be decoded is not correctly encoded.'
-		);
-	}
-	var bitCounter = 0;
-	var bitStorage;
-	var buffer;
-	var output = '';
-	var position = -1;
-	while (++position < length) {
-		buffer = __btoa_TABLE.indexOf(input.charAt(position));
-		bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
-		// Unless this is the first of a group of 4 characters…
-		if (bitCounter++ % 4) {
-			// …convert the first 8 bits to a single ASCII character.
-			output += String.fromCharCode(
-				0xFF & bitStorage >> (-2 * bitCounter & 6)
-			);
-		}
-	}
-	return output;
-};

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

@@ -1,122 +0,0 @@
-import android.app.Activity
-import android.content.Context
-import android.content.pm.ActivityInfo
-import android.hardware.Sensor
-import android.hardware.SensorEvent
-import android.hardware.SensorEventListener
-import android.hardware.SensorManager
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-
-class AdvancedOrientationListener(private val activity: Activity, private val lifecycleScope: CoroutineScope) {
-    private val sensorManager: SensorManager = activity.getSystemService(Context.SENSOR_SERVICE) as SensorManager
-    private val accelerometer: Sensor? = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
-    private val magnetometer: Sensor? = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD)
-
-    private var lastOrientation: Int = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    private var lastStableOrientation: Int = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    private var lastOrientationChangeTime = 0L
-    private val debounceTime = 200L
-    private val stabilityThresholdTime = 800L
-    private var deviceAspectRatio: Float = 1.0f
-
-    private val gravity = FloatArray(3)
-    private val geomagnetic = FloatArray(3)
-    private val rotationMatrix = FloatArray(9)
-    private val orientationAngles = FloatArray(3)
-
-    val onOrientationChanged = Event1<Int>()
-
-    private val sensorListener = object : SensorEventListener {
-        override fun onSensorChanged(event: SensorEvent) {
-            when (event.sensor.type) {
-                Sensor.TYPE_ACCELEROMETER -> {
-                    System.arraycopy(event.values, 0, gravity, 0, gravity.size)
-                }
-                Sensor.TYPE_MAGNETIC_FIELD -> {
-                    System.arraycopy(event.values, 0, geomagnetic, 0, geomagnetic.size)
-                }
-            }
-
-            if (gravity.isNotEmpty() && geomagnetic.isNotEmpty()) {
-                val success = SensorManager.getRotationMatrix(rotationMatrix, null, gravity, geomagnetic)
-                if (success) {
-                    SensorManager.getOrientation(rotationMatrix, orientationAngles)
-
-                    val azimuth = Math.toDegrees(orientationAngles[0].toDouble()).toFloat()
-                    val pitch = Math.toDegrees(orientationAngles[1].toDouble()).toFloat()
-                    val roll = Math.toDegrees(orientationAngles[2].toDouble()).toFloat()
-
-                    val newOrientation = when {
-                        roll in -155f .. -15f && isWithinThreshold(pitch, 0f, 30.0) -> {
-                            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                        }
-                        roll in 15f .. 155f && isWithinThreshold(pitch, 0f, 30.0) -> {
-                            ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-                        }
-                        isWithinThreshold(pitch, -90f, 30.0 * deviceAspectRatio) && roll in -15f .. 15f -> {
-                            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-                        }
-                        isWithinThreshold(pitch, 90f, 30.0 * deviceAspectRatio) && roll in -15f .. 15f -> {
-                            ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
-                        }
-                        else -> lastOrientation
-                    }
-
-                    //Logger.i("AdvancedOrientationListener", "newOrientation = ${newOrientation}, roll = ${roll}, pitch = ${pitch}, azimuth = ${azimuth}")
-
-                    if (newOrientation != lastStableOrientation) {
-                        val currentTime = System.currentTimeMillis()
-                        if (currentTime - lastOrientationChangeTime > debounceTime) {
-                            lastOrientationChangeTime = currentTime
-                            lastStableOrientation = newOrientation
-
-                            lifecycleScope.launch(Dispatchers.Main) {
-                                try {
-                                    delay(stabilityThresholdTime)
-                                    if (newOrientation == lastStableOrientation) {
-                                        lastOrientation = newOrientation
-                                        onOrientationChanged.emit(newOrientation)
-                                    }
-                                } catch (e: Throwable) {
-                                    Logger.i(TAG, "Failed to trigger onOrientationChanged", e)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {}
-    }
-
-    private fun isWithinThreshold(value: Float, target: Float, threshold: Double): Boolean {
-        return Math.abs(value - target) <= threshold
-    }
-
-    init {
-        sensorManager.registerListener(sensorListener, accelerometer, SensorManager.SENSOR_DELAY_GAME)
-        sensorManager.registerListener(sensorListener, magnetometer, SensorManager.SENSOR_DELAY_GAME)
-
-        val metrics = activity.resources.displayMetrics
-        deviceAspectRatio = (metrics.heightPixels.toFloat() / metrics.widthPixels.toFloat())
-        if (deviceAspectRatio == 0.0f)
-            deviceAspectRatio = 1.0f
-
-        lastOrientation = activity.resources.configuration.orientation
-    }
-
-    fun stopListening() {
-        sensorManager.unregisterListener(sensorListener)
-    }
-
-    companion object {
-        private val TAG = "AdvancedOrientationListener"
-    }
-}

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

@@ -18,10 +18,7 @@ fun IAudioSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
 @UnstableApi
 fun JSSource.getHttpDataSourceFactory(): HttpDataSource.Factory {
     val requestModifier = getRequestModifier();
-    val requestExecutor = getRequestExecutor();
-    return if (requestExecutor != null) {
-        JSHttpDataSource.Factory().setRequestExecutor(requestExecutor);
-    } else if (requestModifier != null) {
+    return if (requestModifier != null) {
         JSHttpDataSource.Factory().setRequestModifier(requestModifier);
     } else {
         DefaultHttpDataSource.Factory();

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

@@ -1,6 +1,5 @@
 package com.futo.platformplayer
 
-import android.util.Log
 import com.google.common.base.CharMatcher
 import java.io.ByteArrayOutputStream
 import java.io.IOException
@@ -10,6 +9,7 @@ import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.nio.ByteBuffer
+import java.nio.charset.Charset
 
 
 private const val IPV4_PART_COUNT = 4;
@@ -216,20 +216,15 @@ private fun ByteArray.toInetAddress(): InetAddress {
 }
 
 fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
-    val timeout = 2000
-
     if (addresses.isEmpty()) {
         return null;
     }
 
     if (addresses.size == 1) {
-        val socket = Socket()
-
         try {
-            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeout) }
+            return Socket(addresses[0], port);
         } catch (e: Throwable) {
-            Log.i("getConnectedSocket", "Failed to connect to: ${addresses[0]}", e)
-            socket.close()
+            //Ignored.
         }
 
         return null;
@@ -254,7 +249,7 @@ fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
                     }
                 }
 
-                socket.connect(InetSocketAddress(address, port), timeout);
+                socket.connect(InetSocketAddress(address, port));
 
                 synchronized(syncObject) {
                     if (connectedSocket == null) {
@@ -268,7 +263,7 @@ fun getConnectedSocket(addresses: List<InetAddress>, port: Int): Socket? {
                     }
                 }
             } catch (e: Throwable) {
-                Log.i("getConnectedSocket", "Failed to connect to: $address", e)
+                //Ignore
             }
         };
 

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

@@ -1,13 +1,11 @@
 package com.futo.platformplayer
 
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.views.adapters.CommentViewHolder
 import com.futo.polycentric.core.ProcessHandle
-import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.SystemState
 import userpackage.Protocol
 import kotlin.math.abs
 import kotlin.math.min
@@ -49,12 +47,6 @@ fun Protocol.Claim.resolveChannelUrls(): List<String> {
 }
 
 suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
-    val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system))
-    if (!systemState.servers.contains(PolycentricCache.SERVER)) {
-        Logger.w("Backfill", "Polycentric prod server not added, adding it.")
-        addServer(PolycentricCache.SERVER)
-    }
-
     val exceptions = fullyBackfillServers()
     for (pair in exceptions) {
         val server = pair.key

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

@@ -1,9 +1,6 @@
 package com.futo.platformplayer
 
 import android.net.Uri
-import java.net.Inet4Address
-import java.net.Inet6Address
-import java.net.InetAddress
 import java.net.URI
 import java.net.URISyntaxException
 import java.net.URLEncoder
@@ -28,18 +25,4 @@ fun String?.yesNoToBoolean(): Boolean {
 
 fun Boolean?.toYesNo(): String {
     return if (this == true) "YES" else "NO"
-}
-
-fun InetAddress?.toUrlAddress(): String {
-    return when (this) {
-        is Inet6Address -> {
-            "[${toString()}]"
-        }
-        is Inet4Address -> {
-            toString()
-        }
-        else -> {
-            throw Exception("Invalid address type")
-        }
-    }
 }

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

@@ -2,11 +2,8 @@ package com.futo.platformplayer
 
 import android.content.ActivityNotFoundException
 import android.content.Context
-import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
-import android.os.PowerManager
 import android.webkit.CookieManager
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.MainActivity
@@ -26,7 +23,6 @@ import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePayment
-import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -38,7 +34,6 @@ import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FormFieldButton
 import com.futo.platformplayer.views.fields.FormFieldWarning
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
-import com.stripe.android.customersheet.injection.CustomerSheetViewModelModule_Companion_ContextFactory.context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -49,7 +44,6 @@ import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
 
-
 @Serializable
 data class MenuBottomBarSetting(val id: Int, var enabled: Boolean);
 
@@ -63,7 +57,7 @@ class Settings : FragmentedStorageFileJson() {
     @Transient
     val onTabsChanged = Event0();
 
-    @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -7)
+    @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -6)
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
         SettingsActivity.getActivity()?.let {
@@ -79,7 +73,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -6)
+    @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -5)
     @FormFieldButton(R.drawable.ic_quiz)
     fun openFAQ() {
         try {
@@ -89,7 +83,7 @@ class Settings : FragmentedStorageFileJson() {
             //Ignored
         }
     }
-    @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -5)
+    @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -4)
     @FormFieldButton(R.drawable.ic_data_alert)
     fun openIssues() {
         try {
@@ -121,7 +115,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }*/
 
-    @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -4)
+    @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -3)
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
@@ -135,7 +129,7 @@ class Settings : FragmentedStorageFileJson() {
 
 
 
-    @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -3)
+    @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -2)
     @FormFieldButton(R.drawable.ic_move_up)
     fun import() {
         val act = SettingsActivity.getActivity() ?: return;
@@ -144,7 +138,7 @@ class Settings : FragmentedStorageFileJson() {
         act.startActivity(intent);
     }
 
-    @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -2)
+    @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -1)
     @FormFieldButton(R.drawable.ic_link)
     fun manageLinks() {
         try {
@@ -154,24 +148,6 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    /*@FormField(R.string.disable_battery_optimization, FieldForm.BUTTON, R.string.click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions, -1)
-    @FormFieldButton(R.drawable.battery_full_24px)
-    fun ignoreBatteryOptimization() {
-        SettingsActivity.getActivity()?.let {
-            val intent = Intent()
-            val packageName = it.packageName
-            val pm = it.getSystemService(POWER_SERVICE) as PowerManager;
-            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
-                intent.setAction(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
-                intent.setData(Uri.parse("package:$packageName"))
-                it.startActivity(intent)
-                UIDialogs.toast(it, "Please ignore battery optimizations for Grayjay")
-            } else {
-                UIDialogs.toast(it, "Battery optimizations already disabled for Grayjay")
-            }
-        }
-    }*/
-
     @FormField(R.string.language, "group", -1, 0)
     var language = LanguageSettings();
     @Serializable
@@ -301,7 +277,7 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 9)
         var fetchOnTabOpen: Boolean = true;
 
-        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 10, "background_update")
+        @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 10)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -335,10 +311,7 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 14)
         var alwaysReloadFromCache: Boolean = false;
 
-        @FormField(R.string.peek_channel_contents, FieldForm.TOGGLE, R.string.peek_channel_contents_description, 15)
-        var peekChannelContents: Boolean = false;
-
-        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 16)
+        @FormField(R.string.clear_channel_cache, FieldForm.BUTTON, R.string.clear_channel_cache_description, 15)
         fun clearChannelCache() {
             UIDialogs.toast(SettingsActivity.getActivity()!!, "Started clearing..");
             StateCache.instance.clear();
@@ -350,7 +323,7 @@ class Settings : FragmentedStorageFileJson() {
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
-        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -1)
+        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, 0)
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
@@ -377,7 +350,7 @@ class Settings : FragmentedStorageFileJson() {
 
         //= context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
-        @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 0)
+        @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 1)
         @DropdownFieldOptionsId(R.array.playback_speeds)
         var defaultPlaybackSpeed: Int = 3;
         fun getDefaultPlaybackSpeed(): Float = when(defaultPlaybackSpeed) {
@@ -393,31 +366,35 @@ class Settings : FragmentedStorageFileJson() {
             else -> 1.0f;
         };
 
-        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, R.string.preferred_quality_description, 1)
+        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, R.string.preferred_quality_description, 2)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredQuality: Int = 0;
 
-        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, R.string.preferred_metered_quality_description, 2)
+        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, R.string.preferred_metered_quality_description, 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredMeteredQuality: Int = 0;
         fun getPreferredQualityPixelCount(): Int = preferedQualityToPixels(preferredQuality);
         fun getPreferredMeteredQualityPixelCount(): Int = preferedQualityToPixels(preferredMeteredQuality);
         fun getCurrentPreferredQualityPixelCount(): Int = if(!StateApp.instance.isCurrentMetered()) getPreferredQualityPixelCount() else getPreferredMeteredQualityPixelCount();
 
-        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, R.string.preferred_preview_quality_description, 3)
+        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, R.string.preferred_preview_quality_description, 4)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredPreviewQuality: Int = 5;
         fun getPreferredPreviewQualityPixelCount(): Int = preferedQualityToPixels(preferredPreviewQuality);
 
-
-        @FormField(R.string.simplify_sources, FieldForm.TOGGLE, R.string.simplify_sources_description, 4)
-        var simplifySources: Boolean = true;
-
         @FormField(R.string.auto_rotate, FieldForm.DROPDOWN, -1, 5)
         @DropdownFieldOptionsId(R.array.system_enabled_disabled_array)
         var autoRotate: Int = 2;
 
-        fun isAutoRotate() = (autoRotate == 1 && !StatePlayer.instance.rotationLock) || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate() && !StatePlayer.instance.rotationLock);
+        fun isAutoRotate() = autoRotate == 1 || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate());
+
+        @FormField(R.string.auto_rotate_dead_zone, FieldForm.DROPDOWN, R.string.this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees, 6)
+        @DropdownFieldOptionsId(R.array.auto_rotate_dead_zone)
+        var autoRotateDeadZone: Int = 0;
+
+        fun getAutoRotateDeadZoneDegrees(): Int {
+            return autoRotateDeadZone * 5;
+        }
 
         @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 7)
         @DropdownFieldOptionsId(R.array.player_background_behavior)
@@ -470,52 +447,18 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.full_screen_portrait, FieldForm.TOGGLE, R.string.allow_full_screen_portrait, 13)
         var fullscreenPortrait: Boolean = false;
-
-        @FormField(R.string.reverse_portrait, FieldForm.TOGGLE, R.string.reverse_portrait_description, 14)
-        var reversePortrait: Boolean = false;
-
-        @FormField(R.string.rotation_zone, FieldForm.DROPDOWN, R.string.rotation_zone_description, 15)
-        @DropdownFieldOptionsId(R.array.rotation_zone)
-        var rotationZone: Int = 2;
-
-        @FormField(R.string.stability_threshold_time, FieldForm.DROPDOWN, R.string.stability_threshold_time_description, 16)
-        @DropdownFieldOptionsId(R.array.rotation_threshold_time)
-        var stabilityThresholdTime: Int = 1;
-
-        @FormField(R.string.full_autorotate_lock, FieldForm.TOGGLE, R.string.full_autorotate_lock_description, 17)
-        var fullAutorotateLock: Boolean = false;
-
-        @FormField(R.string.prefer_webm, FieldForm.TOGGLE, R.string.prefer_webm_description, 18)
-        var preferWebmVideo: Boolean = false;
-        @FormField(R.string.prefer_webm_audio, FieldForm.TOGGLE, R.string.prefer_webm_audio_description, 19)
-        var preferWebmAudio: Boolean = false;
-
-        @FormField(R.string.allow_under_cutout, FieldForm.TOGGLE, R.string.allow_under_cutout_description, 20)
-        var allowVideoToGoUnderCutout: Boolean = true;
-
-        @FormField(R.string.autoplay, FieldForm.TOGGLE, R.string.autoplay, 21)
-        var autoplay: Boolean = false;
     }
 
     @FormField(R.string.comments, "group", R.string.comments_description, 6)
     var comments = CommentSettings();
     @Serializable
     class CommentSettings {
-        var didAskPolycentricDefault: Boolean = false;
-
         @FormField(R.string.default_comment_section, FieldForm.DROPDOWN, -1, 0)
         @DropdownFieldOptionsId(R.array.comment_sections)
-        var defaultCommentSection: Int = 2;
-
-        @FormField(R.string.default_recommendations, FieldForm.TOGGLE, R.string.default_recommendations_description, 0)
-        var recommendationsDefault: Boolean = false;
-
-        @FormField(R.string.hide_recommendations, FieldForm.TOGGLE, R.string.hide_recommendations_description, 0)
-        var hideRecommendations: Boolean = false;
+        var defaultCommentSection: Int = 0;
 
         @FormField(R.string.bad_reputation_comments_fading, FieldForm.TOGGLE, R.string.bad_reputation_comments_fading_description, 0)
         var badReputationCommentsFading: Boolean = true;
-
     }
 
     @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 7)
@@ -564,7 +507,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 = false; //Temporary default disabled to prevent ui freeze?
+        var videoCache: Boolean = true;
     }
 
     @FormField(R.string.casting, "group", R.string.configure_casting, 9)
@@ -579,10 +522,6 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var keepScreenOn: Boolean = true;
 
-        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 1)
-        @Serializable(with = FlexibleBooleanSerializer::class)
-        var alwaysProxyRequests: Boolean = false;
-
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -607,8 +546,6 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.log_levels)
         var logLevel: Int = 0;
 
-        fun isVerbose() = logLevel >= 4;
-
         @FormField(R.string.submit_logs, FieldForm.BUTTON, R.string.submit_logs_to_help_us_narrow_down_issues, 1)
         fun submitLogs() {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
@@ -748,9 +685,7 @@ class Settings : FragmentedStorageFileJson() {
         fun manualCheck() {
             if (!BuildConfig.IS_PLAYSTORE_BUILD) {
                 SettingsActivity.getActivity()?.let {
-                    StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                        StateUpdate.instance.checkForUpdates(it, true)
-                    }
+                    StateUpdate.instance.checkForUpdates(it, true);
                 }
             } else {
                 SettingsActivity.getActivity()?.let {
@@ -833,10 +768,10 @@ class Settings : FragmentedStorageFileJson() {
         fun export() {
             val activity = SettingsActivity.getActivity() ?: return;
             UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {},
-                SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", tag = null, call = {
+                SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", null, {
                     StateBackup.shareExternalBackup();
                 }),
-                SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", tag = null, call = {
+                SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", null, {
                     StateBackup.saveExternalBackup(activity);
                 })
             )
@@ -872,36 +807,7 @@ class Settings : FragmentedStorageFileJson() {
         var polycentricEnabled: Boolean = true;
     }
 
-    @FormField(R.string.gesture_controls, FieldForm.GROUP, -1, 19)
-    var gestureControls = GestureControls();
-    @Serializable
-    class GestureControls {
-        @FormField(R.string.volume_slider, FieldForm.TOGGLE, R.string.volume_slider_descr, 1)
-        var volumeSlider: Boolean = true;
-
-        @FormField(R.string.brightness_slider, FieldForm.TOGGLE, R.string.brightness_slider_descr, 2)
-        var brightnessSlider: Boolean = true;
-
-        @FormField(R.string.toggle_full_screen, FieldForm.TOGGLE, R.string.toggle_full_screen_descr, 3)
-        var toggleFullscreen: Boolean = true;
-
-        @FormField(R.string.system_brightness, FieldForm.TOGGLE, R.string.system_brightness_descr, 4)
-        var useSystemBrightness: Boolean = false;
-
-        @FormField(R.string.system_volume, FieldForm.TOGGLE, R.string.system_volume_descr, 5)
-        var useSystemVolume: Boolean = true;
-
-        @FormField(R.string.restore_system_brightness, FieldForm.TOGGLE, R.string.restore_system_brightness_descr, 6)
-        var restoreSystemBrightness: Boolean = true;
-
-        @FormField(R.string.zoom_option, FieldForm.TOGGLE, R.string.zoom_option_descr, 7)
-        var zoom: Boolean = true;
-
-        @FormField(R.string.pan_option, FieldForm.TOGGLE, R.string.pan_option_descr, 8)
-        var pan: Boolean = true;
-    }
-
-    @FormField(R.string.info, FieldForm.GROUP, -1, 20)
+    @FormField(R.string.info, FieldForm.GROUP, -1, 19)
     var info = Info();
     @Serializable
     class Info {

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

@@ -8,7 +8,6 @@ import androidx.work.WorkManager
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.futo.platformplayer.activities.DeveloperActivity
-import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
@@ -34,7 +33,6 @@ import com.futo.platformplayer.stores.FragmentedStorageFileJson
 import com.futo.platformplayer.views.fields.ButtonField
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
-import com.futo.platformplayer.views.fields.FormFieldWarning
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -235,17 +233,13 @@ class SettingsDev : FragmentedStorageFileJson() {
         R.string.test_background_worker_description, 4)
     fun triggerBackgroundUpdate() {
         val act = SettingsActivity.getActivity()!!;
-        try {
-            UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
+        UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
 
-            val wm = WorkManager.getInstance(act);
-            val req = OneTimeWorkRequestBuilder<BackgroundWorker>()
-                .setInputData(Data.Builder().putBoolean("bypassMainCheck", true).build())
-                .build();
-            wm.enqueue(req);
-        } catch (e: Throwable) {
-            UIDialogs.showGeneralErrorDialog(act, "Failed to trigger background update", e)
-        }
+        val wm = WorkManager.getInstance(act);
+        val req = OneTimeWorkRequestBuilder<BackgroundWorker>()
+            .setInputData(Data.Builder().putBoolean("bypassMainCheck", true).build())
+            .build();
+        wm.enqueue(req);
     }
     @FormField(R.string.clear_channel_cache, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
@@ -496,24 +490,6 @@ class SettingsDev : FragmentedStorageFileJson() {
                 }
             }
         }
-
-
-        @FormField(R.string.test_playback, FieldForm.BUTTON,
-            R.string.test_playback, 1)
-        fun testPlayback(context: Context) {
-            context.startActivity(MainActivity.getActionIntent(context, "TEST_PLAYBACK"));
-        }
-    }
-
-
-
-    @FormField(R.string.networking, FieldForm.GROUP, -1, 18)
-    var networking = Networking();
-    @Serializable
-    class Networking {
-        @FormField(R.string.allow_all_certificates, FieldForm.TOGGLE, -1, 0)
-        @FormFieldWarning(R.string.allow_all_certificates_warning)
-        var allowAllCertificates: Boolean = false;
     }
 
 
@@ -527,8 +503,6 @@ class SettingsDev : FragmentedStorageFileJson() {
         var channelCacheStartupCount = StateCache.instance.channelCacheStartupCount;
     }
 
-
-
     //region BOILERPLATE
     override fun encode(): String {
         return Json.encodeToString(this);

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

@@ -1,86 +0,0 @@
-package com.futo.platformplayer
-
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import android.hardware.SensorManager
-import android.view.OrientationEventListener
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-class SimpleOrientationListener(
-    private val activity: Activity,
-    private val lifecycleScope: CoroutineScope
-) {
-    private var lastOrientation: Int = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    private var lastStableOrientation: Int = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    private var _currentJob: Job? = null
-
-    val onOrientationChanged = Event1<Int>()
-
-    private val orientationListener = object : OrientationEventListener(activity, SensorManager.SENSOR_DELAY_UI) {
-        override fun onOrientationChanged(orientation: Int) {
-            //val rotationZone = 45
-            val stabilityThresholdTime = when (Settings.instance.playback.stabilityThresholdTime) {
-                0 -> 100L
-                1 -> 500L
-                2 -> 750L
-                3 -> 1000L
-                4 -> 1500L
-                5 -> 2000L
-                else -> 500L
-            }
-
-            val rotationZone = when (Settings.instance.playback.rotationZone) {
-                0 -> 15
-                1 -> 30
-                2 -> 45
-                else -> 45
-            }
-
-            val newOrientation = when {
-                orientation in (90 - rotationZone)..(90 + rotationZone - 1) -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-                orientation in (180 - rotationZone)..(180 + rotationZone - 1) -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
-                orientation in (270 - rotationZone)..(270 + rotationZone - 1) -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                orientation in (360 - rotationZone)..(360 + rotationZone - 1) || orientation in 0..(rotationZone - 1) -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-                else -> lastOrientation
-            }
-
-            if (newOrientation != lastStableOrientation) {
-                lastStableOrientation = newOrientation
-
-                _currentJob?.cancel()
-                _currentJob = lifecycleScope.launch(Dispatchers.Main) {
-                    try {
-                        delay(stabilityThresholdTime)
-                        if (newOrientation == lastStableOrientation) {
-                            lastOrientation = newOrientation
-                            onOrientationChanged.emit(newOrientation)
-                        }
-                    } catch (e: Throwable) {
-                        Logger.i(TAG, "Failed to trigger onOrientationChanged", e)
-                    }
-                }
-            }
-        }
-    }
-
-    init {
-        orientationListener.enable()
-        lastOrientation = activity.resources.configuration.orientation
-    }
-
-    fun stopListening() {
-        _currentJob?.cancel()
-        _currentJob = null
-        orientationListener.disable()
-    }
-
-    companion object {
-        private val TAG = "SimpleOrientationListener"
-    }
-}

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
-import android.text.method.ScrollingMovementMethod
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -19,7 +18,6 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.dialogs.AutoUpdateDialog
 import com.futo.platformplayer.dialogs.AutomaticBackupDialog
@@ -33,19 +31,12 @@ import com.futo.platformplayer.dialogs.ConnectedCastingDialog
 import com.futo.platformplayer.dialogs.ImportDialog
 import com.futo.platformplayer.dialogs.ImportOptionsDialog
 import com.futo.platformplayer.dialogs.MigrateDialog
-import com.futo.platformplayer.dialogs.PluginUpdateDialog
 import com.futo.platformplayer.dialogs.ProgressDialog
 import com.futo.platformplayer.engine.exceptions.PluginException
-import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
-import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
-import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.stores.v2.ManagedStore
-import com.futo.platformplayer.views.ToastView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -191,14 +182,6 @@ class UIDialogs {
             dialog.show();
         }
 
-        fun showPluginUpdateDialog(context: Context, oldConfig: SourcePluginConfig, newConfig: SourcePluginConfig) {
-            val dialog = PluginUpdateDialog(context, oldConfig, newConfig);
-            registerDialogOpened(dialog);
-            dialog.setOnDismissListener { registerDialogClosed(dialog) };
-            dialog.show();
-        }
-
-
         fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action) {
             val builder = AlertDialog.Builder(context);
             val view = LayoutInflater.from(context).inflate(R.layout.dialog_multi_button, null);
@@ -224,20 +207,18 @@ class UIDialogs {
                     this.visibility = View.GONE;
                 else {
                     this.text = code;
-                    this.movementMethod = ScrollingMovementMethod.getInstance();
                     this.visibility = View.VISIBLE;
                 }
             };
             view.findViewById<LinearLayout>(R.id.dialog_buttons).apply {
-                val center = actions.any { it?.center == true };
                 val buttons = actions.map<Action, TextView> { act ->
                     val buttonView = TextView(context);
                     val dp10 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, resources.displayMetrics).toInt();
                     val dp28 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 28f, resources.displayMetrics).toInt();
                     val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics).toInt();
                     buttonView.layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
-                        this.marginStart = if(actions.size >= 2) dp14 / 2 else dp28 / 2;
-                        this.marginEnd = if(actions.size >= 2) dp14 / 2 else dp28 / 2;
+                        if(actions.size > 1)
+                            this.marginEnd = if(actions.size > 2) dp14 else dp28;
                     };
                     buttonView.setTextColor(Color.WHITE);
                     buttonView.textSize = 14f;
@@ -259,7 +240,7 @@ class UIDialogs {
 
                     return@map buttonView;
                 };
-                if(actions.size <= 1 || center)
+                if(actions.size <= 1)
                     this.gravity = Gravity.CENTER;
                 else
                     this.gravity = Gravity.END;
@@ -286,48 +267,22 @@ class UIDialogs {
                 }, UIDialogs.ActionStyle.PRIMARY)
             );
         }
-        fun showGeneralRetryErrorDialog(context: Context, msg: String, ex: Throwable? = null, retryAction: (() -> Unit)? = null, closeAction: (() -> Unit)? = null, mainFragment: MainFragment? = null) {
-            val pluginConfig = if(ex is PluginException) ex.config else null;
+        fun showGeneralRetryErrorDialog(context: Context, msg: String, ex: Throwable? = null, retryAction: (() -> Unit)? = null, closeAction: (() -> Unit)? = null) {
             val pluginInfo = if(ex is PluginException)
                 "\nPlugin [${ex.config.name}]" else "";
-
-            var exMsg = if(ex != null ) "${ex.message}" else "";
-            if(pluginConfig != null && pluginConfig is SourcePluginConfig && StatePlugins.instance.hasUpdateAvailable(pluginConfig))
-                exMsg += "\n\nAn update is available"
-
-            if(mainFragment != null && pluginConfig != null && pluginConfig is SourcePluginConfig && StatePlugins.instance.hasUpdateAvailable(pluginConfig))
-                showDialog(context,
-                    R.drawable.ic_error_pred,
-                    "${msg}${pluginInfo}",
-                    exMsg,
-                    if(ex is PluginException) ex.code else null,
-                    1,
-                    UIDialogs.Action(context.getString(R.string.update), {
-                        mainFragment.navigate<SourceDetailFragment>(SourceDetailFragment.UpdatePluginAction(pluginConfig));
-                        if(mainFragment is VideoDetailFragment)
-                            mainFragment.minimizeVideoDetail();
-                    }, UIDialogs.ActionStyle.ACCENT),
-                    UIDialogs.Action(context.getString(R.string.close), {
-                        closeAction?.invoke()
-                    }, UIDialogs.ActionStyle.NONE),
-                    UIDialogs.Action(context.getString(R.string.retry), {
-                        retryAction?.invoke();
-                    }, UIDialogs.ActionStyle.PRIMARY)
-                );
-            else
-                showDialog(context,
-                    R.drawable.ic_error_pred,
-                    "${msg}${pluginInfo}",
-                    exMsg,
-                    if(ex is PluginException) ex.code else null,
-                    0,
-                    UIDialogs.Action(context.getString(R.string.close), {
-                        closeAction?.invoke()
-                    }, UIDialogs.ActionStyle.NONE),
-                    UIDialogs.Action(context.getString(R.string.retry), {
-                        retryAction?.invoke();
-                    }, UIDialogs.ActionStyle.PRIMARY)
-                );
+            showDialog(context,
+                R.drawable.ic_error_pred,
+                "${msg}${pluginInfo}",
+                (if(ex != null ) "${ex.message}" else ""),
+                if(ex is PluginException) ex.code else null,
+                0,
+                UIDialogs.Action(context.getString(R.string.retry), {
+                    retryAction?.invoke();
+                }, UIDialogs.ActionStyle.PRIMARY),
+                UIDialogs.Action(context.getString(R.string.close), {
+                    closeAction?.invoke()
+                }, UIDialogs.ActionStyle.NONE)
+            );
         }
 
         fun showSingleButtonDialog(context: Context, icon: Int, text: String, buttonText: String, action: (() -> Unit)) {
@@ -348,16 +303,12 @@ class UIDialogs {
             showDialog(context, R.drawable.ic_error, text, null, null, 0, cancelButtonAction, confirmButtonAction)
         }
 
-        fun showUpdateAvailableDialog(context: Context, lastVersion: Int, hideExceptionButtons: Boolean = false) {
+        fun showUpdateAvailableDialog(context: Context, lastVersion: Int) {
             val dialog = AutoUpdateDialog(context);
             registerDialogOpened(dialog);
             dialog.setOnDismissListener { registerDialogClosed(dialog) };
             dialog.show();
             dialog.setMaxVersion(lastVersion);
-
-            if (hideExceptionButtons) {
-                dialog.hideExceptionButtons()
-            }
         }
 
         fun showChangelogDialog(context: Context, lastVersion: Int) {
@@ -387,8 +338,8 @@ class UIDialogs {
             }
         }
 
-        fun showImportDialog(context: Context, store: ManagedStore<*>, name: String, reconstructions: List<String>, cache: ImportCache?, onConcluded: () -> Unit) {
-            val dialog = ImportDialog(context, store, name, reconstructions, cache, onConcluded);
+        fun showImportDialog(context: Context, store: ManagedStore<*>, name: String, reconstructions: List<String>, onConcluded: () -> Unit) {
+            val dialog = ImportDialog(context, store, name, reconstructions, onConcluded);
             registerDialogOpened(dialog);
             dialog.setOnDismissListener { registerDialogClosed(dialog) };
             dialog.show();
@@ -447,28 +398,13 @@ class UIDialogs {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                 try {
                     StateApp.withContext {
-                        toast(it, text, long);
+                        Toast.makeText(it, text, if (long) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show();
                     }
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to show toast.", e);
                 }
             }
         }
-        fun appToast(text: String, long: Boolean = false) {
-            appToast(ToastView.Toast(text, long))
-        }
-        fun appToastError(text: String, long: Boolean) {
-            StateApp.withContext {
-                appToast(ToastView.Toast(text, long, it.getColor(R.color.pastel_red)));
-            };
-        }
-        fun appToast(toast: ToastView.Toast) {
-            StateApp.withContext {
-                if(it is MainActivity) {
-                    it.showAppToast(toast);
-                }
-            }
-        }
 
         fun showClickableToast(context: Context, text: String, onClick: () -> Unit, isLongDuration: Boolean = false) {
             //TODO: Is not actually clickable...
@@ -510,13 +446,11 @@ class UIDialogs {
         val text: String;
         val action: ()->Unit;
         val style: ActionStyle;
-        var center: Boolean;
 
-        constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
+        constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE) {
             this.text = text;
             this.action = action;
             this.style = style;
-            this.center = center;
         }
     }
     enum class ActionStyle {

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

@@ -1,32 +1,23 @@
 package com.futo.platformplayer
 
-import android.app.NotificationManager
 import android.content.ContentResolver
-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
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.downloads.VideoLocal
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
 import com.futo.platformplayer.helpers.VideoHelper
@@ -38,21 +29,15 @@ import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
-import com.futo.platformplayer.states.StateHistory
 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.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
@@ -78,7 +63,7 @@ class UISlideOverlays {
             return menu;
         }
 
-        fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup): SlideUpMenuOverlay {
+        fun showSubscriptionOptionsOverlay(subscription: Subscription, container: ViewGroup) {
             val items = arrayListOf<View>();
 
             val originalNotif = subscription.doNotifications;
@@ -87,115 +72,39 @@ class UISlideOverlays {
             val originalVideo = subscription.doFetchVideos;
             val originalPosts = subscription.doFetchPosts;
 
-            val menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, listOf());
-
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO){
                 val plugin = StatePlatform.instance.getChannelClient(subscription.channel.url);
                 val capabilities = plugin.getChannelCapabilities();
 
                 withContext(Dispatchers.Main) {
-                    items.addAll(listOf(
-                        SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_notifications,
-                            "Notifications",
-                            "",
-                            tag = "notifications",
-                            call = {
-                                subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
-                            },
-                            invokeParent = 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,
+                    var menu: SlideUpMenuOverlay? = null;
+
+
+                    items.addAll(listOf(
+                        SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
+                            subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
+                        }, false),
+
                         SlideUpMenuGroup(container.context, "Fetch Settings",
                             "Depending on the platform you might not need to enable a type for it to be available.",
                             -1, listOf()),
-                        if(capabilities.hasType(ResultCapabilities.TYPE_LIVE)) SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_live_tv,
-                            "Livestreams",
-                            "Check for livestreams",
-                            tag = "fetchLive",
-                            call = {
-                                subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
-                            },
-                            invokeParent = false
-                        ) else null,
-                        if(capabilities.hasType(ResultCapabilities.TYPE_STREAMS)) SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_play,
-                            "Streams",
-                            "Check for streams",
-                            tag = "fetchStreams",
-                            call = {
-                                subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchStreams;
-                            },
-                            invokeParent = false
-                        ) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_LIVE)) SlideUpMenuItem(container.context, R.drawable.ic_live_tv, "Livestreams", "Check for livestreams", "fetchLive", {
+                            subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
+                        }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_STREAMS)) SlideUpMenuItem(container.context, R.drawable.ic_play, "Streams", "Check for streams", "fetchStreams", {
+                            subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchStreams;
+                        }, false) else null,
                         if(capabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
-                            SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_play,
-                                "Videos",
-                                "Check for videos",
-                                tag = "fetchVideos",
-                                call = {
-                                    subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
-                                },
-                                invokeParent = false
-                            ) else if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
-                            SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_play,
-                                "Content",
-                                "Check for content",
-                                tag = "fetchVideos",
-                                call = {
-                                    subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
-                                },
-                                invokeParent = false
-                            ) else null,
-                        if(capabilities.hasType(ResultCapabilities.TYPE_POSTS)) SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_chat,
-                            "Posts",
-                            "Check for posts",
-                            tag = "fetchPosts",
-                            call = {
-                                subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchPosts;
-                            },
-                            invokeParent = false
-                        ) else null/*,,
+                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Videos", "Check for videos", "fetchVideos", {
+                            subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                        }, false) else if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
+                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Content", "Check for content", "fetchVideos", {
+                                subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                            }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_POSTS)) SlideUpMenuItem(container.context, R.drawable.ic_chat, "Posts", "Check for posts", "fetchPosts", {
+                            subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchPosts;
+                        }, false) else null/*,,
 
                         SlideUpMenuGroup(container.context, "Actions",
                             "Various things you can do with this subscription",
@@ -205,7 +114,7 @@ class UISlideOverlays {
                         }, false)*/
                         ).filterNotNull());
 
-                    menu.setItems(items);
+                    menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items);
 
                     if(subscription.doNotifications)
                         menu.selectOption(null, "notifications", true, true);
@@ -222,29 +131,8 @@ class UISlideOverlays {
                         subscription.save();
                         menu.hide(true);
 
-                        if(subscription.doNotifications && !originalNotif) {
-                            val mainContext = StateApp.instance.contextOrNull;
-                            if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval == 0) {
-                                UIDialogs.toast(container.context, "Enable 'Background Update' in settings for notifications to work");
-
-                                if(mainContext is MainActivity) {
-                                    UIDialogs.showDialog(mainContext, R.drawable.ic_settings, "Background Updating Required",
-                                        "You need to set a Background Updating interval for notifications", null, 0,
-                                        UIDialogs.Action("Cancel", {}),
-                                        UIDialogs.Action("Configure", {
-                                            val intent = Intent(mainContext, SettingsActivity::class.java);
-                                            intent.putExtra("query", mainContext.getString(R.string.background_update));
-                                            mainContext.startActivity(intent);
-                                        }, UIDialogs.ActionStyle.PRIMARY));
-                                }
-                                return@subscribe;
-                            }
-                            else if(!(mainContext?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).areNotificationsEnabled()) {
-                                UIDialogs.toast(container.context, "Android notifications are disabled");
-                                if(mainContext is MainActivity) {
-                                    mainContext.requestNotificationPermissions("Notifications are required for subscription updating and notifications to work");
-                                }
-                            }
+                        if(subscription.doNotifications && !originalNotif && Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval == 0) {
+                            UIDialogs.toast(container.context, "Enable 'Background Update' in settings for notifications to work");
                         }
                     };
                     menu.onCancel.subscribe {
@@ -260,8 +148,6 @@ class UISlideOverlays {
                     menu.show();
                 }
             }
-
-            return menu;
         }
 
         fun showAddToGroupOverlay(channel: IPlatformVideo, container: ViewGroup) {
@@ -294,23 +180,11 @@ class UISlideOverlays {
                     masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
 
                     masterPlaylist.getAudioSources().forEach { it ->
-
-                        val estSize = VideoHelper.estimateSourceSize(it);
-                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                        audioButtons.add(SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_music,
-                            it.name,
-                            listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
-                            (prefix + it.codec).trim(),
-                            tag = it,
-                            call = {
-                                selectedAudioVariant = it
-                                slideUpMenuOverlay.selectOption(audioButtons, it)
-                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                            },
-                            invokeParent = false
-                        ))
+                        audioButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
+                            selectedAudioVariant = it
+                            slideUpMenuOverlay.selectOption(audioButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
                     }
 
                     /*masterPlaylist.getSubtitleSources().forEach { it ->
@@ -322,22 +196,11 @@ class UISlideOverlays {
                     }*/
 
                     masterPlaylist.getVideoSources().forEach {
-                        val estSize = VideoHelper.estimateSourceSize(it);
-                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                        videoButtons.add(SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_movie,
-                            it.name,
-                            "${it.width}x${it.height}",
-                            (prefix + it.codec).trim(),
-                            tag = it,
-                            call = {
-                                selectedVideoVariant = it
-                                slideUpMenuOverlay.selectOption(videoButtons, it)
-                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                            },
-                            invokeParent = false
-                        ))
+                        videoButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
+                            selectedVideoVariant = it
+                            slideUpMenuOverlay.selectOption(videoButtons, it)
+                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                        }, false))
                     }
 
                     val newItems = arrayListOf<View>()
@@ -396,8 +259,8 @@ class UISlideOverlays {
 
 
             val requiresAudio = descriptor is VideoUnMuxedSourceDescriptor;
-            var selectedVideo: IVideoSource? = null;
-            var selectedAudio: IAudioSource? = null;
+            var selectedVideo: IVideoUrlSource? = null;
+            var selectedAudio: IAudioUrlSource? = null;
             var selectedSubtitle: ISubtitleSource? = null;
 
             val videoSources = descriptor.videoSources;
@@ -416,93 +279,45 @@ class UISlideOverlays {
             }
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.video), videoSources,
-                listOf(listOf(SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_movie,
-                    container.context.getString(R.string.none),
-                    container.context.getString(R.string.audio_only),
-                    tag = "none",
-                    call = {
-                        selectedVideo = null;
-                        menu?.selectOption(videoSources, "none");
-                        if(selectedAudio != null || !requiresAudio)
-                            menu?.setOk(container.context.getString(R.string.download));
-                    },
-                    invokeParent = false
-                )) +
+                listOf(listOf(SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.none), container.context.getString(R.string.audio_only), "none", {
+                    selectedVideo = null;
+                    menu?.selectOption(videoSources, "none");
+                    if(selectedAudio != null || !requiresAudio)
+                        menu?.setOk(container.context.getString(R.string.download));
+                }, false)) +
                 videoSources
                 .filter { it.isDownloadable() }
                 .map {
                     when (it) {
                         is IVideoUrlSource -> {
-                            val estSize = VideoHelper.estimateSourceSize(it);
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                            SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_movie,
-                                it.name,
-                                "${it.width}x${it.height}",
-                                (prefix + it.codec).trim(),
-                                tag = it,
-                                call = {
-                                    selectedVideo = it
-                                    menu?.selectOption(videoSources, it);
-                                    if(selectedAudio != null || !requiresAudio)
-                                        menu?.setOk(container.context.getString(R.string.download));
-                                },
-                                invokeParent = false
-                            )
-                        }
-
-                        is JSDashManifestRawSource -> {
-                            val estSize = VideoHelper.estimateSourceSize(it);
-                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                            SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_movie,
-                                it.name,
-                                "${it.width}x${it.height}",
-                                (prefix + it.codec).trim(),
-                                tag = it,
-                                call = {
-                                    selectedVideo = it
-                                    menu?.selectOption(videoSources, it);
-                                    if(selectedAudio != null || !requiresAudio)
-                                        menu?.setOk(container.context.getString(R.string.download));
-                                },
-                                invokeParent = false
-                            )
+                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
+                                selectedVideo = it
+                                menu?.selectOption(videoSources, it);
+                                if(selectedAudio != null || !requiresAudio)
+                                    menu?.setOk(container.context.getString(R.string.download));
+                            }, false)
                         }
 
                         is IHLSManifestSource -> {
-                            SlideUpMenuItem(
-                                container.context,
-                                R.drawable.ic_movie,
-                                it.name,
-                                "HLS",
-                                tag = it,
-                                call = {
-                                    showHlsPicker(video, it, it.url, container)
-                                },
-                                invokeParent = false
-                            )
+                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS", it, {
+                                showHlsPicker(video, it, it.url, container)
+                            }, false)
                         }
 
                         else -> {
-                            Logger.w(TAG, "Unhandled source type for UISlideOverlay download items");
-                            null;//throw Exception("Unhandled source type")
+                            throw Exception("Unhandled source type")
                         }
                     }
-                }.filterNotNull()).flatten().toList()
+                }).flatten().toList()
             ));
 
             if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.isNotEmpty()) {
                 //TODO: Add HLS support here
                 selectedVideo = VideoHelper.selectBestVideoSource(
-                    videoSources.filter { it is IVideoSource && it.isDownloadable() }.asIterable(),
+                    videoSources.filter { it is IVideoUrlSource && it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
                     FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS
-                ) as IVideoSource?;
+                ) as IVideoUrlSource;
             }
 
             if (audioSources != null) {
@@ -511,90 +326,43 @@ class UISlideOverlays {
                     .map {
                         when (it) {
                             is IAudioUrlSource -> {
-                                val estSize = VideoHelper.estimateSourceSize(it);
-                                val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                                SlideUpMenuItem(
-                                    container.context,
-                                    R.drawable.ic_music,
-                                    it.name,
-                                    "${it.bitrate}",
-                                    (prefix + it.codec).trim(),
-                                    tag = it,
-                                    call = {
-                                        selectedAudio = it
-                                        menu?.selectOption(audioSources, it);
-                                        menu?.setOk(container.context.getString(R.string.download));
-                                    },
-                                    invokeParent = false
-                                );
-                            }
-
-                            is JSDashManifestRawAudioSource -> {
-                                val estSize = VideoHelper.estimateSourceSize(it);
-                                val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
-                                SlideUpMenuItem(
-                                    container.context,
-                                    R.drawable.ic_music,
-                                    it.name,
-                                    "${it.bitrate}",
-                                    (prefix + it.codec).trim(),
-                                    tag = it,
-                                    call = {
-                                        selectedAudio = it
-                                        menu?.selectOption(audioSources, it);
-                                        menu?.setOk(container.context.getString(R.string.download));
-                                    },
-                                    invokeParent = false
-                                );
+                                SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
+                                    selectedAudio = it
+                                    menu?.selectOption(audioSources, it);
+                                    menu?.setOk(container.context.getString(R.string.download));
+                                }, false);
                             }
 
                             is IHLSManifestAudioSource -> {
-                                SlideUpMenuItem(
-                                    container.context,
-                                    R.drawable.ic_movie,
-                                    it.name,
-                                    "HLS Audio",
-                                    tag = it,
-                                    call = {
-                                        showHlsPicker(video, it, it.url, container)
-                                    },
-                                    invokeParent = false
-                                )
+                                SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS Audio", it, {
+                                    showHlsPicker(video, it, it.url, container)
+                                }, false)
                             }
 
                             else -> {
-                                Logger.w(TAG, "Unhandled source type for UISlideOverlay download items");
-                                null;//throw Exception("Unhandled source type")
+                                throw Exception("Unhandled source type")
                             }
                         }
-                    }.filterNotNull()));
+                    }));
 
                 //TODO: Add HLS support here
-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioSource && it.isDownloadable() }.asIterable(),
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource && it.isDownloadable() }.asIterable(),
                     FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                     Settings.instance.playback.getPrimaryLanguage(container.context),
-                    if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioSource?;
+                    if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
             }
 
             if(contentResolver != null && subtitleSources.isNotEmpty()) {
                 items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.subtitles), subtitleSources, subtitleSources.map {
-                        SlideUpMenuItem(
-                            container.context,
-                            R.drawable.ic_edit,
-                            it.name,
-                            "",
-                            tag = it,
-                            call = {
-                                if (selectedSubtitle == it) {
-                                    selectedSubtitle = null;
-                                    menu?.selectOption(subtitleSources, null);
-                                } else {
-                                    selectedSubtitle = it;
-                                    menu?.selectOption(subtitleSources, it);
-                                }
-                            },
-                            invokeParent = false
-                        );
+                        SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
+                            if (selectedSubtitle == it) {
+                                selectedSubtitle = null;
+                                menu?.selectOption(subtitleSources, null);
+                            } else {
+                                selectedSubtitle = it;
+                                menu?.selectOption(subtitleSources, it);
+                            }
+                        }, false);
                     })
                 );
             }
@@ -612,18 +380,6 @@ class UISlideOverlays {
             }
 
             menu.onOK.subscribe {
-                val sv = selectedVideo
-                if (sv is IHLSManifestSource) {
-                    showHlsPicker(video, sv, sv.url, container)
-                    return@subscribe
-                }
-
-                val sa = selectedAudio
-                if (sa is IHLSManifestAudioSource) {
-                    showHlsPicker(video, sa, sa.url, container)
-                    return@subscribe
-                }
-
                 menu.hide();
                 val subtitleToDownload = selectedSubtitle;
                 if(selectedAudio != null || !requiresAudio) {
@@ -680,9 +436,8 @@ class UISlideOverlays {
                             }
                         }
                         catch(ex: Throwable) {
-                            Logger.e(TAG, "Fetching details for download failed due to: " + ex.message, ex);
                             withContext(Dispatchers.Main) {
-                                UIDialogs.toast(container.context.getString(R.string.failed_to_fetch_details_for_download) + "\n" + ex.message);
+                                UIDialogs.toast(container.context.getString(R.string.failed_to_fetch_details_for_download));
                                 handleUnknownDownload();
                                 loader.hide(true);
                             }
@@ -693,15 +448,10 @@ class UISlideOverlays {
             }
         }
         fun showDownloadPlaylistOverlay(playlist: Playlist, container: ViewGroup) {
-            showUnknownVideoDownload(container.context.getString(R.string.playlist), container) { px, bitrate ->
+            showUnknownVideoDownload(container.context.getString(R.string.video), container) { px, bitrate ->
                 StateDownloads.instance.download(playlist, px, bitrate);
             };
         }
-        fun showDownloadWatchlaterOverlay(container: ViewGroup) {
-            showUnknownVideoDownload(container.context.getString(R.string.watch_later), container, { px, bitrate ->
-                StateDownloads.instance.downloadWatchLater(px, bitrate);
-            })
-        }
         private fun showUnknownVideoDownload(toDownload: String, container: ViewGroup, cb: (Long?, Long?)->Unit) {
             val items = arrayListOf<View>();
             var menu: SlideUpMenuOverlay? = null;
@@ -719,47 +469,23 @@ class UISlideOverlays {
             );
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.target_resolution), "Video", resolutions.map {
-                SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_movie,
-                    it.first,
-                    it.second,
-                    tag = it.third,
-                    call = {
-                        targetPxSize = it.third;
-                        menu?.selectOption("Video", it.third);
-                    },
-                    invokeParent = false
-                )
+                SlideUpMenuItem(container.context, R.drawable.ic_movie, it.first, it.second, it.third, {
+                    targetPxSize = it.third;
+                    menu?.selectOption("Video", it.third);
+                }, false)
             }));
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.target_bitrate), "Bitrate", listOf(
-                SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_movie,
-                    container.context.getString(R.string.low_bitrate),
-                    "",
-                    tag = 1,
-                    call = {
-                        targetBitrate = 1;
-                        menu?.selectOption("Bitrate", 1);
-                        menu?.setOk(container.context.getString(R.string.download));
-                    },
-                    invokeParent = false
-                ),
-                SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_movie,
-                    container.context.getString(R.string.high_bitrate),
-                    "",
-                    tag = 9999999,
-                    call = {
-                        targetBitrate = 9999999;
-                        menu?.selectOption("Bitrate", 9999999);
-                        menu?.setOk(container.context.getString(R.string.download));
-                    },
-                    invokeParent = false
-                )
+                SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.low_bitrate), "", 1, {
+                    targetBitrate = 1;
+                    menu?.selectOption("Bitrate", 1);
+                    menu?.setOk(container.context.getString(R.string.download));
+                }, false),
+                SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.high_bitrate), "", 9999999, {
+                    targetBitrate = 9999999;
+                    menu?.selectOption("Bitrate", 9999999);
+                    menu?.setOk(container.context.getString(R.string.download));
+                }, false)
             )));
 
 
@@ -882,12 +608,8 @@ class UISlideOverlays {
             if (lastUpdated != null) {
                 items.add(
                     SlideUpMenuGroup(container.context, container.context.getString(R.string.recently_used_playlist), "recentlyusedplaylist",
-                        SlideUpMenuItem(container.context,
-                            R.drawable.ic_playlist_add,
-                            lastUpdated.name,
-                            "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
-                            tag = "",
-                            call = {
+                        SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, lastUpdated.name, "${lastUpdated.videos.size} " + container.context.getString(R.string.videos), "",
+                            {
                                 StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
@@ -899,90 +621,34 @@ 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),
-                        tag = "download",
-                        call = {
+                    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);
-                        },
-                        invokeParent = false
-                    ),
-                    SlideUpMenuItem(
-                        container.context,
-                        R.drawable.ic_share,
-                        container.context.getString(R.string.share),
-                        "Share the video",
-                        tag = "share",
-                        call = {
-                            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));
-                        },
-                        invokeParent = false
-                    ),
-                    SlideUpMenuItem(
-                        container.context,
-                        R.drawable.ic_visibility_off,
-                        container.context.getString(R.string.hide_creator_from_home),
-                        "",
-                        tag = "hide_creator",
-                        call = {
-                            StateMeta.instance.addHiddenCreator(video.author.url);
-                            UIDialogs.toast(container.context, "[${video.author.name}] hidden, you may need to reload home");
-                        }))
+                        }, 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");
+                    }))
                         + actions)
             ));
             items.add(
                 SlideUpMenuGroup(container.context, container.context.getString(R.string.add_to), "addto",
-                    SlideUpMenuItem(container.context,
-                        R.drawable.ic_queue_add,
-                        container.context.getString(R.string.add_to_queue),
-                        "${queue.size} " + container.context.getString(R.string.videos),
-                        tag = "queue",
-                        call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context,
-                        R.drawable.ic_watchlist_add,
-                        "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "",
-                        "${watchLater.size} " + container.context.getString(R.string.videos),
-                        tag = "watch later",
-                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
-                    SlideUpMenuItem(container.context,
-                        R.drawable.ic_history,
-                        container.context.getString(R.string.add_to_history),
-                        "Mark as watched",
-                        tag = "history",
-                        call = { StateHistory.instance.markAsWatched(video); }),
+                    SlideUpMenuItem(container.context, R.drawable.ic_queue_add, container.context.getString(R.string.add_to_queue), "${queue.size} " + container.context.getString(R.string.videos), "queue",
+                        { StatePlayer.instance.addToQueue(video); }),
+                    SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "", "${watchLater.size} " + container.context.getString(R.string.videos), "watch later",
+                        { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); })
             ));
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
-            playlistItems.add(SlideUpMenuItem(
-                container.context,
-                R.drawable.ic_playlist_add,
-                container.context.getString(R.string.new_playlist),
-                container.context.getString(R.string.add_to_new_playlist),
-                tag = "add_to_new_playlist",
-                call = {
-                    showCreatePlaylistOverlay(container) {
-                        val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
-                        StatePlaylists.instance.createOrUpdatePlaylist(playlist);
-                    };
-                },
-                invokeParent = false
-            ))
+            playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, container.context.getString(R.string.new_playlist), container.context.getString(R.string.add_to_new_playlist), "add_to_new_playlist", {
+                showCreatePlaylistOverlay(container) {
+                    val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
+                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+                };
+            }, false))
 
             for (playlist in allPlaylists) {
-                playlistItems.add(SlideUpMenuItem(container.context,
-                    R.drawable.ic_playlist_add,
-                    "${container.context.getString(R.string.add_to)} " + playlist.name + "",
-                    "${playlist.videos.size} " + container.context.getString(R.string.videos),
-                    tag = "",
-                    call = {
+                playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, "${container.context.getString(R.string.add_to)} " + playlist.name + "", "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
+                    {
                         StatePlaylists.instance.addToPlaylist(playlist.id, video);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
@@ -995,7 +661,7 @@ class UISlideOverlays {
         }
 
 
-        fun showAddToOverlay(video: IPlatformVideo, container: ViewGroup, slideUpMenuOverlayUpdated: (SlideUpMenuOverlay) -> Unit): SlideUpMenuOverlay {
+        fun showAddToOverlay(video: IPlatformVideo, container: ViewGroup): SlideUpMenuOverlay {
 
             val items = arrayListOf<View>();
 
@@ -1004,12 +670,8 @@ class UISlideOverlays {
             if (lastUpdated != null) {
                 items.add(
                     SlideUpMenuGroup(container.context, container.context.getString(R.string.recently_used_playlist), "recentlyusedplaylist",
-                        SlideUpMenuItem(container.context,
-                            R.drawable.ic_playlist_add,
-                            lastUpdated.name,
-                            "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
-                            tag = "",
-                            call = {
+                        SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, lastUpdated.name, "${lastUpdated.videos.size} " + container.context.getString(R.string.videos), "",
+                            {
                                 StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
@@ -1021,52 +683,18 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(
                 SlideUpMenuGroup(container.context, container.context.getString(R.string.other), "other",
-                    SlideUpMenuItem(container.context,
-                        R.drawable.ic_queue_add,
-                        container.context.getString(R.string.queue),
-                        "${queue.size} " + container.context.getString(R.string.videos),
-                        tag = "queue",
-                        call = { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context,
-                        R.drawable.ic_watchlist_add,
-                        StatePlayer.TYPE_WATCHLATER,
-                        "${watchLater.size} " + container.context.getString(R.string.videos),
-                        tag = "watch later",
-                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
-                    SlideUpMenuItem(
-                        container.context,
-                        R.drawable.ic_download,
-                        container.context.getString(R.string.download),
-                        container.context.getString(R.string.download_the_video),
-                        tag = container.context.getString(R.string.download),
-                        call = { showDownloadVideoOverlay(video, container, true); },
-                        invokeParent = false
-                    ))
+                    SlideUpMenuItem(container.context, R.drawable.ic_queue_add, container.context.getString(R.string.queue), "${queue.size} " + container.context.getString(R.string.videos), "queue",
+                        { StatePlayer.instance.addToQueue(video); }),
+                    SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, StatePlayer.TYPE_WATCHLATER, "${watchLater.size} " + container.context.getString(R.string.videos), "watch later",
+                        { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
+                    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))
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
-            playlistItems.add(SlideUpMenuItem(
-                container.context,
-                R.drawable.ic_playlist_add,
-                container.context.getString(R.string.new_playlist),
-                container.context.getString(R.string.add_to_new_playlist),
-                tag = "add_to_new_playlist",
-                call = {
-                    slideUpMenuOverlayUpdated(showCreatePlaylistOverlay(container) {
-                        val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
-                        StatePlaylists.instance.createOrUpdatePlaylist(playlist);
-                    });
-                },
-                invokeParent = false
-            ))
-
             for (playlist in allPlaylists) {
-                playlistItems.add(SlideUpMenuItem(container.context,
-                    R.drawable.ic_playlist_add,
-                    playlist.name,
-                    "${playlist.videos.size} " + container.context.getString(R.string.videos),
-                    tag = "",
-                    call = {
+                playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, playlist.name, "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
+                    {
                         StatePlaylists.instance.addToPlaylist(playlist.id, video);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
@@ -1078,49 +706,33 @@ class UISlideOverlays {
             return SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.add_to), null, true, items).apply { show() };
         }
 
-        fun showFiltersOverlay(lifecycleScope: CoroutineScope, container: ViewGroup, enabledClientsIds: List<String>, filterValues: HashMap<String, List<String>>, isChannelSearch: Boolean = false): SlideUpMenuFilters {
-            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues, isChannelSearch);
+        fun showFiltersOverlay(lifecycleScope: CoroutineScope, container: ViewGroup, enabledClientsIds: List<String>, filterValues: HashMap<String, List<String>>): SlideUpMenuFilters {
+            val overlay = SlideUpMenuFilters(lifecycleScope, container, enabledClientsIds, filterValues);
             overlay.show();
             return overlay;
         }
 
 
-        fun showMoreButtonOverlay(container: ViewGroup, buttonGroup: RoundButtonGroup, ignoreTags: List<Any> = listOf(), invokeParents: Boolean = true, onPinnedbuttons: ((List<RoundButton>)->Unit)? = null): SlideUpMenuOverlay {
+        fun showMoreButtonOverlay(container: ViewGroup, buttonGroup: RoundButtonGroup, ignoreTags: List<Any> = listOf(), onPinnedbuttons: ((List<RoundButton>)->Unit)? = null): SlideUpMenuOverlay {
             val visible = buttonGroup.getVisibleButtons().filter { !ignoreTags.contains(it.tagRef) };
             val hidden = buttonGroup.getInvisibleButtons().filter { !ignoreTags.contains(it.tagRef) };
 
             val views = arrayOf(
                 hidden
-                    .map { btn -> SlideUpMenuItem(
-                        container.context,
-                        btn.iconResource,
-                        btn.text.text.toString(),
-                        "",
-                        tag = "",
-                        call = {
-                            btn.handler?.invoke(btn);
-                        },
-                        invokeParent = invokeParents
-                    ) as View  }.toTypedArray(),
-                arrayOf(SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_pin,
-                    container.context.getString(R.string.change_pins),
-                    container.context.getString(R.string.decide_which_buttons_should_be_pinned),
-                    tag = "",
-                    call = {
-                        showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
-                            val selected = it
-                                .map { x -> visible.find { it.tagRef == x } ?: hidden.find { it.tagRef == x } }
-                                .filter { it != null }
-                                .map { it!! }
-                                .toList();
+                    .map { btn -> SlideUpMenuItem(container.context, btn.iconResource, btn.text.text.toString(), "", "", {
+                        btn.handler?.invoke(btn);
+                    }, true) as View  }.toTypedArray(),
+                arrayOf(SlideUpMenuItem(container.context, R.drawable.ic_pin, container.context.getString(R.string.change_pins), container.context.getString(R.string.decide_which_buttons_should_be_pinned), "", {
+                    showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
+                        val selected = it
+                            .map { x -> visible.find { it.tagRef == x } ?: hidden.find { it.tagRef == x } }
+                            .filter { it != null }
+                            .map { it!! }
+                            .toList();
 
-                            onPinnedbuttons?.invoke(selected + (visible + hidden).filter { !selected.contains(it) });
-                        }
-                    },
-                    invokeParent = false
-                ))
+                        onPinnedbuttons?.invoke(selected + (visible + hidden).filter { !selected.contains(it) });
+                    }
+                }, false))
             ).flatten().toTypedArray();
 
             return SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.more_options), null, true, *views).apply { show() };
@@ -1132,21 +744,14 @@ class UISlideOverlays {
             var overlay: SlideUpMenuOverlay? = null;
 
             overlay = SlideUpMenuOverlay(container.context, container, title, container.context.getString(R.string.save), true,
-                options.map { SlideUpMenuItem(
-                    container.context,
-                    R.drawable.ic_move_up,
-                    it.first,
-                    "",
-                    tag = it.second,
-                    call = {
+                options.map { SlideUpMenuItem(container.context, R.drawable.ic_move_up, it.first, "", it.second, {
                         if(overlay!!.selectOption(null, it.second, true, true)) {
                             if(!selection.contains(it.second))
                                 selection.add(it.second);
-                        } else
+                        }
+                        else
                             selection.remove(it.second);
-                    },
-                    invokeParent = false
-                )
+                    }, false)
                 });
             overlay.onOK.subscribe {
                 onOrdered.invoke(selection);

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

@@ -13,7 +13,6 @@ import android.os.OperationCanceledException
 import android.util.TypedValue
 import android.view.View
 import android.view.WindowInsetsController
-import android.view.WindowManager
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider

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

@@ -12,7 +12,6 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
@@ -38,10 +37,8 @@ class AddSourceActivity : AppCompatActivity() {
 
     private lateinit var _sourceHeader: SourceHeaderView;
 
-
     private lateinit var _sourcePermissions: LinearLayout;
     private lateinit var _sourceWarnings: LinearLayout;
-    private lateinit var _sourceWarningsContainer: LinearLayout;
 
     private lateinit var _container: ScrollView;
     private lateinit var _loader: ImageView;
@@ -82,7 +79,6 @@ class AddSourceActivity : AppCompatActivity() {
 
         _sourcePermissions = findViewById(R.id.source_permissions);
         _sourceWarnings = findViewById(R.id.source_warnings);
-        _sourceWarningsContainer = findViewById(R.id.container_source_warnings);
 
         _container = findViewById(R.id.configContainer);
         _loader = findViewById(R.id.loader);
@@ -207,30 +203,21 @@ class AddSourceActivity : AppCompatActivity() {
 
         val pastelRed = ContextCompat.getColor(this, R.color.pastel_red);
 
-        val warnings = config.getWarnings(script);
-        for(warning in warnings)
+        for(warning in config.getWarnings(script))
             _sourceWarnings.addView(
                 SourceInfoView(this,
                 R.drawable.ic_security_pred,
                 warning.first,
                 warning.second)
                 .withDescriptionColor(pastelRed));
-        _sourceWarningsContainer.isVisible = warnings.isNotEmpty();
 
         setLoading(false);
     }
 
     fun install(config: SourcePluginConfig, script: String) {
-        val isNew = !StatePlatform.instance.getAvailableClients().any { it.id == config.id };
         StatePlugins.instance.installPlugin(this, lifecycleScope, config, script) {
-            if(it) {
-                StatePlugins.instance.clearUpdateAvailable(config)
-                if(isNew)
-                    lifecycleScope.launch {
-                        StatePlatform.instance.enableClient(listOf(config.id));
-                    }
+            if(it)
                 backToSources();
-            }
         }
     }
 

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

@@ -16,7 +16,6 @@ class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonBack: ImageButton;
 
     lateinit var _buttonQR: BigButton;
-    lateinit var _buttonBrowse: BigButton;
     lateinit var _buttonURL: BigButton;
     lateinit var _buttonPlugins: BigButton;
 
@@ -57,7 +56,6 @@ class AddSourceOptionsActivity : AppCompatActivity() {
         _buttonBack = findViewById(R.id.button_back);
 
         _buttonQR = findViewById(R.id.option_qr);
-        _buttonBrowse = findViewById(R.id.option_browse);
         _buttonURL = findViewById(R.id.option_url);
         _buttonPlugins = findViewById(R.id.option_plugins);
 
@@ -76,9 +74,6 @@ class AddSourceOptionsActivity : AppCompatActivity() {
             integrator.setCaptureActivity(QRCaptureActivity::class.java);
             _qrCodeResultLauncher.launch(integrator.createScanIntent())
         }
-        _buttonBrowse.onClick.subscribe {
-            startActivity(MainActivity.getTabIntent(this, "BROWSE_PLUGINS"));
-        }
 
         _buttonURL.onClick.subscribe {
             UIDialogs.toast(this, getString(R.string.not_implemented_yet));

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

@@ -4,19 +4,15 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.R
+import com.futo.platformplayer.*
 import com.futo.platformplayer.logging.LogLevel
 import com.futo.platformplayer.logging.Logging
-import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateUpdate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -30,7 +26,6 @@ class ExceptionActivity : AppCompatActivity() {
     private lateinit var _buttonSubmit: LinearLayout;
     private lateinit var _buttonRestart: LinearLayout;
     private lateinit var _buttonClose: LinearLayout;
-    private lateinit var _buttonCheckForUpdates: LinearLayout;
     private var _file: File? = null;
     private var _submitted = false;
 
@@ -48,7 +43,6 @@ class ExceptionActivity : AppCompatActivity() {
         _buttonSubmit = findViewById(R.id.button_submit);
         _buttonRestart = findViewById(R.id.button_restart);
         _buttonClose = findViewById(R.id.button_close);
-        _buttonCheckForUpdates = findViewById(R.id.button_check_for_updates);
 
         val context = intent.getStringExtra(EXTRA_CONTEXT) ?: getString(R.string.unknown_context);
         val stack = intent.getStringExtra(EXTRA_STACK) ?: getString(R.string.something_went_wrong_missing_stack_trace);
@@ -87,17 +81,6 @@ class ExceptionActivity : AppCompatActivity() {
         _buttonClose.setOnClickListener {
             finish();
         };
-
-        if (!BuildConfig.IS_PLAYSTORE_BUILD) {
-            _buttonCheckForUpdates.visibility = View.VISIBLE
-            _buttonCheckForUpdates.setOnClickListener {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    StateUpdate.instance.checkForUpdates(this@ExceptionActivity, true, true)
-                }
-            }
-        } else {
-            _buttonCheckForUpdates.visibility = View.GONE
-        }
     }
 
     private fun submitFile() {

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

@@ -10,7 +10,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
-import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
@@ -40,7 +39,6 @@ class LoginActivity : AppCompatActivity() {
         _textUrl = findViewById(R.id.text_url);
         _buttonClose = findViewById(R.id.button_close);
         _buttonClose.setOnClickListener {
-            UIDialogs.toast("Login cancelled", false);
             finish();
         }
 

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

@@ -4,103 +4,52 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.content.pm.PackageManager
+import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.Uri
-import android.net.wifi.WifiManager
 import android.os.Bundle
-import android.os.StrictMode
-import android.os.StrictMode.VmPolicy
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
-import android.view.WindowManager
 import android.widget.FrameLayout
-import android.widget.ImageView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.BuildConfig
-import com.futo.platformplayer.R
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.*
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
-import com.futo.platformplayer.fragment.mainactivity.main.BrowserFragment
-import com.futo.platformplayer.fragment.mainactivity.main.BuyFragment
-import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
-import com.futo.platformplayer.fragment.mainactivity.main.CommentsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.ContentSearchResultsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.CreatorSearchResultsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.CreatorsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.DownloadsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.HistoryFragment
-import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
-import com.futo.platformplayer.fragment.mainactivity.main.ImportPlaylistsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.ImportSubscriptionsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PlaylistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PlaylistSearchResultsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PlaylistsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.PostDetailFragment
-import com.futo.platformplayer.fragment.mainactivity.main.RemotePlaylistFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupListFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
-import com.futo.platformplayer.fragment.mainactivity.main.SuggestionsFragment
-import com.futo.platformplayer.fragment.mainactivity.main.TutorialFragment
-import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
-import com.futo.platformplayer.fragment.mainactivity.main.WatchLaterFragment
+import com.futo.platformplayer.fragment.mainactivity.main.*
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.GeneralTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
+import com.futo.platformplayer.listeners.OrientationManager
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.ImportCache
-import com.futo.platformplayer.setNavigationBarColorAndIcons
-import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateBackup
-import com.futo.platformplayer.states.StateDeveloper
-import com.futo.platformplayer.states.StatePayment
-import com.futo.platformplayer.states.StatePlatform
-import com.futo.platformplayer.states.StatePlayer
-import com.futo.platformplayer.states.StatePlaylists
-import com.futo.platformplayer.states.StateSubscriptions
+import com.futo.platformplayer.models.UrlVideoWithTime
+import com.futo.platformplayer.states.*
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
-import com.futo.platformplayer.views.ToastView
-import com.futo.polycentric.core.ApiMethods
 import com.google.gson.JsonParser
 import com.google.zxing.integration.android.IntentIntegrator
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
-import java.util.LinkedList
-import java.util.Queue
-import java.util.concurrent.ConcurrentLinkedQueue
-
+import java.util.*
 
 class MainActivity : AppCompatActivity, IWithResultLauncher {
 
@@ -112,7 +61,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var rootView : MotionLayout;
 
     private lateinit var _overlayContainer: FrameLayout;
-    private lateinit var _toastView: ToastView;
 
     //Segment Containers
     private lateinit var _fragContainerTopBar: FragmentContainerView;
@@ -121,9 +69,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     private lateinit var _fragContainerVideoDetail: FragmentContainerView;
     private lateinit var _fragContainerOverlay: FrameLayout;
 
-    //Views
-    private lateinit var _buttonIncognito: ImageView;
-
     //Frags TopBar
     lateinit var _fragTopBarGeneral: GeneralTopBarFragment;
     lateinit var _fragTopBarSearch: SearchTopBarFragment;
@@ -149,7 +94,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     lateinit var _fragMainTutorial: TutorialFragment;
     lateinit var _fragMainPlaylists: PlaylistsFragment;
     lateinit var _fragMainPlaylist: PlaylistFragment;
-    lateinit var _fragMainRemotePlaylist: RemotePlaylistFragment;
     lateinit var _fragWatchlist: WatchLaterFragment;
     lateinit var _fragHistory: HistoryFragment;
     lateinit var _fragSourceDetail: SourceDetailFragment;
@@ -174,6 +118,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     val onNavigated = Event1<MainFragment>();
 
+    private lateinit var _orientationManager: OrientationManager;
+    var orientation: OrientationManager.Orientation = OrientationManager.Orientation.PORTRAIT
+        private set;
     private var _isVisible = true;
     private var _wasStopped = false;
 
@@ -187,9 +134,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
 
             try {
-                runBlocking {
-                    handleUrlAll(content)
-                }
+                handleUrlAll(content)
             } catch (e: Throwable) {
                 Logger.i(TAG, "Failed to handle URL.", e)
                 UIDialogs.toast(this, "Failed to handle URL: ${e.message}")
@@ -198,17 +143,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     }
 
     constructor() : super() {
-        if (BuildConfig.DEBUG) {
-            StrictMode.setVmPolicy(
-                VmPolicy.Builder()
-                    .detectLeakedClosableObjects()
-                    .penaltyLog()
-                    .build()
-            )
-        }
-
-        ApiMethods.UserAgent = "Grayjay Android (${BuildConfig.VERSION_CODE})";
-
         Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
             val writer = StringWriter();
 
@@ -247,15 +181,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Logger.i(TAG, "MainActivity Starting");
         StateApp.instance.setGlobalContext(this, lifecycleScope);
         StateApp.instance.mainAppStarting(this);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         setNavigationBarColorAndIcons();
-        if (Settings.instance.playback.allowVideoToGoUnderCutout)
-            window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 
         runBlocking {
             StatePlatform.instance.updateAvailableClients(this@MainActivity);
@@ -272,7 +203,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragContainerVideoDetail = findViewById(R.id.fragment_overlay);
         _fragContainerOverlay = findViewById(R.id.fragment_overlay_container);
         _overlayContainer = findViewById(R.id.overlay_container);
-        _toastView = findViewById(R.id.toast_view);
+        //_overlayContainer.visibility = View.GONE;
 
         //Initialize fragments
 
@@ -300,7 +231,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragMainSources = SourcesFragment.newInstance();
         _fragMainPlaylists = PlaylistsFragment.newInstance();
         _fragMainPlaylist = PlaylistFragment.newInstance();
-        _fragMainRemotePlaylist = RemotePlaylistFragment.newInstance();
         _fragPostDetail = PostDetailFragment.newInstance();
         _fragWatchlist = WatchLaterFragment.newInstance();
         _fragHistory = HistoryFragment.newInstance();
@@ -343,52 +273,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             updateSegmentPaddings();
         };
 
-
-        _buttonIncognito = findViewById(R.id.incognito_button);
-        _buttonIncognito.elevation = -99f;
-        _buttonIncognito.alpha = 0f;
-        StateApp.instance.privateModeChanged.subscribe {
-            //Messing with visibility causes some issues with layout ordering?
-            if(it) {
-                _buttonIncognito.elevation = 99f;
-                _buttonIncognito.alpha = 1f;
-            }
-            else {
-                _buttonIncognito.elevation = -99f;
-                _buttonIncognito.alpha = 0f;
-            }
-        }
-        _buttonIncognito.setOnClickListener {
-            if(!StateApp.instance.privateMode)
-                return@setOnClickListener;
-            UIDialogs.showDialog(this, R.drawable.ic_disabled_visible_purple, "Disable Privacy Mode",
-                "Do you want to disable privacy mode? New videos will be tracked again.", null, 0,
-                UIDialogs.Action("Cancel", {
-                    StateApp.instance.setPrivacyMode(true);
-                }, UIDialogs.ActionStyle.NONE),
-                UIDialogs.Action("Disable", {
-                    StateApp.instance.setPrivacyMode(false);
-                }, UIDialogs.ActionStyle.DANGEROUS));
-        };
-        _fragVideoDetail.onFullscreenChanged.subscribe {
-            Logger.i(TAG, "onFullscreenChanged ${it}");
-
-            if(it) {
-                _buttonIncognito.elevation = -99f;
-                _buttonIncognito.alpha = 0f;
-            }
-            else {
-                if(StateApp.instance.privateMode) {
-                    _buttonIncognito.elevation = 99f;
-                    _buttonIncognito.alpha = 1f;
-                }
-                else {
-                    _buttonIncognito.elevation = -99f;
-                    _buttonIncognito.alpha = 0f;
-                }
-            }
-        }
-
         StatePlayer.instance.also {
             it.onQueueChanged.subscribe { shouldSwapCurrentItem ->
                 if (!shouldSwapCurrentItem) {
@@ -432,7 +316,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         _fragMainSources.topBar = _fragTopBarAdd;
         _fragMainPlaylists.topBar = _fragTopBarGeneral;
         _fragMainPlaylist.topBar = _fragTopBarNavigation;
-        _fragMainRemotePlaylist.topBar = _fragTopBarNavigation;
         _fragPostDetail.topBar = _fragTopBarNavigation;
         _fragWatchlist.topBar = _fragTopBarNavigation;
         _fragHistory.topBar = _fragTopBarNavigation;
@@ -463,6 +346,26 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             .commitNow();
 
         defaultTab.action(_fragBotBarMenu);
+
+        _orientationManager = OrientationManager(this);
+        _orientationManager.onOrientationChanged.subscribe {
+            orientation = it;
+            Logger.i(TAG, "Orientation changed (Found ${it})");
+            fragCurrent.onOrientationChanged(it);
+            if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED)
+                _fragVideoDetail.onOrientationChanged(it);
+            else if(Settings.instance.other.bypassRotationPrevention)
+            {
+                requestedOrientation = when(orientation) {
+                    OrientationManager.Orientation.PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                    OrientationManager.Orientation.LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                    OrientationManager.Orientation.REVERSED_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+                    OrientationManager.Orientation.REVERSED_LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+                }
+            }
+        };
+        _orientationManager.enable();
+
         StateSubscriptions.instance;
 
         fragCurrent.onShown(null, false);
@@ -517,6 +420,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
+
     /*
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -558,7 +462,33 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onResume() {
         super.onResume();
         Logger.v(TAG, "onResume")
+
+        val curOrientation = _orientationManager.orientation;
+
+        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.lastOrientation != curOrientation) {
+            Logger.i(TAG, "Orientation mismatch (Found ${curOrientation})");
+            orientation = curOrientation;
+            fragCurrent.onOrientationChanged(curOrientation);
+            if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED)
+                _fragVideoDetail.onOrientationChanged(curOrientation);
+        }
+
         _isVisible = true;
+        val videoToOpen = StateSaved.instance.videoToOpen;
+
+        if (_wasStopped) {
+            _wasStopped = false;
+
+            if (videoToOpen != null && _fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
+                Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
+                if (StatePlatform.instance.hasEnabledVideoClient(videoToOpen.url)) {
+                    navigate(_fragVideoDetail, UrlVideoWithTime(videoToOpen.url, videoToOpen.timeSeconds, false));
+                    _fragVideoDetail.maximizeVideoDetail(true);
+                }
+
+                StateSaved.instance.setVideoToOpenNonBlocking(null);
+            }
+        }
     }
 
     override fun onPause() {
@@ -605,11 +535,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             "IMPORT_OPTIONS" -> {
                 UIDialogs.showImportOptionsDialog(this);
             }
-            "ACTION" -> {
-                val action = intent.getStringExtra("ACTION");
-                StateDeveloper.instance.testState = "TestPlayback";
-                StateDeveloper.instance.testPlayback();
-            }
             "TAB" -> {
                 when(intent.getStringExtra("TAB")){
                     "Sources" -> {
@@ -618,28 +543,13 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                             navigate(_fragMainSources);
                         }
                     };
-                    "BROWSE_PLUGINS" -> {
-                        navigate(_fragBrowser, BrowserFragment.NavigateOptions("https://plugins.grayjay.app/phone.html", mapOf(
-                            Pair("grayjay") { req ->
-                                StateApp.instance.contextOrNull?.let {
-                                    if(it is MainActivity) {
-                                        runBlocking {
-                                            it.handleUrlAll(req.url.toString());
-                                        }
-                                    }
-                                };
-                            }
-                        )));
-                    }
                 }
             }
         }
 
         try {
             if (targetData != null) {
-                runBlocking {
-                    handleUrlAll(targetData)
-                }
+                handleUrlAll(targetData)
             }
         }
         catch(ex: Throwable) {
@@ -647,7 +557,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    suspend fun handleUrlAll(url: String) {
+    fun handleUrlAll(url: String) {
         val uri = Uri.parse(url)
         when (uri.scheme) {
             "grayjay" -> {
@@ -683,7 +593,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                     UIDialogs.showSingleButtonDialog(
                         this,
                         R.drawable.ic_play,
-                        getString(R.string.unknown_content_format) + " [${url}]\n[${intent.type}]",
+                        getString(R.string.unknown_content_format) + " [${url}]",
                         "Ok",
                         { });
                 }
@@ -731,38 +641,23 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    suspend fun handleUrl(url: String): Boolean {
+    fun handleUrl(url: String): Boolean {
         Logger.i(TAG, "handleUrl(url=$url)")
 
-        return withContext(Dispatchers.IO) {
-            Logger.i(TAG, "handleUrl(url=$url) on IO");
-            if (StatePlatform.instance.hasEnabledVideoClient(url)) {
-                Logger.i(TAG, "handleUrl(url=$url) found video client");
-                lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragVideoDetail, url);
+        if (StatePlatform.instance.hasEnabledVideoClient(url)) {
+            navigate(_fragVideoDetail, url);
+            _fragVideoDetail.maximizeVideoDetail(true);
+            return true;
+        } else if(StatePlatform.instance.hasEnabledChannelClient(url)) {
+            navigate(_fragMainChannel, url);
 
-                    _fragVideoDetail.maximizeVideoDetail(true);
-                }
-                return@withContext true;
-            } else if (StatePlatform.instance.hasEnabledChannelClient(url)) {
-                Logger.i(TAG, "handleUrl(url=$url) found channel client");
-                lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragMainChannel, url);
-                    delay(100);
-                    _fragVideoDetail.minimizeVideoDetail();
-                };
-                return@withContext true;
-            } else if (StatePlatform.instance.hasEnabledPlaylistClient(url)) {
-                Logger.i(TAG, "handleUrl(url=$url) found playlist client");
-                lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragMainPlaylist, url);
-                    delay(100);
-                    _fragVideoDetail.minimizeVideoDetail();
-                };
-                return@withContext true;
-            }
-            return@withContext false;
+            lifecycleScope.launch {
+                delay(100);
+                _fragVideoDetail.minimizeVideoDetail();
+            };
+            return true;
         }
+        return false;
     }
     fun handleContent(file: String, mime: String? = null): Boolean {
         Logger.i(TAG, "handleContent(url=$file)");
@@ -773,22 +668,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if(!recon.trim().startsWith("["))
                 return handleUnknownJson(recon);
 
-            var reconLines = Json.decodeFromString<List<String>>(recon);
-            val cacheStr = reconLines.find { it.startsWith("__CACHE:") }?.substring("__CACHE:".length);
-            reconLines = reconLines.filter { !it.startsWith("__CACHE:") }; //TODO: constant prefix
-            var cache: ImportCache? = null;
-            try {
-                if(cacheStr != null)
-                    cache = Json.decodeFromString(cacheStr);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed to deserialize cache");
-            }
-
-
+            val reconLines = Json.decodeFromString<List<String>>(recon);
             recon = reconLines.joinToString("\n");
             Logger.i(TAG, "Opened shared playlist reconstruction\n${recon}");
-            handleReconstruction(recon, cache);
+            handleReconstruction(recon);
             return true;
         }
         else if(file.lowercase().endsWith(".zip") || mime == "application/zip") {
@@ -803,25 +686,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     fun handleFile(file: String): Boolean {
         Logger.i(TAG, "handleFile(url=$file)");
         if(file.lowercase().endsWith(".json")) {
-            var recon = String(readSharedFile(file));
+            val recon = String(readSharedFile(file));
             if(!recon.startsWith("["))
                 return handleUnknownJson(recon);
 
-            var reconLines = Json.decodeFromString<List<String>>(recon);
-            val cacheStr = reconLines.find { it.startsWith("__CACHE:") }?.substring("__CACHE:".length);
-            reconLines = reconLines.filter { !it.startsWith("__CACHE:") }; //TODO: constant prefix
-            var cache: ImportCache? = null;
-            try {
-                if(cacheStr != null)
-                    cache = Json.decodeFromString(cacheStr);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed to deserialize cache");
-            }
-            recon = reconLines.joinToString("\n");
-
             Logger.i(TAG, "Opened shared playlist reconstruction\n${recon}");
-            handleReconstruction(recon, cache);
+            handleReconstruction(recon);
             return true;
         }
         else if(file.lowercase().endsWith(".zip")) {
@@ -833,7 +703,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
         return false;
     }
-    fun handleReconstruction(recon: String, cache: ImportCache? = null) {
+    fun handleReconstruction(recon: String) {
         val type = ManagedStore.getReconstructionIdentifier(recon);
         val store: ManagedStore<*> = when(type) {
             "Playlist" -> StatePlaylists.instance.playlistStore
@@ -850,7 +720,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
 
         if(!type.isNullOrEmpty()) {
-            UIDialogs.showImportDialog(this, store, name, listOf(recon), cache) {
+            UIDialogs.showImportDialog(this, store, name, listOf(recon)) {
 
             }
         }
@@ -940,9 +810,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if(_fragBotBarMenu.onBackPressed())
             return;
 
-        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.onBackPressed())
+        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED &&
+            _fragVideoDetail.onBackPressed())
             return;
 
+
         if(!fragCurrent.onBackPressed())
             closeSegment();
     }
@@ -958,6 +830,18 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onRestart() {
         super.onRestart();
         Logger.i(TAG, "onRestart");
+
+        //Force Portrait on restart
+        Logger.i(TAG, "Restarted with state ${_fragVideoDetail.state}");
+        if(_fragVideoDetail.state != VideoDetailFragment.State.MAXIMIZED) {
+            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+            WindowCompat.setDecorFitsSystemWindows(window, true)
+            WindowInsetsControllerCompat(window, rootView).let { controller ->
+                controller.show(WindowInsetsCompat.Type.statusBars());
+                controller.show(WindowInsetsCompat.Type.systemBars())
+            }
+            _fragVideoDetail.onOrientationChanged(OrientationManager.Orientation.PORTRAIT);
+        }
     }
 
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
@@ -972,7 +856,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onDestroy() {
         super.onDestroy();
         Logger.v(TAG, "onDestroy")
+
+        _orientationManager.disable();
+
         StateApp.instance.mainAppDestroyed(this);
+        StateSaved.instance.setVideoToOpenBlocking(null);
     }
 
     inline fun <reified T> isFragmentActive(): Boolean {
@@ -1104,7 +992,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             SourcesFragment::class -> _fragMainSources as T;
             PlaylistsFragment::class -> _fragMainPlaylists as T;
             PlaylistFragment::class -> _fragMainPlaylist as T;
-            RemotePlaylistFragment::class -> _fragMainRemotePlaylist as T;
             PostDetailFragment::class -> _fragPostDetail as T;
             WatchLaterFragment::class -> _fragWatchlist as T;
             HistoryFragment::class -> _fragHistory as T;
@@ -1135,70 +1022,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     }
 
 
-    val notifPermission = "android.permission.POST_NOTIFICATIONS";
-    val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
-        if (isGranted)
-            UIDialogs.toast(this, "Notification permission granted");
-        else
-            UIDialogs.toast(this, "Notification permission denied");
-    }
-    fun requestNotificationPermissions(reason: String) {
-        when {
-            ContextCompat.checkSelfPermission(this, notifPermission) == PackageManager.PERMISSION_GRANTED -> {
-
-            }
-            ActivityCompat.shouldShowRequestPermissionRationale(this, notifPermission) -> {
-                UIDialogs.showDialog(this, R.drawable.ic_notifications, "Notifications Required",
-                    reason, null, 0,
-                    UIDialogs.Action("Cancel", {}),
-                    UIDialogs.Action("Enable", {
-                        requestPermissionLauncher.launch(notifPermission);
-                    }, UIDialogs.ActionStyle.PRIMARY));
-            }
-            else -> {
-                requestPermissionLauncher.launch(notifPermission);
-            }
-        }
-    }
-
-    private val _toastQueue = ConcurrentLinkedQueue<ToastView.Toast>();
-    private var _toastJob: Job? = null;
-    fun showAppToast(toast: ToastView.Toast) {
-        synchronized(_toastQueue) {
-            _toastQueue.add(toast);
-            if(_toastJob?.isActive != true)
-                _toastJob = lifecycleScope.launch(Dispatchers.Default) {
-                    launchAppToastJob();
-                };
-        }
-    }
-    private suspend fun launchAppToastJob() {
-        Logger.i(TAG, "Starting appToast loop");
-        while(!_toastQueue.isEmpty()) {
-            val toast = _toastQueue.poll() ?: continue;
-            Logger.i(TAG, "Showing next toast (${toast.msg})");
-
-            lifecycleScope.launch(Dispatchers.Main) {
-                if (!_toastView.isVisible) {
-                    Logger.i(TAG, "First showing toast");
-                    _toastView.setToast(toast);
-                    _toastView.show(true);
-                } else {
-                    _toastView.setToastAnimated(toast);
-                }
-            }
-            if(toast.long)
-                delay(5000);
-            else
-                delay(3000);
-        }
-        Logger.i(TAG, "Ending appToast loop");
-        lifecycleScope.launch(Dispatchers.Main) {
-            _toastView.hide(true) {
-            };
-        }
-    }
-
 
     //TODO: Only calls last handler due to missing request codes on ActivityResultLaunchers.
     private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
@@ -1237,13 +1060,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             return sourcesIntent;
         }
-        fun getActionIntent(context: Context, action: String) : Intent {
-            val sourcesIntent = Intent(context, MainActivity::class.java);
-            sourcesIntent.action = "ACTION";
-            sourcesIntent.putExtra("ACTION", action);
-            sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            return sourcesIntent;
-        }
 
         fun getImportOptionsIntent(context: Context): Intent {
             val sourcesIntent = Intent(context, MainActivity::class.java);

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
-import android.net.Uri
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
@@ -20,12 +19,7 @@ import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.polycentric.core.ContentType
-import com.futo.polycentric.core.SignedEvent
-import com.futo.polycentric.core.StorageTypeCRDTItem
-import com.futo.polycentric.core.StorageTypeCRDTSetItem
-import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.toBase64Url
+import com.futo.polycentric.core.*
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.MultiFormatWriter
 import com.google.zxing.common.BitMatrix
@@ -70,8 +64,11 @@ class PolycentricBackupActivity : AppCompatActivity() {
         }
 
         _buttonShare.onClick.subscribe {
-            val shareIntent = Intent(Intent.ACTION_VIEW, Uri.parse(_exportBundle))
-            startActivity(Intent.createChooser(shareIntent, "Share ID"));
+            val shareIntent = Intent(Intent.ACTION_SEND).apply {
+                type = "text/plain";
+                putExtra(Intent.EXTRA_TEXT, _exportBundle);
+            }
+            startActivity(Intent.createChooser(shareIntent, getString(R.string.share_text)));
         };
 
         _buttonCopy.onClick.subscribe {

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

@@ -12,14 +12,14 @@ 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.PolycentricCache
-import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
+import com.futo.polycentric.core.Synchronization
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -71,14 +71,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                     try {
                         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(PolycentricCache.SERVER);
+                        processHandle.addServer("https://srv1-stg.polycentric.io");
                         processHandle.setUsername(username);
                         StatePolycentric.instance.setProcessHandle(processHandle);
                     } catch (e: Throwable) {

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

@@ -8,16 +8,12 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 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
-import com.futo.platformplayer.views.overlays.LoaderOverlay
 import com.futo.polycentric.core.KeyPair
 import com.futo.polycentric.core.Process
 import com.futo.polycentric.core.ProcessSecret
@@ -25,9 +21,6 @@ import com.futo.polycentric.core.SignedEvent
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.base64UrlToByteArray
 import com.google.zxing.integration.android.IntentIntegrator
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import userpackage.Protocol
 import userpackage.Protocol.ExportBundle
 
@@ -36,7 +29,6 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
     private lateinit var _buttonScanProfile: LinearLayout;
     private lateinit var _buttonImportProfile: LinearLayout;
     private lateinit var _editProfile: EditText;
-    private lateinit var _loaderOverlay: LoaderOverlay;
 
     private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
@@ -60,7 +52,6 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         _buttonHelp = findViewById(R.id.button_help);
         _buttonScanProfile = findViewById(R.id.button_scan_profile);
         _buttonImportProfile = findViewById(R.id.button_import_profile);
-        _loaderOverlay = findViewById(R.id.loader_overlay);
         _editProfile = findViewById(R.id.edit_profile);
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
@@ -103,63 +94,42 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
             return;
         }
 
-        _loaderOverlay.show()
+        try {
+            val data = url.substring("polycentric://".length).base64UrlToByteArray();
+            val urlInfo = Protocol.URLInfo.parseFrom(data);
+            if (urlInfo.urlType != 3L) {
+                throw Exception("Expected urlInfo struct of type ExportBundle")
+            }
 
-        lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val data = url.substring("polycentric://".length).base64UrlToByteArray();
-                val urlInfo = Protocol.URLInfo.parseFrom(data);
-                if (urlInfo.urlType != 3L) {
-                    throw Exception("Expected urlInfo struct of type ExportBundle")
-                }
+            val exportBundle = ExportBundle.parseFrom(urlInfo.body);
+            val keyPair = KeyPair.fromProto(exportBundle.keyPair);
 
-                val exportBundle = ExportBundle.parseFrom(urlInfo.body);
-                val keyPair = KeyPair.fromProto(exportBundle.keyPair);
+            val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey);
+            if (existingProcessSecret != null) {
+                UIDialogs.toast(this, getString(R.string.this_profile_is_already_imported));
+                return;
+            }
 
-                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey);
-                if (existingProcessSecret != null) {
-                    withContext(Dispatchers.Main) {
-                        UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.this_profile_is_already_imported));
-                    }
-                    return@launch;
-                }
+            val processSecret = ProcessSecret(keyPair, Process.random());
+            Store.instance.addProcessSecret(processSecret);
 
-                val processSecret = ProcessSecret(keyPair, Process.random());
-                Store.instance.addProcessSecret(processSecret);
+            val processHandle = processSecret.toProcessHandle();
 
+            for (e in exportBundle.events.eventsList) {
                 try {
-                    PolycentricStorage.instance.addProcessSecret(processSecret)
+                    val se = SignedEvent.fromProto(e);
+                    Store.instance.putSignedEvent(se);
                 } 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) {
-                    try {
-                        val se = SignedEvent.fromProto(e);
-                        Store.instance.putSignedEvent(se);
-                    } catch (e: Throwable) {
-                        Logger.w(TAG, "Ignored invalid event", e);
-                    }
-                }
-
-                StatePolycentric.instance.setProcessHandle(processHandle);
-                processHandle.fullyBackfillClient(PolycentricCache.SERVER);
-                withContext(Dispatchers.Main) {
-                    startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
-                    finish();
-                }
-            } catch (e: Throwable) {
-                Logger.w(TAG, "Failed to import profile", e);
-                withContext(Dispatchers.Main) {
-                    UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.failed_to_import_profile) + " '${e.message}'");
-                }
-            } finally {
-                withContext(Dispatchers.Main) {
-                    _loaderOverlay.hide();
+                    Logger.w(TAG, "Ignored invalid event", e);
                 }
             }
+
+            StatePolycentric.instance.setProcessHandle(processHandle);
+            startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
+            finish();
+        } catch (e: Throwable) {
+            Logger.w(TAG, "Failed to import profile", e);
+            UIDialogs.toast(this, getString(R.string.failed_to_import_profile) + " '${e.message}'");
         }
     }
 

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

@@ -1,8 +1,6 @@
 package com.futo.platformplayer.activities
 
 import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
@@ -14,7 +12,6 @@ import android.webkit.MimeTypeMap
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
@@ -24,16 +21,14 @@ import com.futo.platformplayer.dp
 import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
-import com.futo.platformplayer.views.overlays.LoaderOverlay
 import com.futo.polycentric.core.Store
+import com.futo.polycentric.core.Synchronization
 import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.toBase64Url
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.github.dhaval2404.imagepicker.ImagePicker
 import kotlinx.coroutines.Dispatchers
@@ -51,8 +46,6 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private lateinit var _buttonDelete: BigButton;
     private lateinit var _username: String;
     private lateinit var _imagePolycentric: ImageView;
-    private lateinit var _loaderOverlay: LoaderOverlay;
-    private lateinit var _textSystem: TextView;
     private var _avatarUri: Uri? = null;
 
     override fun attachBaseContext(newBase: Context?) {
@@ -70,13 +63,28 @@ class PolycentricProfileActivity : AppCompatActivity() {
         _buttonExport = findViewById(R.id.button_export);
         _buttonLogout = findViewById(R.id.button_logout);
         _buttonDelete = findViewById(R.id.button_delete);
-        _loaderOverlay = findViewById(R.id.loader_overlay);
-        _textSystem = findViewById(R.id.text_system)
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             saveIfRequired();
             finish();
         };
 
+        lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                val processHandle = StatePolycentric.instance.processHandle!!;
+                Synchronization.fullyBackFillClient(processHandle, processHandle.system, "https://srv1-stg.polycentric.io");
+
+                withContext(Dispatchers.Main) {
+                    updateUI();
+                }
+            } catch (e: Throwable) {
+                withContext(Dispatchers.Main) {
+                    UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.failed_to_backfill_client));
+                }
+            }
+        }
+
+        updateUI();
+
         _imagePolycentric.setOnClickListener {
             ImagePicker.with(this)
                 .cropSquare()
@@ -112,37 +120,6 @@ class PolycentricProfileActivity : AppCompatActivity() {
                 finish();
             });
         }
-
-        _textSystem.setOnLongClickListener {
-            val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val clip: ClipData = ClipData.newPlainText("system", _textSystem.text)
-            clipboard.setPrimaryClip(clip)
-            return@setOnLongClickListener true
-        }
-
-        updateUI()
-
-        StatePolycentric.instance.processHandle?.let { processHandle ->
-            _loaderOverlay.show()
-
-            lifecycleScope.launch(Dispatchers.IO) {
-                try {
-                    processHandle.fullyBackfillClient(PolycentricCache.SERVER)
-
-                    withContext(Dispatchers.Main) {
-                        updateUI();
-                    }
-                } catch (e: Throwable) {
-                    withContext(Dispatchers.Main) {
-                        UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.failed_to_backfill_client));
-                    }
-                } finally {
-                    withContext(Dispatchers.Main) {
-                        _loaderOverlay.hide()
-                    }
-                }
-            }
-        }
     }
 
     private fun saveIfRequired() {
@@ -151,17 +128,13 @@ class PolycentricProfileActivity : AppCompatActivity() {
                 var hasChanges = false;
                 val username = _editName.text.toString();
                 if (username.length < 3) {
-                    withContext(Dispatchers.Main) {
-                        UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.name_must_be_at_least_3_characters_long));
-                    }
+                    UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.name_must_be_at_least_3_characters_long));
                     return@launch;
                 }
 
                 val processHandle = StatePolycentric.instance.processHandle;
                 if (processHandle == null) {
-                    withContext(Dispatchers.Main) {
-                        UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.process_handle_unset));
-                    }
+                    UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.process_handle_unset));
                     return@launch;
                 }
 
@@ -246,7 +219,6 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private fun updateUI() {
         val processHandle = StatePolycentric.instance.processHandle!!;
         val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(processHandle.system))
-        _textSystem.text = processHandle.system.key.toBase64Url()
         _username = systemState.username;
         _editName.text.clear();
         _editName.text.append(_username);

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

@@ -1,10 +1,8 @@
 package com.futo.platformplayer.activities
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
 import android.widget.FrameLayout
@@ -14,11 +12,8 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
-import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.LoaderView
@@ -38,14 +33,6 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
 
     lateinit var overlay: FrameLayout;
 
-    val notifPermission = "android.permission.POST_NOTIFICATIONS";
-    val requestPermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
-        if (isGranted)
-            UIDialogs.toast(this, "Notification permission granted");
-        else
-            UIDialogs.toast(this, "Notification permission denied");
-    }
-
     override fun attachBaseContext(newBase: Context?) {
         Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext")
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
@@ -71,33 +58,6 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
                 Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
                 StateApp.instance.setLocaleSetting(this, Settings.instance.language.getAppLanguageLocaleString());
             }
-
-            if(field.descriptor?.id == "background_update") {
-                Logger.i("SettingsActivity", "Detected change in background work ${field.value}");
-                if(Settings.instance.subscriptions.subscriptionsBackgroundUpdateInterval > 0) {
-                    val notifManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-                    if(!notifManager.areNotificationsEnabled()) {
-                        UIDialogs.toast(this, "Notifications aren't enabled");
-
-                        when {
-                            ContextCompat.checkSelfPermission(this, notifPermission) == PackageManager.PERMISSION_GRANTED -> {
-
-                            }
-                            ActivityCompat.shouldShowRequestPermissionRationale(this, notifPermission) -> {
-                                UIDialogs.showDialog(this, R.drawable.ic_notifications, "Notifications Required",
-                                    "Notifications need to be enabled for background updating to function", null, 0,
-                                    UIDialogs.Action("Cancel", {}),
-                                    UIDialogs.Action("Enable", {
-                                        requestPermissionLauncher.launch(notifPermission);
-                                    }, UIDialogs.ActionStyle.PRIMARY));
-                            }
-                            else -> {
-                                requestPermissionLauncher.launch(notifPermission);
-                            }
-                        }
-                    }
-                }
-            }
         };
         _buttonBack.setOnClickListener {
             finish();
@@ -112,10 +72,7 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
         reloadSettings();
     }
 
-    var isFirstLoad = true;
     fun reloadSettings() {
-        val firstLoad = isFirstLoad;
-        isFirstLoad = false;
         _form.setSearchVisible(false);
         _loaderView.start();
         _form.fromObject(lifecycleScope, Settings.instance) {
@@ -133,13 +90,6 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
                     UIDialogs.toast(this, getString(R.string.you_are_now_in_developer_mode));
                 }
             };
-
-            if(firstLoad) {
-                val query = intent.getStringExtra("query");
-                if(!query.isNullOrEmpty()) {
-                    _form.setSearchQuery(query);
-                }
-            }
         };
     }
 
@@ -185,19 +135,11 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
         resultLauncher.launch(intent);
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        settingsActivityClosed.emit()
-    }
-
-
     companion object {
         //TODO: Temporary for solving Settings issues
         @SuppressLint("StaticFieldLeak")
         private var _lastActivity: SettingsActivity? = null;
 
-        val settingsActivityClosed = Event0()
-
         fun getActivity(): SettingsActivity? {
             val act = _lastActivity;
             if(act != null && !act._isFinished)

app/src/main/java/com/futo/platformplayer/api/http/ManagedHttpClient.kt

@@ -1,7 +1,5 @@
 package com.futo.platformplayer.api.http
 
-import androidx.collection.arrayMapOf
-import com.futo.platformplayer.SettingsDev
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.ensureNotMainThread
 import com.futo.platformplayer.logging.Logger
@@ -15,16 +13,10 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
-import java.security.SecureRandom
-import java.security.cert.X509Certificate
-import java.time.Duration
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
-import javax.net.ssl.X509TrustManager
 import kotlin.system.measureTimeMillis
 
 open class ManagedHttpClient {
-    protected var _builderTemplate: OkHttpClient.Builder;
+    protected val _builderTemplate: OkHttpClient.Builder;
 
     private var client: OkHttpClient;
 
@@ -33,38 +25,8 @@ open class ManagedHttpClient {
 
     var user_agent = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
 
-    fun setTimeout(timeout: Long) {
-        rebuildClient {
-            it.callTimeout(Duration.ofMillis(client.callTimeoutMillis.toLong()))
-                .writeTimeout(Duration.ofMillis(client.writeTimeoutMillis.toLong()))
-                .readTimeout(Duration.ofMillis(client.readTimeoutMillis.toLong()))
-                .connectTimeout(Duration.ofMillis(timeout));
-        }
-    }
-
-    private val trustAllCerts = arrayOf<TrustManager>(
-      object: X509TrustManager {
-          override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) { }
-          override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) { }
-          override fun getAcceptedIssuers(): Array<X509Certificate> {
-              return arrayOf();
-          }
-      }
-    );
-    private fun trustAllCertificates(builder: OkHttpClient.Builder) {
-        val sslContext = SSLContext.getInstance("SSL");
-        sslContext.init(null, trustAllCerts, SecureRandom());
-        builder.sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager);
-        builder.hostnameVerifier { a, b ->
-            return@hostnameVerifier true;
-        }
-        Logger.w(TAG, "Creating INSECURE client (TrustAll)");
-    }
-
     constructor(builder: OkHttpClient.Builder = OkHttpClient.Builder()) {
         _builderTemplate = builder;
-        if(SettingsDev.instance.developerMode && SettingsDev.instance.networking.allowAllCertificates)
-            trustAllCertificates(builder);
         client = builder.addNetworkInterceptor { chain ->
             val request = beforeRequest(chain.request());
             val response = afterRequest(chain.proceed(request));
@@ -72,15 +34,6 @@ open class ManagedHttpClient {
         }.build();
     }
 
-    fun rebuildClient(modify: (OkHttpClient.Builder) -> OkHttpClient.Builder) {
-        _builderTemplate = modify(_builderTemplate);
-        client = _builderTemplate.addNetworkInterceptor { chain ->
-            val request = beforeRequest(chain.request());
-            val response = afterRequest(chain.proceed(request));
-            return@addNetworkInterceptor response;
-        }.build();
-    }
-
     open fun clone(): ManagedHttpClient {
         val clonedClient = ManagedHttpClient(_builderTemplate);
         clonedClient.user_agent = user_agent;

app/src/main/java/com/futo/platformplayer/api/http/server/HttpContext.kt

@@ -210,20 +210,6 @@ class HttpContext : AutoCloseable {
             }
         }
     }
-    fun respondBytes(status: Int, headers: HttpHeaders, body: ByteArray? = null) {
-        if(headers.get("content-length").isNullOrEmpty()) {
-            if (body != null) {
-                headers.put("content-length", body.size.toString());
-            } else {
-                headers.put("content-length", "0")
-            }
-        }
-        respond(status, headers) { responseStream ->
-            if(body != null) {
-                responseStream.write(body);
-            }
-        }
-    }
     fun respond(status: Int, headers: HttpHeaders, writing: (OutputStream)->Unit) {
         val responseStream = _responseStream ?: throw IllegalStateException("No response stream set");
 

app/src/main/java/com/futo/platformplayer/api/http/server/ManagedHttpServer.kt

@@ -2,7 +2,7 @@ package com.futo.platformplayer.api.http.server
 
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.http.server.exceptions.EmptyRequestException
-import com.futo.platformplayer.api.http.server.handlers.HttpFunctionHandler
+import com.futo.platformplayer.api.http.server.handlers.HttpFuntionHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpOptionsAllowHandler
 import com.futo.platformplayer.logging.Logger
@@ -208,20 +208,20 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
 
         for(getMethod in getMethods)
             if(getMethod.first.parameterTypes.firstOrNull() == HttpContext::class.java && getMethod.first.parameterCount == 1)
-                addHandler(HttpFunctionHandler("GET", getMethod.second.path) { getMethod.first.invoke(obj, it) }).apply {
+                addHandler(HttpFuntionHandler("GET", getMethod.second.path) { getMethod.first.invoke(obj, it) }).apply {
                     if(!getMethod.second.contentType.isEmpty())
                         this.withContentType(getMethod.second.contentType);
                 }.withContentType(getMethod.second.contentType);
         for(postMethod in postMethods)
             if(postMethod.first.parameterTypes.firstOrNull() == HttpContext::class.java && postMethod.first.parameterCount == 1)
-                addHandler(HttpFunctionHandler("POST", postMethod.second.path) { postMethod.first.invoke(obj, it) }).apply {
+                addHandler(HttpFuntionHandler("POST", postMethod.second.path) { postMethod.first.invoke(obj, it) }).apply {
                     if(!postMethod.second.contentType.isEmpty())
                         this.withContentType(postMethod.second.contentType);
                 }.withContentType(postMethod.second.contentType);
 
         for(getField in getFields) {
             getField.first.isAccessible = true;
-            addHandler(HttpFunctionHandler("GET", getField.second.path) {
+            addHandler(HttpFuntionHandler("GET", getField.second.path) {
                 val value = getField.first.get(obj) as String?;
                 if(value != null) {
                     val headers = HttpHeaders(

app/src/main/java/com/futo/platformplayer/api/http/server/handlers/HttpFunctionHandler.kt

@@ -2,7 +2,7 @@ package com.futo.platformplayer.api.http.server.handlers
 
 import com.futo.platformplayer.api.http.server.HttpContext
 
-class HttpFunctionHandler(method: String, path: String, val handler: (HttpContext)->Unit) : HttpHandler(method, path) {
+class HttpFuntionHandler(method: String, path: String, val handler: (HttpContext)->Unit) : HttpHandler(method, path) {
     override fun handle(httpContext: HttpContext) {
         httpContext.setResponseHeaders(this.headers);
         handler(httpContext);

app/src/main/java/com/futo/platformplayer/api/media/CachedPlatformClient.kt

@@ -0,0 +1,103 @@
+package com.futo.platformplayer.api.media
+
+import androidx.collection.LruCache
+import com.futo.platformplayer.api.media.models.ResultCapabilities
+import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
+import com.futo.platformplayer.api.media.models.chapters.IChapter
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
+import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
+import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
+import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.models.ImageVariable
+
+/**
+ * A temporary class that caches video results
+ * In future this should be part of a bigger system
+ */
+class CachedPlatformClient : IPlatformClient {
+    private val _client : IPlatformClient;
+    override val id: String get() = _client.id;
+    override val name: String get() = _client.name;
+    override val icon: ImageVariable? get() = _client.icon;
+
+    private val _cache: LruCache<String, IPlatformContentDetails>;
+
+    override val capabilities: PlatformClientCapabilities
+        get() = _client.capabilities;
+
+    constructor(client : IPlatformClient, cacheSize : Int = 10 * 1024 * 1024) {
+        this._client = client;
+        this._cache = LruCache<String, IPlatformContentDetails>(cacheSize);
+    }
+    override fun initialize() { _client.initialize() }
+    override fun disable() { _client.disable() }
+
+    override fun isContentDetailsUrl(url: String): Boolean = _client.isContentDetailsUrl(url);
+    override fun getContentDetails(url: String): IPlatformContentDetails {
+        var result = _cache.get(url);
+        if(result == null) {
+            result = _client.getContentDetails(url);
+            _cache.put(url, result);
+        }
+        return result;
+    }
+
+    override fun getContentChapters(url: String): List<IChapter> = _client.getContentChapters(url);
+    override fun getPlaybackTracker(url: String): IPlaybackTracker? = _client.getPlaybackTracker(url);
+
+    override fun isChannelUrl(url: String): Boolean = _client.isChannelUrl(url);
+    override fun getChannel(channelUrl: String): IPlatformChannel = _client.getChannel(channelUrl);
+
+    override fun getChannelCapabilities(): ResultCapabilities  = _client.getChannelCapabilities();
+    override fun getChannelContents(
+        channelUrl: String,
+        type: String?,
+        order: String?,
+        filters: Map<String, List<String>>?
+    ): IPager<IPlatformContent> = _client.getChannelContents(channelUrl);
+
+    override fun getChannelUrlByClaim(claimType: Int, claimValues: Map<Int, String>): String? = _client.getChannelUrlByClaim(claimType, claimValues)
+
+    override fun searchSuggestions(query: String): Array<String> = _client.searchSuggestions(query);
+    override fun getSearchCapabilities(): ResultCapabilities  = _client.getSearchCapabilities();
+    override fun search(
+        query: String,
+        type: String?,
+        order: String?,
+        filters: Map<String, List<String>>?
+    ): IPager<IPlatformContent> = _client.search(query, type, order, filters);
+
+    override fun getSearchChannelContentsCapabilities(): ResultCapabilities = _client.getSearchChannelContentsCapabilities();
+    override fun searchChannelContents(
+        channelUrl: String,
+        query: String,
+        type: String?,
+        order: String?,
+        filters: Map<String, List<String>>?
+    ): IPager<IPlatformContent> = _client.searchChannelContents(channelUrl, query, type, order, filters);
+
+    override fun searchChannels(query: String) = _client.searchChannels(query);
+
+    override fun getComments(url: String): IPager<IPlatformComment> = _client.getComments(url);
+    override fun getSubComments(comment: IPlatformComment): IPager<IPlatformComment> = _client.getSubComments(comment);
+
+    override fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor? = _client.getLiveChatWindow(url);
+    override fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>? = _client.getLiveEvents(url);
+
+    override fun getHome(): IPager<IPlatformContent> = _client.getHome();
+
+    override fun getUserSubscriptions(): Array<String> { return arrayOf(); };
+
+    override fun searchPlaylists(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = _client.searchPlaylists(query, type, order, filters);
+    override fun isPlaylistUrl(url: String): Boolean = _client.isPlaylistUrl(url);
+    override fun getPlaylist(url: String): IPlatformPlaylistDetails = _client.getPlaylist(url);
+    override fun getUserPlaylists(): Array<String> { return arrayOf(); };
+
+    override fun isClaimTypeSupported(claimType: Int): Boolean {
+        return _client.isClaimTypeSupported(claimType);
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/IPlatformClient.kt

@@ -10,7 +10,6 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.models.ImageVariable
@@ -85,20 +84,6 @@ interface IPlatformClient {
      */
     fun getChannelContents(channelUrl: String, type: String? = null, order: String? = null, filters: Map<String, List<String>>? = null): IPager<IPlatformContent>;
 
-    /**
-     * Describes what the plugin is capable on peek channel results
-     */
-    fun getPeekChannelTypes(): List<String>;
-    /**
-     * Peeks contents of a channel, upload time descending
-     */
-    fun peekChannelContents(channelUrl: String, type: String? = null): List<IPlatformContent>
-
-    /**
-     * Gets all playlists of a channel
-     */
-    fun getChannelPlaylists(channelUrl: String): IPager<IPlatformPlaylist>
-
     /**
      * Gets the channel url associated with a claimType
      */
@@ -121,11 +106,6 @@ interface IPlatformClient {
      */
     fun getPlaybackTracker(url: String): IPlaybackTracker?;
 
-    /**
-     * Get content recommendations
-     */
-    fun getContentRecommendations(url: String): IPager<IPlatformContent>?;
-
 
     //Comments
     /**

app/src/main/java/com/futo/platformplayer/api/media/PlatformClientCapabilities.kt

@@ -13,14 +13,10 @@ data class PlatformClientCapabilities(
     val hasGetChannelUrlByClaim: Boolean = false,
     val hasGetChannelTemplateByClaimMap: Boolean = false,
     val hasGetSearchCapabilities: Boolean = false,
-    val hasGetSearchChannelContentsCapabilities: Boolean = false,
     val hasGetChannelCapabilities: Boolean = false,
     val hasGetLiveEvents: Boolean = false,
     val hasGetLiveChatWindow: Boolean = false,
-    val hasGetContentChapters: Boolean = false,
-    val hasPeekChannelContents: Boolean = false,
-    val hasGetChannelPlaylists: Boolean = false,
-    val hasGetContentRecommendations: Boolean = false
+    val hasGetContentChapters: Boolean = false
 ) {
 
 }

app/src/main/java/com/futo/platformplayer/api/media/PlatformClientPool.kt

@@ -13,15 +13,13 @@ class PlatformClientPool {
     private val _pool: HashMap<JSClient, Int> = hashMapOf();
     private var _poolCounter = 0;
     private val _poolName: String?;
-    private val _privatePool: Boolean;
 
     var isDead: Boolean = false
         private set;
     val onDead = Event2<JSClient, PlatformClientPool>();
 
-    constructor(parentClient: IPlatformClient, name: String? = null, privatePool: Boolean = false) {
+    constructor(parentClient: IPlatformClient, name: String? = null) {
         _poolName = name;
-        _privatePool = privatePool;
         if(parentClient !is JSClient)
             throw IllegalArgumentException("Pooling only supported for JSClients right now");
         Logger.i(TAG, "Pool for ${parentClient.name} was started");
@@ -53,7 +51,7 @@ class PlatformClientPool {
             reserved = _pool.keys.find { !it.isBusy };
             if(reserved == null && _pool.size < capacity) {
                 Logger.i(TAG, "Started additional [${_parent.name}] client in pool [${_poolName}] (${_pool.size + 1}/${capacity})");
-                reserved = _parent.getCopy(_privatePool);
+                reserved = _parent.getCopy();
 
                 reserved?.onCaptchaException?.subscribe { client, ex ->
                     StateApp.instance.handleCaptchaException(client, ex);

app/src/main/java/com/futo/platformplayer/api/media/PlatformMultiClientPool.kt

@@ -6,14 +6,12 @@ class PlatformMultiClientPool {
     private val _clientPools: HashMap<IPlatformClient, PlatformClientPool> = hashMapOf();
 
     private var _isFake = false;
-    private var _privatePool = false;
 
-    constructor(name: String, maxCap: Int = -1, isPrivatePool: Boolean = false) {
+    constructor(name: String, maxCap: Int = -1) {
         _name = name;
         _maxCap = if(maxCap > 0)
             maxCap
         else 99;
-        _privatePool = isPrivatePool;
     }
 
     fun getClientPooled(parentClient: IPlatformClient, capacity: Int = _maxCap): IPlatformClient {
@@ -21,7 +19,7 @@ class PlatformMultiClientPool {
             return parentClient;
         val pool = synchronized(_clientPools) {
             if(!_clientPools.containsKey(parentClient))
-                _clientPools[parentClient] = PlatformClientPool(parentClient, _name, _privatePool).apply {
+                _clientPools[parentClient] = PlatformClientPool(parentClient, _name).apply {
                     this.onDead.subscribe { _, pool ->
                         synchronized(_clientPools) {
                             if(_clientPools[parentClient] == pool)

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

@@ -14,7 +14,7 @@ open class PlatformAuthorLink {
     val id: PlatformID;
     val name: String;
     val url: String;
-    var thumbnail: String?;
+    val thumbnail: String?;
     var subscribers: Long? = null; //Optional
 
     constructor(id: PlatformID, name: String, url: String, thumbnail: String? = null, subscribers: Long? = null)
@@ -27,8 +27,6 @@ open class PlatformAuthorLink {
     }
 
     companion object {
-        val UNKNOWN = PlatformAuthorLink(PlatformID.NONE, "Unknown", "", null, null);
-
         fun fromV8(config: SourcePluginConfig, value: V8ValueObject): PlatformAuthorLink {
             if(value.has("membershipUrl"))
                 return PlatformAuthorMembershipLink.fromV8(config, value);

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

@@ -3,8 +3,6 @@ package com.futo.platformplayer.api.media.models
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.engine.IV8PluginConfig
-import com.futo.platformplayer.engine.V8PluginConfig
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 
 @kotlinx.serialization.Serializable
@@ -33,7 +31,7 @@ class Thumbnails {
         fun fromV8(config: IV8PluginConfig, value: V8ValueObject): Thumbnails {
             return Thumbnails((value.getOrThrow<V8ValueArray>(config, "sources", "Thumbnails"))
                 .toArray()
-                .map { Thumbnail.fromV8(config, it as V8ValueObject) }
+                .map { Thumbnail.fromV8(it as V8ValueObject) }
                 .toTypedArray());
         }
     }
@@ -42,10 +40,10 @@ class Thumbnails {
 data class Thumbnail(val url : String?, val quality : Int = 0) {
 
     companion object {
-        fun fromV8(config: IV8PluginConfig, value: V8ValueObject): Thumbnail {
+        fun fromV8(value: V8ValueObject): Thumbnail {
             return Thumbnail(
-                value.getOrDefault<String>(config,"url", "Thumbnail", null),
-                value.getOrDefault(config, "quality", "Thumbnail", 0) ?: 0);
+                value.getString("url"),
+                value.getInteger("quality"));
         }
     }
 };

app/src/main/java/com/futo/platformplayer/api/media/models/channels/SerializedChannel.kt

@@ -37,10 +37,6 @@ class SerializedChannel(
         TODO("Not yet implemented")
     }
 
-    fun isSameUrl(url: String): Boolean {
-        return this.url == url || urlAlternatives.contains(url);
-    }
-
     companion object {
         fun fromChannel(channel: IPlatformChannel): SerializedChannel {
             return SerializedChannel(

app/src/main/java/com/futo/platformplayer/api/media/models/chapters/IChapter.kt

@@ -14,8 +14,7 @@ enum class ChapterType(val value: Int) {
     NORMAL(0),
 
     SKIPPABLE(5),
-    SKIP(6),
-    SKIPONCE(7);
+    SKIP(6);
 
 
 
@@ -23,7 +22,7 @@ enum class ChapterType(val value: Int) {
     companion object {
         fun fromInt(value: Int): ChapterType
         {
-            val result = ChapterType.entries.firstOrNull { it.value == value };
+            val result = ChapterType.values().firstOrNull { it.value == value };
             if(result == null)
                 throw UnknownPlatformException(value.toString());
             return result;

app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt

@@ -19,9 +19,8 @@ class PolycentricPlatformComment : IPlatformComment {
 
     val eventPointer: Pointer;
     val reference: Reference;
-    val parentReference: Reference?;
 
-    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, eventPointer: Pointer, parentReference: Reference?, replyCount: Int? = null) {
+    constructor(contextUrl: String, author: PlatformAuthorLink, msg: String, rating: IRating, date: OffsetDateTime, eventPointer: Pointer, replyCount: Int? = null) {
         this.contextUrl = contextUrl;
         this.author = author;
         this.message = msg;
@@ -30,7 +29,6 @@ class PolycentricPlatformComment : IPlatformComment {
         this.replyCount = replyCount;
         this.eventPointer = eventPointer;
         this.reference = eventPointer.toReference();
-        this.parentReference = parentReference;
     }
 
     override fun getReplies(client: IPlatformClient): IPager<IPlatformComment> {
@@ -38,11 +36,10 @@ class PolycentricPlatformComment : IPlatformComment {
     }
 
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
-        return PolycentricPlatformComment(contextUrl, author, message, rating, date, eventPointer, parentReference, replyCount);
+        return PolycentricPlatformComment(contextUrl, author, message, rating, date, eventPointer, replyCount);
     }
 
     companion object {
-        private const val TAG = "PolycentricPlatformComment"
         val MAX_COMMENT_SIZE = 2000
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/contents/ContentType.kt

@@ -21,7 +21,7 @@ enum class ContentType(val value: Int) {
     companion object {
         fun fromInt(value: Int): ContentType
         {
-            val result = ContentType.entries.firstOrNull { it.value == value };
+            val result = ContentType.values().firstOrNull { it.value == value };
             if(result == null)
                 throw UnknownPlatformException(value.toString());
             return result;

app/src/main/java/com/futo/platformplayer/api/media/models/contents/IPlatformContentDetails.kt

@@ -10,6 +10,4 @@ interface IPlatformContentDetails : IPlatformContent {
 
     fun getComments(client: IPlatformClient): IPager<IPlatformComment>?;
     fun getPlaybackTracker(): IPlaybackTracker?;
-
-    fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>?;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/live/ILiveChatWindowDescriptor.kt

@@ -3,5 +3,4 @@ package com.futo.platformplayer.api.media.models.live
 interface ILiveChatWindowDescriptor {
     val url: String;
     val removeElements: List<String>;
-    val removeElementsInterval: List<String>;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventType.kt

@@ -10,7 +10,7 @@ enum class LiveEventType(val value : Int) {
 
     companion object{
         fun fromInt(value : Int) : LiveEventType{
-            return LiveEventType.entries.first { it.value == value };
+            return LiveEventType.values().first { it.value == value };
         }
     }
 }

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

@@ -3,5 +3,4 @@ package com.futo.platformplayer.api.media.models.modifier
 interface IModifierOptions {
     val applyAuthClient: String?;
     val applyCookieClient: String?;
-    val applyOtherHeaders: Boolean;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/playback/IPlaybackTracker.kt

@@ -7,5 +7,4 @@ interface IPlaybackTracker {
 
     fun onInit(seconds: Double);
     fun onProgress(seconds: Double, isPlaying: Boolean);
-    fun onConcluded();
 }

app/src/main/java/com/futo/platformplayer/api/media/models/playlists/IPlatformPlaylistDetails.kt

@@ -8,5 +8,5 @@ interface IPlatformPlaylistDetails: IPlatformPlaylist {
     //TODO: Determine if this should be IPlatformContent (probably not?)
     val contents: IPager<IPlatformVideo>;
 
-    fun toPlaylist(onProgress: ((progress: Int) -> Unit)? = null): Playlist;
+    fun toPlaylist(): Playlist;
 }

app/src/main/java/com/futo/platformplayer/api/media/models/post/TextType.kt

@@ -10,7 +10,7 @@ enum class TextType(val value: Int) {
     companion object {
         fun fromInt(value: Int): TextType
         {
-            val result = TextType.entries.firstOrNull { it.value == value };
+            val result = TextType.values().firstOrNull { it.value == value };
             if(result == null)
                 throw IllegalArgumentException("Unknown Texttype: $value");
             return result;

app/src/main/java/com/futo/platformplayer/api/media/models/ratings/RatingType.kt

@@ -8,7 +8,7 @@ enum class RatingType(val value : Int) {
 
     companion object{
         fun fromInt(value : Int) : RatingType{
-            return RatingType.entries.first { it.value == value };
+            return RatingType.values().first { it.value == value };
         }
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/IAudioUrlWidevineSource.kt

@@ -1,6 +0,0 @@
-package com.futo.platformplayer.api.media.models.streams.sources
-
-interface IAudioUrlWidevineSource : IAudioUrlSource {
-    val bearerToken: String
-    val licenseUri: String
-}

app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideoDetails.kt

@@ -7,7 +7,6 @@ import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.Thumbnails
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
 import com.futo.platformplayer.api.media.models.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.models.streams.sources.*
@@ -57,7 +56,6 @@ open class SerializedPlatformVideoDetails(
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? = null;
     override fun getPlaybackTracker(): IPlaybackTracker? = null;
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? = null;
 
     companion object {
         fun fromVideo(video : IPlatformVideoDetails, subtitleSources: List<SubtitleRawSource>) : SerializedPlatformVideoDetails {

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

@@ -8,8 +8,6 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDeveloper
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import java.util.UUID
 
 class DevJSClient : JSClient {
@@ -54,8 +52,8 @@ class DevJSClient : JSClient {
         return DevJSClient(context, config, _devScript, _auth, _captcha, devID, descriptor.settings);
     }
 
-    override fun getCopy(privateCopy: Boolean): JSClient {
-        return DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, saveState(), devID);
+    override fun getCopy(): JSClient {
+        return DevJSClient(_context, descriptor, _script, _auth, _captcha, saveState(), devID);
     }
 
     override fun initialize() {
@@ -117,7 +115,7 @@ class DevJSClient : JSClient {
 
     //Video
     override fun isContentDetailsUrl(url: String): Boolean {
-        return StateDeveloper.instance.handleDevCall(devID, "isVideoDetailsUrl(${Json.encodeToString(url)})"){
+        return StateDeveloper.instance.handleDevCall(devID, "isVideoDetailsUrl"){
             super.isContentDetailsUrl(url);
         };
     }

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

@@ -20,7 +20,6 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylist
 import com.futo.platformplayer.api.media.models.playlists.IPlatformPlaylistDetails
 import com.futo.platformplayer.api.media.platforms.js.internal.JSCallDocs
 import com.futo.platformplayer.api.media.platforms.js.internal.JSDocs
@@ -28,7 +27,6 @@ import com.futo.platformplayer.api.media.platforms.js.internal.JSDocsParameter
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.api.media.platforms.js.internal.JSOptional
 import com.futo.platformplayer.api.media.platforms.js.internal.JSParameterDocs
-import com.futo.platformplayer.api.media.platforms.js.models.IJSContent
 import com.futo.platformplayer.api.media.platforms.js.models.IJSContentDetails
 import com.futo.platformplayer.api.media.platforms.js.models.JSChannel
 import com.futo.platformplayer.api.media.platforms.js.models.JSChannelPager
@@ -40,7 +38,6 @@ import com.futo.platformplayer.api.media.platforms.js.models.JSLiveChatWindowDes
 import com.futo.platformplayer.api.media.platforms.js.models.JSLiveEventPager
 import com.futo.platformplayer.api.media.platforms.js.models.JSPlaybackTracker
 import com.futo.platformplayer.api.media.platforms.js.models.JSPlaylistDetails
-import com.futo.platformplayer.api.media.platforms.js.models.JSPlaylistPager
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event1
@@ -48,7 +45,6 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.PluginEngineException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
-import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
 import com.futo.platformplayer.logging.Logger
@@ -60,10 +56,8 @@ import com.futo.platformplayer.states.StatePlugins
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
-import kotlin.Exception
 import kotlin.reflect.full.findAnnotations
 import kotlin.reflect.jvm.kotlinFunction
-import kotlin.streams.asSequence
 
 open class JSClient : IPlatformClient {
     val config: SourcePluginConfig;
@@ -79,7 +73,6 @@ open class JSClient : IPlatformClient {
     private var _searchCapabilities: ResultCapabilities? = null;
     private var _searchChannelContentsCapabilities: ResultCapabilities? = null;
     private var _channelCapabilities: ResultCapabilities? = null;
-    private var _peekChannelTypes: List<String>? = null;
 
     protected val _script: String;
 
@@ -98,11 +91,7 @@ open class JSClient : IPlatformClient {
 
     private val _busyLock = Object();
     private var _busyCounter = 0;
-    private var _busyAction = "";
     val isBusy: Boolean get() = _busyCounter > 0;
-    val isBusyAction: String get() {
-        return _busyAction;
-    }
 
     val settings: HashMap<String, String?> get() = descriptor.settings;
 
@@ -161,19 +150,14 @@ open class JSClient : IPlatformClient {
             if(it is ScriptCaptchaRequiredException)
                 onCaptchaException.emit(this, it);
         };
-
-        _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
     }
-    constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String, withoutCredentials: Boolean = false) {
+    constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String) {
         this._context = context;
         this.config = descriptor.config;
         icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
-        if(!withoutCredentials)
-            _auth = descriptor.getAuth();
-        else
-            _auth = null;
+        _auth = descriptor.getAuth();
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
@@ -189,12 +173,10 @@ open class JSClient : IPlatformClient {
             if(it is ScriptCaptchaRequiredException)
                 onCaptchaException.emit(this, it);
         };
-
-        _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
     }
 
-    open fun getCopy(withoutCredentials: Boolean = false): JSClient {
-        return JSClient(_context, descriptor, saveState(), _script, withoutCredentials);
+    open fun getCopy(): JSClient {
+        return JSClient(_context, descriptor, saveState(), _script);
     }
 
     fun getUnderlyingPlugin(): V8Plugin {
@@ -232,13 +214,9 @@ open class JSClient : IPlatformClient {
             hasGetChannelTemplateByClaimMap = plugin.executeBoolean("!!source.getChannelTemplateByClaimMap") ?: false,
             hasGetSearchCapabilities = plugin.executeBoolean("!!source.getSearchCapabilities") ?: false,
             hasGetChannelCapabilities = plugin.executeBoolean("!!source.getChannelCapabilities") ?: false,
-            hasGetSearchChannelContentsCapabilities = plugin.executeBoolean("!!source.getSearchChannelContentsCapabilities") ?: false,
             hasGetLiveEvents = plugin.executeBoolean("!!source.getLiveEvents") ?: false,
             hasGetLiveChatWindow = plugin.executeBoolean("!!source.getLiveChatWindow") ?: false,
             hasGetContentChapters = plugin.executeBoolean("!!source.getContentChapters") ?: false,
-            hasPeekChannelContents = plugin.executeBoolean("!!source.peekChannelContents") ?: false,
-            hasGetChannelPlaylists = plugin.executeBoolean("!!source.getChannelPlaylists") ?: false,
-            hasGetContentRecommendations = plugin.executeBoolean("!!source.getContentRecommendations") ?: false
         );
 
         try {
@@ -282,7 +260,7 @@ open class JSClient : IPlatformClient {
     }
 
     @JSDocs(2, "source.getHome()", "Gets the HomeFeed of the platform")
-    override fun getHome(): IPager<IPlatformContent> = isBusyWith("getHome") {
+    override fun getHome(): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.getHome()"));
@@ -290,7 +268,7 @@ open class JSClient : IPlatformClient {
 
     @JSDocs(3, "source.searchSuggestions(query)", "Gets search suggestions for a given query")
     @JSDocsParameter("query", "Query to complete suggestions for")
-    override fun searchSuggestions(query: String): Array<String> = isBusyWith("searchSuggestions") {
+    override fun searchSuggestions(query: String): Array<String> = isBusyWith {
         ensureEnabled();
         return@isBusyWith plugin.executeTyped<V8ValueArray>("source.searchSuggestions(${Json.encodeToString(query)})")
             .toArray()
@@ -320,7 +298,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("order", "(optional) Order in which contents should be returned")
     @JSDocsParameter("filters", "(optional) Filters to apply on contents")
     @JSDocsParameter("channelId", "(optional) Channel id to search in")
-    override fun search(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith("search") {
+    override fun search(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.search(${Json.encodeToString(query)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
@@ -328,9 +306,6 @@ open class JSClient : IPlatformClient {
 
     @JSDocs(4, "source.getSearchChannelContentsCapabilities()", "Gets capabilities this plugin has for search videos")
     override fun getSearchChannelContentsCapabilities(): ResultCapabilities {
-        if(!capabilities.hasGetSearchChannelContentsCapabilities)
-            return ResultCapabilities(listOf(ResultCapabilities.TYPE_MIXED));
-
         ensureEnabled();
         if (_searchChannelContentsCapabilities != null)
             return _searchChannelContentsCapabilities!!;
@@ -344,7 +319,7 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("type", "(optional) Type of contents to get from search ")
     @JSDocsParameter("order", "(optional) Order in which contents should be returned")
     @JSDocsParameter("filters", "(optional) Filters to apply on contents")
-    override fun searchChannelContents(channelUrl: String, query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith("searchChannelContents") {
+    override fun searchChannelContents(channelUrl: String, query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
         if(!capabilities.hasSearchChannelContents)
             throw IllegalStateException("This plugin does not support channel search");
@@ -356,7 +331,7 @@ open class JSClient : IPlatformClient {
     @JSOptional
     @JSDocs(5, "source.searchChannels(query)",  "Searches for channels on the platform")
     @JSDocsParameter("query", "Query that channels should match")
-    override fun searchChannels(query: String): IPager<PlatformAuthorLink> = isBusyWith("searchChannels") {
+    override fun searchChannels(query: String): IPager<PlatformAuthorLink> = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSChannelPager(config, this,
             plugin.executeTyped("source.searchChannels(${Json.encodeToString(query)})"));
@@ -376,7 +351,7 @@ open class JSClient : IPlatformClient {
     }
     @JSDocs(7, "source.getChannel(channelUrl)", "Gets a channel by its url")
     @JSDocsParameter("channelUrl", "A channel url (this platform)")
-    override fun getChannel(channelUrl: String): IPlatformChannel = isBusyWith("getChannel") {
+    override fun getChannel(channelUrl: String): IPlatformChannel = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSChannel(config,
             plugin.executeTyped("source.getChannel(${Json.encodeToString(channelUrl)})"));
@@ -403,57 +378,12 @@ open class JSClient : IPlatformClient {
     @JSDocsParameter("type", "(optional) Type of contents to get from channel")
     @JSDocsParameter("order", "(optional) Order in which contents should be returned")
     @JSDocsParameter("filters", "(optional) Filters to apply on contents")
-    override fun getChannelContents(channelUrl: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith("getChannelContents") {
+    override fun getChannelContents(channelUrl: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSContentPager(config, this,
             plugin.executeTyped("source.getChannelContents(${Json.encodeToString(channelUrl)}, ${Json.encodeToString(type)}, ${Json.encodeToString(order)}, ${Json.encodeToString(filters)})"));
     }
 
-    @JSDocs(10, "source.getChannelPlaylists(url)", "Gets playlists of a channel")
-    @JSDocsParameter("channelUrl", "A channel url (this platform)")
-    override fun getChannelPlaylists(channelUrl: String): IPager<IPlatformPlaylist> = isBusyWith("getChannelPlaylists") {
-        ensureEnabled();
-        if(!capabilities.hasGetChannelPlaylists)
-            return@isBusyWith EmptyPager();
-        return@isBusyWith JSPlaylistPager(config, this,
-            plugin.executeTyped("source.getChannelPlaylists(${Json.encodeToString(channelUrl)})"));
-    }
-
-    @JSDocs(10, "source.getPeekChannelTypes()", "Gets types this plugin has for peek channel contents")
-    override fun getPeekChannelTypes(): List<String> {
-        if(!capabilities.hasPeekChannelContents)
-            return listOf();
-        try {
-            if (_peekChannelTypes != null) {
-                return _peekChannelTypes!!;
-            }
-            val arr: V8ValueArray = plugin.executeTyped("source.getPeekChannelTypes()");
-
-            _peekChannelTypes = arr.keys.mapNotNull {
-                val str = arr.get<V8ValueString>(it);
-                return@mapNotNull str.value;
-            };
-            return _peekChannelTypes ?: listOf();
-        }
-        catch(ex: Throwable) {
-            announcePluginUnhandledException("getPeekChannelTypes", ex);
-            return listOf();
-        }
-    }
-
-    @JSDocs(10, "source.peekChannelContents(url, type)", "Peek contents of a channel (reverse chronological order)")
-    @JSDocsParameter("channelUrl", "A channel url (this platform)")
-    @JSDocsParameter("type", "(optional) Type of contents to get from channel")
-    override fun peekChannelContents(channelUrl: String, type: String?): List<IPlatformContent> = isBusyWith("peekChannelContents") {
-        ensureEnabled();
-
-        val items: V8ValueArray = plugin.executeTyped("source.peekChannelContents(${Json.encodeToString(channelUrl)}, ${Json.encodeToString(type)})");
-        return@isBusyWith items.keys.mapNotNull {
-            val obj = items.get<V8ValueObject>(it);
-            return@mapNotNull IJSContent.fromV8(this, obj);
-        };
-    }
-
     @JSOptional
     @JSDocs(11, "source.getChannelUrlByClaim(claimType, claimValues)", "Gets the channel url that should be used to fetch a given polycentric claim")
     @JSDocsParameter("claimType", "Polycentric claimtype id")
@@ -514,7 +444,7 @@ open class JSClient : IPlatformClient {
     }
     @JSDocs(14, "source.getContentDetails(url)", "Gets content details by its url")
     @JSDocsParameter("url", "A content url (this platform)")
-    override fun getContentDetails(url: String): IPlatformContentDetails = isBusyWith("getContentDetails") {
+    override fun getContentDetails(url: String): IPlatformContentDetails = isBusyWith {
         ensureEnabled();
         return@isBusyWith IJSContentDetails.fromV8(this,
             plugin.executeTyped("source.getContentDetails(${Json.encodeToString(url)})"));
@@ -523,7 +453,7 @@ open class JSClient : IPlatformClient {
     @JSOptional //getContentChapters = function(url, initialData)
     @JSDocs(15, "source.getContentChapters(url)", "Gets chapters for content details")
     @JSDocsParameter("url", "A content url (this platform)")
-    override fun getContentChapters(url: String): List<IChapter> = isBusyWith("getContentChapters") {
+    override fun getContentChapters(url: String): List<IChapter> = isBusyWith {
         if(!capabilities.hasGetContentChapters)
             return@isBusyWith listOf();
         ensureEnabled();
@@ -534,7 +464,7 @@ open class JSClient : IPlatformClient {
     @JSOptional
     @JSDocs(15, "source.getPlaybackTracker(url)", "Gets a playback tracker for given content url")
     @JSDocsParameter("url", "A content url (this platform)")
-    override fun getPlaybackTracker(url: String): IPlaybackTracker? = isBusyWith("getPlaybackTracker") {
+    override fun getPlaybackTracker(url: String): IPlaybackTracker? = isBusyWith {
         if(!capabilities.hasGetPlaybackTracker)
             return@isBusyWith null;
         ensureEnabled();
@@ -548,7 +478,7 @@ open class JSClient : IPlatformClient {
 
     @JSDocs(16, "source.getComments(url)", "Gets comments for a content by its url")
     @JSDocsParameter("url", "A content url (this platform)")
-    override fun getComments(url: String): IPager<IPlatformComment> = isBusyWith("getComments") {
+    override fun getComments(url: String): IPager<IPlatformComment> = isBusyWith {
         ensureEnabled();
         val pager = plugin.executeTyped<V8Value>("source.getComments(${Json.encodeToString(url)})");
         if (pager !is V8ValueObject) { //TODO: Maybe solve this better
@@ -564,45 +494,31 @@ open class JSClient : IPlatformClient {
                 plugin.executeTyped("source.getSubComments(${Json.encodeToString(comment as JSComment)})"));
     }
 
-    @JSDocs(18, "source.getLiveChatWindow(url)", "Gets live events for a livestream")
+    @JSDocs(16, "source.getLiveChatWindow(url)", "Gets live events for a livestream")
     @JSDocsParameter("url", "Url of live stream")
-    override fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor? = isBusyWith("getLiveChatWindow") {
+    override fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor? = isBusyWith {
         if(!capabilities.hasGetLiveChatWindow)
             return@isBusyWith null;
         ensureEnabled();
         return@isBusyWith JSLiveChatWindowDescriptor(config,
             plugin.executeTyped("source.getLiveChatWindow(${Json.encodeToString(url)})"));
     }
-    @JSDocs(19, "source.getLiveEvents(url)", "Gets live events for a livestream")
+    @JSDocs(16, "source.getLiveEvents(url)", "Gets live events for a livestream")
     @JSDocsParameter("url", "Url of live stream")
-    override fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>? = isBusyWith("getLiveEvents") {
+    override fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>? = isBusyWith {
         if(!capabilities.hasGetLiveEvents)
             return@isBusyWith null;
         ensureEnabled();
         return@isBusyWith JSLiveEventPager(config, this,
             plugin.executeTyped("source.getLiveEvents(${Json.encodeToString(url)})"));
     }
-
-
-    @JSDocs(19, "source.getContentRecommendations(url)", "Gets recommendations of a content page")
-    @JSDocsParameter("url", "Url of content")
-    override fun getContentRecommendations(url: String): IPager<IPlatformContent>? = isBusyWith("getContentRecommendations") {
-        if(!capabilities.hasGetContentRecommendations)
-            return@isBusyWith null;
-        ensureEnabled();
-        return@isBusyWith JSContentPager(config, this,
-            plugin.executeTyped("source.getContentRecommendations(${Json.encodeToString(url)})"));
-    }
-
-
-
     @JSDocs(19, "source.searchPlaylists(query)", "Searches for playlists on the platform")
     @JSDocsParameter("query", "Query that search results should match")
     @JSDocsParameter("type", "(optional) Type of contents to get from search ")
     @JSDocsParameter("order", "(optional) Order in which contents should be returned")
     @JSDocsParameter("filters", "(optional) Filters to apply on contents")
     @JSDocsParameter("channelId", "(optional) Channel id to search in")
-    override fun searchPlaylists(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith("searchPlaylists") {
+    override fun searchPlaylists(query: String, type: String?, order: String?, filters: Map<String, List<String>>?): IPager<IPlatformContent> = isBusyWith {
         ensureEnabled();
         if(!capabilities.hasSearchPlaylists)
             throw IllegalStateException("This plugin does not support playlist search");
@@ -612,22 +528,15 @@ open class JSClient : IPlatformClient {
     @JSDocs(20, "source.isPlaylistUrl(url)", "Validates if a playlist url is for this platform")
     @JSDocsParameter("url", "Url of playlist")
     override fun isPlaylistUrl(url: String): Boolean {
+        ensureEnabled();
         if (!capabilities.hasGetPlaylist)
             return false;
-
-        try {
-            return plugin.executeTyped<V8ValueBoolean>("source.isPlaylistUrl(${Json.encodeToString(url)})")
-                .value;
-        }
-        catch(ex: Throwable) {
-            announcePluginUnhandledException("isPlaylistUrl", ex);
-            return false;
-        }
+        return plugin.executeBoolean("source.isPlaylistUrl(${Json.encodeToString(url)})") ?: false;
     }
     @JSOptional
     @JSDocs(21, "source.getPlaylist(url)", "Gets the playlist of the current user")
     @JSDocsParameter("url", "Url of playlist")
-    override fun getPlaylist(url: String): IPlatformPlaylistDetails = isBusyWith("getPlaylist") {
+    override fun getPlaylist(url: String): IPlatformPlaylistDetails = isBusyWith {
         ensureEnabled();
         return@isBusyWith JSPlaylistDetails(this, plugin.config as SourcePluginConfig, plugin.executeTyped("source.getPlaylist(${Json.encodeToString(url)})"));
     }
@@ -724,24 +633,19 @@ open class JSClient : IPlatformClient {
     }
 
 
-    private fun <T> isBusyWith(actionName: String, handle: ()->T): T {
+    private fun <T> isBusyWith(handle: ()->T): T {
         try {
             synchronized(_busyLock) {
                 _busyCounter++;
             }
-            _busyAction = actionName;
             return handle();
         }
         finally {
-            _busyAction = "";
             synchronized(_busyLock) {
                 _busyCounter--;
             }
         }
     }
-    private fun <T> isBusyWith(handle: ()->T): T {
-        return isBusyWith("Unknown", handle);
-    }
 
     private fun announcePluginUnhandledException(method: String, ex: Throwable) {
         if(ex is PluginEngineException)
@@ -758,43 +662,10 @@ open class JSClient : IPlatformClient {
 
     companion object {
         val TAG = "JSClient";
-        private val _lock = Object();
-        private var _docs: Map<String, String>? = null;
-
-        fun getMethodDocs(names: List<String>): Map<String, String>? {
-            synchronized(_lock) {
-                if(_docs == null) {
-                    val client = ManagedHttpClient();
-                    val docs = names
-                        .map { stringWithoutBrackets(it) }
-                        .distinct()
-                        .parallelStream()
-                        .map {
-                            val url = "https://github.com/futo-org/grayjay-android/blob/master/docs/source/${it}.md";
-                            val resp = client.head(url);
-                            if(resp.isOk)
-                                return@map Pair(it, url);
-                            else
-                                return@map null;
-                        }.asSequence()
-                        .filterNotNull()
-                        .toMap();
-                    _docs = docs;
-                }
-                return _docs;
-            }
-        }
-        fun getMethodDocUrls(): Map<String, String>? {
-            if(_docs != null)
-                return _docs;
-            val methods = JSClient::class.java.declaredMethods.filter { it.getAnnotation(JSDocs::class.java) != null }
-            return getMethodDocs(methods.map { it.name });
-        }
 
         fun getJSDocs(): List<JSCallDocs> {
             val docs = mutableListOf<JSCallDocs>();
             val methods = JSClient::class.java.declaredMethods.filter { it.getAnnotation(JSDocs::class.java) != null }
-
             for(method in methods.sortedBy { it.getAnnotation(JSDocs::class.java)?.order }) {
                 val doc = method.getAnnotation(JSDocs::class.java);
                 val parameters = method.kotlinFunction!!.findAnnotations<JSDocsParameter>();
@@ -807,12 +678,5 @@ open class JSClient : IPlatformClient {
             }
             return docs;
         }
-
-        private fun stringWithoutBrackets(name: String): String {
-            val index = name.indexOf('(');
-            if(index >= 0)
-                return name.substring(0, index);
-            return name;
-        }
     }
 }

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

@@ -1,7 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js
-
-class JSClientConstants {
-    companion object {
-        val PLUGIN_SPEC_VERSION = 2;
-    }
-}

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

@@ -11,5 +11,4 @@ class SourcePluginAuthConfig(
     val userAgent: String? = null,
     val loginButton: String? = null,
     val domainHeadersToFind: Map<String, List<String>>? = null,
-    val loginWarning: String? = null
 ) { }

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

@@ -4,9 +4,7 @@ import android.net.Uri
 import com.futo.platformplayer.SignatureProvider
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.engine.IV8PluginConfig
-import com.futo.platformplayer.matchesDomain
 import com.futo.platformplayer.states.StatePlugins
-import kotlinx.serialization.Contextual
 import java.net.URL
 import java.util.UUID
 
@@ -47,10 +45,7 @@ class SourcePluginConfig(
     var enableInSearch: Boolean = true,
     var enableInHome: Boolean = true,
     var supportedClaimTypes: List<Int> = listOf(),
-    var primaryClaimFieldType: Int? = null,
-    var developerSubmitUrl: String? = null,
-    var allowAllHttpHeaderAccess: Boolean = false,
-    var maxDownloadParallelism: Int = 0
+    var primaryClaimFieldType: Int? = null
 ) : IV8PluginConfig {
 
     val absoluteIconUrl: String? get() = resolveAbsoluteUrl(iconUrl, sourceUrl);
@@ -80,49 +75,10 @@ class SourcePluginConfig(
     private var _allowUrlsLowerVal: List<String>? = null;
     private val _allowUrlsLower: List<String> get() {
         if(_allowUrlsLowerVal == null)
-            _allowUrlsLowerVal = allowUrls.map { it.lowercase() }
-                .filter { it.length > 0 };
+            _allowUrlsLowerVal = allowUrls.map { it.lowercase() };
         return _allowUrlsLowerVal!!;
     };
 
-    fun isLowRiskUpdate(oldScript: String, newConfig: SourcePluginConfig, newScript: String): Boolean{
-        //New allow header access
-        if(!allowAllHttpHeaderAccess && newConfig.allowAllHttpHeaderAccess)
-            return false;
-
-        //All urls should already be allowed
-        for(url in newConfig.allowUrls) {
-            if(!allowUrls.contains(url))
-                return false;
-        }
-        //All packages should already be allowed
-        for(pack in newConfig.packages) {
-            if(!packages.contains(pack))
-                return false;
-        }
-        //Developer Submit Url should be same or empty
-        if(!newConfig.developerSubmitUrl.isNullOrEmpty() && developerSubmitUrl != newConfig.developerSubmitUrl)
-            return false;
-
-        //Should have a public key
-        if(scriptPublicKey.isNullOrEmpty() || scriptSignature.isNullOrEmpty())
-            return false;
-
-        //Should be same public key
-        if(scriptPublicKey != newConfig.scriptPublicKey)
-            return false;
-
-        //Old signature should be valid
-        if(!validate(oldScript))
-            return false;
-
-        //New signature should be valid
-        if(!newConfig.validate(newScript))
-            return false;
-
-        return true;
-    }
-
     fun getWarnings(scriptToCheck: String? = null) : List<Pair<String,String>> {
         val list = mutableListOf<Pair<String,String>>();
 
@@ -151,11 +107,6 @@ class SourcePluginConfig(
             list.add(Pair(
                 "Unrestricted Web Access",
                 "This plugin requires access to all URLs, this may include malicious URLs."));
-        if(allowAllHttpHeaderAccess)
-            list.add(Pair(
-                "Unrestricted Http Header access",
-                "Allows this plugin to access all headers (including cookies and authorization headers) for unauthenticated requests."
-            ))
 
         return list;
     }
@@ -174,7 +125,7 @@ class SourcePluginConfig(
             return true;
         val uri = Uri.parse(url);
         val host = uri.host?.lowercase() ?: "";
-        return _allowUrlsLower.any { it == host || (it.length > 0 && it[0] == '.' && host.matchesDomain(it)) };
+        return _allowUrlsLower.any { it == host };
     }
 
     companion object {

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

@@ -2,13 +2,9 @@ package com.futo.platformplayer.api.media.platforms.js
 
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event0
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.AnnouncementType
-import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.views.fields.DropdownFieldOptions
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
-import com.futo.platformplayer.views.fields.FormFieldWarning
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -59,16 +55,7 @@ class SourcePluginDescriptor {
         onCaptchaChanged.emit();
     }
     fun getCaptchaData(): SourceCaptchaData? {
-        try {
-            return SourceCaptchaData.fromEncrypted(captchaEncrypted);
-        }
-        catch(ex: Throwable) {
-            Logger.e("SourcePluginDescriptor", "Captcha decode failed, disabling auth.", ex);
-            StateAnnouncement.instance.registerAnnouncement("CAP_BROKEN_" + config.id,
-                "Captcha corrupted for plugin [${config.name}]",
-                "Something went wrong in the stored captcha, you'll have to login again", AnnouncementType.SESSION);
-            return null;
-        }
+        return SourceCaptchaData.fromEncrypted(captchaEncrypted);
     }
 
     fun updateAuth(str: SourceAuth?) {
@@ -76,26 +63,12 @@ class SourcePluginDescriptor {
         onAuthChanged.emit();
     }
     fun getAuth(): SourceAuth? {
-        try {
-            return SourceAuth.fromEncrypted(authEncrypted);
-        }
-        catch(ex: Throwable) {
-            Logger.e("SourcePluginDescriptor", "Authentication decode failed, disabling auth.", ex);
-            StateAnnouncement.instance.registerAnnouncement("AUTH_BROKEN_" + config.id,
-                "Authentication corrupted for plugin [${config.name}]",
-                "Something went wrong in the stored authentication, you'll have to login again", AnnouncementType.SESSION);
-            return null;
-        }
+        return SourceAuth.fromEncrypted(authEncrypted);
     }
 
     @Serializable
     class AppPluginSettings {
 
-        @FormField(R.string.check_for_updates_setting, FieldForm.TOGGLE, R.string.check_for_updates_setting_description, -1)
-        var checkForUpdates: Boolean = true;
-        @FormField(R.string.automatic_update_setting, FieldForm.TOGGLE, R.string.automatic_update_setting_description, 0)
-        var automaticUpdate: Boolean = false;
-
         @FormField(R.string.visibility, "group", R.string.enable_where_this_plugins_content_are_visible, 2)
         var tabEnabled = TabEnabled();
         @Serializable
@@ -133,11 +106,6 @@ class SourcePluginDescriptor {
         }
 
 
-
-        @FormField(R.string.allow_developer_submit, FieldForm.TOGGLE, R.string.allow_developer_submit_description, 1, "devSubmit")
-        var allowDeveloperSubmit: Boolean = false;
-
-
         fun loadDefaults(config: SourcePluginConfig) {
             if(tabEnabled.enableHome == null)
                 tabEnabled.enableHome = config.enableInHome

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSDocs.kt

@@ -14,6 +14,6 @@ annotation class JSOptional()
 annotation class JSDocsParameter(val name: String, val description: String, val order: Int = 0)
 
 @kotlinx.serialization.Serializable
-data class JSCallDocs(val title: String, val code: String, val description: String, val parameters: List<JSParameterDocs>, val isOptional: Boolean = false, val docsUrl: String? = null);
+data class JSCallDocs(val title: String, val code: String, val description: String, val parameters: List<JSParameterDocs>, val isOptional: Boolean = false);
 @kotlinx.serialization.Serializable
 data class JSParameterDocs(val name: String, val description: String);

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt

@@ -2,22 +2,14 @@ package com.futo.platformplayer.api.media.platforms.js.internal
 
 import android.net.Uri
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequest
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier
-import com.futo.platformplayer.developer.DeveloperEndpoints
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.matchesDomain
-import com.futo.platformplayer.states.StateDeveloper
-import com.google.common.net.MediaType
-import okhttp3.OkHttpClient
-import okio.GzipSource
-import java.net.InetSocketAddress
-import java.net.Proxy
 import java.util.UUID
 
 class JSHttpClient : ManagedHttpClient {
@@ -36,15 +28,7 @@ class JSHttpClient : ManagedHttpClient {
     private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
     private var _otherCookieMap: HashMap<String, HashMap<String, String>>;
 
-    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super(
-            //Temporary ugly solution for DevPortal proxy support
-            (if(jsClient?.config?.id == StateDeveloper.DEV_ID && StateDeveloper.instance.devProxy != null)
-                OkHttpClient.Builder().proxy(Proxy(Proxy.Type.HTTP,
-                    InetSocketAddress(StateDeveloper.instance.devProxy!!.url, StateDeveloper.instance.devProxy!!.port)
-                ))
-            else
-                OkHttpClient.Builder())
-        ) {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super() {
         _jsClient = jsClient;
         _jsConfig = config;
         _auth = auth;
@@ -217,16 +201,6 @@ class JSHttpClient : ManagedHttpClient {
                 }
             }
         }
-
-        if(_jsClient is DevJSClient) {
-            //val peekBody = resp.peekBody(1000 * 1000).string();
-            StateDeveloper.instance.addDevHttpExchange(
-                StateDeveloper.DevHttpExchange(
-                    StateDeveloper.DevHttpRequest(resp.request.method, resp.request.url.toString(), mapOf(*resp.request.headers.map { Pair(it.first, it.second) }.toTypedArray()), ""),
-                    StateDeveloper.DevHttpRequest("RESP", resp.request.url.toString(), mapOf(*resp.headers.map { Pair(it.first, it.second) }.toTypedArray()), "", resp.code)
-                ));
-        }
-
         return resp;
     }
 

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

@@ -16,7 +16,6 @@ interface IJSContentDetails: IPlatformContent  {
             return when(ContentType.fromInt(type)) {
                 ContentType.MEDIA -> JSVideoDetails(plugin, obj);
                 ContentType.POST -> JSPostDetails(plugin.config, obj);
-                ContentType.ARTICLE -> JSArticleDetails(plugin, obj);
                 else -> throw NotImplementedError("Unknown content type ${type}");
             }
         }

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

@@ -1,162 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.IPlatformClient
-import com.futo.platformplayer.api.media.IPluginSourced
-import com.futo.platformplayer.api.media.models.Thumbnails
-import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.ContentType
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
-import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
-import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
-import com.futo.platformplayer.api.media.models.post.TextType
-import com.futo.platformplayer.api.media.models.ratings.IRating
-import com.futo.platformplayer.api.media.models.ratings.RatingLikes
-import com.futo.platformplayer.api.media.platforms.js.DevJSClient
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.getOrDefault
-import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.getOrThrowNullableList
-import com.futo.platformplayer.states.StateDeveloper
-
-open class JSArticleDetails : JSContent, IPluginSourced, IPlatformContentDetails {
-    final override val contentType: ContentType get() = ContentType.ARTICLE;
-
-    private val _hasGetComments: Boolean;
-    private val _hasGetContentRecommendations: Boolean;
-
-    val rating: IRating;
-
-    val summary: String;
-    val thumbnails: Thumbnails?;
-    val segments: List<IJSArticleSegment>;
-
-    constructor(client: JSClient, obj: V8ValueObject): super(client.config, obj) {
-        val contextName = "PlatformPost";
-
-        rating = obj.getOrDefault<V8ValueObject>(client.config, "rating", contextName, null)?.let { IRating.fromV8(client.config, it, contextName) } ?: RatingLikes(0);
-        summary = _content.getOrThrow(client.config, "summary", contextName);
-        if(_content.has("thumbnails"))
-            thumbnails = Thumbnails.fromV8(client.config, _content.getOrThrow(client.config, "thumbnails", contextName));
-        else
-            thumbnails = null;
-
-
-        segments = (obj.getOrThrowNullableList<V8ValueObject>(client.config, "segments", contextName)
-            ?.map { fromV8Segment(client, it) }
-            ?.filterNotNull() ?: listOf());
-
-        _hasGetComments = _content.has("getComments");
-        _hasGetContentRecommendations = _content.has("getContentRecommendations");
-    }
-
-    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
-        if(!_hasGetComments || _content.isClosed)
-            return null;
-
-        if(client is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(client.devID, "videoDetail.getComments()") {
-                return@handleDevCall getCommentsJS(client);
-            }
-        else if(client is JSClient)
-            return getCommentsJS(client);
-
-        return null;
-    }
-
-    override fun getPlaybackTracker(): IPlaybackTracker? = null;
-
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
-            return  null;
-
-        if(client is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(client.devID, "postDetail.getContentRecommendations()") {
-                return@handleDevCall getContentRecommendationsJS(client);
-            }
-        else if(client is JSClient)
-            return getContentRecommendationsJS(client);
-
-        return null;
-    }
-
-    private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
-    }
-
-    private fun getCommentsJS(client: JSClient): JSCommentPager {
-        val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
-        return JSCommentPager(_pluginConfig, client, commentPager);
-    }
-
-    companion object {
-        fun fromV8Segment(client: JSClient, obj: V8ValueObject): IJSArticleSegment? {
-            if(!obj.has("type"))
-                throw IllegalArgumentException("Object missing type field");
-            return when(SegmentType.fromInt(obj.getOrThrow(client.config, "type", "JSArticle.Segment"))) {
-                SegmentType.TEXT -> JSTextSegment(client, obj);
-                SegmentType.IMAGES -> JSImagesSegment(client, obj);
-                SegmentType.NESTED -> JSNestedSegment(client, obj);
-                else -> null;
-            }
-        }
-    }
-}
-
-enum class SegmentType(val value: Int) {
-    UNKNOWN(0),
-    TEXT(1),
-    IMAGES(2),
-
-    NESTED(9);
-
-
-    companion object {
-        fun fromInt(value: Int): SegmentType
-        {
-            val result = SegmentType.entries.firstOrNull { it.value == value };
-            if(result == null)
-                throw IllegalArgumentException("Unknown Texttype: $value");
-            return result;
-        }
-    }
-}
-
-interface IJSArticleSegment {
-    val type: SegmentType;
-}
-class JSTextSegment: IJSArticleSegment {
-    override val type = SegmentType.TEXT;
-    val textType: TextType;
-    val content: String;
-
-    constructor(client: JSClient, obj: V8ValueObject) {
-        val contextName = "JSTextSegment";
-        textType = TextType.fromInt((obj.getOrDefault<Int>(client.config, "textType", contextName, null) ?: 0));
-        content = obj.getOrDefault(client.config, "content", contextName, "") ?: "";
-    }
-}
-class JSImagesSegment: IJSArticleSegment {
-    override val type = SegmentType.IMAGES;
-    val images: List<String>;
-    val caption: String;
-
-    constructor(client: JSClient, obj: V8ValueObject) {
-        val contextName = "JSTextSegment";
-        images = obj.getOrThrowNullableList<String>(client.config, "images", contextName) ?: listOf();
-        caption = obj.getOrDefault(client.config, "caption", contextName, "") ?: "";
-    }
-}
-class JSNestedSegment: IJSArticleSegment {
-    override val type = SegmentType.NESTED;
-    val nested: IPlatformContent;
-
-    constructor(client: JSClient, obj: V8ValueObject) {
-        val contextName = "JSNestedSegment";
-        val nestedObj = obj.getOrThrow<V8ValueObject>(client.config, "nested", contextName, false);
-        nested = IJSContent.fromV8(client, nestedObj);
-    }
-}

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

@@ -7,7 +7,6 @@ import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrDefaultList
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullable
@@ -38,7 +37,7 @@ class JSChannel : IPlatformChannel {
         description = _channel.getOrThrowNullable(config, "description", contextName);
         url = _channel.getOrThrow(config, "url", contextName);
         urlAlternatives = _channel.getOrDefaultList(config, "urlAlternatives", contextName, listOf()) ?: listOf();
-        links = HashMap(_channel.getOrDefault<Map<String, String>>(config, "links", contextName, mapOf()) ?: mapOf());
+        links = HashMap();
     }
 
     override fun getContents(client: IPlatformClient): IPager<IPlatformContent> {

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

@@ -42,12 +42,7 @@ open class JSContent : IPlatformContent, IPluginSourced {
 
         id = PlatformID.fromV8(_pluginConfig, _content.getOrThrow(config, "id", contextName));
         name = HtmlCompat.fromHtml(_content.getOrThrow<String>(config, "name", contextName).decodeUnicode(), HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
-
-        val authorObj = _content.getOrDefault<V8ValueObject>(config, "author", contextName, null);
-        if(authorObj != null)
-            author = PlatformAuthorLink.fromV8(_pluginConfig, authorObj);
-        else
-            author = PlatformAuthorLink.UNKNOWN;
+        author = PlatformAuthorLink.fromV8(_pluginConfig, _content.getOrThrow(config, "author", contextName));
 
         val datetimeInt = _content.getOrThrow<Int>(config, "datetime", contextName).toLong();
         if(datetimeInt == 0.toLong())
@@ -59,8 +54,4 @@ open class JSContent : IPlatformContent, IPluginSourced {
 
         _hasGetDetails = _content.has("getDetails");
     }
-
-    fun getUnderlyingObject(): V8ValueObject? {
-        return _content;
-    }
 }

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

@@ -14,13 +14,12 @@ import java.time.ZoneOffset
 class JSLiveChatWindowDescriptor: ILiveChatWindowDescriptor {
     override val url: String;
     override val removeElements: List<String>;
-    override val removeElementsInterval: List<String>;
+
 
     constructor(config: SourcePluginConfig, obj: V8ValueObject) {
         val contextName = "LiveChatWindowDescriptor";
 
         url = obj.getOrThrow(config, "url", contextName);
         removeElements = obj.getOrDefault(config, "removeElements", contextName, listOf()) ?: listOf();
-        removeElementsInterval = obj.getOrDefault(config, "removeElementsInterval", contextName, listOf()) ?: listOf();
     }
 }

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

@@ -17,8 +17,6 @@ class JSPlaybackTracker: IPlaybackTracker {
 
     private var _lastRequest: Long = Long.MIN_VALUE;
 
-    private val _hasOnConcluded: Boolean;
-
     override var nextRequest: Int = 1000
         private set;
 
@@ -28,7 +26,6 @@ class JSPlaybackTracker: IPlaybackTracker {
             throw ScriptImplementationException(config, "Missing onProgress on PlaybackTracker");
         if(!obj.has("nextRequest"))
             throw ScriptImplementationException(config, "Missing nextRequest on PlaybackTracker");
-        _hasOnConcluded = obj.has("onConcluded");
 
         this._config = config;
         this._obj = obj;
@@ -62,16 +59,6 @@ class JSPlaybackTracker: IPlaybackTracker {
             }
         }
     }
-    override fun onConcluded() {
-        warnIfMainThread("JSPlaybackTracker.onConcluded");
-        if(_hasOnConcluded) {
-            synchronized(_obj) {
-                Logger.i("JSPlaybackTracker", "onConcluded");
-                _obj.invokeVoid("onConcluded", -1);
-            }
-        }
-    }
-
 
     override fun shouldUpdate(): Boolean = (_lastRequest < 0 || (System.currentTimeMillis() - _lastRequest) > nextRequest);
 }

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

@@ -14,6 +14,6 @@ open class JSPlaylist : JSContent, IPlatformPlaylist {
     constructor(config: SourcePluginConfig, obj: V8ValueObject) : super(config, obj) {
         val contextName = "Playlist";
         thumbnail = obj.getOrDefault(config, "thumbnail", contextName, null);
-        videoCount = obj.getOrDefault(config, "videoCount", contextName, -1)!!;
+        videoCount = obj.getOrDefault(config, "videoCount", contextName, 0)!!;
     }
 }

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

@@ -7,7 +7,7 @@ import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
-import com.futo.platformplayer.api.media.structures.ReusablePager
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.models.Playlist
 
@@ -15,26 +15,22 @@ class JSPlaylistDetails: JSPlaylist, IPlatformPlaylistDetails {
     override val contents: IPager<IPlatformVideo>;
 
     constructor(plugin: JSClient, config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
-        contents = ReusablePager(JSVideoPager(config, plugin, obj.getOrThrow(config, "contents", "PlaylistDetails")));
+        contents = JSVideoPager(config, plugin, obj.getOrThrow(config, "contents", "PlaylistDetails"));
     }
 
-    override fun toPlaylist(onProgress: ((progress: Int) -> Unit)?): Playlist {
-        val playlist = if (contents is ReusablePager) contents.getWindow() else contents;
-        val videos = playlist.getResults().toMutableList();
-        onProgress?.invoke(videos.size);
+    override fun toPlaylist(): Playlist {
+        val videos = contents.getResults().toMutableList();
 
         //Download all pages
         var allowedEmptyCount = 2;
-        while(playlist.hasMorePages()) {
-            playlist.nextPage();
-            if(!videos.addAll(playlist.getResults())) {
+        while(contents.hasMorePages()) {
+            contents.nextPage();
+            if(!videos.addAll(contents.getResults())) {
                 allowedEmptyCount--;
                 if(allowedEmptyCount <= 0)
                     break;
             }
             else allowedEmptyCount = 2;
-
-            onProgress?.invoke(videos.size);
         }
 
         return Playlist(id.toString(), name, videos.map { SerializedPlatformVideo.fromVideo(it)});

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

@@ -3,7 +3,6 @@ package com.futo.platformplayer.api.media.platforms.js.models
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.post.IPlatformPost
 import com.futo.platformplayer.api.media.models.post.IPlatformPostDetails
@@ -19,7 +18,6 @@ import com.futo.platformplayer.states.StateDeveloper
 
 class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
     private val _hasGetComments: Boolean;
-    private val _hasGetContentRecommendations: Boolean;
 
     override val rating: IRating;
 
@@ -36,7 +34,6 @@ class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
         content = obj.getOrDefault(config, "content", contextName, "") ?: "";
 
         _hasGetComments = _content.has("getComments");
-        _hasGetContentRecommendations = _content.has("getContentRecommendations");
     }
 
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
@@ -54,27 +51,9 @@ class JSPostDetails : JSPost, IPlatformPost, IPlatformPostDetails {
     }
     override fun getPlaybackTracker(): IPlaybackTracker? = null;
 
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
-            return  null;
-
-        if(client is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(client.devID, "postDetail.getContentRecommendations()") {
-                return@handleDevCall getContentRecommendationsJS(client);
-            }
-        else if(client is JSClient)
-            return getContentRecommendationsJS(client);
-
-        return null;
-    }
-    private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
-    }
 
     private fun getCommentsJS(client: JSClient): JSCommentPager {
         val commentPager = _content.invoke<V8ValueObject>("getComments", arrayOf<Any>());
         return JSCommentPager(_pluginConfig, client, commentPager);
     }
-
 }

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

@@ -23,31 +23,21 @@ class JSRequest : IRequest {
         _v8Options = options;
         initialize(plugin, originalUrl, originalHeaders);
     }
-    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>?) {
         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);
         _v8Options = obj.getOrDefault<V8ValueObject>(config, "options", "JSRequestModifier.options", null)?.let {
-            Options(config, it, applyOtherHeadersByDefault);
-        } ?: Options(null, null, applyOtherHeadersByDefault);
+            Options(config, it);
+        }
         initialize(plugin, originalUrl, originalHeaders);
     }
 
     private fun initialize(plugin: JSClient, originalUrl: String?, originalHeaders: Map<String, String>?) {
         val config = plugin.config;
         url = _v8Url ?: originalUrl;
-
-        if(_v8Options?.applyOtherHeaders ?: false) {
-            val headersToSet = _v8Headers?.toMutableMap() ?: mutableMapOf();
-            if (originalHeaders != null)
-                for (head in originalHeaders)
-                    if (!headersToSet.containsKey(head.key))
-                        headersToSet[head.key] = head.value;
-            headers = headersToSet;
-        }
-        else
-            headers = _v8Headers ?: originalHeaders ?: mapOf();
+        headers = _v8Headers ?: originalHeaders ?: mapOf();
 
         if(_v8Options != null) {
             if(_v8Options.applyCookieClient != null && url != null) {
@@ -78,18 +68,10 @@ class JSRequest : IRequest {
     class Options: IModifierOptions {
         override val applyAuthClient: String?;
         override val applyCookieClient: String?;
-        override val applyOtherHeaders: Boolean;
 
-
-        constructor(config: IV8PluginConfig, obj: V8ValueObject, applyOtherHeadersByDefault: Boolean = false) {
+        constructor(config: IV8PluginConfig, obj: V8ValueObject) {
             applyAuthClient = obj.getOrDefault(config, "applyAuthClient", "JSRequestModifier.options.applyAuthClient", null);
             applyCookieClient = obj.getOrDefault(config, "applyCookieClient", "JSRequestModifier.options.applyCookieClient", null);
-            applyOtherHeaders = obj.getOrDefault(config, "applyOtherHeaders", "JSRequestModifier.options.applyOtherHeaders", applyOtherHeadersByDefault) ?: applyOtherHeadersByDefault;
-        }
-        constructor(applyAuthClient: String? = null, applyCookieClient: String? = null, applyOtherHeaders: Boolean = false) {
-            this.applyAuthClient = applyAuthClient;
-            this.applyCookieClient = applyCookieClient;
-            this.applyOtherHeaders = applyOtherHeaders;
         }
     }
 

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

@@ -1,134 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models
-
-import com.caoccao.javet.values.V8Value
-import com.caoccao.javet.values.primitive.V8ValueString
-import com.caoccao.javet.values.primitive.V8ValueUndefined
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.caoccao.javet.values.reference.V8ValueTypedArray
-import com.futo.platformplayer.api.media.platforms.js.DevJSClient
-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.PluginException
-import com.futo.platformplayer.engine.exceptions.ScriptException
-import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
-import com.futo.platformplayer.getOrDefault
-import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.states.StateDeveloper
-import kotlinx.serialization.Serializable
-import java.util.Base64
-
-class JSRequestExecutor {
-    private val _plugin: JSClient;
-    private val _config: IV8PluginConfig;
-    private var _executor: V8ValueObject;
-    val urlPrefix: String?;
-
-    private val hasCleanup: Boolean;
-
-    constructor(plugin: JSClient, executor: V8ValueObject) {
-        this._plugin = plugin;
-        this._executor = executor;
-        this._config = plugin.config;
-        val config = plugin.config;
-
-        urlPrefix = executor.getOrDefault(config, "urlPrefix", "RequestExecutor", null);
-
-        if(!executor.has("executeRequest"))
-            throw ScriptImplementationException(config, "RequestExecutor is missing executeRequest", null);
-        hasCleanup = executor.has("cleanup");
-    }
-
-    //TODO: Executor properties?
-    @Throws(ScriptException::class)
-    open fun executeRequest(url: String, headers: Map<String, String>): ByteArray {
-        if (_executor.isClosed)
-            throw IllegalStateException("Executor object is closed");
-
-        val result = if(_plugin is DevJSClient)
-            StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
-                V8Plugin.catchScriptErrors<Any>(
-                    _config,
-                    "[${_config.name}] JSRequestExecutor",
-                    "builder.modifyRequest()"
-                ) {
-                    _executor.invoke("executeRequest", url, headers);
-                } as V8Value;
-            }
-            else V8Plugin.catchScriptErrors<Any>(
-                _config,
-                "[${_config.name}] JSRequestExecutor",
-                "builder.modifyRequest()"
-            ) {
-                _executor.invoke("executeRequest", url, headers);
-            } as V8Value;
-
-        try {
-            if(result is V8ValueString) {
-                val base64Result = Base64.getDecoder().decode(result.value);
-                return base64Result;
-            }
-            if(result is V8ValueTypedArray) {
-                val buffer = result.buffer;
-                val byteBuffer = buffer.byteBuffer;
-                val bytesResult = ByteArray(result.byteLength);
-                byteBuffer.get(bytesResult, 0, result.byteLength);
-                buffer.close();
-                return bytesResult;
-            }
-            if(result is V8ValueObject && result.has("type")) {
-                val type = result.getOrThrow<Int>(_config, "type", "JSRequestModifier");
-                when(type) {
-                    //TODO: Buffer type?
-                }
-            }
-            if(result is V8ValueUndefined) {
-                if(_plugin is DevJSClient)
-                    StateDeveloper.instance.logDevException(_plugin.devID, "JSRequestExecutor.executeRequest returned illegal undefined");
-                throw ScriptImplementationException(_config, "JSRequestExecutor.executeRequest returned illegal undefined", null);
-            }
-            throw NotImplementedError("Executor result type not implemented? " + result.javaClass.name);
-        }
-        finally {
-            result.close();
-        }
-    }
-
-
-    open fun cleanup() {
-        if (!hasCleanup || _executor.isClosed)
-            return;
-
-       if(_plugin is DevJSClient)
-            StateDeveloper.instance.handleDevCall(_plugin.devID, "requestExecutor.executeRequest()") {
-                V8Plugin.catchScriptErrors<Any>(
-                    _config,
-                    "[${_config.name}] JSRequestExecutor",
-                    "builder.modifyRequest()"
-                ) {
-                    _executor.invokeVoid("cleanup", null);
-                };
-            }
-        else V8Plugin.catchScriptErrors<Any>(
-            _config,
-            "[${_config.name}] JSRequestExecutor",
-            "builder.modifyRequest()"
-        ) {
-           _executor.invokeVoid("cleanup", null);
-        };
-    }
-
-    protected fun finalize() {
-        cleanup();
-    }
-}
-
-//TODO: are these available..?
-@Serializable
-class ExecutorParameters {
-    var rangeStart: Int = -1;
-    var rangeEnd: Int = -1;
-
-    var segment: Int = -1;
-}

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

@@ -40,7 +40,6 @@ class JSRequestModifier: IRequestModifier {
         } as V8ValueObject;
 
         val req = JSRequest(_plugin, result, url, headers);
-        result.close();
         return req;
     }
 

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

@@ -6,7 +6,6 @@ import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
-import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.IRating
 import com.futo.platformplayer.api.media.models.ratings.RatingLikes
@@ -28,7 +27,6 @@ import com.futo.platformplayer.states.StateDeveloper
 
 class JSVideoDetails : JSVideo, IPlatformVideoDetails {
     private val _hasGetComments: Boolean;
-    private val _hasGetContentRecommendations: Boolean;
     private val _hasGetPlaybackTracker: Boolean;
 
     //Details
@@ -68,7 +66,6 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
 
         _hasGetComments = _content.has("getComments");
         _hasGetPlaybackTracker = _content.has("getPlaybackTracker");
-        _hasGetContentRecommendations = _content.has("getContentRecommendations");
     }
 
     override fun getPlaybackTracker(): IPlaybackTracker? {
@@ -92,24 +89,6 @@ class JSVideoDetails : JSVideo, IPlatformVideoDetails {
         };
     }
 
-    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? {
-        if(!_hasGetContentRecommendations || _content.isClosed)
-            return  null;
-
-        if(client is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(client.devID, "videoDetail.getContentRecommendations()") {
-                return@handleDevCall getContentRecommendationsJS(client);
-            }
-        else if(client is JSClient)
-            return getContentRecommendationsJS(client);
-
-        return null;
-    }
-    private fun getContentRecommendationsJS(client: JSClient): JSContentPager {
-        val contentPager = _content.invoke<V8ValueObject>("getContentRecommendations", arrayOf<Any>());
-        return JSContentPager(_pluginConfig, client, contentPager);
-    }
-
     override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? {
         if(client !is JSClient || !_hasGetComments || _content.isClosed)
             return null;

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

@@ -1,24 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlWidevineSource
-import com.futo.platformplayer.api.media.platforms.js.JSClient
-import com.futo.platformplayer.getOrThrow
-
-class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
-    override val bearerToken: String
-    override val licenseUri: String
-
-    @Suppress("ConvertSecondaryConstructorToPrimary")
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin, obj) {
-        val contextName = "JSAudioUrlWidevineSource"
-        val config = plugin.config
-        bearerToken = _obj.getOrThrow(config, "bearerToken", contextName)
-        licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
-    }
-
-    override fun toString(): String {
-        val url = getAudioUrl()
-        return "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration, bearerToken=$bearerToken, licenseUri=$licenseUri)"
-    }
-}

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

@@ -35,9 +35,4 @@ class JSAudioUrlRangeSource : JSAudioUrlSource, IStreamMetaDataSource {
         indexEnd = _obj.getOrDefault(config, "indexEnd", contextName, null);
         audioChannels = _obj.getOrDefault(config, "audioChannels", contextName, 2) ?: 2;
     }
-
-    override fun toString(): String {
-        return "RangeSource(url=[${getAudioUrl()}], itagId=[${itagId}], initStart=[${initStart}], initEnd=[${initEnd}], indexStart=[${indexStart}], indexEnd=[${indexEnd}]))";
-        return super.toString()
-    }
 }

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

@@ -1,64 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
-import com.futo.platformplayer.api.media.platforms.js.DevJSClient
-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.getOrDefault
-import com.futo.platformplayer.getOrNull
-import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.others.Language
-import com.futo.platformplayer.states.StateDeveloper
-
-class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawSource {
-    override val container : String = "application/dash+xml";
-    override val name : String;
-    override val codec: String;
-    override val bitrate: Int;
-    override val duration: Long;
-    override val priority: Boolean;
-
-    override val language: String;
-
-    val url: String;
-    override var manifest: String?;
-
-    override val hasGenerate: Boolean;
-
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH_RAW, plugin, obj) {
-        val contextName = "DashRawSource";
-        val config = plugin.config;
-        name = _obj.getOrThrow(config, "name", contextName);
-        url = _obj.getOrThrow(config, "url", contextName);
-        manifest = _obj.getOrThrow(config, "manifest", contextName);
-        codec = _obj.getOrDefault(config, "codec", contextName, "") ?: "";
-        bitrate = _obj.getOrDefault(config, "bitrate", contextName, 0) ?: 0;
-        duration = _obj.getOrDefault(config, "duration", contextName, 0) ?: 0;
-        priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
-        language = _obj.getOrDefault(config, "language", contextName, Language.UNKNOWN) ?: Language.UNKNOWN;
-        hasGenerate = _obj.has("generate");
-    }
-
-    override fun generate(): String? {
-        if(!hasGenerate)
-            return manifest;
-        if(_obj.isClosed)
-            throw IllegalStateException("Source object already closed");
-
-        val plugin = _plugin.getUnderlyingPlugin();
-        if(_plugin is DevJSClient)
-            return StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRaw", false) {
-                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
-                    _obj.invokeString("generate");
-                }
-            }
-        else
-            return _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw", "dashManifestRaw.generate()") {
-                _obj.invokeString("generate");
-            }
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.futo.platformplayer.api.media.platforms.js.models.sources
-
-import com.caoccao.javet.values.V8Value
-import com.caoccao.javet.values.primitive.V8ValueString
-import com.caoccao.javet.values.reference.V8ValueObject
-import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
-import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
-import com.futo.platformplayer.api.media.platforms.js.DevJSClient
-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.getOrDefault
-import com.futo.platformplayer.getOrNull
-import com.futo.platformplayer.getOrThrow
-import com.futo.platformplayer.states.StateDeveloper
-
-interface IJSDashManifestRawSource {
-    val hasGenerate: Boolean;
-    var manifest: String?;
-    fun generate(): String?;
-}
-open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSource {
-    override val container : String = "application/dash+xml";
-    override val name : String;
-    override val width: Int;
-    override val height: Int;
-    override val codec: String;
-    override val bitrate: Int?;
-    override val duration: Long;
-    override val priority: Boolean;
-
-    var url: String?;
-    override var manifest: String?;
-
-    override val hasGenerate: Boolean;
-    val canMerge: Boolean;
-
-    constructor(plugin: JSClient, obj: V8ValueObject) : super(TYPE_DASH_RAW, plugin, obj) {
-        val contextName = "DashRawSource";
-        val config = plugin.config;
-        name = _obj.getOrThrow(config, "name", contextName);
-        url = _obj.getOrThrow(config, "url", contextName);
-        manifest = _obj.getOrDefault<String>(config, "manifest", contextName, null);
-        width = _obj.getOrDefault(config, "width", contextName, 0) ?: 0;
-        height = _obj.getOrDefault(config, "height", contextName, 0) ?: 0;
-        codec = _obj.getOrDefault(config, "codec", contextName, "") ?: "";
-        bitrate = _obj.getOrDefault(config, "bitrate", contextName, 0) ?: 0;
-        duration = _obj.getOrDefault(config, "duration", contextName, 0) ?: 0;
-        priority = _obj.getOrDefault(config, "priority", contextName, false) ?: false;
-        canMerge = _obj.getOrDefault(config, "canMerge", contextName, false) ?: false;
-        hasGenerate = _obj.has("generate");
-    }
-
-    override open fun generate(): String? {
-        if(!hasGenerate)
-            return manifest;
-        if(_obj.isClosed)
-            throw IllegalStateException("Source object already closed");
-        if(_plugin is DevJSClient) {
-            return StateDeveloper.instance.handleDevCall(_plugin.devID, "DashManifestRawSource.generate()") {
-                _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
-                    _obj.invokeString("generate");
-                });
-            }
-        }
-        else
-            return _plugin.getUnderlyingPlugin().catchScriptErrors("DashManifestRaw.generate", "generate()", {
-                _obj.invokeString("generate");
-            });
-    }
-}
-
-class JSDashManifestMergingRawSource(
-    val video: JSDashManifestRawSource,
-    val audio: JSDashManifestRawAudioSource): JSDashManifestRawSource(video.getUnderlyingPlugin()!!, video.getUnderlyingObject()!!), IVideoSource {
-
-    override val name: String
-        get() = video.name;
-    override val bitrate: Int
-        get() = (video.bitrate ?: 0) + audio.bitrate;
-    override val codec: String
-        get() = video.codec
-    override val container: String
-        get() = video.container
-    override val duration: Long
-        get() = video.duration;
-    override val height: Int
-        get() = video.height;
-    override val width: Int
-        get() = video.width;
-    override val priority: Boolean
-        get() = video.priority;
-
-    override fun generate(): String? {
-        val videoDash = video.generate();
-        val audioDash = audio.generate();
-        if(videoDash != null && audioDash == null) return videoDash;
-        if(audioDash != null && videoDash == null) return audioDash;
-        if(videoDash == null) return null;
-
-        //TODO: Temporary simple solution..make more reliable version
-        val audioAdaptationSet = adaptationSetRegex.find(audioDash!!);
-        if(audioAdaptationSet != null) {
-            return videoDash.replace("</AdaptationSet>", "</AdaptationSet>\n" + audioAdaptationSet.value)
-        }
-        else
-            return videoDash;
-    }
-
-    companion object {
-        private val adaptationSetRegex = Regex("<AdaptationSet.*?>.*?<\\/AdaptationSet>", RegexOption.DOT_MATCHES_ALL);
-    }
-}

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

@@ -10,12 +10,10 @@ import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequest
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrDefault
-import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.orNull
 import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
 
@@ -23,17 +21,9 @@ abstract class JSSource {
     protected val _plugin: JSClient;
     protected val _config: IV8PluginConfig;
     protected val _obj: V8ValueObject;
-
     val hasRequestModifier: Boolean;
     private val _requestModifier: JSRequest?;
 
-    val hasRequestExecutor: Boolean;
-    private val _requestExecutor: JSRequest?;
-
-    val requiresCustomDatasource: Boolean get() {
-        return hasRequestModifier || hasRequestExecutor;
-    }
-
     val type : String;
 
     constructor(type: String, plugin: JSClient, obj: V8ValueObject) {
@@ -43,14 +33,9 @@ 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);
         }
         hasRequestModifier = _requestModifier != null || obj.has("getRequestModifier");
-
-        _requestExecutor = obj.getOrDefault<V8ValueObject>(_config, "requestExecutor", "JSSource.requestExecutor", null)?.let {
-            JSRequest(plugin, it, null, null, true);
-        }
-        hasRequestExecutor = _requestExecutor != null || obj.has("getRequestExecutor");
     }
 
     fun getRequestModifier(): IRequestModifier? {
@@ -59,38 +44,20 @@ abstract class JSSource {
                   return@AdhocRequestModifier _requestModifier.modify(_plugin, url, headers);
             };
 
-        if (!hasRequestModifier || _obj.isClosed)
+        if (!hasRequestModifier || _obj.isClosed) {
             return null;
+        }
 
         val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSVideoUrlSource", "obj.getRequestModifier()") {
             _obj.invoke("getRequestModifier", arrayOf<Any>());
         };
 
-        if (result !is V8ValueObject)
+        if (result !is V8ValueObject) {
             return null;
+        }
 
         return JSRequestModifier(_plugin, result)
     }
-    open fun getRequestExecutor(): JSRequestExecutor? {
-        if (!hasRequestExecutor || _obj.isClosed)
-            return null;
-
-        val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getRequestExecutor()") {
-            _obj.invoke("getRequestExecutor", arrayOf<Any>());
-        };
-
-        if (result !is V8ValueObject)
-            return null;
-
-        return JSRequestExecutor(_plugin, result)
-    }
-
-    fun getUnderlyingPlugin(): JSClient? {
-        return _plugin;
-    }
-    fun getUnderlyingObject(): V8ValueObject? {
-        return _obj;
-    }
 
     companion object {
         const val TYPE_AUDIOURL = "AudioUrlSource";
@@ -98,45 +65,31 @@ abstract class JSSource {
         const val TYPE_AUDIO_WITH_METADATA = "AudioUrlRangeSource";
         const val TYPE_VIDEO_WITH_METADATA = "VideoUrlRangeSource";
         const val TYPE_DASH = "DashSource";
-        const val TYPE_DASH_RAW = "DashRawSource";
-        const val TYPE_DASH_RAW_AUDIO = "DashRawAudioSource";
         const val TYPE_HLS = "HLSSource";
-        const val TYPE_AUDIOURL_WIDEVINE = "AudioUrlWidevineSource"
 
         fun fromV8VideoNullable(plugin: JSClient, obj: V8Value?) : IVideoSource? = obj.orNull { fromV8Video(plugin, it as V8ValueObject) };
-        fun fromV8Video(plugin: JSClient, obj: V8ValueObject) : IVideoSource? {
+        fun fromV8Video(plugin: JSClient, obj: V8ValueObject) : IVideoSource {
             val type = obj.getString("plugin_type");
             return when(type) {
                 TYPE_VIDEOURL -> JSVideoUrlSource(plugin, obj);
                 TYPE_VIDEO_WITH_METADATA -> JSVideoUrlRangeSource(plugin, obj);
                 TYPE_HLS -> fromV8HLS(plugin, obj);
                 TYPE_DASH -> fromV8Dash(plugin, obj);
-                TYPE_DASH_RAW -> fromV8DashRaw(plugin, obj);
-                else -> {
-                    Logger.w("JSSource", "Unknown video type ${type}");
-                    null;
-                };
+                else -> throw NotImplementedError("Unknown type ${type}");
             }
         }
         fun fromV8DashNullable(plugin: JSClient, obj: V8Value?) : JSDashManifestSource? = obj.orNull { fromV8Dash(plugin, it as V8ValueObject) };
         fun fromV8Dash(plugin: JSClient, obj: V8ValueObject) : JSDashManifestSource = JSDashManifestSource(plugin, obj);
-        fun fromV8DashRaw(plugin: JSClient, obj: V8ValueObject) : JSDashManifestRawSource = JSDashManifestRawSource(plugin, obj);
-        fun fromV8DashRawAudio(plugin: JSClient, obj: V8ValueObject) : JSDashManifestRawAudioSource = JSDashManifestRawAudioSource(plugin, obj);
         fun fromV8HLSNullable(plugin: JSClient, obj: V8Value?) : JSHLSManifestSource? = obj.orNull { fromV8HLS(plugin, it as V8ValueObject) };
         fun fromV8HLS(plugin: JSClient, obj: V8ValueObject) : JSHLSManifestSource = JSHLSManifestSource(plugin, obj);
 
-        fun fromV8Audio(plugin: JSClient, obj: V8ValueObject) : IAudioSource? {
+        fun fromV8Audio(plugin: JSClient, obj: V8ValueObject) : IAudioSource {
             val type = obj.getString("plugin_type");
             return when(type) {
                 TYPE_HLS -> JSHLSManifestAudioSource.fromV8HLS(plugin, obj);
                 TYPE_AUDIOURL -> JSAudioUrlSource(plugin, obj);
-                TYPE_DASH_RAW_AUDIO -> fromV8DashRawAudio(plugin, obj);
-                TYPE_AUDIOURL_WIDEVINE -> JSAudioUrlWidevineSource(plugin, obj);
                 TYPE_AUDIO_WITH_METADATA -> JSAudioUrlRangeSource(plugin, obj);
-                else -> {
-                    Logger.w("JSSource", "Unknown audio type ${type}");
-                    null;
-                };
+                else -> throw NotImplementedError("Unknown type ${type}");
             }
         }
     }

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

@@ -23,11 +23,9 @@ class JSUnMuxVideoSourceDescriptor: VideoUnMuxedSourceDescriptor {
         this.isUnMuxed = obj.getOrThrow(config, "isUnMuxed", contextName);
         this.videoSources = obj.getOrThrow<V8ValueArray>(config, "videoSources", contextName).toArray()
             .map { JSSource.fromV8Video(plugin, it as V8ValueObject) }
-            .filterNotNull()
             .toTypedArray();
         this.audioSources = obj.getOrThrow<V8ValueArray>(config, "audioSources", contextName).toArray()
             .map { JSSource.fromV8Audio(plugin, it as V8ValueObject) }
-            .filterNotNull()
             .toTypedArray();
     }
 }

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

@@ -21,7 +21,6 @@ class JSVideoSourceDescriptor : VideoMuxedSourceDescriptor {
         this.isUnMuxed = obj.getOrThrow(config, "isUnMuxed", contextName);
         this.videoSources = obj.getOrThrow<V8ValueArray>(config, "videoSources", contextName).toArray()
             .map { JSSource.fromV8Video(plugin, it as V8ValueObject) }
-            .filterNotNull()
             .toTypedArray();
     }
 

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

@@ -33,9 +33,4 @@ class JSVideoUrlRangeSource : JSVideoUrlSource, IStreamMetaDataSource {
         indexStart = _obj.getOrDefault(config, "indexStart", contextName, null);
         indexEnd = _obj.getOrDefault(config, "indexEnd", contextName, null);
     }
-
-    override fun toString(): String {
-        return "RangeSource(url=[${getVideoUrl()}], itagId=[${itagId}], initStart=[${initStart}], initEnd=[${initEnd}], indexStart=[${indexStart}], indexEnd=[${indexEnd}]))";
-        return super.toString()
-    }
 }

app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt

@@ -138,7 +138,7 @@ class AirPlayCastingDevice : CastingDevice {
                     try {
                         val connectedSocket = getConnectedSocket(adrs.toList(), port);
                         if (connectedSocket == null) {
-                            delay(1000);
+                            delay(3000);
                             continue;
                         }
 
@@ -163,25 +163,24 @@ class AirPlayCastingDevice : CastingDevice {
                         }
 
                         connectionState = CastConnectionState.CONNECTED;
+                        delay(1000);
 
                         val progressIndex = progressInfo.lowercase().indexOf("position: ");
                         if (progressIndex == -1) {
-                            delay(1000);
                             continue;
                         }
 
                         val progress = progressInfo.substring(progressIndex + "position: ".length).toDoubleOrNull() ?: continue;
                         setTime(progress);
 
+
                         val durationIndex = progressInfo.lowercase().indexOf("duration: ");
                         if (durationIndex == -1) {
-                            delay(1000);
                             continue;
                         }
 
                         val duration = progressInfo.substring(durationIndex + "duration: ".length).toDoubleOrNull() ?: continue;
                         setDuration(duration);
-                        delay(1000);
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get server info from AirPlay device.", e)
                     }

app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt

@@ -17,8 +17,6 @@ import org.json.JSONObject
 import java.io.DataInputStream
 import java.io.DataOutputStream
 import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.Socket
 import java.security.cert.X509Certificate
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSocket
@@ -44,9 +42,7 @@ class ChromecastCastingDevice : CastingDevice {
 
     private var _socket: SSLSocket? = null;
     private var _outputStream: DataOutputStream? = null;
-    private var _outputStreamLock = Object();
     private var _inputStream: DataInputStream? = null;
-    private var _inputStreamLock = Object();
     private var _scopeIO: CoroutineScope? = null;
     private var _requestId = 1;
     private var _started: Boolean = false;
@@ -307,18 +303,17 @@ class ChromecastCastingDevice : CastingDevice {
             _thread = Thread {
                 connectionState = CastConnectionState.CONNECTING;
 
-                var connectedSocket: Socket? = null
                 while (_scopeIO?.isActive == true) {
                     try {
-                        val resultSocket = getConnectedSocket(adrs.toList(), port);
-                        if (resultSocket == null) {
-                            Thread.sleep(1000);
+                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        if (connectedSocket == null) {
+                            Thread.sleep(3000);
                             continue;
                         }
 
-                        connectedSocket = resultSocket
                         usedRemoteAddress = connectedSocket.inetAddress;
                         localAddress = connectedSocket.localAddress;
+                        connectedSocket.close();
                         break;
                     } catch (e: Throwable) {
                         Logger.w(TAG, "Failed to get setup initial connection to ChromeCast device.", e)
@@ -330,8 +325,6 @@ class ChromecastCastingDevice : CastingDevice {
 
                 val factory = sslContext.socketFactory;
 
-                val address = InetSocketAddress(usedRemoteAddress, port)
-
                 //Connection loop
                 while (_scopeIO?.isActive == true) {
                     Logger.i(TAG, "Connecting to Chromecast.");
@@ -339,16 +332,7 @@ class ChromecastCastingDevice : CastingDevice {
 
                     try {
                         _socket?.close()
-                        if (connectedSocket != null) {
-                            Logger.i(TAG, "Using connected socket.")
-                            _socket = factory.createSocket(connectedSocket, connectedSocket.inetAddress.hostAddress, connectedSocket.port, true) as SSLSocket
-                            connectedSocket = null
-                        } else {
-                            Logger.i(TAG, "Using new socket.")
-                            val s = Socket().apply { this.connect(address, 2000) }
-                            _socket = factory.createSocket(s, s.inetAddress.hostAddress, s.port, true) as SSLSocket
-                        }
-
+                        _socket = factory.createSocket(usedRemoteAddress, port) as SSLSocket;
                         _socket?.startHandshake();
                         Logger.i(TAG, "Successfully connected to Chromecast at $usedRemoteAddress:$port");
 
@@ -363,7 +347,7 @@ class ChromecastCastingDevice : CastingDevice {
                         Logger.i(TAG, "Failed to connect to Chromecast.", e);
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(1000);
+                        Thread.sleep(3000);
                         continue;
                     }
 
@@ -379,50 +363,45 @@ class ChromecastCastingDevice : CastingDevice {
                         _socket?.close();
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(1000);
+                        Thread.sleep(3000);
                         continue;
                     }
 
                     getStatus();
 
-                    val buffer = ByteArray(409600);
+                    val buffer = ByteArray(4096);
 
                     Logger.i(TAG, "Started receiving.");
                     while (_scopeIO?.isActive == true) {
                         try {
                             val inputStream = _inputStream ?: break;
+                            Log.d(TAG, "Receiving next packet...");
+                            val b1 = inputStream.readUnsignedByte();
+                            val b2 = inputStream.readUnsignedByte();
+                            val b3 = inputStream.readUnsignedByte();
+                            val b4 = inputStream.readUnsignedByte();
+                            val size = ((b1.toLong() shl 24) or (b2.toLong() shl 16) or (b3.toLong() shl 8) or b4.toLong()).toInt();
+                            if (size > buffer.size) {
+                                Logger.w(TAG, "Skipping packet that is too large $size bytes.")
+                                inputStream.skip(size.toLong());
+                                continue;
+                            }
 
-                            synchronized(_inputStreamLock)
-                            {
-                                Log.d(TAG, "Receiving next packet...");
-                                val b1 = inputStream.readUnsignedByte();
-                                val b2 = inputStream.readUnsignedByte();
-                                val b3 = inputStream.readUnsignedByte();
-                                val b4 = inputStream.readUnsignedByte();
-                                val size =
-                                    ((b1.toLong() shl 24) or (b2.toLong() shl 16) or (b3.toLong() shl 8) or b4.toLong()).toInt();
-                                if (size > buffer.size) {
-                                    Logger.w(TAG, "Skipping packet that is too large $size bytes.")
-                                    inputStream.skip(size.toLong());
-                                    return@synchronized
-                                }
+                            Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
+                            inputStream.read(buffer, 0, size);
 
-                                Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
-                                inputStream.read(buffer, 0, size);
+                            //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
+                            val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
+                            Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
+                            val message = ChromeCast.CastMessage.parseFrom(messageBytes);
+                            if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
+                                Logger.i(TAG, "Received message: $message");
+                            }
 
-                                //TODO: In the future perhaps this size-1 will cause issues, why is there a 0 on the end?
-                                val messageBytes = buffer.sliceArray(IntRange(0, size - 1));
-                                Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
-                                val message = ChromeCast.CastMessage.parseFrom(messageBytes);
-                                if (message.namespace != "urn:x-cast:com.google.cast.tp.heartbeat") {
-                                    Logger.i(TAG, "Received message: $message");
-                                }
-
-                                try {
-                                    handleMessage(message);
-                                } catch (e: Throwable) {
-                                    Logger.w(TAG, "Failed to handle message.", e);
-                                }
+                            try {
+                                handleMessage(message);
+                            } catch (e:Throwable) {
+                                Logger.w(TAG, "Failed to handle message.", e);
                             }
                         } catch (e: java.net.SocketException) {
                             Logger.e(TAG, "Socket exception while receiving.", e);
@@ -436,7 +415,7 @@ class ChromecastCastingDevice : CastingDevice {
                     Logger.i(TAG, "Socket disconnected.");
 
                     connectionState = CastConnectionState.CONNECTING;
-                    Thread.sleep(1000);
+                    Thread.sleep(3000);
                 }
 
                 Logger.i(TAG, "Stopped connection loop.");
@@ -453,11 +432,10 @@ class ChromecastCastingDevice : CastingDevice {
                 while (_scopeIO?.isActive == true) {
                     try {
                         sendChannelMessage("sender-0", "receiver-0", "urn:x-cast:com.google.cast.tp.heartbeat", pingObject.toString());
+                        Thread.sleep(5000);
                     } catch (e: Throwable) {
                         Log.w(TAG, "Failed to send ping.");
                     }
-
-                    Thread.sleep(5000);
                 }
 
                 Logger.i(TAG, "Stopped ping loop.");
@@ -595,16 +573,13 @@ class ChromecastCastingDevice : CastingDevice {
             return;
         }
 
-        synchronized(_outputStreamLock)
-        {
-            val serializedSizeBE = ByteArray(4);
-            serializedSizeBE[0] = (data.size shr 24 and 0xff).toByte();
-            serializedSizeBE[1] = (data.size shr 16 and 0xff).toByte();
-            serializedSizeBE[2] = (data.size shr 8 and 0xff).toByte();
-            serializedSizeBE[3] = (data.size and 0xff).toByte();
-            outputStream.write(serializedSizeBE);
-            outputStream.write(data);
-        }
+        val serializedSizeBE = ByteArray(4);
+        serializedSizeBE[0] = (data.size shr 24 and 0xff).toByte();
+        serializedSizeBE[1] = (data.size shr 16 and 0xff).toByte();
+        serializedSizeBE[2] = (data.size shr 8 and 0xff).toByte();
+        serializedSizeBE[3] = (data.size and 0xff).toByte();
+        outputStream.write(serializedSizeBE);
+        outputStream.write(data);
 
         //Log.d(TAG, "Sent ${data.size} bytes.");
     }

app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt

@@ -15,7 +15,6 @@ import com.futo.platformplayer.casting.models.FCastSetSpeedMessage
 import com.futo.platformplayer.casting.models.FCastSetVolumeMessage
 import com.futo.platformplayer.casting.models.FCastVersionMessage
 import com.futo.platformplayer.casting.models.FCastVolumeUpdateMessage
-import com.futo.platformplayer.ensureNotMainThread
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.CastingDeviceInfo
@@ -28,12 +27,11 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.io.DataInputStream
+import java.io.DataOutputStream
 import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
 import java.math.BigInteger
 import java.net.InetAddress
-import java.net.InetSocketAddress
 import java.net.Socket
 import java.security.KeyFactory
 import java.security.KeyPair
@@ -83,15 +81,12 @@ class FCastCastingDevice : CastingDevice {
     var port: Int = 0;
 
     private var _socket: Socket? = null;
-    private var _outputStream: OutputStream? = null;
-    private var _inputStream: InputStream? = null;
+    private var _outputStream: DataOutputStream? = null;
+    private var _inputStream: DataInputStream? = null;
     private var _scopeIO: CoroutineScope? = null;
     private var _started: Boolean = false;
     private var _version: Long = 1;
     private var _thread: Thread? = null
-    private var _pingThread: Thread? = null
-    private var _lastPongTime = -1L
-    private var _outputStreamLock = Object()
 
     constructor(name: String, addresses: Array<InetAddress>, port: Int) : super() {
         this.name = name;
@@ -211,13 +206,7 @@ class FCastCastingDevice : CastingDevice {
 
     private fun invokeInIOScopeIfRequired(action: () -> Unit): Boolean {
         if(Looper.getMainLooper().thread == Thread.currentThread()) {
-            _scopeIO?.launch {
-                try {
-                    action();
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to invoke in IO scope.", e)
-                }
-            }
+            _scopeIO?.launch { action(); }
             return true;
         }
 
@@ -251,113 +240,77 @@ class FCastCastingDevice : CastingDevice {
         val adrs = addresses ?: return;
 
         val thread = _thread
-        val pingThread = _pingThread
-        if (_started && (thread == null || !thread.isAlive || pingThread == null || !pingThread.isAlive)) {
-            Log.i(TAG, "(Re)starting thread because the thread has died")
-
-            _scopeIO?.let {
-                it.cancel()
-                Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
-            }
+        if (thread == null || !thread.isAlive) {
+            Log.i(TAG, "Restarting thread because the thread has died")
 
+            _scopeIO?.cancel();
+            Logger.i(TAG, "Cancelled previous scopeIO because a new one is starting.")
             _scopeIO = CoroutineScope(Dispatchers.IO);
 
             _thread = Thread {
                 connectionState = CastConnectionState.CONNECTING;
-                Log.i(TAG, "Connection thread started.")
 
-                var connectedSocket: Socket? = null
                 while (_scopeIO?.isActive == true) {
                     try {
-                        Log.i(TAG, "getConnectedSocket (adrs = [ ${adrs.joinToString(", ")} ], port = ${port}).")
-
-                        val resultSocket = getConnectedSocket(adrs.toList(), port);
-
-                        if (resultSocket == null) {
-                            Log.i(TAG, "Connection failed, waiting 1 seconds.")
-                            Thread.sleep(1000);
+                        val connectedSocket = getConnectedSocket(adrs.toList(), port);
+                        if (connectedSocket == null) {
+                            Thread.sleep(3000);
                             continue;
                         }
 
-                        Log.i(TAG, "Connection succeeded.")
-
-                        connectedSocket = resultSocket
-                        usedRemoteAddress = connectedSocket.inetAddress
-                        localAddress = connectedSocket.localAddress
+                        usedRemoteAddress = connectedSocket.inetAddress;
+                        localAddress = connectedSocket.localAddress;
+                        connectedSocket.close();
                         break;
                     } catch (e: Throwable) {
-                        Logger.w(TAG, "Failed to get setup initial connection to FastCast device.", e)
+                        Logger.w(ChromecastCastingDevice.TAG, "Failed to get setup initial connection to FastCast device.", e)
                     }
                 }
 
-                val address = InetSocketAddress(usedRemoteAddress, port)
-
                 //Connection loop
                 while (_scopeIO?.isActive == true) {
                     Logger.i(TAG, "Connecting to FastCast.");
                     connectionState = CastConnectionState.CONNECTING;
 
                     try {
-                        _socket?.close()
-                        _inputStream?.close()
-                        _outputStream?.close()
-                        if (connectedSocket != null) {
-                            Logger.i(TAG, "Using connected socket.");
-                            _socket = connectedSocket
-                            connectedSocket = null
-                        } else {
-                            Logger.i(TAG, "Using new socket.");
-                            _socket = Socket().apply { this.connect(address, 2000) };
-                        }
+                        _socket = Socket(usedRemoteAddress, port);
                         Logger.i(TAG, "Successfully connected to FastCast at $usedRemoteAddress:$port");
 
-                        _outputStream = _socket?.outputStream;
-                        _inputStream = _socket?.inputStream;
+                        _outputStream = DataOutputStream(_socket?.outputStream);
+                        _inputStream = DataInputStream(_socket?.inputStream);
                     } catch (e: IOException) {
-                        _socket?.close()
-                        _inputStream?.close()
-                        _outputStream?.close()
+                        _socket?.close();
                         Logger.i(TAG, "Failed to connect to FastCast.", e);
 
                         connectionState = CastConnectionState.CONNECTING;
-                        Thread.sleep(1000);
+                        Thread.sleep(3000);
                         continue;
                     }
 
                     localAddress = _socket?.localAddress;
                     connectionState = CastConnectionState.CONNECTED;
-                    _lastPongTime = -1L
 
                     val buffer = ByteArray(4096);
 
                     Logger.i(TAG, "Started receiving.");
-                    while (_scopeIO?.isActive == true) {
+                    var exceptionOccurred = false;
+                    while (_scopeIO?.isActive == true && !exceptionOccurred) {
                         try {
                             val inputStream = _inputStream ?: break;
                             Log.d(TAG, "Receiving next packet...");
-
-                            var headerBytesRead = 0
-                            while (headerBytesRead < 4) {
-                                val read = inputStream.read(buffer, headerBytesRead, 4 - headerBytesRead)
-                                if (read == -1)
-                                    throw Exception("Stream closed")
-                                headerBytesRead += read
-                            }
-
-                            val size = ((buffer[3].toLong() shl 24) or (buffer[2].toLong() shl 16) or (buffer[1].toLong() shl 8) or buffer[0].toLong()).toInt();
+                            val b1 = inputStream.readUnsignedByte();
+                            val b2 = inputStream.readUnsignedByte();
+                            val b3 = inputStream.readUnsignedByte();
+                            val b4 = inputStream.readUnsignedByte();
+                            val size = ((b4.toLong() shl 24) or (b3.toLong() shl 16) or (b2.toLong() shl 8) or b1.toLong()).toInt();
                             if (size > buffer.size) {
-                                Logger.w(TAG, "Packets larger than $size bytes are not supported.")
-                                break
+                                Logger.w(TAG, "Skipping packet that is too large $size bytes.")
+                                inputStream.skip(size.toLong());
+                                continue;
                             }
 
                             Log.d(TAG, "Received header indicating $size bytes. Waiting for message.");
-                            var bytesRead = 0
-                            while (bytesRead < size) {
-                                val read = inputStream.read(buffer, bytesRead, size - bytesRead)
-                                if (read == -1)
-                                    throw Exception("Stream closed")
-                                bytesRead += read
-                            }
+                            inputStream.read(buffer, 0, size);
 
                             val messageBytes = buffer.sliceArray(IntRange(0, size));
                             Log.d(TAG, "Received $size bytes: ${messageBytes.toHexString()}.");
@@ -371,68 +324,31 @@ class FCastCastingDevice : CastingDevice {
                             try {
                                 handleMessage(Opcode.find(opcode), json);
                             } catch (e: Throwable) {
-                                Logger.w(TAG, "Failed to handle message.", e)
-                                break
+                                Logger.w(TAG, "Failed to handle message.", e);
                             }
                         } catch (e: java.net.SocketException) {
                             Logger.e(TAG, "Socket exception while receiving.", e);
-                            break
+                            exceptionOccurred = true;
                         } catch (e: Throwable) {
                             Logger.e(TAG, "Exception while receiving.", e);
-                            break
+                            exceptionOccurred = true;
                         }
                     }
 
                     try {
-                        _socket?.close()
-                        _inputStream?.close()
-                        _outputStream?.close()
+                        _socket?.close();
                         Logger.i(TAG, "Socket disconnected.");
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to close socket.", e)
                     }
 
                     connectionState = CastConnectionState.CONNECTING;
-                    Thread.sleep(1000);
+                    Thread.sleep(3000);
                 }
 
                 Logger.i(TAG, "Stopped connection loop.");
                 connectionState = CastConnectionState.DISCONNECTED;
-            }.apply { start() }
-
-            _pingThread = Thread {
-                Logger.i(TAG, "Started ping loop.")
-
-                while (_scopeIO?.isActive == true) {
-                    try {
-                        send(Opcode.Ping)
-                    } catch (e: Throwable) {
-                        Log.w(TAG, "Failed to send ping.")
-
-                        try {
-                            _socket?.close()
-                            _inputStream?.close()
-                            _outputStream?.close()
-                        } catch (e: Throwable) {
-                            Log.w(TAG, "Failed to close socket.", e)
-                        }
-                    }
-
-                    /*if (_lastPongTime != -1L && System.currentTimeMillis() - _lastPongTime > 6000) {
-                        Logger.w(TAG, "Closing socket due to last pong time being larger than 6 seconds.")
-
-                        try {
-                            _socket?.close()
-                        } catch (e: Throwable) {
-                            Log.w(TAG, "Failed to close socket.", e)
-                        }
-                    }*/
-
-                    Thread.sleep(2000)
-                }
-
-                Logger.i(TAG, "Stopped ping loop.");
-            }.apply { start() }
+            }.apply { start() };
         } else {
             Log.i(TAG, "Thread was still alive, not restarted")
         }
@@ -485,44 +401,39 @@ class FCastCastingDevice : CastingDevice {
                 Logger.i(TAG, "Remote version received: $version")
             }
             Opcode.Ping -> send(Opcode.Pong)
-            Opcode.Pong -> _lastPongTime = System.currentTimeMillis()
             else -> { }
         }
     }
 
     private fun send(opcode: Opcode, message: String? = null) {
-        ensureNotMainThread()
-
-        synchronized (_outputStreamLock) {
-            try {
-                val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
-                val size = 1 + data.size
-                val outputStream = _outputStream
-                if (outputStream == null) {
-                    Log.w(TAG, "Failed to send $size bytes, output stream is null.")
-                    return
-                }
-
-                val serializedSizeLE = ByteArray(4)
-                serializedSizeLE[0] = (size and 0xff).toByte()
-                serializedSizeLE[1] = (size shr 8 and 0xff).toByte()
-                serializedSizeLE[2] = (size shr 16 and 0xff).toByte()
-                serializedSizeLE[3] = (size shr 24 and 0xff).toByte()
-                outputStream.write(serializedSizeLE)
-
-                val opcodeBytes = ByteArray(1)
-                opcodeBytes[0] = opcode.value
-                outputStream.write(opcodeBytes)
-
-                if (data.isNotEmpty()) {
-                    outputStream.write(data)
-                }
-
-                Log.d(TAG, "Sent $size bytes: (opcode: $opcode, body: $message).")
-            } catch (e: Throwable) {
-                Log.i(TAG, "Failed to send message.", e)
-                throw e
+        try {
+            val data: ByteArray = message?.encodeToByteArray() ?: ByteArray(0)
+            val size = 1 + data.size
+            val outputStream = _outputStream
+            if (outputStream == null) {
+                Log.w(TAG, "Failed to send $size bytes, output stream is null.")
+                return
             }
+
+            val serializedSizeLE = ByteArray(4)
+            serializedSizeLE[0] = (size and 0xff).toByte()
+            serializedSizeLE[1] = (size shr 8 and 0xff).toByte()
+            serializedSizeLE[2] = (size shr 16 and 0xff).toByte()
+            serializedSizeLE[3] = (size shr 24 and 0xff).toByte()
+            outputStream.write(serializedSizeLE)
+
+            val opcodeBytes = ByteArray(1)
+            opcodeBytes[0] = opcode.value
+            outputStream.write(opcodeBytes)
+
+            if (data.isNotEmpty()) {
+                outputStream.write(data)
+            }
+
+            Log.d(TAG, "Sent $size bytes: (opcode: $opcode, body: $message).")
+        } catch (e: Throwable) {
+            Log.i(TAG, "Failed to send message.", e)
+            throw e
         }
     }
 
@@ -542,7 +453,6 @@ class FCastCastingDevice : CastingDevice {
         _started = false;
         //TODO: Kill and/or join thread?
         _thread = null;
-        _pingThread = null;
 
         val socket = _socket;
         val scopeIO = _scopeIO;
@@ -552,8 +462,6 @@ class FCastCastingDevice : CastingDevice {
 
             scopeIO.launch {
                 socket.close();
-                _inputStream?.close()
-                _outputStream?.close()
                 connectionState = CastConnectionState.DISCONNECTED;
                 scopeIO.cancel();
                 Logger.i(TAG, "Cancelled scopeIO with open socket.")

app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt

@@ -6,17 +6,13 @@ import android.net.Uri
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import android.util.Xml
-import androidx.annotation.OptIn
-import androidx.media3.common.util.UnstableApi
-import com.futo.platformplayer.Settings
+import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.http.server.HttpHeaders
 import com.futo.platformplayer.api.http.server.ManagedHttpServer
 import com.futo.platformplayer.api.http.server.handlers.HttpConstantHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpFileHandler
-import com.futo.platformplayer.api.http.server.handlers.HttpFunctionHandler
+import com.futo.platformplayer.api.http.server.handlers.HttpFuntionHandler
 import com.futo.platformplayer.api.http.server.handlers.HttpProxyHandler
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
@@ -29,23 +25,16 @@ import com.futo.platformplayer.api.media.models.streams.sources.LocalSubtitleSou
 import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
-import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestMergingRawSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
-import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.builders.DashBuilder
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.mdns.DnsService
-import com.futo.platformplayer.mdns.ServiceDiscoverer
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.stores.CastingDeviceInfoStorage
 import com.futo.platformplayer.stores.FragmentedStorage
-import com.futo.platformplayer.toUrlAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -53,15 +42,17 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import java.io.ByteArrayInputStream
 import java.net.InetAddress
-import java.net.URLDecoder
-import java.net.URLEncoder
 import java.util.UUID
+import javax.jmdns.JmDNS
+import javax.jmdns.ServiceEvent
+import javax.jmdns.ServiceListener
+import javax.jmdns.ServiceTypeListener
 
 class StateCasting {
     private val _scopeIO = CoroutineScope(Dispatchers.IO);
     private val _scopeMain = CoroutineScope(Dispatchers.Main);
+    private var _jmDNS: JmDNS? = null;
     private val _storage: CastingDeviceInfoStorage = FragmentedStorage.get();
 
     private val _castServer = ManagedHttpServer(9999);
@@ -78,51 +69,105 @@ class StateCasting {
     val onActiveDeviceDurationChanged = Event1<Double>();
     val onActiveDeviceVolumeChanged = Event1<Double>();
     var activeDevice: CastingDevice? = null;
-    private var _videoExecutor: JSRequestExecutor? = null
-    private var _audioExecutor: JSRequestExecutor? = null
     private val _client = ManagedHttpClient();
     var _resumeCastingDevice: CastingDeviceInfo? = null;
-    val _serviceDiscoverer = ServiceDiscoverer(arrayOf(
-        "_googlecast._tcp.local",
-        "_airplay._tcp.local",
-        "_fastcast._tcp.local",
-        "_fcast._tcp.local"
-    )) { handleServiceUpdated(it) }
 
     val isCasting: Boolean get() = activeDevice != null;
 
-    private fun handleServiceUpdated(services: List<DnsService>) {
-        for (s in services) {
-            //TODO: Addresses IPv4 only?
-            val addresses = s.addresses.toTypedArray()
-            val port = s.port.toInt()
-            var name = s.texts.firstOrNull { it.startsWith("md=") }?.substring("md=".length)
-            if (s.name.endsWith("._googlecast._tcp.local")) {
-                if (name == null) {
-                    name = s.name.substring(0, s.name.length - "._googlecast._tcp.local".length)
-                }
+    private val _chromecastServiceListener = object : ServiceListener {
+        override fun serviceAdded(event: ServiceEvent) {
+            Logger.i(TAG, "ChromeCast service added: " + event.info);
+            addOrUpdateDevice(event);
+        }
 
-                addOrUpdateChromeCastDevice(name, addresses, port)
-            } else if (s.name.endsWith("._airplay._tcp.local")) {
-                if (name == null) {
-                    name = s.name.substring(0, s.name.length - "._airplay._tcp.local".length)
+        override fun serviceRemoved(event: ServiceEvent) {
+            Logger.i(TAG, "ChromeCast service removed: " + event.info);
+            synchronized(devices) {
+                val device = devices[event.info.name];
+                if (device != null) {
+                    onDeviceRemoved.emit(device);
                 }
-
-                addOrUpdateAirPlayDevice(name, addresses, port)
-            } else if (s.name.endsWith("._fastcast._tcp.local")) {
-                if (name == null) {
-                    name = s.name.substring(0, s.name.length - "._fastcast._tcp.local".length)
-                }
-
-                addOrUpdateFastCastDevice(name, addresses, port)
-            } else if (s.name.endsWith("._fcast._tcp.local")) {
-                if (name == null) {
-                    name = s.name.substring(0, s.name.length - "._fcast._tcp.local".length)
-                }
-
-                addOrUpdateFastCastDevice(name, addresses, port)
             }
         }
+
+        override fun serviceResolved(event: ServiceEvent) {
+            Logger.v(TAG, "ChromeCast service resolved: " + event.info);
+            addOrUpdateDevice(event);
+        }
+
+        fun addOrUpdateDevice(event: ServiceEvent) {
+            addOrUpdateChromeCastDevice(event.info.name, event.info.inetAddresses, event.info.port);
+        }
+    }
+
+    private val _airPlayServiceListener = object : ServiceListener {
+        override fun serviceAdded(event: ServiceEvent) {
+            Logger.i(TAG, "AirPlay service added: " + event.info);
+            addOrUpdateDevice(event);
+        }
+
+        override fun serviceRemoved(event: ServiceEvent) {
+            Logger.i(TAG, "AirPlay service removed: " + event.info);
+            synchronized(devices) {
+                val device = devices[event.info.name];
+                if (device != null) {
+                    onDeviceRemoved.emit(device);
+                }
+            }
+        }
+
+        override fun serviceResolved(event: ServiceEvent) {
+            Logger.i(TAG, "AirPlay service resolved: " + event.info);
+            addOrUpdateDevice(event);
+        }
+
+        fun addOrUpdateDevice(event: ServiceEvent) {
+            addOrUpdateAirPlayDevice(event.info.name, event.info.inetAddresses, event.info.port);
+        }
+    }
+
+    private val _fastCastServiceListener = object : ServiceListener {
+        override fun serviceAdded(event: ServiceEvent) {
+            Logger.i(TAG, "FastCast service added: " + event.info);
+            addOrUpdateDevice(event);
+        }
+
+        override fun serviceRemoved(event: ServiceEvent) {
+            Logger.i(TAG, "FastCast service removed: " + event.info);
+            synchronized(devices) {
+                val device = devices[event.info.name];
+                if (device != null) {
+                    onDeviceRemoved.emit(device);
+                }
+            }
+        }
+
+        override fun serviceResolved(event: ServiceEvent) {
+            Logger.i(TAG, "FastCast service resolved: " + event.info);
+            addOrUpdateDevice(event);
+        }
+
+        fun addOrUpdateDevice(event: ServiceEvent) {
+            addOrUpdateFastCastDevice(event.info.name, event.info.inetAddresses, event.info.port);
+        }
+    }
+
+    private val _serviceTypeListener = object : ServiceTypeListener {
+        override fun serviceTypeAdded(event: ServiceEvent?) {
+            if (event == null) {
+                return;
+            }
+
+            Logger.i(TAG, "Service type added (name: ${event.name}, type: ${event.type})");
+        }
+
+        override fun subTypeForServiceTypeAdded(event: ServiceEvent?) {
+            if (event == null) {
+                return;
+            }
+
+            Logger.i(TAG, "Sub type for service type added (name: ${event.name}, type: ${event.type})");
+        }
     }
 
     fun handleUrl(context: Context, url: String) {
@@ -191,30 +236,28 @@ class StateCasting {
         rememberedDevices.clear();
         rememberedDevices.addAll(_storage.deviceInfos.map { deviceFromCastingDeviceInfo(it) });
 
+        _scopeIO.launch {
+            try {
+                val jmDNS = JmDNS.create(InetAddress.getLocalHost());
+                jmDNS.addServiceListener("_googlecast._tcp.local.", _chromecastServiceListener);
+                jmDNS.addServiceListener("_airplay._tcp.local.", _airPlayServiceListener);
+                jmDNS.addServiceListener("_fastcast._tcp.local.", _fastCastServiceListener);
+
+                if (BuildConfig.DEBUG) {
+                    jmDNS.addServiceTypeListener(_serviceTypeListener);
+                }
+
+                _jmDNS = jmDNS;
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to start casting service.", e);
+            }
+        }
         _castServer.start();
         enableDeveloper(true);
 
         Logger.i(TAG, "CastingService started.");
     }
 
-    @Synchronized
-    fun startDiscovering() {
-        try {
-            _serviceDiscoverer.start()
-        } catch (e: Throwable) {
-            Logger.i(TAG, "Failed to start ServiceDiscoverer", e)
-        }
-    }
-
-    @Synchronized
-    fun stopDiscovering() {
-        try {
-            _serviceDiscoverer.stop()
-        } catch (e: Throwable) {
-            Logger.i(TAG, "Failed to stop ServiceDiscoverer", e)
-        }
-    }
-
     @Synchronized
     fun stop() {
         if (!_started)
@@ -224,7 +267,25 @@ class StateCasting {
 
         Logger.i(TAG, "CastingService stopping.")
 
-        stopDiscovering()
+        val jmDNS = _jmDNS;
+        if (jmDNS != null) {
+            _scopeIO.launch {
+                try {
+                    jmDNS.removeServiceListener("_googlecast._tcp.local.", _chromecastServiceListener);
+                    jmDNS.removeServiceListener("_airplay._tcp", _airPlayServiceListener);
+                    jmDNS.removeServiceListener("_fastcast._tcp.local.", _fastCastServiceListener);
+
+                    if (BuildConfig.DEBUG) {
+                        jmDNS.removeServiceTypeListener(_serviceTypeListener);
+                    }
+
+                    jmDNS.close();
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to stop mDNS.", e);
+                }
+            }
+        }
+
         _scopeIO.cancel();
         _scopeMain.cancel();
 
@@ -374,26 +435,15 @@ class StateCasting {
             } else {
                 StateApp.instance.scope.launch(Dispatchers.IO) {
                     try {
-                        val isRawDash = videoSource is JSDashManifestRawSource || audioSource is JSDashManifestRawAudioSource
-                        if (isRawDash) {
-                            Logger.i(TAG, "Casting as raw DASH");
-
-                            try {
-                                castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, audioSource as JSDashManifestRawAudioSource?, subtitleSource, resumePosition, speed);
-                            } catch (e: Throwable) {
-                                Logger.e(TAG, "Failed to start casting DASH raw videoSource=${videoSource} audioSource=${audioSource}.", e);
-                            }
+                        if (ad is FCastCastingDevice) {
+                            Logger.i(TAG, "Casting as DASH direct");
+                            castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
+                        } else if (ad is AirPlayCastingDevice) {
+                            Logger.i(TAG, "Casting as HLS indirect");
+                            castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
                         } else {
-                            if (ad is FCastCastingDevice) {
-                                Logger.i(TAG, "Casting as DASH direct");
-                                castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            } else if (ad is AirPlayCastingDevice) {
-                                Logger.i(TAG, "Casting as HLS indirect");
-                                castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            } else {
-                                Logger.i(TAG, "Casting as DASH indirect");
-                                castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                            }
+                            Logger.i(TAG, "Casting as DASH indirect");
+                            castDashIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
                         }
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Failed to start casting DASH videoSource=${videoSource} audioSource=${audioSource}.", e);
@@ -401,22 +451,14 @@ class StateCasting {
                 }
             }
         } else {
-            val proxyStreams = Settings.instance.casting.alwaysProxyRequests;
-            val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
-            val id = UUID.randomUUID();
-
             if (videoSource is IVideoUrlSource) {
-                val videoPath = "/video-${id}"
-                val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
                 Logger.i(TAG, "Casting as singular video");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.getVideoUrl(), resumePosition, video.duration.toDouble(), speed);
             } else if (audioSource is IAudioUrlSource) {
-                val audioPath = "/audio-${id}"
-                val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
                 Logger.i(TAG, "Casting as singular audio");
-                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
+                ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.getAudioUrl(), resumePosition, video.duration.toDouble(), speed);
             } else if(videoSource is IHLSManifestSource) {
-                if (proxyStreams || ad is ChromecastCastingDevice) {
+                if (ad is ChromecastCastingDevice) {
                     Logger.i(TAG, "Casting as proxied HLS");
                     castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
                 } else {
@@ -424,7 +466,7 @@ class StateCasting {
                     ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed);
                 }
             } else if(audioSource is IHLSManifestAudioSource) {
-                if (proxyStreams || ad is ChromecastCastingDevice) {
+                if (ad is ChromecastCastingDevice) {
                     Logger.i(TAG, "Casting as proxied audio HLS");
                     castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
                 } else {
@@ -437,26 +479,6 @@ class StateCasting {
             } else if (audioSource is LocalAudioSource) {
                 Logger.i(TAG, "Casting as local audio");
                 castLocalAudio(video, audioSource, resumePosition, speed);
-            } else if (videoSource is JSDashManifestRawSource) {
-                Logger.i(TAG, "Casting as JSDashManifestRawSource video");
-
-                StateApp.instance.scope.launch(Dispatchers.IO) {
-                    try {
-                        castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, null, null, resumePosition, speed);
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to start casting DASH raw videoSource=${videoSource}.", e);
-                    }
-                }
-            } else if (audioSource is JSDashManifestRawAudioSource) {
-                Logger.i(TAG, "Casting as JSDashManifestRawSource audio");
-
-                StateApp.instance.scope.launch(Dispatchers.IO) {
-                    try {
-                        castDashRaw(contentResolver, video, null, audioSource as JSDashManifestRawAudioSource?, null, resumePosition, speed);
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to start casting DASH raw audioSource=${audioSource}.", e);
-                    }
-                }
             } else {
                 var str = listOf(
                     if(videoSource != null) "Video: ${videoSource::class.java.simpleName}" else null,
@@ -497,7 +519,7 @@ class StateCasting {
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val videoPath = "/video-${id}"
         val videoUrl = url + videoPath;
@@ -516,7 +538,7 @@ class StateCasting {
     private fun castLocalAudio(video: IPlatformVideoDetails, audioSource: LocalAudioSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
         val audioPath = "/audio-${id}"
         val audioUrl = url + audioPath;
@@ -535,7 +557,7 @@ class StateCasting {
     private fun castLocalHls(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double, speed: Double?): List<String> {
         val ad = activeDevice ?: return listOf()
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}"
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}"
         val id = UUID.randomUUID()
 
         val hlsPath = "/hls-${id}"
@@ -631,7 +653,7 @@ class StateCasting {
     private fun castLocalDash(video: IPlatformVideoDetails, videoSource: LocalVideoSource?, audioSource: LocalAudioSource?, subtitleSource: LocalSubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -644,11 +666,8 @@ class StateCasting {
         val audioUrl = url + audioPath;
         val subtitleUrl = url + subtitlePath;
 
-        val dashContent = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitleUrl);
-        Logger.v(TAG) { "Dash manifest: $dashContent" };
-
         _castServer.addHandlerWithAllowAllOptions(
-                HttpConstantHandler("GET", dashPath, dashContent,
+                HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitleUrl),
                     "application/dash+xml")
                     .withHeader("Access-Control-Allow-Origin", "*"), true
             ).withTag("cast");
@@ -679,17 +698,13 @@ class StateCasting {
 
     private suspend fun castDashDirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
-        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
+        val subtitlePath = "/subtitle-${id}";
 
-        val videoPath = "/video-${id}"
-        val audioPath = "/audio-${id}"
-        val subtitlePath = "/subtitle-${id}"
-
-        val videoUrl = if(proxyStreams) url + videoPath else videoSource?.getVideoUrl();
-        val audioUrl = if(proxyStreams) url + audioPath else audioSource?.getAudioUrl();
+        val videoUrl = videoSource?.getVideoUrl();
+        val audioUrl = audioSource?.getAudioUrl();
 
         val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
             return@withContext subtitleSource.getSubtitlesURI();
@@ -718,42 +733,26 @@ class StateCasting {
             }
         }
 
-        if (videoSource != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpProxyHandler("GET", videoPath, videoSource.getVideoUrl(), true)
-                    .withInjectedHost()
-                    .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("cast");
-        }
-        if (audioSource != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpProxyHandler("GET", audioPath, audioSource.getAudioUrl(), true)
-                    .withInjectedHost()
-                    .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("cast");
-        }
-
         val content = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl);
 
         Logger.i(TAG, "Direct dash cast to casting device (videoUrl: $videoUrl, audioUrl: $audioUrl).");
-        Logger.v(TAG) { "Dash manifest: $content" };
         ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble(), speed);
 
-        return listOf(videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
+        return listOf(videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "");
     }
 
     private fun castProxiedHls(video: IPlatformVideoDetails, sourceUrl: String, codec: String?, resumePosition: Double, speed: Double?): List<String> {
         _castServer.removeAllHandlers("castProxiedHlsMaster")
 
         val ad = activeDevice ?: return listOf();
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
 
         val id = UUID.randomUUID();
         val hlsPath = "/hls-${id}"
         val hlsUrl = url + hlsPath
         Logger.i(TAG, "HLS url: $hlsUrl");
 
-        _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", hlsPath) { masterContext ->
+        _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", hlsPath) { masterContext ->
             _castServer.removeAllHandlers("castProxiedHlsVariant")
 
             val headers = masterContext.headers.clone()
@@ -780,7 +779,7 @@ class StateCasting {
                     val proxiedVariantPlaylist = proxyVariantPlaylist(url, id, variantPlaylist, video.isLive)
                     val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
                     masterContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                    return@HttpFunctionHandler
+                    return@HttpFuntionHandler
                 } else {
                     throw e
                 }
@@ -797,7 +796,7 @@ class StateCasting {
                 val newPlaylistPath = "/hls-playlist-${playlistId}"
                 val newPlaylistUrl = url + newPlaylistPath;
 
-                _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", newPlaylistPath) { vpContext ->
+                _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
                     val vpHeaders = vpContext.headers.clone()
                     vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
@@ -827,7 +826,7 @@ class StateCasting {
                     val newPlaylistPath = "/hls-playlist-${playlistId}"
                     newPlaylistUrl = url + newPlaylistPath
 
-                    _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", newPlaylistPath) { vpContext ->
+                    _castServer.addHandlerWithAllowAllOptions(HttpFuntionHandler("GET", newPlaylistPath) { vpContext ->
                         val vpHeaders = vpContext.headers.clone()
                         vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
@@ -916,7 +915,7 @@ class StateCasting {
 
     private suspend fun castHlsIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val hlsPath = "/hls-${id}"
@@ -1044,9 +1043,9 @@ class StateCasting {
 
     private suspend fun castDashIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
-        val proxyStreams = Settings.instance.casting.alwaysProxyRequests || ad !is FCastCastingDevice;
+        val proxyStreams = ad !is FCastCastingDevice;
 
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
+        val url = "http://${ad.localAddress.toString().trim('/')}:${_castServer.port}";
         val id = UUID.randomUUID();
 
         val dashPath = "/dash-${id}"
@@ -1090,11 +1089,8 @@ class StateCasting {
             }
         }
 
-        val dashContent = DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl);
-        Logger.v(TAG) { "Dash manifest: $dashContent" };
-
         _castServer.addHandlerWithAllowAllOptions(
-            HttpConstantHandler("GET", dashPath, dashContent,
+            HttpConstantHandler("GET", dashPath, DashBuilder.generateOnDemandDash(videoSource, videoUrl, audioSource, audioUrl, subtitleSource, subtitlesUrl),
                 "application/dash+xml")
                 .withHeader("Access-Control-Allow-Origin", "*"), true
         ).withTag("cast");
@@ -1120,166 +1116,6 @@ class StateCasting {
         return listOf(dashUrl, videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
 
-    private fun cleanExecutors() {
-        if (_videoExecutor != null) {
-            _videoExecutor?.cleanup()
-            _videoExecutor = null
-        }
-
-        if (_audioExecutor != null) {
-            _audioExecutor?.cleanup()
-            _audioExecutor = null
-        }
-    }
-
-    @OptIn(UnstableApi::class)
-    private suspend fun castDashRaw(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: JSDashManifestRawSource?, audioSource: JSDashManifestRawAudioSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
-        val ad = activeDevice ?: return listOf();
-
-        cleanExecutors()
-        _castServer.removeAllHandlers("castDashRaw")
-
-        val url = "http://${ad.localAddress.toUrlAddress().trim('/')}:${_castServer.port}";
-        val id = UUID.randomUUID();
-
-        val dashPath = "/dash-${id}"
-        val videoPath = "/video-${id}"
-        val audioPath = "/audio-${id}"
-        val subtitlePath = "/subtitle-${id}"
-
-        val dashUrl = url + dashPath;
-        Logger.i(TAG, "DASH url: $dashUrl");
-
-        val videoUrl = url + videoPath
-        val audioUrl = url + audioPath
-
-        val subtitlesUri = if (subtitleSource != null) withContext(Dispatchers.IO) {
-            return@withContext subtitleSource.getSubtitlesURI();
-        } else null;
-
-        var subtitlesUrl: String? = null;
-        if (subtitlesUri != null) {
-            if(subtitlesUri.scheme == "file") {
-                var content: String? = null;
-                val inputStream = contentResolver.openInputStream(subtitlesUri);
-                inputStream?.use { stream ->
-                    val reader = stream.bufferedReader();
-                    content = reader.use { it.readText() };
-                }
-
-                if (content != null) {
-                    _castServer.addHandlerWithAllowAllOptions(
-                        HttpConstantHandler("GET", subtitlePath, content!!, subtitleSource?.format ?: "text/vtt")
-                            .withHeader("Access-Control-Allow-Origin", "*"), true
-                    ).withTag("cast");
-                }
-
-                subtitlesUrl = url + subtitlePath;
-            } else {
-                subtitlesUrl = subtitlesUri.toString();
-            }
-        }
-
-        var dashContent = withContext(Dispatchers.IO) {
-            //TODO: Include subtitlesURl in the future
-            return@withContext if (audioSource != null && videoSource != null) {
-                JSDashManifestMergingRawSource(videoSource, audioSource).generate()
-            } else if (audioSource != null) {
-                audioSource.generate()
-            } else if (videoSource != null) {
-                videoSource.generate()
-            } else {
-                Logger.e(TAG, "Expected at least audio or video to be set")
-                null
-            }
-        } ?: throw Exception("Dash is null")
-
-        for (representation in representationRegex.findAll(dashContent)) {
-            val mediaType = representation.groups[1]?.value ?: throw Exception("Media type should be found")
-            dashContent = mediaInitializationRegex.replace(dashContent) {
-                if (it.range.first < representation.range.first || it.range.last > representation.range.last) {
-                    return@replace it.value
-                }
-
-                if (mediaType.startsWith("video/")) {
-                    return@replace "${it.groups[1]!!.value}=\"${videoUrl}?url=${URLEncoder.encode(it.groups[2]!!.value, "UTF-8").replace("%24Number%24", "\$Number\$")}&amp;mediaType=${URLEncoder.encode(mediaType, "UTF-8")}\""
-                } else if (mediaType.startsWith("audio/")) {
-                    return@replace "${it.groups[1]!!.value}=\"${audioUrl}?url=${URLEncoder.encode(it.groups[2]!!.value, "UTF-8").replace("%24Number%24", "\$Number\$")}&amp;mediaType=${URLEncoder.encode(mediaType, "UTF-8")}\""
-                } else {
-                    throw Exception("Expected audio or video")
-                }
-            }
-        }
-
-        if (videoSource != null && !videoSource.hasRequestExecutor) {
-            throw Exception("Video source without request executor not supported")
-        }
-
-        if (audioSource != null && !audioSource.hasRequestExecutor) {
-            throw Exception("Audio source without request executor not supported")
-        }
-
-        if (audioSource != null && audioSource.hasRequestExecutor) {
-            _audioExecutor = audioSource.getRequestExecutor()
-        }
-
-        if (videoSource != null && videoSource.hasRequestExecutor) {
-            _videoExecutor = videoSource.getRequestExecutor()
-        }
-
-        //TOOD: Else also handle the non request executor case, perhaps add ?url=$originalUrl to the query parameters, ... propagate this for all other flows also
-
-        Logger.v(TAG) { "Dash manifest: $dashContent" };
-
-        _castServer.addHandlerWithAllowAllOptions(
-            HttpConstantHandler("GET", dashPath, dashContent,
-                "application/dash+xml")
-                .withHeader("Access-Control-Allow-Origin", "*"), true
-        ).withTag("castDashRaw");
-
-        if (videoSource != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpFunctionHandler("GET", videoPath) { httpContext ->
-                    val originalUrl = httpContext.query["url"]?.let { URLDecoder.decode(it, "UTF-8") } ?: return@HttpFunctionHandler
-                    val mediaType = httpContext.query["mediaType"]?.let { URLDecoder.decode(it, "UTF-8") } ?: return@HttpFunctionHandler
-
-                    val videoExecutor = _videoExecutor;
-                    if (videoExecutor != null) {
-                        val data = videoExecutor.executeRequest(originalUrl, httpContext.headers)
-                        httpContext.respondBytes(200, HttpHeaders().apply {
-                            put("Content-Type", mediaType)
-                        }, data);
-                    } else {
-                        throw NotImplementedError()
-                    }
-                }.withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("castDashRaw");
-        }
-        if (audioSource != null) {
-            _castServer.addHandlerWithAllowAllOptions(
-                HttpFunctionHandler("GET", audioPath) { httpContext ->
-                    val originalUrl = httpContext.query["url"]?.let { URLDecoder.decode(it, "UTF-8") } ?: return@HttpFunctionHandler
-                    val mediaType = httpContext.query["mediaType"]?.let { URLDecoder.decode(it, "UTF-8") } ?: return@HttpFunctionHandler
-
-                    val audioExecutor = _audioExecutor;
-                    if (audioExecutor != null) {
-                        val data = audioExecutor.executeRequest(originalUrl, httpContext.headers)
-                        httpContext.respondBytes(200, HttpHeaders().apply {
-                            put("Content-Type", mediaType)
-                        }, data);
-                    } else {
-                        throw NotImplementedError()
-                    }
-                }.withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("castDashRaw");
-        }
-
-        Logger.i(TAG, "added new castDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath).");
-        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed);
-
-        return listOf()
-    }
-
     private fun deviceFromCastingDeviceInfo(deviceInfo: CastingDeviceInfo): CastingDevice {
         return when (deviceInfo.type) {
             CastProtocolType.CHROMECAST -> {
@@ -1374,7 +1210,7 @@ class StateCasting {
                 }
             } else {
                 val newDevice = deviceFactory();
-                this.devices[name] = newDevice;
+                devices[name] = newDevice;
 
                 invokeEvents = {
                     onDeviceAdded.emit(newDevice);
@@ -1388,7 +1224,7 @@ class StateCasting {
     fun enableDeveloper(enableDev: Boolean){
         _castServer.removeAllHandlers("dev");
         if(enableDev) {
-            _castServer.addHandler(HttpFunctionHandler("GET", "/dashPlayer") { context ->
+            _castServer.addHandler(HttpFuntionHandler("GET", "/dashPlayer") { context ->
                 if (context.query.containsKey("dashUrl")) {
                     val dashUrl = context.query["dashUrl"];
                     val html = "<div>\n" +
@@ -1428,9 +1264,6 @@ class StateCasting {
     companion object {
         val instance: StateCasting = StateCasting();
 
-        private val representationRegex = Regex("<Representation .*?mimeType=\"(.*?)\".*?>(.*?)<\\/Representation>", RegexOption.DOT_MATCHES_ALL)
-        private val mediaInitializationRegex = Regex("(media|initiali[sz]ation)=\"([^\"]+)\"", RegexOption.DOT_MATCHES_ALL);
-
         private val TAG = "StateCasting";
     }
 }

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -9,10 +9,7 @@ import com.futo.platformplayer.api.http.server.HttpGET
 import com.futo.platformplayer.api.http.server.HttpPOST
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
-import com.futo.platformplayer.api.media.platforms.js.internal.JSDocs
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
-import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.dev.V8RemoteObject
 import com.futo.platformplayer.engine.dev.V8RemoteObject.Companion.gsonStandard
@@ -23,27 +20,18 @@ import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateAssets
 import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.states.StatePlatform
-import com.google.gson.ExclusionStrategy
-import com.google.gson.FieldAttributes
-import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonParser
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.lang.reflect.Field
 import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Modifier
 import java.util.UUID
-import kotlin.reflect.full.findAnnotation
-import kotlin.reflect.full.memberFunctions
-import kotlin.reflect.jvm.javaType
 import kotlin.reflect.jvm.jvmErasure
 
 class DeveloperEndpoints(private val context: Context) {
     private val TAG = "DeveloperEndpoints";
     private val _client = ManagedHttpClient();
     private var _testPlugin: V8Plugin? = null;
-    private var _testPluginFull: JSClient? = null;
     private val testPluginOrThrow: V8Plugin get() = _testPlugin ?: throw IllegalStateException("Attempted to use test plugin without plugin");
     private val _testPluginVariables: HashMap<String, V8RemoteObject> = hashMapOf();
 
@@ -102,22 +90,15 @@ class DeveloperEndpoints(private val context: Context) {
     @HttpGET("/source_docs.js", "application/javascript")
     val devSourceDocsJS = "const sourceDocs = $devSourceDocsJson";
 
-    @HttpGET("/source_doc_urls.json", "application/json")
-    fun devSourceDocUrlsJson(httpContext: HttpContext) {;
-        val docs = JSClient.getMethodDocUrls();
-        httpContext.respondCode(200, Json.encodeToString(docs), "application/json");
-    }
-    @HttpGET("/source_doc_urls.js", "application/javascript")
-    fun devSourceDocUrlsJs(httpContext: HttpContext) {;
-        val docs = JSClient.getMethodDocUrls();
-        httpContext.respondCode(200, "const sourceDocUrls = " + Json.encodeToString(docs), "application/javascript");
-    }
-
     //Dependencies
+    //@HttpGET("/dependencies/vue.js", "application/javascript")
+    //val depVue = StateAssets.readAsset(context, "devportal/dependencies/vue.js", true);
+    //@HttpGET("/dependencies/vuetify.js", "application/javascript")
+    //val depVuetify = StateAssets.readAsset(context, "devportal/dependencies/vuetify.js", true);
+    //@HttpGET("/dependencies/vuetify.min.css", "text/css")
+    //val depVuetifyCss = StateAssets.readAsset(context, "devportal/dependencies/vuetify.min.css", true);
     @HttpGET("/dependencies/FutoMainLogo.svg", "image/svg+xml")
     val depFutoLogo = StateAssets.readAsset(context, "devportal/dependencies/FutoMainLogo.svg");
-    @HttpGET("/favicon.svg", "image/svg+xml")
-    val favicon = StateAssets.readAsset(context, "devportal/dependencies/favicon.svg");
 
     @HttpGET("/reference_plugin.d.ts", "text/plain")
     fun devSourceTSWithRefs(httpContext: HttpContext) {
@@ -209,17 +190,6 @@ class DeveloperEndpoints(private val context: Context) {
             val client = JSHttpClient(null, null, null, config);
             val clientAuth = JSHttpClient(null, null, null, config);
             _testPlugin = V8Plugin(StateApp.instance.context, config, null, client, clientAuth);
-            try {
-                val script = _client.get(config.absoluteScriptUrl);
-                _testPluginFull = JSClient(StateApp.instance.context, SourcePluginDescriptor(
-                    config, null, null, null
-                ), null, script.body?.string() ?: "");
-                _testPluginFull!!.initialize();
-            }
-            catch (ex: Throwable) {
-                Logger.e(TAG, "Loading full client failed", ex);
-                _testPluginFull = null;
-            }
 
             context.respondJson(200, testPluginOrThrow.getPackageVariables());
         }
@@ -442,25 +412,6 @@ class DeveloperEndpoints(private val context: Context) {
             context.respondCode(500, ex::class.simpleName + ":" + ex.message, "text/plain")
         }
     }
-    @HttpGET("/dev/setDevProxy")
-    fun devSetDevProxy(context: HttpContext) {
-        try {
-            val url = context.query.getOrDefault("url", "");
-            val port = context.query.getOrDefault("port", "");
-            if(url.isNullOrEmpty() || port.isNullOrEmpty() || port.toIntOrNull() == null)
-            {
-                StateDeveloper.instance.devProxy = null;
-                context.respondCode(400);
-                return;
-            }
-            StateDeveloper.instance.devProxy = StateDeveloper.DevProxySettings(url, port.toInt());
-            context.respondCode(200, "true", "application/json");
-        }
-        catch(ex: Exception) {
-            Logger.e("DeveloperEndpoints", ex.message, ex);
-            context.respondCode(500, ex::class.simpleName + ":" + ex.message, "text/plain")
-        }
-    }
 
     @HttpGET("/plugin/getDevLogs")
     fun pluginGetDevLogs(context: HttpContext) {
@@ -472,15 +423,6 @@ class DeveloperEndpoints(private val context: Context) {
             context.respondCode(500, ex.message ?: "", "text/plain")
         }
     }
-    @HttpGET("/plugin/getDevHttpExchanges")
-    fun pluginGetDevExchanges(context: HttpContext) {
-        try {
-            context.respondJson(200, StateDeveloper.instance.getHttpExchangesAndClear());
-        }
-        catch(ex: Exception) {
-            context.respondCode(500, ex.message ?: "", "text/plain")
-        }
-    }
     @HttpGET("/plugin/fakeDevLog")
     fun pluginFakeDevLog(context: HttpContext) {
         try {
@@ -498,68 +440,6 @@ class DeveloperEndpoints(private val context: Context) {
         }
     }
 
-    private val _fieldAttributesField = FieldAttributes::class.java.getDeclaredField("field");
-    init {
-        _fieldAttributesField.isAccessible = true;
-    }
-    private val _remoteTestGson = GsonBuilder()
-        .setExclusionStrategies(object : ExclusionStrategy {
-            override fun shouldSkipClass(clazz: Class<*>?): Boolean {
-                return clazz?.simpleName == "JSClient" ||
-                    clazz?.simpleName == "KSerializer[]" ||
-                    clazz?.simpleName == "V8ValueObject";
-            }
-
-            override fun shouldSkipField(f: FieldAttributes?): Boolean {
-                val isPublic = f?.hasModifier(Modifier.PUBLIC) ?: true;
-                if(!isPublic) {
-                    val underlyingField = _fieldAttributesField.get(f) as Field;
-                    return !(underlyingField.declaringClass as Class).methods.any { it.name == "get" + underlyingField.name.replaceFirstChar { it.uppercaseChar() } && Modifier.isPublic(it.modifiers) };
-                }
-                else
-                    return !isPublic;
-            }
-        }).create();
-    @HttpPOST("/plugin/remoteTest")
-    fun pluginRemoteTest(context: HttpContext) {
-        val method = context.query.getOrDefault("method", "");
-        try {
-
-            val parameters = context.readContentString();
-            val paras = JsonParser.parseString(parameters);
-            if(!paras.isJsonArray)
-                throw IllegalArgumentException("Expected json array as body");
-
-            val plugin = _testPluginFull ?: throw IllegalStateException("Plugin not loaded");
-
-            val function = plugin::class.memberFunctions.filter { it.findAnnotation<JSDocs>() != null }
-                .find { it.name == method };
-            if(function == null)
-                throw java.lang.IllegalArgumentException("Plugin method [${function}] not found");
-            val callResult = function.call(*(listOf(plugin) + paras.asJsonArray.take(function.parameters.size - 1).mapIndexed { index, jsonElement ->
-                //For now, manual conversion.
-                val parameter = function.parameters[index + 1];
-                val value = _remoteTestGson.fromJson<Any>(jsonElement, parameter.type.javaType);
-                return@mapIndexed value;
-            }).toTypedArray());
-            val json = if(callResult is IPager<*>)
-                _remoteTestGson.toJson(callResult.getResults())
-            else
-                _remoteTestGson.toJson(callResult);
-            //val json = wrapRemoteResult(callResult, false);
-
-            context.respondCode(200, json);
-        }
-        catch(ex: InvocationTargetException) {
-            Logger.e(TAG, "Remote test for [${method}] is failed", ex.targetException);
-            context.respondCode(500, ex.targetException.message ?: "", "text/plain")
-        }
-        catch(ex: Exception) {
-            Logger.e(TAG, "Remote test for [${method}] is failed", ex);
-            context.respondCode(500, ex.message ?: "", "text/plain")
-        }
-    }
-
     //Internal calls
     @HttpPOST("/get")
     fun get(context: HttpContext) {
@@ -571,7 +451,7 @@ class DeveloperEndpoints(private val context: Context) {
             val resp = _client.get(body.url!!, body.headers);
 
             context.respondCode(200,
-                Json.encodeToString(PackageHttp.BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string())),
+                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.url, resp.code, resp.body?.string())),
                 context.query.getOrDefault("CT", "text/plain"));
         }
         catch(ex: Exception) {

app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt

@@ -96,11 +96,6 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) {
         Logger.i(TAG, "Cleared InstallReceiver.onReceiveResult handler.")
     }
 
-    fun hideExceptionButtons() {
-        _buttonNever.visibility = View.GONE
-        _buttonShowChangelog.visibility = View.GONE
-    }
-
     private fun update() {
         _buttonShowChangelog.visibility = Button.GONE;
         _buttonNever.visibility = Button.GONE;

app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt

@@ -6,12 +6,11 @@ import android.graphics.Color
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.PlatformID
@@ -26,11 +25,7 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
-import com.futo.polycentric.core.ClaimType
-import com.futo.polycentric.core.Store
-import com.futo.polycentric.core.SystemState
-import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
-import com.futo.polycentric.core.toURLInfoSystemLinkUrl
+import com.futo.polycentric.core.*
 import com.google.android.material.button.MaterialButton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -98,7 +93,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
 
             val comment = _editComment.text.toString();
             val processHandle = StatePolycentric.instance.processHandle!!
-            val eventPointer = processHandle.post(comment, ref)
+            val eventPointer = processHandle.post(comment, null, ref)
 
             StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
@@ -123,8 +118,7 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
                 msg = comment,
                 rating = RatingLikeDislikes(0, 0),
                 date = OffsetDateTime.now(),
-                eventPointer = eventPointer,
-                parentReference = ref
+                eventPointer = eventPointer
             ));
 
             dismiss();

app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt

@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
-import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,8 +26,8 @@ import kotlinx.coroutines.launch
 class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
     private lateinit var _imageLoader: ImageView;
     private lateinit var _buttonClose: Button;
-    private lateinit var _buttonAdd: ImageButton;
-    private lateinit var _buttonScanQR: ImageButton;
+    private lateinit var _buttonAdd: Button;
+    private lateinit var _buttonScanQR: Button;
     private lateinit var _textNoDevicesFound: TextView;
     private lateinit var _textNoDevicesRemembered: TextView;
     private lateinit var _recyclerDevices: RecyclerView;
@@ -104,8 +103,6 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         super.show();
         Logger.i(TAG, "Dialog shown.");
 
-        StateCasting.instance.startDiscovering()
-
         (_imageLoader.drawable as Animatable?)?.start();
 
         _devices.clear();
@@ -171,7 +168,6 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
 
         (_imageLoader.drawable as Animatable?)?.stop();
 
-        StateCasting.instance.stopDiscovering()
         StateCasting.instance.onDeviceAdded.remove(this);
         StateCasting.instance.onDeviceChanged.remove(this);
         StateCasting.instance.onDeviceRemoved.remove(this);

app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt

@@ -143,9 +143,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         StateCasting.instance.onActiveDeviceDurationChanged.remove(this);
         StateCasting.instance.onActiveDeviceDurationChanged.subscribe {
-            val dur = it.toFloat().coerceAtLeast(1.0f)
-            _sliderPosition.value = _sliderPosition.value.coerceAtLeast(0.0f).coerceAtMost(dur);
-            _sliderPosition.valueTo = dur
+            _sliderPosition.valueTo = it.toFloat().coerceAtLeast(1.0f);
         };
 
         _device = StateCasting.instance.activeDevice;
@@ -187,10 +185,8 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         _sliderPosition.valueFrom = 0.0f;
         _sliderVolume.valueFrom = 0.0f;
         _sliderVolume.value = d.volume.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo);
-
-        val dur = d.duration.toFloat().coerceAtLeast(1.0f)
-        _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(dur)
-        _sliderPosition.valueTo = dur
+        _sliderPosition.valueTo = d.duration.toFloat().coerceAtLeast(1.0f);
+        _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(_sliderVolume.valueTo);
 
         if (d.canSetVolume) {
             _layoutVolumeAdjustable.visibility = View.VISIBLE;