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

Encryption changes, load more on import subscriptions.

See merge request videostreaming/grayjay!3

app/src/androidTest/java/com/futo/platformplayer/GEncryptionProviderTests.kt

@@ -1,13 +1,14 @@
 package com.futo.platformplayer
 
-import com.futo.platformplayer.encryption.EncryptionProvider
+import com.futo.platformplayer.encryption.GEncryptionProviderV0
+import com.futo.platformplayer.encryption.GEncryptionProviderV1
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 
-class EncryptionProviderTests {
+class GEncryptionProviderTests {
     @Test
-    fun testEncryptDecrypt() {
-        val encryptionProvider = EncryptionProvider.instance
+    fun testEncryptDecryptV1() {
+        val encryptionProvider = GEncryptionProviderV1.instance
         val plaintext = "This is a test string."
 
         // Encrypt the plaintext
@@ -22,8 +23,8 @@ class EncryptionProviderTests {
 
 
     @Test
-    fun testEncryptDecryptBytes() {
-        val encryptionProvider = EncryptionProvider.instance
+    fun testEncryptDecryptBytesV1() {
+        val encryptionProvider = GEncryptionProviderV1.instance
         val bytes = "This is a test string.".toByteArray();
 
         // Encrypt the plaintext
@@ -36,21 +37,36 @@ class EncryptionProviderTests {
         assertArrayEquals(bytes, decrypted);
     }
 
+
     @Test
-    fun testEncryptDecryptBytesPassword() {
-        val encryptionProvider = EncryptionProvider.instance
-        val bytes = "This is a test string.".toByteArray();
-        val password = "1234".padStart(32, '9');
+    fun testEncryptDecryptV0() {
+        val encryptionProvider = GEncryptionProviderV0.instance
+        val plaintext = "This is a test string."
 
         // Encrypt the plaintext
-        val ciphertext = encryptionProvider.encrypt(bytes, password)
+        val ciphertext = encryptionProvider.encrypt(plaintext)
 
         // Decrypt the ciphertext
-        val decrypted = encryptionProvider.decrypt(ciphertext, password)
+        val decrypted = encryptionProvider.decrypt(ciphertext)
+
+        // The decrypted string should be equal to the original plaintext
+        assertEquals(plaintext, decrypted)
+    }
+
+
+    @Test
+    fun testEncryptDecryptBytesV0() {
+        val encryptionProvider = GEncryptionProviderV0.instance
+        val bytes = "This is a test string.".toByteArray();
+
+        // Encrypt the plaintext
+        val ciphertext = encryptionProvider.encrypt(bytes)
+
+        // Decrypt the ciphertext
+        val decrypted = encryptionProvider.decrypt(ciphertext)
 
         // The decrypted string should be equal to the original plaintext
         assertArrayEquals(bytes, decrypted);
-
     }
 
     private fun assertArrayEquals(a: ByteArray, b: ByteArray) {

app/src/androidTest/java/com/futo/platformplayer/GPasswordEncryptionProviderTests.kt

@@ -0,0 +1,45 @@
+package com.futo.platformplayer
+
+import com.futo.platformplayer.encryption.GPasswordEncryptionProviderV0
+import com.futo.platformplayer.encryption.GPasswordEncryptionProviderV1
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+
+class GPasswordEncryptionProviderTests {
+    @Test
+    fun testEncryptDecryptBytesPasswordV1() {
+        val encryptionProvider = GPasswordEncryptionProviderV1();
+        val bytes = "This is a test string.".toByteArray();
+
+        // Encrypt the plaintext
+        val ciphertext = encryptionProvider.encrypt(bytes, "1234")
+
+        // Decrypt the ciphertext
+        val decrypted = encryptionProvider.decrypt(ciphertext, "1234")
+
+        // The decrypted string should be equal to the original plaintext
+        assertArrayEquals(bytes, decrypted);
+    }
+
+    @Test
+    fun testEncryptDecryptBytesPasswordV0() {
+        val encryptionProvider = GPasswordEncryptionProviderV0("1234".padStart(32, '9'));
+        val bytes = "This is a test string.".toByteArray();
+
+        // Encrypt the plaintext
+        val ciphertext = encryptionProvider.encrypt(bytes)
+
+        // Decrypt the ciphertext
+        val decrypted = encryptionProvider.decrypt(ciphertext)
+
+        // The decrypted string should be equal to the original plaintext
+        assertArrayEquals(bytes, decrypted);
+    }
+
+    private fun assertArrayEquals(a: ByteArray, b: ByteArray) {
+        assertEquals(a.size, b.size);
+        for(i in 0 until a.size) {
+            assertEquals(a[i], b[i]);
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -92,6 +92,26 @@
                 <data android:host="*" />
                 <data android:scheme="file" />
 
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.VIEW" />
+                <data android:host="*" />
+                <data android:scheme="content" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.VIEW" />
+                <data android:host="*" />
+                <data android:scheme="file" />
+
                 <data android:mimeType="application/zip" />
             </intent-filter>
             <intent-filter android:autoVerify="true">

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

@@ -159,13 +159,27 @@ class FilterCapability {
 
 
 class PlatformAuthorLink {
-    constructor(id, name, url, thumbnail, subscribers) {
+    constructor(id, name, url, thumbnail, subscribers, membershipUrl) {
         this.id = id ?? PlatformID(); //PlatformID
         this.name = name ?? ""; //string
         this.url = url ?? ""; //string
         this.thumbnail = thumbnail; //string
         if(subscribers)
             this.subscribers = subscribers;
+        if(membershipUrl)
+            this.membershipUrl = membershipUrl ?? null; //string (for backcompat)
+    }
+}
+class PlatformAuthorMembershipLink {
+    constructor(id, name, url, thumbnail, subscribers, membershipUrl) {
+        this.id = id ?? PlatformID(); //PlatformID
+        this.name = name ?? ""; //string
+        this.url = url ?? ""; //string
+        this.thumbnail = thumbnail; //string
+        if(subscribers)
+            this.subscribers = subscribers;
+        if(membershipUrl)
+            this.membershipUrl = membershipUrl ?? null; //string
     }
 }
 class PlatformContent {

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

@@ -185,6 +185,25 @@ fun OffsetDateTime.toHumanNowDiffString(abs: Boolean = false) : String {
 
     return "${value} ${unit}";
 };
+fun Int.toHumanTimeIndicator(abs: Boolean = false) : String {
+    var value = this;
+
+    var unit = "s";
+
+    if(abs) value = abs(value);
+    if(value >= secondsInHour) {
+        value = (this / secondsInHour).toInt();
+        if(abs) value = abs(value);
+        unit = "hr" + (if(value > 1) "s" else "");
+    }
+    else if(value >= secondsInMinute) {
+        value = (this / secondsInMinute).toInt();
+        if(abs) value = abs(value);
+        unit = "min";
+    }
+
+    return "${value}${unit}";
+}
 
 fun Long.toHumanTime(isMs: Boolean): String {
     var scaler = 1;

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

@@ -0,0 +1,20 @@
+package com.futo.platformplayer
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class HorizontalSpaceItemDecoration(private val startSpace: Int, private val betweenSpace: Int, private val endSpace: Int) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.left = betweenSpace
+
+        val position = parent.getChildAdapterPosition(view)
+        if (position == 0) {
+            outRect.left = startSpace
+        }
+
+        else if (position == state.itemCount - 1) {
+            outRect.right = endSpace
+        }
+    }
+}

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

@@ -4,9 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.webkit.CookieManager
-import androidx.core.content.ContextCompat.startActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.*
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -30,6 +28,7 @@ import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import java.io.File
 import java.time.OffsetDateTime
+import java.util.Locale
 
 @Serializable
 data class MenuBottomBarSetting(val id: Int, var enabled: Boolean);
@@ -46,7 +45,7 @@ class Settings : FragmentedStorageFileJson() {
 
     @FormField(
         R.string.manage_polycentric_identity, FieldForm.BUTTON,
-        R.string.manage_your_polycentric_identity, -4
+        R.string.manage_your_polycentric_identity, -5
     )
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
@@ -61,7 +60,7 @@ class Settings : FragmentedStorageFileJson() {
 
     @FormField(
         R.string.show_faq, FieldForm.BUTTON,
-        R.string.get_answers_to_common_questions, -3
+        R.string.get_answers_to_common_questions, -4
     )
     @FormFieldButton(R.drawable.ic_quiz)
     fun openFAQ() {
@@ -74,7 +73,7 @@ class Settings : FragmentedStorageFileJson() {
     }
     @FormField(
         R.string.show_issues, FieldForm.BUTTON,
-        R.string.a_list_of_user_reported_and_self_reported_issues, -2
+        R.string.a_list_of_user_reported_and_self_reported_issues, -3
     )
     @FormFieldButton(R.drawable.ic_data_alert)
     fun openIssues() {
@@ -86,6 +85,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
+    /*
     @FormField(
         R.string.submit_feedback, FieldForm.BUTTON,
         R.string.give_feedback_on_the_application, -1
@@ -104,11 +104,11 @@ class Settings : FragmentedStorageFileJson() {
         } catch (e: Throwable) {
             //Ignored
         }
-    }
+    }*/
 
     @FormField(
         R.string.manage_tabs, FieldForm.BUTTON,
-        R.string.change_tabs_visible_on_the_home_screen, -1
+        R.string.change_tabs_visible_on_the_home_screen, -2
     )
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
@@ -121,11 +121,39 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
+
+
+    @FormField(R.string.home, "group", R.string.configure_how_your_home_tab_works_and_feels, 0)
+    var language = LanguageSettings();
+    @Serializable
+    class LanguageSettings {
+        @FormField(R.string.app_language, FieldForm.DROPDOWN, R.string.may_require_restart, 5, "app_language")
+        @DropdownFieldOptionsId(R.array.app_languages)
+        var appLanguage: Int = 0;
+
+        fun getAppLanguageLocaleString(): String? {
+            return when(appLanguage) {
+                0 -> null
+                1 -> "en";
+                2 -> "de";
+                3 -> "es";
+                4 -> "pt";
+                5 -> "fr"
+                6 -> "ja";
+                7 -> "ko";
+                8 -> "zh";
+                9 -> "ru";
+                10 -> "ar";
+                else -> null
+            }
+        }
+    }
+
     @FormField(R.string.home, "group", R.string.configure_how_your_home_tab_works_and_feels, 1)
     var home = HomeSettings();
     @Serializable
     class HomeSettings {
-        @FormField(R.string.feed_style, FieldForm.DROPDOWN, -1, 5)
+        @FormField(R.string.feed_style, FieldForm.DROPDOWN, R.string.may_require_restart, 5)
         @DropdownFieldOptionsId(R.array.feed_style)
         var homeFeedStyle: Int = 1;
 
@@ -135,21 +163,28 @@ class Settings : FragmentedStorageFileJson() {
             else
                 return FeedStyle.THUMBNAIL;
         }
+
+        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 6)
+        var previewFeedItems: Boolean = true;
     }
 
     @FormField(R.string.search, "group", -1, 2)
     var search = SearchSettings();
     @Serializable
     class SearchSettings {
-        @FormField(R.string.search_history, FieldForm.TOGGLE, -1, 4)
+        @FormField(R.string.search_history, FieldForm.TOGGLE, R.string.may_require_restart, 3)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var searchHistory: Boolean = true;
 
 
-        @FormField(R.string.feed_style, FieldForm.DROPDOWN, -1, 5)
+        @FormField(R.string.feed_style, FieldForm.DROPDOWN, -1, 4)
         @DropdownFieldOptionsId(R.array.feed_style)
         var searchFeedStyle: Int = 1;
 
+        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
+        var previewFeedItems: Boolean = true;
+
+
 
         fun getSearchFeedStyle(): FeedStyle {
             if(searchFeedStyle == 0)
@@ -163,7 +198,7 @@ class Settings : FragmentedStorageFileJson() {
     var subscriptions = SubscriptionsSettings();
     @Serializable
     class SubscriptionsSettings {
-        @FormField(R.string.feed_style, FieldForm.DROPDOWN, -1, 5)
+        @FormField(R.string.feed_style, FieldForm.DROPDOWN, R.string.may_require_restart, 4)
         @DropdownFieldOptionsId(R.array.feed_style)
         var subscriptionsFeedStyle: Int = 1;
 
@@ -174,10 +209,16 @@ class Settings : FragmentedStorageFileJson() {
                 return FeedStyle.THUMBNAIL;
         }
 
+        @FormField(R.string.preview_feed_items, FieldForm.TOGGLE, R.string.preview_feed_items_description, 5)
+        var previewFeedItems: Boolean = true;
+
         @FormField(R.string.fetch_on_app_boot, FieldForm.TOGGLE, R.string.shortly_after_opening_the_app_start_fetching_subscriptions, 6)
         @Serializable(with = FlexibleBooleanSerializer::class)
         var fetchOnAppBoot: Boolean = true;
 
+        @FormField(R.string.fetch_on_tab_opened, FieldForm.TOGGLE, R.string.fetch_on_tab_opened_description, 6)
+        var fetchOnTabOpen: Boolean = true;
+
         @FormField(R.string.background_update, FieldForm.DROPDOWN, R.string.experimental_background_update_for_subscriptions_cache, 7)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
@@ -201,6 +242,16 @@ class Settings : FragmentedStorageFileJson() {
         fun getSubscriptionsConcurrency() : Int {
             return threadIndexToCount(subscriptionConcurrency);
         }
+
+        @FormField(R.string.show_watch_metrics, FieldForm.TOGGLE, R.string.show_watch_metrics_description, 9)
+        var showWatchMetrics: Boolean = false;
+
+        @FormField(R.string.track_playtime_locally, FieldForm.TOGGLE, R.string.track_playtime_locally_description, 10)
+        var allowPlaytimeTracking: Boolean = true;
+
+
+        @FormField(R.string.always_reload_from_cache, FieldForm.TOGGLE, R.string.always_reload_from_cache_description, 11)
+        var alwaysReloadFromCache: Boolean = false;
     }
 
     @FormField(R.string.player, "group", R.string.change_behavior_of_the_player, 4)
@@ -208,10 +259,10 @@ class Settings : FragmentedStorageFileJson() {
     @Serializable
     class PlaybackSettings {
         @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, 0)
-        @DropdownFieldOptionsId(R.array.languages)
+        @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
-        fun getPrimaryLanguage(context: Context) = context.resources.getStringArray(R.array.languages)[primaryLanguage];
+        fun getPrimaryLanguage(context: Context) = context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
         @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 1)
         @DropdownFieldOptionsId(R.array.playback_speeds)
@@ -270,10 +321,6 @@ class Settings : FragmentedStorageFileJson() {
         @DropdownFieldOptionsId(R.array.resume_after_preview)
         var resumeAfterPreview: Int = 1;
 
-
-        @FormField(R.string.live_chat_webview, FieldForm.TOGGLE, R.string.use_the_live_chat_web_window_when_available_over_native_implementation, 8)
-        var useLiveChatWindow: Boolean = true;
-
         fun shouldResumePreview(previewedPosition: Long): Boolean{
             if(resumeAfterPreview == 2)
                 return true;
@@ -281,6 +328,14 @@ class Settings : FragmentedStorageFileJson() {
                 return true;
             return false;
         }
+
+        @FormField(R.string.live_chat_webview, FieldForm.TOGGLE, R.string.use_the_live_chat_web_window_when_available_over_native_implementation, 8)
+        var useLiveChatWindow: Boolean = true;
+
+
+
+        @FormField(R.string.background_switch_audio, FieldForm.TOGGLE, R.string.background_switch_audio_description, 8)
+        var backgroundSwitchToAudio: Boolean = true;
     }
 
     @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 5)
@@ -596,6 +651,23 @@ class Settings : FragmentedStorageFileJson() {
         fun export() {
             StateBackup.startExternalBackup();
         }
+
+
+        /*
+        @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, 4)
+        fun import() {
+            val act = SettingsActivity.getActivity() ?: return;
+            StateApp.instance.requestFileReadAccess(act, null) {
+                if(it != null && it.exists()) {
+                    val name = it.name;
+                    val contents = it.readBytes(act);
+                    if(contents != null) {
+                        if(name != null && name.endsWith(".zip", true))
+                            StateBackup.importZipBytes(act, act.lifecycleScope, contents);
+                    }
+                }
+            }
+        }*/
     }
 
     @FormField(R.string.payment, FieldForm.GROUP, -1, 14)

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

@@ -2,14 +2,24 @@ package com.futo.platformplayer
 
 import android.content.Context
 import android.webkit.CookieManager
+import androidx.work.Constraints
+import androidx.work.Data
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 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.structures.IPager
+import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
@@ -28,6 +38,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
+import java.util.UUID
+import java.util.concurrent.TimeUnit
 import java.util.stream.IntStream.range
 import kotlin.system.measureTimeMillis
 
@@ -87,11 +99,23 @@ class SettingsDev : FragmentedStorageFileJson() {
         val cookieManager: CookieManager = CookieManager.getInstance()
         cookieManager.removeAllCookies(null);
     }
+    @FormField(R.string.test_background_worker, FieldForm.BUTTON,
+        R.string.test_background_worker_description, 3)
+    fun triggerBackgroundUpdate() {
+        val act = SettingsActivity.getActivity()!!;
+        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);
+    }
 
     @Contextual
     @Transient
     @FormField(R.string.v8_benchmarks, FieldForm.GROUP,
-        R.string.various_benchmarks_using_the_integrated_v8_engine, 3)
+        R.string.various_benchmarks_using_the_integrated_v8_engine, 4)
     val v8Benchmarks: V8Benchmarks = V8Benchmarks();
     class V8Benchmarks {
         @FormField(
@@ -139,7 +163,7 @@ class SettingsDev : FragmentedStorageFileJson() {
 
         @FormField(
             R.string.test_v8_communication_speed, FieldForm.BUTTON,
-            R.string.tests_v8_communication_speeds, 2
+            R.string.tests_v8_communication_speeds, 4
         )
         fun testV8RunSpeeds() {
             var plugin: V8Plugin? = null;

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

@@ -82,6 +82,8 @@ class UISlideOverlays {
 
             menu = SlideUpMenuOverlay(container.context, container, "Subscription Settings", null, true, items);
 
+            if(subscription.doNotifications)
+                menu.selectOption(null, "notifications", true, true);
             if(subscription.doFetchLive)
                 menu.selectOption(null, "fetchLive", true, true);
             if(subscription.doFetchStreams)
@@ -92,7 +94,7 @@ class UISlideOverlays {
                 menu.selectOption(null, "fetchPosts", true, true);
 
             menu.onOK.subscribe {
-                StateSubscriptions.instance.saveSubscription(subscription);
+                subscription.save();
                 menu.hide(true);
             };
             menu.onCancel.subscribe {

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

@@ -7,6 +7,8 @@ import android.webkit.ConsoleMessage
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import android.widget.ImageButton
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
@@ -23,6 +25,8 @@ import kotlinx.serialization.json.Json
 
 class LoginActivity : AppCompatActivity() {
     private lateinit var _webView: WebView;
+    private lateinit var _textUrl: TextView;
+    private lateinit var _buttonClose: ImageButton;
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,6 +34,13 @@ class LoginActivity : AppCompatActivity() {
         setContentView(R.layout.activity_login);
         setNavigationBarColorAndIcons();
 
+        _textUrl = findViewById(R.id.text_url);
+        _buttonClose = findViewById(R.id.button_close);
+        _buttonClose.setOnClickListener {
+            finish();
+        }
+
+
         _webView = findViewById(R.id.web_view);
         _webView.settings.javaScriptEnabled = true;
         CookieManager.getInstance().setAcceptCookie(true);
@@ -60,6 +71,8 @@ class LoginActivity : AppCompatActivity() {
         };
         var isFirstLoad = true;
         webViewClient.onPageLoaded.subscribe { view, url ->
+            _textUrl.setText(url ?: "");
+
             if(!isFirstLoad)
                 return@subscribe;
             isFirstLoad = false;

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

@@ -7,6 +7,7 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.util.TypedValue
 import android.view.View
 import android.widget.FrameLayout
@@ -154,6 +155,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
+    override fun attachBaseContext(newBase: Context?) {
+        Logger.i(TAG, "MainActivity.attachBaseContext")
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         StateApp.instance.setGlobalContext(this, lifecycleScope);
         StateApp.instance.mainAppStarting(this);
@@ -497,6 +503,14 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                             };
                             startActivity(intent);
                         }
+                        else if(targetData.startsWith("grayjay://video/")) {
+                            val videoUrl = targetData.substring("grayjay://video/".length);
+                            navigate(_fragVideoDetail, videoUrl);
+                        }
+                        else if(targetData.startsWith("grayjay://channel/")) {
+                            val channelUrl = targetData.substring("grayjay://channel/".length);
+                            navigate(_fragMainChannel, channelUrl);
+                        }
                     }
                     "content" -> {
                         if(!handleContent(targetData, intent.type)) {
@@ -583,6 +597,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             StateBackup.importZipBytes(this, lifecycleScope, data);
             return true;
         }
+        else if(file.lowercase().endsWith(".txt") || mime == "text/plain") {
+            return handleUnknownText(String(data));
+        }
         return false;
     }
     fun handleFile(file: String): Boolean {
@@ -600,6 +617,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             StateBackup.importZipBytes(this, lifecycleScope, readSharedFile(file));
             return true;
         }
+        else if(file.lowercase().endsWith(".txt")) {
+            return handleUnknownText(String(readSharedFile(file)));
+        }
         return false;
     }
     fun handleReconstruction(recon: String) {
@@ -625,6 +645,20 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
+    fun handleUnknownText(text: String): Boolean {
+        try {
+            if(text.startsWith("@/Subscription") || text.startsWith("Subscriptions")) {
+                val lines = text.split("\n").map { it.trim() }.drop(1).filter { it.isNotEmpty() };
+                navigate(_fragImportSubscriptions, lines);
+                return true;
+            }
+        }
+        catch(ex: Throwable) {
+            Logger.e(TAG, ex.message, ex);
+            UIDialogs.showGeneralErrorDialog(this, getString(R.string.failed_to_parse_text_file), ex);
+        }
+        return false;
+    }
     fun handleUnknownJson(name: String?, json: String): Boolean {
 
         val context = this;
@@ -745,6 +779,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         StateSaved.instance.setVideoToOpenBlocking(null);
     }
 
+    inline fun <reified T> isFragmentActive(): Boolean {
+        return fragCurrent is T;
+    }
 
     /**
      * Navigate takes a MainFragment, and makes them the current main visible view

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

@@ -29,6 +29,7 @@ import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.Synchronization
 import com.futo.polycentric.core.SystemState
 import com.futo.polycentric.core.toURLInfoDataLink
+import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.github.dhaval2404.imagepicker.ImagePicker
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -222,7 +223,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
         val avatar = systemState.avatar.selectBestImage(dp_80 * dp_80);
 
         Glide.with(_imagePolycentric)
-            .load(avatar?.toURLInfoDataLink(processHandle.system.toProto(), processHandle.processSecret.process.toProto(), systemState.servers.toList()))
+            .load(avatar?.toURLInfoSystemLinkUrl(processHandle.system.toProto(), avatar.process, systemState.servers.toList()))
             .placeholder(R.drawable.placeholder_profile)
             .crossfade()
             .into(_imagePolycentric)

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

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.activities
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
@@ -13,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.ReadOnlyTextField
@@ -28,6 +30,10 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
 
     private var _isFinished = false;
 
+    override fun attachBaseContext(newBase: Context?) {
+        Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext")
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
@@ -43,6 +49,11 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
             Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
             _form.setObjectValues();
             Settings.instance.save();
+
+            if(field.descriptor?.id == "app_language") {
+                Logger.i("SettingsActivity", "App language change detected, propogating to shared preferences");
+                StateApp.instance.setLocaleSetting(this, Settings.instance.language.getAppLanguageLocaleString());
+            }
         };
         _buttonBack.setOnClickListener {
             finish();

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

@@ -10,7 +10,7 @@ import com.futo.platformplayer.getOrThrow
  * A link to a channel, often with its own name and thumbnail
  */
 @kotlinx.serialization.Serializable
-class PlatformAuthorLink {
+open class PlatformAuthorLink {
     val id: PlatformID;
     val name: String;
     val url: String;
@@ -28,6 +28,9 @@ class PlatformAuthorLink {
 
     companion object {
         fun fromV8(config: SourcePluginConfig, value: V8ValueObject): PlatformAuthorLink {
+            if(value.has("membershipUrl"))
+                return PlatformAuthorMembershipLink.fromV8(config, value);
+
             val context = "AuthorLink"
             return PlatformAuthorLink(PlatformID.fromV8(config, value.getOrThrow(config, "id", context, false)),
                 value.getOrThrow(config ,"name", context),

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

@@ -0,0 +1,33 @@
+package com.futo.platformplayer.api.media.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+
+/**
+ * A link to a channel, often with its own name and thumbnail
+ */
+@kotlinx.serialization.Serializable
+class PlatformAuthorMembershipLink: PlatformAuthorLink {
+    val membershipUrl: String?;
+
+    constructor(id: PlatformID, name: String, url: String, thumbnail: String? = null, subscribers: Long? = null, membershipUrl: String? = null): super(id, name, url, thumbnail, subscribers)
+    {
+        this.membershipUrl = membershipUrl;
+    }
+
+    companion object {
+        fun fromV8(config: SourcePluginConfig, value: V8ValueObject): PlatformAuthorMembershipLink {
+            val context = "AuthorMembershipLink"
+            return PlatformAuthorMembershipLink(PlatformID.fromV8(config, value.getOrThrow(config, "id", context, false)),
+                value.getOrThrow(config ,"name", context),
+                value.getOrThrow(config, "url", context),
+                value.getOrDefault<String>(config, "thumbnail", context, null),
+                if(value.has("subscribers")) value.getOrThrow(config,"subscribers", context) else null,
+                if(value.has("membershipUrl")) value.getOrThrow(config, "membershipUrl", context) else null
+            );
+        }
+    }
+}

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

@@ -20,6 +20,10 @@ class Thumbnails {
     fun getLQThumbnail() : String? {
         return sources.firstOrNull()?.url;
     }
+    fun getMinimumThumbnail(quality: Int): String? {
+        return sources.firstOrNull { it.quality >= quality }?.url ?: getHQThumbnail();
+    }
+
     fun hasMultiple() = sources.size > 1;
 
 

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

@@ -92,6 +92,19 @@ open class JSClient : IPlatformClient {
     val enableInSearch get() = descriptor.appSettings.tabEnabled.enableSearch ?: true
     val enableInHome get() = descriptor.appSettings.tabEnabled.enableHome ?: true
 
+    fun getSubscriptionRateLimit(): Int? {
+        val pluginRateLimit = config.subscriptionRateLimit;
+        val settingsRateLimit = descriptor.appSettings.rateLimit.getSubRateLimit();
+        if(settingsRateLimit > 0) {
+            if(pluginRateLimit != null)
+                return settingsRateLimit.coerceAtMost(pluginRateLimit);
+            else
+                return settingsRateLimit;
+        }
+        else
+            return pluginRateLimit;
+    }
+
     val onDisabled = Event1<JSClient>();
     val onCaptchaException = Event2<JSClient, ScriptCaptchaRequiredException>();
 
@@ -571,7 +584,7 @@ open class JSClient : IPlatformClient {
             if(it.containsKey(claimType)) {
                 val templates = it[claimType];
                 if(templates != null)
-                    for(value in values.keys.sortedBy { it }) {
+                    for(value in values.keys.sortedBy { if(it == config.primaryClaimFieldType) Int.MIN_VALUE else it }) {
                         if(templates.containsKey(value)) {
                             return templates[value]!!.replace("{{CLAIMVALUE}}", values[value]!!);
                         }

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

@@ -1,20 +1,17 @@
 package com.futo.platformplayer.api.media.platforms.js
 
-import com.futo.platformplayer.encryption.EncryptionProvider
-import com.futo.platformplayer.logging.Logger
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
-
 data class SourceAuth(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf()) {
     override fun toString(): String {
         return "(headers: '$headers', cookieString: '$cookieMap')";
     }
 
     fun toEncrypted(): String{
-        return EncryptionProvider.instance.encrypt(serialize());
+        return SourceEncrypted.fromDecrypted { serialize() }.toJson();
     }
 
     private fun serialize(): String {
@@ -25,20 +22,10 @@ data class SourceAuth(val cookieMap: HashMap<String, HashMap<String, String>>? =
         val TAG = "SourceAuth";
 
         fun fromEncrypted(encrypted: String?): SourceAuth? {
-            if(encrypted == null)
-                return null;
-
-            val decrypted = EncryptionProvider.instance.decrypt(encrypted);
-            try {
-                return deserialize(decrypted);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed to deserialize authentication", ex);
-                return null;
-            }
+            return SourceEncrypted.decryptEncrypted(encrypted) { deserialize(it) };
         }
 
-        fun deserialize(str: String): SourceAuth {
+        private fun deserialize(str: String): SourceAuth {
             val data = Json.decodeFromString<SerializedAuth>(str);
             return SourceAuth(data.cookieMap, data.headers);
         }

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

@@ -1,7 +1,5 @@
 package com.futo.platformplayer.api.media.platforms.js
 
-import com.futo.platformplayer.encryption.EncryptionProvider
-import com.futo.platformplayer.logging.Logger
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -13,7 +11,7 @@ data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, Stri
     }
 
     fun toEncrypted(): String{
-        return EncryptionProvider.instance.encrypt(serialize());
+        return SourceEncrypted.fromDecrypted { serialize() }.toJson();
     }
 
     private fun serialize(): String {
@@ -21,20 +19,10 @@ data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, Stri
     }
 
     companion object {
-        val TAG = "SourceAuth";
+        val TAG = "SourceCaptchaData";
 
         fun fromEncrypted(encrypted: String?): SourceCaptchaData? {
-            if(encrypted == null)
-                return null;
-
-            val decrypted = EncryptionProvider.instance.decrypt(encrypted);
-            try {
-                return deserialize(decrypted);
-            }
-            catch(ex: Throwable) {
-                Logger.e(TAG, "Failed to deserialize authentication", ex);
-                return null;
-            }
+            return SourceEncrypted.decryptEncrypted(encrypted) { deserialize(it) };
         }
 
         fun deserialize(str: String): SourceCaptchaData {

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

@@ -0,0 +1,59 @@
+package com.futo.platformplayer.api.media.platforms.js
+
+import com.futo.platformplayer.encryption.GEncryptionProvider
+import com.futo.platformplayer.encryption.GEncryptionProviderV0
+import com.futo.platformplayer.logging.Logger
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.lang.Exception
+
+@Serializable
+data class SourceEncrypted(
+    val encrypted: String,
+    val version: Int = GEncryptionProvider.version
+) {
+    fun toJson(): String {
+        return Json.encodeToString(this);
+    }
+
+    companion object {
+        fun fromDecrypted(serializer: () -> String): SourceEncrypted {
+            return SourceEncrypted(GEncryptionProvider.instance.encrypt(serializer()));
+        }
+
+        fun <T> decryptEncrypted(encrypted: String?, deserializer: (decrypted: String) -> T): T? {
+            if(encrypted == null)
+                return null;
+
+            try {
+                val encryptedSourceAuth = Json.decodeFromString<SourceEncrypted>(encrypted)
+                if (encryptedSourceAuth.version != GEncryptionProvider.version) {
+                    throw Exception("Invalid encryption version.");
+                }
+
+                val decrypted = GEncryptionProvider.instance.decrypt(encryptedSourceAuth.encrypted);
+                try {
+                    return deserializer(decrypted);
+                } catch(ex: Throwable) {
+                    Logger.e(SourceAuth.TAG, "Failed to deserialize SourceEncrypted<T>", ex);
+                    return null;
+                }
+            } catch (e: Throwable) {
+                //Try to fall back to old mechanism, remove this eventually
+                if (!encrypted.contains("version")) {
+                    val decrypted = GEncryptionProviderV0.instance.decrypt(encrypted);
+                    try {
+                        return deserializer(decrypted);
+                    } catch (ex: Throwable) {
+                        Logger.e(SourceAuth.TAG, "Failed to deserialize SourceEncrypted<T>", ex);
+                        return null;
+                    }
+                } else {
+                    return null;
+                }
+            }
+        }
+    }
+}

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

@@ -41,10 +41,12 @@ class SourcePluginConfig(
     val constants: HashMap<String, String> = hashMapOf(),
 
     //TODO: These should be vals...but prob for serialization reasons cannot be changed.
+    var platformUrl: String? = null,
     var subscriptionRateLimit: Int? = null,
     var enableInSearch: Boolean = true,
     var enableInHome: Boolean = true,
-    var supportedClaimTypes: List<Int> = listOf()
+    var supportedClaimTypes: List<Int> = listOf(),
+    var primaryClaimFieldType: Int? = null
 ) : IV8PluginConfig {
 
     val absoluteIconUrl: String? get() = resolveAbsoluteUrl(iconUrl, sourceUrl);
@@ -142,7 +144,10 @@ class SourcePluginConfig(
         val description: String,
         val type: String,
         val default: String? = null,
-        val variable: String? = null
+        val variable: String? = null,
+        val dependency: String? = null,
+        val warningDialog: String? = null,
+        val options: List<String>? = null
     ) {
         @kotlinx.serialization.Transient
         val variableOrName: String get() = variable ?: name;

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

@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.platforms.js
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.serializers.FlexibleBooleanSerializer
+import com.futo.platformplayer.views.fields.DropdownFieldOptions
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
 import kotlinx.serialization.Serializable
@@ -79,6 +80,29 @@ class SourcePluginDescriptor {
             var enableSearch: Boolean? = null;
         }
 
+        @FormField(R.string.ratelimit, "group", R.string.ratelimit_description, 3)
+        var rateLimit = RateLimit();
+        @Serializable
+        class RateLimit {
+            @FormField(R.string.subscriptions, FieldForm.DROPDOWN, R.string.ratelimit_sub_setting_description, 1)
+            @DropdownFieldOptions("Plugin defined", "25", "50", "75", "100", "125", "150", "200")
+            var rateLimitSubs: Int = 0;
+
+            fun getSubRateLimit(): Int {
+                return when(rateLimitSubs) {
+                    0 -> -1
+                    1 -> 25
+                    2 -> 50
+                    3 -> 75
+                    4 -> 100
+                    5 -> 125
+                    6 -> 150
+                    7 -> 200
+                    else -> -1
+                }
+            }
+
+        }
 
 
         fun loadDefaults(config: SourcePluginConfig) {

app/src/main/java/com/futo/platformplayer/background/BackgroundWorker.kt

@@ -4,6 +4,8 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.media.MediaSession2Service.MediaNotification
 import androidx.concurrent.futures.CallbackToFutureAdapter
 import androidx.concurrent.futures.ResolvableFuture
@@ -11,8 +13,12 @@ import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
 import androidx.work.ListenableWorker
 import androidx.work.WorkerParameters
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
@@ -29,10 +35,10 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.time.OffsetDateTime
 
-class BackgroundWorker(private val appContext: Context, workerParams: WorkerParameters) :
+class BackgroundWorker(private val appContext: Context, private val workerParams: WorkerParameters) :
     CoroutineWorker(appContext, workerParams) {
     override suspend fun doWork(): Result {
-        if(StateApp.instance.isMainActive) {
+        if(StateApp.instance.isMainActive && !inputData.getBoolean("bypassMainCheck", false)) {
             Logger.i("BackgroundWorker", "CANCELLED");
             return Result.success();
         }
@@ -86,9 +92,10 @@ class BackgroundWorker(private val appContext: Context, workerParams: WorkerPara
         val newSubChanges = hashSetOf<Subscription>();
         val newItems = mutableListOf<IPlatformContent>();
 
+        val now = OffsetDateTime.now();
         val contentNotifs = mutableListOf<Pair<Subscription, IPlatformContent>>();
         withContext(Dispatchers.IO) {
-            StateSubscriptions.instance.getSubscriptionsFeedWithExceptions(true, false,this, { progress, total ->
+            val results = StateSubscriptions.instance.getSubscriptionsFeedWithExceptions(true, false,this, { progress, total ->
                 Logger.i("BackgroundWorker", "SUBSCRIPTION PROGRESS: ${progress}/${total}");
 
                 synchronized(manager) {
@@ -103,29 +110,46 @@ class BackgroundWorker(private val appContext: Context, workerParams: WorkerPara
                 synchronized(newSubChanges) {
                     if(!newSubChanges.contains(sub)) {
                         newSubChanges.add(sub);
-                        if(sub.doNotifications)
+                        if(sub.doNotifications && content.datetime?.let { it < now } == true)
                             contentNotifs.add(Pair(sub, content));
                     }
                     newItems.add(content);
                 }
             });
+
+            //Only for testing notifications
+            val testNotifs = 0;
+            if(contentNotifs.size == 0 && testNotifs > 0) {
+                results.first.getResults().filter { it is IPlatformVideo && it.datetime?.let { it < now } == true }
+                    .take(testNotifs).forEach {
+                        contentNotifs.add(Pair(StateSubscriptions.instance.getSubscriptions().first(), it));
+                    }
+            }
         }
 
         manager.cancel(12);
 
-        if(newItems.size > 0) {
+        if(contentNotifs.size > 0) {
             try {
                 val items = contentNotifs.take(5).toList()
                 for(i in items.indices) {
                     val contentNotif = items.get(i);
-                    manager.notify(13 + i, NotificationCompat.Builder(appContext, notificationChannel.id)
-                        .setSmallIcon(com.futo.platformplayer.R.drawable.foreground)
-                        .setContentTitle("New video by [${contentNotif.first.channel.name}]")
-                        .setContentText("${contentNotif.second.name}")
-                        .setSilent(true)
-                        .setContentIntent(PendingIntent.getActivity(this.appContext, 0, MainActivity.getVideoIntent(this.appContext, contentNotif.second.url),
-                            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
-                        .setChannelId(notificationChannel.id).build());
+                    val thumbnail = if(contentNotif.second is IPlatformVideo) (contentNotif.second as IPlatformVideo).thumbnails.getHQThumbnail()
+                        else null;
+                    if(thumbnail != null)
+                        Glide.with(appContext).asBitmap()
+                            .load(thumbnail)
+                            .into(object: CustomTarget<Bitmap>() {
+                                override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                                    notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, resource);
+                                }
+                                override fun onLoadCleared(placeholder: Drawable?) {}
+                                override fun onLoadFailed(errorDrawable: Drawable?) {
+                                    notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, null);
+                                }
+                            })
+                    else
+                        notifyNewContent(manager, notificationChannel, 13 + i, contentNotif.first, contentNotif.second, null);
                 }
             }
             catch(ex: Throwable) {
@@ -140,4 +164,20 @@ class BackgroundWorker(private val appContext: Context, workerParams: WorkerPara
                 .setSilent(true)
                 .setChannelId(notificationChannel.id).build());*/
     }
+
+    fun notifyNewContent(manager: NotificationManager, notificationChannel: NotificationChannel, id: Int, sub: Subscription, content: IPlatformContent, thumbnail: Bitmap? = null) {
+        val notifBuilder = NotificationCompat.Builder(appContext, notificationChannel.id)
+            .setSmallIcon(com.futo.platformplayer.R.drawable.foreground)
+            .setContentTitle("New by [${sub.channel.name}]")
+            .setContentText("${content.name}")
+            .setSilent(true)
+            .setContentIntent(PendingIntent.getActivity(this.appContext, 0, MainActivity.getVideoIntent(this.appContext, content.url),
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
+            .setChannelId(notificationChannel.id);
+        if(thumbnail != null) {
+            //notifBuilder.setLargeIcon(thumbnail);
+            notifBuilder.setStyle(NotificationCompat.BigPictureStyle().bigPicture(thumbnail).bigLargeIcon(null as Bitmap?));
+        }
+        manager.notify(id, notifBuilder.build());
+    }
 }

app/src/main/java/com/futo/platformplayer/cache/ChannelContentCache.kt

@@ -18,10 +18,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.time.OffsetDateTime
+import kotlin.streams.toList
 import kotlin.system.measureTimeMillis
 
 class ChannelContentCache {
-    private val _targetCacheSize = 2000;
+    private val _targetCacheSize = 3000;
     val _channelCacheDir = FragmentedStorage.getOrCreateDirectory("channelCache");
     val _channelContents: HashMap<String, ManagedStore<SerializedPlatformContent>>;
     init {
@@ -29,11 +30,11 @@ class ChannelContentCache {
         val initializeTime = measureTimeMillis {
             _channelContents = HashMap(allFiles
                 .filter { it.isDirectory }
-                .associate {
+                .parallelStream().map {
                     Pair(it.name, FragmentedStorage.storeJson(_channelCacheDir, it.name, PlatformContentSerializer())
                             .withoutBackup()
                             .load())
-                });
+                }.toList().associate { it })
         }
         val minDays = OffsetDateTime.now().minusDays(10);
         val totalItems = _channelContents.map { it.value.count() }.sum();
@@ -41,7 +42,7 @@ class ChannelContentCache {
         val trimmed: Int;
         if(toTrim > 0) {
             val redundantContent = _channelContents.flatMap { it.value.getItems().filter { it.datetime != null && it.datetime!!.isBefore(minDays) }.drop(9) }
-                .sortedByDescending { it.datetime!! }.take(toTrim);
+                .sortedBy { it.datetime!! }.take(toTrim);
             for(content in redundantContent)
                 uncacheContent(content);
             trimmed = redundantContent.size;
@@ -82,7 +83,7 @@ class ChannelContentCache {
         val items = validStores.flatMap { it.getItems() }
             .sortedByDescending { it.datetime };
 
-        return DedupContentPager(PlatformContentPager(items, Math.min(150, items.size)), StatePlatform.instance.getEnabledClients().map { it.id });
+        return DedupContentPager(PlatformContentPager(items, Math.min(30, items.size)), StatePlatform.instance.getEnabledClients().map { it.id });
     }
 
     fun uncacheContent(content: SerializedPlatformContent) {

app/src/main/java/com/futo/platformplayer/encryption/GEncryptionProvider.kt

@@ -0,0 +1,8 @@
+package com.futo.platformplayer.encryption
+
+class GEncryptionProvider {
+    companion object {
+        val instance: GEncryptionProviderV1 = GEncryptionProviderV1.instance;
+        val version = 1;
+    }
+}

app/src/main/java/com/futo/platformplayer/encryption/GEncryptionProviderV0.kt

@@ -8,9 +8,8 @@ import java.security.KeyStore
 import javax.crypto.Cipher
 import javax.crypto.KeyGenerator
 import javax.crypto.spec.GCMParameterSpec
-import javax.crypto.spec.SecretKeySpec
 
-class EncryptionProvider {
+class GEncryptionProviderV0 {
     private val _keyStore: KeyStore;
     private val secretKey: Key? get() = _keyStore.getKey(KEY_ALIAS, null);
 
@@ -25,45 +24,43 @@ class EncryptionProvider {
                 .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
                 .setRandomizedEncryptionRequired(false)
                 .build());
-            
+
             keyGenerator.generateKey();
         }
     }
 
-    fun encrypt(decrypted: String, password: String? = null): String {
-        val encodedBytes = encrypt(decrypted.toByteArray(), password);
+    fun encrypt(decrypted: String): String {
+        val encodedBytes = encrypt(decrypted.toByteArray());
         val encrypted = Base64.encodeToString(encodedBytes, Base64.DEFAULT);
         return encrypted;
     }
-    fun encrypt(decrypted: ByteArray, password: String? = null): ByteArray {
+    fun encrypt(decrypted: ByteArray): ByteArray {
         val c: Cipher = Cipher.getInstance(AES_MODE);
-        val keyToUse = if(password == null) secretKey else SecretKeySpec(password.toByteArray(), "AES");
-        c.init(Cipher.ENCRYPT_MODE, keyToUse, GCMParameterSpec(128, FIXED_IV));
+        c.init(Cipher.ENCRYPT_MODE, secretKey, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
         val encodedBytes: ByteArray = c.doFinal(decrypted);
         return encodedBytes;
     }
 
-    fun decrypt(encrypted: String, password: String? = null): String {
+    fun decrypt(encrypted: String): String {
         val c = Cipher.getInstance(AES_MODE);
-        val keyToUse = if(password == null) secretKey else SecretKeySpec(password.toByteArray(), "AES");
-        c.init(Cipher.DECRYPT_MODE, keyToUse, GCMParameterSpec(128, FIXED_IV));
+        c.init(Cipher.DECRYPT_MODE, secretKey, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
         val decrypted = String(c.doFinal(Base64.decode(encrypted, Base64.DEFAULT)));
         return decrypted;
     }
-    fun decrypt(encrypted: ByteArray, password: String? = null): ByteArray {
+    fun decrypt(encrypted: ByteArray): ByteArray {
         val c = Cipher.getInstance(AES_MODE);
-        val keyToUse = if(password == null) secretKey else SecretKeySpec(password.toByteArray(), "AES");
-        c.init(Cipher.DECRYPT_MODE, keyToUse, GCMParameterSpec(128, FIXED_IV));
+        c.init(Cipher.DECRYPT_MODE, secretKey, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
         return c.doFinal(encrypted);
     }
 
     companion object {
-        val instance: EncryptionProvider = EncryptionProvider();
+        val instance: GEncryptionProviderV0 = GEncryptionProviderV0();
 
         private val FIXED_IV = byteArrayOf(12, 43, 127, 2, 99, 22, 6,  78,  24, 53, 8, 101);
         private const val AndroidKeyStore = "AndroidKeyStore";
         private const val KEY_ALIAS = "FUTOMedia_Key";
         private const val AES_MODE = "AES/GCM/NoPadding";
-        private val TAG = "EncryptionProvider";
+        private const val TAG_LENGTH = 128
+        private val TAG = "GEncryptionProviderV0";
     }
 }

app/src/main/java/com/futo/platformplayer/encryption/GEncryptionProviderV1.kt

@@ -0,0 +1,76 @@
+package com.futo.platformplayer.encryption
+
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import android.util.Base64
+import java.security.Key
+import java.security.KeyStore
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.spec.GCMParameterSpec
+
+class GEncryptionProviderV1 {
+    private val _keyStore: KeyStore;
+    private val secretKey: Key? get() = _keyStore.getKey(KEY_ALIAS, null);
+
+    constructor() {
+        _keyStore = KeyStore.getInstance(AndroidKeyStore);
+        _keyStore.load(null);
+
+        if (!_keyStore.containsAlias(KEY_ALIAS)) {
+            val keyGenerator: KeyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, AndroidKeyStore)
+            keyGenerator.init(KeyGenParameterSpec.Builder(KEY_ALIAS, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+                .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+                .setRandomizedEncryptionRequired(false)
+                .build());
+
+            keyGenerator.generateKey();
+        }
+    }
+
+    fun encrypt(decrypted: String): String {
+        val encrypted = encrypt(decrypted.toByteArray());
+        val encoded = Base64.encodeToString(encrypted, Base64.DEFAULT);
+        return encoded;
+    }
+    fun encrypt(decrypted: ByteArray): ByteArray {
+        val ivBytes = generateIv()
+        val c: Cipher = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.ENCRYPT_MODE, secretKey, GCMParameterSpec(TAG_LENGTH, ivBytes));
+        val encodedBytes: ByteArray = c.doFinal(decrypted);
+        return ivBytes + encodedBytes;
+    }
+
+    fun decrypt(data: String): String {
+        val bytes = Base64.decode(data, Base64.DEFAULT)
+        return String(decrypt(bytes));
+    }
+    fun decrypt(bytes: ByteArray): ByteArray {
+        val encrypted = bytes.sliceArray(IntRange(IV_SIZE, bytes.size - 1))
+        val ivBytes = bytes.sliceArray(IntRange(0, IV_SIZE - 1))
+
+        val c = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.DECRYPT_MODE, secretKey, GCMParameterSpec(TAG_LENGTH, ivBytes));
+        return c.doFinal(encrypted);
+    }
+
+    private fun generateIv(): ByteArray {
+        val r = SecureRandom()
+        val ivBytes = ByteArray(IV_SIZE)
+        r.nextBytes(ivBytes)
+        return ivBytes
+    }
+
+    companion object {
+        val instance: GEncryptionProviderV1 = GEncryptionProviderV1();
+
+        private const val AndroidKeyStore = "AndroidKeyStore";
+        private const val KEY_ALIAS = "FUTOMedia_Key";
+        private const val AES_MODE = "AES/GCM/NoPadding";
+        private const val IV_SIZE = 12;
+        private const val TAG_LENGTH = 128
+        private val TAG = "GEncryptionProviderV1";
+    }
+}

app/src/main/java/com/futo/platformplayer/encryption/GPasswordEncryptionProvider.kt

@@ -0,0 +1,8 @@
+package com.futo.platformplayer.encryption
+
+class GPasswordEncryptionProvider {
+    companion object {
+        val version = 1;
+        val instance = GPasswordEncryptionProviderV1.instance;
+    }
+}

app/src/main/java/com/futo/platformplayer/encryption/GPasswordEncryptionProviderV0.kt

@@ -0,0 +1,45 @@
+package com.futo.platformplayer.encryption
+
+import android.util.Base64
+import javax.crypto.Cipher
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+class GPasswordEncryptionProviderV0 {
+    private val _key: SecretKeySpec;
+
+    constructor(password: String) {
+        _key = SecretKeySpec(password.toByteArray(), "AES");
+    }
+
+    fun encrypt(decrypted: String): String {
+        val encodedBytes = encrypt(decrypted.toByteArray());
+        val encrypted = Base64.encodeToString(encodedBytes, Base64.DEFAULT);
+        return encrypted;
+    }
+    fun encrypt(decrypted: ByteArray): ByteArray {
+        val c: Cipher = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.ENCRYPT_MODE, _key, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
+        val encodedBytes: ByteArray = c.doFinal(decrypted);
+        return encodedBytes;
+    }
+
+    fun decrypt(encrypted: String): String {
+        val c = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.DECRYPT_MODE, _key, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
+        val decrypted = String(c.doFinal(Base64.decode(encrypted, Base64.DEFAULT)));
+        return decrypted;
+    }
+    fun decrypt(encrypted: ByteArray): ByteArray {
+        val c = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.DECRYPT_MODE, _key, GCMParameterSpec(TAG_LENGTH, FIXED_IV));
+        return c.doFinal(encrypted);
+    }
+
+    companion object {
+        private val FIXED_IV = byteArrayOf(12, 43, 127, 2, 99, 22, 6,  78,  24, 53, 8, 101);
+        private const val TAG_LENGTH = 128
+        private const val AES_MODE = "AES/GCM/NoPadding";
+        private val TAG = "GPasswordEncryptionProviderV0";
+    }
+}

app/src/main/java/com/futo/platformplayer/encryption/GPasswordEncryptionProviderV1.kt

@@ -0,0 +1,75 @@
+package com.futo.platformplayer.encryption
+
+import android.util.Base64
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+class GPasswordEncryptionProviderV1 {
+    fun encrypt(decrypted: String, password: String): String {
+        val encrypted = encrypt(decrypted.toByteArray(), password);
+        val encoded = Base64.encodeToString(encrypted, Base64.DEFAULT);
+        return encoded;
+    }
+
+    fun encrypt(decrypted: ByteArray, password: String): ByteArray {
+        val saltBytes = generateSalt()
+        val ivBytes = generateIv()
+        val c: Cipher = Cipher.getInstance(AES_MODE);
+        val key = deriveKeyFromPassword(password, saltBytes)
+
+        c.init(Cipher.ENCRYPT_MODE, key, GCMParameterSpec(TAG_LENGTH, ivBytes));
+        val encodedBytes: ByteArray = c.doFinal(decrypted);
+        return saltBytes + ivBytes + encodedBytes;
+    }
+
+    fun decrypt(data: String, password: String): String {
+        val bytes = Base64.decode(data, Base64.DEFAULT)
+        return String(decrypt(bytes, password));
+    }
+    fun decrypt(bytes: ByteArray, password: String): ByteArray {
+        val encrypted = bytes.sliceArray(IntRange(SALT_SIZE + IV_SIZE, bytes.size - 1))
+        val ivBytes = bytes.sliceArray(IntRange(SALT_SIZE, SALT_SIZE + IV_SIZE - 1))
+        val saltBytes = bytes.sliceArray(IntRange(0, SALT_SIZE - 1))
+        val key = deriveKeyFromPassword(password, saltBytes)
+
+        val c = Cipher.getInstance(AES_MODE);
+        c.init(Cipher.DECRYPT_MODE, key, GCMParameterSpec(TAG_LENGTH, ivBytes));
+        return c.doFinal(encrypted);
+    }
+
+    private fun deriveKeyFromPassword(password: String, salt: ByteArray): SecretKeySpec {
+        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
+        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+        val tmp = factory.generateSecret(spec)
+        return SecretKeySpec(tmp.encoded, "AES")
+    }
+
+    private fun generateSalt(): ByteArray {
+        val random = SecureRandom()
+        val salt = ByteArray(SALT_SIZE)
+        random.nextBytes(salt)
+        return salt
+    }
+
+    private fun generateIv(): ByteArray {
+        val r = SecureRandom()
+        val ivBytes = ByteArray(IV_SIZE)
+        r.nextBytes(ivBytes)
+        return ivBytes
+    }
+
+    companion object {
+        val instance = GPasswordEncryptionProviderV1();
+        private const val AES_MODE = "AES/GCM/NoPadding";
+        private const val IV_SIZE = 12
+        private const val SALT_SIZE = 16
+        private const val ITERATION_COUNT = 2 * 65536
+        private const val KEY_LENGTH = 256
+        private const val TAG_LENGTH = 128
+        private val TAG = "GPasswordEncryptionProviderV1";
+    }
+}

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt

@@ -25,6 +25,7 @@ import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.api.media.structures.IRefreshPager
 import com.futo.platformplayer.api.media.structures.IReplacerPager
 import com.futo.platformplayer.api.media.structures.MultiPager
+import com.futo.platformplayer.cache.ChannelContentCache
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
@@ -33,6 +34,7 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.PreviewContentListAdapter
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
@@ -74,9 +76,14 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
 
     private val _taskLoadVideos = TaskHandler<IPlatformChannel, IPager<IPlatformContent>>({lifecycleScope}, {
             return@TaskHandler getContentPager(it);
-        }).success {
+        }).success { livePager ->
             setLoading(false);
-            setPager(it);
+
+            val pager = if(_channel?.let { StateSubscriptions.instance.isSubscribed(it) } == true)
+                ChannelContentCache.cachePagerResults(lifecycleScope, livePager);
+            else livePager;
+
+            setPager(pager);
         }
         .exception<ScriptCaptchaRequiredException> {  }
         .exception<Throwable> {

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelMonetizationFragment.kt

@@ -1,21 +1,20 @@
 package com.futo.platformplayer.fragment.channel.tab
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
-import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.views.buttons.BigButton
+import com.futo.platformplayer.views.SupportView
 
 
 class ChannelMonetizationFragment : Fragment, IChannelTabFragment {
-    private var _buttonStore: BigButton? = null;
+    private var _supportView: SupportView? = null
+    private var _textMonetization: TextView? = null
 
     private var _lastChannel: IPlatformChannel? = null;
     private var _lastPolycentricProfile: PolycentricProfile? = null;
@@ -24,51 +23,39 @@ class ChannelMonetizationFragment : Fragment, IChannelTabFragment {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.fragment_channel_monetization, container, false);
-        _buttonStore = view.findViewById(R.id.button_store);
-
-        _buttonStore?.onClick?.subscribe {
-            _lastPolycentricProfile?.systemState?.store?.let {
-                try {
-                    val uri = Uri.parse(it);
-                    val intent = Intent(Intent.ACTION_VIEW)
-                    intent.data = uri
-                    startActivity(intent)
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to open URI: '${it}'.", e);
-                }
-            }
-        };
+        _supportView = view.findViewById(R.id.support);
+        _textMonetization = view.findViewById(R.id.text_monetization);
 
         _lastChannel?.also {
             setChannel(it);
         };
 
-        _lastPolycentricProfile?.also {
-            setPolycentricProfile(it, animate = false);
-        }
-
+        _supportView?.visibility = View.GONE;
+        _textMonetization?.visibility = View.GONE;
+        setPolycentricProfile(_lastPolycentricProfile, animate = false);
         return view;
     }
 
     override fun onDestroyView() {
         super.onDestroyView();
-        _buttonStore = null;
+        _supportView = null;
+        _textMonetization = null;
     }
 
     override fun setChannel(channel: IPlatformChannel) {
         _lastChannel = channel;
-        _buttonStore?.visibility = View.GONE;
     }
 
     fun setPolycentricProfile(polycentricProfile: PolycentricProfile?, animate: Boolean) {
-        _lastPolycentricProfile = polycentricProfile;
-
-        if (polycentricProfile == null) {
-            return;
-        }
-
-        if (polycentricProfile.systemState.store.isNotEmpty()) {
-            _buttonStore?.visibility = View.VISIBLE;
+        _lastPolycentricProfile = polycentricProfile
+        if (polycentricProfile != null) {
+            _supportView?.setPolycentricProfile(polycentricProfile, animate)
+            _supportView?.visibility = View.VISIBLE
+            _textMonetization?.visibility = View.GONE
+        } else {
+            _supportView?.setPolycentricProfile(null, animate)
+            _supportView?.visibility = View.GONE
+            _textMonetization?.visibility = View.VISIBLE
         }
     }
 

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

@@ -225,7 +225,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
             if (faqIndex != -1) {
                 val button = buttons[faqIndex]
                 buttons.removeAt(faqIndex)
-                buttons.add(1, button)
+                buttons.add(if (buttons.size == 1) 1 else 0, button)
             }
 
             for (data in buttons) {
@@ -252,8 +252,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
             val defs = currentButtonDefinitions?.toMutableList() ?: return
             val metrics = StateApp.instance.displayMetrics ?: resources.displayMetrics;
             _buttonsVisible = floor(metrics.widthPixels.toDouble() / 65.dp(resources).toDouble()).roundToInt();
-            if (_buttonsVisible - 2 >= defs.size) {
-                updateBottomMenuButtons(defs.slice(IntRange(0, defs.size - 1)).toMutableList(), false);
+            if (_buttonsVisible - 1 >= defs.size) {
+                updateBottomMenuButtons(defs.toMutableList(), false);
             } else {
                 updateBottomMenuButtons(defs.slice(IntRange(0, _buttonsVisible - 2)).toMutableList(), true);
                 updateMoreButtons(defs.slice(IntRange(_buttonsVisible - 1, defs.size - 1)).toMutableList());

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

@@ -170,6 +170,10 @@ class ChannelFragment : MainFragment() {
 
             _buttonSubscribe.onSubscribed.subscribe {
                 UISlideOverlays.showSubscriptionOptionsOverlay(it, _overlayContainer);
+                _buttonSubscriptionSettings.visibility = if(_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE;
+            }
+            _buttonSubscribe.onUnSubscribed.subscribe {
+                _buttonSubscriptionSettings.visibility = if(_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE;
             }
 
             _buttonSubscriptionSettings.setOnClickListener {
@@ -382,14 +386,18 @@ class ChannelFragment : MainFragment() {
                 });
             });
 
-            val plugin = StatePlatform.instance.getChannelClientOrNull(channel.url);
-            if (plugin != null && plugin.capabilities.hasSearchChannelContents) {
-                buttons.add(Pair(R.drawable.ic_search) {
-                    _fragment.navigate<SuggestionsFragment>(SuggestionsFragmentData("", SearchType.VIDEO, channel.url));
-                });
-            }
+            _fragment.lifecycleScope.launch(Dispatchers.IO) {
+                val plugin = StatePlatform.instance.getChannelClientOrNull(channel.url);
+                withContext(Dispatchers.Main) {
+                    if (plugin != null && plugin.capabilities.hasSearchChannelContents) {
+                        buttons.add(Pair(R.drawable.ic_search) {
+                            _fragment.navigate<SuggestionsFragment>(SuggestionsFragmentData("", SearchType.VIDEO, channel.url));
+                        });
 
-            _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons);
+                        _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(buttons);
+                    }
+                }
+            }
 
             _buttonSubscribe.setSubscribeChannel(channel);
             _buttonSubscriptionSettings.visibility = if(_buttonSubscribe.isSubscribed) View.VISIBLE else View.GONE;

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

@@ -63,7 +63,7 @@ class ContentSearchResultsFragment : MainFragment() {
     }
 
     fun setPreviewsEnabled(previewsEnabled: Boolean) {
-        _view?.setPreviewsEnabled(previewsEnabled);
+        _view?.setPreviewsEnabled(previewsEnabled && Settings.instance.search.previewFeedItems);
     }
 
     @SuppressLint("ViewConstructor")
@@ -93,6 +93,8 @@ class ContentSearchResultsFragment : MainFragment() {
                 Logger.w(TAG, "Failed to load results.", it);
                 UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
             }
+
+            setPreviewsEnabled(Settings.instance.search.previewFeedItems);
         }
 
         override fun cleanup() {

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

@@ -6,10 +6,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.FrameLayout
 import android.widget.Spinner
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.views.adapters.SubscriptionAdapter
 
 class CreatorsFragment : MainFragment() {
@@ -18,13 +20,16 @@ class CreatorsFragment : MainFragment() {
     override val hasBottomBar: Boolean get() = true;
 
     private var _spinnerSortBy: Spinner? = null;
+    private var _overlayContainer: FrameLayout? = null;
 
     override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val view = inflater.inflate(R.layout.fragment_creators, container, false);
 
         val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription));
         adapter.onClick.subscribe { platformUser -> navigate<ChannelFragment>(platformUser) };
+        adapter.onSettings.subscribe { sub -> _overlayContainer?.let { UISlideOverlays.showSubscriptionOptionsOverlay(sub, it) } }
 
+        _overlayContainer = view.findViewById(R.id.overlay_container);
         val spinnerSortBy: Spinner = view.findViewById(R.id.spinner_sortby);
         spinnerSortBy.adapter = ArrayAdapter(view.context, R.layout.spinner_item_simple, resources.getStringArray(R.array.subscriptions_sortby_array)).also {
             it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
@@ -48,6 +53,7 @@ class CreatorsFragment : MainFragment() {
     override fun onDestroyMainView() {
         super.onDestroyMainView();
         _spinnerSortBy = null;
+        _overlayContainer = null;
     }
 
     companion object {

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

@@ -122,6 +122,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
 
         _toolbarContentView = findViewById(R.id.container_toolbar_content);
 
+        var filteredNextPageCounter = 0;
         _nextPageHandler = TaskHandler<TPager, List<TResult>>({fragment.lifecycleScope}, {
             if (it is IAsyncPager<*>)
                 it.nextPageAsync();
@@ -141,10 +142,15 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
             val filteredResults = filterResults(it);
             recyclerData.results.addAll(filteredResults);
             recyclerData.resultsUnfiltered.addAll(it);
-            if(filteredResults.isEmpty())
-                loadNextPage()
-            else
+            if(filteredResults.isEmpty()) {
+                filteredNextPageCounter++
+                if(filteredNextPageCounter <= 4)
+                    loadNextPage()
+            }
+            else {
+                filteredNextPageCounter = 0;
                 recyclerData.adapter.notifyItemRangeInserted(recyclerData.adapter.childToParentPosition(posBefore), filteredResults.size);
+            }
         }.exception<Throwable> {
             Logger.w(TAG, "Failed to load next page.", it);
             UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {

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

@@ -78,7 +78,7 @@ class HomeFragment : MainFragment() {
     }
 
     fun setPreviewsEnabled(previewsEnabled: Boolean) {
-        _view?.setPreviewsEnabled(previewsEnabled);
+        _view?.setPreviewsEnabled(previewsEnabled && Settings.instance.home.previewFeedItems);
     }
 
     @SuppressLint("ViewConstructor")
@@ -122,6 +122,8 @@ class HomeFragment : MainFragment() {
                     setLoading(false);
                 };
             };
+
+            setPreviewsEnabled(Settings.instance.home.previewFeedItems);
         }
 
         fun onShown() {

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

@@ -63,6 +63,7 @@ class ImportSubscriptionsFragment : MainFragment() {
         private var _textSelectDeselectAll: TextView;
         private var _textNothingToImport: TextView;
         private var _textCounter: TextView;
+        private var _textLoadMore: TextView;
         private var _adapterView: AnyAdapterView<SelectableIPlatformChannel, ImportSubscriptionViewHolder>;
         private var _links: List<String> = listOf();
         private val _items: ArrayList<SelectableIPlatformChannel> = arrayListOf();
@@ -79,6 +80,7 @@ class ImportSubscriptionsFragment : MainFragment() {
             _textNothingToImport = findViewById(R.id.nothing_to_import);
             _textSelectDeselectAll = findViewById(R.id.text_select_deselect_all);
             _textCounter = findViewById(R.id.text_select_counter);
+            _textLoadMore = findViewById(R.id.text_load_more);
             _spinner = findViewById(R.id.channel_loader);
 
             _adapterView = findViewById<RecyclerView>(R.id.recycler_import).asAny( _items) {
@@ -120,6 +122,19 @@ class ImportSubscriptionsFragment : MainFragment() {
                 //UIDialogs.showDataRetryDialog(layoutInflater, { load(); });
                 loadNext();
             };
+
+            _textLoadMore.setOnClickListener {
+                if (!_limitToastShown) {
+                    return@setOnClickListener;
+                }
+
+                _textLoadMore.visibility = View.GONE;
+                _limitToastShown = false;
+                _counter = 0;
+                load();
+            };
+
+            _textLoadMore.visibility = View.GONE;
         }
 
         fun cleanup() {
@@ -165,7 +180,8 @@ class ImportSubscriptionsFragment : MainFragment() {
             if (_counter >= MAXIMUM_BATCH_SIZE) {
                 if (!_limitToastShown) {
                     _limitToastShown = true;
-                    UIDialogs.toast(context, "Stopped after {requestCount} to avoid rate limit, re-enter to import rest".replace("{requestCount}", MAXIMUM_BATCH_SIZE.toString()));
+                    _textLoadMore.visibility = View.VISIBLE;
+                    UIDialogs.toast(context, context.getString(R.string.stopped_after_requestcount_to_avoid_rate_limit_click_load_more_to_load_more).replace("{requestCount}", MAXIMUM_BATCH_SIZE.toString()));
                 }
 
                 setLoading(false);
@@ -210,7 +226,7 @@ class ImportSubscriptionsFragment : MainFragment() {
 
     companion object {
         val TAG = "ImportSubscriptionsFragment";
-        private const val MAXIMUM_BATCH_SIZE = 75;
+        private const val MAXIMUM_BATCH_SIZE = 100;
         fun newInstance() = ImportSubscriptionsFragment().apply {}
     }
 }

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

@@ -81,7 +81,7 @@ class SubscriptionsFeedFragment : MainFragment() {
     }
 
     fun setPreviewsEnabled(previewsEnabled: Boolean) {
-        _view?.setPreviewsEnabled(previewsEnabled);
+        _view?.setPreviewsEnabled(previewsEnabled && Settings.instance.subscriptions.previewFeedItems);
     }
 
     @SuppressLint("ViewConstructor")
@@ -108,6 +108,8 @@ class SubscriptionsFeedFragment : MainFragment() {
             };
 
             initializeToolbarContent();
+
+            setPreviewsEnabled(Settings.instance.subscriptions.previewFeedItems);
         }
 
         fun onShown() {
@@ -118,7 +120,11 @@ class SubscriptionsFeedFragment : MainFragment() {
             if(recyclerData.loadedFeedStyle != feedStyle ||
                 recyclerData.lastLoad.getNowDiffSeconds() > 60 ) {
                 recyclerData.lastLoad = OffsetDateTime.now();
-                loadResults();
+
+                if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5 && Settings.instance.subscriptions.fetchOnTabOpen)
+                    loadResults(false);
+                else if(recyclerData.results.size == 0)
+                    loadCache();
             }
 
             val announcementsView = _announcementsView;
@@ -172,9 +178,9 @@ class SubscriptionsFeedFragment : MainFragment() {
         private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
             if(!_bypassRateLimit) {
                 val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
-                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
-                val rateLimitPlugins = subRequestCounts.filter { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true }
-                Logger.w(TAG, "Refreshing subscriptions with requests:\n" + reqCountStr);
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.getSubscriptionRateLimit()}" }.joinToString("\n");
+                val rateLimitPlugins = subRequestCounts.filter { clientCount -> clientCount.key.getSubscriptionRateLimit()?.let { rateLimit -> clientCount.value > rateLimit } == true }
+                Logger.w(TAG, "Trying to refreshing subscriptions with requests:\n" + reqCountStr);
                 if(rateLimitPlugins.any())
                     throw RateLimitException(rateLimitPlugins.map { it.key.id });
             }
@@ -187,7 +193,15 @@ class SubscriptionsFeedFragment : MainFragment() {
 
             return@TaskHandler resp;
         })
-            .success { loadedResult(it); }
+            .success {
+                if(!Settings.instance.subscriptions.alwaysReloadFromCache)
+                    loadedResult(it);
+                else {
+                    finishRefreshLayoutLoader();
+                    setLoading(false);
+                    loadCache();
+                }
+            } //TODO: Remove
             .exception<RateLimitException> {
                 fragment.lifecycleScope.launch(Dispatchers.IO) {
                     val subs = StateSubscriptions.instance.getSubscriptions();
@@ -201,7 +215,7 @@ class SubscriptionsFeedFragment : MainFragment() {
                             context.getString(R.string.rate_limit_warning),  context.getString(R.string.this_is_a_temporary_measure_to_prevent_people_from_hitting_rate_limit_until_we_have_better_support_for_lots_of_subscriptions) + context.getString(R.string.you_have_too_many_subscriptions_for_the_following_plugins),
                             subsByLimited.map { it.first.config.name + ": " + it.second.size + " " + context.getString(R.string.subscriptions) } .joinToString("\n"), 0, UIDialogs.Action("Refresh Anyway", {
                                 _bypassRateLimit = true;
-                                loadResults();
+                                loadResults(true);
                             }, UIDialogs.ActionStyle.DANGEROUS_TEXT),
                             UIDialogs.Action("OK", {
                                 finishRefreshLayoutLoader();
@@ -213,7 +227,7 @@ class SubscriptionsFeedFragment : MainFragment() {
             .exception<Throwable> {
                 Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
                 if(it !is CancellationException)
-                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults(true) });
                 else {
                     finishRefreshLayoutLoader();
                     setLoading(false);
@@ -250,7 +264,10 @@ class SubscriptionsFeedFragment : MainFragment() {
                 else null;
                 _filterSettings.save();
             };
-            loadResults(false)
+            if(Settings.instance.subscriptions.fetchOnTabOpen) //TODO: Do this different, temporary workaround
+                loadResults(false);
+            else
+                loadCache();
         }
 
         override fun filterResults(results: List<IPlatformContent>): List<IPlatformContent> {
@@ -278,22 +295,30 @@ class SubscriptionsFeedFragment : MainFragment() {
             loadResults(true);
         }
 
+
+        private fun loadCache() {
+            Logger.i(TAG, "Subscriptions load cache");
+            val cachePager = ChannelContentCache.instance.getSubscriptionCachePager();
+            val results = cachePager.getResults();
+            Logger.i(TAG, "Subscriptions show cache (${results.size})");
+            setTextCentered(if (results.isEmpty()) context.getString(R.string.no_results_found_swipe_down_to_refresh) else null);
+            setPager(cachePager);
+        }
         private fun loadResults(withRefetch: Boolean = false) {
             setLoading(true);
             Logger.i(TAG, "Subscriptions load");
             if(recyclerData.results.size == 0) {
-                Logger.i(TAG, "Subscriptions load cache");
-                val cachePager = ChannelContentCache.instance.getSubscriptionCachePager();
-                val results = cachePager.getResults();
-                Logger.i(TAG, "Subscriptions show cache (${results.size})");
-                setTextCentered(if (results.isEmpty()) context.getString(R.string.no_results_found_swipe_down_to_refresh) else null);
-                setPager(cachePager);
+                loadCache();
             } else {
                 setTextCentered(null);
             }
             _taskGetPager.run(withRefetch);
         }
 
+        override fun onRestoreCachedData(cachedData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>) {
+            super.onRestoreCachedData(cachedData);
+            setTextCentered(if (cachedData.results.isEmpty()) context.getString(R.string.no_results_found_swipe_down_to_refresh) else null);
+        }
         private fun loadedResult(pager: IPager<IPlatformContent>) {
             Logger.i(TAG, "Subscriptions new pager loaded (${pager.getResults().size})");
 

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

@@ -12,7 +12,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.Icon
 import android.net.Uri
-import android.provider.Browser
 import android.support.v4.media.session.PlaybackStateCompat
 import android.text.Spanned
 import android.util.AttributeSet
@@ -23,7 +22,6 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-import android.view.WindowManager
 import android.widget.*
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.lifecycleScope
@@ -38,6 +36,8 @@ import com.futo.platformplayer.api.media.LiveChatManager
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.ContentNotAvailableYetException
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
 import com.futo.platformplayer.api.media.models.chapters.ChapterType
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
@@ -51,6 +51,7 @@ 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.IJSContentDetails
 import com.futo.platformplayer.api.media.platforms.js.models.JSVideoDetails
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.casting.CastConnectionState
@@ -66,11 +67,13 @@ import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.receivers.MediaControlReceiver
 import com.futo.platformplayer.states.*
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringArrayStorage
+import com.futo.platformplayer.views.MonetizationView
 import com.futo.platformplayer.views.behavior.TouchInterceptFrameLayout
 import com.futo.platformplayer.views.casting.CastView
 import com.futo.platformplayer.views.comments.AddCommentView
@@ -80,6 +83,7 @@ import com.futo.platformplayer.views.overlays.DescriptionOverlay
 import com.futo.platformplayer.views.overlays.LiveChatOverlay
 import com.futo.platformplayer.views.overlays.QueueEditorOverlay
 import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.platformplayer.views.overlays.SupportOverlay
 import com.futo.platformplayer.views.overlays.slideup.*
 import com.futo.platformplayer.views.pills.PillRatingLikesDislikes
 import com.futo.platformplayer.views.pills.RoundButton
@@ -96,7 +100,6 @@ import com.google.android.exoplayer2.Format
 import com.google.android.exoplayer2.ui.PlayerControlView
 import com.google.android.exoplayer2.ui.TimeBar
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException
-import com.google.common.base.Stopwatch
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.*
 import userpackage.Protocol
@@ -193,6 +196,7 @@ class VideoDetailView : ConstraintLayout {
     private val _container_content_replies: RepliesOverlay;
     private val _container_content_description: DescriptionOverlay;
     private val _container_content_liveChat: LiveChatOverlay;
+    private val _container_content_support: SupportOverlay;
 
     private var _container_content_current: View;
 
@@ -202,9 +206,7 @@ class VideoDetailView : ConstraintLayout {
     private val _imageDislikeIcon: ImageView;
     private val _imageLikeIcon: ImageView;
 
-    private val _buttonSupport: LinearLayout;
-    private val _buttonStore: LinearLayout;
-    private val _layoutMonetization: LinearLayout;
+    private val _monetization: MonetizationView;
 
     private val _buttonMore: RoundButton;
 
@@ -294,6 +296,7 @@ class VideoDetailView : ConstraintLayout {
         _container_content_replies = findViewById(R.id.videodetail_container_replies);
         _container_content_description = findViewById(R.id.videodetail_container_description);
         _container_content_liveChat = findViewById(R.id.videodetail_container_livechat);
+        _container_content_support = findViewById(R.id.videodetail_container_support)
 
         _textComments = findViewById(R.id.text_comments);
         _addCommentView = findViewById(R.id.add_comment_view);
@@ -312,11 +315,7 @@ class VideoDetailView : ConstraintLayout {
         _imageLikeIcon = findViewById(R.id.image_like_icon);
         _imageDislikeIcon = findViewById(R.id.image_dislike_icon);
 
-        _buttonSupport = findViewById(R.id.button_support);
-        _buttonStore = findViewById(R.id.button_store);
-        _layoutMonetization = findViewById(R.id.layout_monetization);
-
-        _layoutMonetization.visibility = View.GONE;
+        _monetization = findViewById(R.id.monetization);
         _player.attachPlayer();
 
 
@@ -329,16 +328,12 @@ class VideoDetailView : ConstraintLayout {
             fragment.navigate<VideoDetailFragment>(it.targetUrl);
         };
 
-        _buttonSupport.setOnClickListener {
-            val author = video?.author ?: _searchVideo?.author;
-            author?.let { fragment.navigate<ChannelFragment>(it).selectTab(2); };
-            fragment.lifecycleScope.launch {
-                delay(100);
-                fragment.minimizeVideoDetail();
-            };
+        _monetization.onSupportTap.subscribe {
+            _container_content_support.setPolycentricProfile(_polycentricProfile?.profile, false);
+            switchContentView(_container_content_support);
         };
 
-        _buttonStore.setOnClickListener {
+        _monetization.onStoreTap.subscribe {
             _polycentricProfile?.profile?.systemState?.store?.let {
                 try {
                     val uri = Uri.parse(it);
@@ -351,6 +346,13 @@ class VideoDetailView : ConstraintLayout {
             }
         };
 
+        _player.attachPlayer();
+
+        _container_content_liveChat.onRaidNow.subscribe {
+            StatePlayer.instance.clearQueue();
+            fragment.navigate<VideoDetailFragment>(it.targetUrl);
+        };
+
         StateApp.instance.preventPictureInPicture.subscribe(this) {
             Logger.i(TAG, "StateApp.instance.preventPictureInPicture.subscribe preventPictureInPicture = true");
             preventPictureInPicture = true;
@@ -436,6 +438,7 @@ class VideoDetailView : ConstraintLayout {
             if (!_isCasting && !_didStop) {
                 setLastPositionMilliseconds(position, true);
             }
+            updatePlaybackTracking(position);
         };
 
         _player.onVideoClicked.subscribe {
@@ -495,8 +498,14 @@ class VideoDetailView : ConstraintLayout {
             updatePillButtonVisibilities();
 
             StateCasting.instance.onActiveDevicePlayChanged.subscribe(this) {
-                if (StateCasting.instance.activeDevice != null) {
+                val activeDevice = StateCasting.instance.activeDevice;
+                if (activeDevice != null) {
                     handlePlayChanged(it);
+
+                    val v = video;
+                    if (!it && v != null && v.duration - activeDevice.time.toLong() < 2L) {
+                        nextVideo();
+                    }
                 }
             };
 
@@ -540,6 +549,7 @@ class VideoDetailView : ConstraintLayout {
         _container_content_liveChat.onClose.subscribe { switchContentView(_container_content_main); };
         _container_content_queue.onClose.subscribe { switchContentView(_container_content_main); };
         _container_content_replies.onClose.subscribe { switchContentView(_container_content_main); };
+        _container_content_support.onClose.subscribe { switchContentView(_container_content_main); };
 
         _description_viewMore.setOnClickListener {
             switchContentView(_container_content_description);
@@ -610,6 +620,61 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
+    val _trackingUpdateTimeLock = Object();
+    val _trackingUpdateInterval = 2500;
+    var _trackingLastUpdateTime = System.currentTimeMillis();
+    var _trackingLastPosition: Long = 0;
+    var _trackingLastVideo: IPlatformVideoDetails? = null;
+    var _trackingTotalWatched: Long = 0;
+    var _trackingDidCountView: Boolean = false;
+    var _trackingLastVideoSubscription: Subscription? = null;
+    fun updatePlaybackTracking(position: Long) {
+        if(!Settings.instance.subscriptions.allowPlaytimeTracking)
+            return;
+        val now = System.currentTimeMillis();
+        val shouldUpdate = synchronized(_trackingUpdateTimeLock) {
+            val doUpdate = (now - _trackingLastUpdateTime) > _trackingUpdateInterval;
+            if(doUpdate)
+                _trackingLastUpdateTime = now;
+            return@synchronized doUpdate;
+        }
+        if(shouldUpdate) {
+            val currentVideo = video;
+            val delta = position - _trackingLastPosition;
+            _trackingLastPosition = position;
+
+            if(currentVideo != null && currentVideo == _trackingLastVideo) {
+                if(delta > 500 && delta < _trackingUpdateInterval * 1.5) {
+                    _trackingLastVideoSubscription?.let {
+                        Logger.i(TAG, "Subscription [${it.channel.name}] watch time delta [${delta}]" +
+                                "(${"%.2f".format((_trackingTotalWatched / 1000) / currentVideo.duration.toDouble().coerceAtLeast(1.0))})");
+                        it.updatePlayback(currentVideo, (delta / 1000).toInt());
+                        _trackingTotalWatched += delta;
+                        if(!_trackingDidCountView && currentVideo.duration > 0) {
+                            val percentage = (_trackingTotalWatched / 1000) / currentVideo.duration.toDouble();
+                            if(percentage > 0.4) {
+                                Logger.i(TAG, "Subscription [${it.channel.name}] new view");
+                                _trackingDidCountView = true;
+                                it.addPlaybackView();
+                            }
+                        }
+                        it.saveAsync();
+                    };
+                }
+            }
+            else {
+                if(_trackingLastVideo == null && currentVideo == null)
+                    return;
+                _trackingLastVideo = currentVideo;
+                _trackingTotalWatched = 0;
+                if(currentVideo?.author?.url != null)
+                    _trackingLastVideoSubscription = StateSubscriptions.instance.getSubscription(currentVideo.author.url);
+                else
+                    _trackingLastVideoSubscription = null;
+            }
+        }
+    }
+
     fun updateMoreButtons() {
         val buttons = listOf(RoundButton(context, R.drawable.ic_add, context.getString(R.string.add), TAG_ADD) {
             (video ?: _searchVideo)?.let {
@@ -752,7 +817,7 @@ class VideoDetailView : ConstraintLayout {
             when (Settings.instance.playback.backgroundPlay) {
                 0 -> handlePause();
                 1 -> {
-                    if(!(video?.isLive ?: false))
+                    if(!(video?.isLive ?: false) && Settings.instance.playback.backgroundSwitchToAudio)
                         _player.switchToAudioMode();
                     StatePlayer.instance.startOrUpdateMediaSession(context, video);
                 }
@@ -787,6 +852,7 @@ class VideoDetailView : ConstraintLayout {
         _container_content_replies.cleanup();
         _container_content_queue.cleanup();
         _container_content_description.cleanup();
+        _container_content_support.cleanup();
         StateCasting.instance.onActiveDevicePlayChanged.remove(this);
         StateCasting.instance.onActiveDeviceTimeChanged.remove(this);
         StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this);
@@ -988,6 +1054,7 @@ class VideoDetailView : ConstraintLayout {
                 }
                 catch(ex: Throwable) {
                     Logger.e(TAG, "Failed to get chapters", ex);
+                    _player.setChapters(null);
 
                     /*withContext(Dispatchers.Main) {
                         UIDialogs.toast(context, "Failed to get chapters\n" + ex.message);
@@ -1034,6 +1101,11 @@ class VideoDetailView : ConstraintLayout {
             (_channelName.layoutParams as MarginLayoutParams).setMargins(0, (DP_2).toInt(), 0, 0);
         }
 
+        video.author.let {
+            if(it is PlatformAuthorMembershipLink && !it.membershipUrl.isNullOrEmpty())
+                _monetization.setPlatformMembership(video.id.pluginId, it.membershipUrl);
+        }
+
         _minimize_title.text = video.name;
         _minimize_meta.text = video.author.name;
 
@@ -1749,6 +1821,7 @@ class VideoDetailView : ConstraintLayout {
         _isCasting = isCasting;
 
         if(isCasting) {
+            setFullscreen(false);
             _player.stop();
             _player.hideControls(false);
             _cast.visibility = View.VISIBLE;
@@ -2036,12 +2109,7 @@ class VideoDetailView : ConstraintLayout {
             _creatorThumbnail.setHarborAvailable(profile != null, animate);
         }
 
-        if (profile != null) {
-            _channelName.text = cachedPolycentricProfile.profile.systemState.username;
-            _layoutMonetization.visibility = View.VISIBLE;
-        } else {
-            _layoutMonetization.visibility = View.GONE;
-        }
+        _monetization.setPolycentricProfile(cachedPolycentricProfile, animate);
     }
 
     fun setProgressBarOverlayed(isOverlayed: Boolean?) {

app/src/main/java/com/futo/platformplayer/images/PolycentricModelLoader.java

@@ -1,5 +1,7 @@
 package com.futo.platformplayer.images;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;

app/src/main/java/com/futo/platformplayer/models/Subscription.kt

@@ -4,9 +4,12 @@ import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.contents.IPlatformContentDetails
 import com.futo.platformplayer.getNowDiffDays
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StateSubscriptions
 import java.time.OffsetDateTime
 
 @kotlinx.serialization.Serializable
@@ -43,22 +46,41 @@ class Subscription {
     var uploadStreamInterval : Int = 0;
     var uploadPostInterval : Int = 0;
 
+    var playbackSeconds: Int = 0;
+    var playbackViews: Int = 0;
+
 
     constructor(channel : SerializedChannel) {
         this.channel = channel;
     }
 
-    fun shouldFetchVideos() = true;
-    fun shouldFetchStreams() = doFetchStreams && lastLiveStream.getNowDiffDays() < 7;
-    fun shouldFetchLiveStreams() = doFetchLive && lastLiveStream.getNowDiffDays() < 14;
-    fun shouldFetchPosts() = doFetchPosts && lastPost.getNowDiffDays() < 2;
+    fun shouldFetchVideos() = doFetchVideos &&
+            (lastVideo.getNowDiffDays() < 30 || lastVideoUpdate.getNowDiffDays() >= 1) &&
+            (lastVideo.getNowDiffDays() < 180 || lastVideoUpdate.getNowDiffDays() >= 3);
+    fun shouldFetchStreams() = doFetchStreams && (lastLiveStream.getNowDiffDays() < 7);
+    fun shouldFetchLiveStreams() = doFetchLive && (lastLiveStream.getNowDiffDays() < 14);
+    fun shouldFetchPosts() = doFetchPosts && (lastPost.getNowDiffDays() < 5);
 
     fun getClient() = StatePlatform.instance.getChannelClientOrNull(channel.url);
 
+    fun save() {
+        StateSubscriptions.instance.saveSubscription(this);
+    }
+    fun saveAsync() {
+        StateSubscriptions.instance.saveSubscription(this);
+    }
+
     fun updateChannel(channel: IPlatformChannel) {
         this.channel = SerializedChannel.fromChannel(channel);
     }
 
+    fun updatePlayback(content: IPlatformContentDetails, seconds: Int) {
+        playbackSeconds += seconds;
+    }
+    fun addPlaybackView() {
+        playbackViews += 1;
+    }
+
     fun updateSubscriptionState(type: String, initialPage: List<IPlatformContent>) {
         val interval: Int;
         val mostRecent: OffsetDateTime?;
@@ -84,30 +106,39 @@ class Subscription {
         else {
             interval = 5;
             mostRecent = null;
+            Logger.i("Subscription", "Subscription [${channel.name}]:${type} no results found");
         }
         when(type) {
             ResultCapabilities.TYPE_VIDEOS -> {
                 uploadInterval = interval;
                 if(mostRecent != null)
                     lastVideo = mostRecent;
+                else if(lastVideo.year > 3000)
+                    lastVideo = OffsetDateTime.MIN;
                 lastVideoUpdate = OffsetDateTime.now();
             }
             ResultCapabilities.TYPE_MIXED -> {
                 uploadInterval = interval;
                 if(mostRecent != null)
                     lastVideo = mostRecent;
+                else if(lastVideo.year > 3000)
+                    lastVideo = OffsetDateTime.MIN;
                 lastVideoUpdate = OffsetDateTime.now();
             }
             ResultCapabilities.TYPE_STREAMS -> {
                 uploadStreamInterval = interval;
                 if(mostRecent != null)
                     lastLiveStream = mostRecent;
+                else if(lastLiveStream.year > 3000)
+                    lastLiveStream = OffsetDateTime.MIN;
                 lastStreamUpdate = OffsetDateTime.now();
             }
             ResultCapabilities.TYPE_POSTS -> {
                 uploadPostInterval = interval;
                 if(mostRecent != null)
                     lastPost = mostRecent;
+                else if(lastPost.year > 3000)
+                    lastPost = OffsetDateTime.MIN;
                 lastPostUpdate = OffsetDateTime.now();
             }
         }

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

@@ -39,7 +39,12 @@ class PolycentricCache {
                     ContentType.USERNAME.value,
                     ContentType.DESCRIPTION.value,
                     ContentType.STORE.value,
-                    ContentType.SERVER.value
+                    ContentType.SERVER.value,
+                    ContentType.STORE_DATA.value,
+                    ContentType.PROMOTION_BANNER.value,
+                    ContentType.PROMOTION.value,
+                    ContentType.MEMBERSHIP_URLS.value,
+                    ContentType.DONATION_DESTINATIONS.value
                 )
             ).eventsList.map { e -> SignedEvent.fromProto(e) };
 

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

@@ -10,6 +10,7 @@ import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
 import android.media.MediaMetadata
+import android.os.Build
 import android.os.IBinder
 import android.os.SystemClock
 import android.support.v4.media.MediaMetadataCompat
@@ -278,7 +279,13 @@ class MediaPlaybackService : Service() {
 
         Logger.i(TAG, "Updating notification bitmap=${if (bitmap != null) "yes" else "no."} channelId=${channel.id} icon=${icon} video=${video?.name ?: ""} playWhenReady=${playWhenReady} session.sessionToken=${session.sessionToken}");
 
-        startForeground(MEDIA_NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // For API 29 and above
+            startForeground(MEDIA_NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
+        } else {
+            // For API 28 and below
+            startForeground(MEDIA_NOTIF_ID, notif);
+        }
 
         _notif_last_bitmap = bitmap;
     }

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

@@ -239,6 +239,25 @@ class StateApp {
         return state;
     }
 
+    fun requestFileReadAccess(activity: IWithResultLauncher, path: Uri?, handle: (DocumentFile?)->Unit) {
+        if(activity is Context) {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT);
+            if(path != null)
+                intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path);
+            intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                .or(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+            activity.launchForResult(intent, 98) {
+                if(it.resultCode == Activity.RESULT_OK) {
+                    val uri = it.data?.data;
+                    if(uri != null)
+                        handle(DocumentFile.fromSingleUri(activity, uri));
+                }
+                else
+                    UIDialogs.showDialogOk(context, R.drawable.ic_security_pred, "No access granted");
+            };
+        }
+    }
     fun requestDirectoryAccess(activity: IWithResultLauncher, name: String, purpose: String? = null, path: Uri?, handle: (Uri?)->Unit)
     {
         if(activity is Context)
@@ -335,6 +354,7 @@ class StateApp {
     }
 
     fun mainAppStarting(context: Context) {
+        Logger.i(TAG, "MainApp Starting");
         initializeFiles(true);
 
         val logFile = File(context.filesDir, "log.txt");
@@ -353,14 +373,18 @@ class StateApp {
 
             Logger.setLogConsumers(listOf(AndroidLogConsumer()));
         }
-
         StatePayment.instance.initialize();
+
+        Logger.i(TAG, "MainApp Starting: Initializing [Polycentric]");
         StatePolycentric.instance.load(context);
+        Logger.i(TAG, "MainApp Starting: Initializing [Saved]");
         StateSaved.instance.load();
 
+        Logger.i(TAG, "MainApp Starting: Initializing [Connectivity]");
         displayMetrics = context.resources.displayMetrics;
         ensureConnectivityManager(context);
 
+        Logger.i(TAG, "MainApp Starting: Initializing [Telemetry]");
         if (!BuildConfig.DEBUG) {
             StateTelemetry.instance.initialize();
             StateTelemetry.instance.upload();
@@ -381,11 +405,12 @@ class StateApp {
         }
     }
     fun mainAppStarted(context: Context) {
-        Logger.i(TAG, "App started");
+        Logger.i(TAG, "MainApp Started");
 
         //Start loading cache
         instance.scopeOrNull?.launch(Dispatchers.IO) {
             try {
+                Logger.i(TAG, "MainApp Started: Initializing [ChannelContentCache]");
                 val time = measureTimeMillis {
                     ChannelContentCache.instance;
                 }
@@ -400,10 +425,12 @@ class StateApp {
         if(SettingsDev.instance.developerMode && SettingsDev.instance.devServerSettings.devServerOnBoot)
             StateDeveloper.instance.runServer();
 
+        Logger.i(TAG, "MainApp Started: Check [Migration (Subscriptions)]");
         if(StateSubscriptions.instance.shouldMigrate())
             StateSubscriptions.instance.tryMigrateIfNecessary();
 
         if(Settings.instance.downloads.shouldDownload()) {
+            Logger.i(TAG, "MainApp Started: Check [Downloads]");
             StateDownloads.instance.checkForOutdatedPlaylists();
 
             StateDownloads.instance.getDownloadPlaylists();
@@ -411,8 +438,10 @@ class StateApp {
                 DownloadService.getOrCreateService(context);
         }
 
+        Logger.i(TAG, "MainApp Started: Check [Exports]");
         StateDownloads.instance.checkForExportTodos();
 
+        Logger.i(TAG, "MainApp Started: Initialize [AutoUpdate]");
         val autoUpdateEnabled = Settings.instance.autoUpdate.isAutoUpdateEnabled();
         val shouldDownload = Settings.instance.autoUpdate.shouldDownload();
         val backgroundDownload = Settings.instance.autoUpdate.backgroundDownload == 1;
@@ -436,6 +465,7 @@ class StateApp {
             }
         }
 
+        Logger.i(TAG, "MainApp Started: Initialize [Noisy]");
         _receiverBecomingNoisy?.let {
             _receiverBecomingNoisy = null;
             context.unregisterReceiver(it);
@@ -444,6 +474,7 @@ class StateApp {
         context.registerReceiver(_receiverBecomingNoisy, IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
 
         //Migration
+        Logger.i(TAG, "MainApp Started: Check [Migrations]");
         migrateStores(context, listOf(
             StateSubscriptions.instance.toMigrateCheck(),
             StatePlaylists.instance.toMigrateCheck()
@@ -451,22 +482,26 @@ class StateApp {
 
         if(Settings.instance.subscriptions.fetchOnAppBoot) {
             scope.launch(Dispatchers.IO) {
+                Logger.i(TAG, "MainApp Started: Fetch [Subscriptions]");
                 val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
-                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
-                val isRateLimitReached = !subRequestCounts.any { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true };
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.getSubscriptionRateLimit()}" }.joinToString("\n");
+                val isRateLimitReached = !subRequestCounts.any { clientCount -> clientCount.key.getSubscriptionRateLimit()?.let { rateLimit -> clientCount.value > rateLimit } == true };
                 if (isRateLimitReached) {
                     Logger.w(TAG, "Subscriptions request on boot, request counts:\n${reqCountStr}");
-                    delay(8000);
-                    StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
+                    delay(5000);
+                    if(StateSubscriptions.instance.getOldestUpdateTime().getNowDiffMinutes() > 5)
+                        StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
                 }
                 else
                     Logger.w(TAG, "Too many subscription requests required:\n${reqCountStr}");
             }
         }
 
+        Logger.i(TAG, "MainApp Started: Initialize [BackgroundWork]");
         val interval = Settings.instance.subscriptions.getSubscriptionsBackgroundIntervalMinutes();
         scheduleBackgroundWork(context, interval != 0, interval);
 
+        Logger.i(TAG, "MainApp Started: Initialize [AutoBackup]");
         if(!Settings.instance.backup.didAskAutoBackup && !Settings.instance.backup.shouldAutomaticBackup()) {
             StateAnnouncement.instance.registerAnnouncement("backup", "Set Automatic Backup", "Configure daily backups of your data to restore in case of catastrophic failure.", AnnouncementType.SESSION, null, null, "Configure", {
                 if(context is IWithResultLauncher && !Settings.instance.storage.isStorageMainValid(context)) {
@@ -494,6 +529,7 @@ class StateApp {
             }
         }
 
+        Logger.i(TAG, "MainApp Started: Initialize [Announcements]");
         instance.scopeOrNull?.launch(Dispatchers.IO) {
             try {
                 StateAnnouncement.instance.loadAnnouncements();
@@ -512,7 +548,7 @@ class StateApp {
         }
 
         StateAnnouncement.instance.registerDidYouKnow();
-
+        Logger.i(TAG, "MainApp Started: Finished");
     }
     fun mainAppStartedWithExternalFiles(context: Context) {
         if(!Settings.instance.didFirstStart) {
@@ -711,6 +747,34 @@ class StateApp {
         }
     }
 
+    fun getLocaleContext(baseContext: Context?): Context? {
+        val locale = getLocaleSetting(baseContext);
+        try {
+
+            if (baseContext != null && locale != null) {
+                val config = baseContext.resources.configuration;
+                config.setLocale(locale);
+                return baseContext.createConfigurationContext(config);
+            }
+            return baseContext;
+        }
+        catch (ex: Throwable) {
+            Logger.e(TAG, "Failed to load locale", ex);
+            return baseContext;
+        }
+    }
+    fun getLocaleSetting(context: Context?): Locale? {
+        return context?.getSharedPreferences("language", Context.MODE_PRIVATE)
+                ?.getString("language", null)
+                ?.let { Locale(it) };
+    }
+    fun setLocaleSetting(context: Context?, locale: String?) {
+        context?.getSharedPreferences("language", Context.MODE_PRIVATE)
+            ?.edit()
+            ?.putString("language", locale)
+            ?.apply();
+    }
+
     companion object {
         private val TAG = "StateApp";
         @SuppressLint("StaticFieldLeak") //This is only alive while MainActivity is alive

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

@@ -1,28 +1,19 @@
 package com.futo.platformplayer.states
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.provider.DocumentsContract.EXTRA_INITIAL_URI
-import androidx.activity.ComponentActivity
 import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
-import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.IWithResultLauncher
-import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.copyTo
-import com.futo.platformplayer.copyToOutputStream
-import com.futo.platformplayer.encryption.EncryptionProvider
-import com.futo.platformplayer.getInputStream
+import com.futo.platformplayer.encryption.GPasswordEncryptionProvider
+import com.futo.platformplayer.encryption.GPasswordEncryptionProviderV0
 import com.futo.platformplayer.getNowDiffHours
-import com.futo.platformplayer.getOutputStream
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.readBytes
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -38,9 +29,8 @@ import kotlinx.serialization.json.Json
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
-import java.io.FileInputStream
 import java.io.FileNotFoundException
-import java.io.InputStream
+import java.lang.Exception
 import java.time.OffsetDateTime
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
@@ -82,7 +72,7 @@ class StateBackup {
             val pbytes = password.toByteArray();
             if(pbytes.size < 4 || pbytes.size > 32)
                 throw IllegalStateException("Automatic backup passwords should atleast be 4 character and smaller than 32");
-            return password.padStart(32, '9');
+            return password;
         }
         fun hasAutomaticBackup(): Boolean {
             val context = StateApp.instance.contextOrNull ?: return false;
@@ -106,8 +96,8 @@ class StateBackup {
                         val data = export();
                         val zip = data.asZip();
 
-                        val encryptedZip = EncryptionProvider.instance.encrypt(zip, getAutomaticBackupPassword());
-
+                        //Prepend some magic bytes to identify everything version 1 and up
+                        val encryptedZip = byteArrayOf(0x11, 0x22, 0x33, 0x44, GPasswordEncryptionProvider.version.toByte()) + GPasswordEncryptionProvider.instance.encrypt(zip, getAutomaticBackupPassword());
                         if(!Settings.instance.storage.isStorageMainValid(context)) {
                             StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                                 UIDialogs.toast("Missing permissions for auto-backup, please set the external general directory in settings");
@@ -151,8 +141,7 @@ class StateBackup {
                         throw IllegalStateException("Backup file does not exist");
 
                     val backupBytesEncrypted = backupFiles.first!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.first?.uri}]");
-                    val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
-                    importZipBytes(context, scope, backupBytes);
+                    importEncryptedZipBytes(context, scope, backupBytesEncrypted, password);
                     Logger.i(TAG, "Finished AutoBackup restore");
                 }
                 catch (exSec: FileNotFoundException) {
@@ -179,13 +168,30 @@ class StateBackup {
                         throw ex;
 
                     val backupBytesEncrypted = backupFiles.second!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.second?.uri}]");
-                    val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
-                    importZipBytes(context, scope, backupBytes);
+                    importEncryptedZipBytes(context, scope, backupBytesEncrypted, password);
                     Logger.i(TAG, "Finished AutoBackup restore");
                 }
             }
         }
 
+        private fun importEncryptedZipBytes(context: Context, scope: CoroutineScope, backupBytesEncrypted: ByteArray, password: String) {
+            val backupBytes: ByteArray;
+            //Check magic bytes indicating version 1 and up
+            if (backupBytesEncrypted[0] == 0x11.toByte() && backupBytesEncrypted[1] == 0x22.toByte() && backupBytesEncrypted[2] == 0x33.toByte() && backupBytesEncrypted[3] == 0x44.toByte()) {
+                val version = backupBytesEncrypted[4].toInt();
+                if (version != GPasswordEncryptionProvider.version) {
+                    throw Exception("Invalid encryption version");
+                }
+
+                backupBytes = GPasswordEncryptionProvider.instance.decrypt(backupBytesEncrypted.sliceArray(IntRange(5, backupBytesEncrypted.size - 1)), getAutomaticBackupPassword(password))
+            } else {
+                //Else its a version 0
+                backupBytes = GPasswordEncryptionProviderV0(getAutomaticBackupPassword(password).padStart(32, '9')).decrypt(backupBytesEncrypted);
+            }
+
+            importZipBytes(context, scope, backupBytes);
+        }
+
         fun startExternalBackup() {
             val data = export();
             val now = OffsetDateTime.now();

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

@@ -407,8 +407,9 @@ class StatePlatform {
                     return@async searchResult;
                 } catch(ex: Throwable) {
                     Logger.e(TAG, "getHomeRefresh", ex);
-                    throw ex;
+                    //throw ex;
                     //return@async null;
+                    return@async PlaceholderPager(10, { PlatformContentPlaceholder(it.id, ex) });
                 }
             });
         }.toList();
@@ -762,7 +763,7 @@ class StatePlatform {
             }
 
             if(hasChanges)
-                StateSubscriptions.instance.saveSubscription(sub);
+                sub.save();
         }
 
         return pagerResult;

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

@@ -374,7 +374,10 @@ class StatePlugins {
             if(icon != null)
                 iconsDir.saveIconBinary(config.id, icon);
 
-            _plugins.save(SourcePluginDescriptor(config, existingAuth?.toEncrypted(), existingCaptcha?.toEncrypted(), flags));
+            val descriptor = SourcePluginDescriptor(config, existingAuth?.toEncrypted(), existingCaptcha?.toEncrypted(), flags);
+            descriptor.settings = existing?.settings ?: descriptor.settings;
+            descriptor.appSettings = existing?.appSettings ?: descriptor.appSettings;
+            _plugins.save(descriptor);
             return null;
         }
         catch(ex: Throwable) {

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

@@ -144,14 +144,15 @@ class StatePolycentric {
         return DedupContentPager(pager, StatePlatform.instance.getEnabledClients().map { it.id });
     }
 
-    fun getChannelUrls(url: String, channelId: PlatformID? = null): List<String> {
+    fun getChannelUrls(url: String, channelId: PlatformID? = null, cacheOnly: Boolean = false): List<String> {
 
         var polycentricProfile: PolycentricProfile? = null;
         try {
             polycentricProfile = PolycentricCache.instance.getCachedProfile(url)?.profile;
             if (polycentricProfile == null && channelId != null) {
                 Logger.i("StateSubscriptions", "Get polycentric profile not cached");
-                polycentricProfile = runBlocking { PolycentricCache.instance.getProfileAsync(channelId) }?.profile;
+                if(!cacheOnly)
+                    polycentricProfile = runBlocking { PolycentricCache.instance.getProfileAsync(channelId) }?.profile;
             } else {
                 Logger.i("StateSubscriptions", "Get polycentric profile cached");
             }

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

@@ -32,12 +32,14 @@ import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithm
 import com.futo.platformplayer.subscription.SubscriptionFetchAlgorithms
 import kotlinx.coroutines.*
+import java.time.OffsetDateTime
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import kotlin.collections.ArrayList
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
+import kotlin.streams.toList
 import kotlin.system.measureTimeMillis
 
 /***
@@ -74,6 +76,13 @@ class StateSubscriptions {
 
     val onSubscriptionsChanged = Event2<List<Subscription>, Boolean>();
 
+    fun getOldestUpdateTime(): OffsetDateTime {
+        val subs = getSubscriptions();
+        if(subs.size == 0)
+            return OffsetDateTime.now();
+        else
+            return subs.minOf { it.lastVideoUpdate };
+    }
     fun getGlobalSubscriptionProgress(): Pair<Int, Int> {
         return Pair(_lastGlobalSubscriptionProgress, _lastGlobalSubscriptionTotal);
     }
@@ -170,6 +179,9 @@ class StateSubscriptions {
     fun saveSubscription(sub: Subscription) {
         _subscriptions.save(sub, false, true);
     }
+    fun saveSubscriptionAsync(sub: Subscription) {
+        _subscriptions.saveAsync(sub, false, true);
+    }
     fun getSubscriptionCount(): Int {
         synchronized(_subscriptions) {
             return _subscriptions.getItems().size;
@@ -229,7 +241,7 @@ class StateSubscriptions {
 
     fun getSubscriptionRequestCount(): Map<JSClient, Int> {
         return SubscriptionFetchAlgorithm.getAlgorithm(_algorithmSubscriptions, StateApp.instance.scope)
-            .countRequests(getSubscriptions());
+            .countRequests(getSubscriptions().associateWith { StatePolycentric.instance.getChannelUrls(it.channel.url, it.channel.id, true) });
     }
 
     fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
@@ -242,13 +254,13 @@ class StateSubscriptions {
 
         }
 
-        val usePolycentric = false;
-        val subUrls = getSubscriptions().associateWith {
+        val usePolycentric = true;
+        val subUrls = getSubscriptions().parallelStream().map {
             if(usePolycentric)
-                StatePolycentric.instance.getChannelUrls(it.channel.url, it.channel.id);
+                Pair(it, StatePolycentric.instance.getChannelUrls(it.channel.url, it.channel.id));
             else
-                listOf(it.channel.url);
-        };
+                Pair(it, listOf(it.channel.url));
+        }.toList().associate { it };
 
         val result = algo.getSubscriptions(subUrls);
         return Pair(result.pager, result.exceptions);

app/src/main/java/com/futo/platformplayer/stores/v2/ManagedStore.kt

@@ -227,18 +227,18 @@ class ManagedStore<T>{
     }
 
 
-    fun saveAsync(obj: T, withReconstruction: Boolean = false) {
+    fun saveAsync(obj: T, withReconstruction: Boolean = false, onlyExisting: Boolean = false) {
         val scope = StateApp.instance.scopeOrNull;
         if(scope != null)
             scope.launch(Dispatchers.IO) {
                 try {
-                    save(obj, withReconstruction);
+                    save(obj, withReconstruction, onlyExisting);
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to save.", e);
                 }
             };
         else
-            save(obj, withReconstruction);
+            save(obj, withReconstruction, onlyExisting);
     }
     fun saveAllAsync(objs: List<T>, withReconstruction: Boolean = false) {
         val scope = StateApp.instance.scopeOrNull;

app/src/main/java/com/futo/platformplayer/subscription/SmartSubscriptionAlgorithm.kt

@@ -33,7 +33,7 @@ class SmartSubscriptionAlgorithm(
                     val client = it.value!! as JSClient;
                     val capabilities = client.getChannelCapabilities();
 
-                    if(capabilities.hasType(ResultCapabilities.TYPE_MIXED))
+                    if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
                         return@flatMap listOf(SubscriptionTask(client, sub, it.key, ResultCapabilities.TYPE_MIXED));
                     else {
                         val types = listOf(
@@ -42,9 +42,13 @@ class SmartSubscriptionAlgorithm(
                               if(sub.shouldFetchPosts()) ResultCapabilities.TYPE_POSTS else null,
                               if(sub.shouldFetchLiveStreams()) ResultCapabilities.TYPE_LIVE else null
                         ).filterNotNull().filter { capabilities.hasType(it) };
-                        return@flatMap types.map {
-                            SubscriptionTask(client, sub, url, it);
-                        };
+
+                        if(!types.isEmpty())
+                            return@flatMap types.map {
+                                SubscriptionTask(client, sub, url, it);
+                            };
+                        else
+                            listOf(SubscriptionTask(client, sub, url, ResultCapabilities.TYPE_VIDEOS, true))
                     }
                 };
         };
@@ -59,7 +63,7 @@ class SmartSubscriptionAlgorithm(
 
 
         for(clientTasks in ordering) {
-            val limit = clientTasks.first.config.subscriptionRateLimit;
+            val limit = clientTasks.first.getSubscriptionRateLimit();
             if(limit == null || limit <= 0)
                 finalTasks.addAll(clientTasks.second);
             else {
@@ -85,21 +89,21 @@ class SmartSubscriptionAlgorithm(
             ResultCapabilities.TYPE_STREAMS -> sub.lastLiveStream;
             ResultCapabilities.TYPE_LIVE -> sub.lastLiveStream;
             ResultCapabilities.TYPE_POSTS -> sub.lastPost;
-            else -> sub.lastVideo; //TODO: minimum of all
+            else -> sub.lastVideo; //TODO: minimum of all?
         };
         val lastUpdate = when(type) {
             ResultCapabilities.TYPE_VIDEOS -> sub.lastVideoUpdate;
             ResultCapabilities.TYPE_STREAMS -> sub.lastLiveStreamUpdate;
             ResultCapabilities.TYPE_LIVE -> sub.lastLiveStreamUpdate;
             ResultCapabilities.TYPE_POSTS -> sub.lastPostUpdate;
-            else -> sub.lastVideoUpdate; //TODO: minimum of all
+            else -> sub.lastVideoUpdate; //TODO: minimum of all?
         };
         val interval = when(type) {
             ResultCapabilities.TYPE_VIDEOS -> sub.uploadInterval;
             ResultCapabilities.TYPE_STREAMS -> sub.uploadStreamInterval;
             ResultCapabilities.TYPE_LIVE -> sub.uploadStreamInterval;
             ResultCapabilities.TYPE_POSTS -> sub.uploadPostInterval;
-            else -> sub.uploadInterval; //TODO: minimum of all
+            else -> sub.uploadInterval; //TODO: minimum of all?
         };
         val lastItemDaysAgo = lastItem.getNowDiffHours();
         val lastUpdateHoursAgo = lastUpdate.getNowDiffHours();

app/src/main/java/com/futo/platformplayer/subscription/SubscriptionsTaskFetchAlgorithm.kt

@@ -2,6 +2,7 @@ package com.futo.platformplayer.subscription
 
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.platforms.js.JSClient
@@ -16,8 +17,10 @@ import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCriticalException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateSubscriptions
 import kotlinx.coroutines.CoroutineScope
@@ -46,15 +49,16 @@ abstract class SubscriptionsTaskFetchAlgorithm(
         val tasksGrouped = tasks.groupBy { it.client }
         val taskCount = tasks.filter { !it.fromCache }.size;
         val cacheCount = tasks.size - taskCount;
+
         Logger.i(TAG, "Starting Subscriptions Fetch:\n" +
-            "   Tasks: ${taskCount}\n" +
-            "   Cached: ${cacheCount}");
+            tasksGrouped.map { "   ${it.key.name}: ${it.value.count { !it.fromCache }}, Cached(${it.value.count { it.fromCache } })" }.joinToString("\n"));
+
         try {
             for(clientTasks in tasksGrouped) {
                 val clientTaskCount = clientTasks.value.filter { !it.fromCache }.size;
                 val clientCacheCount = clientTasks.value.size - clientTaskCount;
-                if(clientCacheCount > 0) {
-                    UIDialogs.toast("[${clientTasks.key.name}] only updating ${clientTaskCount} most urgent channels.")
+                if(clientCacheCount > 0 && clientTaskCount > 0 && StateApp.instance.contextOrNull?.let { it is MainActivity && it.isFragmentActive<SubscriptionsFeedFragment>() } == true) {
+                    UIDialogs.toast("[${clientTasks.key.name}] only updating ${clientTaskCount} most urgent channels (rqs). (${clientCacheCount} cached)");
                 }
             }
 
@@ -75,7 +79,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                     if(result != null) {
                         if(result.pager != null)
                             taskResults.add(result);
-                        else if(result.exception != null) {
+                        if(result.exception != null) {
                             val ex = result.exception;
                             if(ex != null) {
                                 val nonRuntimeEx = findNonRuntimeException(ex);
@@ -155,7 +159,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
 
                         val initialPage = pager.getResults();
                         task.sub.updateSubscriptionState(task.type, initialPage);
-                        StateSubscriptions.instance.saveSubscription(task.sub);
+                        task.sub.save();
 
                         finished++;
                         onProgress.emit(finished, forkTasks.size);
@@ -194,6 +198,7 @@ abstract class SubscriptionsTaskFetchAlgorithm(
                         Logger.i(StateSubscriptions.TAG, "Channel ${task.sub.channel.name} failed, substituting with cache");
                         pager = ChannelContentCache.instance.getChannelCachePager(task.sub.channel.url);
                         taskEx = ex;
+                        return@submit SubscriptionTaskResult(task, pager, taskEx);
                     }
                 }
                 return@submit SubscriptionTaskResult(task, null, taskEx);

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

@@ -0,0 +1,164 @@
+package com.futo.platformplayer.views
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.futo.platformplayer.R
+import com.futo.platformplayer.HorizontalSpaceItemDecoration
+import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
+import com.futo.platformplayer.views.adapters.viewholders.StoreItemViewHolder
+import com.futo.platformplayer.views.platform.PlatformIndicator
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+
+@Serializable
+data class StoreItem(
+    val url: String,
+    val name: String,
+    val image: String
+);
+
+class MonetizationView : LinearLayout {
+    private val _buttonSupport: LinearLayout;
+    private val _buttonStore: LinearLayout;
+    private val _buttonMembership: LinearLayout;
+    private val _membershipPlatform: PlatformIndicator;
+    private var _membershipUrl: String? = null;
+
+    private val _textMerchandise: TextView;
+    private val _recyclerMerchandise: RecyclerView;
+    private val _loaderMerchandise: Loader;
+    private val _layoutMerchandise: FrameLayout;
+    private var _merchandiseAdapterView: AnyAdapterView<StoreItem, StoreItemViewHolder>? = null;
+
+    private val _root: LinearLayout;
+
+    private val _taskLoadMerchandise = TaskHandler<String, List<StoreItem>>(StateApp.instance.scopeGetter, { url ->
+        val client = ManagedHttpClient();
+        val result = client.get("https://storecache.grayjay.app/StoreData?url=$url")
+        if (!result.isOk) {
+            throw Exception("Failed to retrieve store data.");
+        }
+
+        return@TaskHandler result.body?.let { Json.decodeFromString<List<StoreItem>>(it.string()); } ?: listOf();
+    })
+    .success { setMerchandise(it) }
+    .exception<Throwable> {
+        Logger.w(TAG, "Failed to load merchandise profile.", it);
+    };
+
+    val onSupportTap = Event0();
+    val onStoreTap = Event0();
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.view_monetization, this);
+        _buttonSupport = findViewById(R.id.button_support);
+        _buttonStore = findViewById(R.id.button_store);
+        _buttonMembership = findViewById(R.id.button_membership);
+        _membershipPlatform = findViewById(R.id.membership_platform);
+        _buttonMembership.setOnClickListener {
+            _membershipUrl?.let {
+                val uri = Uri.parse(it);
+                val intent = Intent(Intent.ACTION_VIEW);
+                intent.data = uri;
+                context.startActivity(intent);
+            }
+        }
+
+        _textMerchandise = findViewById(R.id.text_merchandise);
+        _recyclerMerchandise = findViewById(R.id.recycler_merchandise);
+        _loaderMerchandise = findViewById(R.id.loader_merchandise);
+        _layoutMerchandise = findViewById(R.id.layout_merchandise);
+
+        _root = findViewById(R.id.root);
+
+        _recyclerMerchandise.addItemDecoration(HorizontalSpaceItemDecoration(30, 16, 30))
+        _merchandiseAdapterView = _recyclerMerchandise.asAny(orientation = RecyclerView.HORIZONTAL);
+
+        _buttonSupport.setOnClickListener { onSupportTap.emit(); }
+        _buttonStore.setOnClickListener { onStoreTap.emit(); }
+        _buttonMembership.visibility = View.GONE;
+        setMerchandise(null);
+    }
+
+    fun setPlatformMembership(pluginId: String?, url: String? = null) {
+        if(pluginId.isNullOrEmpty() || url.isNullOrEmpty()) {
+            _buttonMembership.visibility = GONE;
+            _membershipUrl = null;
+        }
+        else {
+            _membershipUrl = url;
+            _membershipPlatform.setPlatformFromClientID(pluginId);
+            _buttonMembership.visibility = VISIBLE;
+        }
+    }
+
+    private fun setMerchandise(items: List<StoreItem>?) {
+        _loaderMerchandise.stop();
+
+        if (items == null) {
+            _textMerchandise.visibility = View.GONE;
+            _recyclerMerchandise.visibility = View.GONE;
+            _layoutMerchandise.visibility = View.GONE;
+        } else {
+            _textMerchandise.visibility = View.VISIBLE;
+            _recyclerMerchandise.visibility = View.VISIBLE;
+            _layoutMerchandise.visibility = View.VISIBLE;
+            _merchandiseAdapterView?.adapter?.setData(items.shuffled());
+        }
+    }
+
+    fun setPolycentricProfile(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
+        val profile = cachedPolycentricProfile?.profile;
+        if (profile != null) {
+            if (profile.systemState.store.isNotEmpty()) {
+                _buttonStore.visibility = View.VISIBLE;
+            } else {
+                _buttonStore.visibility = View.GONE;
+            }
+
+            _root.visibility = View.VISIBLE;
+        } else {
+            _root.visibility = View.GONE;
+        }
+
+        setMerchandise(null);
+        val storeData = profile?.systemState?.storeData;
+        if (storeData != null) {
+            try {
+                val storeItems = Json.decodeFromString<List<StoreItem>>(storeData);
+                setMerchandise(storeItems);
+            } catch (_: Throwable) {
+                try {
+                    val uri = Uri.parse(storeData);
+                    if (uri.isAbsolute) {
+                        _taskLoadMerchandise.run(storeData);
+                        _loaderMerchandise.start();
+                    } else {
+                        Logger.i(TAG, "Merchandise not loaded, not URL nor JSON")
+                    }
+                } catch (_: Throwable) {
+
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val TAG = "MonetizationView";
+    }
+}

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

@@ -0,0 +1,243 @@
+package com.futo.platformplayer.views
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
+import com.futo.platformplayer.R
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
+import com.futo.platformplayer.views.buttons.BigButton
+import com.futo.polycentric.core.toURLInfoSystemLinkUrl
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.ShapeAppearanceModel
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import userpackage.Protocol.ImageManifest
+
+class SupportView : LinearLayout {
+    private val _layoutStore: LinearLayout
+    private val _buttonPromotion: BigButton
+    private val _layoutMemberships: LinearLayout
+    private val _layoutMembershipEntries: LinearLayout
+    private val _layoutPromotions: LinearLayout
+    private val _layoutPromotionEntries: LinearLayout
+    private val _layoutDonation: LinearLayout
+    private val _layoutDonationEntries: LinearLayout
+    private val _buttonStore: BigButton
+    private val _imagePromotion: ShapeableImageView
+    private var _textNoSupportOptionsSet: TextView
+    private var _polycentricProfile: PolycentricProfile? = null
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.view_support, this);
+
+        _layoutStore = findViewById(R.id.layout_store)
+        _buttonStore = findViewById(R.id.button_store)
+        _layoutMemberships = findViewById(R.id.layout_memberships)
+        _layoutMembershipEntries = findViewById(R.id.layout_membership_entries)
+        _layoutPromotions = findViewById(R.id.layout_promotions)
+        _layoutPromotionEntries = findViewById(R.id.layout_promotion_entries)
+        _layoutDonation = findViewById(R.id.layout_donation)
+        _layoutDonationEntries = findViewById(R.id.layout_donation_entries)
+        _buttonPromotion = findViewById(R.id.button_promotion)
+        _imagePromotion = findViewById(R.id.image_promotion)
+        _textNoSupportOptionsSet = findViewById(R.id.text_no_support_options_set)
+
+        _buttonPromotion.onClick.subscribe { openPromotion() }
+        _imagePromotion.setOnClickListener { openPromotion() }
+        _buttonStore.onClick.subscribe {
+            val storeUrl = _polycentricProfile?.systemState?.store ?: return@subscribe
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(storeUrl))
+            context.startActivity(browserIntent)
+        }
+    }
+
+    private fun openPromotion() {
+        val promotionUrl = _polycentricProfile?.systemState?.promotion ?: return
+        val uri = Uri.parse(promotionUrl)
+        if (!uri.isAbsolute && (uri.scheme == "https" || uri.scheme == "http")) {
+            return
+        }
+
+        val browserIntent = Intent(Intent.ACTION_VIEW, uri)
+        context.startActivity(browserIntent)
+    }
+
+    private fun setMemberships(urls: List<String>) {
+        _layoutMembershipEntries.removeAllViews()
+        for (url in urls) {
+            val button = createMembershipButton(url)
+            _layoutMembershipEntries.addView(button)
+        }
+        _layoutMemberships.visibility = if (urls.isEmpty()) View.GONE else View.VISIBLE
+    }
+
+    private fun createMembershipButton(url: String): BigButton {
+        val uri = Uri.parse(url)
+        val name: String
+        val iconDrawableId: Int
+
+        if (uri.host?.contains("patreon.com") == true) {
+            name = "Patreon"
+            iconDrawableId = R.drawable.patreon
+        } else {
+            name = uri.host.toString()
+            iconDrawableId = R.drawable.ic_web_white
+        }
+
+        return BigButton(context, name, "Become a member on $name", iconDrawableId) {
+            val intent = Intent(Intent.ACTION_VIEW);
+            intent.data = uri;
+            context.startActivity(intent);
+        }.apply {
+            layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        };
+    }
+
+    private fun setDonations(destinations: List<String>) {
+        _layoutDonationEntries.removeAllViews()
+        for (destination in destinations) {
+            val button = createDonationButton(destination)
+            _layoutDonationEntries.addView(button)
+        }
+        _layoutDonation.visibility = if (destinations.isEmpty()) View.GONE else View.VISIBLE
+    }
+
+    private enum class CryptoType {
+        BITCOIN, ETHEREUM, LITECOIN, RIPPLE, UNKNOWN
+    }
+
+    private fun getCryptoType(address: String): CryptoType {
+        val btcRegex = Regex("^(1|3)[1-9A-HJ-NP-Za-km-z]{25,34}$|^(bc1)[0-9a-zA-HJ-NP-Z]{39,59}$")
+        val ethRegex = Regex("^(0x)[0-9a-fA-F]{40}$")
+        val ltcRegex = Regex("^(L|M)[1-9A-HJ-NP-Za-km-z]{26,33}$|^(ltc1)[0-9a-zA-HJ-NP-Z]{39,59}$")
+        val xrpRegex = Regex("^r[1-9A-HJ-NP-Za-km-z]{24,34}$")
+
+        return when {
+            ltcRegex.matches(address) -> CryptoType.LITECOIN
+            btcRegex.matches(address) -> CryptoType.BITCOIN
+            ethRegex.matches(address) -> CryptoType.ETHEREUM
+            xrpRegex.matches(address) -> CryptoType.RIPPLE
+            else -> CryptoType.UNKNOWN
+        }
+    }
+
+    private fun createDonationButton(destination: String): BigButton {
+        val uri = Uri.parse(destination)
+
+        var action: (() -> Unit)? = null
+        val (name, iconDrawableId, cryptoType) = if (uri.scheme == "http" || uri.scheme == "https") {
+            val hostName = uri.host ?: ""
+
+            action = {
+                val intent = Intent(Intent.ACTION_VIEW);
+                intent.data = uri;
+                context.startActivity(intent);
+            }
+
+            if (hostName.contains("paypal.com")) {
+                Triple("Paypal", R.drawable.paypal, null) // Replace with your actual PayPal drawable resource
+            } else {
+                Triple(hostName, R.drawable.ic_web_white, null) // Replace with your generic web drawable resource
+            }
+        } else {
+            action = {
+                val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                val clip = ClipData.newPlainText("Donation Address", destination)
+                clipboard.setPrimaryClip(clip)
+                Toast.makeText(context, "Copied to clipboard", Toast.LENGTH_SHORT).show()
+            }
+
+            when (getCryptoType(destination)) {
+                CryptoType.BITCOIN -> Triple("Bitcoin", R.drawable.bitcoin, CryptoType.BITCOIN)
+                CryptoType.ETHEREUM -> Triple("Ethereum", R.drawable.ethereum, CryptoType.ETHEREUM)
+                CryptoType.LITECOIN -> Triple("Litecoin", R.drawable.litecoin, CryptoType.LITECOIN)
+                CryptoType.RIPPLE -> Triple("Ripple", R.drawable.ripple, CryptoType.RIPPLE)
+                CryptoType.UNKNOWN -> Triple("Unknown", R.drawable.ic_paid, CryptoType.UNKNOWN)
+            }
+        }
+
+        return BigButton(context, name, destination.takeIf { cryptoType != null } ?: "Donate on $name", iconDrawableId, action).apply {
+            layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        };
+    }
+
+    private fun setPromotions(url: String?, imageUrl: String?) {
+        Logger.i(TAG, "setPromotions($url, $imageUrl)")
+
+        if (url != null) {
+            _layoutPromotions.visibility = View.VISIBLE
+
+            if (imageUrl != null) {
+                _buttonPromotion.visibility = View.GONE
+                _imagePromotion.visibility = View.VISIBLE
+
+                Glide.with(_imagePromotion)
+                    .load(imageUrl)
+                    .crossfade()
+                    .into(_imagePromotion)
+            } else {
+                _buttonPromotion.setSecondaryText(url)
+                _buttonPromotion.visibility = View.VISIBLE
+                _imagePromotion.visibility = View.GONE
+            }
+        } else {
+            _layoutPromotions.visibility = View.GONE
+        }
+    }
+
+    fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
+        if (_polycentricProfile == profile) {
+            return
+        }
+
+        if (profile != null) {
+            setDonations(profile.systemState.donationDestinations);
+            setMemberships(profile.systemState.membershipUrls);
+
+            val imageManifest = profile.systemState.promotionBanner?.imageManifestsList?.firstOrNull()
+            if (imageManifest != null) {
+                val imageUrl = imageManifest.toURLInfoSystemLinkUrl(profile.system.toProto(), imageManifest.process, profile.systemState.servers.toList());
+                setPromotions(profile.systemState.promotion, imageUrl);
+            } else {
+                setPromotions(null, null);
+            }
+
+            if (profile.systemState.store.isNotEmpty()) {
+                _layoutStore.visibility = View.VISIBLE
+            } else {
+                _layoutStore.visibility = View.GONE
+            }
+
+            _textNoSupportOptionsSet.visibility = View.GONE
+        } else {
+            setDonations(listOf());
+            setMemberships(listOf());
+            setPromotions(null, null);
+            _layoutStore.visibility = View.GONE
+            _textNoSupportOptionsSet.visibility = View.VISIBLE
+        }
+
+        _polycentricProfile = profile
+    }
+
+    companion object {
+        const val TAG = "SupportView";
+    }
+}

app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistsViewHolder.kt

@@ -43,7 +43,7 @@ class PlaylistsViewHolder : ViewHolder {
     fun bind(p: Playlist) {
         if (p.videos.isNotEmpty()) {
             Glide.with(_imageThumbnail)
-                .load(p.videos[0].thumbnails.getLQThumbnail())
+                .load(p.videos[0].thumbnails.getMinimumThumbnail(380))
                 .placeholder(R.drawable.placeholder_video_thumbnail)
                 .crossfade()
                 .into(_imageThumbnail);

app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt

@@ -14,7 +14,8 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
     private val _confirmationMessage: String;
 
     var onClick = Event1<Subscription>();
-    var sortBy: Int = 0
+    var onSettings = Event1<Subscription>();
+    var sortBy: Int = 3
         set(value) {
             field = value;
             updateDataset();
@@ -33,12 +34,16 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SubscriptionViewHolder {
         val holder = SubscriptionViewHolder(viewGroup);
         holder.onClick.subscribe(onClick::emit);
+        holder.onSettings.subscribe(onSettings::emit);
         holder.onTrash.subscribe {
             val sub = holder.subscription ?: return@subscribe;
             UIDialogs.showConfirmationDialog(_inflater.context, _confirmationMessage, {
                 StateSubscriptions.instance.removeSubscription(sub.channel.url);
             });
         };
+        holder.onSettings.subscribe {
+            onSettings.emit(it);
+        };
 
         return holder;
     }
@@ -49,11 +54,20 @@ class SubscriptionAdapter : RecyclerView.Adapter<SubscriptionViewHolder> {
 
     private fun updateDataset() {
         _sortedDataset = when (sortBy) {
-            0 -> StateSubscriptions.instance.getSubscriptions().sortedBy({ u -> u.channel.name })
-            1 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending({ u -> u.channel.name })
+            0 -> StateSubscriptions.instance.getSubscriptions().sortedBy({ u -> u.channel.name.lowercase() })
+            1 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending({ u -> u.channel.name.lowercase() })
+            2 -> StateSubscriptions.instance.getSubscriptions().sortedBy { it.playbackViews * VIEW_PRIORITY + it.playbackSeconds }
+            3 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending { it.playbackViews * VIEW_PRIORITY + it.playbackSeconds }
+            4 -> StateSubscriptions.instance.getSubscriptions().sortedBy { it.playbackSeconds }
+            5 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending { it.playbackSeconds }
             else -> throw IllegalStateException("Invalid sorting algorithm selected.");
         }.toList();
 
         notifyDataSetChanged();
     }
+
+
+    companion object {
+        val VIEW_PRIORITY = 36000 * 3;
+    }
 }

app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionViewHolder.kt

@@ -9,6 +9,8 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.models.Subscription
@@ -17,6 +19,9 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.selectBestImage
+import com.futo.platformplayer.states.StateSubscriptions
+import com.futo.platformplayer.toHumanBytesSpeed
+import com.futo.platformplayer.toHumanTimeIndicator
 import com.futo.platformplayer.views.others.CreatorThumbnail
 import com.futo.platformplayer.views.platform.PlatformIndicator
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
@@ -26,12 +31,14 @@ class SubscriptionViewHolder : ViewHolder {
     private val _textName: TextView;
     private val _creatorThumbnail: CreatorThumbnail;
     private val _buttonTrash: ImageButton;
+    private val _buttonSettings: ImageButton;
     private val _platformIndicator : PlatformIndicator;
+    private val _textMeta: TextView;
 
     private val _taskLoadProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(
         StateApp.instance.scopeGetter,
         { PolycentricCache.instance.getProfileAsync(it) })
-        .success { it -> onProfileLoaded(it, true) }
+        .success { it -> onProfileLoaded(null, it, true) }
         .exception<Throwable> {
             Logger.w(TAG, "Failed to load profile.", it);
         };
@@ -41,12 +48,15 @@ class SubscriptionViewHolder : ViewHolder {
 
     var onClick = Event1<Subscription>();
     var onTrash = Event0();
+    var onSettings = Event1<Subscription>();
 
     constructor(viewGroup: ViewGroup) : super(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_subscription, viewGroup, false)) {
         _layoutSubscription = itemView.findViewById(R.id.layout_subscription);
         _textName = itemView.findViewById(R.id.text_name);
+        _textMeta = itemView.findViewById(R.id.text_meta);
         _creatorThumbnail = itemView.findViewById(R.id.creator_thumbnail);
         _buttonTrash = itemView.findViewById(R.id.button_trash);
+        _buttonSettings = itemView.findViewById(R.id.button_settings);
         _platformIndicator = itemView.findViewById(R.id.platform);
 
         _layoutSubscription.setOnClickListener {
@@ -59,6 +69,11 @@ class SubscriptionViewHolder : ViewHolder {
         _buttonTrash.setOnClickListener {
             onTrash.emit();
         };
+        _buttonSettings.setOnClickListener {
+            subscription?.let {
+                onSettings.emit(it);
+            };
+        }
     }
 
     fun bind(sub: Subscription) {
@@ -68,17 +83,18 @@ class SubscriptionViewHolder : ViewHolder {
 
         val cachedProfile = PolycentricCache.instance.getCachedProfile(sub.channel.url, true);
         if (cachedProfile != null) {
-            onProfileLoaded(cachedProfile, false);
+            onProfileLoaded(sub, cachedProfile, false);
         } else {
             _creatorThumbnail.setThumbnail(sub.channel.thumbnail, false);
             _taskLoadProfile.run(sub.channel.id);
             _textName.text = sub.channel.name;
+            bindViewMetrics(sub);
         }
 
         _platformIndicator.setPlatformFromClientID(sub.channel.id.pluginId);
     }
 
-    private fun onProfileLoaded(cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
+    private fun onProfileLoaded(sub: Subscription?, cachedPolycentricProfile: PolycentricCache.CachedPolycentricProfile?, animate: Boolean) {
         val dp_46 = 46.dp(itemView.context.resources);
         val profile = cachedPolycentricProfile?.profile;
         val avatar = profile?.systemState?.avatar?.selectBestImage(dp_46 * dp_46)
@@ -94,6 +110,19 @@ class SubscriptionViewHolder : ViewHolder {
         if (profile != null) {
             _textName.text = profile.systemState.username;
         }
+
+        if(sub != null)
+            bindViewMetrics(sub)
+    }
+
+    fun bindViewMetrics(sub: Subscription?) {
+        if(sub == null || !Settings.instance.subscriptions.showWatchMetrics)
+            _textMeta.text = "";
+        else
+            _textMeta.text = listOf(
+                if(sub.playbackViews > 0) "${sub.playbackViews} view" + (if(sub.playbackViews > 1) "s" else "") else null,
+                if(sub.playbackSeconds > 0) sub.playbackSeconds.toHumanTimeIndicator() else null
+            ).filterNotNull().joinToString(" · ");
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/views/adapters/VideoListEditorViewHolder.kt

@@ -11,6 +11,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.futo.platformplayer.R
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.constructs.Event1
@@ -76,7 +78,7 @@ class VideoListEditorViewHolder : ViewHolder {
 
     fun bind(v: IPlatformVideo, canEdit: Boolean) {
         Glide.with(_imageThumbnail)
-            .load(v.thumbnails.getLQThumbnail())
+            .load(v.thumbnails.getHQThumbnail())
             .placeholder(R.drawable.placeholder_video_thumbnail)
             .crossfade()
             .into(_imageThumbnail);

app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/StoreItemViewHolder.kt

@@ -0,0 +1,55 @@
+package com.futo.platformplayer.views.adapters.viewholders
+
+import android.content.Intent
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.bumptech.glide.Glide
+import com.futo.platformplayer.R
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.views.StoreItem
+import com.futo.platformplayer.views.adapters.AnyAdapter
+import com.google.android.material.imageview.ShapeableImageView
+
+class StoreItemViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder<StoreItem>(
+    LayoutInflater.from(_viewGroup.context).inflate(R.layout.view_store_item, _viewGroup, false)) {
+
+    private val _image: ShapeableImageView;
+    private val _name: TextView;
+    private var _storeItem: StoreItem? = null;
+    
+    init {
+        _image = _view.findViewById(R.id.image_item);
+        _name = _view.findViewById(R.id.text_item);
+        _view.findViewById<LinearLayout>(R.id.root).setOnClickListener {
+            val s = _storeItem ?: return@setOnClickListener;
+
+            try {
+                val uri = Uri.parse(s.url);
+                val intent = Intent(Intent.ACTION_VIEW);
+                intent.data = uri;
+                _view.context.startActivity(intent);
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to open URI: '${it}'.", e);
+            }
+        }
+    }
+
+    override fun bind(storeItem: StoreItem) {
+        Glide.with(_image)
+            .load(storeItem.image)
+            .crossfade()
+            .into(_image);
+
+        _name.text = storeItem.name;
+        _storeItem = storeItem;
+    }
+
+    companion object {
+        private const val TAG = "StoreItemViewHolder";
+    }
+}

app/src/main/java/com/futo/platformplayer/views/buttons/BigButton.kt

@@ -69,6 +69,10 @@ open class BigButton : LinearLayout {
         _textSecondary.text = attrTextSecondary;
     }
 
+    fun setSecondaryText(text: String?) {
+        _textSecondary.text = text
+    }
+
     fun withPrimaryText(text: String): BigButton {
         _textPrimary.text = text;
         return this;

app/src/main/java/com/futo/platformplayer/views/fields/ButtonField.kt

@@ -8,6 +8,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
 import com.futo.platformplayer.dp
 import com.futo.platformplayer.views.buttons.BigButton
 import java.lang.reflect.Field
@@ -37,7 +38,7 @@ class ButtonField : BigButton, IField {
     //private val _title : TextView;
     //private val _subtitle : TextView;
 
-    override val onChanged = Event2<IField, Any>();
+    override val onChanged = Event3<IField, Any, Any>();
 
     constructor(context : Context, attrs : AttributeSet? = null) : super(context, attrs){
         //inflate(context, R.layout.field_button, this);
@@ -59,6 +60,8 @@ class ButtonField : BigButton, IField {
         }
     }
 
+    override fun setValue(value: Any) {}
+
     fun fromMethod(obj : Any, method: Method) : ButtonField {
         this._method = method;
         this._obj = obj;

app/src/main/java/com/futo/platformplayer/views/fields/DropdownField.kt

@@ -6,6 +6,8 @@ import android.view.View
 import android.widget.*
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
+import com.futo.platformplayer.logging.Logger
 import java.lang.reflect.Field
 
 class DropdownField : TableRow, IField {
@@ -35,7 +37,7 @@ class DropdownField : TableRow, IField {
 
     override var reference: Any? = null;
 
-    override val onChanged = Event2<IField, Any>();
+    override val onChanged = Event3<IField, Any, Any>();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs){
         inflate(context, R.layout.field_dropdown, this);
@@ -50,13 +52,21 @@ class DropdownField : TableRow, IField {
                     _isInitFire = false;
                     return;
                 }
+                Logger.i("DropdownField", "Changed: ${_selected} -> ${pos}");
+                val old = _selected;
                 _selected = pos;
-                onChanged.emit(this@DropdownField, pos);
+                onChanged.emit(this@DropdownField, pos, old);
             }
             override fun onNothingSelected(parent: AdapterView<*>?) = Unit
         };
     }
 
+    override fun setValue(value: Any) {
+        if(value is Int) {
+            _spinner.setSelection(value);
+        }
+    }
+
     fun asBoolean(name: String, description: String?, obj: Boolean) : DropdownField {
         _options = resources.getStringArray(R.array.enabled_disabled_array);
         _spinner.adapter = ArrayAdapter<String>(context, R.layout.spinner_item_simple, _options).also {
@@ -77,6 +87,23 @@ class DropdownField : TableRow, IField {
         return this;
     }
 
+    fun withValue(title: String, description: String?, options: List<String>, value: Int): DropdownField {
+        _title.text = title;
+        _description.visibility = if(description.isNullOrEmpty()) View.GONE else View.VISIBLE;
+        _description.text = description ?: "";
+
+        _options = options.toTypedArray();
+        _spinner.adapter = ArrayAdapter<String>(context, R.layout.spinner_item_simple, _options).also {
+            it.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
+        };
+
+        _selected = value;
+        _spinner.isSelected = false;
+        _spinner.setSelection(_selected, true);
+
+        return this;
+    }
+
     override fun fromField(obj: Any, field: Field, formField: FormField?) : DropdownField {
         this._field = field;
         this._obj = obj;

app/src/main/java/com/futo/platformplayer/views/fields/Field.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.views.fields
 
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
 import java.lang.reflect.Field
 
 
@@ -13,11 +14,12 @@ interface IField {
     val obj : Any?;
     val field : Field?;
 
-    val onChanged : Event2<IField, Any>;
+    val onChanged : Event3<IField, Any, Any>;
 
     var reference: Any?;
 
-
     fun fromField(obj : Any, field : Field, formField: FormField? = null) : IField;
     fun setField();
+
+    fun setValue(value: Any);
 }

app/src/main/java/com/futo/platformplayer/views/fields/FieldForm.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
@@ -49,7 +50,7 @@ class FieldForm : LinearLayout {
                         throw java.lang.IllegalStateException("Only views can be IFields");
 
                     _root.addView(field as View);
-                    field.onChanged.subscribe { a1, a2 ->
+                    field.onChanged.subscribe { a1, a2, oldValue ->
                         onChanged.emit(a1, a2);
                     };
                 }
@@ -67,7 +68,7 @@ class FieldForm : LinearLayout {
                 throw java.lang.IllegalStateException("Only views can be IFields");
 
             _root.addView(field as View);
-            field.onChanged.subscribe { a1, a2 ->
+            field.onChanged.subscribe { a1, a2, oldValue ->
                 onChanged.emit(a1, a2);
             };
         }
@@ -82,25 +83,59 @@ class FieldForm : LinearLayout {
 
         if(groupTitle == null) {
             for(field in newFields) {
-                if(field !is View)
+                if(field.second !is View)
                     throw java.lang.IllegalStateException("Only views can be IFields");
-                field.onChanged.subscribe { field, value ->
-                    onChanged.emit(field, value);
-                }
+                finalizePluginSettingField(field.first, field.second, newFields);
                 _root.addView(field as View);
             }
-            _fields = newFields;
+            _fields = newFields.map { it.second };
         } else {
             for(field in newFields) {
-                field.onChanged.subscribe { field, value ->
-                    onChanged.emit(field, value);
-                }
+                finalizePluginSettingField(field.first, field.second, newFields);
             }
             val group = GroupField(context, groupTitle, groupDescription)
-                .withFields(newFields);
+                .withFields(newFields.map { it.second });
             _root.addView(group as View);
         }
     }
+    private fun finalizePluginSettingField(setting: SourcePluginConfig.Setting, field: IField, others: List<Pair<SourcePluginConfig.Setting, IField>>) {
+        field.onChanged.subscribe { field, value, oldValue ->
+            onChanged.emit(field, value);
+
+            setting.warningDialog?.let {
+                if(it.isNotBlank() && isValueTrue(value))
+                    UIDialogs.showDialog(context, R.drawable.ic_warning_yellow, setting.warningDialog, null, null, 0,
+                        UIDialogs.Action("Cancel", {
+                            field.setValue(oldValue);
+                        }, UIDialogs.ActionStyle.NONE),
+                        UIDialogs.Action("Ok", {
+
+                        }, UIDialogs.ActionStyle.PRIMARY));
+            }
+        }
+        if(setting.dependency != null) {
+            val dependentField = others.firstOrNull { it.first.variableOrName == setting.dependency };
+            if(dependentField == null || dependentField.second !is View)
+                (field as View).visibility = View.GONE;
+            else {
+                dependentField.second.onChanged.subscribe { dependentField, value, oldValue ->
+                    val isValid = isValueTrue(value);
+                    if(isValid)
+                        (field as View).visibility = View.VISIBLE;
+                    else
+                        (field as View).visibility = View.GONE;
+                }
+            }
+        }
+    }
+    private fun isValueTrue(value: Any): Boolean {
+        return when(value) {
+            is Int -> value > 0;
+            is Boolean -> value;
+            is String -> value.toIntOrNull()?.let { it > 0 } ?: false || value.lowercase() == "true";
+            else -> false
+        };
+    }
 
     fun setObjectValues(){
         val fields = _fields;
@@ -133,26 +168,42 @@ class FieldForm : LinearLayout {
         private val _json = Json {};
 
 
-        fun getFieldsFromPluginSettings(context: Context, settings: List<SourcePluginConfig.Setting>, values: HashMap<String, String?>): List<IField> {
-            val fields = mutableListOf<IField>()
+        fun getFieldsFromPluginSettings(context: Context, settings: List<SourcePluginConfig.Setting>, values: HashMap<String, String?>): List<Pair<SourcePluginConfig.Setting, IField>> {
+            val fields = mutableListOf<Pair<SourcePluginConfig.Setting, IField>>()
 
             for(setting in settings) {
+                val value = if(values.containsKey(setting.variableOrName)) values[setting.variableOrName] else setting.default;
+
                 val field = when(setting.type.lowercase()) {
+                    "header" -> {
+                        val groupField = GroupField(context, setting.name, setting.description);
+                        groupField;
+                    }
                     "boolean" -> {
-                        val value = if(values.containsKey(setting.variableOrName)) values[setting.variableOrName] else setting.default;
                         val field = ToggleField(context).withValue(setting.name,
                             setting.description,
                             value == "true" || value == "1" || value == "True");
-                        field.onChanged.subscribe { field, value ->
+                        field.onChanged.subscribe { field, value, oldValue ->
                             values[setting.variableOrName] = _json.encodeToString (value == 1 || value == true);
                         }
                         field;
                     }
+                    "dropdown" -> {
+                        if(setting.options != null && !setting.options.isEmpty()) {
+                            var selected = value?.toIntOrNull()?.coerceAtLeast(0) ?: 0;
+                            val field = DropdownField(context).withValue(setting.name, setting.description, setting.options, selected);
+                            field.onChanged.subscribe { field, value, oldValue ->
+                                values[setting.variableOrName] = value.toString();
+                            }
+                            field;
+                        }
+                        else null;
+                    }
                     else -> null;
                 }
 
                 if(field != null)
-                    fields.add(field);
+                    fields.add(Pair(setting, field));
             }
             return fields;
         }

app/src/main/java/com/futo/platformplayer/views/fields/GroupField.kt

@@ -7,6 +7,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
 import java.lang.reflect.Field
 
 class GroupField : LinearLayout, IField {
@@ -27,7 +28,7 @@ class GroupField : LinearLayout, IField {
         return _field;
     };
 
-    override val onChanged = Event2<IField, Any>();
+    override val onChanged = Event3<IField, Any, Any>();
 
     private val _title : TextView;
     private val _subtitle : TextView;
@@ -138,4 +139,6 @@ class GroupField : LinearLayout, IField {
             field.setField();
         }
     }
+
+    override fun setValue(value: Any) {}
 }

app/src/main/java/com/futo/platformplayer/views/fields/ReadOnlyTextField.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.widget.*
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 
@@ -27,7 +28,7 @@ class ReadOnlyTextField : TableRow, IField {
     private val _title : TextView;
     private val _value : TextView;
 
-    override val onChanged = Event2<IField, Any>();
+    override val onChanged = Event3<IField, Any, Any>();
 
     override var reference: Any? = null;
     constructor(context : Context, attrs : AttributeSet? = null) : super(context, attrs){
@@ -36,6 +37,8 @@ class ReadOnlyTextField : TableRow, IField {
         _value = findViewById(R.id.field_value);
     }
 
+    override fun setValue(value: Any) {}
+
     override fun fromField(obj : Any, field : Field, formField: FormField?) : ReadOnlyTextField {
         this._field = field;
         this._obj = obj;

app/src/main/java/com/futo/platformplayer/views/fields/ToggleField.kt

@@ -6,6 +6,8 @@ import android.view.View
 import android.widget.*
 import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.constructs.Event3
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.others.Toggle
 import java.lang.reflect.Field
 
@@ -28,10 +30,11 @@ class ToggleField : TableRow, IField {
     private val _title : TextView;
     private val _description : TextView;
     private val _toggle : Toggle;
+    private var _lastValue: Boolean = false;
 
     override var reference: Any? = null;
 
-    override val onChanged = Event2<IField, Any>();
+    override val onChanged = Event3<IField, Any, Any>();
 
     constructor(context : Context, attrs : AttributeSet? = null) : super(context, attrs){
         inflate(context, R.layout.field_toggle, this);
@@ -40,10 +43,18 @@ class ToggleField : TableRow, IField {
         _description = findViewById(R.id.field_description);
 
         _toggle.onValueChanged.subscribe {
-            onChanged.emit(this, it);
+            val lastVal = _lastValue;
+            Logger.i("ToggleField", "Changed: ${lastVal} -> ${it}");
+            _lastValue = it;
+            onChanged.emit(this, it, lastVal);
         };
     }
 
+    override fun setValue(value: Any) {
+        if(value is Boolean)
+            _toggle.setValue(value, true, true);
+    }
+
     fun withValue(title: String, description: String?, value: Boolean): ToggleField {
 
         _title.text = title;
@@ -54,6 +65,7 @@ class ToggleField : TableRow, IField {
             _description.visibility = View.GONE;
 
         _toggle.setValue(value, true);
+        _lastValue = value;
 
         return this;
     }
@@ -78,14 +90,16 @@ class ToggleField : TableRow, IField {
         }
 
         val value = field.get(obj);
-        if(value is Boolean)
-            _toggle.setValue(value, true);
+        val toggleValue =  if(value is Boolean)
+            value;
         else if(value is Number)
-            _toggle.setValue((value as Number).toInt() > 0, true);
+            (value as Number).toInt() > 0;
         else if(value == null)
-            _toggle.setValue(false, true);
+            false;
         else
-            _toggle.setValue(false, true);
+            false;
+        _toggle.setValue(toggleValue, true);
+        _lastValue = toggleValue;
 
         return this;
     }

app/src/main/java/com/futo/platformplayer/views/others/Toggle.kt

@@ -29,7 +29,7 @@ class Toggle : AppCompatImageView {
         scaleType = ScaleType.FIT_CENTER;
     }
 
-    fun setValue(v: Boolean, animated: Boolean = true) {
+    fun setValue(v: Boolean, animated: Boolean = true, withEvent: Boolean = false) {
         if (value == v) {
             return;
         }
@@ -44,5 +44,8 @@ class Toggle : AppCompatImageView {
         } else {
             setImageResource(if (v) R.drawable.toggle_enabled else R.drawable.toggle_disabled);
         }
+
+        if(withEvent)
+            onValueChanged.emit(value);
     }
 }

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

@@ -0,0 +1,33 @@
+package com.futo.platformplayer.views.overlays
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import com.futo.platformplayer.R
+import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.platformplayer.views.SupportView
+
+class SupportOverlay : LinearLayout {
+    val onClose = Event0();
+
+    private val _topbar: OverlayTopbar;
+    private val _support: SupportView;
+
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.overlay_support, this)
+        _topbar = findViewById(R.id.topbar);
+        _support = findViewById(R.id.support);
+
+        _topbar.onClose.subscribe(this, onClose::emit);
+    }
+
+
+    fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
+        _support.setPolycentricProfile(profile, animate)
+    }
+
+    fun cleanup() {
+        _topbar.onClose.remove(this);
+    }
+}

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

@@ -34,7 +34,8 @@ class CommentsList : ConstraintLayout {
         }
         .exception<Throwable> {
             Logger.e(TAG, "Failed to load comments.", it);
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_comments) + (it.message ?: ""), it, ::fetchComments);
+            UIDialogs.toast(context, context.getString(R.string.failed_to_load_comments) + "\n" + (it.message ?: ""));
+            //UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_comments) + (it.message ?: ""), it, ::fetchComments);
             setLoading(false);
         } else TaskHandler(IPlatformVideoDetails::class.java, StateApp.instance.scopeGetter);
 

app/src/main/java/com/futo/platformplayer/views/sources/SourceHeaderView.kt

@@ -21,10 +21,13 @@ class SourceHeaderView : LinearLayout {
     private val _sourceDescription: TextView;
 
     private val _sourceVersion: TextView;
+    private val _sourcePlatformUrl: TextView;
     private val _sourceRepositoryUrl: TextView;
     private val _sourceScriptUrl: TextView;
     private val _sourceSignature: TextView;
 
+    private val _sourcePlatformUrlContainer: LinearLayout;
+
     private var _config : SourcePluginConfig? = null;
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
@@ -38,6 +41,8 @@ class SourceHeaderView : LinearLayout {
 
         _sourceVersion = findViewById(R.id.source_version);
         _sourceRepositoryUrl = findViewById(R.id.source_repo);
+        _sourcePlatformUrl = findViewById(R.id.source_platform);
+        _sourcePlatformUrlContainer = findViewById(R.id.source_platform_container);
         _sourceScriptUrl = findViewById(R.id.source_script);
         _sourceSignature = findViewById(R.id.source_signature);
 
@@ -53,6 +58,10 @@ class SourceHeaderView : LinearLayout {
             if(!_config?.absoluteScriptUrl.isNullOrEmpty())
                 context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(_config?.absoluteScriptUrl)));
         };
+        _sourcePlatformUrl.setOnClickListener {
+            if(!_config?.platformUrl.isNullOrEmpty())
+                context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(_config?.platformUrl)));
+        };
     }
 
     fun loadConfig(config: SourcePluginConfig, script: String?) {
@@ -74,6 +83,12 @@ class SourceHeaderView : LinearLayout {
         _sourceRepositoryUrl.text = config.repositoryUrl;
         _sourceAuthorID.text = "";
 
+        _sourcePlatformUrl.text = config.platformUrl ?: "";
+        if(!config.platformUrl.isNullOrEmpty())
+            _sourcePlatformUrlContainer.visibility = VISIBLE;
+        else
+            _sourcePlatformUrlContainer.visibility = GONE;
+
         if(!config.authorUrl.isNullOrEmpty())
             _sourceBy.setTextColor(resources.getColor(R.color.colorPrimary));
         else
@@ -105,5 +120,7 @@ class SourceHeaderView : LinearLayout {
         _sourceScriptUrl.text = "";
         _sourceRepositoryUrl.text = "";
         _sourceAuthorID.text = "";
+        _sourcePlatformUrl.text = "";
+        _sourcePlatformUrlContainer.visibility = GONE;
     }
 }

app/src/main/java/com/futo/platformplayer/views/subscriptions/SubscribeButton.kt

@@ -36,6 +36,7 @@ class SubscribeButton : LinearLayout {
     } else { null };
 
     val onSubscribed = Event1<Subscription>();
+    val onUnSubscribed = Event1<String>();
 
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
@@ -82,6 +83,7 @@ class SubscribeButton : LinearLayout {
         if (removed != null)
             UIDialogs.toast(context, context.getString(R.string.unsubscribed_from) + removed.channel.name);
         setIsSubscribed(false);
+        onUnSubscribed.emit(url);
     }
 
     fun setSubscribeChannel(url: String) {

app/src/main/java/com/futo/platformplayer/views/subscriptions/SubscriptionBar.kt

@@ -25,7 +25,7 @@ class SubscriptionBar : LinearLayout {
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.view_subscription_bar, this);
 
-        val subscriptions = StateSubscriptions.instance.getSubscriptions();
+        val subscriptions = StateSubscriptions.instance.getSubscriptions().sortedByDescending { it.playbackSeconds };
         _adapterView = findViewById<RecyclerView>(R.id.recycler_creators).asAny(subscriptions, orientation = RecyclerView.HORIZONTAL) {
             it.onClick.subscribe { c ->
                 onClickChannel.emit(c.channel);

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

@@ -71,6 +71,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
     private val _control_videosettings_fullscreen: ImageButton;
     private val _control_minimize_fullscreen: ImageButton;
     private val _control_rotate_lock_fullscreen: ImageButton;
+    private val _control_cast_fullscreen: ImageButton;
     private val _control_play_fullscreen: ImageButton;
     private val _time_bar_fullscreen: TimeBar;
     private val _overlay_brightness: FrameLayout;
@@ -127,10 +128,15 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         _control_minimize_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_minimize);
         _control_videosettings_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_settings);
         _control_rotate_lock_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_rotate_lock);
+        _control_cast_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_cast);
         _control_play_fullscreen = videoControls.findViewById(com.google.android.exoplayer2.ui.R.id.exo_play);
         _control_chapter_fullscreen = _videoControls_fullscreen.findViewById(R.id.text_chapter_current);
         _time_bar_fullscreen = _videoControls_fullscreen.findViewById(com.google.android.exoplayer2.ui.R.id.exo_progress);
 
+        val castVisibility = if (Settings.instance.casting.enabled) View.VISIBLE else View.GONE
+        _control_cast.visibility = castVisibility
+        _control_cast_fullscreen.visibility = castVisibility
+
         _overlay_brightness = findViewById(R.id.overlay_brightness);
 
         _title_fullscreen = _videoControls_fullscreen.findViewById(R.id.exo_title);
@@ -213,7 +219,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             updateRotateLock();
         };
         _control_cast.setOnClickListener {
-            UIDialogs.showCastingDialog(context);
+
         };
 
         _control_minimize_fullscreen.setOnClickListener {
@@ -229,6 +235,9 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             StatePlayer.instance.rotationLock = !StatePlayer.instance.rotationLock;
             updateRotateLock();
         };
+        _control_cast_fullscreen.setOnClickListener {
+            UIDialogs.showCastingDialog(context);
+        };
 
         var lastPos = 0L;
         videoControls.setProgressUpdateListener { position, bufferedPosition ->
@@ -270,7 +279,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
         if (drawable != null) {
             _videoView.defaultArtwork = drawable;
             _videoView.useArtwork = true;
-            fitHeight();
+            fitOrFill(isFullScreen);
         } else {
             _videoView.defaultArtwork = null;
             _videoView.useArtwork = false;
@@ -311,7 +320,7 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             gestureControl.hideControls();
             //videoControlsBar.visibility = View.GONE;
             _videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
-            fillHeight();
+
             _videoControls_fullscreen.show();
             videoControls.hide();
         }
@@ -323,16 +332,25 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
             gestureControl.hideControls();
             //videoControlsBar.visibility = View.VISIBLE;
             _videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
-            fitHeight();
+
             videoControls.show();
             _videoControls_fullscreen.hide();
         }
 
+        fitOrFill(fullScreen);
         gestureControl.setFullscreen(fullScreen);
         onToggleFullScreen.emit(fullScreen);
         isFullScreen = fullScreen;
     }
 
+    private fun fitOrFill(fullScreen: Boolean) {
+        if (fullScreen) {
+            fillHeight();
+        } else {
+            fitHeight();
+        }
+    }
+
     fun lockControlsAlpha(locked : Boolean) {
         if(locked && _isControlsLocked != locked) {
             _isControlsLocked = locked;

app/src/main/res/drawable/background_big_button_black.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#000000" />
+    <corners android:radius="4dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_membership.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#232323" />
+    <corners android:radius="5dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>

app/src/main/res/drawable/background_store.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#3A1448" />
-    <corners android:radius="14dp" />
+    <corners android:radius="5dp" />
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

app/src/main/res/drawable/background_support.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#144826" />
-    <corners android:radius="14dp" />
+    <corners android:radius="5dp" />
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

app/src/main/res/drawable/bitcoin.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="273.6dp"
+    android:height="360dp"
+    android:viewportWidth="273.6"
+    android:viewportHeight="360">
+  <path
+      android:pathData="M217.02,167.04c18.63,-9.48 30.29,-26.18 27.57,-54.01c-3.67,-38.02 -36.53,-50.77 -78.01,-54.4l-0.01,-52.74h-32.14l-0.01,51.35c-8.46,0 -17.08,0.17 -25.66,0.34L108.76,5.9l-32.11,-0l-0.01,52.73c-6.96,0.14 -13.79,0.28 -20.47,0.28v-0.16l-44.33,-0.02l0.01,34.28c0,0 23.73,-0.45 23.34,-0.01c13.01,0.01 17.26,7.56 18.48,14.08l0.01,60.08v84.4c-0.57,4.09 -2.98,10.63 -12.08,10.64c0.41,0.36 -23.38,-0 -23.38,-0l-6.38,38.33h41.82c7.79,0.01 15.45,0.13 22.96,0.19l0.03,53.34l32.1,0.01l-0.01,-52.78c8.83,0.18 17.36,0.26 25.68,0.25l-0.01,52.53h32.14l0.02,-53.25c54.02,-3.1 91.84,-16.7 96.54,-67.39C266.92,192.61 247.69,174.4 217.02,167.04zM109.54,95.32c18.13,0 75.13,-5.77 75.14,32.06c-0.01,36.27 -57,32.03 -75.14,32.03V95.32zM109.52,262.45l0.01,-70.67c21.78,-0.01 90.08,-6.26 90.09,35.32C199.64,266.97 131.31,262.43 109.52,262.45z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/divider_transparent_4dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="0dp"
+        android:width="4dp"/>
+</shape>

app/src/main/res/drawable/divider_transparent_8dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="0dp"
+        android:width="8dp"/>
+</shape>

app/src/main/res/drawable/divider_transparent_vertical_20dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="20dp"
+        android:width="0dp"/>
+</shape>

app/src/main/res/drawable/divider_transparent_vertical_8dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="8dp"
+        android:width="0dp"/>
+</shape>

app/src/main/res/drawable/ethereum.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M15.927,23.959l-9.823,-5.797 9.817,13.839 9.828,-13.839 -9.828,5.797zM16.073,0l-9.819,16.297 9.819,5.807 9.823,-5.801z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/ic_bug.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M480,760Q546,760 593,713Q640,666 640,600L640,440Q640,374 593,327Q546,280 480,280Q414,280 367,327Q320,374 320,440L320,600Q320,666 367,713Q414,760 480,760ZM400,640L560,640L560,560L400,560L400,640ZM400,480L560,480L560,400L400,400L400,480ZM480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520ZM480,840Q415,840 359.5,808Q304,776 272,720L160,720L160,640L244,640Q241,620 240.5,600Q240,580 240,560L160,560L160,480L240,480Q240,460 240.5,440Q241,420 244,400L160,400L160,320L272,320Q286,297 303.5,277Q321,257 344,242L280,176L336,120L422,206Q450,197 479,197Q508,197 536,206L624,120L680,176L614,242Q637,257 655.5,276.5Q674,296 688,320L800,320L800,400L716,400Q719,420 719.5,440Q720,460 720,480L800,480L800,560L720,560Q720,580 719.5,600Q719,620 716,640L800,640L800,720L688,720Q656,776 600.5,808Q545,840 480,840Z"/>

app/src/main/res/drawable/ic_data_alert.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M120,800L120,720L600,720L600,800L120,800ZM640,520Q557,520 498.5,461.5Q440,403 440,320Q440,237 498.5,178.5Q557,120 640,120Q723,120 781.5,178.5Q840,237 840,320Q840,403 781.5,461.5Q723,520 640,520ZM120,480L120,400L372,400Q379,422 388,442Q397,462 410,480L120,480ZM120,640L120,560L496,560Q519,574 545,583.5Q571,593 600,597L600,640L120,640ZM620,360L660,360L660,200L620,200L620,360ZM640,440Q648,440 654,434Q660,428 660,420Q660,412 654,406Q648,400 640,400Q632,400 626,406Q620,412 620,420Q620,428 626,434Q632,440 640,440Z"/>

app/src/main/res/drawable/ic_encrypted.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M420,600L540,600L517,471Q537,461 548.5,442Q560,423 560,400Q560,367 536.5,343.5Q513,320 480,320Q447,320 423.5,343.5Q400,367 400,400Q400,423 411.5,442Q423,461 443,471L420,600ZM480,880Q341,845 250.5,720.5Q160,596 160,444L160,200L480,80L800,200L800,444Q800,596 709.5,720.5Q619,845 480,880ZM480,796Q584,763 652,664Q720,565 720,444L720,255L480,165L240,255L240,444Q240,565 308,664Q376,763 480,796ZM480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

app/src/main/res/drawable/ic_lines.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,720L120,640L600,640L600,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z"/>
+</vector>

app/src/main/res/drawable/ic_live_tv.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M380,620L660,440L380,260L380,620ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,680Q880,713 856.5,736.5Q833,760 800,760L640,760L640,840L320,840ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L160,680Z"/>

app/src/main/res/drawable/ic_notifications.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,460L480,460L480,460L480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680Z"/>

app/src/main/res/drawable/ic_quiz.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M560,600Q577,600 589.5,587.5Q602,575 602,558Q602,541 589.5,528.5Q577,516 560,516Q543,516 530.5,528.5Q518,541 518,558Q518,575 530.5,587.5Q543,600 560,600ZM530,472L590,472Q590,443 596,429.5Q602,416 624,394Q654,364 664,345.5Q674,327 674,302Q674,257 642.5,228.5Q611,200 560,200Q519,200 488.5,223Q458,246 446,284L500,306Q509,281 524.5,268.5Q540,256 560,256Q584,256 599,269.5Q614,283 614,306Q614,320 606,332.5Q598,345 578,364Q545,393 537.5,409.5Q530,426 530,472ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM320,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880ZM320,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640L320,640Q320,640 320,640Q320,640 320,640L320,160Q320,160 320,160Q320,160 320,160Z"/>

app/src/main/res/drawable/ic_star.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M293,796.92L342.61,584.39L177.69,441.54L394.92,422.69L480,222.31L565.08,422.69L782.31,441.54L617.39,584.39L667,796.92L480,684.08L293,796.92Z"/>
+</vector>

app/src/main/res/drawable/ic_tabs.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M160,720L800,720Q800,720 800,720Q800,720 800,720L800,400L520,400L520,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L160,720Z"/>

app/src/main/res/drawable/ic_warning.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M40,840L480,80L920,840L40,840ZM178,760L782,760L480,240L178,760ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600ZM480,500L480,500L480,500L480,500Z"/>
+</vector>

app/src/main/res/drawable/ic_warning_yellow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#E4A72E"
+      android:pathData="M40,840L480,80L920,840L40,840ZM178,760L782,760L480,240L178,760ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600ZM480,500L480,500L480,500L480,500Z"/>
+</vector>

app/src/main/res/drawable/ic_zip.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M640,480L640,400L720,400L720,480L640,480ZM640,560L560,560L560,480L640,480L640,560ZM640,640L640,560L720,560L720,640L640,640ZM447,320L367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720L560,720L560,640L640,640L640,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L640,320L640,400L560,400L560,320L447,320ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L160,720Q160,720 160,720Q160,720 160,720L160,320Q160,320 160,320Q160,320 160,320L160,320L160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
+</vector>

app/src/main/res/drawable/litecoin.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="82.6dp"
+    android:height="82.6dp"
+    android:viewportWidth="82.6"
+    android:viewportHeight="82.6">
+  <path
+      android:pathData="M41.3,0A41.3,41.3 0,1 0,82.6 41.3h0A41.18,41.18 0,0 0,41.54 0ZM42,42.7 L37.7,57.2h23a1.16,1.16 0,0 1,1.2 1.12v0.38l-2,6.9a1.49,1.49 0,0 1,-1.5 1.1H23.2l5.9,-20.1 -6.6,2L24,44l6.6,-2 8.3,-28.2a1.51,1.51 0,0 1,1.5 -1.1h8.9a1.16,1.16 0,0 1,1.2 1.12v0.38L43.5,38l6.6,-2 -1.4,4.8Z"
+      android:fillColor="#ffffff"/>
+</vector>