Bump polycentricandroid submodule

Sync protocol

See merge request videostreaming/grayjay!35

.gitmodules

@@ -70,3 +70,15 @@
 [submodule "app/src/unstable/assets/sources/spotify"]
 	path = app/src/unstable/assets/sources/spotify
 	url = ../plugins/spotify.git
+[submodule "app/src/stable/assets/sources/bitchute"]
+	path = app/src/stable/assets/sources/bitchute
+	url = ../plugins/bitchute.git
+[submodule "app/src/unstable/assets/sources/bitchute"]
+	path = app/src/unstable/assets/sources/bitchute
+	url = ../plugins/bitchute.git
+[submodule "app/src/unstable/assets/sources/dailymotion"]
+	path = app/src/unstable/assets/sources/dailymotion
+	url = ../plugins/dailymotion.git
+[submodule "app/src/stable/assets/sources/dailymotion"]
+	path = app/src/stable/assets/sources/dailymotion
+	url = ../plugins/dailymotion.git

LICENSE.md

@@ -1,4 +1,4 @@
-# Grayjay Core License 1.0
+# Source First License 1.1
 
 ## Acceptance
 By using the software, you agree to all of the terms and conditions below.
@@ -16,7 +16,7 @@ Notwithstanding the above, you may not remove or obscure any functionality in th
 You may not alter, remove, or obscure any licensing, copyright, or other notices of the Licensor in the software. Any use of the Licensor’s trademarks is subject to applicable law.
 
 ## Patents
-If you make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
+If you make any written claim that the software infringes or contributes to infringement of any patent, your license for the software granted under these terms ends immediately. If your company makes such a claim, your license ends immediately for work on behalf of your company.
 
 ## Notices
 You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms. If you modify the software, you must include in any modified copies of the software a prominent notice stating that you have modified the software, such as but not limited to, a statement in a readme file or an in-application about section.

app/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21'
-    id 'org.ajoberstar.grgit' version '1.7.2'
+    id 'org.ajoberstar.grgit' version '5.2.2'
     id 'com.google.protobuf'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
@@ -144,9 +144,19 @@ android {
     buildFeatures {
         buildConfig true
     }
+    sourceSets {
+        main {
+            assets {
+                srcDirs 'src/main/assets', 'src/tests/assets', 'src/test/assets'
+            }
+        }
+    }
 }
 
 dependencies {
+    implementation 'com.google.dagger:dagger:2.48'
+    implementation 'androidx.test:monitor:1.7.2'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
 
     //Core
     implementation 'androidx.core:core-ktx:1.12.0'
@@ -184,7 +194,6 @@ dependencies {
     implementation 'androidx.media:media:1.7.0'
 
     //Other
-    implementation 'org.jmdns:jmdns:3.5.1'
     implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <!--<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
@@ -50,7 +51,7 @@
             android:name=".activities.MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
             android:exported="true"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
@@ -152,27 +153,27 @@
 
         <activity
             android:name=".activities.SettingsActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.DeveloperActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ExceptionActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.CaptchaActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.LoginActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.AddSourceActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:exported="true"
             android:theme="@style/Theme.FutoVideo.NoActionBar">
             <intent-filter>
@@ -186,44 +187,60 @@
         </activity>
         <activity
             android:name=".activities.AddSourceOptionsActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricHomeActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricBackupActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricCreateProfileActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricProfileActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricWhyActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.PolycentricImportProfileActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.ManageTabsActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
 
         <activity
             android:name=".activities.QRCaptureActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.FCastGuideActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.PolycentricWhyActivity"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.SyncHomeActivity"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.SyncPairActivity"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.SyncShowPairingCodeActivity"
+            android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
     </application>
 </manifest>

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

@@ -201,7 +201,7 @@ class PlatformContent {
         obj = obj ?? {};
         this.id = obj.id ?? PlatformID();   //PlatformID
         this.name = obj.name ?? ""; //string
-        this.thumbnails = obj.thumbnails; //Thumbnail[]
+        this.thumbnails = obj.thumbnails ?? new Thumbnails([]); //Thumbnail[]
         this.author = obj.author; //PlatformAuthorLink
         this.datetime = obj.datetime ?? obj.uploadDate ?? 0; //OffsetDateTime (Long)
         this.url = obj.url ?? ""; //String
@@ -278,12 +278,49 @@ class PlatformPostDetails extends PlatformPost {
         super(obj);
         obj = obj ?? {};
         this.plugin_type = "PlatformPostDetails";
-        this.rating = obj.rating ?? RatingLikes(-1);
+        this.rating = obj.rating ?? new RatingLikes(-1);
         this.textType = obj.textType ?? 0;
         this.content = obj.content ?? "";
     }
 }
 
+class PlatformArticleDetails extends PlatformContent {
+    constructor(obj) {
+        super(obj, 3);
+        obj = obj ?? {};
+        this.plugin_type = "PlatformArticleDetails";
+        this.rating = obj.rating ?? new RatingLikes(-1);
+        this.summary = obj.summary ?? "";
+        this.segments = obj.segments ?? [];
+        this.thumbnails = obj.thumbnails ?? new Thumbnails([]);
+    }
+}
+class ArticleSegment {
+    constructor(type) {
+        this.type = type;
+    }
+}
+class ArticleTextSegment extends ArticleSegment {
+    constructor(content, textType) {
+        super(1);
+        this.textType = textType;
+        this.content = content;
+    }
+}
+class ArticleImagesSegment extends ArticleSegment {
+    constructor(images) {
+        super(2);
+        this.images = images;
+    }
+}
+class ArticleNestedSegment extends ArticleSegment {
+    constructor(nested) {
+        super(9);
+        this.nested = nested;
+    }
+}
+
+
 //Sources
 class VideoSourceDescriptor {
     constructor(obj) {
@@ -406,6 +443,39 @@ class DashSource {
             this.requestModifier = obj.requestModifier;
     }
 }
+class DashManifestRawSource {
+    constructor(obj) {
+        obj = obj ?? {};
+        this.plugin_type = "DashRawSource";
+        this.name = obj.name ?? "";
+        this.bitrate = obj.bitrate ?? 0;
+        this.container = obj.container ?? "";
+        this.codec = obj.codec ?? "";
+        this.duration = obj.duration ?? 0;
+        this.url = obj.url;
+        this.language = obj.language ?? Language.UNKNOWN;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
+    }
+}
+
+class DashManifestRawAudioSource {
+    constructor(obj) {
+        obj = obj ?? {};
+        this.plugin_type = "DashRawAudioSource";
+        this.name = obj.name ?? "";
+        this.bitrate = obj.bitrate ?? 0;
+        this.container = obj.container ?? "";
+        this.codec = obj.codec ?? "";
+        this.duration = obj.duration ?? 0;
+        this.url = obj.url;
+        this.language = obj.language ?? Language.UNKNOWN;
+        this.manifest = obj.manifest ?? null;
+        if(obj.requestModifier)
+            this.requestModifier = obj.requestModifier;
+    }
+}
+
 
 class RequestModifier {
     constructor(obj) {
@@ -762,3 +832,99 @@ class URLSearchParams {
         return searchString;
     }
 }
+
+
+var __REGEX_SPACE_CHARACTERS = /<%= spaceCharacters %>/g;
+var __btoa_TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+function btoa(input) {
+	input = String(input);
+	if (/[^\0-\xFF]/.test(input)) {
+		// Note: no need to special-case astral symbols here, as surrogates are
+		// matched, and the input is supposed to only contain ASCII anyway.
+		error(
+			'The string to be encoded contains characters outside of the ' +
+			'Latin1 range.'
+		);
+	}
+	var padding = input.length % 3;
+	var output = '';
+	var position = -1;
+	var a;
+	var b;
+	var c;
+	var buffer;
+	// Make sure any padding is handled outside of the loop.
+	var length = input.length - padding;
+
+	while (++position < length) {
+		// Read three bytes, i.e. 24 bits.
+		a = input.charCodeAt(position) << 16;
+		b = input.charCodeAt(++position) << 8;
+		c = input.charCodeAt(++position);
+		buffer = a + b + c;
+		// Turn the 24 bits into four chunks of 6 bits each, and append the
+		// matching character for each of them to the output.
+		output += (
+			__btoa_TABLE.charAt(buffer >> 18 & 0x3F) +
+			__btoa_TABLE.charAt(buffer >> 12 & 0x3F) +
+			__btoa_TABLE.charAt(buffer >> 6 & 0x3F) +
+			__btoa_TABLE.charAt(buffer & 0x3F)
+		);
+	}
+
+	if (padding == 2) {
+		a = input.charCodeAt(position) << 8;
+		b = input.charCodeAt(++position);
+		buffer = a + b;
+		output += (
+			__btoa_TABLE.charAt(buffer >> 10) +
+			__btoa_TABLE.charAt((buffer >> 4) & 0x3F) +
+			__btoa_TABLE.charAt((buffer << 2) & 0x3F) +
+			'='
+		);
+	} else if (padding == 1) {
+		buffer = input.charCodeAt(position);
+		output += (
+			__btoa_TABLE.charAt(buffer >> 2) +
+			__btoa_TABLE.charAt((buffer << 4) & 0x3F) +
+			'=='
+		);
+	}
+
+	return output;
+};
+function atob(input) {
+	input = String(input)
+		.replace(__REGEX_SPACE_CHARACTERS, '');
+	var length = input.length;
+	if (length % 4 == 0) {
+		input = input.replace(/==?$/, '');
+		length = input.length;
+	}
+	if (
+		length % 4 == 1 ||
+		// http://whatwg.org/C#alphanumeric-ascii-characters
+		/[^+a-zA-Z0-9/]/.test(input)
+	) {
+		error(
+			'Invalid character: the string to be decoded is not correctly encoded.'
+		);
+	}
+	var bitCounter = 0;
+	var bitStorage;
+	var buffer;
+	var output = '';
+	var position = -1;
+	while (++position < length) {
+		buffer = __btoa_TABLE.indexOf(input.charAt(position));
+		bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
+		// Unless this is the first of a group of 4 characters…
+		if (bitCounter++ % 4) {
+			// …convert the first 8 bits to a single ASCII character.
+			output += String.fromCharCode(
+				0xFF & bitStorage >> (-2 * bitCounter & 6)
+			);
+		}
+	}
+	return output;
+};

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

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

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

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

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

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

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

@@ -0,0 +1,192 @@
+package com.futo.platformplayer
+
+import com.google.common.base.Preconditions
+import com.google.common.io.ByteStreams
+import com.google.common.primitives.Ints
+import com.google.common.primitives.Longs
+import java.io.DataInput
+import java.io.DataInputStream
+import java.io.EOFException
+import java.io.FilterInputStream
+import java.io.IOException
+import java.io.InputStream
+
+class LittleEndianDataInputStream
+/**
+ * Creates a `LittleEndianDataInputStream` that wraps the given stream.
+ *
+ * @param in the stream to delegate to
+ */
+    (`in`: InputStream?) : FilterInputStream(Preconditions.checkNotNull(`in`)), DataInput {
+    /** This method will throw an [UnsupportedOperationException].  */
+    override fun readLine(): String {
+        throw UnsupportedOperationException("readLine is not supported")
+    }
+
+    @Throws(IOException::class)
+    override fun readFully(b: ByteArray) {
+        ByteStreams.readFully(this, b)
+    }
+
+    @Throws(IOException::class)
+    override fun readFully(b: ByteArray, off: Int, len: Int) {
+        ByteStreams.readFully(this, b, off, len)
+    }
+
+    @Throws(IOException::class)
+    override fun skipBytes(n: Int): Int {
+        return `in`.skip(n.toLong()).toInt()
+    }
+
+    @Throws(IOException::class)
+    override fun readUnsignedByte(): Int {
+        val b1 = `in`.read()
+        if (0 > b1) {
+            throw EOFException()
+        }
+
+        return b1
+    }
+
+    /**
+     * Reads an unsigned `short` as specified by [DataInputStream.readUnsignedShort],
+     * except using little-endian byte order.
+     *
+     * @return the next two bytes of the input stream, interpreted as an unsigned 16-bit integer in
+     * little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readUnsignedShort(): Int {
+        val b1 = readAndCheckByte()
+        val b2 = readAndCheckByte()
+
+        return Ints.fromBytes(0.toByte(), 0.toByte(), b2, b1)
+    }
+
+    /**
+     * Reads an integer as specified by [DataInputStream.readInt], except using little-endian
+     * byte order.
+     *
+     * @return the next four bytes of the input stream, interpreted as an `int` in little-endian
+     * byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readInt(): Int {
+        val b1 = readAndCheckByte()
+        val b2 = readAndCheckByte()
+        val b3 = readAndCheckByte()
+        val b4 = readAndCheckByte()
+
+        return Ints.fromBytes(b4, b3, b2, b1)
+    }
+
+    /**
+     * Reads a `long` as specified by [DataInputStream.readLong], except using
+     * little-endian byte order.
+     *
+     * @return the next eight bytes of the input stream, interpreted as a `long` in
+     * little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readLong(): Long {
+        val b1 = readAndCheckByte()
+        val b2 = readAndCheckByte()
+        val b3 = readAndCheckByte()
+        val b4 = readAndCheckByte()
+        val b5 = readAndCheckByte()
+        val b6 = readAndCheckByte()
+        val b7 = readAndCheckByte()
+        val b8 = readAndCheckByte()
+
+        return Longs.fromBytes(b8, b7, b6, b5, b4, b3, b2, b1)
+    }
+
+    /**
+     * Reads a `float` as specified by [DataInputStream.readFloat], except using
+     * little-endian byte order.
+     *
+     * @return the next four bytes of the input stream, interpreted as a `float` in
+     * little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readFloat(): Float {
+        return java.lang.Float.intBitsToFloat(readInt())
+    }
+
+    /**
+     * Reads a `double` as specified by [DataInputStream.readDouble], except using
+     * little-endian byte order.
+     *
+     * @return the next eight bytes of the input stream, interpreted as a `double` in
+     * little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readDouble(): Double {
+        return java.lang.Double.longBitsToDouble(readLong())
+    }
+
+    @Throws(IOException::class)
+    override fun readUTF(): String {
+        return DataInputStream(`in`).readUTF()
+    }
+
+    /**
+     * Reads a `short` as specified by [DataInputStream.readShort], except using
+     * little-endian byte order.
+     *
+     * @return the next two bytes of the input stream, interpreted as a `short` in little-endian
+     * byte order.
+     * @throws IOException if an I/O error occurs.
+     */
+    @Throws(IOException::class)
+    override fun readShort(): Short {
+        return readUnsignedShort().toShort()
+    }
+
+    /**
+     * Reads a char as specified by [DataInputStream.readChar], except using little-endian
+     * byte order.
+     *
+     * @return the next two bytes of the input stream, interpreted as a `char` in little-endian
+     * byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun readChar(): Char {
+        return readUnsignedShort().toChar()
+    }
+
+    @Throws(IOException::class)
+    override fun readByte(): Byte {
+        return readUnsignedByte().toByte()
+    }
+
+    @Throws(IOException::class)
+    override fun readBoolean(): Boolean {
+        return readUnsignedByte() != 0
+    }
+
+    /**
+     * Reads a byte from the input stream checking that the end of file (EOF) has not been
+     * encountered.
+     *
+     * @return byte read from input
+     * @throws IOException if an error is encountered while reading
+     * @throws EOFException if the end of file (EOF) is encountered.
+     */
+    @Throws(IOException::class, EOFException::class)
+    private fun readAndCheckByte(): Byte {
+        val b1 = `in`.read()
+
+        if (-1 == b1) {
+            throw EOFException()
+        }
+
+        return b1.toByte()
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.futo.platformplayer
+
+import com.google.common.base.Preconditions
+import com.google.common.primitives.Longs
+import java.io.*
+
+class LittleEndianDataOutputStream
+    /**
+     * Creates a `LittleEndianDataOutputStream` that wraps the given stream.
+     *
+     * @param out the stream to delegate to
+     */
+    (out: OutputStream?) : FilterOutputStream(DataOutputStream(Preconditions.checkNotNull(out))),
+    DataOutput {
+    @Throws(IOException::class)
+    override fun write(b: ByteArray, off: Int, len: Int) {
+        // Override slow FilterOutputStream impl
+        out.write(b, off, len)
+    }
+
+    @Throws(IOException::class)
+    override fun writeBoolean(v: Boolean) {
+        (out as DataOutputStream).writeBoolean(v)
+    }
+
+    @Throws(IOException::class)
+    override fun writeByte(v: Int) {
+        (out as DataOutputStream).writeByte(v)
+    }
+
+    @Deprecated(
+        """The semantics of {@code writeBytes(String s)} are considered dangerous. Please use
+        {@link #writeUTF(String s)}, {@link #writeChars(String s)} or another write method instead."""
+    )
+    @Throws(
+        IOException::class
+    )
+    override fun writeBytes(s: String) {
+        (out as DataOutputStream).writeBytes(s)
+    }
+
+    /**
+     * Writes a char as specified by [DataOutputStream.writeChar], except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeChar(v: Int) {
+        writeShort(v)
+    }
+
+    /**
+     * Writes a `String` as specified by [DataOutputStream.writeChars], except
+     * each character is written using little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeChars(s: String) {
+        for (i in 0 until s.length) {
+            writeChar(s[i].code)
+        }
+    }
+
+    /**
+     * Writes a `double` as specified by [DataOutputStream.writeDouble], except
+     * using little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeDouble(v: Double) {
+        writeLong(java.lang.Double.doubleToLongBits(v))
+    }
+
+    /**
+     * Writes a `float` as specified by [DataOutputStream.writeFloat], except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeFloat(v: Float) {
+        writeInt(java.lang.Float.floatToIntBits(v))
+    }
+
+    /**
+     * Writes an `int` as specified by [DataOutputStream.writeInt], except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeInt(v: Int) {
+        val bytes = byteArrayOf(
+            (0xFF and v).toByte(),
+            (0xFF and (v shr 8)).toByte(),
+            (0xFF and (v shr 16)).toByte(),
+            (0xFF and (v shr 24)).toByte()
+        )
+        out.write(bytes)
+    }
+
+    /**
+     * Writes a `long` as specified by [DataOutputStream.writeLong], except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeLong(v: Long) {
+        val bytes = Longs.toByteArray(java.lang.Long.reverseBytes(v))
+        write(bytes, 0, bytes.size)
+    }
+
+    /**
+     * Writes a `short` as specified by [DataOutputStream.writeShort], except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Throws(IOException::class)
+    override fun writeShort(v: Int) {
+        val bytes = byteArrayOf(
+            (0xFF and v).toByte(),
+            (0xFF and (v shr 8)).toByte()
+        )
+        out.write(bytes)
+    }
+
+    @Throws(IOException::class)
+    override fun writeUTF(str: String) {
+        (out as DataOutputStream).writeUTF(str)
+    }
+
+    // Overriding close() because FilterOutputStream's close() method pre-JDK8 has bad behavior:
+    // it silently ignores any exception thrown by flush(). Instead, just close the delegate stream.
+    // It should flush itself if necessary.
+    @Throws(IOException::class)
+    override fun close() {
+        out.close()
+    }
+}

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

@@ -2,8 +2,11 @@ package com.futo.platformplayer
 
 import android.content.ActivityNotFoundException
 import android.content.Context
+import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
+import android.os.PowerManager
 import android.webkit.CookieManager
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.MainActivity
@@ -11,6 +14,7 @@ import com.futo.platformplayer.activities.ManageTabsActivity
 import com.futo.platformplayer.activities.PolycentricHomeActivity
 import com.futo.platformplayer.activities.PolycentricProfileActivity
 import com.futo.platformplayer.activities.SettingsActivity
+import com.futo.platformplayer.activities.SyncHomeActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
@@ -23,6 +27,7 @@ import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePayment
+import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
@@ -34,6 +39,7 @@ import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FormFieldButton
 import com.futo.platformplayer.views.fields.FormFieldWarning
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
+import com.stripe.android.customersheet.injection.CustomerSheetViewModelModule_Companion_ContextFactory.context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -44,6 +50,7 @@ import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
 
+
 @Serializable
 data class MenuBottomBarSetting(val id: Int, var enabled: Boolean);
 
@@ -57,7 +64,16 @@ class Settings : FragmentedStorageFileJson() {
     @Transient
     val onTabsChanged = Event0();
 
-    @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -6)
+    @FormField(R.string.sync_grayjay, FieldForm.BUTTON, R.string.sync_grayjay_description, -8)
+    @FormFieldButton(R.drawable.ic_update)
+    fun syncGrayjay() {
+        SettingsActivity.getActivity()?.let {
+            it.startActivity(Intent(it, SyncHomeActivity::class.java))
+        }
+    }
+
+
+    @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -7)
     @FormFieldButton(R.drawable.ic_person)
     fun managePolycentricIdentity() {
         SettingsActivity.getActivity()?.let {
@@ -73,7 +89,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
-    @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -5)
+    @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -6)
     @FormFieldButton(R.drawable.ic_quiz)
     fun openFAQ() {
         try {
@@ -83,7 +99,7 @@ class Settings : FragmentedStorageFileJson() {
             //Ignored
         }
     }
-    @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -4)
+    @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -5)
     @FormFieldButton(R.drawable.ic_data_alert)
     fun openIssues() {
         try {
@@ -115,7 +131,7 @@ class Settings : FragmentedStorageFileJson() {
         }
     }*/
 
-    @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -3)
+    @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -4)
     @FormFieldButton(R.drawable.ic_tabs)
     fun manageTabs() {
         try {
@@ -129,7 +145,7 @@ class Settings : FragmentedStorageFileJson() {
 
 
 
-    @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -2)
+    @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -3)
     @FormFieldButton(R.drawable.ic_move_up)
     fun import() {
         val act = SettingsActivity.getActivity() ?: return;
@@ -138,7 +154,7 @@ class Settings : FragmentedStorageFileJson() {
         act.startActivity(intent);
     }
 
-    @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -1)
+    @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -2)
     @FormFieldButton(R.drawable.ic_link)
     fun manageLinks() {
         try {
@@ -148,6 +164,24 @@ class Settings : FragmentedStorageFileJson() {
         }
     }
 
+    /*@FormField(R.string.disable_battery_optimization, FieldForm.BUTTON, R.string.click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions, -1)
+    @FormFieldButton(R.drawable.battery_full_24px)
+    fun ignoreBatteryOptimization() {
+        SettingsActivity.getActivity()?.let {
+            val intent = Intent()
+            val packageName = it.packageName
+            val pm = it.getSystemService(POWER_SERVICE) as PowerManager;
+            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                intent.setAction(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
+                intent.setData(Uri.parse("package:$packageName"))
+                it.startActivity(intent)
+                UIDialogs.toast(it, "Please ignore battery optimizations for Grayjay")
+            } else {
+                UIDialogs.toast(it, "Battery optimizations already disabled for Grayjay")
+            }
+        }
+    }*/
+
     @FormField(R.string.language, "group", -1, 0)
     var language = LanguageSettings();
     @Serializable
@@ -326,7 +360,7 @@ class Settings : FragmentedStorageFileJson() {
     var playback = PlaybackSettings();
     @Serializable
     class PlaybackSettings {
-        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, 0)
+        @FormField(R.string.primary_language, FieldForm.DROPDOWN, -1, -1)
         @DropdownFieldOptionsId(R.array.audio_languages)
         var primaryLanguage: Int = 0;
 
@@ -353,7 +387,7 @@ class Settings : FragmentedStorageFileJson() {
 
         //= context.resources.getStringArray(R.array.audio_languages)[primaryLanguage];
 
-        @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 1)
+        @FormField(R.string.default_playback_speed, FieldForm.DROPDOWN, -1, 0)
         @DropdownFieldOptionsId(R.array.playback_speeds)
         var defaultPlaybackSpeed: Int = 3;
         fun getDefaultPlaybackSpeed(): Float = when(defaultPlaybackSpeed) {
@@ -369,35 +403,31 @@ class Settings : FragmentedStorageFileJson() {
             else -> 1.0f;
         };
 
-        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, R.string.preferred_quality_description, 2)
+        @FormField(R.string.preferred_quality, FieldForm.DROPDOWN, R.string.preferred_quality_description, 1)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredQuality: Int = 0;
 
-        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, R.string.preferred_metered_quality_description, 3)
+        @FormField(R.string.preferred_metered_quality, FieldForm.DROPDOWN, R.string.preferred_metered_quality_description, 2)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredMeteredQuality: Int = 0;
         fun getPreferredQualityPixelCount(): Int = preferedQualityToPixels(preferredQuality);
         fun getPreferredMeteredQualityPixelCount(): Int = preferedQualityToPixels(preferredMeteredQuality);
         fun getCurrentPreferredQualityPixelCount(): Int = if(!StateApp.instance.isCurrentMetered()) getPreferredQualityPixelCount() else getPreferredMeteredQualityPixelCount();
 
-        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, R.string.preferred_preview_quality_description, 4)
+        @FormField(R.string.preferred_preview_quality, FieldForm.DROPDOWN, R.string.preferred_preview_quality_description, 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
         var preferredPreviewQuality: Int = 5;
         fun getPreferredPreviewQualityPixelCount(): Int = preferedQualityToPixels(preferredPreviewQuality);
 
+
+        @FormField(R.string.simplify_sources, FieldForm.TOGGLE, R.string.simplify_sources_description, 4)
+        var simplifySources: Boolean = true;
+
         @FormField(R.string.auto_rotate, FieldForm.DROPDOWN, -1, 5)
         @DropdownFieldOptionsId(R.array.system_enabled_disabled_array)
         var autoRotate: Int = 2;
 
-        fun isAutoRotate() = autoRotate == 1 || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate());
-
-        @FormField(R.string.auto_rotate_dead_zone, FieldForm.DROPDOWN, R.string.this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees, 6)
-        @DropdownFieldOptionsId(R.array.auto_rotate_dead_zone)
-        var autoRotateDeadZone: Int = 0;
-
-        fun getAutoRotateDeadZoneDegrees(): Int {
-            return autoRotateDeadZone * 5;
-        }
+        fun isAutoRotate() = (autoRotate == 1 && !StatePlayer.instance.rotationLock) || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate() && !StatePlayer.instance.rotationLock);
 
         @FormField(R.string.background_behavior, FieldForm.DROPDOWN, -1, 7)
         @DropdownFieldOptionsId(R.array.player_background_behavior)
@@ -450,18 +480,52 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.full_screen_portrait, FieldForm.TOGGLE, R.string.allow_full_screen_portrait, 13)
         var fullscreenPortrait: Boolean = false;
+
+        @FormField(R.string.reverse_portrait, FieldForm.TOGGLE, R.string.reverse_portrait_description, 14)
+        var reversePortrait: Boolean = false;
+
+        @FormField(R.string.rotation_zone, FieldForm.DROPDOWN, R.string.rotation_zone_description, 15)
+        @DropdownFieldOptionsId(R.array.rotation_zone)
+        var rotationZone: Int = 2;
+
+        @FormField(R.string.stability_threshold_time, FieldForm.DROPDOWN, R.string.stability_threshold_time_description, 16)
+        @DropdownFieldOptionsId(R.array.rotation_threshold_time)
+        var stabilityThresholdTime: Int = 1;
+
+        @FormField(R.string.full_autorotate_lock, FieldForm.TOGGLE, R.string.full_autorotate_lock_description, 17)
+        var fullAutorotateLock: Boolean = false;
+
+        @FormField(R.string.prefer_webm, FieldForm.TOGGLE, R.string.prefer_webm_description, 18)
+        var preferWebmVideo: Boolean = false;
+        @FormField(R.string.prefer_webm_audio, FieldForm.TOGGLE, R.string.prefer_webm_audio_description, 19)
+        var preferWebmAudio: Boolean = false;
+
+        @FormField(R.string.allow_under_cutout, FieldForm.TOGGLE, R.string.allow_under_cutout_description, 20)
+        var allowVideoToGoUnderCutout: Boolean = true;
+
+        @FormField(R.string.autoplay, FieldForm.TOGGLE, R.string.autoplay, 21)
+        var autoplay: Boolean = false;
     }
 
     @FormField(R.string.comments, "group", R.string.comments_description, 6)
     var comments = CommentSettings();
     @Serializable
     class CommentSettings {
+        var didAskPolycentricDefault: Boolean = false;
+
         @FormField(R.string.default_comment_section, FieldForm.DROPDOWN, -1, 0)
         @DropdownFieldOptionsId(R.array.comment_sections)
-        var defaultCommentSection: Int = 0;
+        var defaultCommentSection: Int = 2;
+
+        @FormField(R.string.default_recommendations, FieldForm.TOGGLE, R.string.default_recommendations_description, 0)
+        var recommendationsDefault: Boolean = false;
+
+        @FormField(R.string.hide_recommendations, FieldForm.TOGGLE, R.string.hide_recommendations_description, 0)
+        var hideRecommendations: Boolean = false;
 
         @FormField(R.string.bad_reputation_comments_fading, FieldForm.TOGGLE, R.string.bad_reputation_comments_fading_description, 0)
         var badReputationCommentsFading: Boolean = true;
+
     }
 
     @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 7)
@@ -510,7 +574,7 @@ class Settings : FragmentedStorageFileJson() {
     class Browsing {
         @FormField(R.string.enable_video_cache, FieldForm.TOGGLE, R.string.cache_to_quickly_load_previously_fetched_videos, 0)
         @Serializable(with = FlexibleBooleanSerializer::class)
-        var videoCache: Boolean = true;
+        var videoCache: Boolean = false; //Temporary default disabled to prevent ui freeze?
     }
 
     @FormField(R.string.casting, "group", R.string.configure_casting, 9)
@@ -525,6 +589,10 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var keepScreenOn: Boolean = true;
 
+        @FormField(R.string.always_proxy_requests, FieldForm.TOGGLE, R.string.always_proxy_requests_description, 1)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var alwaysProxyRequests: Boolean = false;
+
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
@@ -775,10 +843,10 @@ class Settings : FragmentedStorageFileJson() {
         fun export() {
             val activity = SettingsActivity.getActivity() ?: return;
             UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {},
-                SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", null, {
+                SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", tag = null, call = {
                     StateBackup.shareExternalBackup();
                 }),
-                SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", null, {
+                SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", tag = null, call = {
                     StateBackup.saveExternalBackup(activity);
                 })
             )
@@ -843,7 +911,24 @@ class Settings : FragmentedStorageFileJson() {
         var pan: Boolean = true;
     }
 
-    @FormField(R.string.info, FieldForm.GROUP, -1, 20)
+    @FormField(R.string.synchronization, FieldForm.GROUP, -1, 20)
+    var synchronization = Synchronization();
+    @Serializable
+    class Synchronization {
+        @FormField(R.string.enabled, FieldForm.TOGGLE, R.string.enabled_description, 1)
+        var enabled: Boolean = true;
+
+        @FormField(R.string.broadcast, FieldForm.TOGGLE, R.string.broadcast_description, 1)
+        var broadcast: Boolean = true;
+
+        @FormField(R.string.connect_discovered, FieldForm.TOGGLE, R.string.connect_discovered_description, 2)
+        var connectDiscovered: Boolean = true;
+
+        @FormField(R.string.connect_last, FieldForm.TOGGLE, R.string.connect_last_description, 3)
+        var connectLast: Boolean = true;
+    }
+
+    @FormField(R.string.info, FieldForm.GROUP, -1, 21)
     var info = Info();
     @Serializable
     class Info {

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

@@ -8,6 +8,7 @@ import androidx.work.WorkManager
 import com.caoccao.javet.values.primitive.V8ValueInteger
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.futo.platformplayer.activities.DeveloperActivity
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
@@ -234,13 +235,17 @@ class SettingsDev : FragmentedStorageFileJson() {
         R.string.test_background_worker_description, 4)
     fun triggerBackgroundUpdate() {
         val act = SettingsActivity.getActivity()!!;
-        UIDialogs.toast(SettingsActivity.getActivity()!!, "Starting test background worker");
+        try {
+            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);
+            val wm = WorkManager.getInstance(act);
+            val req = OneTimeWorkRequestBuilder<BackgroundWorker>()
+                .setInputData(Data.Builder().putBoolean("bypassMainCheck", true).build())
+                .build();
+            wm.enqueue(req);
+        } catch (e: Throwable) {
+            UIDialogs.showGeneralErrorDialog(act, "Failed to trigger background update", e)
+        }
     }
     @FormField(R.string.clear_channel_cache, FieldForm.BUTTON,
         R.string.test_background_worker_description, 4)
@@ -491,6 +496,13 @@ class SettingsDev : FragmentedStorageFileJson() {
                 }
             }
         }
+
+
+        @FormField(R.string.test_playback, FieldForm.BUTTON,
+            R.string.test_playback, 1)
+        fun testPlayback(context: Context) {
+            context.startActivity(MainActivity.getActionIntent(context, "TEST_PLAYBACK"));
+        }
     }
 
 

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

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

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

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
+import android.text.method.ScrollingMovementMethod
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -223,18 +224,20 @@ class UIDialogs {
                     this.visibility = View.GONE;
                 else {
                     this.text = code;
+                    this.movementMethod = ScrollingMovementMethod.getInstance();
                     this.visibility = View.VISIBLE;
                 }
             };
             view.findViewById<LinearLayout>(R.id.dialog_buttons).apply {
+                val center = actions.any { it?.center == true };
                 val buttons = actions.map<Action, TextView> { act ->
                     val buttonView = TextView(context);
                     val dp10 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, resources.displayMetrics).toInt();
                     val dp28 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 28f, resources.displayMetrics).toInt();
                     val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics).toInt();
                     buttonView.layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
-                        if(actions.size > 1)
-                            this.marginEnd = if(actions.size > 2) dp14 else dp28;
+                        this.marginStart = if(actions.size >= 2) dp14 / 2 else dp28 / 2;
+                        this.marginEnd = if(actions.size >= 2) dp14 / 2 else dp28 / 2;
                     };
                     buttonView.setTextColor(Color.WHITE);
                     buttonView.textSize = 14f;
@@ -256,7 +259,7 @@ class UIDialogs {
 
                     return@map buttonView;
                 };
-                if(actions.size <= 1)
+                if(actions.size <= 1 || center)
                     this.gravity = Gravity.CENTER;
                 else
                     this.gravity = Gravity.END;
@@ -507,11 +510,13 @@ class UIDialogs {
         val text: String;
         val action: ()->Unit;
         val style: ActionStyle;
+        var center: Boolean;
 
-        constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE) {
+        constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
             this.text = text;
             this.action = action;
             this.style = style;
+            this.center = center;
         }
     }
     enum class ActionStyle {

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

@@ -15,14 +15,18 @@ import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.downloads.VideoLocal
 import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
 import com.futo.platformplayer.helpers.VideoHelper
@@ -34,12 +38,12 @@ import com.futo.platformplayer.models.SubscriptionGroup
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDownloads
+import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
 import com.futo.platformplayer.states.StateSubscriptionGroups
-import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.AnyAdapterView
 import com.futo.platformplayer.views.AnyAdapterView.Companion.asAny
 import com.futo.platformplayer.views.LoaderView
@@ -91,9 +95,17 @@ class UISlideOverlays {
 
                 withContext(Dispatchers.Main) {
                     items.addAll(listOf(
-                        SlideUpMenuItem(container.context, R.drawable.ic_notifications, "Notifications", "", "notifications", {
-                            subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
-                        }, false),
+                        SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_notifications,
+                            "Notifications",
+                            "",
+                            tag = "notifications",
+                            call = {
+                                subscription.doNotifications = menu?.selectOption(null, "notifications", true, true) ?: subscription.doNotifications;
+                            },
+                            invokeParent = false
+                        ),
                         if(StateSubscriptionGroups.instance.getSubscriptionGroups().isNotEmpty())
                             SlideUpMenuGroup(container.context, "Subscription Groups",
                                 "You can select which groups this subscription is part of.",
@@ -128,22 +140,62 @@ class UISlideOverlays {
                         SlideUpMenuGroup(container.context, "Fetch Settings",
                             "Depending on the platform you might not need to enable a type for it to be available.",
                             -1, listOf()),
-                        if(capabilities.hasType(ResultCapabilities.TYPE_LIVE)) SlideUpMenuItem(container.context, R.drawable.ic_live_tv, "Livestreams", "Check for livestreams", "fetchLive", {
-                            subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
-                        }, false) else null,
-                        if(capabilities.hasType(ResultCapabilities.TYPE_STREAMS)) SlideUpMenuItem(container.context, R.drawable.ic_play, "Streams", "Check for streams", "fetchStreams", {
-                            subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchStreams;
-                        }, false) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_LIVE)) SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_live_tv,
+                            "Livestreams",
+                            "Check for livestreams",
+                            tag = "fetchLive",
+                            call = {
+                                subscription.doFetchLive = menu?.selectOption(null, "fetchLive", true, true) ?: subscription.doFetchLive;
+                            },
+                            invokeParent = false
+                        ) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_STREAMS)) SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_play,
+                            "Streams",
+                            "Check for streams",
+                            tag = "fetchStreams",
+                            call = {
+                                subscription.doFetchStreams = menu?.selectOption(null, "fetchStreams", true, true) ?: subscription.doFetchStreams;
+                            },
+                            invokeParent = false
+                        ) else null,
                         if(capabilities.hasType(ResultCapabilities.TYPE_VIDEOS))
-                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Videos", "Check for videos", "fetchVideos", {
-                            subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
-                        }, false) else if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
-                            SlideUpMenuItem(container.context, R.drawable.ic_play, "Content", "Check for content", "fetchVideos", {
-                                subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
-                            }, false) else null,
-                        if(capabilities.hasType(ResultCapabilities.TYPE_POSTS)) SlideUpMenuItem(container.context, R.drawable.ic_chat, "Posts", "Check for posts", "fetchPosts", {
-                            subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchPosts;
-                        }, false) else null/*,,
+                            SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_play,
+                                "Videos",
+                                "Check for videos",
+                                tag = "fetchVideos",
+                                call = {
+                                    subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                                },
+                                invokeParent = false
+                            ) else if(capabilities.hasType(ResultCapabilities.TYPE_MIXED) || capabilities.types.isEmpty())
+                            SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_play,
+                                "Content",
+                                "Check for content",
+                                tag = "fetchVideos",
+                                call = {
+                                    subscription.doFetchVideos = menu?.selectOption(null, "fetchVideos", true, true) ?: subscription.doFetchVideos;
+                                },
+                                invokeParent = false
+                            ) else null,
+                        if(capabilities.hasType(ResultCapabilities.TYPE_POSTS)) SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_chat,
+                            "Posts",
+                            "Check for posts",
+                            tag = "fetchPosts",
+                            call = {
+                                subscription.doFetchPosts = menu?.selectOption(null, "fetchPosts", true, true) ?: subscription.doFetchPosts;
+                            },
+                            invokeParent = false
+                        ) else null/*,,
 
                         SlideUpMenuGroup(container.context, "Actions",
                             "Various things you can do with this subscription",
@@ -242,11 +294,23 @@ class UISlideOverlays {
                     masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
 
                     masterPlaylist.getAudioSources().forEach { it ->
-                        audioButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "), it, {
-                            selectedAudioVariant = it
-                            slideUpMenuOverlay.selectOption(audioButtons, it)
-                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                        }, false))
+
+                        val estSize = VideoHelper.estimateSourceSize(it);
+                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                        audioButtons.add(SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_music,
+                            it.name,
+                            listOf(it.language, it.codec).mapNotNull { x -> x.ifEmpty { null } }.joinToString(", "),
+                            (prefix + it.codec).trim(),
+                            tag = it,
+                            call = {
+                                selectedAudioVariant = it
+                                slideUpMenuOverlay.selectOption(audioButtons, it)
+                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                            },
+                            invokeParent = false
+                        ))
                     }
 
                     /*masterPlaylist.getSubtitleSources().forEach { it ->
@@ -258,11 +322,22 @@ class UISlideOverlays {
                     }*/
 
                     masterPlaylist.getVideoSources().forEach {
-                        videoButtons.add(SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
-                            selectedVideoVariant = it
-                            slideUpMenuOverlay.selectOption(videoButtons, it)
-                            slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
-                        }, false))
+                        val estSize = VideoHelper.estimateSourceSize(it);
+                        val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                        videoButtons.add(SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_movie,
+                            it.name,
+                            "${it.width}x${it.height}",
+                            (prefix + it.codec).trim(),
+                            tag = it,
+                            call = {
+                                selectedVideoVariant = it
+                                slideUpMenuOverlay.selectOption(videoButtons, it)
+                                slideUpMenuOverlay.setOk(container.context.getString(R.string.download))
+                            },
+                            invokeParent = false
+                        ))
                     }
 
                     val newItems = arrayListOf<View>()
@@ -321,8 +396,8 @@ class UISlideOverlays {
 
 
             val requiresAudio = descriptor is VideoUnMuxedSourceDescriptor;
-            var selectedVideo: IVideoUrlSource? = null;
-            var selectedAudio: IAudioUrlSource? = null;
+            var selectedVideo: IVideoSource? = null;
+            var selectedAudio: IAudioSource? = null;
             var selectedSubtitle: ISubtitleSource? = null;
 
             val videoSources = descriptor.videoSources;
@@ -341,45 +416,93 @@ class UISlideOverlays {
             }
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.video), videoSources,
-                listOf(listOf(SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.none), container.context.getString(R.string.audio_only), "none", {
-                    selectedVideo = null;
-                    menu?.selectOption(videoSources, "none");
-                    if(selectedAudio != null || !requiresAudio)
-                        menu?.setOk(container.context.getString(R.string.download));
-                }, false)) +
+                listOf(listOf(SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_movie,
+                    container.context.getString(R.string.none),
+                    container.context.getString(R.string.audio_only),
+                    tag = "none",
+                    call = {
+                        selectedVideo = null;
+                        menu?.selectOption(videoSources, "none");
+                        if(selectedAudio != null || !requiresAudio)
+                            menu?.setOk(container.context.getString(R.string.download));
+                    },
+                    invokeParent = false
+                )) +
                 videoSources
                 .filter { it.isDownloadable() }
                 .map {
                     when (it) {
                         is IVideoUrlSource -> {
-                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
-                                selectedVideo = it
-                                menu?.selectOption(videoSources, it);
-                                if(selectedAudio != null || !requiresAudio)
-                                    menu?.setOk(container.context.getString(R.string.download));
-                            }, false)
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_movie,
+                                it.name,
+                                "${it.width}x${it.height}",
+                                (prefix + it.codec).trim(),
+                                tag = it,
+                                call = {
+                                    selectedVideo = it
+                                    menu?.selectOption(videoSources, it);
+                                    if(selectedAudio != null || !requiresAudio)
+                                        menu?.setOk(container.context.getString(R.string.download));
+                                },
+                                invokeParent = false
+                            )
+                        }
+
+                        is JSDashManifestRawSource -> {
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_movie,
+                                it.name,
+                                "${it.width}x${it.height}",
+                                (prefix + it.codec).trim(),
+                                tag = it,
+                                call = {
+                                    selectedVideo = it
+                                    menu?.selectOption(videoSources, it);
+                                    if(selectedAudio != null || !requiresAudio)
+                                        menu?.setOk(container.context.getString(R.string.download));
+                                },
+                                invokeParent = false
+                            )
                         }
 
                         is IHLSManifestSource -> {
-                            SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS", it, {
-                                showHlsPicker(video, it, it.url, container)
-                            }, false)
+                            SlideUpMenuItem(
+                                container.context,
+                                R.drawable.ic_movie,
+                                it.name,
+                                "HLS",
+                                tag = it,
+                                call = {
+                                    showHlsPicker(video, it, it.url, container)
+                                },
+                                invokeParent = false
+                            )
                         }
 
                         else -> {
-                            throw Exception("Unhandled source type")
+                            Logger.w(TAG, "Unhandled source type for UISlideOverlay download items");
+                            null;//throw Exception("Unhandled source type")
                         }
                     }
-                }).flatten().toList()
+                }.filterNotNull()).flatten().toList()
             ));
 
             if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.isNotEmpty()) {
                 //TODO: Add HLS support here
                 selectedVideo = VideoHelper.selectBestVideoSource(
-                    videoSources.filter { it is IVideoUrlSource && it.isDownloadable() }.asIterable(),
+                    videoSources.filter { it is IVideoSource && it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
                     FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS
-                ) as IVideoUrlSource?;
+                ) as IVideoSource?;
             }
 
             if (audioSources != null) {
@@ -388,43 +511,90 @@ class UISlideOverlays {
                     .map {
                         when (it) {
                             is IAudioUrlSource -> {
-                                SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
-                                    selectedAudio = it
-                                    menu?.selectOption(audioSources, it);
-                                    menu?.setOk(container.context.getString(R.string.download));
-                                }, false);
+                                val estSize = VideoHelper.estimateSourceSize(it);
+                                val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                                SlideUpMenuItem(
+                                    container.context,
+                                    R.drawable.ic_music,
+                                    it.name,
+                                    "${it.bitrate}",
+                                    (prefix + it.codec).trim(),
+                                    tag = it,
+                                    call = {
+                                        selectedAudio = it
+                                        menu?.selectOption(audioSources, it);
+                                        menu?.setOk(container.context.getString(R.string.download));
+                                    },
+                                    invokeParent = false
+                                );
+                            }
+
+                            is JSDashManifestRawAudioSource -> {
+                                val estSize = VideoHelper.estimateSourceSize(it);
+                                val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                                SlideUpMenuItem(
+                                    container.context,
+                                    R.drawable.ic_music,
+                                    it.name,
+                                    "${it.bitrate}",
+                                    (prefix + it.codec).trim(),
+                                    tag = it,
+                                    call = {
+                                        selectedAudio = it
+                                        menu?.selectOption(audioSources, it);
+                                        menu?.setOk(container.context.getString(R.string.download));
+                                    },
+                                    invokeParent = false
+                                );
                             }
 
                             is IHLSManifestAudioSource -> {
-                                SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "HLS Audio", it, {
-                                    showHlsPicker(video, it, it.url, container)
-                                }, false)
+                                SlideUpMenuItem(
+                                    container.context,
+                                    R.drawable.ic_movie,
+                                    it.name,
+                                    "HLS Audio",
+                                    tag = it,
+                                    call = {
+                                        showHlsPicker(video, it, it.url, container)
+                                    },
+                                    invokeParent = false
+                                )
                             }
 
                             else -> {
-                                throw Exception("Unhandled source type")
+                                Logger.w(TAG, "Unhandled source type for UISlideOverlay download items");
+                                null;//throw Exception("Unhandled source type")
                             }
                         }
-                    }));
+                    }.filterNotNull()));
 
                 //TODO: Add HLS support here
-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource && it.isDownloadable() }.asIterable(),
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioSource && it.isDownloadable() }.asIterable(),
                     FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                     Settings.instance.playback.getPrimaryLanguage(container.context),
-                    if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
+                    if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioSource?;
             }
 
             if(contentResolver != null && subtitleSources.isNotEmpty()) {
                 items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.subtitles), subtitleSources, subtitleSources.map {
-                        SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
-                            if (selectedSubtitle == it) {
-                                selectedSubtitle = null;
-                                menu?.selectOption(subtitleSources, null);
-                            } else {
-                                selectedSubtitle = it;
-                                menu?.selectOption(subtitleSources, it);
-                            }
-                        }, false);
+                        SlideUpMenuItem(
+                            container.context,
+                            R.drawable.ic_edit,
+                            it.name,
+                            "",
+                            tag = it,
+                            call = {
+                                if (selectedSubtitle == it) {
+                                    selectedSubtitle = null;
+                                    menu?.selectOption(subtitleSources, null);
+                                } else {
+                                    selectedSubtitle = it;
+                                    menu?.selectOption(subtitleSources, it);
+                                }
+                            },
+                            invokeParent = false
+                        );
                     })
                 );
             }
@@ -442,6 +612,18 @@ class UISlideOverlays {
             }
 
             menu.onOK.subscribe {
+                val sv = selectedVideo
+                if (sv is IHLSManifestSource) {
+                    showHlsPicker(video, sv, sv.url, container)
+                    return@subscribe
+                }
+
+                val sa = selectedAudio
+                if (sa is IHLSManifestAudioSource) {
+                    showHlsPicker(video, sa, sa.url, container)
+                    return@subscribe
+                }
+
                 menu.hide();
                 val subtitleToDownload = selectedSubtitle;
                 if(selectedAudio != null || !requiresAudio) {
@@ -498,8 +680,9 @@ class UISlideOverlays {
                             }
                         }
                         catch(ex: Throwable) {
+                            Logger.e(TAG, "Fetching details for download failed due to: " + ex.message, ex);
                             withContext(Dispatchers.Main) {
-                                UIDialogs.toast(container.context.getString(R.string.failed_to_fetch_details_for_download));
+                                UIDialogs.toast(container.context.getString(R.string.failed_to_fetch_details_for_download) + "\n" + ex.message);
                                 handleUnknownDownload();
                                 loader.hide(true);
                             }
@@ -536,23 +719,47 @@ class UISlideOverlays {
             );
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.target_resolution), "Video", resolutions.map {
-                SlideUpMenuItem(container.context, R.drawable.ic_movie, it.first, it.second, it.third, {
-                    targetPxSize = it.third;
-                    menu?.selectOption("Video", it.third);
-                }, false)
+                SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_movie,
+                    it.first,
+                    it.second,
+                    tag = it.third,
+                    call = {
+                        targetPxSize = it.third;
+                        menu?.selectOption("Video", it.third);
+                    },
+                    invokeParent = false
+                )
             }));
 
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.target_bitrate), "Bitrate", listOf(
-                SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.low_bitrate), "", 1, {
-                    targetBitrate = 1;
-                    menu?.selectOption("Bitrate", 1);
-                    menu?.setOk(container.context.getString(R.string.download));
-                }, false),
-                SlideUpMenuItem(container.context, R.drawable.ic_movie, container.context.getString(R.string.high_bitrate), "", 9999999, {
-                    targetBitrate = 9999999;
-                    menu?.selectOption("Bitrate", 9999999);
-                    menu?.setOk(container.context.getString(R.string.download));
-                }, false)
+                SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_movie,
+                    container.context.getString(R.string.low_bitrate),
+                    "",
+                    tag = 1,
+                    call = {
+                        targetBitrate = 1;
+                        menu?.selectOption("Bitrate", 1);
+                        menu?.setOk(container.context.getString(R.string.download));
+                    },
+                    invokeParent = false
+                ),
+                SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_movie,
+                    container.context.getString(R.string.high_bitrate),
+                    "",
+                    tag = 9999999,
+                    call = {
+                        targetBitrate = 9999999;
+                        menu?.selectOption("Bitrate", 9999999);
+                        menu?.setOk(container.context.getString(R.string.download));
+                    },
+                    invokeParent = false
+                )
             )));
 
 
@@ -675,8 +882,12 @@ class UISlideOverlays {
             if (lastUpdated != null) {
                 items.add(
                     SlideUpMenuGroup(container.context, container.context.getString(R.string.recently_used_playlist), "recentlyusedplaylist",
-                        SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, lastUpdated.name, "${lastUpdated.videos.size} " + container.context.getString(R.string.videos), "",
-                            {
+                        SlideUpMenuItem(container.context,
+                            R.drawable.ic_playlist_add,
+                            lastUpdated.name,
+                            "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
+                            tag = "",
+                            call = {
                                 StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
@@ -688,42 +899,90 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(SlideUpMenuGroup(container.context, container.context.getString(R.string.actions), "actions",
                 (listOf(
-                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), "download", {
-                        showDownloadVideoOverlay(video, container, true);
-                    }, false),
-                    SlideUpMenuItem(container.context, R.drawable.ic_share, container.context.getString(R.string.share), "Share the video", "share", {
-                        val url = if(video.shareUrl.isNotEmpty()) video.shareUrl else video.url;
-                        container.context.startActivity(Intent.createChooser(Intent().apply {
-                            action = Intent.ACTION_SEND;
-                            putExtra(Intent.EXTRA_TEXT, url);
-                            type = "text/plain";
-                        }, null));
-                    }, false),
-                    SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, container.context.getString(R.string.hide_creator_from_home), "", "hide_creator", {
-                        StateMeta.instance.addHiddenCreator(video.author.url);
-                        UIDialogs.toast(container.context, "[${video.author.name}] hidden, you may need to reload home");
-                    }))
+                    SlideUpMenuItem(
+                        container.context,
+                        R.drawable.ic_download,
+                        container.context.getString(R.string.download),
+                        container.context.getString(R.string.download_the_video),
+                        tag = "download",
+                        call = {
+                            showDownloadVideoOverlay(video, container, true);
+                        },
+                        invokeParent = false
+                    ),
+                    SlideUpMenuItem(
+                        container.context,
+                        R.drawable.ic_share,
+                        container.context.getString(R.string.share),
+                        "Share the video",
+                        tag = "share",
+                        call = {
+                            val url = if(video.shareUrl.isNotEmpty()) video.shareUrl else video.url;
+                            container.context.startActivity(Intent.createChooser(Intent().apply {
+                                action = Intent.ACTION_SEND;
+                                putExtra(Intent.EXTRA_TEXT, url);
+                                type = "text/plain";
+                            }, null));
+                        },
+                        invokeParent = false
+                    ),
+                    SlideUpMenuItem(
+                        container.context,
+                        R.drawable.ic_visibility_off,
+                        container.context.getString(R.string.hide_creator_from_home),
+                        "",
+                        tag = "hide_creator",
+                        call = {
+                            StateMeta.instance.addHiddenCreator(video.author.url);
+                            UIDialogs.toast(container.context, "[${video.author.name}] hidden, you may need to reload home");
+                        }))
                         + actions)
             ));
             items.add(
                 SlideUpMenuGroup(container.context, container.context.getString(R.string.add_to), "addto",
-                    SlideUpMenuItem(container.context, R.drawable.ic_queue_add, container.context.getString(R.string.add_to_queue), "${queue.size} " + container.context.getString(R.string.videos), "queue",
-                        { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "", "${watchLater.size} " + container.context.getString(R.string.videos), "watch later",
-                        { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); })
+                    SlideUpMenuItem(container.context,
+                        R.drawable.ic_queue_add,
+                        container.context.getString(R.string.add_to_queue),
+                        "${queue.size} " + container.context.getString(R.string.videos),
+                        tag = "queue",
+                        call = { StatePlayer.instance.addToQueue(video); }),
+                    SlideUpMenuItem(container.context,
+                        R.drawable.ic_watchlist_add,
+                        "${container.context.getString(R.string.add_to)} " + StatePlayer.TYPE_WATCHLATER + "",
+                        "${watchLater.size} " + container.context.getString(R.string.videos),
+                        tag = "watch later",
+                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
+                    SlideUpMenuItem(container.context,
+                        R.drawable.ic_history,
+                        container.context.getString(R.string.add_to_history),
+                        "Mark as watched",
+                        tag = "history",
+                        call = { StateHistory.instance.markAsWatched(video); }),
             ));
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
-            playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, container.context.getString(R.string.new_playlist), container.context.getString(R.string.add_to_new_playlist), "add_to_new_playlist", {
-                showCreatePlaylistOverlay(container) {
-                    val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
-                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
-                };
-            }, false))
+            playlistItems.add(SlideUpMenuItem(
+                container.context,
+                R.drawable.ic_playlist_add,
+                container.context.getString(R.string.new_playlist),
+                container.context.getString(R.string.add_to_new_playlist),
+                tag = "add_to_new_playlist",
+                call = {
+                    showCreatePlaylistOverlay(container) {
+                        val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
+                        StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+                    };
+                },
+                invokeParent = false
+            ))
 
             for (playlist in allPlaylists) {
-                playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, "${container.context.getString(R.string.add_to)} " + playlist.name + "", "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
-                    {
+                playlistItems.add(SlideUpMenuItem(container.context,
+                    R.drawable.ic_playlist_add,
+                    "${container.context.getString(R.string.add_to)} " + playlist.name + "",
+                    "${playlist.videos.size} " + container.context.getString(R.string.videos),
+                    tag = "",
+                    call = {
                         StatePlaylists.instance.addToPlaylist(playlist.id, video);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
@@ -745,8 +1004,12 @@ class UISlideOverlays {
             if (lastUpdated != null) {
                 items.add(
                     SlideUpMenuGroup(container.context, container.context.getString(R.string.recently_used_playlist), "recentlyusedplaylist",
-                        SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, lastUpdated.name, "${lastUpdated.videos.size} " + container.context.getString(R.string.videos), "",
-                            {
+                        SlideUpMenuItem(container.context,
+                            R.drawable.ic_playlist_add,
+                            lastUpdated.name,
+                            "${lastUpdated.videos.size} " + container.context.getString(R.string.videos),
+                            tag = "",
+                            call = {
                                 StatePlaylists.instance.addToPlaylist(lastUpdated.id, video);
                                 StateDownloads.instance.checkForOutdatedPlaylists();
                             }))
@@ -758,25 +1021,52 @@ class UISlideOverlays {
             val watchLater = StatePlaylists.instance.getWatchLater();
             items.add(
                 SlideUpMenuGroup(container.context, container.context.getString(R.string.other), "other",
-                    SlideUpMenuItem(container.context, R.drawable.ic_queue_add, container.context.getString(R.string.queue), "${queue.size} " + container.context.getString(R.string.videos), "queue",
-                        { StatePlayer.instance.addToQueue(video); }),
-                    SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, StatePlayer.TYPE_WATCHLATER, "${watchLater.size} " + container.context.getString(R.string.videos), "watch later",
-                        { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
-                    SlideUpMenuItem(container.context, R.drawable.ic_download, container.context.getString(R.string.download), container.context.getString(R.string.download_the_video), container.context.getString(R.string.download),
-                        { showDownloadVideoOverlay(video, container, true); }, false))
+                    SlideUpMenuItem(container.context,
+                        R.drawable.ic_queue_add,
+                        container.context.getString(R.string.queue),
+                        "${queue.size} " + container.context.getString(R.string.videos),
+                        tag = "queue",
+                        call = { StatePlayer.instance.addToQueue(video); }),
+                    SlideUpMenuItem(container.context,
+                        R.drawable.ic_watchlist_add,
+                        StatePlayer.TYPE_WATCHLATER,
+                        "${watchLater.size} " + container.context.getString(R.string.videos),
+                        tag = "watch later",
+                        call = { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
+                    SlideUpMenuItem(
+                        container.context,
+                        R.drawable.ic_download,
+                        container.context.getString(R.string.download),
+                        container.context.getString(R.string.download_the_video),
+                        tag = container.context.getString(R.string.download),
+                        call = { showDownloadVideoOverlay(video, container, true); },
+                        invokeParent = false
+                    ))
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();
-            playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, container.context.getString(R.string.new_playlist), container.context.getString(R.string.add_to_new_playlist), "add_to_new_playlist", {
-                slideUpMenuOverlayUpdated(showCreatePlaylistOverlay(container) {
-                    val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
-                    StatePlaylists.instance.createOrUpdatePlaylist(playlist);
-                });
-            }, false))
+            playlistItems.add(SlideUpMenuItem(
+                container.context,
+                R.drawable.ic_playlist_add,
+                container.context.getString(R.string.new_playlist),
+                container.context.getString(R.string.add_to_new_playlist),
+                tag = "add_to_new_playlist",
+                call = {
+                    slideUpMenuOverlayUpdated(showCreatePlaylistOverlay(container) {
+                        val playlist = Playlist(it, arrayListOf(SerializedPlatformVideo.fromVideo(video)));
+                        StatePlaylists.instance.createOrUpdatePlaylist(playlist);
+                    });
+                },
+                invokeParent = false
+            ))
 
             for (playlist in allPlaylists) {
-                playlistItems.add(SlideUpMenuItem(container.context, R.drawable.ic_playlist_add, playlist.name, "${playlist.videos.size} " + container.context.getString(R.string.videos), "",
-                    {
+                playlistItems.add(SlideUpMenuItem(container.context,
+                    R.drawable.ic_playlist_add,
+                    playlist.name,
+                    "${playlist.videos.size} " + container.context.getString(R.string.videos),
+                    tag = "",
+                    call = {
                         StatePlaylists.instance.addToPlaylist(playlist.id, video);
                         StateDownloads.instance.checkForOutdatedPlaylists();
                     }));
@@ -801,20 +1091,36 @@ class UISlideOverlays {
 
             val views = arrayOf(
                 hidden
-                    .map { btn -> SlideUpMenuItem(container.context, btn.iconResource, btn.text.text.toString(), "", "", {
-                        btn.handler?.invoke(btn);
-                    }, invokeParents) as View  }.toTypedArray(),
-                arrayOf(SlideUpMenuItem(container.context, R.drawable.ic_pin, container.context.getString(R.string.change_pins), container.context.getString(R.string.decide_which_buttons_should_be_pinned), "", {
-                    showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
-                        val selected = it
-                            .map { x -> visible.find { it.tagRef == x } ?: hidden.find { it.tagRef == x } }
-                            .filter { it != null }
-                            .map { it!! }
-                            .toList();
+                    .map { btn -> SlideUpMenuItem(
+                        container.context,
+                        btn.iconResource,
+                        btn.text.text.toString(),
+                        "",
+                        tag = "",
+                        call = {
+                            btn.handler?.invoke(btn);
+                        },
+                        invokeParent = invokeParents
+                    ) as View  }.toTypedArray(),
+                arrayOf(SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_pin,
+                    container.context.getString(R.string.change_pins),
+                    container.context.getString(R.string.decide_which_buttons_should_be_pinned),
+                    tag = "",
+                    call = {
+                        showOrderOverlay(container, container.context.getString(R.string.select_your_pins_in_order),  (visible + hidden).map { Pair(it.text.text.toString(), it.tagRef!!) }) {
+                            val selected = it
+                                .map { x -> visible.find { it.tagRef == x } ?: hidden.find { it.tagRef == x } }
+                                .filter { it != null }
+                                .map { it!! }
+                                .toList();
 
-                        onPinnedbuttons?.invoke(selected + (visible + hidden).filter { !selected.contains(it) });
-                    }
-                }, false))
+                            onPinnedbuttons?.invoke(selected + (visible + hidden).filter { !selected.contains(it) });
+                        }
+                    },
+                    invokeParent = false
+                ))
             ).flatten().toTypedArray();
 
             return SlideUpMenuOverlay(container.context, container, container.context.getString(R.string.more_options), null, true, *views).apply { show() };
@@ -826,14 +1132,21 @@ class UISlideOverlays {
             var overlay: SlideUpMenuOverlay? = null;
 
             overlay = SlideUpMenuOverlay(container.context, container, title, container.context.getString(R.string.save), true,
-                options.map { SlideUpMenuItem(container.context, R.drawable.ic_move_up, it.first, "", it.second, {
+                options.map { SlideUpMenuItem(
+                    container.context,
+                    R.drawable.ic_move_up,
+                    it.first,
+                    "",
+                    tag = it.second,
+                    call = {
                         if(overlay!!.selectOption(null, it.second, true, true)) {
                             if(!selection.contains(it.second))
                                 selection.add(it.second);
-                        }
-                        else
+                        } else
                             selection.remove(it.second);
-                    }, false)
+                    },
+                    invokeParent = false
+                )
                 });
             overlay.onOK.subscribe {
                 onOrdered.invoke(selection);

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

@@ -13,6 +13,7 @@ import android.os.OperationCanceledException
 import android.util.TypedValue
 import android.view.View
 import android.view.WindowInsetsController
+import android.view.WindowManager
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
@@ -25,10 +26,12 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.others.PlatformLinkMovementMethod
+import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.nio.ByteBuffer
 import java.util.*
 import java.util.concurrent.ThreadLocalRandom
 

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

@@ -4,15 +4,19 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.net.Uri
+import android.net.wifi.WifiManager
 import android.os.Bundle
+import android.os.StrictMode
+import android.os.StrictMode.VmPolicy
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
+import android.view.WindowManager
 import android.widget.FrameLayout
+import android.widget.ImageView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -20,30 +24,62 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import com.futo.platformplayer.*
-import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
-import com.futo.platformplayer.fragment.mainactivity.main.*
+import com.futo.platformplayer.fragment.mainactivity.main.BrowserFragment
+import com.futo.platformplayer.fragment.mainactivity.main.BuyFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
+import com.futo.platformplayer.fragment.mainactivity.main.CommentsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ContentSearchResultsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.CreatorSearchResultsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.CreatorsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.DownloadsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.HistoryFragment
+import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ImportPlaylistsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ImportSubscriptionsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
+import com.futo.platformplayer.fragment.mainactivity.main.PlaylistFragment
+import com.futo.platformplayer.fragment.mainactivity.main.PlaylistSearchResultsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.PlaylistsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.PostDetailFragment
+import com.futo.platformplayer.fragment.mainactivity.main.RemotePlaylistFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SourcesFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionGroupListFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SubscriptionsFeedFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SuggestionsFragment
+import com.futo.platformplayer.fragment.mainactivity.main.TutorialFragment
+import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
+import com.futo.platformplayer.fragment.mainactivity.main.WatchLaterFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.GeneralTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.NavigationTopBarFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
-import com.futo.platformplayer.listeners.OrientationManager
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.models.UrlVideoWithTime
-import com.futo.platformplayer.states.*
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
+import com.futo.platformplayer.states.StateDeveloper
+import com.futo.platformplayer.states.StatePayment
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlayer
+import com.futo.platformplayer.states.StatePlaylists
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
@@ -51,15 +87,22 @@ import com.futo.platformplayer.views.ToastView
 import com.futo.polycentric.core.ApiMethods
 import com.google.gson.JsonParser
 import com.google.zxing.integration.android.IntentIntegrator
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
-import java.util.*
+import java.util.LinkedList
+import java.util.Queue
 import java.util.concurrent.ConcurrentLinkedQueue
 
+
 class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     //TODO: Move to dimensions
@@ -79,6 +122,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     private lateinit var _fragContainerVideoDetail: FragmentContainerView;
     private lateinit var _fragContainerOverlay: FrameLayout;
 
+    //Views
+    private lateinit var _buttonIncognito: ImageView;
+
     //Frags TopBar
     lateinit var _fragTopBarGeneral: GeneralTopBarFragment;
     lateinit var _fragTopBarSearch: SearchTopBarFragment;
@@ -129,9 +175,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     val onNavigated = Event1<MainFragment>();
 
-    private lateinit var _orientationManager: OrientationManager;
-    var orientation: OrientationManager.Orientation = OrientationManager.Orientation.PORTRAIT
-        private set;
     private var _isVisible = true;
     private var _wasStopped = false;
 
@@ -156,6 +199,15 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     }
 
     constructor() : super() {
+        if (BuildConfig.DEBUG) {
+            StrictMode.setVmPolicy(
+                VmPolicy.Builder()
+                    .detectLeakedClosableObjects()
+                    .penaltyLog()
+                    .build()
+            )
+        }
+        
         ApiMethods.UserAgent = "Grayjay Android (${BuildConfig.VERSION_CODE})";
 
         Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
@@ -197,12 +249,16 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         Logger.i(TAG, "MainActivity Starting");
+        ApiMethods.initCache(cacheDir);
+
         StateApp.instance.setGlobalContext(this, lifecycleScope);
         StateApp.instance.mainAppStarting(this);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         setNavigationBarColorAndIcons();
+        if (Settings.instance.playback.allowVideoToGoUnderCutout)
+            window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 
         runBlocking {
             StatePlatform.instance.updateAvailableClients(this@MainActivity);
@@ -290,6 +346,52 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             updateSegmentPaddings();
         };
 
+
+        _buttonIncognito = findViewById(R.id.incognito_button);
+        _buttonIncognito.elevation = -99f;
+        _buttonIncognito.alpha = 0f;
+        StateApp.instance.privateModeChanged.subscribe {
+            //Messing with visibility causes some issues with layout ordering?
+            if(it) {
+                _buttonIncognito.elevation = 99f;
+                _buttonIncognito.alpha = 1f;
+            }
+            else {
+                _buttonIncognito.elevation = -99f;
+                _buttonIncognito.alpha = 0f;
+            }
+        }
+        _buttonIncognito.setOnClickListener {
+            if(!StateApp.instance.privateMode)
+                return@setOnClickListener;
+            UIDialogs.showDialog(this, R.drawable.ic_disabled_visible_purple, "Disable Privacy Mode",
+                "Do you want to disable privacy mode? New videos will be tracked again.", null, 0,
+                UIDialogs.Action("Cancel", {
+                    StateApp.instance.setPrivacyMode(true);
+                }, UIDialogs.ActionStyle.NONE),
+                UIDialogs.Action("Disable", {
+                    StateApp.instance.setPrivacyMode(false);
+                }, UIDialogs.ActionStyle.DANGEROUS));
+        };
+        _fragVideoDetail.onFullscreenChanged.subscribe {
+            Logger.i(TAG, "onFullscreenChanged ${it}");
+
+            if(it) {
+                _buttonIncognito.elevation = -99f;
+                _buttonIncognito.alpha = 0f;
+            }
+            else {
+                if(StateApp.instance.privateMode) {
+                    _buttonIncognito.elevation = 99f;
+                    _buttonIncognito.alpha = 1f;
+                }
+                else {
+                    _buttonIncognito.elevation = -99f;
+                    _buttonIncognito.alpha = 0f;
+                }
+            }
+        }
+
         StatePlayer.instance.also {
             it.onQueueChanged.subscribe { shouldSwapCurrentItem ->
                 if (!shouldSwapCurrentItem) {
@@ -364,26 +466,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             .commitNow();
 
         defaultTab.action(_fragBotBarMenu);
-
-        _orientationManager = OrientationManager(this);
-        _orientationManager.onOrientationChanged.subscribe {
-            orientation = it;
-            Logger.i(TAG, "Orientation changed (Found ${it})");
-            fragCurrent.onOrientationChanged(it);
-            if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED)
-                _fragVideoDetail.onOrientationChanged(it);
-            else if(Settings.instance.other.bypassRotationPrevention)
-            {
-                requestedOrientation = when(orientation) {
-                    OrientationManager.Orientation.PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-                    OrientationManager.Orientation.LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                    OrientationManager.Orientation.REVERSED_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
-                    OrientationManager.Orientation.REVERSED_LANDSCAPE -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-                }
-            }
-        };
-        _orientationManager.enable();
-
         StateSubscriptions.instance;
 
         fragCurrent.onShown(null, false);
@@ -438,7 +520,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-
     /*
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -480,17 +561,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onResume() {
         super.onResume();
         Logger.v(TAG, "onResume")
-
-        val curOrientation = _orientationManager.orientation;
-
-        if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.lastOrientation != curOrientation) {
-            Logger.i(TAG, "Orientation mismatch (Found ${curOrientation})");
-            orientation = curOrientation;
-            fragCurrent.onOrientationChanged(curOrientation);
-            if(_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED)
-                _fragVideoDetail.onOrientationChanged(curOrientation);
-        }
-
         _isVisible = true;
     }
 
@@ -538,6 +608,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             "IMPORT_OPTIONS" -> {
                 UIDialogs.showImportOptionsDialog(this);
             }
+            "ACTION" -> {
+                val action = intent.getStringExtra("ACTION");
+                StateDeveloper.instance.testState = "TestPlayback";
+                StateDeveloper.instance.testPlayback();
+            }
             "TAB" -> {
                 when(intent.getStringExtra("TAB")){
                     "Sources" -> {
@@ -659,7 +734,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    suspend fun handleUrl(url: String): Boolean {
+    suspend fun handleUrl(url: String, position: Int = 0): Boolean {
         Logger.i(TAG, "handleUrl(url=$url)")
 
         return withContext(Dispatchers.IO) {
@@ -667,7 +742,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (StatePlatform.instance.hasEnabledVideoClient(url)) {
                 Logger.i(TAG, "handleUrl(url=$url) found video client");
                 lifecycleScope.launch(Dispatchers.Main) {
-                    navigate(_fragVideoDetail, url);
+                    if(position > 0)
+                        navigate(_fragVideoDetail, UrlVideoWithTime(url, position.toLong(), true));
+                    else
+                        navigate(_fragVideoDetail, url);
 
                     _fragVideoDetail.maximizeVideoDetail(true);
                 }
@@ -886,18 +964,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onRestart() {
         super.onRestart();
         Logger.i(TAG, "onRestart");
-
-        //Force Portrait on restart
-        Logger.i(TAG, "Restarted with state ${_fragVideoDetail.state}");
-        if(_fragVideoDetail.state != VideoDetailFragment.State.MAXIMIZED) {
-            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-            WindowCompat.setDecorFitsSystemWindows(window, true)
-            WindowInsetsControllerCompat(window, rootView).let { controller ->
-                controller.show(WindowInsetsCompat.Type.statusBars());
-                controller.show(WindowInsetsCompat.Type.systemBars())
-            }
-            _fragVideoDetail.onOrientationChanged(OrientationManager.Orientation.PORTRAIT);
-        }
     }
 
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
@@ -912,9 +978,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     override fun onDestroy() {
         super.onDestroy();
         Logger.v(TAG, "onDestroy")
-
-        _orientationManager.disable();
-
         StateApp.instance.mainAppDestroyed(this);
     }
 
@@ -1180,6 +1243,13 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             return sourcesIntent;
         }
+        fun getActionIntent(context: Context, action: String) : Intent {
+            val sourcesIntent = Intent(context, MainActivity::class.java);
+            sourcesIntent.action = "ACTION";
+            sourcesIntent.putExtra("ACTION", action);
+            sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            return sourcesIntent;
+        }
 
         fun getImportOptionsIntent(context: Context): Intent {
             val sourcesIntent = Intent(context, MainActivity::class.java);

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

@@ -3,6 +3,7 @@ package com.futo.platformplayer.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
@@ -17,6 +18,7 @@ import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.views.LoaderView
 import com.futo.polycentric.core.ProcessHandle
 import com.futo.polycentric.core.Store
 import kotlinx.coroutines.Dispatchers
@@ -27,6 +29,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
     private lateinit var _buttonHelp: ImageButton;
     private lateinit var _profileName: EditText;
     private lateinit var _buttonCreate: LinearLayout;
+    private lateinit var _loader: LoaderView;
     private val TAG = "PolycentricCreateProfileActivity";
 
     private var _creating = false;
@@ -43,6 +46,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
         _buttonHelp = findViewById(R.id.button_help);
         _profileName = findViewById(R.id.edit_profile_name);
         _buttonCreate = findViewById(R.id.button_create_profile);
+        _loader = findViewById(R.id.loader);
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
         };
@@ -65,35 +69,49 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                     return@setOnClickListener;
                 }
 
+                _profileName.isEnabled = false;
+                _buttonCreate.visibility = View.GONE;
+                _loader.start();
+                _loader.visibility = View.VISIBLE;
+                
                 lifecycleScope.launch(Dispatchers.IO) {
                     val processHandle: ProcessHandle;
-
                     try {
-                        processHandle = ProcessHandle.create();
-                        Store.instance.addProcessSecret(processHandle.processSecret);
-
                         try {
-                            PolycentricStorage.instance.addProcessSecret(processHandle.processSecret)
+                            processHandle = ProcessHandle.create();
+                            Store.instance.addProcessSecret(processHandle.processSecret);
+
+                            try {
+                                PolycentricStorage.instance.addProcessSecret(processHandle.processSecret)
+                            } catch (e: Throwable) {
+                                Logger.e(TAG, "Failed to save process secret to secret storage.", e)
+                            }
+
+                            processHandle.addServer(PolycentricCache.SERVER);
+                            processHandle.setUsername(username);
+                            StatePolycentric.instance.setProcessHandle(processHandle);
                         } catch (e: Throwable) {
-                            Logger.e(TAG, "Failed to save process secret to secret storage.", e)
+                            Logger.e(TAG, getString(R.string.failed_to_create_profile), e);
+                            return@launch;
+                        } finally {
+                            _creating = false;
                         }
 
-                        processHandle.addServer(PolycentricCache.SERVER);
-                        processHandle.setUsername(username);
-                        StatePolycentric.instance.setProcessHandle(processHandle);
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, getString(R.string.failed_to_create_profile), e);
-                        return@launch;
-                    } finally {
-                        _creating = false;
+                        try {
+                            Logger.i(TAG, "Started backfill");
+                            processHandle.fullyBackfillServersAnnounceExceptions();
+                            Logger.i(TAG, "Finished backfill");
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers), e);
+                        }
                     }
-
-                    try {
-                        Logger.i(TAG, "Started backfill");
-                        processHandle.fullyBackfillServersAnnounceExceptions();
-                        Logger.i(TAG, "Finished backfill");
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers), e);
+                    finally {
+                        withContext(Dispatchers.Main) {
+                            _profileName.isEnabled = true;
+                            _buttonCreate.visibility = View.VISIBLE;
+                            _loader.stop();
+                            _loader.visibility = View.GONE;
+                        }
                     }
 
                     withContext(Dispatchers.Main) {

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.util.TypedValue
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import android.widget.ScrollView
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
@@ -28,6 +29,7 @@ class PolycentricHomeActivity : AppCompatActivity() {
     private lateinit var _buttonNewProfile: BigButton;
     private lateinit var _buttonImportProfile: BigButton;
     private lateinit var _layoutButtons: LinearLayout;
+    private lateinit var _scroll: ScrollView;
 
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
@@ -42,6 +44,7 @@ class PolycentricHomeActivity : AppCompatActivity() {
         _buttonNewProfile = findViewById(R.id.button_new_profile);
         _buttonImportProfile = findViewById(R.id.button_import_profile);
         _layoutButtons = findViewById(R.id.layout_buttons);
+        _scroll = findViewById(R.id.scroll);
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
         };
@@ -78,6 +81,7 @@ class PolycentricHomeActivity : AppCompatActivity() {
 
             _layoutButtons.addView(profileButton, 0);
         }
+        _scroll.invalidate();
 
         _buttonHelp.setOnClickListener {
             startActivity(Intent(this, PolycentricWhyActivity::class.java));

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

@@ -25,6 +25,7 @@ import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.polycentric.PolycentricCache
+import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
@@ -33,6 +34,7 @@ import com.futo.platformplayer.views.buttons.BigButton
 import com.futo.platformplayer.views.overlays.LoaderOverlay
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toBase64Url
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.github.dhaval2404.imagepicker.ImagePicker
@@ -47,6 +49,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
     private lateinit var _buttonHelp: ImageButton;
     private lateinit var _editName: EditText;
     private lateinit var _buttonExport: BigButton;
+    private lateinit var _buttonOpenHarborProfile: BigButton;
     private lateinit var _buttonLogout: BigButton;
     private lateinit var _buttonDelete: BigButton;
     private lateinit var _username: String;
@@ -68,10 +71,14 @@ class PolycentricProfileActivity : AppCompatActivity() {
         _imagePolycentric = findViewById(R.id.image_polycentric);
         _editName = findViewById(R.id.edit_profile_name);
         _buttonExport = findViewById(R.id.button_export);
+        _buttonOpenHarborProfile = findViewById(R.id.button_open_harbor_profile);
         _buttonLogout = findViewById(R.id.button_logout);
         _buttonDelete = findViewById(R.id.button_delete);
         _loaderOverlay = findViewById(R.id.loader_overlay);
         _textSystem = findViewById(R.id.text_system)
+        findViewById<TextView>(R.id.text_cta2).setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://harbor.social")))
+        }
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             saveIfRequired();
             finish();
@@ -92,6 +99,16 @@ class PolycentricProfileActivity : AppCompatActivity() {
             startActivity(Intent(this, PolycentricBackupActivity::class.java));
         };
 
+        _buttonOpenHarborProfile.onClick.subscribe {
+            val processHandle = StatePolycentric.instance.processHandle!!;
+            processHandle?.let {
+                val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(it.system));
+                val url = it.system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
+                val navUrl = "https://harbor.social/" + url.substring("polycentric://".length)
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(navUrl)))
+            }
+        }
+
         _buttonLogout.onClick.subscribe {
             StatePolycentric.instance.setProcessHandle(null);
             startActivity(Intent(this, PolycentricHomeActivity::class.java));
@@ -108,6 +125,7 @@ class PolycentricProfileActivity : AppCompatActivity() {
 
                 StatePolycentric.instance.setProcessHandle(null);
                 Store.instance.removeProcessSecret(processHandle.system);
+                PolycentricStorage.instance.removeProcessSecret(processHandle.system);
                 startActivity(Intent(this, PolycentricHomeActivity::class.java));
                 finish();
             });

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

@@ -18,6 +18,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
+import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.views.LoaderView
@@ -184,12 +185,19 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
         resultLauncher.launch(intent);
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        settingsActivityClosed.emit()
+    }
+
 
     companion object {
         //TODO: Temporary for solving Settings issues
         @SuppressLint("StaticFieldLeak")
         private var _lastActivity: SettingsActivity? = null;
 
+        val settingsActivityClosed = Event0()
+
         fun getActivity(): SettingsActivity? {
             val act = _lastActivity;
             if(act != null && !act._isFinished)

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

@@ -0,0 +1,138 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.R
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateSync
+import com.futo.platformplayer.sync.internal.LinkType
+import com.futo.platformplayer.sync.internal.SyncSession
+import com.futo.platformplayer.views.sync.SyncDeviceView
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class SyncHomeActivity : AppCompatActivity() {
+    private lateinit var _layoutDevices: LinearLayout
+    private lateinit var _layoutEmpty: LinearLayout
+    private val _viewMap: MutableMap<String, SyncDeviceView> = mutableMapOf()
+
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_sync_home)
+        setNavigationBarColorAndIcons()
+
+        _layoutDevices = findViewById(R.id.layout_devices)
+        _layoutEmpty = findViewById(R.id.layout_empty)
+
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+            finish()
+        }
+
+        findViewById<LinearLayout>(R.id.button_link_new_device).setOnClickListener {
+            startActivity(Intent(this@SyncHomeActivity, SyncPairActivity::class.java))
+        }
+
+        findViewById<LinearLayout>(R.id.button_show_pairing_code).setOnClickListener {
+            startActivity(Intent(this@SyncHomeActivity, SyncShowPairingCodeActivity::class.java))
+        }
+
+        initializeDevices()
+
+        StateSync.instance.deviceUpdatedOrAdded.subscribe(this) { publicKey, session ->
+            lifecycleScope.launch(Dispatchers.Main) {
+                val view = _viewMap[publicKey]
+                if (!session.isAuthorized) {
+                    if (view != null) {
+                        _layoutDevices.removeView(view)
+                        _viewMap.remove(publicKey)
+                    }
+                    return@launch
+                }
+
+                if (view == null) {
+                    val syncDeviceView = SyncDeviceView(this@SyncHomeActivity)
+                    syncDeviceView.onRemove.subscribe {
+                        StateApp.instance.scopeOrNull?.launch {
+                            StateSync.instance.delete(publicKey)
+                        }
+                    }
+                    val v = updateDeviceView(syncDeviceView, publicKey, session)
+                    _layoutDevices.addView(v, 0)
+                    _viewMap[publicKey] = v
+                } else {
+                    updateDeviceView(view, publicKey, session)
+                }
+
+                updateEmptyVisibility()
+            }
+        }
+
+        StateSync.instance.deviceRemoved.subscribe(this) {
+            lifecycleScope.launch(Dispatchers.Main) {
+                val view = _viewMap[it]
+                if (view != null) {
+                    _layoutDevices.removeView(view)
+                    _viewMap.remove(it)
+                }
+
+                updateEmptyVisibility()
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        StateSync.instance.deviceUpdatedOrAdded.remove(this)
+        StateSync.instance.deviceRemoved.remove(this)
+    }
+
+    private fun updateDeviceView(syncDeviceView: SyncDeviceView, publicKey: String, session: SyncSession?): SyncDeviceView {
+        val connected = session?.connected ?: false
+        syncDeviceView.setLinkType(if (connected) LinkType.Local else LinkType.None)
+            .setName(publicKey)
+            .setStatus(if (connected) "Connected" else "Disconnected")
+        return syncDeviceView
+    }
+
+    private fun updateEmptyVisibility() {
+        if (_viewMap.isNotEmpty()) {
+            _layoutEmpty.visibility = View.GONE
+        } else {
+            _layoutEmpty.visibility = View.VISIBLE
+        }
+    }
+
+    private fun initializeDevices() {
+        _layoutDevices.removeAllViews()
+
+        for (publicKey in StateSync.instance.getAll()) {
+            val syncDeviceView = SyncDeviceView(this)
+            syncDeviceView.onRemove.subscribe {
+                StateApp.instance.scopeOrNull?.launch {
+                    StateSync.instance.delete(publicKey)
+                }
+            }
+            val view = updateDeviceView(syncDeviceView, publicKey, StateSync.instance.getSession(publicKey))
+            _layoutDevices.addView(view)
+            _viewMap[publicKey] = view
+        }
+
+        updateEmptyVisibility()
+    }
+
+    companion object {
+        private const val TAG = "SyncHomeActivity"
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.os.Bundle
+import android.util.Base64
+import android.view.View
+import android.widget.EditText
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.R
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateSync
+import com.futo.platformplayer.sync.internal.SyncDeviceInfo
+import com.google.zxing.integration.android.IntentIntegrator
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+
+class SyncPairActivity : AppCompatActivity() {
+    private lateinit var _editCode: EditText
+
+    private lateinit var _layoutPairing: LinearLayout
+    private lateinit var _textPairingStatus: TextView
+
+    private lateinit var _layoutPairingSuccess: LinearLayout
+
+    private lateinit var _layoutPairingError: LinearLayout
+    private lateinit var _textError: TextView
+
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            if (it.contents != null) {
+                _editCode.text.clear()
+                _editCode.text.append(it.contents)
+                pair(it.contents)
+            }
+        }
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_sync_pair)
+        setNavigationBarColorAndIcons()
+
+        _editCode = findViewById(R.id.edit_code)
+        _layoutPairing = findViewById(R.id.layout_pairing)
+        _textPairingStatus = findViewById(R.id.text_pairing_status)
+        _layoutPairingSuccess = findViewById(R.id.layout_pairing_success)
+        _layoutPairingError = findViewById(R.id.layout_pairing_error)
+        _textError = findViewById(R.id.text_error)
+
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+            finish()
+        }
+
+        findViewById<LinearLayout>(R.id.button_scan_qr).setOnClickListener {
+            val integrator = IntentIntegrator(this)
+            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+            integrator.setPrompt(getString(R.string.scan_a_qr_code))
+            integrator.setOrientationLocked(true);
+            integrator.setCameraId(0)
+            integrator.setBeepEnabled(false)
+            integrator.setBarcodeImageEnabled(true)
+            integrator.setCaptureActivity(QRCaptureActivity::class.java);
+            _qrCodeResultLauncher.launch(integrator.createScanIntent())
+        }
+
+        findViewById<LinearLayout>(R.id.button_link_new_device).setOnClickListener {
+            pair(_editCode.text.toString())
+        }
+
+        _layoutPairingSuccess.setOnClickListener {
+            _layoutPairingSuccess.visibility = View.GONE
+        }
+        _layoutPairingError.setOnClickListener {
+            _layoutPairingError.visibility = View.GONE
+        }
+        _layoutPairingSuccess.visibility = View.GONE
+        _layoutPairingError.visibility = View.GONE
+    }
+
+    fun pair(url: String) {
+        try {
+            _layoutPairing.visibility = View.VISIBLE
+            _textPairingStatus.text = "Parsing text..."
+
+            if (!url.startsWith("grayjay://sync/")) {
+                throw Exception("Not a valid URL: $url")
+            }
+
+            val deviceInfo: SyncDeviceInfo = Json.decodeFromString<SyncDeviceInfo>(Base64.decode(url.substring("grayjay://sync/".length), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP).decodeToString())
+            if (StateSync.instance.isAuthorized(deviceInfo.publicKey)) {
+                throw Exception("This device is already paired")
+            }
+
+            _textPairingStatus.text = "Connecting..."
+
+            lifecycleScope.launch(Dispatchers.IO) {
+                try {
+                    StateSync.instance.connect(deviceInfo) { session, complete, message ->
+                        lifecycleScope.launch(Dispatchers.Main) {
+                            if (complete) {
+                                _layoutPairingSuccess.visibility = View.VISIBLE
+                                _layoutPairing.visibility = View.GONE
+                            } else {
+                                _textPairingStatus.text = message
+                            }
+                        }
+                    }
+                } catch (e: Throwable) {
+                    withContext(Dispatchers.Main) {
+                        _layoutPairingError.visibility = View.VISIBLE
+                        _textError.text = e.message
+                        _layoutPairing.visibility = View.GONE
+                        Logger.e(TAG, "Failed to pair", e)
+                    }
+                }
+            }
+        } catch(e: Throwable) {
+            _layoutPairingError.visibility = View.VISIBLE
+            _textError.text = e.message
+            _layoutPairing.visibility = View.GONE
+            Logger.e(TAG, "Failed to pair", e)
+        } finally {
+            _layoutPairing.visibility = View.GONE
+        }
+    }
+
+    companion object {
+        private const val TAG = "SyncPairActivity"
+    }
+}

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

@@ -0,0 +1,142 @@
+package com.futo.platformplayer.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.os.Bundle
+import android.util.Base64
+import android.util.TypedValue
+import android.view.View
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateSync
+import com.futo.platformplayer.sync.internal.SyncDeviceInfo
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.MultiFormatWriter
+import com.google.zxing.common.BitMatrix
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.net.NetworkInterface
+
+class SyncShowPairingCodeActivity : AppCompatActivity() {
+    private lateinit var _textCode: TextView
+    private lateinit var _imageQR: ImageView
+    private lateinit var _textQR: TextView
+    private var _code: String? = null
+
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        activity = null
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        activity = this
+
+        setContentView(R.layout.activity_sync_show_pairing_code)
+        setNavigationBarColorAndIcons()
+
+        _textCode = findViewById(R.id.text_code)
+        _imageQR = findViewById(R.id.image_qr)
+        _textQR = findViewById(R.id.text_scan_qr)
+
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+            finish()
+        }
+
+        findViewById<LinearLayout>(R.id.button_copy).setOnClickListener {
+            val code = _code ?: return@setOnClickListener
+            val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager;
+            val clip = ClipData.newPlainText(getString(R.string.copied_text), code);
+            clipboard.setPrimaryClip(clip);
+            UIDialogs.toast(this, "Copied to clipboard")
+        }
+
+        val ips = getIPs()
+        val selfDeviceInfo = SyncDeviceInfo(StateSync.instance.publicKey!!, ips.toTypedArray(), StateSync.PORT)
+        val json = Json.encodeToString(selfDeviceInfo)
+        val base64 = Base64.encodeToString(json.toByteArray(), Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
+        val url = "grayjay://sync/${base64}"
+        setCode(url)
+    }
+
+    fun setCode(code: String?) {
+        _code = code
+
+        _textCode.text = code
+
+        if (code == null) {
+            _imageQR.visibility = View.INVISIBLE
+            _textQR.visibility = View.INVISIBLE
+            return
+        }
+
+        try {
+            val dimension = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 200f, resources.displayMetrics).toInt()
+            val qrCodeBitmap = generateQRCode(code, dimension, dimension)
+            _imageQR.setImageBitmap(qrCodeBitmap)
+            _imageQR.visibility = View.VISIBLE
+            _textQR.visibility = View.VISIBLE
+        } catch (e: Exception) {
+            Logger.e(TAG, getString(R.string.failed_to_generate_qr_code), e)
+            _imageQR.visibility = View.INVISIBLE
+            _textQR.visibility = View.INVISIBLE
+        }
+    }
+
+    private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
+        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height);
+        return bitMatrixToBitmap(bitMatrix);
+    }
+
+    private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
+        val width = matrix.width;
+        val height = matrix.height;
+        val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
+
+        for (x in 0 until width) {
+            for (y in 0 until height) {
+                bmp.setPixel(x, y, if (matrix[x, y]) Color.BLACK else Color.WHITE);
+            }
+        }
+        return bmp;
+    }
+
+    private fun getIPs(): List<String> {
+        val ips = arrayListOf<String>()
+        for (intf in NetworkInterface.getNetworkInterfaces()) {
+            for (addr in intf.inetAddresses) {
+                if (addr.isLoopbackAddress) {
+                    continue
+                }
+
+                if (addr.address.size != 4) {
+                    continue
+                }
+
+                addr.hostAddress?.let { ips.add(it) }
+            }
+        }
+        return ips
+    }
+
+    companion object {
+        private const val TAG = "SyncShowPairingCodeActivity"
+        var activity: SyncShowPairingCodeActivity? = null
+            private set
+    }
+}

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

@@ -17,13 +17,14 @@ import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
+import java.time.Duration
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 import kotlin.system.measureTimeMillis
 
 open class ManagedHttpClient {
-    protected val _builderTemplate: OkHttpClient.Builder;
+    protected var _builderTemplate: OkHttpClient.Builder;
 
     private var client: OkHttpClient;
 
@@ -32,6 +33,15 @@ open class ManagedHttpClient {
 
     var user_agent = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
 
+    fun setTimeout(timeout: Long) {
+        rebuildClient {
+            it.callTimeout(Duration.ofMillis(client.callTimeoutMillis.toLong()))
+                .writeTimeout(Duration.ofMillis(client.writeTimeoutMillis.toLong()))
+                .readTimeout(Duration.ofMillis(client.readTimeoutMillis.toLong()))
+                .connectTimeout(Duration.ofMillis(timeout));
+        }
+    }
+
     private val trustAllCerts = arrayOf<TrustManager>(
       object: X509TrustManager {
           override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) { }
@@ -62,6 +72,15 @@ open class ManagedHttpClient {
         }.build();
     }
 
+    fun rebuildClient(modify: (OkHttpClient.Builder) -> OkHttpClient.Builder) {
+        _builderTemplate = modify(_builderTemplate);
+        client = _builderTemplate.addNetworkInterceptor { chain ->
+            val request = beforeRequest(chain.request());
+            val response = afterRequest(chain.proceed(request));
+            return@addNetworkInterceptor response;
+        }.build();
+    }
+
     open fun clone(): ManagedHttpClient {
         val clonedClient = ManagedHttpClient(_builderTemplate);
         clonedClient.user_agent = user_agent;

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

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

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

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

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

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

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

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

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

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

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

@@ -4,6 +4,6 @@ import kotlinx.serialization.json.Json
 
 class Serializer {
     companion object {
-        val json = Json { ignoreUnknownKeys = true; encodeDefaults = true; };
+        val json = Json { ignoreUnknownKeys = true; encodeDefaults = true; coerceInputValues = true };
     }
 }

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

@@ -27,6 +27,8 @@ open class PlatformAuthorLink {
     }
 
     companion object {
+        val UNKNOWN = PlatformAuthorLink(PlatformID.NONE, "Unknown", "", null, null);
+
         fun fromV8(config: SourcePluginConfig, value: V8ValueObject): PlatformAuthorLink {
             if(value.has("membershipUrl"))
                 return PlatformAuthorMembershipLink.fromV8(config, value);

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

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

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

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

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

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

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

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

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

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

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

@@ -19,9 +19,9 @@ open class SerializedPlatformVideo(
     override val thumbnails: Thumbnails,
     override val author: PlatformAuthorLink,
     @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
-    override val datetime: OffsetDateTime?,
+    override val datetime: OffsetDateTime? = null,
     override val url: String,
-    override val shareUrl: String,
+    override val shareUrl: String = "",
 
     override val duration: Long,
     override val viewCount: Long,

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

@@ -54,8 +54,8 @@ class DevJSClient : JSClient {
         return DevJSClient(context, config, _devScript, _auth, _captcha, devID, descriptor.settings);
     }
 
-    override fun getCopy(): JSClient {
-        return DevJSClient(_context, descriptor, _script, _auth, _captcha, saveState(), devID);
+    override fun getCopy(privateCopy: Boolean): JSClient {
+        return DevJSClient(_context, descriptor, _script, if(!privateCopy) _auth else null, _captcha, saveState(), devID);
     }
 
     override fun initialize() {

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

@@ -164,13 +164,16 @@ open class JSClient : IPlatformClient {
 
         _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
     }
-    constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String) {
+    constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String, withoutCredentials: Boolean = false) {
         this._context = context;
         this.config = descriptor.config;
         icon = StatePlatform.instance.getPlatformIcon(config.id) ?: ImageVariable(config.absoluteIconUrl, null, null);
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
-        _auth = descriptor.getAuth();
+        if(!withoutCredentials)
+            _auth = descriptor.getAuth();
+        else
+            _auth = null;
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
@@ -190,8 +193,8 @@ open class JSClient : IPlatformClient {
         _plugin.changeAllowDevSubmit(descriptor.appSettings.allowDeveloperSubmit);
     }
 
-    open fun getCopy(): JSClient {
-        return JSClient(_context, descriptor, saveState(), _script);
+    open fun getCopy(withoutCredentials: Boolean = false): JSClient {
+        return JSClient(_context, descriptor, saveState(), _script, withoutCredentials);
     }
 
     fun getUnderlyingPlugin(): V8Plugin {
@@ -234,7 +237,8 @@ open class JSClient : IPlatformClient {
             hasGetLiveChatWindow = plugin.executeBoolean("!!source.getLiveChatWindow") ?: false,
             hasGetContentChapters = plugin.executeBoolean("!!source.getContentChapters") ?: false,
             hasPeekChannelContents = plugin.executeBoolean("!!source.peekChannelContents") ?: false,
-            hasGetChannelPlaylists = plugin.executeBoolean("!!source.getChannelPlaylists") ?: false
+            hasGetChannelPlaylists = plugin.executeBoolean("!!source.getChannelPlaylists") ?: false,
+            hasGetContentRecommendations = plugin.executeBoolean("!!source.getContentRecommendations") ?: false
         );
 
         try {

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

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

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

@@ -4,7 +4,9 @@ import android.net.Uri
 import com.futo.platformplayer.SignatureProvider
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.matchesDomain
 import com.futo.platformplayer.states.StatePlugins
+import kotlinx.serialization.Contextual
 import java.net.URL
 import java.util.UUID
 
@@ -48,6 +50,7 @@ class SourcePluginConfig(
     var primaryClaimFieldType: Int? = null,
     var developerSubmitUrl: String? = null,
     var allowAllHttpHeaderAccess: Boolean = false,
+    var maxDownloadParallelism: Int = 0
 ) : IV8PluginConfig {
 
     val absoluteIconUrl: String? get() = resolveAbsoluteUrl(iconUrl, sourceUrl);
@@ -77,7 +80,8 @@ class SourcePluginConfig(
     private var _allowUrlsLowerVal: List<String>? = null;
     private val _allowUrlsLower: List<String> get() {
         if(_allowUrlsLowerVal == null)
-            _allowUrlsLowerVal = allowUrls.map { it.lowercase() };
+            _allowUrlsLowerVal = allowUrls.map { it.lowercase() }
+                .filter { it.length > 0 };
         return _allowUrlsLowerVal!!;
     };
 
@@ -170,7 +174,7 @@ class SourcePluginConfig(
             return true;
         val uri = Uri.parse(url);
         val host = uri.host?.lowercase() ?: "";
-        return _allowUrlsLower.any { it == host };
+        return _allowUrlsLower.any { it == host || (it.length > 0 && it[0] == '.' && host.matchesDomain(it)) };
     }
 
     companion object {

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

@@ -38,7 +38,7 @@ class JSHttpClient : ManagedHttpClient {
 
     constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super(
             //Temporary ugly solution for DevPortal proxy support
-            (if(jsClient?.config?.id == StateDeveloper.DEV_ID && StateDeveloper.instance.devProxy != null)
+            (if((jsClient?.config?.id == StateDeveloper.DEV_ID || jsClient == null) && StateDeveloper.instance.devProxy != null)
                 OkHttpClient.Builder().proxy(Proxy(Proxy.Type.HTTP,
                     InetSocketAddress(StateDeveloper.instance.devProxy!!.url, StateDeveloper.instance.devProxy!!.port)
                 ))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -25,10 +25,8 @@ import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.states.StatePlatform
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.google.gson.JsonParser
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -573,7 +571,7 @@ class DeveloperEndpoints(private val context: Context) {
             val resp = _client.get(body.url!!, body.headers);
 
             context.respondCode(200,
-                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.url, resp.code, resp.body?.string())),
+                Json.encodeToString(PackageHttp.BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string())),
                 context.query.getOrDefault("CT", "text/plain"));
         }
         catch(ex: Exception) {

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

@@ -104,6 +104,8 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         super.show();
         Logger.i(TAG, "Dialog shown.");
 
+        StateCasting.instance.startDiscovering()
+
         (_imageLoader.drawable as Animatable?)?.start();
 
         _devices.clear();
@@ -169,6 +171,7 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
 
         (_imageLoader.drawable as Animatable?)?.stop();
 
+        StateCasting.instance.stopDiscovering()
         StateCasting.instance.onDeviceAdded.remove(this);
         StateCasting.instance.onDeviceChanged.remove(this);
         StateCasting.instance.onDeviceRemoved.remove(this);

app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt

@@ -12,6 +12,8 @@ import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescri
 import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -25,6 +27,14 @@ 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.models.video.SerializedPlatformVideoDetails
+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.models.JSRequestExecutor
+import com.futo.platformplayer.api.media.platforms.js.models.JSVideo
+import com.futo.platformplayer.api.media.platforms.js.models.sources.IJSDashManifestRawSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.exceptions.DownloadException
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
@@ -34,6 +44,7 @@ import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
 import hasAnySource
@@ -46,9 +57,12 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Transient
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.lang.Thread.sleep
 import java.time.OffsetDateTime
 import java.util.UUID
 import java.util.concurrent.Executors
@@ -56,6 +70,7 @@ import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
 import kotlin.coroutines.resumeWithException
+import kotlin.time.times
 
 @kotlinx.serialization.Serializable
 class VideoDownload {
@@ -71,12 +86,50 @@ class VideoDownload {
 
     var targetPixelCount: Long? = null;
     var targetBitrate: Long? = null;
+    var targetVideoName: String? = null;
+    var targetAudioName: String? = null;
+
     var videoSource: VideoUrlSource?;
     var audioSource: AudioUrlSource?;
+    @Contextual
+    @Transient
+    val videoSourceToUse: IVideoSource? get () = if(requiresLiveVideoSource) videoSourceLive as IVideoSource? else videoSource as IVideoSource?;
+    @Contextual
+    @Transient
+    val audioSourceToUse: IAudioSource? get () = if(requiresLiveAudioSource) audioSourceLive as IAudioSource? else audioSource as IAudioSource?;
+
+    var requireVideoSource: Boolean = false;
+    var requireAudioSource: Boolean = false;
+
+    @Contextual
+    @Transient
+    val isVideoDownloadReady: Boolean get() = !requireVideoSource ||
+            ((requiresLiveVideoSource && isLiveVideoSourceValid) || (!requiresLiveVideoSource && videoSource != null));
+    @Contextual
+    @Transient
+    val isAudioDownloadReady: Boolean get() = !requireAudioSource ||
+            ((requiresLiveAudioSource && isLiveAudioSourceValid) || (!requiresLiveAudioSource && audioSource != null));
+
+
     var subtitleSource: SubtitleRawSource?;
     @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
     var prepareTime: OffsetDateTime? = null;
 
+    var requiresLiveVideoSource: Boolean = false;
+    @Contextual
+    @kotlinx.serialization.Transient
+    var videoSourceLive: JSSource? = null;
+    val isLiveVideoSourceValid get() = videoSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+
+    var requiresLiveAudioSource: Boolean = false;
+    @Contextual
+    @kotlinx.serialization.Transient
+    var audioSourceLive: JSSource? = null;
+    val isLiveAudioSourceValid get() = audioSourceLive?.getUnderlyingObject()?.isClosed?.let { !it } ?: false;
+
+    var hasVideoRequestExecutor: Boolean = false;
+    var hasAudioRequestExecutor: Boolean = false;
+
     var progress: Double = 0.0;
     var isCancelled = false;
 
@@ -118,14 +171,32 @@ class VideoDownload {
         this.subtitleSource = null;
         this.targetPixelCount = targetPixelCount;
         this.targetBitrate = targetBitrate;
+        this.hasVideoRequestExecutor = video is JSSource && video.hasRequestExecutor;
+        this.requiresLiveVideoSource = false;
+        this.requiresLiveAudioSource = false;
+        this.targetVideoName = videoSource?.name;
+        this.requireVideoSource = targetPixelCount != null
+        this.requireAudioSource = targetBitrate != null; //TODO: May not be a valid check.. can only be determined after live fetch?
     }
-    constructor(video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: SubtitleRawSource?) {
+    constructor(video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: SubtitleRawSource?) {
         this.video = SerializedPlatformVideo.fromVideo(video);
         this.videoDetails = SerializedPlatformVideoDetails.fromVideo(video, if (subtitleSource != null) listOf(subtitleSource) else listOf());
-        this.videoSource = VideoUrlSource.fromUrlSource(videoSource);
-        this.audioSource = AudioUrlSource.fromUrlSource(audioSource);
+        this.videoSource = if(videoSource is IVideoUrlSource) VideoUrlSource.fromUrlSource(videoSource) else null;
+        this.audioSource = if(audioSource is IAudioUrlSource) AudioUrlSource.fromUrlSource(audioSource) else null;
+        this.videoSourceLive = if(videoSource is JSSource) videoSource else null;
+        this.audioSourceLive = if(audioSource is JSSource) audioSource else null;
         this.subtitleSource = subtitleSource;
         this.prepareTime = OffsetDateTime.now();
+        this.hasVideoRequestExecutor = videoSource is JSSource && videoSource.hasRequestExecutor;
+        this.hasAudioRequestExecutor = audioSource is JSSource && audioSource.hasRequestExecutor;
+        this.requiresLiveVideoSource = this.hasVideoRequestExecutor || (videoSource is JSDashManifestRawSource && videoSource.hasGenerate);
+        this.requiresLiveAudioSource = this.hasAudioRequestExecutor || (audioSource is JSDashManifestRawAudioSource && audioSource.hasGenerate);
+        this.targetVideoName = videoSource?.name;
+        this.targetAudioName = audioSource?.name;
+        this.targetPixelCount = if(videoSource != null) (videoSource.width * videoSource.height).toLong() else null;
+        this.targetBitrate = if(audioSource != null) audioSource.bitrate.toLong() else null;
+        this.requireVideoSource = videoSource != null;
+        this.requireAudioSource = audioSource != null;
     }
 
     fun withGroup(groupType: String, groupID: String): VideoDownload {
@@ -156,9 +227,21 @@ class VideoDownload {
 
     suspend fun prepare(client: ManagedHttpClient) {
         Logger.i(TAG, "VideoDownload Prepare [${name}]");
+
+        //If live sources are required, ensure a live object is present
+        if(requiresLiveVideoSource && !isLiveVideoSourceValid) {
+            videoDetails = null;
+            videoSource = null;
+            videoSourceLive = null;
+        }
+        if(requiresLiveAudioSource && !isLiveAudioSourceValid) {
+            videoDetails = null;
+            audioSource = null;
+            videoSourceLive = null;
+        }
         if(video == null && videoDetails == null)
             throw IllegalStateException("Missing information for download to complete");
-        if(targetPixelCount == null && targetBitrate == null && videoSource == null && audioSource == null)
+        if(targetPixelCount == null && targetBitrate == null && videoSource == null && audioSource == null && targetVideoName == null && targetAudioName == null)
             throw IllegalStateException("No sources or query values set");
 
         //Fetch full video object and determine source
@@ -192,23 +275,35 @@ class VideoDownload {
                         videoSources.add(source)
                     }
                 }
+                var vsource: IVideoSource? = null;
 
-                val vsource = VideoHelper.selectBestVideoSource(videoSources, targetPixelCount!!.toInt(), arrayOf())
+                if(targetVideoName != null)
+                    vsource = videoSources.find { x -> x.isDownloadable() && x.name == targetVideoName };
+                if(vsource == null && targetPixelCount == null)
+                    throw IllegalStateException("Could not find comparable downloadable video stream (No target pixel count)");
+                if(vsource == null)
+                    vsource = VideoHelper.selectBestVideoSource(videoSources, targetPixelCount!!.toInt(), arrayOf())
                 //    ?: throw IllegalStateException("Could not find a valid video source for video");
-                if(vsource != null) {
-                    if (vsource is IVideoUrlSource)
-                        videoSource = VideoUrlSource.fromUrlSource(vsource)
-                    else
-                        throw DownloadException("Video source is not supported for downloading (yet)", false);
+
+                if(vsource == null) {
+                    videoSource = null;
+                    if(original.video.videoSources.size == 0)
+                        requireVideoSource = false;
                 }
+                else if(vsource is IVideoUrlSource)
+                    videoSource = VideoUrlSource.fromUrlSource(vsource)
+                else if(vsource is JSSource && requiresLiveVideoSource)
+                    videoSourceLive = vsource;
+                else
+                    throw DownloadException("Video source is not supported for downloading (yet) [" + vsource?.javaClass?.name + "]", false);
             }
 
             if(audioSource == null && targetBitrate != null) {
-                val audioSources = arrayListOf<IAudioSource>()
+                var audioSources = mutableListOf<IAudioSource>()
                 val video = original.video
                 if (video is VideoUnMuxedSourceDescriptor) {
                     for (source in video.audioSources) {
-                        if (source is IHLSManifestSource) {
+                        if (source is IHLSManifestAudioSource) {
                             try {
                                 val playlistResponse = client.get(source.url)
                                 if (playlistResponse.isOk) {
@@ -226,25 +321,43 @@ class VideoDownload {
                     }
                 }
 
-                val asource = VideoHelper.selectBestAudioSource(audioSources, arrayOf(), null, targetBitrate)
-                    ?: if(videoSource != null ) null
-                    else throw DownloadException("Could not find a valid video or audio source for download")
+                var asource: IAudioSource? = null;
+                if(targetAudioName != null) {
+                    val filteredAudioSources = audioSources.filter { x -> x.isDownloadable() && x.name == targetAudioName }.toTypedArray();
+                    if(filteredAudioSources.size == 1)
+                        asource = filteredAudioSources.first();
+                    else if(filteredAudioSources.size > 1)
+                        audioSources = filteredAudioSources.toMutableList();
+                }
+                if(asource == null && targetBitrate == null)
+                    throw IllegalStateException("Could not find comparable downloadable video stream (No target bitrate)");
                 if(asource == null)
+                    asource = VideoHelper.selectBestAudioSource(audioSources, arrayOf(), null, targetBitrate)
+                        ?: if(videoSource != null ) null
+                        else throw DownloadException("Could not find a valid video or audio source for download")
+                if(asource == null) {
                     audioSource = null;
+                    if(!original.video.isUnMuxed || original.video.videoSources.size == 0)
+                        requireVideoSource = false;
+                }
                 else if(asource is IAudioUrlSource)
                     audioSource = AudioUrlSource.fromUrlSource(asource)
+                else if(asource is JSSource && requiresLiveAudioSource)
+                    audioSourceLive = asource;
                 else
-                    throw DownloadException("Audio source is not supported for downloading (yet)", false);
+                    throw DownloadException("Audio source is not supported for downloading (yet) [" + asource?.javaClass?.name + "]", false);
             }
 
-            if(videoSource == null && audioSource == null)
-                throw DownloadException("No valid sources found for video/audio");
+            if(!isVideoDownloadReady)
+                throw DownloadException("No valid sources found for video");
+            if(!isAudioDownloadReady)
+                throw DownloadException("No valid sources found for audio");
         }
     }
 
     suspend fun download(context: Context, client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
         Logger.i(TAG, "VideoDownload Download [${name}]");
-        if(videoDetails == null || (videoSource == null && audioSource == null))
+        if(videoDetails == null || (videoSourceToUse == null && audioSourceToUse == null))
             throw IllegalStateException("Missing information for download to complete");
         val downloadDir = StateDownloads.instance.getDownloadsDirectory();
 
@@ -253,12 +366,19 @@ class VideoDownload {
 
         if(isCancelled) throw CancellationException("Download got cancelled");
 
-        if(videoSource != null) {
-            videoFileName = "${videoDetails!!.id.value!!} [${videoSource!!.width}x${videoSource!!.height}].${videoContainerToExtension(videoSource!!.container)}".sanitizeFileName();
+        val actualVideoSource = if(requiresLiveVideoSource && videoSourceLive is IVideoSource)
+            videoSourceLive as IVideoSource?;
+        else videoSource;
+        val actualAudioSource = if(requiresLiveAudioSource && audioSourceLive is IAudioSource)
+            audioSourceLive as IAudioSource?;
+        else audioSource;
+
+        if(actualVideoSource != null) {
+            videoFileName = "${videoDetails!!.id.value!!} [${actualVideoSource!!.width}x${actualVideoSource!!.height}].${videoContainerToExtension(actualVideoSource!!.container)}".sanitizeFileName();
             videoFilePath = File(downloadDir, videoFileName!!).absolutePath;
         }
-        if(audioSource != null) {
-            audioFileName = "${videoDetails!!.id.value!!} [${audioSource!!.language}-${audioSource!!.bitrate}].${audioContainerToExtension(audioSource!!.container)}".sanitizeFileName();
+        if(actualAudioSource != null) {
+            audioFileName = "${videoDetails!!.id.value!!} [${actualAudioSource!!.language}-${actualAudioSource!!.bitrate}].${audioContainerToExtension(actualAudioSource!!.container)}".sanitizeFileName();
             audioFilePath = File(downloadDir, audioFileName!!).absolutePath;
         }
         if(subtitleSource != null) {
@@ -273,10 +393,11 @@ class VideoDownload {
         var lastAudioLength: Long = 0;
         var lastAudioRead: Long = 0;
 
-        if(videoSource != null) {
+        if(actualVideoSource != null) {
             sourcesToDownload.add(async {
                 Logger.i(TAG, "Started downloading video");
 
+                var lastEmit = 0L;
                 val progressCallback = { length: Long, totalRead: Long, speed: Long ->
                     synchronized(progressLock) {
                         lastVideoLength = length;
@@ -289,23 +410,34 @@ class VideoDownload {
                         val total = lastVideoRead + lastAudioRead;
                         if(totalLength > 0) {
                             val percentage = (total / totalLength.toDouble());
-                            onProgress?.invoke(percentage);
                             progress = percentage;
-                            onProgressChanged.emit(percentage);
+
+                            val now = System.currentTimeMillis();
+                            if(now - lastEmit > 200) {
+                                lastEmit = System.currentTimeMillis();
+                                onProgress?.invoke(percentage);
+                                onProgressChanged.emit(percentage);
+                            }
                         }
                     }
                 }
 
-                videoFileSize = when (videoSource!!.container) {
-                    "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
-                    else -> downloadFileSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                if(actualVideoSource is IVideoUrlSource)
+                    videoFileSize = when (videoSource!!.container) {
+                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                        else -> downloadFileSource("Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
+                    }
+                else if(actualVideoSource is JSDashManifestRawSource) {
+                    videoFileSize = downloadDashFileSource("Video", client, actualVideoSource, File(downloadDir, videoFileName!!), progressCallback);
                 }
+                else throw NotImplementedError("NotImplemented video download: " + actualVideoSource.javaClass.name);
             });
         }
-        if(audioSource != null) {
+        if(actualAudioSource != null) {
             sourcesToDownload.add(async {
                 Logger.i(TAG, "Started downloading audio");
 
+                var lastEmit = 0L;
                 val progressCallback = { length: Long, totalRead: Long, speed: Long ->
                     synchronized(progressLock) {
                         lastAudioLength = length;
@@ -318,17 +450,27 @@ class VideoDownload {
                         val total = lastVideoRead + lastAudioRead;
                         if(totalLength > 0) {
                             val percentage = (total / totalLength.toDouble());
-                            onProgress?.invoke(percentage);
                             progress = percentage;
-                            onProgressChanged.emit(percentage);
+
+                            val now = System.currentTimeMillis();
+                            if(now - lastEmit > 200) {
+                                lastEmit = System.currentTimeMillis();
+                                onProgress?.invoke(percentage);
+                                onProgressChanged.emit(percentage);
+                            }
                         }
                     }
                 }
 
-                audioFileSize = when (audioSource!!.container) {
-                    "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
-                    else -> downloadFileSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                if(actualAudioSource is IAudioUrlSource)
+                    audioFileSize = when (audioSource!!.container) {
+                        "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                        else -> downloadFileSource("Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
+                    }
+                else if(actualAudioSource is JSDashManifestRawAudioSource) {
+                    audioFileSize = downloadDashFileSource("Audio", client, actualAudioSource, File(downloadDir, audioFileName!!), progressCallback);
                 }
+                else throw NotImplementedError("NotImplemented audio download: " + actualAudioSource.javaClass.name);
             });
         }
         if (subtitleSource != null) {
@@ -398,15 +540,20 @@ class VideoDownload {
 
                 Logger.i(TAG, "Download '$name' segment $index Sequential");
                 val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
-                segmentFiles.add(segmentFile)
+                val outputStream = segmentFile.outputStream()
+                try {
+                    segmentFiles.add(segmentFile)
 
-                val segmentLength = downloadSource_Sequential(client, segmentFile.outputStream(), segment.uri) { segmentLength, totalRead, lastSpeed ->
-                    val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
-                    val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
-                    onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
+                    val segmentLength = downloadSource_Sequential(client, outputStream, segment.uri) { segmentLength, totalRead, lastSpeed ->
+                        val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
+                        val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
+                        onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
+                    }
+
+                    downloadedTotalLength += segmentLength
+                } finally {
+                    outputStream.close()
                 }
-
-                downloadedTotalLength += segmentLength
             }
 
             Logger.i(TAG, "Combining segments into $targetFile");
@@ -473,6 +620,86 @@ class VideoDownload {
         }
     }
 
+    private fun downloadDashFileSource(name: String, client: ManagedHttpClient, source: IJSDashManifestRawSource, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+        if(targetFile.exists())
+            targetFile.delete();
+
+        targetFile.createNewFile();
+
+        val sourceLength: Long?;
+        val fileStream = FileOutputStream(targetFile);
+
+        try{
+            var manifest = source.manifest;
+            if(source.hasGenerate)
+                manifest = source.generate();
+            if(manifest == null)
+                throw IllegalStateException("No manifest after generation");
+
+            //TODO: Temporary naive assume single-sourced dash
+            val foundTemplate = REGEX_DASH_TEMPLATE.find(manifest);
+            if(foundTemplate == null || foundTemplate.groupValues.size != 3)
+                throw IllegalStateException("No SegmentTemplate found in manifest (unsupported dash?)");
+            val foundTemplateUrl = foundTemplate.groupValues[1];
+            val foundCues = REGEX_DASH_CUE.findAll(foundTemplate.groupValues[2]);
+            if(foundCues.count() <= 0)
+                throw IllegalStateException("No Cues found in manifest (unsupported dash?)");
+
+            val executor = if(source is JSSource && source.hasRequestExecutor)
+                source.getRequestExecutor();
+            else
+                null;
+            val speedTracker = SpeedTracker(1000);
+
+            Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString());
+
+            var written = 0;
+            var indexCounter = 0;
+            onProgress(foundCues.count().toLong(), 0, 0);
+            for(cue in foundCues) {
+                val t = cue.groupValues[1];
+                val d = cue.groupValues[2];
+
+                val url = foundTemplateUrl.replace("\$Number\$", indexCounter.toString());
+
+                val data = if(executor != null)
+                    executor.executeRequest(url, mapOf());
+                else {
+                    val resp = client.get(url, mutableMapOf());
+                    if(!resp.isOk)
+                        throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
+                    resp.body!!.bytes()
+                }
+                fileStream.write(data, 0, data.size);
+                speedTracker.addWork(data.size.toLong());
+                written += data.size;
+
+                onProgress(foundCues.count().toLong(), indexCounter.toLong(), speedTracker.lastSpeed);
+
+                indexCounter++;
+            }
+            sourceLength = written.toLong();
+
+            Logger.i(TAG, "$name downloadSource Finished");
+        }
+        catch(ioex: IOException) {
+            if(targetFile.exists() ?: false)
+                targetFile.delete();
+            if(ioex.message?.contains("ENOSPC") ?: false)
+                throw Exception("Not enough space on device", ioex);
+            else
+                throw ioex;
+        }
+        catch(ex: Throwable) {
+            if(targetFile.exists() ?: false)
+                targetFile.delete();
+            throw ex;
+        }
+        finally {
+            fileStream.close();
+        }
+        return sourceLength!!;
+    }
     private fun downloadFileSource(name: String, client: ManagedHttpClient, videoUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if(targetFile.exists())
             targetFile.delete();
@@ -484,17 +711,25 @@ class VideoDownload {
 
         try{
             val head = client.tryHead(videoUrl);
+            val relatedPlugin = (video?.url ?: videoDetails?.url)?.let { StatePlatform.instance.getContentClient(it) }?.let { if(it is JSClient) it else null };
             if(Settings.instance.downloads.byteRangeDownload && head?.containsKey("accept-ranges") == true && head.containsKey("content-length"))
             {
-                val concurrency = Settings.instance.downloads.getByteRangeThreadCount();
-                Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency})");
+                val maxParallel = if(relatedPlugin != null && relatedPlugin.config.maxDownloadParallelism > 0)
+                    relatedPlugin.config.maxDownloadParallelism else 99;
+                val concurrency = Math.min(maxParallel, Settings.instance.downloads.getByteRangeThreadCount());
+                Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency}): " + videoUrl);
                 sourceLength = head["content-length"]!!.toLong();
                 onProgress(sourceLength, 0, 0);
                 downloadSource_Ranges(name, client, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
             }
             else {
                 Logger.i(TAG, "Download $name Sequential");
-                sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, onProgress);
+                try {
+                    sourceLength = downloadSource_Sequential(client, fileStream, videoUrl, onProgress);
+                } catch (e: Throwable) {
+                    Logger.w(TAG, "Failed to download sequentially (url = $videoUrl)")
+                    throw e
+                }
             }
 
             Logger.i(TAG, "$name downloadSource Finished");
@@ -518,17 +753,19 @@ class VideoDownload {
         return sourceLength!!;
     }
     private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, onProgress: (Long, Long, Long) -> Unit): Long {
-        val progressRate: Int = 4096 * 25;
+        val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
-        val speedRate: Int = 4096 * 25;
+        val speedRate: Int = 4096 * 5;
         var readSinceLastSpeedTest: Long = 0;
         var timeSinceLastSpeedTest: Long = System.currentTimeMillis();
 
         var lastSpeed: Long = 0;
 
         val result = client.get(url);
-        if (!result.isOk)
+        if (!result.isOk) {
+            result.body?.close()
             throw IllegalStateException("Failed to download source. Web[${result.code}] Error");
+        }
         if (result.body == null)
             throw IllegalStateException("Failed to download source. Web[${result.code}] No response");
 
@@ -536,41 +773,114 @@ class VideoDownload {
         val sourceStream = result.body.byteStream();
 
         var totalRead: Long = 0;
-        var read: Int;
+        try {
+            var read: Int;
+            val buffer = ByteArray(4096);
 
-        val buffer = ByteArray(4096);
+            do {
+                read = sourceStream.read(buffer);
+                if (read < 0)
+                    break;
 
-        do {
-            read = sourceStream.read(buffer);
-            if (read < 0)
-                break;
+                fileStream.write(buffer, 0, read);
 
-            fileStream.write(buffer, 0, read);
+                totalRead += read;
 
-            totalRead += read;
+                readSinceLastSpeedTest += read;
+                if (totalRead.toDouble() / progressRate > lastProgressCount) {
+                    onProgress(sourceLength, totalRead, lastSpeed);
+                    lastProgressCount++;
+                }
+                if (readSinceLastSpeedTest > speedRate) {
+                    val lastSpeedTime = timeSinceLastSpeedTest;
+                    timeSinceLastSpeedTest = System.currentTimeMillis();
+                    val timeSince = timeSinceLastSpeedTest - lastSpeedTime;
+                    if (timeSince > 0)
+                        lastSpeed = (readSinceLastSpeedTest / (timeSince / 1000.0)).toLong();
+                    readSinceLastSpeedTest = 0;
+                }
 
-            readSinceLastSpeedTest += read;
-            if (totalRead / progressRate > lastProgressCount) {
-                onProgress(sourceLength, totalRead, lastSpeed);
-                lastProgressCount++;
-            }
-            if (readSinceLastSpeedTest > speedRate) {
-                val lastSpeedTime = timeSinceLastSpeedTest;
-                timeSinceLastSpeedTest = System.currentTimeMillis();
-                val timeSince = timeSinceLastSpeedTest - lastSpeedTime;
-                if (timeSince > 0)
-                    lastSpeed = (readSinceLastSpeedTest / (timeSince / 1000.0)).toLong();
-                readSinceLastSpeedTest = 0;
-            }
+                if (isCancelled)
+                    throw CancellationException("Cancelled");
+            } while (read > 0);
+        } finally {
+            sourceStream.close()
+            result.body.close()
+        }
 
-            if (isCancelled)
-                throw CancellationException("Cancelled");
-        } while (read > 0);
-
-        lastSpeed = 0;
         onProgress(sourceLength, totalRead, 0);
         return sourceLength;
     }
+    /*private fun downloadSource_Sequential(client: ManagedHttpClient, fileStream: FileOutputStream, url: String, onProgress: (Long, Long, Long) -> Unit): Long {
+        val progressRate: Int = 4096 * 25
+        var lastProgressCount: Int = 0
+        val speedRate: Int = 4096 * 25
+        var readSinceLastSpeedTest: Long = 0
+        var timeSinceLastSpeedTest: Long = System.currentTimeMillis()
+
+        var lastSpeed: Long = 0
+
+        var totalRead: Long = 0
+        var sourceLength: Long
+        val buffer = ByteArray(4096)
+
+        var isPartialDownload = false
+        var result: ManagedHttpClient.Response? = null
+        do {
+            result = client.get(url, if (isPartialDownload) hashMapOf("Range" to "bytes=$totalRead-") else hashMapOf())
+            if (isPartialDownload) {
+                if (result.code != 206)
+                    throw IllegalStateException("Failed to download source, byte range fallback failed. Web[${result.code}] Error")
+            } else {
+                if (!result.isOk)
+                    throw IllegalStateException("Failed to download source. Web[${result.code}] Error")
+            }
+            if (result.body == null)
+                throw IllegalStateException("Failed to download source. Web[${result.code}] No response")
+
+            isPartialDownload = true
+            sourceLength = result.body!!.contentLength()
+            val sourceStream = result.body!!.byteStream()
+
+            try {
+                while (true) {
+                    val read = sourceStream.read(buffer)
+                    if (read <= 0) {
+                        break
+                    }
+
+                    fileStream.write(buffer, 0, read)
+
+                    totalRead += read
+                    readSinceLastSpeedTest += read
+
+                    if (totalRead / progressRate > lastProgressCount) {
+                        onProgress(sourceLength, totalRead, lastSpeed)
+                        lastProgressCount++
+                    }
+                    if (readSinceLastSpeedTest > speedRate) {
+                        val lastSpeedTime = timeSinceLastSpeedTest
+                        timeSinceLastSpeedTest = System.currentTimeMillis()
+                        val timeSince = timeSinceLastSpeedTest - lastSpeedTime
+                        if (timeSince > 0)
+                            lastSpeed = (readSinceLastSpeedTest / (timeSince / 1000.0)).toLong()
+                        readSinceLastSpeedTest = 0
+                    }
+
+                    if (isCancelled)
+                        throw CancellationException("Cancelled")
+                }
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Sequential download was interrupted, trying to fallback to byte ranges", e)
+            } finally {
+                sourceStream.close()
+                result.body?.close()
+            }
+        } while (totalRead < sourceLength)
+
+        onProgress(sourceLength, totalRead, 0)
+        return sourceLength
+    }*/
     private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
         val progressRate: Int = 4096 * 5;
         var lastProgressCount: Int = 0;
@@ -643,23 +953,47 @@ class VideoDownload {
         return tasks.map { it.get() };
     }
     private fun requestByteRange(client: ManagedHttpClient, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
-        val toRead = rangeEnd - rangeStart;
-        val req = client.get(url, mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}")));
-        if(!req.isOk)
-            throw IllegalStateException("Range request failed Code [${req.code}] due to: ${req.message}");
-        if(req.body == null)
-            throw IllegalStateException("Range request failed, No body");
-        val read = req.body.contentLength();
+        var retryCount = 0
+        var lastException: Throwable? = null
 
-        if(read < toRead)
-            throw IllegalStateException("Byte-Range request attempted to provide less (${read} < ${toRead})");
+        while (retryCount <= 3) {
+            try {
+                val toRead = rangeEnd - rangeStart;
+                val req = client.get(url, mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}")));
+                if (!req.isOk) {
+                    val bodyString = req.body?.string()
+                    req.body?.close()
+                    throw IllegalStateException("Range request failed Code [${req.code}] due to: ${req.message}");
+                }
+                if (req.body == null)
+                    throw IllegalStateException("Range request failed, No body");
+                val read = req.body.contentLength();
 
-        return Triple(req.body.bytes(), rangeStart, rangeEnd);
+                if (read < toRead)
+                    throw IllegalStateException("Byte-Range request attempted to provide less (${read} < ${toRead})");
+
+                return Triple(req.body.bytes(), rangeStart, rangeEnd);
+            } catch (e: Throwable) {
+                Logger.w(TAG, "Failed to download range (url=${url} bytes=${rangeStart}-${rangeEnd})", e)
+
+                retryCount++
+                lastException = e
+
+                sleep(when (retryCount) {
+                    1 -> 1000 + ((Math.random() * 300.0).toLong() - 150)
+                    2 -> 2000 + ((Math.random() * 300.0).toLong() - 150)
+                    3 -> 4000 + ((Math.random() * 300.0).toLong() - 150)
+                    else -> 1000 + ((Math.random() * 300.0).toLong() - 150)
+                })
+            }
+        }
+
+        throw lastException!!
     }
 
     fun validate() {
         Logger.i(TAG, "VideoDownload Validate [${name}]");
-        if(videoSource != null) {
+        if(videoSourceToUse != null) {
             if(videoFilePath == null)
                 throw IllegalStateException("Missing video file name after download");
             val expectedFile = File(videoFilePath!!);
@@ -670,7 +1004,7 @@ class VideoDownload {
                     throw IllegalStateException("Expected size [${videoFileSize}], but found ${expectedFile.length()}");
             }
         }
-        if(audioSource != null) {
+        if(audioSourceToUse != null) {
             if(audioFilePath == null)
                 throw IllegalStateException("Missing audio file name after download");
             val expectedFile = File(audioFilePath!!);
@@ -692,15 +1026,15 @@ class VideoDownload {
     fun complete() {
         Logger.i(TAG, "VideoDownload Complete [${name}]");
         val existing = StateDownloads.instance.getCachedVideo(id);
-        val localVideoSource = videoFilePath?.let { LocalVideoSource.fromSource(videoSource!!, it, videoFileSize ?: 0) };
-        val localAudioSource = audioFilePath?.let { LocalAudioSource.fromSource(audioSource!!, it, audioFileSize ?: 0) };
+        val localVideoSource = videoFilePath?.let { LocalVideoSource.fromSource(videoSourceToUse!!, it, videoFileSize ?: 0) };
+        val localAudioSource = audioFilePath?.let { LocalAudioSource.fromSource(audioSourceToUse!!, it, audioFileSize ?: 0) };
         val localSubtitleSource = subtitleFilePath?.let { LocalSubtitleSource.fromSource(subtitleSource!!, it) };
 
-        if(localVideoSource != null && videoSource != null && videoSource is IStreamMetaDataSource)
-            localVideoSource.streamMetaData = (videoSource as IStreamMetaDataSource).streamMetaData;
+        if(localVideoSource != null && videoSourceToUse != null && videoSourceToUse is IStreamMetaDataSource)
+            localVideoSource.streamMetaData = (videoSourceToUse as IStreamMetaDataSource).streamMetaData;
 
-        if(localAudioSource != null && audioSource != null && audioSource is IStreamMetaDataSource)
-            localAudioSource.streamMetaData = (audioSource as IStreamMetaDataSource).streamMetaData;
+        if(localAudioSource != null && audioSourceToUse != null && audioSourceToUse is IStreamMetaDataSource)
+            localAudioSource.streamMetaData = (audioSourceToUse as IStreamMetaDataSource).streamMetaData;
 
         if(existing != null) {
             existing.videoSerialized = videoDetails!!;
@@ -757,6 +1091,9 @@ class VideoDownload {
         const val GROUP_PLAYLIST = "Playlist";
         const val GROUP_WATCHLATER= "WatchLater";
 
+        val REGEX_DASH_TEMPLATE = Regex("<SegmentTemplate .*?media=\"(.*?)\".*?>(.*?)<\\/SegmentTemplate>", RegexOption.DOT_MATCHES_ALL);
+        val REGEX_DASH_CUE = Regex("<S .*?t=\"([0-9]*?)\".*?d=\"([0-9]*?)\".*?\\/>", RegexOption.DOT_MATCHES_ALL);
+
         fun videoContainerToExtension(container: String): String? {
             if (container.contains("video/mp4") || container == "application/vnd.apple.mpegurl")
                 return "mp4";
@@ -803,4 +1140,27 @@ class VideoDownload {
                 return "subtitle";
         }
     }
+
+    class SpeedTracker {
+        private val segmentStart: Long;
+        private val intervalMs: Long;
+        private var workDone: Long;
+        var lastSpeed: Long;
+        constructor(intervalMs: Long) {
+            segmentStart = System.currentTimeMillis();
+            this.intervalMs = intervalMs;
+            this.workDone = 0;
+            this.lastSpeed = 0;
+        }
+        fun addWork(work: Long) {
+            val now = System.currentTimeMillis();
+            if((now - segmentStart) > intervalMs)
+            {
+                lastSpeed = workDone;
+                workDone = 0;
+            }
+            workDone += work;
+        }
+
+    }
 }

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -6,6 +6,8 @@ import com.caoccao.javet.exceptions.JavetException
 import com.caoccao.javet.exceptions.JavetExecutionException
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
+import com.caoccao.javet.interop.options.V8Flags
+import com.caoccao.javet.interop.options.V8RuntimeOptions
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueBoolean
 import com.caoccao.javet.values.primitive.V8ValueInteger
@@ -133,9 +135,10 @@ class V8Plugin {
         synchronized(_runtimeLock) {
             if (_runtime != null)
                 return;
-
+            //V8RuntimeOptions.V8_FLAGS.setUseStrict(true);
             val host = V8Host.getV8Instance();
             val options = host.jsRuntimeType.getRuntimeOptions();
+
             _runtime = host.createV8Runtime(options);
             if (!host.isIsolateCreated)
                 throw IllegalStateException("Isolate not created");

app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt

@@ -2,12 +2,14 @@ package com.futo.platformplayer.engine.packages
 
 import com.caoccao.javet.annotations.V8Function
 import com.caoccao.javet.annotations.V8Property
+import com.caoccao.javet.values.V8Value
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.JSClientConstants
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.engine.IV8PluginConfig
@@ -49,9 +51,20 @@ class PackageBridge : V8Package {
     fun buildFlavor(): String {
         return BuildConfig.FLAVOR;
     }
+    @V8Property
+    fun buildSpecVersion(): Int {
+        return JSClientConstants.PLUGIN_SPEC_VERSION;
+    }
+
+    @V8Function
+    fun dispose(value: V8Value) {
+        Logger.e(TAG, "Manual dispose: " + value.javaClass.name);
+        value.close();
+    }
 
     @V8Function
     fun toast(str: String) {
+        Logger.i(TAG, "Plugin toast [${_config.name}]: ${str}");
         StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
             try {
                 UIDialogs.toast(str);

app/src/main/java/com/futo/platformplayer/engine/packages/PackageDOMParser.kt

@@ -68,6 +68,10 @@ class PackageDOMParser : V8Package {
             return result;
         }
         @V8Property
+        fun parentElement(): DOMNode? {
+            return parentNode();
+        }
+        @V8Property
         fun attributes(): Map<String, String> = _element.attributes().associate { Pair(it.key, it.value) }
         @V8Property
         fun innerHTML(): String = _element.html();
@@ -76,6 +80,8 @@ class PackageDOMParser : V8Package {
         @V8Property
         fun textContent(): String = _element.text();
         @V8Property
+        fun tagName(): String = _element.tagName().uppercase();
+        @V8Property
         fun text(): String = _element.text().ifEmpty { data() };
         @V8Property
         fun data(): String = _element.data();

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -7,7 +7,11 @@ import com.caoccao.javet.enums.V8ConversionMode
 import com.caoccao.javet.enums.V8ProxyMode
 import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.values.V8Value
+import com.caoccao.javet.values.primitive.V8ValueString
+import com.caoccao.javet.values.reference.V8ValueArrayBuffer
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.caoccao.javet.values.reference.V8ValueSharedArrayBuffer
+import com.caoccao.javet.values.reference.V8ValueTypedArray
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
@@ -16,6 +20,9 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.internal.IV8Convertable
 import com.futo.platformplayer.engine.internal.V8BindObject
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 import kotlin.streams.asSequence
 
@@ -64,33 +71,44 @@ class PackageHttp: V8Package {
     }
 
     @V8Function
-    fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BridgeHttpResponse {
+    fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, bytesResult: Boolean = false) : IBridgeHttpResponse {
         return if(useAuth)
-            _packageClientAuth.request(method, url, headers)
+            _packageClientAuth.request(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.request(method, url, headers);
+            _packageClient.request(method, url, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
     }
 
     @V8Function
-    fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BridgeHttpResponse {
+    fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, bytesResult: Boolean = false) : IBridgeHttpResponse {
         return if(useAuth)
-            _packageClientAuth.requestWithBody(method, url, body, headers)
+            _packageClientAuth.requestWithBody(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.requestWithBody(method, url, body, headers);
+            _packageClient.requestWithBody(method, url, body, headers, if(bytesResult) ReturnType.BYTES else ReturnType.STRING);
     }
     @V8Function
-    fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BridgeHttpResponse {
+    fun GET(url: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, useByteResponse: Boolean = false) : IBridgeHttpResponse {
         return if(useAuth)
-            _packageClientAuth.GET(url, headers)
+            _packageClientAuth.GET(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING)
         else
-            _packageClient.GET(url, headers);
+            _packageClient.GET(url, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
     }
     @V8Function
-    fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BridgeHttpResponse {
-        return if(useAuth)
-            _packageClientAuth.POST(url, body, headers)
+    fun POST(url: String, body: Any, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false, useByteResponse: Boolean = false) : IBridgeHttpResponse {
+
+        val client = if(useAuth) _packageClientAuth else _packageClient;
+
+        if(body is V8ValueString)
+            return client.POST(url, body.value, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+        else if(body is String)
+            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+        else if(body is V8ValueTypedArray)
+            return client.POST(url, body.toBytes(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+        else if(body is ByteArray)
+            return client.POST(url, body, headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
+        else if(body is ArrayList<*>) //Avoid this case, used purely for testing
+            return client.POST(url, body.map { (it as Double).toInt().toByte() }.toByteArray(), headers, if(useByteResponse) ReturnType.BYTES else ReturnType.STRING);
         else
-            _packageClient.POST(url, body, headers);
+            throw NotImplementedError("Body type " + body?.javaClass?.name?.toString() + " not implemented for POST");
     }
 
     @V8Function
@@ -111,8 +129,19 @@ class PackageHttp: V8Package {
         }
     }
 
+    interface IBridgeHttpResponse {
+        val url: String;
+        val code: Int;
+        val headers: Map<String, List<String>>?;
+    }
+
     @kotlinx.serialization.Serializable
-    class BridgeHttpResponse(val url: String, val code: Int, val body: String?, val headers: Map<String, List<String>>? = null) : IV8Convertable {
+    class BridgeHttpStringResponse(
+        override val url: String,
+        override val code: Int, val
+        body: String?,
+        override val headers: Map<String, List<String>>? = null) : IV8Convertable, IBridgeHttpResponse {
+
         val isOk = code >= 200 && code < 300;
 
         override fun toV8(runtime: V8Runtime): V8Value? {
@@ -125,6 +154,37 @@ class PackageHttp: V8Package {
             return obj;
         }
     }
+    @kotlinx.serialization.Serializable
+    class BridgeHttpBytesResponse: IV8Convertable, IBridgeHttpResponse {
+        override val url: String;
+        override val code: Int;
+        val body: ByteArray?;
+        override val headers: Map<String, List<String>>?;
+
+        val isOk: Boolean;
+
+        constructor(url: String, code: Int, body: ByteArray? = null, headers: Map<String, List<String>>? = null) {
+            this.url = url;
+            this.code = code;
+            this.body = body;
+            this.headers = headers;
+            this.isOk = code >= 200 && code < 300;
+        }
+
+        override fun toV8(runtime: V8Runtime): V8Value? {
+            val obj = runtime.createV8ValueObject();
+            obj.set("url", url);
+            obj.set("code", code);
+            if(body != null) {
+                val buffer = runtime.createV8ValueArrayBuffer(body.size);
+                buffer.fromBytes(body);
+                obj.set("body", body);
+            }
+            obj.set("headers", headers);
+            obj.set("isOk", isOk);
+            return obj;
+        }
+    }
 
     //TODO: This object is currently re-wrapped each modification, this is due to an issue passing the same object back and forth, should be fixed in future.
     @V8Convert(mode = V8ConversionMode.AllowOnly, proxyMode = V8ProxyMode.Class)
@@ -147,6 +207,12 @@ class PackageHttp: V8Package {
         fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), useAuth: Boolean = false) : BatchBuilder
             = clientPOST(_package.getDefaultClient(useAuth), url, body, headers);
 
+        @V8Function
+        fun DUMMY(): BatchBuilder {
+            _reqs.add(Pair(_package.getDefaultClient(false), RequestDescriptor("DUMMY", "", mutableMapOf())));
+            return BatchBuilder(_package, _reqs);
+        }
+
         //Client-specific
 
         @V8Function
@@ -169,12 +235,14 @@ class PackageHttp: V8Package {
 
         //Finalizer
         @V8Function
-        fun execute(): List<BridgeHttpResponse> {
+        fun execute(): List<IBridgeHttpResponse?> {
             return _reqs.parallelStream().map {
+                if(it.second.method == "DUMMY")
+                    return@map null;
                 if(it.second.body != null)
-                    return@map it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers);
+                    return@map it.first.requestWithBody(it.second.method, it.second.url, it.second.body!!, it.second.headers, it.second.respType);
                 else
-                    return@map it.first.request(it.second.method, it.second.url, it.second.headers);
+                    return@map it.first.request(it.second.method, it.second.url, it.second.headers, it.second.respType);
             }
                 .asSequence()
                 .toList();
@@ -230,65 +298,116 @@ class PackageHttp: V8Package {
             if(_client is JSHttpClient)
                 _client.doAllowNewCookies = allow;
         }
+        @V8Function
+        fun setTimeout(timeoutMs: Int) {
+            if(_client is JSHttpClient) {
+                _client.setTimeout(timeoutMs.toLong());
+            }
+        }
 
         @V8Function
-        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap()) : BridgeHttpResponse {
+        fun request(method: String, url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
             applyDefaultHeaders(headers);
             return logExceptions {
                 return@logExceptions catchHttp {
                     val client = _client;
                     //logRequest(method, url, headers, null);
                     val resp = client.requestMethod(method, url, headers);
-                    val responseBody = resp.body?.string();
                     //logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
-                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                    return@catchHttp when(returnType) {
+                        ReturnType.STRING -> BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        ReturnType.BYTES -> BridgeHttpBytesResponse(resp.url, resp.code, resp.body?.bytes(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        else -> throw NotImplementedError("Return type " + returnType.toString() + " not implemented");
+                    }
                 }
             };
         }
         @V8Function
-        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap()) : BridgeHttpResponse {
+        fun requestWithBody(method: String, url: String, body:String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType) : IBridgeHttpResponse {
             applyDefaultHeaders(headers);
             return logExceptions {
                 catchHttp {
                     val client = _client;
                     //logRequest(method, url, headers, body);
                     val resp = client.requestMethod(method, url, body, headers);
-                    val responseBody = resp.body?.string();
                     //logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
-                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+
+                    return@catchHttp when(returnType) {
+                        ReturnType.STRING -> BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        ReturnType.BYTES -> BridgeHttpBytesResponse(resp.url, resp.code, resp.body?.bytes(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        else -> throw NotImplementedError("Return type " + returnType.toString() + " not implemented");
+                    }
                 }
             };
         }
 
         @V8Function
-        fun GET(url: String, headers: MutableMap<String, String> = HashMap()) : BridgeHttpResponse {
+        fun GET(url: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
             applyDefaultHeaders(headers);
             return logExceptions {
                 catchHttp {
                     val client = _client;
                     //logRequest("GET", url, headers, null);
                     val resp = client.get(url, headers);
-                    val responseBody = resp.body?.string();
+                    //val responseBody = resp.body?.string();
                     //logResponse("GET", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
-                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+
+
+                    return@catchHttp when(returnType) {
+                        ReturnType.STRING -> BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        ReturnType.BYTES -> BridgeHttpBytesResponse(resp.url, resp.code, resp.body?.bytes(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        else -> throw NotImplementedError("Return type " + returnType.toString() + " not implemented");
+                    }
                 }
             };
         }
         @V8Function
-        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap()) : BridgeHttpResponse {
+        fun POST(url: String, body: String, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
             applyDefaultHeaders(headers);
             return logExceptions {
                 catchHttp {
                     val client = _client;
                     //logRequest("POST", url, headers, body);
                     val resp = client.post(url, body, headers);
-                    val responseBody = resp.body?.string();
+                    //val responseBody = resp.body?.string();
                     //logResponse("POST", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
-                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+
+
+                    return@catchHttp when(returnType) {
+                        ReturnType.STRING -> BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        ReturnType.BYTES -> BridgeHttpBytesResponse(resp.url, resp.code, resp.body?.bytes(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        else -> throw NotImplementedError("Return type " + returnType.toString() + " not implemented");
+                    }
+                }
+            };
+        }
+        @V8Function
+        fun POST(url: String, body: ByteArray, headers: MutableMap<String, String> = HashMap(), returnType: ReturnType = ReturnType.STRING) : IBridgeHttpResponse {
+            applyDefaultHeaders(headers);
+            return logExceptions {
+                catchHttp {
+                    val client = _client;
+                    //logRequest("POST", url, headers, body);
+                    val resp = client.post(url, body, headers);
+                    //val responseBody = resp.body?.string();
+                    //logResponse("POST", url, resp.code, resp.headers, responseBody);
+
+
+                    return@catchHttp when(returnType) {
+                        ReturnType.STRING -> BridgeHttpStringResponse(resp.url, resp.code, resp.body?.string(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        ReturnType.BYTES -> BridgeHttpBytesResponse(resp.url, resp.code, resp.body?.bytes(), sanitizeResponseHeaders(resp.headers,
+                            _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
+                        else -> throw NotImplementedError("Return type " + returnType.toString() + " not implemented");
+                    }
                 }
             };
         }
@@ -388,13 +507,13 @@ class PackageHttp: V8Package {
             }
         }
 
-        private fun catchHttp(handle: ()->BridgeHttpResponse): BridgeHttpResponse {
+        private fun catchHttp(handle: ()->IBridgeHttpResponse): IBridgeHttpResponse {
             try{
                 return handle();
             }
             //Forward timeouts
             catch(ex: SocketTimeoutException) {
-                return BridgeHttpResponse("", 408, null);
+                return BridgeHttpStringResponse("", 408, null);
             }
         }
     }
@@ -514,20 +633,25 @@ class PackageHttp: V8Package {
         val url: String,
         val headers: MutableMap<String, String>,
         val body: String? = null,
-        val contentType: String? = null
+        val contentType: String? = null,
+        val respType: ReturnType = ReturnType.STRING
     )
 
-    private fun catchHttp(handle: ()->BridgeHttpResponse): BridgeHttpResponse {
+    private fun catchHttp(handle: ()->BridgeHttpStringResponse): BridgeHttpStringResponse {
         try{
             return handle();
         }
         //Forward timeouts
         catch(ex: SocketTimeoutException) {
-            return BridgeHttpResponse("", 408, null);
+            return BridgeHttpStringResponse("", 408, null);
         }
     }
 
 
+    enum class ReturnType(val value: Int) {
+        STRING(0),
+        BYTES(1);
+    }
 
     companion object {
         private const val TAG = "PackageHttp";

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

@@ -133,6 +133,10 @@ class ChannelAboutFragment : Fragment, IChannelTabFragment {
                 Logger.w(TAG, "Failed to parse claim=$c", e)
             }
         }
+        if(!map.containsKey("Harbor"))
+            this.context?.let {
+                map.set("Harbor", polycentricProfile.getHarborUrl(it));
+            }
 
         if (map.isNotEmpty())
             setLinks(map, if (polycentricProfile.systemState.username.isNotBlank()) polycentricProfile.systemState.username else _lastChannel?.name ?: "")

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

@@ -16,6 +16,7 @@ import androidx.core.animation.doOnEnd
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.dp
@@ -208,19 +209,30 @@ class MenuBottomBarFragment : MainActivityFragment() {
             _moreButtons.clear();
             _layoutMoreButtons.removeAllViews();
 
+            var insertedButtons = 0;
             //Force buy to be on top for more buttons
             val buyIndex = buttons.indexOfFirst { b -> b.id == 98 };
             if (buyIndex != -1) {
                 val button = buttons[buyIndex]
                 buttons.removeAt(buyIndex)
                 buttons.add(0, button)
+                insertedButtons++;
             }
             //Force faq to be second
             val faqIndex = buttons.indexOfFirst { b -> b.id == 97 };
             if (faqIndex != -1) {
                 val button = buttons[faqIndex]
                 buttons.removeAt(faqIndex)
-                buttons.add(if (buttons.size == 1) 1 else 0, button)
+                buttons.add(if (insertedButtons == 1) 1 else 0, button)
+                insertedButtons++;
+            }
+            //Force privacy to be third
+            val privacyIndex = buttons.indexOfFirst { b -> b.id == 96 };
+            if (privacyIndex != -1) {
+                val button = buttons[privacyIndex]
+                buttons.removeAt(privacyIndex)
+                buttons.add(if (insertedButtons == 2) 2 else (if(insertedButtons == 1) 1 else 0), button)
+                insertedButtons++;
             }
 
             for (data in buttons) {
@@ -302,9 +314,6 @@ class MenuBottomBarFragment : MainActivityFragment() {
             if (!StatePayment.instance.hasPaid) {
                 newCurrentButtonDefinitions.add(ButtonDefinition(98, R.drawable.ic_paid, R.drawable.ic_paid_filled, R.string.buy, canToggle = false, { it.currentMain is BuyFragment }, { it.navigate<BuyFragment>() }))
             }
-            newCurrentButtonDefinitions.add(ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = false, { false }, {
-                it.navigate<BrowserFragment>(Settings.URL_FAQ);
-            }))
 
             //Add conditional buttons here, when you add a conditional button, be sure to add the register and unregister events for when the button needs to be updated
 
@@ -350,7 +359,15 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
         //Add configurable buttons here
         var buttonDefinitions = listOf(
-            ButtonDefinition(0, R.drawable.ic_home, R.drawable.ic_home_filled, R.string.home, canToggle = true, { it.currentMain is HomeFragment }, { it.navigate<HomeFragment>() }),
+            ButtonDefinition(0, R.drawable.ic_home, R.drawable.ic_home_filled, R.string.home, canToggle = true, { it.currentMain is HomeFragment }, {
+                val currentMain = it.currentMain
+                if (currentMain is HomeFragment) {
+                    currentMain.scrollToTop(false)
+                    currentMain.reloadFeed()
+                } else {
+                    it.navigate<HomeFragment>()
+                }
+            }),
             ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>() }),
             ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>() }),
             ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>() }),
@@ -369,8 +386,22 @@ class MenuBottomBarFragment : MainActivityFragment() {
                 if (c is Activity) {
                     c.overridePendingTransition(R.anim.slide_in_up, R.anim.slide_darken);
                 }
+            }),
+            ButtonDefinition(96, R.drawable.ic_disabled_visible, R.drawable.ic_disabled_visible, R.string.privacy_mode, canToggle = true, { false }, {
+                UIDialogs.showDialog(it.context ?: return@ButtonDefinition, R.drawable.ic_disabled_visible_purple, "Privacy Mode",
+                    "All requests will be processed anonymously (unauthenticated), playback and history tracking will be disabled.\n\nTap the icon to disable.", null, 0,
+                    UIDialogs.Action("Cancel", {
+                        StateApp.instance.setPrivacyMode(false);
+                    }, UIDialogs.ActionStyle.NONE),
+                    UIDialogs.Action("Enable", {
+                        StateApp.instance.setPrivacyMode(true);
+                    }, UIDialogs.ActionStyle.PRIMARY));
+            }),
+            ButtonDefinition(97, R.drawable.ic_quiz, R.drawable.ic_quiz_fill, R.string.faq, canToggle = true, { false }, {
+                it.navigate<BrowserFragment>(Settings.URL_FAQ);
             })
-            //98 is reversed for buy button
+            //96 is reserved for privacy button
+            //98 is reserved for buy button
             //99 is reserved for more button
         );
     }

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

@@ -1,7 +1,10 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
 import android.graphics.drawable.Animatable
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -12,6 +15,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat.startActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.Glide
@@ -52,7 +56,9 @@ import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.futo.platformplayer.views.subscriptions.SubscribeButton
 import com.futo.polycentric.core.OwnedClaim
 import com.futo.polycentric.core.PublicKey
+import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.SystemState
+import com.futo.polycentric.core.systemToURLInfoSystemLinkUrl
 import com.futo.polycentric.core.toURLInfoSystemLinkUrl
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -64,7 +70,13 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class PolycentricProfile(
     val system: PublicKey, val systemState: SystemState, val ownedClaims: List<OwnedClaim>
-)
+) {
+    fun getHarborUrl(context: Context): String{
+        val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system));
+        val url = system.systemToURLInfoSystemLinkUrl(systemState.servers.asIterable());
+        return "https://harbor.social/" + url.substring("polycentric://".length);
+    }
+}
 
 class ChannelFragment : MainFragment() {
     override val isMainView: Boolean = true

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

@@ -221,8 +221,8 @@ class CommentsFragment : MainFragment() {
 
             Logger.i(TAG, "onAuthorClick: " + c.author.id.value);
             if(c.author.id.value?.startsWith("polycentric://") ?: false) {
-                //val navUrl = "https://harbor.social/" + c.author.id.value?.substring("polycentric://".length);
-                val navUrl = "https://polycentric.io/user/" + c.author.id.value?.substring("polycentric://".length);
+                val navUrl = "https://harbor.social/" + c.author.id.value?.substring("polycentric://".length);
+                //val navUrl = "https://polycentric.io/user/" + c.author.id.value?.substring("polycentric://".length);
                 _fragment.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(navUrl)))
                 //_fragment.navigate<BrowserFragment>(navUrl);
             }

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

@@ -118,8 +118,13 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
 
     private fun showVideoOptionsOverlay(content: IPlatformVideo) {
         _overlayContainer.let {
-            _videoOptionsOverlay = UISlideOverlays.showVideoOptionsOverlay(content, it, SlideUpMenuItem(context, R.drawable.ic_visibility_off, context.getString(R.string.hide), context.getString(R.string.hide_from_home), "hide",
-                { StateMeta.instance.addHiddenVideo(content.url);
+            _videoOptionsOverlay = UISlideOverlays.showVideoOptionsOverlay(content, it, SlideUpMenuItem(
+                context,
+                R.drawable.ic_visibility_off,
+                context.getString(R.string.hide),
+                context.getString(R.string.hide_from_home),
+                tag = "hide",
+                call = { StateMeta.instance.addHiddenVideo(content.url);
                     if (fragment is HomeFragment) {
                         val removeIndex = recyclerData.results.indexOf(content);
                         if (removeIndex >= 0) {
@@ -128,8 +133,12 @@ abstract class ContentFeedView<TFragment> : FeedView<TFragment, IPlatformContent
                         }
                     }
                 }),
-                SlideUpMenuItem(context, R.drawable.ic_playlist, context.getString(R.string.play_feed_as_queue), context.getString(R.string.play_entire_feed), "playFeed",
-                    {
+                SlideUpMenuItem(context,
+                    R.drawable.ic_playlist,
+                    context.getString(R.string.play_feed_as_queue),
+                    context.getString(R.string.play_entire_feed),
+                    tag = "playFeed",
+                    call = {
                         val newQueue = listOf(content) + recyclerData.results
                             .filterIsInstance<IPlatformVideo>()
                             .filter { it != content };

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

@@ -46,6 +46,14 @@ class HomeFragment : MainFragment() {
     private var _view: HomeView? = null;
     private var _cachedRecyclerData: FeedView.RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null;
 
+    fun reloadFeed() {
+        _view?.reloadFeed()
+    }
+
+    fun scrollToTop(smooth: Boolean) {
+        _view?.scrollToTop(smooth)
+    }
+
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
         super.onShownWithView(parameter, isBack);
         _view?.onShown();
@@ -138,17 +146,12 @@ class HomeFragment : MainFragment() {
         fun onShown() {
             val lastClients = recyclerData.lastClients;
             val clients = StatePlatform.instance.getSortedEnabledClient().filter { if (it is JSClient) it.enableInHome else true };
-
             val feedstyleChanged = recyclerData.loadedFeedStyle != feedStyle;
             val clientsChanged = lastClients == null || lastClients.size != clients.size || !lastClients.containsAll(clients);
-            val outdated = recyclerData.lastLoad.getNowDiffSeconds() > 60;
-            Logger.i(TAG, "onShown (recyclerData.loadedFeedStyle=${recyclerData.loadedFeedStyle}, recyclerData.lastLoad=${recyclerData.lastLoad}, feedstyleChanged=$feedstyleChanged, clientsChanged=$clientsChanged, outdated=$outdated)")
+            Logger.i(TAG, "onShown (recyclerData.loadedFeedStyle=${recyclerData.loadedFeedStyle}, recyclerData.lastLoad=${recyclerData.lastLoad}, feedstyleChanged=$feedstyleChanged, clientsChanged=$clientsChanged)")
 
-            if(feedstyleChanged || outdated || clientsChanged) {
-                recyclerData.lastLoad = OffsetDateTime.now();
-                recyclerData.loadedFeedStyle = feedStyle;
-                recyclerData.lastClients = clients;
-                loadResults();
+            if(feedstyleChanged || clientsChanged) {
+                reloadFeed()
             } else {
                 setLoading(false);
             }
@@ -156,6 +159,21 @@ class HomeFragment : MainFragment() {
             finishRefreshLayoutLoader();
         }
 
+        fun scrollToTop(smooth: Boolean) {
+            if (smooth) {
+                _recyclerResults.smoothScrollToPosition(0)
+            } else {
+                _recyclerResults.scrollToPosition(0)
+            }
+        }
+
+        fun reloadFeed() {
+            recyclerData.lastLoad = OffsetDateTime.now();
+            recyclerData.loadedFeedStyle = feedStyle;
+            recyclerData.lastClients = StatePlatform.instance.getSortedEnabledClient().filter { if (it is JSClient) it.enableInHome else true };
+            loadResults();
+        }
+
         override fun getEmptyPagerView(): View? {
             val dp10 = 10.dp(resources);
             val dp30 = 30.dp(resources);

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

@@ -8,7 +8,6 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.fragment.mainactivity.MainActivityFragment
 import com.futo.platformplayer.fragment.mainactivity.topbar.TopFragment
-import com.futo.platformplayer.listeners.OrientationManager
 
 abstract class MainFragment : MainActivityFragment() {
     open val isMainView: Boolean = false;
@@ -46,10 +45,6 @@ abstract class MainFragment : MainActivityFragment() {
 
     }
 
-    open fun onOrientationChanged(orientation: OrientationManager.Orientation) {
-
-    }
-
     open fun onBackPressed(): Boolean {
         return false;
     }

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

@@ -109,19 +109,31 @@ class PlaylistFragment : MainFragment() {
                 val reconstruction = StatePlaylists.instance.playlistStore.getReconstructionString(playlist);
 
                 UISlideOverlays.showOverlay(overlayContainer, context.getString(R.string.playlist) + " [${playlist.name}]", null, {},
-                    SlideUpMenuItem(context, R.drawable.ic_list, context.getString(R.string.share_as_text), context.getString(R.string.share_as_a_list_of_video_urls), 1, {
-                        _fragment.startActivity(ShareCompat.IntentBuilder(context)
-                            .setType("text/plain")
-                            .setText(reconstruction)
-                            .intent);
-                    }),
-                    SlideUpMenuItem(context, R.drawable.ic_move_up, context.getString(R.string.share_as_import), context.getString(R.string.share_as_a_import_file_for_grayjay), 2, {
-                        val shareUri = StatePlaylists.instance.createPlaylistShareJsonUri(context, playlist);
-                        _fragment.startActivity(ShareCompat.IntentBuilder(context)
-                            .setType("application/json")
-                            .setStream(shareUri)
-                            .intent);
-                    })
+                    SlideUpMenuItem(
+                        context,
+                        R.drawable.ic_list,
+                        context.getString(R.string.share_as_text),
+                        context.getString(R.string.share_as_a_list_of_video_urls),
+                        tag = 1,
+                        call = {
+                            _fragment.startActivity(ShareCompat.IntentBuilder(context)
+                                .setType("text/plain")
+                                .setText(reconstruction)
+                                .intent);
+                        }),
+                    SlideUpMenuItem(
+                        context,
+                        R.drawable.ic_move_up,
+                        context.getString(R.string.share_as_import),
+                        context.getString(R.string.share_as_a_import_file_for_grayjay),
+                        tag = 2,
+                        call = {
+                            val shareUri = StatePlaylists.instance.createPlaylistShareJsonUri(context, playlist);
+                            _fragment.startActivity(ShareCompat.IntentBuilder(context)
+                                .setType("application/json")
+                                .setStream(shareUri)
+                                .intent);
+                        })
                 );
             };
 
@@ -144,6 +156,14 @@ class PlaylistFragment : MainFragment() {
                 };
         }
 
+        private fun copyPlaylist(playlist: Playlist) {
+            StatePlaylists.instance.playlistStore.save(playlist)
+            _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(
+                arrayListOf()
+            )
+            UIDialogs.toast("Playlist saved")
+        }
+
         fun onShown(parameter: Any?) {
             _taskLoadPlaylist.cancel()
 
@@ -158,14 +178,10 @@ class PlaylistFragment : MainFragment() {
                     setButtonDownloadVisible(true)
                     setButtonEditVisible(true)
 
-                    if (!StatePlaylists.instance.playlistStore.getItems().contains(parameter)) {
+                    if (!StatePlaylists.instance.playlistStore.hasItem { it.id == parameter.id }) {
                         _fragment.topBar?.assume<NavigationTopBarFragment>()
                             ?.setMenuItems(arrayListOf(Pair(R.drawable.ic_copy) {
-                                StatePlaylists.instance.playlistStore.save(parameter)
-                                _fragment.topBar?.assume<NavigationTopBarFragment>()?.setMenuItems(
-                                    arrayListOf()
-                                )
-                                UIDialogs.toast("Playlist saved")
+                                copyPlaylist(parameter)
                             }))
                     }
                 } else {
@@ -230,6 +246,15 @@ class PlaylistFragment : MainFragment() {
         }
 
         private fun download() {
+            val playlist = _playlist ?: return
+            if (!StatePlaylists.instance.playlistStore.hasItem { it.id == playlist.id }) {
+                UIDialogs.showConfirmationDialog(context, "Playlist must be saved to download", {
+                    copyPlaylist(playlist)
+                    download()
+                })
+                return
+            }
+
             _playlist?.let {
                 UISlideOverlays.showDownloadPlaylistOverlay(it, overlayContainer);
             }
@@ -254,6 +279,15 @@ class PlaylistFragment : MainFragment() {
         override fun canEdit(): Boolean { return _playlist != null; }
 
         override fun onEditClick() {
+            val playlist = _playlist ?: return
+            if (!StatePlaylists.instance.playlistStore.hasItem { it.id == playlist.id }) {
+                UIDialogs.showConfirmationDialog(context, "Playlist must be saved to edit the name", {
+                    copyPlaylist(playlist)
+                    onEditClick()
+                })
+                return
+            }
+
             _editPlaylistNameInput?.activate();
             _editPlaylistOverlay?.show();
         }

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

@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewPropertyAnimator
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -19,6 +20,7 @@ import androidx.core.view.children
 import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.Thumbnails
@@ -135,10 +137,7 @@ class PostDetailFragment : MainFragment {
         private val _imageDislikeIcon: ImageView;
         private val _textDislikes: TextView;
 
-        private val _textComments: TextView;
-        private val _textCommentType: TextView;
         private val _addCommentView: AddCommentView;
-        private val _toggleCommentType: Toggle;
 
         private val _rating: PillRatingLikesDislikes;
 
@@ -152,6 +151,10 @@ class PostDetailFragment : MainFragment {
 
         private val _commentsList: CommentsList;
 
+        private var _commentType: Boolean? = null;
+        private val _buttonPolycentric: Button
+        private val _buttonPlatform: Button
+
         private val _taskLoadPost = if(!isInEditMode) TaskHandler<String, IPlatformPostDetails>(
             StateApp.instance.scopeGetter,
             {
@@ -198,9 +201,6 @@ class PostDetailFragment : MainFragment {
             _textDislikes = findViewById(R.id.text_dislikes);
 
             _commentsList = findViewById(R.id.comments_list);
-            _textCommentType = findViewById(R.id.text_comment_type);
-            _toggleCommentType = findViewById(R.id.toggle_comment_type);
-            _textComments = findViewById(R.id.text_comments);
             _addCommentView = findViewById(R.id.add_comment_view);
 
             _rating = findViewById(R.id.rating);
@@ -213,6 +213,9 @@ class PostDetailFragment : MainFragment {
 
             _repliesOverlay = findViewById(R.id.replies_overlay);
 
+            _buttonPolycentric = findViewById(R.id.button_polycentric)
+            _buttonPlatform = findViewById(R.id.button_platform)
+
             _textContent.setPlatformPlayerLinkMovementMethod(context);
 
             _buttonSubscribe.onSubscribed.subscribe {
@@ -224,9 +227,10 @@ class PostDetailFragment : MainFragment {
             root.removeView(layoutTop);
             _commentsList.setPrependedView(layoutTop);
 
+            /*TODO: Why is this here?
             _commentsList.onCommentsLoaded.subscribe {
                 updateCommentType(false);
-            };
+            };*/
 
             _commentsList.onRepliesClick.subscribe { c ->
                 val replyCount = c.replyCount ?: 0;
@@ -237,7 +241,7 @@ class PostDetailFragment : MainFragment {
 
                 if (c is PolycentricPlatformComment) {
                     var parentComment: PolycentricPlatformComment = c;
-                    _repliesOverlay.load(_toggleCommentType.value, metadata, c.contextUrl, c.reference, c,
+                    _repliesOverlay.load(_commentType!!, metadata, c.contextUrl, c.reference, c,
                         { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) },
                         {
                             val newComment = parentComment.cloneWithUpdatedReplyCount((parentComment.replyCount ?: 0) + 1);
@@ -245,22 +249,23 @@ class PostDetailFragment : MainFragment {
                             parentComment = newComment;
                         });
                 } else {
-                    _repliesOverlay.load(_toggleCommentType.value, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
+                    _repliesOverlay.load(_commentType!!, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
                 }
 
                 setRepliesOverlayVisible(isVisible = true, animate = true);
             };
 
+            if (StatePolycentric.instance.enabled) {
+                _buttonPolycentric.setOnClickListener {
+                    updateCommentType(false)
+                }
+            } else {
+                _buttonPolycentric.visibility = View.GONE
+            }
 
-            _toggleCommentType.onValueChanged.subscribe {
-                updateCommentType(true);
-            };
-
-            _textCommentType.setOnClickListener {
-                _toggleCommentType.setValue(!_toggleCommentType.value, true);
-                updateCommentType(true);
-            };
-
+            _buttonPlatform.setOnClickListener {
+                updateCommentType(true)
+            }
             _layoutMonetization.visibility = View.GONE;
 
             _buttonSupport.setOnClickListener {
@@ -432,7 +437,7 @@ class PostDetailFragment : MainFragment {
             _taskLoadPolycentricProfile.cancel();
             _version++;
 
-            _toggleCommentType.setValue(false, false);
+            updateCommentType(null)
             _url = null;
             _post = null;
             _postOverview = null;
@@ -476,7 +481,8 @@ class PostDetailFragment : MainFragment {
                 _addCommentView.setContext(value.url, Models.referenceFromBuffer(value.url.toByteArray()));
             }
 
-            updateCommentType(true);
+            val commentType = !Settings.instance.other.polycentricEnabled || Settings.instance.comments.defaultCommentSection == 1
+            updateCommentType(commentType, true);
             setLoading(false);
         }
 
@@ -679,20 +685,29 @@ class PostDetailFragment : MainFragment {
             _commentsList.load(false) { StatePolycentric.instance.getCommentPager(post!!.url, ref, listOfNotNull(extraBytesRef)); };
         }
 
-        private fun updateCommentType(reloadComments: Boolean) {
-            if (_toggleCommentType.value) {
-                _textCommentType.text = "Platform";
-                _addCommentView.visibility = View.GONE;
+        private fun updateCommentType(commentType: Boolean?, forceReload: Boolean = false) {
+            val changed = commentType != _commentType
+            _commentType = commentType
 
-                if (reloadComments) {
-                    fetchComments();
-                }
+            if (commentType == null) {
+                _buttonPlatform.setTextColor(resources.getColor(R.color.gray_ac))
+                _buttonPolycentric.setTextColor(resources.getColor(R.color.gray_ac))
             } else {
-                _textCommentType.text = "Polycentric";
-                _addCommentView.visibility = View.VISIBLE;
+                _buttonPlatform.setTextColor(resources.getColor(if (commentType) R.color.white else R.color.gray_ac))
+                _buttonPolycentric.setTextColor(resources.getColor(if (!commentType) R.color.white else R.color.gray_ac))
 
-                if (reloadComments) {
-                    fetchPolycentricComments()
+                if (commentType) {
+                    _addCommentView.visibility = View.GONE;
+
+                    if (forceReload || changed) {
+                        fetchComments();
+                    }
+                } else {
+                    _addCommentView.visibility = View.VISIBLE;
+
+                    if (forceReload || changed) {
+                        fetchPolycentricComments()
+                    }
                 }
             }
         }

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

@@ -397,23 +397,43 @@ class SourceDetailFragment : MainFragment() {
                     UIDialogs.Action("Cancel", {}, UIDialogs.ActionStyle.NONE),
                     UIDialogs.Action("Login", {
                         LoginActivity.showLogin(StateApp.instance.context, config) {
-                            StatePlugins.instance.setPluginAuth(config.id, it);
-                            reloadSource(config.id);
+                            try {
+                                StatePlugins.instance.setPluginAuth(config.id, it);
+                                reloadSource(config.id);
+                            } catch (e: Throwable) {
+                                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                                    context?.let { c -> UIDialogs.showGeneralErrorDialog(c, "Failed to set plugin authentication (loginSource, loginWarning)", e) }
+                                }
+                                Logger.e(TAG, "Failed to set plugin authentication (loginSource, loginWarning)", e)
+                            }
                         };
                     }, UIDialogs.ActionStyle.PRIMARY))
             }
             else
                 LoginActivity.showLogin(StateApp.instance.context, config) {
-                    StatePlugins.instance.setPluginAuth(config.id, it);
-                    reloadSource(config.id);
+                    try {
+                        StatePlugins.instance.setPluginAuth(config.id, it);
+                        reloadSource(config.id);
+                    } catch (e: Throwable) {
+                        StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                            context?.let { c -> UIDialogs.showGeneralErrorDialog(c, "Failed to set plugin authentication (loginSource)", e) }
+                        }
+                        Logger.e(TAG, "Failed to set plugin authentication (loginSource)", e)
+                    }
                 };
         }
         private fun logoutSource(clear: Boolean = true) {
             val config = _config ?: return;
 
-            StatePlugins.instance.setPluginAuth(config.id, null);
-            reloadSource(config.id);
-
+            try {
+                StatePlugins.instance.setPluginAuth(config.id, null);
+                reloadSource(config.id);
+            } catch (e: Throwable) {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                    context?.let { c -> UIDialogs.showGeneralErrorDialog(c, "Failed to clear plugin authentication", e) }
+                }
+                Logger.e(TAG, "Failed to clear plugin authentication", e)
+            }
 
             //TODO: Maybe add a dialog option..
             if(Settings.instance.plugins.clearCookiesOnLogout && clear) {

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

@@ -117,8 +117,14 @@ class SuggestionsFragment : MainFragment {
                     } else if (_searchType == SearchType.PLAYLIST) {
                         navigate<PlaylistSearchResultsFragment>(it);
                     } else {
-                        if(it.isHttpUrl())
-                            navigate<VideoDetailFragment>(it);
+                        if(it.isHttpUrl()) {
+                            if(StatePlatform.instance.hasEnabledPlaylistClient(it))
+                                navigate<RemotePlaylistFragment>(it);
+                            else if(StatePlatform.instance.hasEnabledChannelClient(it))
+                                navigate<ChannelFragment>(it);
+                            else
+                                navigate<VideoDetailFragment>(it);
+                        }
                         else
                             navigate<ContentSearchResultsFragment>(SuggestionsFragmentData(it, SearchType.VIDEO, _channelUrl));
                     }

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

@@ -200,7 +200,7 @@ class TutorialFragment : MainFragment() {
             TutorialVideo(
                 uuid = "94d36959-e3fc-4c24-a988-89147067a179",
                 name = "Casting",
-                description = "Learn about casting in Grayjay. How do I show video on my TV?",
+                description = "Learn about casting in Grayjay. How do I show video on my TV?\nhttps://fcast.org/",
                 thumbnailUrl = "https://releases.grayjay.app/tutorials/how-to-cast.jpg",
                 videoUrl = "https://releases.grayjay.app/tutorials/how-to-cast.mp4",
                 duration = 79

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

@@ -2,31 +2,37 @@ package com.futo.platformplayer.fragment.mainactivity.main
 
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowInsets
+import android.view.WindowInsetsController
+import android.view.WindowManager
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
+import com.futo.platformplayer.SimpleOrientationListener
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.activities.SettingsActivity
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
-import com.futo.platformplayer.casting.CastConnectionState
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.listeners.OrientationManager
+import com.futo.platformplayer.listeners.AutoRotateChangeListener
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.models.UrlVideoWithTime
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.views.containers.SingleViewTouchableMotionLayout
 
+
 class VideoDetailFragment : MainFragment {
     override val isMainView : Boolean = false;
     override val hasBottomBar: Boolean = true;
@@ -37,23 +43,32 @@ class VideoDetailFragment : MainFragment {
 
     private var _viewDetail : VideoDetailView? = null;
     private var _view : SingleViewTouchableMotionLayout? = null;
+    private lateinit var _autoRotateChangeListener: AutoRotateChangeListener
+    private lateinit var _orientationListener: SimpleOrientationListener
+    private var _currentOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
 
     var isFullscreen : Boolean = false;
+    val onFullscreenChanged = Event1<Boolean>();
     var isTransitioning : Boolean = false
         private set;
     var isInPictureInPicture : Boolean = false
         private set;
 
-    var state: State = State.CLOSED;
+    private var _state: State = State.CLOSED
+
+    var state: State
+        get() = _state
+        set(value) {
+            _state = value
+            onStateChanged(value)
+        }
+
     val currentUrl get() = _viewDetail?.currentUrl;
 
     val onMinimize = Event0();
     val onTransitioning = Event1<Boolean>();
     val onMaximized = Event0();
 
-    var lastOrientation : OrientationManager.Orientation = OrientationManager.Orientation.PORTRAIT
-        private set;
-
     private var _isInitialMaximize = true;
 
     private val _maximizeProgress get() = _view?.progress ?: 0.0f;
@@ -73,6 +88,67 @@ class VideoDetailFragment : MainFragment {
         _viewDetail?.prevVideo(true);
     }
 
+    private fun onStateChanged(state: VideoDetailFragment.State) {
+        updateOrientation()
+    }
+
+    private fun updateOrientation() {
+        val a = activity ?: return
+        val isMaximized = state == State.MAXIMIZED
+        val isFullScreenPortraitAllowed = Settings.instance.playback.fullscreenPortrait;
+        val bypassRotationPrevention = Settings.instance.other.bypassRotationPrevention;
+        val fullAutorotateLock = Settings.instance.playback.fullAutorotateLock
+        val currentRequestedOrientation = a.requestedOrientation
+        var currentOrientation = if (_currentOrientation == -1) currentRequestedOrientation else _currentOrientation
+        if (currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT && !Settings.instance.playback.reversePortrait)
+            currentOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+
+        val isAutoRotate = Settings.instance.playback.isAutoRotate()
+        val isFs = isFullscreen
+
+        if (fullAutorotateLock) {
+            if (isFs && isMaximized) {
+                if (isFullScreenPortraitAllowed) {
+                    if (isAutoRotate) {
+                        a.requestedOrientation = currentOrientation
+                    }
+                } else if (currentOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
+                    if (isAutoRotate || currentOrientation != currentRequestedOrientation && (currentRequestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || currentRequestedOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT)) {
+                        a.requestedOrientation = currentOrientation
+                    }
+                } else {
+                    a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                }
+            } else if (bypassRotationPrevention) {
+                a.requestedOrientation = currentOrientation
+            } else if (currentOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
+                a.requestedOrientation = currentOrientation
+            } else {
+                a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        } else {
+            if (isFs && isMaximized) {
+                if (isFullScreenPortraitAllowed) {
+                    a.requestedOrientation = currentOrientation
+                } else if (currentOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
+                    a.requestedOrientation = currentOrientation
+                } else if (currentRequestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || currentRequestedOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
+                    //Don't change anything
+                } else {
+                    a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                }
+            } else if (bypassRotationPrevention) {
+                a.requestedOrientation = currentOrientation
+            } else if (currentOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
+                a.requestedOrientation = currentOrientation
+            } else {
+                a.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+
+        Log.i(TAG, "updateOrientation (isFs = ${isFs}, currentOrientation = ${currentOrientation}, fullAutorotateLock = ${fullAutorotateLock}, currentRequestedOrientation = ${currentRequestedOrientation}, isMaximized = ${isMaximized}, isAutoRotate = ${isAutoRotate}, isFullScreenPortraitAllowed = ${isFullScreenPortraitAllowed}) resulted in requested orientation ${activity?.requestedOrientation}");
+    }
+
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
         super.onShownWithView(parameter, isBack);
         Logger.i(TAG, "onShownWithView parameter=$parameter")
@@ -98,49 +174,6 @@ class VideoDetailFragment : MainFragment {
         }
     }
 
-    override fun onOrientationChanged(orientation: OrientationManager.Orientation) {
-        super.onOrientationChanged(orientation);
-
-        if(!_isActive || state != State.MAXIMIZED)
-            return;
-
-        var newOrientation = orientation;
-        val d = StateCasting.instance.activeDevice;
-        if (d != null && d.connectionState == CastConnectionState.CONNECTED) {
-            newOrientation = OrientationManager.Orientation.PORTRAIT;
-        } else if(StatePlayer.instance.rotationLock) {
-            return;
-        }
-
-        if(Settings.instance.other.bypassRotationPrevention && orientation == OrientationManager.Orientation.PORTRAIT)
-            changeOrientation(OrientationManager.Orientation.PORTRAIT);
-
-        if(lastOrientation == newOrientation)
-            return;
-
-        activity?.let {
-            if (isFullscreen) {
-                if (Settings.instance.playback.fullscreenPortrait) {
-                    changeOrientation(newOrientation);
-                } else {
-                    if(newOrientation == OrientationManager.Orientation.REVERSED_LANDSCAPE && it.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
-                        changeOrientation(OrientationManager.Orientation.REVERSED_LANDSCAPE);
-                    else if(newOrientation == OrientationManager.Orientation.LANDSCAPE && it.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)
-                        changeOrientation(OrientationManager.Orientation.LANDSCAPE);
-                    else if(Settings.instance.playback.isAutoRotate() && (newOrientation == OrientationManager.Orientation.PORTRAIT || newOrientation == OrientationManager.Orientation.REVERSED_PORTRAIT)) {
-                        _viewDetail?.setFullscreen(false);
-                    }
-                }
-            }
-            else {
-                if(Settings.instance.playback.isAutoRotate() && (lastOrientation == OrientationManager.Orientation.PORTRAIT || lastOrientation == OrientationManager.Orientation.REVERSED_PORTRAIT)) {
-                    lastOrientation = newOrientation;
-                    _viewDetail?.setFullscreen(true);
-                }
-            }
-        }
-        lastOrientation = newOrientation;
-    }
     override fun onBackPressed(): Boolean {
         Logger.i(TAG, "onBackPressed")
 
@@ -154,6 +187,7 @@ class VideoDetailFragment : MainFragment {
             closeVideoDetails();
         return true;
     }
+
     override fun onHide() {
         super.onHide();
     }
@@ -163,7 +197,7 @@ class VideoDetailFragment : MainFragment {
         _viewDetail?.preventPictureInPicture = true;
     }
 
-    fun minimizeVideoDetail(){
+    fun minimizeVideoDetail() {
         _viewDetail?.setFullscreen(false);
         if(_view != null)
             _view!!.transitionToStart();
@@ -265,7 +299,6 @@ class VideoDetailFragment : MainFragment {
             override fun onTransitionTrigger(p0: MotionLayout?, p1: Int, p2: Boolean, p3: Float) { }
         });
 
-        context
         _view?.let {
             if (it.progress >= 0.5 && it.progress < 1.0)
                 maximizeVideoDetail();
@@ -273,12 +306,55 @@ class VideoDetailFragment : MainFragment {
                 minimizeVideoDetail();
         }
 
-        _loadUrlOnCreate?.let { _viewDetail?.setVideo(it.url, it.timeSeconds, it.playWhenReady) };
+        _autoRotateChangeListener = AutoRotateChangeListener(requireContext(), Handler()) { _ ->
+            if (updateAutoFullscreen()) {
+                return@AutoRotateChangeListener
+            }
+            updateOrientation()
+        }
 
+        _loadUrlOnCreate?.let { _viewDetail?.setVideo(it.url, it.timeSeconds, it.playWhenReady) };
         maximizeVideoDetail();
+
+        SettingsActivity.settingsActivityClosed.subscribe(this) {
+            updateOrientation()
+        }
+
+        StatePlayer.instance.onRotationLockChanged.subscribe(this) {
+            if (updateAutoFullscreen()) {
+                return@subscribe
+            }
+            updateOrientation()
+        }
+
+        _orientationListener = SimpleOrientationListener(requireActivity(), lifecycleScope)
+        _orientationListener.onOrientationChanged.subscribe {
+            _currentOrientation = it
+            Logger.i(TAG, "Current orientation changed (_currentOrientation = ${_currentOrientation})")
+
+            if (updateAutoFullscreen()) {
+                return@subscribe
+            }
+            updateOrientation()
+        }
         return _view!!;
     }
 
+    private fun updateAutoFullscreen(): Boolean {
+        if (Settings.instance.playback.isAutoRotate()) {
+            if (state == State.MAXIMIZED && !isFullscreen && (_currentOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || _currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)) {
+                _viewDetail?.setFullscreen(true)
+                return true
+            }
+
+            if (state == State.MAXIMIZED && isFullscreen && !Settings.instance.playback.fullscreenPortrait && (_currentOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || _currentOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT)) {
+                _viewDetail?.setFullscreen(false)
+                return true
+            }
+        }
+        return false
+    }
+
     fun onUserLeaveHint() {
         val viewDetail = _viewDetail;
         Logger.i(TAG, "onUserLeaveHint preventPictureInPicture=${viewDetail?.preventPictureInPicture} isCasting=${StateCasting.instance.isCasting} isBackgroundPictureInPicture=${Settings.instance.playback.isBackgroundPictureInPicture()} allowBackground=${viewDetail?.allowBackground}");
@@ -333,11 +409,6 @@ class VideoDetailFragment : MainFragment {
             }
         }
 
-        val realOrientation = if(activity is MainActivity) (activity as MainActivity).orientation else lastOrientation;
-        Logger.i(TAG, "Real orientation on boot ${realOrientation}, lastOrientation: ${lastOrientation}");
-        if(realOrientation != lastOrientation)
-            onOrientationChanged(realOrientation);
-
         StateCasting.instance.onResume();
     }
     override fun onPause() {
@@ -379,6 +450,12 @@ class VideoDetailFragment : MainFragment {
     override fun onDestroyMainView() {
         super.onDestroyMainView();
         Logger.v(TAG, "onDestroyMainView");
+        _autoRotateChangeListener?.unregister()
+        _orientationListener.stopListening()
+
+        SettingsActivity.settingsActivityClosed.remove(this)
+        StatePlayer.instance.onRotationLockChanged.remove(this)
+
         _viewDetail?.let {
             _viewDetail = null;
             it.onDestroy();
@@ -386,13 +463,6 @@ class VideoDetailFragment : MainFragment {
         _view = null;
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState);
-        StateCasting.instance.onActiveDeviceConnectionStateChanged.subscribe(this) { _, _ ->
-            onOrientationChanged(lastOrientation);
-        };
-    }
-
     override fun onDestroy() {
         super.onDestroy()
 
@@ -408,64 +478,59 @@ class VideoDetailFragment : MainFragment {
         onMaximized.clear();
     }
 
-    private fun onFullscreenChanged(fullscreen : Boolean) {
-        activity?.let {
-            if (fullscreen) {
-                if (Settings.instance.playback.fullscreenPortrait) {
-                    changeOrientation(lastOrientation);
-                } else {
-                    var orient = lastOrientation;
-                    if(orient == OrientationManager.Orientation.PORTRAIT || orient == OrientationManager.Orientation.REVERSED_PORTRAIT)
-                        orient = OrientationManager.Orientation.LANDSCAPE;
-                    changeOrientation(orient);
-                }
+    private fun hideSystemUI() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            WindowCompat.setDecorFitsSystemWindows(requireActivity().window, false)
+            activity?.window?.insetsController?.let { controller ->
+                controller.hide(WindowInsets.Type.statusBars())
+                controller.hide(WindowInsets.Type.systemBars())
+                controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             }
-            else
-                changeOrientation(OrientationManager.Orientation.PORTRAIT);
+        } else {
+            @Suppress("DEPRECATION")
+            activity?.window?.setFlags(
+                WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN
+            )
+            @Suppress("DEPRECATION")
+            activity?.window?.decorView?.systemUiVisibility = (
+                    View.SYSTEM_UI_FLAG_FULLSCREEN
+                            or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                            or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    )
         }
-        isFullscreen = fullscreen;
-        _view?.allowMotion = !fullscreen;
     }
-    private fun changeOrientation(orientation: OrientationManager.Orientation) {
-        Logger.i(TAG, "Orientation Change:" + orientation.name);
-        activity?.let {
-            when (orientation) {
-                OrientationManager.Orientation.LANDSCAPE -> {
-                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-                    _view?.allowMotion = false;
 
-                    WindowCompat.setDecorFitsSystemWindows(requireActivity().window, false)
-                    WindowInsetsControllerCompat(it.window, _viewDetail!!).let { controller ->
-                        controller.hide(WindowInsetsCompat.Type.statusBars());
-                        controller.hide(WindowInsetsCompat.Type.systemBars());
-                        controller.systemBarsBehavior =  WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;
-                    }
-                }
-                OrientationManager.Orientation.REVERSED_LANDSCAPE -> {
-                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
-                    _view?.allowMotion = false;
-
-                    WindowCompat.setDecorFitsSystemWindows(requireActivity().window, false)
-                    WindowInsetsControllerCompat(it.window, _viewDetail!!).let { controller ->
-                        controller.hide(WindowInsetsCompat.Type.statusBars());
-                        controller.hide(WindowInsetsCompat.Type.systemBars());
-                        controller.systemBarsBehavior =  WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;
-                    }
-                }
-                else -> {
-                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-                    _view?.allowMotion = true;
-
-                    WindowCompat.setDecorFitsSystemWindows(it.window, true)
-                    WindowInsetsControllerCompat(it.window, _viewDetail!!).let { controller ->
-                        controller.show(WindowInsetsCompat.Type.statusBars());
-                        controller.show(WindowInsetsCompat.Type.systemBars())
-                    }
-                }
+    private fun showSystemUI() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            WindowCompat.setDecorFitsSystemWindows(requireActivity().window, true)
+            activity?.window?.insetsController?.let { controller ->
+                controller.show(WindowInsets.Type.statusBars())
+                controller.show(WindowInsets.Type.systemBars())
+                controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_DEFAULT
             }
+        } else {
+            @Suppress("DEPRECATION")
+            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+            @Suppress("DEPRECATION")
+            activity?.window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
         }
     }
 
+    private fun onFullscreenChanged(fullscreen : Boolean) {
+        isFullscreen = fullscreen;
+        onFullscreenChanged.emit(isFullscreen);
+
+        if (isFullscreen) {
+            hideSystemUI()
+        } else {
+            showSystemUI()
+        }
+
+        updateOrientation();
+        _view?.allowMotion = !fullscreen;
+    }
+
     companion object {
         private val TAG = "VideoDetailFragment";
 

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

@@ -23,7 +23,7 @@ import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.view.WindowManager
-import android.webkit.WebView
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -53,14 +53,13 @@ import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
 import com.futo.platformplayer.api.media.models.chapters.ChapterType
 import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.live.ILiveChatWindowDescriptor
 import com.futo.platformplayer.api.media.models.live.IPlatformLiveEvent
 import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
 import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
-import com.futo.platformplayer.api.media.models.streams.sources.DashManifestSource
-import com.futo.platformplayer.api.media.models.streams.sources.HLSManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
@@ -102,8 +101,10 @@ import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateDeveloper
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.states.StateHistory
+import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.states.StatePlaylists
@@ -114,15 +115,18 @@ import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.StringArrayStorage
 import com.futo.platformplayer.stores.db.types.DBHistory
 import com.futo.platformplayer.toHumanBitrate
+import com.futo.platformplayer.toHumanBytesSize
 import com.futo.platformplayer.toHumanNowDiffString
 import com.futo.platformplayer.toHumanNumber
 import com.futo.platformplayer.toHumanTime
+import com.futo.platformplayer.views.FeedStyle
+import com.futo.platformplayer.views.LoaderView
 import com.futo.platformplayer.views.MonetizationView
+import com.futo.platformplayer.views.adapters.feedtypes.PreviewVideoView
 import com.futo.platformplayer.views.behavior.TouchInterceptFrameLayout
 import com.futo.platformplayer.views.casting.CastView
 import com.futo.platformplayer.views.comments.AddCommentView
 import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.others.Toggle
 import com.futo.platformplayer.views.overlays.DescriptionOverlay
 import com.futo.platformplayer.views.overlays.LiveChatOverlay
 import com.futo.platformplayer.views.overlays.QueueEditorOverlay
@@ -156,6 +160,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import okhttp3.Dispatcher
+import org.w3c.dom.Text
 import userpackage.Protocol
 import java.time.OffsetDateTime
 import kotlin.math.abs
@@ -226,10 +232,8 @@ class VideoDetailView : ConstraintLayout {
 
     var preventPictureInPicture: Boolean = false;
 
-    private val _textComments: TextView;
-    private val _textCommentType: TextView;
     private val _addCommentView: AddCommentView;
-    private val _toggleCommentType: Toggle;
+    private var _tabIndex: Int? = null;
 
     private val _layoutSkip: LinearLayout;
     private val _textSkip: TextView;
@@ -237,6 +241,7 @@ class VideoDetailView : ConstraintLayout {
     private val _layoutResume: LinearLayout;
     private var _jobHideResume: Job? = null;
     private val _layoutPlayerContainer: TouchInterceptFrameLayout;
+    private val _layoutChangeBottomSection: LinearLayout;
 
     //Overlays
     private val _overlayContainer: FrameLayout;
@@ -260,12 +265,16 @@ class VideoDetailView : ConstraintLayout {
     private val _layoutRating: LinearLayout;
     private val _imageDislikeIcon: ImageView;
     private val _imageLikeIcon: ImageView;
-    private val _layoutToggleCommentSection: LinearLayout;
 
     private val _monetization: MonetizationView;
 
     private val _buttonMore: RoundButton;
 
+    private val _buttonPolycentric: Button
+    private val _buttonPlatform: Button
+    private val _buttonRecommended: Button
+    private val _layoutRecommended: LinearLayout
+
     private var _didStop: Boolean = false;
     private var _onPauseCalled = false;
     private var _lastVideoSource: IVideoSource? = null;
@@ -281,6 +290,7 @@ class VideoDetailView : ConstraintLayout {
     private var _commentsCount = 0;
     private var _polycentricProfile: PolycentricCache.CachedPolycentricProfile? = null;
     private var _slideUpOverlay: SlideUpMenuOverlay? = null;
+    private var _autoplayVideo: IPlatformVideo? = null
 
     //Events
     val onMinimize = Event0();
@@ -335,9 +345,8 @@ class VideoDetailView : ConstraintLayout {
         _overlay_loading_spinner = findViewById(R.id.videodetail_loader);
         _rating = findViewById(R.id.videodetail_rating);
         _upNext = findViewById(R.id.up_next);
-        _textCommentType = findViewById(R.id.text_comment_type);
-        _toggleCommentType = findViewById(R.id.toggle_comment_type);
-        _layoutToggleCommentSection = findViewById(R.id.layout_toggle_comment_section);
+        _layoutChangeBottomSection = findViewById(R.id.layout_change_bottom_section);
+        _layoutRecommended = findViewById(R.id.layout_recommended)
 
         _overlayContainer = findViewById(R.id.overlay_container);
         _overlay_quality_container = findViewById(R.id.videodetail_quality_overview);
@@ -359,7 +368,6 @@ class VideoDetailView : ConstraintLayout {
         _container_content_support = findViewById(R.id.videodetail_container_support);
         _container_content_browser = findViewById(R.id.videodetail_container_webview)
 
-        _textComments = findViewById(R.id.text_comments);
         _addCommentView = findViewById(R.id.add_comment_view);
         _commentsList = findViewById(R.id.comments_list);
 
@@ -376,6 +384,10 @@ class VideoDetailView : ConstraintLayout {
         _imageLikeIcon = findViewById(R.id.image_like_icon);
         _imageDislikeIcon = findViewById(R.id.image_dislike_icon);
 
+        _buttonPolycentric = findViewById(R.id.button_polycentric)
+        _buttonPlatform = findViewById(R.id.button_platform)
+        _buttonRecommended = findViewById(R.id.button_recommended)
+
         _monetization = findViewById(R.id.monetization);
         _player.attachPlayer();
 
@@ -429,17 +441,26 @@ class VideoDetailView : ConstraintLayout {
 
         _commentsList.onCommentsLoaded.subscribe { count ->
             _commentsCount = count;
-            updateCommentType(false);
+            //TODO: Why is this here ? updateTabs(false);
         };
 
-        _toggleCommentType.onValueChanged.subscribe {
-            updateCommentType(true);
-        };
+        if (StatePolycentric.instance.enabled) {
+            _buttonPolycentric.setOnClickListener {
+                setTabIndex(0);
+                StateMeta.instance.setLastCommentSection(0);
+            }
+        } else {
+            _buttonPolycentric.visibility = View.GONE
+        }
 
-        _textCommentType.setOnClickListener {
-            _toggleCommentType.setValue(!_toggleCommentType.value, true);
-            updateCommentType(true);
-        };
+        _buttonRecommended.setOnClickListener {
+            setTabIndex(2)
+        }
+
+        _buttonPlatform.setOnClickListener {
+            setTabIndex(1)
+            StateMeta.instance.setLastCommentSection(1);
+        }
 
         val layoutTop: LinearLayout = findViewById(R.id.layout_top);
         _container_content_main.removeView(layoutTop);
@@ -660,8 +681,8 @@ class VideoDetailView : ConstraintLayout {
 
             Logger.i(TAG, "onAuthorClick: " + c.author.id.value);
             if(c.author.id.value?.startsWith("polycentric://") ?: false) {
-                //val navUrl = "https://harbor.social/" + c.author.id.value?.substring("polycentric://".length);
-                val navUrl = "https://polycentric.io/user/" + c.author.id.value?.substring("polycentric://".length);
+                val navUrl = "https://harbor.social/" + c.author.id.value?.substring("polycentric://".length);
+                //val navUrl = "https://polycentric.io/user/" + c.author.id.value?.substring("polycentric://".length);
                 fragment.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(navUrl)))
                 //_container_content_browser.goto(navUrl);
                 //switchContentView(_container_content_browser);
@@ -676,7 +697,7 @@ class VideoDetailView : ConstraintLayout {
 
             if (c is PolycentricPlatformComment) {
                 var parentComment: PolycentricPlatformComment = c;
-                _container_content_replies.load(_toggleCommentType.value, metadata, c.contextUrl, c.reference, c,
+                _container_content_replies.load(if (_tabIndex!! == 0) false else true, metadata, c.contextUrl, c.reference, c,
                     { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) },
                     {
                         val newComment = parentComment.cloneWithUpdatedReplyCount((parentComment.replyCount ?: 0) + 1);
@@ -684,7 +705,7 @@ class VideoDetailView : ConstraintLayout {
                         parentComment = newComment;
                     });
             } else {
-                _container_content_replies.load(_toggleCommentType.value, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
+                _container_content_replies.load(if (_tabIndex!! == 0) false else true, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) });
             }
             switchContentView(_container_content_replies);
         };
@@ -694,11 +715,23 @@ class VideoDetailView : ConstraintLayout {
             _lastAudioSource = null;
             _lastSubtitleSource = null;
             video = null;
+            _player.clear();
             cleanupPlaybackTracker();
             Logger.i(TAG, "Keep screen on unset onClose")
             fragment.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         };
 
+        StatePlayer.instance.autoplayChanged.subscribe(this) {
+            if (it) {
+                val url = _url
+                val autoPlayVideo = _autoplayVideo
+                if (url != null && autoPlayVideo == null) {
+                    _taskLoadRecommendations.cancel()
+                    _taskLoadRecommendations.run(url)
+                }
+            }
+        }
+
         _layoutResume.setOnClickListener {
             handleSeek(_historicalPosition * 1000);
 
@@ -985,6 +1018,7 @@ class VideoDetailView : ConstraintLayout {
         _container_content_queue.cleanup();
         _container_content_description.cleanup();
         _container_content_support.cleanup();
+        StatePlayer.instance.autoplayChanged.remove(this)
         StateCasting.instance.onActiveDevicePlayChanged.remove(this);
         StateCasting.instance.onActiveDeviceTimeChanged.remove(this);
         StateCasting.instance.onActiveDeviceConnectionStateChanged.remove(this);
@@ -1022,7 +1056,6 @@ class VideoDetailView : ConstraintLayout {
         setDescription("".fixHtmlWhitespace());
         _descriptionContainer.visibility = View.GONE;
         _player.clear();
-        _textComments.visibility = View.INVISIBLE;
         _commentsList.clear();
 
         _lastVideoSource = null;
@@ -1046,7 +1079,7 @@ class VideoDetailView : ConstraintLayout {
         setLastPositionMilliseconds(_videoResumePositionMilliseconds, false);
         _addCommentView.setContext(null, null);
 
-        _toggleCommentType.setValue(false, false);
+        setTabIndex(0)
         _commentsList.clear();
 
         setEmpty();
@@ -1082,16 +1115,17 @@ class VideoDetailView : ConstraintLayout {
         this.video = null;
         cleanupPlaybackTracker();
         _searchVideo = video;
+        _autoplayVideo = null
+        Logger.i(TAG, "Autoplay video cleared (setVideoOverview)")
         _videoResumePositionMilliseconds = resumeSeconds * 1000;
         setLastPositionMilliseconds(_videoResumePositionMilliseconds, false);
         _addCommentView.setContext(null, null);
 
-        _toggleCommentType.setValue(false, false);
+        setTabIndex(null)
 
         _title.text = video.name;
         _rating.visibility = View.GONE;
         _layoutRating.visibility = View.GONE;
-        _textComments.visibility = View.VISIBLE;
 
         _minimize_title.text = video.name;
         _minimize_meta.text = video.author.name;
@@ -1170,6 +1204,10 @@ class VideoDetailView : ConstraintLayout {
     //@OptIn(ExperimentalCoroutinesApi::class)
     fun setVideoDetails(videoDetail: IPlatformVideoDetails, newVideo: Boolean = false) {
         Logger.i(TAG, "setVideoDetails (${videoDetail.name})")
+        _didTriggerDatasourceErrroCount = 0;
+        _didTriggerDatasourceError = false;
+        _autoplayVideo = null
+        Logger.i(TAG, "Autoplay video cleared (setVideoDetails)")
 
         if(newVideo && this.video?.url == videoDetail.url)
             return;
@@ -1236,18 +1274,25 @@ class VideoDetailView : ConstraintLayout {
                     }*/
                 }
                 try {
-                    val stopwatch = com.futo.platformplayer.debug.Stopwatch()
-                    var tracker = video.getPlaybackTracker()
-                    Logger.i(TAG, "video.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
+                    if(!StateApp.instance.privateMode) {
+                        val stopwatch = com.futo.platformplayer.debug.Stopwatch()
+                        var tracker = video.getPlaybackTracker()
+                        Logger.i(TAG, "video.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
 
-                    if (tracker == null) {
-                        stopwatch.reset()
-                        tracker = StatePlatform.instance.getPlaybackTracker(video.url);
-                        Logger.i(TAG, "StatePlatform.instance.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
+                        if (tracker == null) {
+                            stopwatch.reset()
+                            tracker = StatePlatform.instance.getPlaybackTracker(video.url);
+                            Logger.i(
+                                TAG,
+                                "StatePlatform.instance.getPlaybackTracker took ${stopwatch.elapsedMs}ms"
+                            )
+                        }
+
+                        if (me.video == video)
+                            me._playbackTracker = tracker;
                     }
-
-                    if(me.video == video)
-                        me._playbackTracker = tracker;
+                    else if(me.video == video)
+                        me._playbackTracker = null;
                 }
                 catch(ex: Throwable) {
                     Logger.e(TAG, "Playback tracker failed", ex);
@@ -1267,13 +1312,19 @@ class VideoDetailView : ConstraintLayout {
         _player.setMetadata(video.name, video.author.name);
 
         if (video is TutorialFragment.TutorialVideo) {
-            _toggleCommentType.setValue(false, false);
+            setTabIndex(0, true)
         } else {
-            _toggleCommentType.setValue(!Settings.instance.other.polycentricEnabled || Settings.instance.comments.defaultCommentSection == 1, false);
+            if (Settings.instance.comments.recommendationsDefault && !Settings.instance.comments.hideRecommendations) {
+                setTabIndex(2, true)
+            } else {
+                when(Settings.instance.comments.defaultCommentSection) {
+                    0 -> if(Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true);
+                    1 -> setTabIndex(1, true);
+                    2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
+                }
+            }
         }
 
-        updateCommentType(true);
-
         //UI
         _title.text = video.name;
         _channelName.text = video.author.name;
@@ -1300,6 +1351,7 @@ class VideoDetailView : ConstraintLayout {
         setDescription(video.description.fixHtmlLinks());
         _creatorThumbnail.setThumbnail(video.author.thumbnail, false);
 
+
         val cachedPolycentricProfile = PolycentricCache.instance.getCachedProfile(video.author.url, true);
         if (cachedPolycentricProfile != null) {
             setPolycentricProfile(cachedPolycentricProfile, animate = false);
@@ -1425,7 +1477,7 @@ class VideoDetailView : ConstraintLayout {
                 val historyItem = getHistoryIndex(videoDetail) ?: return@launch;
 
                 withContext(Dispatchers.Main) {
-                    _historicalPosition = StateHistory.instance.updateHistoryPosition(video,  historyItem,false, (toResume.toFloat() / 1000.0f).toLong());
+                    _historicalPosition = StateHistory.instance.updateHistoryPosition(video,  historyItem,false, (toResume.toFloat() / 1000.0f).toLong(), null, true);
                     Logger.i(TAG, "Historical position: $_historicalPosition, last position: $lastPositionMilliseconds");
                     if (_historicalPosition > 60 && video.duration - _historicalPosition > 5 && Math.abs(_historicalPosition - lastPositionMilliseconds / 1000) > 5.0) {
                         _layoutResume.visibility = View.VISIBLE;
@@ -1451,12 +1503,15 @@ class VideoDetailView : ConstraintLayout {
         StatePlayer.instance.startOrUpdateMediaSession(context, video);
         StatePlayer.instance.setCurrentlyPlaying(video);
 
+        _liveChat?.stop();
+        _liveChat = null;
         if(video.isLive && video.live != null) {
             loadLiveChat(video);
         }
         if(video.isLive && video.live == null && !video.video.videoSources.any())
             startLiveTry(video);
 
+
         _player.updateNextPrevious();
         updateMoreButtons();
 
@@ -1465,13 +1520,18 @@ class VideoDetailView : ConstraintLayout {
             _buttonMore.visibility = View.GONE
             _buttonPins.visibility = View.GONE
             _layoutRating.visibility = View.GONE
-            _layoutToggleCommentSection.visibility = View.GONE
+            _layoutChangeBottomSection.visibility = View.GONE
         } else {
             _buttonSubscribe.visibility = View.VISIBLE
             _buttonMore.visibility = View.VISIBLE
             _buttonPins.visibility = View.VISIBLE
             _layoutRating.visibility = View.VISIBLE
-            _layoutToggleCommentSection.visibility = View.VISIBLE
+            _layoutChangeBottomSection.visibility = View.VISIBLE
+        }
+
+        if (StatePlayer.instance.autoplay) {
+            _taskLoadRecommendations.cancel()
+            _taskLoadRecommendations.run(videoDetail.url)
         }
     }
     fun loadLiveChat(video: IPlatformVideoDetails) {
@@ -1582,7 +1642,6 @@ class VideoDetailView : ConstraintLayout {
                         });
                 else
                     _player.setArtwork(null);
-
                 _player.setSource(videoSource, audioSource, _playWhenReady, false);
                 if(subtitleSource != null)
                     _player.swapSubtitles(fragment.lifecycleScope, subtitleSource);
@@ -1647,6 +1706,7 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
+    private var _didTriggerDatasourceErrroCount = 0;
     private var _didTriggerDatasourceError = false;
     private fun onDataSourceError(exception: Throwable) {
         Logger.e(TAG, "onDataSourceError", exception);
@@ -1656,26 +1716,49 @@ class VideoDetailView : ConstraintLayout {
                 return;
             val config = currentVideo.sourceConfig;
 
-            if(!_didTriggerDatasourceError) {
+            if(_didTriggerDatasourceErrroCount <= 3) {
                 _didTriggerDatasourceError = true;
+                _didTriggerDatasourceErrroCount++;
 
+                UIDialogs.toast("Block detected, attempting bypass");
+                //return;
+                fragment.lifecycleScope.launch(Dispatchers.IO) {
+                    val newDetails = StatePlatform.instance.getContentDetails(currentVideo.url, true).await();
+                    val previousVideoSource = _lastVideoSource;
+                    val previousAudioSource = _lastAudioSource;
+
+                    if(newDetails is IPlatformVideoDetails) {
+                        val newVideoSource = if(previousVideoSource != null)
+                            VideoHelper.selectBestVideoSource(newDetails.video, previousVideoSource.height * previousVideoSource.width, FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS);
+                        else null;
+                        val newAudioSource = if(previousAudioSource != null)
+                            VideoHelper.selectBestAudioSource(newDetails.video, FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS, previousAudioSource.language, previousAudioSource.bitrate.toLong());
+                        else null;
+                        withContext(Dispatchers.Main) {
+                            video = newDetails;
+                            _player.setSource(newVideoSource, newAudioSource, true, true);
+                        }
+                    }
+                }
+            }
+            else if(_didTriggerDatasourceErrroCount > 3) {
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred,
                     context.getString(R.string.media_error),
                     context.getString(R.string.the_media_source_encountered_an_unauthorized_error_this_might_be_solved_by_a_plugin_reload_would_you_like_to_reload_experimental),
                     null,
                     0,
-                        UIDialogs.Action(context.getString(R.string.no), { _didTriggerDatasourceError = false }),
-                        UIDialogs.Action(context.getString(R.string.yes), {
-                            fragment.lifecycleScope.launch(Dispatchers.IO) {
-                                try {
-                                    StatePlatform.instance.reloadClient(context, config.id);
-                                    reloadVideo();
-                                } catch (e: Throwable) {
-                                    Logger.e(TAG, "Failed to reload video.", e)
-                                }
+                    UIDialogs.Action(context.getString(R.string.no), { _didTriggerDatasourceError = false }),
+                    UIDialogs.Action(context.getString(R.string.yes), {
+                        fragment.lifecycleScope.launch(Dispatchers.IO) {
+                            try {
+                                StatePlatform.instance.reloadClient(context, config.id);
+                                reloadVideo();
+                            } catch (e: Throwable) {
+                                Logger.e(TAG, "Failed to reload video.", e)
                             }
-                        }, UIDialogs.ActionStyle.PRIMARY)
-                    );
+                        }
+                    }, UIDialogs.ActionStyle.PRIMARY)
+                );
             }
         }
     }
@@ -1718,6 +1801,14 @@ class VideoDetailView : ConstraintLayout {
     fun nextVideo(forceLoop: Boolean = false, withoutRemoval: Boolean = false, bypassVideoLoop: Boolean = false): Boolean {
         Logger.i(TAG, "nextVideo")
         var next = StatePlayer.instance.nextQueueItem(withoutRemoval || _player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9, bypassVideoLoop);
+        val autoplayVideo = _autoplayVideo
+        if (next == null && autoplayVideo != null && StatePlayer.instance.autoplay) {
+            Logger.i(TAG, "Found autoplay video!")
+            StatePlayer.instance.setAutoplayed(autoplayVideo.url)
+            next = autoplayVideo
+        }
+        _autoplayVideo = null
+        Logger.i(TAG, "Autoplay video cleared (nextVideo)")
         if(next == null && forceLoop)
             next = StatePlayer.instance.restartQueue();
         if(next != null) {
@@ -1772,19 +1863,21 @@ class VideoDetailView : ConstraintLayout {
             }
         }
 
-        val bestVideoSources = (videoSources?.map { it.height * it.width }
+        val doDedup = Settings.instance.playback.simplifySources;
+
+        val bestVideoSources = if(doDedup) (videoSources?.map { it.height * it.width }
             ?.distinct()
             ?.map { x -> VideoHelper.selectBestVideoSource(videoSources.filter { x == it.height * it.width }, -1, FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) }
             ?.plus(videoSources.filter { it is IHLSManifestSource || it is IDashManifestSource }))
             ?.distinct()
             ?.filter { it != null }
-            ?.toList() ?: listOf();
+            ?.toList() ?: listOf() else videoSources?.toList() ?: listOf()
         val bestAudioContainer = audioSources?.let { VideoHelper.selectBestAudioSource(it, FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS)?.container };
-        val bestAudioSources = audioSources
+        val bestAudioSources = if(doDedup) audioSources
             ?.filter { it.container == bestAudioContainer }
             ?.plus(audioSources.filter { it is IHLSManifestAudioSource || it is IDashManifestSource })
             ?.distinct()
-            ?.toList() ?: listOf();
+            ?.toList() ?: listOf() else audioSources?.toList() ?: listOf();
 
         val canSetSpeed = !_isCasting || StateCasting.instance.activeDevice?.canSetSpeed == true
         val currentPlaybackRate = if (_isCasting) StateCasting.instance.activeDevice?.speed else _player.getPlaybackRate()
@@ -1813,40 +1906,56 @@ class VideoDetailView : ConstraintLayout {
                 SlideUpMenuGroup(this.context, context.getString(R.string.offline_video), "video",
                     *localVideoSources
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it,
-                                { handleSelectVideoTrack(it) });
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_movie,
+                                it.name,
+                                "${it.width}x${it.height}",
+                                tag = it,
+                                call = { handleSelectVideoTrack(it) });
                         }.toList().toTypedArray())
             else null,
             if(localAudioSource?.isNotEmpty() == true)
                 SlideUpMenuGroup(this.context, context.getString(R.string.offline_audio), "audio",
                     *localAudioSource
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_music, it.name, it.bitrate.toHumanBitrate(), it,
-                                { handleSelectAudioTrack(it) });
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_music,
+                                it.name,
+                                it.bitrate.toHumanBitrate(),
+                                tag = it,
+                                call = { handleSelectAudioTrack(it) });
                         }.toList().toTypedArray())
             else null,
             if(localSubtitleSources?.isNotEmpty() == true)
                 SlideUpMenuGroup(this.context, context.getString(R.string.offline_subtitles), "subtitles",
                     *localSubtitleSources
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_edit, it.name, "", it,
-                                { handleSelectSubtitleTrack(it) })
+                            SlideUpMenuItem(this.context, R.drawable.ic_edit, it.name, "", tag = it,
+                                call = { handleSelectSubtitleTrack(it) })
                         }.toList().toTypedArray())
             else null,
             if(liveStreamVideoFormats?.isEmpty() == false)
                 SlideUpMenuGroup(this.context, context.getString(R.string.stream_video), "video",
                     *liveStreamVideoFormats
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_movie, it.label ?: it.containerMimeType ?: it.bitrate.toString(), "${it.width}x${it.height}", it,
-                                { _player.selectVideoTrack(it.height) });
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_movie,
+                                it.label ?: it.containerMimeType ?: it.bitrate.toString(),
+                                "${it.width}x${it.height}",
+                                tag = it,
+                                call = { _player.selectVideoTrack(it.height) });
                         }.toList().toTypedArray())
             else null,
             if(liveStreamAudioFormats?.isEmpty() == false)
                 SlideUpMenuGroup(this.context, context.getString(R.string.stream_audio), "audio",
                     *liveStreamAudioFormats
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_music, "${it.label ?: it.containerMimeType} ${it.bitrate}", "", it,
-                                { _player.selectAudioTrack(it.bitrate) });
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_music,
+                                "${it.label ?: it.containerMimeType} ${it.bitrate}",
+                                "",
+                                tag = it,
+                                call = { _player.selectAudioTrack(it.bitrate) });
                         }.toList().toTypedArray())
             else null,
 
@@ -1854,24 +1963,38 @@ class VideoDetailView : ConstraintLayout {
                 SlideUpMenuGroup(this.context, context.getString(R.string.video), "video",
                     *bestVideoSources
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_movie, it!!.name, if (it.width > 0 && it.height > 0) "${it.width}x${it.height}" else "", it,
-                                { handleSelectVideoTrack(it) });
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_movie,
+                                it!!.name,
+                                if (it.width > 0 && it.height > 0) "${it.width}x${it.height}" else "",
+                                (prefix + it.codec.trim()).trim(),
+                                tag = it,
+                                call = { handleSelectVideoTrack(it) });
                         }.toList().toTypedArray())
             else null,
             if(bestAudioSources.isNotEmpty())
                 SlideUpMenuGroup(this.context, context.getString(R.string.audio), "audio",
                     *bestAudioSources
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_music, it.name, it.bitrate.toHumanBitrate(), it,
-                                { handleSelectAudioTrack(it) });
+                            val estSize = VideoHelper.estimateSourceSize(it);
+                            val prefix = if(estSize > 0) "±" + estSize.toHumanBytesSize() + " " else "";
+                            SlideUpMenuItem(this.context,
+                                R.drawable.ic_music,
+                                it.name,
+                                it.bitrate.toHumanBitrate(),
+                                (prefix + it.codec.trim()).trim(),
+                                tag = it,
+                                call = { handleSelectAudioTrack(it) });
                         }.toList().toTypedArray())
             else null,
             if(video?.subtitles?.isNotEmpty() == true)
                 SlideUpMenuGroup(this.context, context.getString(R.string.subtitles), "subtitles",
                     *video.subtitles
                         .map {
-                            SlideUpMenuItem(this.context, R.drawable.ic_edit, it.name, "", it,
-                                { handleSelectSubtitleTrack(it) })
+                            SlideUpMenuItem(this.context, R.drawable.ic_edit, it.name, "", tag = it,
+                                call = { handleSelectSubtitleTrack(it) })
                         }.toList().toTypedArray())
             else null);
     }
@@ -2203,24 +2326,93 @@ class VideoDetailView : ConstraintLayout {
         };
     }
 
-    private fun updateCommentType(reloadComments: Boolean) {
-        if (_toggleCommentType.value) {
-            _textCommentType.text = "Platform";
-            _addCommentView.visibility = View.GONE;
+    private fun setTabIndex(index: Int?, forceReload: Boolean = false) {
+        Logger.i(TAG, "setTabIndex (index: ${index}, forceReload: ${forceReload})")
+        val changed = _tabIndex != index || forceReload
+        if (!changed) {
+            return
+        }
 
-            if (reloadComments) {
-                fetchComments();
-            }
-        } else {
-            _textCommentType.text = "Polycentric";
-            _addCommentView.visibility = View.VISIBLE;
+        val recommendationsHidden = Settings.instance.comments.hideRecommendations
+        _buttonRecommended.visibility = if (recommendationsHidden) View.GONE else View.VISIBLE
 
-            if (reloadComments) {
-                fetchPolycentricComments()
-            }
+        _taskLoadRecommendations.cancel()
+        _tabIndex = index
+        _buttonRecommended.setTextColor(resources.getColor(if (index == 2) R.color.white else R.color.gray_ac))
+        _buttonPlatform.setTextColor(resources.getColor(if (index == 1) R.color.white else R.color.gray_ac))
+        _buttonPolycentric.setTextColor(resources.getColor(if (index == 0) R.color.white else R.color.gray_ac))
+        _layoutRecommended.removeAllViews()
+
+        if (index == null) {
+            _addCommentView.visibility = View.GONE
+            _commentsList.clear()
+            _layoutRecommended.visibility = View.GONE
+        } else if (index == 0) {
+            _addCommentView.visibility = View.VISIBLE
+            _layoutRecommended.visibility = View.GONE
+            fetchPolycentricComments()
+        } else if (index == 1) {
+            _addCommentView.visibility = View.GONE
+            _layoutRecommended.visibility = View.GONE
+            fetchComments()
+        } else if (index == 2) {
+            _addCommentView.visibility = View.GONE
+            _layoutRecommended.visibility = View.VISIBLE
+            _commentsList.clear()
+
+            _layoutRecommended.addView(LoaderView(context).apply {
+                layoutParams = LinearLayout.LayoutParams(60.dp(resources), 60.dp(resources))
+                start()
+            })
+            _taskLoadRecommendations.run(null)
         }
     }
 
+    private fun setRecommendations(results: List<IPlatformVideo>?, message: String? = null) {
+        if (results != null && StatePlayer.instance.autoplay) {
+            _autoplayVideo = results.firstOrNull { !StatePlayer.instance.wasAutoplayed(it.url) }
+            Logger.i(TAG, "Autoplay video set (url = ${_autoplayVideo?.url})")
+        }
+
+        if (_tabIndex == 2) {
+            _layoutRecommended.removeAllViews()
+            if (results == null || results.isEmpty()) {
+                _layoutRecommended.addView(TextView(context).apply {
+                    layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply {
+                        setMargins(20.dp(resources), 20.dp(resources), 20.dp(resources), 20.dp(resources))
+                    }
+                    textAlignment = TEXT_ALIGNMENT_CENTER
+                    textSize = 14.0f
+                    text = message
+                })
+                return
+            }
+
+            for (result in results) {
+                _layoutRecommended.addView(PreviewVideoView(context, FeedStyle.THUMBNAIL, null, false).apply {
+                    layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+                    bind(result)
+
+                    hideAddTo()
+
+                    onVideoClicked.subscribe { video, _ ->
+                        fragment.navigate<VideoDetailFragment>(video).maximizeVideoDetail()
+                    }
+
+                    onChannelClicked.subscribe {
+                        fragment.navigate<ChannelFragment>(it)
+                    }
+
+                    onAddToWatchLaterClicked.subscribe(this) {
+                        if(it is IPlatformVideo) {
+                            StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(it));
+                            UIDialogs.toast("Added to watch later\n[${it.name}]");
+                        }
+                    }
+                })
+            }
+        }
+    }
 
     //Picture2Picture
     fun startPictureInPicture() {
@@ -2305,13 +2497,22 @@ class VideoDetailView : ConstraintLayout {
             if (v !is TutorialFragment.TutorialVideo) {
                 fragment.lifecycleScope.launch(Dispatchers.IO) {
                     val history = getHistoryIndex(v) ?: return@launch;
-                    StateHistory.instance.updateHistoryPosition(v, history, true, (positionMilliseconds.toFloat() / 1000.0f).toLong());
+                    StateHistory.instance.updateHistoryPosition(v, history, true, (positionMilliseconds.toFloat() / 1000.0f).toLong(), null, true);
                 }
             }
             _lastPositionSaveTime = currentTime;
         }
 
         updateTracker(positionMilliseconds, isPlaying, false);
+
+        if(StateDeveloper.instance.isPlaybackTesting) {
+            if((positionMilliseconds > 1000 * 65 || positionMilliseconds > (video!!.duration * 1000 - 1000))) {
+                StateDeveloper.instance.testPlayback();
+            }
+            else if(video!!.duration > 70 && positionMilliseconds < 10000) {
+                handleSeek(55000);
+            }
+        }
     }
 
     private fun updateTracker(positionMs: Long, isPlaying: Boolean, forceUpdate: Boolean = false) {
@@ -2487,7 +2688,7 @@ class VideoDetailView : ConstraintLayout {
                     }
                     if(!didLogin)
                         UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, "Failed to login");
-                }));
+                }, UIDialogs.ActionStyle.PRIMARY));
         }
         .exception<ContentNotAvailableYetException> {
             Logger.w(TAG, "exception<ContentNotAvailableYetException>", it)
@@ -2557,6 +2758,21 @@ class VideoDetailView : ConstraintLayout {
             }
         } else TaskHandler(IPlatformVideoDetails::class.java, {fragment.lifecycleScope});
 
+    private val _taskLoadRecommendations = TaskHandler<String?, IPager<IPlatformContent>?>(StateApp.instance.scopeGetter, {
+        video?.let { v ->
+            if (v is VideoLocal) {
+                StatePlatform.instance.getContentRecommendations(v.url)
+            } else {
+                video?.getContentRecommendations(StatePlatform.instance.getContentClient(v.url))
+            }
+        }
+    })
+        .success { setRecommendations(it?.getResults()?.filter { it is IPlatformVideo }?.map { it as IPlatformVideo }, "No recommendations found") }
+        .exception<Throwable> {
+            setRecommendations(null, it.message)
+            Logger.w(TAG, "Failed to load recommendations.", it);
+        };
+
     private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(StateApp.instance.scopeGetter, { PolycentricCache.instance.getProfileAsync(it) })
         .success { it -> setPolycentricProfile(it, animate = true) }
         .exception<Throwable> {

app/src/main/java/com/futo/platformplayer/helpers/VideoHelper.kt

@@ -20,6 +20,9 @@ import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSAudioUrlRangeSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.Language
@@ -44,8 +47,8 @@ class VideoHelper {
             return false
         }
 
-        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource || source is IHLSManifestSource;
-        fun isDownloadable(source: IAudioSource) = (source is IAudioUrlSource || source is IHLSManifestAudioSource) && source !is IAudioUrlWidevineSource
+        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource || source is IHLSManifestSource || source is JSDashManifestRawSource;
+        fun isDownloadable(source: IAudioSource) = (source is IAudioUrlSource || source is IHLSManifestAudioSource || source is JSDashManifestRawAudioSource) && source !is IAudioUrlWidevineSource
 
         fun selectBestVideoSource(desc: IVideoSourceDescriptor, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? = selectBestVideoSource(desc.videoSources.toList(), desiredPixelCount, prefContainers);
         fun selectBestVideoSource(sources: Iterable<IVideoSource>, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? {
@@ -127,7 +130,7 @@ class VideoHelper {
         }
 
         @OptIn(UnstableApi::class)
-        fun convertItagSourceToChunkedDashSource(videoSource: JSVideoUrlRangeSource) : MediaSource {
+        fun convertItagSourceToChunkedDashSource(videoSource: JSVideoUrlRangeSource) : Pair<MediaSource, String> {
             val urlToUse = videoSource.getVideoUrl();
             val manifestConfig = ProgressiveDashManifestCreator.fromVideoProgressiveStreamingUrl(urlToUse,
                 videoSource.duration * 1000,
@@ -145,10 +148,10 @@ class VideoHelper {
             );
 
             val manifest = DashManifestParser().parse(Uri.parse(""), manifestConfig.byteInputStream());
-            return DashMediaSource.Factory(ResolvingDataSource.Factory(videoSource.getHttpDataSourceFactory(), ResolvingDataSource.Resolver { dataSpec ->
+            return Pair(DashMediaSource.Factory(ResolvingDataSource.Factory(videoSource.getHttpDataSourceFactory(), ResolvingDataSource.Resolver { dataSpec ->
                 Logger.v("PLAYBACK", "Video REQ Range [" + dataSpec.position + "-" + (dataSpec.position + dataSpec.length) + "](" + dataSpec.length + ")", null);
                 return@Resolver dataSpec;
-            })).createMediaSource(manifest, MediaItem.Builder().setUri(Uri.parse(videoSource.getVideoUrl())).build())
+            })).createMediaSource(manifest, MediaItem.Builder().setUri(Uri.parse(videoSource.getVideoUrl())).build()), manifestConfig);
         }
 
         fun getMediaMetadata(media: IPlatformVideoDetails): MediaMetadata {
@@ -186,5 +189,25 @@ class VideoHelper {
                 return@Resolver dataSpec;
             })).createMediaSource(manifest, MediaItem.Builder().setUri(Uri.parse(audioSource.getAudioUrl())).build())
         }
+
+
+        fun estimateSourceSize(source: IVideoSource?): Int {
+            if(source == null) return 0;
+            if(source is IVideoSource) {
+                if(source.bitrate ?: 0 <= 0 || source.duration.toInt() == 0)
+                    return 0;
+                return (source.duration / 8).toInt() * source.bitrate!!;
+            }
+            else return 0;
+        }
+        fun estimateSourceSize(source: IAudioSource?): Int {
+            if(source == null) return 0;
+            if(source is IAudioSource) {
+                if(source.bitrate <= 0 || source.duration?.toInt() ?: 0 == 0)
+                    return 0;
+                return (source.duration!! / 8).toInt() * source.bitrate;
+            }
+            else return 0;
+        }
     }
 }

app/src/main/java/com/futo/platformplayer/listeners/AutoRotateChangeListener.kt

@@ -0,0 +1,42 @@
+package com.futo.platformplayer.listeners
+
+import android.content.Context
+import android.database.ContentObserver
+import android.os.Handler
+import android.provider.Settings
+
+class AutoRotateObserver(handler: Handler, private val onChangeCallback: () -> Unit) : ContentObserver(handler) {
+    override fun onChange(selfChange: Boolean) {
+        super.onChange(selfChange)
+        onChangeCallback()
+    }
+}
+
+class AutoRotateChangeListener(context: Context, handler: Handler, private val onAutoRotateChanged: (Boolean) -> Unit) {
+
+    private val contentResolver = context.contentResolver
+    private val autoRotateObserver = AutoRotateObserver(handler) {
+        val isAutoRotateEnabled = isAutoRotateEnabled()
+        onAutoRotateChanged(isAutoRotateEnabled)
+    }
+
+    init {
+        contentResolver.registerContentObserver(
+            Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
+            false,
+            autoRotateObserver
+        )
+    }
+
+    fun unregister() {
+        contentResolver.unregisterContentObserver(autoRotateObserver)
+    }
+
+    private fun isAutoRotateEnabled(): Boolean {
+        return Settings.System.getInt(
+            contentResolver,
+            Settings.System.ACCELEROMETER_ROTATION,
+            0
+        ) == 1
+    }
+}

app/src/main/java/com/futo/platformplayer/listeners/OrientationManager.kt

@@ -1,56 +0,0 @@
-package com.futo.platformplayer.listeners
-
-import android.content.Context
-import android.view.OrientationEventListener
-import com.futo.platformplayer.Settings
-import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.logging.Logger
-
-class OrientationManager : OrientationEventListener {
-
-    val onOrientationChanged = Event1<Orientation>();
-
-    var orientation : Orientation = Orientation.PORTRAIT;
-
-    constructor(context: Context) : super(context) { }
-
-    //TODO: Something weird is going on here
-    //TODO: Old implementation felt pretty good for me, but now with 0 deadzone still feels bad, even though code should be identical?
-    override fun onOrientationChanged(orientationAnglep: Int) {
-        if (orientationAnglep == -1) return
-
-        val deadZone = Settings.instance.playback.getAutoRotateDeadZoneDegrees()
-        val isInDeadZone = when (orientation) {
-            Orientation.PORTRAIT -> orientationAnglep in 0 until (60 - deadZone) || orientationAnglep in (300 + deadZone) .. 360
-            Orientation.REVERSED_LANDSCAPE -> orientationAnglep in (60 + deadZone) until (140 - deadZone)
-            Orientation.REVERSED_PORTRAIT -> orientationAnglep in (140 + deadZone) until (220 - deadZone)
-            Orientation.LANDSCAPE -> orientationAnglep in (220 + deadZone) until (300 - deadZone)
-        }
-
-        if (isInDeadZone) {
-            return;
-        }
-
-        val newOrientation = when (orientationAnglep) {
-            in 60 until 140 -> Orientation.REVERSED_LANDSCAPE
-            in 140 until 220 -> Orientation.REVERSED_PORTRAIT
-            in 220 until 300 -> Orientation.LANDSCAPE
-            else -> Orientation.PORTRAIT
-        }
-
-        Logger.i("OrientationManager", "Orientation=$newOrientation orientationAnglep=$orientationAnglep");
-
-        if (newOrientation != orientation) {
-            orientation = newOrientation
-            onOrientationChanged.emit(newOrientation)
-        }
-    }
-
-    //TODO: Perhaps just use ActivityInfo orientations instead..
-    enum class Orientation {
-        PORTRAIT,
-        LANDSCAPE,
-        REVERSED_PORTRAIT,
-        REVERSED_LANDSCAPE
-    }
-}

app/src/main/java/com/futo/platformplayer/mdns/BroadcastService.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.mdns
+
+data class BroadcastService(
+    val deviceName: String,
+    val serviceName: String,
+    val port: UShort,
+    val ttl: UInt,
+    val weight: UShort,
+    val priority: UShort,
+    val texts: List<String>? = null
+)

app/src/main/java/com/futo/platformplayer/mdns/DnsPacket.kt

@@ -0,0 +1,93 @@
+package com.futo.platformplayer.mdns
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+enum class QueryResponse(val value: Byte) {
+    Query(0),
+    Response(1)
+}
+
+enum class DnsOpcode(val value: Byte) {
+    StandardQuery(0),
+    InverseQuery(1),
+    ServerStatusRequest(2)
+}
+
+enum class DnsResponseCode(val value: Byte) {
+    NoError(0),
+    FormatError(1),
+    ServerFailure(2),
+    NameError(3),
+    NotImplemented(4),
+    Refused(5)
+}
+
+data class DnsPacketHeader(
+    val identifier: UShort,
+    val queryResponse: Int,
+    val opcode: Int,
+    val authoritativeAnswer: Boolean,
+    val truncated: Boolean,
+    val recursionDesired: Boolean,
+    val recursionAvailable: Boolean,
+    val answerAuthenticated: Boolean,
+    val nonAuthenticatedData: Boolean,
+    val responseCode: DnsResponseCode
+)
+
+data class DnsPacket(
+    val header: DnsPacketHeader,
+    val questions: List<DnsQuestion>,
+    val answers: List<DnsResourceRecord>,
+    val authorities: List<DnsResourceRecord>,
+    val additionals: List<DnsResourceRecord>
+) {
+    companion object {
+        fun parse(data: ByteArray): DnsPacket {
+            val span = data.asUByteArray()
+            val flags = (span[2].toInt() shl 8 or span[3].toInt()).toUShort()
+            val questionCount = (span[4].toInt() shl 8 or span[5].toInt()).toUShort()
+            val answerCount = (span[6].toInt() shl 8 or span[7].toInt()).toUShort()
+            val authorityCount = (span[8].toInt() shl 8 or span[9].toInt()).toUShort()
+            val additionalCount = (span[10].toInt() shl 8 or span[11].toInt()).toUShort()
+
+            var position = 12
+
+            val questions = List(questionCount.toInt()) {
+                DnsQuestion.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val answers = List(answerCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val authorities = List(authorityCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            val additionals = List(additionalCount.toInt()) {
+                DnsResourceRecord.parse(data, position).also { position = it.second }
+            }.map { it.first }
+
+            return DnsPacket(
+                header = DnsPacketHeader(
+                    identifier = (span[0].toInt() shl 8 or span[1].toInt()).toUShort(),
+                    queryResponse = ((flags.toUInt() shr 15) and 0b1u).toInt(),
+                    opcode = ((flags.toUInt() shr 11) and 0b1111u).toInt(),
+                    authoritativeAnswer = (flags.toInt() shr 10) and 0b1 != 0,
+                    truncated = (flags.toInt() shr 9) and 0b1 != 0,
+                    recursionDesired = (flags.toInt() shr 8) and 0b1 != 0,
+                    recursionAvailable = (flags.toInt() shr 7) and 0b1 != 0,
+                    answerAuthenticated = (flags.toInt() shr 5) and 0b1 != 0,
+                    nonAuthenticatedData = (flags.toInt() shr 4) and 0b1 != 0,
+                    responseCode = DnsResponseCode.entries[flags.toInt() and 0b1111]
+                ),
+                questions = questions,
+                answers = answers,
+                authorities = authorities,
+                additionals = additionals
+            )
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsQuestion.kt

@@ -0,0 +1,110 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+
+enum class QuestionType(val value: UShort) {
+    A(1u),
+    NS(2u),
+    MD(3u),
+    MF(4u),
+    CNAME(5u),
+    SOA(6u),
+    MB(7u),
+    MG(8u),
+    MR(9u),
+    NULL(10u),
+    WKS(11u),
+    PTR(12u),
+    HINFO(13u),
+    MINFO(14u),
+    MX(15u),
+    TXT(16u),
+    RP(17u),
+    AFSDB(18u),
+    SIG(24u),
+    KEY(25u),
+    AAAA(28u),
+    LOC(29u),
+    SRV(33u),
+    NAPTR(35u),
+    KX(36u),
+    CERT(37u),
+    DNAME(39u),
+    APL(42u),
+    DS(43u),
+    SSHFP(44u),
+    IPSECKEY(45u),
+    RRSIG(46u),
+    NSEC(47u),
+    DNSKEY(48u),
+    DHCID(49u),
+    NSEC3(50u),
+    NSEC3PARAM(51u),
+    TSLA(52u),
+    SMIMEA(53u),
+    HIP(55u),
+    CDS(59u),
+    CDNSKEY(60u),
+    OPENPGPKEY(61u),
+    CSYNC(62u),
+    ZONEMD(63u),
+    SVCB(64u),
+    HTTPS(65u),
+    EUI48(108u),
+    EUI64(109u),
+    TKEY(249u),
+    TSIG(250u),
+    URI(256u),
+    CAA(257u),
+    TA(32768u),
+    DLV(32769u),
+    AXFR(252u),
+    IXFR(251u),
+    OPT(41u),
+    MAILB(253u),
+    MALA(254u),
+    All(252u)
+}
+
+enum class QuestionClass(val value: UShort) {
+    IN(1u),
+    CS(2u),
+    CH(3u),
+    HS(4u),
+    All(255u)
+}
+
+data class DnsQuestion(
+    override val name: String,
+    override val type: Int,
+    override val clazz: Int,
+    val queryUnicast: Boolean
+) : DnsResourceRecordBase(name, type, clazz) {
+    companion object {
+        fun parse(data: ByteArray, startPosition: Int): Pair<DnsQuestion, Int> {
+            val span = data.asUByteArray()
+            var position = startPosition
+            val qname = span.readDomainName(position).also { position = it.second }
+            val qtype = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val qclass = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+
+            return DnsQuestion(
+                name = qname.first,
+                type = qtype.toInt(),
+                queryUnicast = ((qclass.toInt() shr 15) and 0b1) != 0,
+                clazz = qclass.toInt() and 0b111111111111111
+            ) to position
+        }
+    }
+}
+
+open class DnsResourceRecordBase(
+    open val name: String,
+    open val type: Int,
+    open val clazz: Int
+)

app/src/main/java/com/futo/platformplayer/mdns/DnsReader.kt

@@ -0,0 +1,514 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.charset.StandardCharsets
+import kotlin.math.pow
+import java.net.InetAddress
+
+data class PTRRecord(val domainName: String)
+
+data class ARecord(val address: InetAddress)
+
+data class AAAARecord(val address: InetAddress)
+
+data class MXRecord(val preference: UShort, val exchange: String)
+
+data class CNAMERecord(val cname: String)
+
+data class TXTRecord(val texts: List<String>)
+
+data class SOARecord(
+    val primaryNameServer: String,
+    val responsibleAuthorityMailbox: String,
+    val serialNumber: Int,
+    val refreshInterval: Int,
+    val retryInterval: Int,
+    val expiryLimit: Int,
+    val minimumTTL: Int
+)
+
+data class SRVRecord(val priority: UShort, val weight: UShort, val port: UShort, val target: String)
+
+data class NSRecord(val nameServer: String)
+
+data class CAARecord(val flags: Byte, val tag: String, val value: String)
+
+data class HINFORecord(val cpu: String, val os: String)
+
+data class RPRecord(val mailbox: String, val txtDomainName: String)
+
+
+data class AFSDBRecord(val subtype: UShort, val hostname: String)
+data class LOCRecord(
+    val version: Byte,
+    val size: Double,
+    val horizontalPrecision: Double,
+    val verticalPrecision: Double,
+    val latitude: Double,
+    val longitude: Double,
+    val altitude: Double
+) {
+    companion object {
+        fun decodeSizeOrPrecision(coded: Byte): Double {
+            val baseValue = (coded.toInt() shr 4) and 0x0F
+            val exponent = coded.toInt() and 0x0F
+            return baseValue * 10.0.pow(exponent.toDouble())
+        }
+
+        fun decodeLatitudeOrLongitude(coded: Int): Double {
+            val arcSeconds = coded / 1E3
+            return arcSeconds / 3600.0
+        }
+
+        fun decodeAltitude(coded: Int): Double {
+            return (coded / 100.0) - 100000.0
+        }
+    }
+}
+
+data class NAPTRRecord(
+    val order: UShort,
+    val preference: UShort,
+    val flags: String,
+    val services: String,
+    val regexp: String,
+    val replacement: String
+)
+
+data class RRSIGRecord(
+    val typeCovered: UShort,
+    val algorithm: Byte,
+    val labels: Byte,
+    val originalTTL: UInt,
+    val signatureExpiration: UInt,
+    val signatureInception: UInt,
+    val keyTag: UShort,
+    val signersName: String,
+    val signature: ByteArray
+)
+
+data class KXRecord(val preference: UShort, val exchanger: String)
+
+data class CERTRecord(val type: UShort, val keyTag: UShort, val algorithm: Byte, val certificate: ByteArray)
+
+
+
+data class DNAMERecord(val target: String)
+
+data class DSRecord(val keyTag: UShort, val algorithm: Byte, val digestType: Byte, val digest: ByteArray)
+
+data class SSHFPRecord(val algorithm: Byte, val fingerprintType: Byte, val fingerprint: ByteArray)
+
+data class TLSARecord(val usage: Byte, val selector: Byte, val matchingType: Byte, val certificateAssociationData: ByteArray)
+
+data class SMIMEARecord(val usage: Byte, val selector: Byte, val matchingType: Byte, val certificateAssociationData: ByteArray)
+
+data class URIRecord(val priority: UShort, val weight: UShort, val target: String)
+
+data class NSECRecord(val ownerName: String, val typeBitMaps: List<Pair<Byte, ByteArray>>)
+data class NSEC3Record(
+    val hashAlgorithm: Byte,
+    val flags: Byte,
+    val iterations: UShort,
+    val salt: ByteArray,
+    val nextHashedOwnerName: ByteArray,
+    val typeBitMaps: List<UShort>
+)
+
+data class NSEC3PARAMRecord(val hashAlgorithm: Byte, val flags: Byte, val iterations: UShort, val salt: ByteArray)
+data class SPFRecord(val texts: List<String>)
+data class TKEYRecord(
+    val algorithm: String,
+    val inception: UInt,
+    val expiration: UInt,
+    val mode: UShort,
+    val error: UShort,
+    val keyData: ByteArray,
+    val otherData: ByteArray
+)
+
+data class TSIGRecord(
+    val algorithmName: String,
+    val timeSigned: UInt,
+    val fudge: UShort,
+    val mac: ByteArray,
+    val originalID: UShort,
+    val error: UShort,
+    val otherData: ByteArray
+)
+
+data class OPTRecordOption(val code: UShort, val data: ByteArray)
+data class OPTRecord(val options: List<OPTRecordOption>)
+
+class DnsReader(private val data: ByteArray, private var position: Int = 0, private val length: Int = data.size) {
+
+    private val endPosition: Int = position + length
+
+    fun readDomainName(): String {
+        return data.asUByteArray().readDomainName(position).also { position = it.second }.first
+    }
+
+    fun readDouble(): Double {
+        checkRemainingBytes(Double.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Double.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).double
+        position += Double.SIZE_BYTES
+        return result
+    }
+
+    fun readInt16(): Short {
+        checkRemainingBytes(Short.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).short
+        position += Short.SIZE_BYTES
+        return result
+    }
+
+    fun readInt32(): Int {
+        checkRemainingBytes(Int.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).int
+        position += Int.SIZE_BYTES
+        return result
+    }
+
+    fun readInt64(): Long {
+        checkRemainingBytes(Long.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).long
+        position += Long.SIZE_BYTES
+        return result
+    }
+
+    fun readSingle(): Float {
+        checkRemainingBytes(Float.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Float.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).float
+        position += Float.SIZE_BYTES
+        return result
+    }
+
+    fun readByte(): Byte {
+        checkRemainingBytes(Byte.SIZE_BYTES)
+        return data[position++]
+    }
+
+    fun readBytes(length: Int): ByteArray {
+        checkRemainingBytes(length)
+        return ByteArray(length).also { data.copyInto(it, startIndex = position, endIndex = position + length) }
+            .also { position += length }
+    }
+
+    fun readUInt16(): UShort {
+        checkRemainingBytes(Short.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).short.toUShort()
+        position += Short.SIZE_BYTES
+        return result
+    }
+
+    fun readUInt32(): UInt {
+        checkRemainingBytes(Int.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).int.toUInt()
+        position += Int.SIZE_BYTES
+        return result
+    }
+
+    fun readUInt64(): ULong {
+        checkRemainingBytes(Long.SIZE_BYTES)
+        val result = ByteBuffer.wrap(data, position, Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).long.toULong()
+        position += Long.SIZE_BYTES
+        return result
+    }
+
+    fun readString(): String {
+        val length = data[position++].toInt()
+        checkRemainingBytes(length)
+        return String(data, position, length, StandardCharsets.UTF_8).also { position += length }
+    }
+
+    private fun checkRemainingBytes(requiredBytes: Int) {
+        if (position + requiredBytes > endPosition) throw IndexOutOfBoundsException()
+    }
+
+    fun readRPRecord(): RPRecord {
+        return RPRecord(readDomainName(), readDomainName())
+    }
+
+    fun readKXRecord(): KXRecord {
+        val preference = readUInt16()
+        val exchanger = readDomainName()
+        return KXRecord(preference, exchanger)
+    }
+
+    fun readCERTRecord(): CERTRecord {
+        val type = readUInt16()
+        val keyTag = readUInt16()
+        val algorithm = readByte()
+        val certificateLength = readUInt16().toInt() - 5
+        val certificate = readBytes(certificateLength)
+        return CERTRecord(type, keyTag, algorithm, certificate)
+    }
+
+    fun readPTRRecord(): PTRRecord {
+        return PTRRecord(readDomainName())
+    }
+
+    fun readARecord(): ARecord {
+        val address = readBytes(4)
+        return ARecord(InetAddress.getByAddress(address))
+    }
+
+    fun readAAAARecord(): AAAARecord {
+        val address = readBytes(16)
+        return AAAARecord(InetAddress.getByAddress(address))
+    }
+
+    fun readMXRecord(): MXRecord {
+        val preference = readUInt16()
+        val exchange = readDomainName()
+        return MXRecord(preference, exchange)
+    }
+
+    fun readCNAMERecord(): CNAMERecord {
+        return CNAMERecord(readDomainName())
+    }
+
+    fun readTXTRecord(): TXTRecord {
+        val texts = mutableListOf<String>()
+        while (position < endPosition) {
+            val textLength = data[position++].toInt()
+            checkRemainingBytes(textLength)
+            val text = String(data, position, textLength, StandardCharsets.UTF_8)
+            texts.add(text)
+            position += textLength
+        }
+        return TXTRecord(texts)
+    }
+
+    fun readSOARecord(): SOARecord {
+        val primaryNameServer = readDomainName()
+        val responsibleAuthorityMailbox = readDomainName()
+        val serialNumber = readInt32()
+        val refreshInterval = readInt32()
+        val retryInterval = readInt32()
+        val expiryLimit = readInt32()
+        val minimumTTL = readInt32()
+        return SOARecord(primaryNameServer, responsibleAuthorityMailbox, serialNumber, refreshInterval, retryInterval, expiryLimit, minimumTTL)
+    }
+
+    fun readSRVRecord(): SRVRecord {
+        val priority = readUInt16()
+        val weight = readUInt16()
+        val port = readUInt16()
+        val target = readDomainName()
+        return SRVRecord(priority, weight, port, target)
+    }
+
+    fun readNSRecord(): NSRecord {
+        return NSRecord(readDomainName())
+    }
+
+    fun readCAARecord(): CAARecord {
+        val length = readUInt16().toInt()
+        val flags = readByte()
+        val tagLength = readByte().toInt()
+        val tag = String(data, position, tagLength, StandardCharsets.US_ASCII).also { position += tagLength }
+        val valueLength = length - 1 - 1 - tagLength
+        val value = String(data, position, valueLength, StandardCharsets.US_ASCII).also { position += valueLength }
+        return CAARecord(flags, tag, value)
+    }
+
+    fun readHINFORecord(): HINFORecord {
+        val cpuLength = readByte().toInt()
+        val cpu = String(data, position, cpuLength, StandardCharsets.US_ASCII).also { position += cpuLength }
+        val osLength = readByte().toInt()
+        val os = String(data, position, osLength, StandardCharsets.US_ASCII).also { position += osLength }
+        return HINFORecord(cpu, os)
+    }
+
+    fun readAFSDBRecord(): AFSDBRecord {
+        return AFSDBRecord(readUInt16(), readDomainName())
+    }
+
+    fun readLOCRecord(): LOCRecord {
+        val version = readByte()
+        val size = LOCRecord.decodeSizeOrPrecision(readByte())
+        val horizontalPrecision = LOCRecord.decodeSizeOrPrecision(readByte())
+        val verticalPrecision = LOCRecord.decodeSizeOrPrecision(readByte())
+        val latitudeCoded = readInt32()
+        val longitudeCoded = readInt32()
+        val altitudeCoded = readInt32()
+        val latitude = LOCRecord.decodeLatitudeOrLongitude(latitudeCoded)
+        val longitude = LOCRecord.decodeLatitudeOrLongitude(longitudeCoded)
+        val altitude = LOCRecord.decodeAltitude(altitudeCoded)
+        return LOCRecord(version, size, horizontalPrecision, verticalPrecision, latitude, longitude, altitude)
+    }
+
+    fun readNAPTRRecord(): NAPTRRecord {
+        val order = readUInt16()
+        val preference = readUInt16()
+        val flags = readString()
+        val services = readString()
+        val regexp = readString()
+        val replacement = readDomainName()
+        return NAPTRRecord(order, preference, flags, services, regexp, replacement)
+    }
+
+    fun readDNAMERecord(): DNAMERecord {
+        return DNAMERecord(readDomainName())
+    }
+
+    fun readDSRecord(): DSRecord {
+        val keyTag = readUInt16()
+        val algorithm = readByte()
+        val digestType = readByte()
+        val digestLength = readUInt16().toInt() - 4
+        val digest = readBytes(digestLength)
+        return DSRecord(keyTag, algorithm, digestType, digest)
+    }
+
+    fun readSSHFPRecord(): SSHFPRecord {
+        val algorithm = readByte()
+        val fingerprintType = readByte()
+        val fingerprintLength = readUInt16().toInt() - 2
+        val fingerprint = readBytes(fingerprintLength)
+        return SSHFPRecord(algorithm, fingerprintType, fingerprint)
+    }
+
+    fun readTLSARecord(): TLSARecord {
+        val usage = readByte()
+        val selector = readByte()
+        val matchingType = readByte()
+        val dataLength = readUInt16().toInt() - 3
+        val certificateAssociationData = readBytes(dataLength)
+        return TLSARecord(usage, selector, matchingType, certificateAssociationData)
+    }
+
+    fun readSMIMEARecord(): SMIMEARecord {
+        val usage = readByte()
+        val selector = readByte()
+        val matchingType = readByte()
+        val dataLength = readUInt16().toInt() - 3
+        val certificateAssociationData = readBytes(dataLength)
+        return SMIMEARecord(usage, selector, matchingType, certificateAssociationData)
+    }
+
+    fun readURIRecord(): URIRecord {
+        val priority = readUInt16()
+        val weight = readUInt16()
+        val length = readUInt16().toInt()
+        val target = String(data, position, length, StandardCharsets.US_ASCII).also { position += length }
+        return URIRecord(priority, weight, target)
+    }
+
+    fun readRRSIGRecord(): RRSIGRecord {
+        val typeCovered = readUInt16()
+        val algorithm = readByte()
+        val labels = readByte()
+        val originalTTL = readUInt32()
+        val signatureExpiration = readUInt32()
+        val signatureInception = readUInt32()
+        val keyTag = readUInt16()
+        val signersName = readDomainName()
+        val signatureLength = readUInt16().toInt()
+        val signature = readBytes(signatureLength)
+        return RRSIGRecord(
+            typeCovered,
+            algorithm,
+            labels,
+            originalTTL,
+            signatureExpiration,
+            signatureInception,
+            keyTag,
+            signersName,
+            signature
+        )
+    }
+
+    fun readNSECRecord(): NSECRecord {
+        val ownerName = readDomainName()
+        val typeBitMaps = mutableListOf<Pair<Byte, ByteArray>>()
+        while (position < endPosition) {
+            val windowBlock = readByte()
+            val bitmapLength = readByte().toInt()
+            val bitmap = readBytes(bitmapLength)
+            typeBitMaps.add(windowBlock to bitmap)
+        }
+        return NSECRecord(ownerName, typeBitMaps)
+    }
+
+    fun readNSEC3Record(): NSEC3Record {
+        val hashAlgorithm = readByte()
+        val flags = readByte()
+        val iterations = readUInt16()
+        val saltLength = readByte().toInt()
+        val salt = readBytes(saltLength)
+        val hashLength = readByte().toInt()
+        val nextHashedOwnerName = readBytes(hashLength)
+        val bitMapLength = readUInt16().toInt()
+        val typeBitMaps = mutableListOf<UShort>()
+        val endPos = position + bitMapLength
+        while (position < endPos) {
+            typeBitMaps.add(readUInt16())
+        }
+        return NSEC3Record(hashAlgorithm, flags, iterations, salt, nextHashedOwnerName, typeBitMaps)
+    }
+
+    fun readNSEC3PARAMRecord(): NSEC3PARAMRecord {
+        val hashAlgorithm = readByte()
+        val flags = readByte()
+        val iterations = readUInt16()
+        val saltLength = readByte().toInt()
+        val salt = readBytes(saltLength)
+        return NSEC3PARAMRecord(hashAlgorithm, flags, iterations, salt)
+    }
+
+
+    fun readSPFRecord(): SPFRecord {
+        val length = readUInt16().toInt()
+        val texts = mutableListOf<String>()
+        val endPos = position + length
+        while (position < endPos) {
+            val textLength = readByte().toInt()
+            val text = String(data, position, textLength, StandardCharsets.US_ASCII).also { position += textLength }
+            texts.add(text)
+        }
+        return SPFRecord(texts)
+    }
+
+    fun readTKEYRecord(): TKEYRecord {
+        val algorithm = readDomainName()
+        val inception = readUInt32()
+        val expiration = readUInt32()
+        val mode = readUInt16()
+        val error = readUInt16()
+        val keySize = readUInt16().toInt()
+        val keyData = readBytes(keySize)
+        val otherSize = readUInt16().toInt()
+        val otherData = readBytes(otherSize)
+        return TKEYRecord(algorithm, inception, expiration, mode, error, keyData, otherData)
+    }
+
+    fun readTSIGRecord(): TSIGRecord {
+        val algorithmName = readDomainName()
+        val timeSigned = readUInt32()
+        val fudge = readUInt16()
+        val macSize = readUInt16().toInt()
+        val mac = readBytes(macSize)
+        val originalID = readUInt16()
+        val error = readUInt16()
+        val otherSize = readUInt16().toInt()
+        val otherData = readBytes(otherSize)
+        return TSIGRecord(algorithmName, timeSigned, fudge, mac, originalID, error, otherData)
+    }
+
+
+
+    fun readOPTRecord(): OPTRecord {
+        val options = mutableListOf<OPTRecordOption>()
+        while (position < endPosition) {
+            val optionCode = readUInt16()
+            val optionLength = readUInt16().toInt()
+            val optionData = readBytes(optionLength)
+            options.add(OPTRecordOption(optionCode, optionData))
+        }
+        return OPTRecord(options)
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsResourceRecord.kt

@@ -0,0 +1,117 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.mdns.Extensions.readDomainName
+
+enum class ResourceRecordType(val value: UShort) {
+    None(0u),
+    A(1u),
+    NS(2u),
+    MD(3u),
+    MF(4u),
+    CNAME(5u),
+    SOA(6u),
+    MB(7u),
+    MG(8u),
+    MR(9u),
+    NULL(10u),
+    WKS(11u),
+    PTR(12u),
+    HINFO(13u),
+    MINFO(14u),
+    MX(15u),
+    TXT(16u),
+    RP(17u),
+    AFSDB(18u),
+    SIG(24u),
+    KEY(25u),
+    AAAA(28u),
+    LOC(29u),
+    SRV(33u),
+    NAPTR(35u),
+    KX(36u),
+    CERT(37u),
+    DNAME(39u),
+    APL(42u),
+    DS(43u),
+    SSHFP(44u),
+    IPSECKEY(45u),
+    RRSIG(46u),
+    NSEC(47u),
+    DNSKEY(48u),
+    DHCID(49u),
+    NSEC3(50u),
+    NSEC3PARAM(51u),
+    TSLA(52u),
+    SMIMEA(53u),
+    HIP(55u),
+    CDS(59u),
+    CDNSKEY(60u),
+    OPENPGPKEY(61u),
+    CSYNC(62u),
+    ZONEMD(63u),
+    SVCB(64u),
+    HTTPS(65u),
+    EUI48(108u),
+    EUI64(109u),
+    TKEY(249u),
+    TSIG(250u),
+    URI(256u),
+    CAA(257u),
+    TA(32768u),
+    DLV(32769u),
+    AXFR(252u),
+    IXFR(251u),
+    OPT(41u)
+}
+
+enum class ResourceRecordClass(val value: UShort) {
+    IN(1u),
+    CS(2u),
+    CH(3u),
+    HS(4u)
+}
+
+data class DnsResourceRecord(
+    override val name: String,
+    override val type: Int,
+    override val clazz: Int,
+    val timeToLive: UInt,
+    val cacheFlush: Boolean,
+    val dataPosition: Int = -1,
+    val dataLength: Int = -1,
+    private val data: ByteArray? = null
+) : DnsResourceRecordBase(name, type, clazz) {
+
+    companion object {
+        fun parse(data: ByteArray, startPosition: Int): Pair<DnsResourceRecord, Int> {
+            val span = data.asUByteArray()
+            var position = startPosition
+            val name = span.readDomainName(position).also { position = it.second }
+            val type = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val clazz = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            position += 2
+            val ttl = (span[position].toInt() shl 24 or (span[position + 1].toInt() shl 16) or
+                    (span[position + 2].toInt() shl 8) or span[position + 3].toInt()).toUInt()
+            position += 4
+            val rdlength = (span[position].toInt() shl 8 or span[position + 1].toInt()).toUShort()
+            val rdposition = position + 2
+            position += 2 + rdlength.toInt()
+
+            return DnsResourceRecord(
+                name = name.first,
+                type = type.toInt(),
+                clazz = clazz.toInt() and 0b1111111_11111111,
+                timeToLive = ttl,
+                cacheFlush = ((clazz.toInt() shr 15) and 0b1) != 0,
+                dataPosition = rdposition,
+                dataLength = rdlength.toInt(),
+                data = data
+            ) to position
+        }
+    }
+
+    fun getDataReader(): DnsReader {
+        return DnsReader(data!!, dataPosition, dataLength)
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/DnsWriter.kt

@@ -0,0 +1,208 @@
+package com.futo.platformplayer.mdns
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.charset.StandardCharsets
+
+class DnsWriter {
+    private val data = mutableListOf<Byte>()
+    private val namePositions = mutableMapOf<String, Int>()
+
+    fun toByteArray(): ByteArray = data.toByteArray()
+
+    fun writePacket(
+        header: DnsPacketHeader,
+        questionCount: Int? = null, questionWriter: ((DnsWriter, Int) -> Unit)? = null,
+        answerCount: Int? = null, answerWriter: ((DnsWriter, Int) -> Unit)? = null,
+        authorityCount: Int? = null, authorityWriter: ((DnsWriter, Int) -> Unit)? = null,
+        additionalsCount: Int? = null, additionalWriter: ((DnsWriter, Int) -> Unit)? = null
+    ) {
+        if (questionCount != null && questionWriter == null || questionCount == null && questionWriter != null)
+            throw Exception("When question count is given, question writer should also be given.")
+        if (answerCount != null && answerWriter == null || answerCount == null && answerWriter != null)
+            throw Exception("When answer count is given, answer writer should also be given.")
+        if (authorityCount != null && authorityWriter == null || authorityCount == null && authorityWriter != null)
+            throw Exception("When authority count is given, authority writer should also be given.")
+        if (additionalsCount != null && additionalWriter == null || additionalsCount == null && additionalWriter != null)
+            throw Exception("When additionals count is given, additional writer should also be given.")
+
+        writeHeader(header, questionCount ?: 0, answerCount ?: 0, authorityCount ?: 0, additionalsCount ?: 0)
+
+        repeat(questionCount ?: 0) { questionWriter?.invoke(this, it) }
+        repeat(answerCount ?: 0) { answerWriter?.invoke(this, it) }
+        repeat(authorityCount ?: 0) { authorityWriter?.invoke(this, it) }
+        repeat(additionalsCount ?: 0) { additionalWriter?.invoke(this, it) }
+    }
+
+    fun writeHeader(header: DnsPacketHeader, questionCount: Int, answerCount: Int, authorityCount: Int, additionalsCount: Int) {
+        write(header.identifier)
+
+        var flags: UShort = 0u
+        flags = flags or ((header.queryResponse.toUInt() and 0xFFFFu) shl 15).toUShort()
+        flags = flags or ((header.opcode.toUInt() and 0xFFFFu) shl 11).toUShort()
+        flags = flags or ((if (header.authoritativeAnswer) 1u else 0u) shl 10).toUShort()
+        flags = flags or ((if (header.truncated) 1u else 0u) shl 9).toUShort()
+        flags = flags or ((if (header.recursionDesired) 1u else 0u) shl 8).toUShort()
+        flags = flags or ((if (header.recursionAvailable) 1u else 0u) shl 7).toUShort()
+        flags = flags or ((if (header.answerAuthenticated) 1u else 0u) shl 5).toUShort()
+        flags = flags or ((if (header.nonAuthenticatedData) 1u else 0u) shl 4).toUShort()
+        flags = flags or header.responseCode.value.toUShort()
+        write(flags)
+
+        write(questionCount.toUShort())
+        write(answerCount.toUShort())
+        write(authorityCount.toUShort())
+        write(additionalsCount.toUShort())
+    }
+
+    fun writeDomainName(name: String) {
+        synchronized(namePositions) {
+            val labels = name.split('.')
+            for (label in labels) {
+                val nameAtOffset = name.substring(name.indexOf(label))
+                if (namePositions.containsKey(nameAtOffset)) {
+                    val position = namePositions[nameAtOffset]!!
+                    val pointer = (0b11000000_00000000 or position).toUShort()
+                    write(pointer)
+                    return
+                }
+                if (label.isNotEmpty()) {
+                    val labelBytes = label.toByteArray(StandardCharsets.UTF_8)
+                    val nameStartPos = data.size
+                    write(labelBytes.size.toByte())
+                    write(labelBytes)
+                    namePositions[nameAtOffset] = nameStartPos
+                }
+            }
+            write(0.toByte())
+        }
+    }
+
+    fun write(value: DnsResourceRecord, dataWriter: (DnsWriter) -> Unit) {
+        writeDomainName(value.name)
+        write(value.type.toUShort())
+        val cls = ((if (value.cacheFlush) 1u else 0u) shl 15).toUShort() or value.clazz.toUShort()
+        write(cls)
+        write(value.timeToLive)
+
+        val lengthOffset = data.size
+        write(0.toUShort())
+        dataWriter(this)
+        val rdLength = data.size - lengthOffset - 2
+        val rdLengthBytes = ByteBuffer.allocate(2).order(ByteOrder.BIG_ENDIAN).putShort(rdLength.toShort()).array()
+        data[lengthOffset] = rdLengthBytes[0]
+        data[lengthOffset + 1] = rdLengthBytes[1]
+    }
+
+    fun write(value: DnsQuestion) {
+        writeDomainName(value.name)
+        write(value.type.toUShort())
+        write(((if (value.queryUnicast) 1u else 0u shl 15).toUShort() or value.clazz.toUShort()))
+    }
+
+    fun write(value: Double) {
+        val bytes = ByteBuffer.allocate(Double.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putDouble(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Short) {
+        val bytes = ByteBuffer.allocate(Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putShort(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Int) {
+        val bytes = ByteBuffer.allocate(Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putInt(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Long) {
+        val bytes = ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putLong(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Float) {
+        val bytes = ByteBuffer.allocate(Float.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putFloat(value).array()
+        write(bytes)
+    }
+
+    fun write(value: Byte) {
+        data.add(value)
+    }
+
+    fun write(value: ByteArray) {
+        data.addAll(value.asIterable())
+    }
+
+    fun write(value: ByteArray, offset: Int, length: Int) {
+        data.addAll(value.slice(offset until offset + length))
+    }
+
+    fun write(value: UShort) {
+        val bytes = ByteBuffer.allocate(Short.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putShort(value.toShort()).array()
+        write(bytes)
+    }
+
+    fun write(value: UInt) {
+        val bytes = ByteBuffer.allocate(Int.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putInt(value.toInt()).array()
+        write(bytes)
+    }
+
+    fun write(value: ULong) {
+        val bytes = ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.BIG_ENDIAN).putLong(value.toLong()).array()
+        write(bytes)
+    }
+
+    fun write(value: String) {
+        val bytes = value.toByteArray(StandardCharsets.UTF_8)
+        write(bytes.size.toByte())
+        write(bytes)
+    }
+
+    fun write(value: PTRRecord) {
+        writeDomainName(value.domainName)
+    }
+
+    fun write(value: ARecord) {
+        val bytes = value.address.address
+        if (bytes.size != 4) throw Exception("Unexpected amount of address bytes.")
+        write(bytes)
+    }
+
+    fun write(value: AAAARecord) {
+        val bytes = value.address.address
+        if (bytes.size != 16) throw Exception("Unexpected amount of address bytes.")
+        write(bytes)
+    }
+
+    fun write(value: TXTRecord) {
+        value.texts.forEach {
+            val bytes = it.toByteArray(StandardCharsets.UTF_8)
+            write(bytes.size.toByte())
+            write(bytes)
+        }
+    }
+
+    fun write(value: SRVRecord) {
+        write(value.priority)
+        write(value.weight)
+        write(value.port)
+        writeDomainName(value.target)
+    }
+
+    fun write(value: NSECRecord) {
+        writeDomainName(value.ownerName)
+        value.typeBitMaps.forEach { (windowBlock, bitmap) ->
+            write(windowBlock)
+            write(bitmap.size.toByte())
+            write(bitmap)
+        }
+    }
+
+    fun write(value: OPTRecord) {
+        value.options.forEach { option ->
+            write(option.code)
+            write(option.data.size.toUShort())
+            write(option.data)
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/Extensions.kt

@@ -0,0 +1,63 @@
+package com.futo.platformplayer.mdns
+
+import android.util.Log
+
+object Extensions {
+    fun ByteArray.toByteDump(): String {
+        val result = StringBuilder()
+        for (i in indices) {
+            result.append(String.format("%02X ", this[i]))
+
+            if ((i + 1) % 16 == 0 || i == size - 1) {
+                val padding = 3 * (16 - (i % 16 + 1))
+                if (i == size - 1 && (i + 1) % 16 != 0) result.append(" ".repeat(padding))
+
+                result.append("; ")
+                val start = i - (i % 16)
+                val end = minOf(i, size - 1)
+                for (j in start..end) {
+                    val ch = if (this[j] in 32..127) this[j].toChar() else '.'
+                    result.append(ch)
+                }
+                if (i != size - 1) result.appendLine()
+            }
+        }
+        return result.toString()
+    }
+
+    fun UByteArray.readDomainName(startPosition: Int): Pair<String, Int> {
+        var position = startPosition
+        return readDomainName(position, 0)
+    }
+
+    private fun UByteArray.readDomainName(position: Int, depth: Int = 0): Pair<String, Int> {
+        if (depth > 16) throw Exception("Exceeded maximum recursion depth in DNS packet. Possible circular reference.")
+
+        val domainParts = mutableListOf<String>()
+        var newPosition = position
+
+        while (true) {
+            if (newPosition < 0)
+                println()
+
+            val length = this[newPosition].toUByte()
+            if ((length and 0b11000000u).toUInt() == 0b11000000u) {
+                val offset = (((length and 0b00111111u).toUInt()) shl 8) or this[newPosition + 1].toUInt()
+                val (part, _) = this.readDomainName(offset.toInt(), depth + 1)
+                domainParts.add(part)
+                newPosition += 2
+                break
+            } else if (length.toUInt() == 0u) {
+                newPosition++
+                break
+            } else {
+                newPosition++
+                val part = String(this.asByteArray(), newPosition, length.toInt(), Charsets.UTF_8)
+                domainParts.add(part)
+                newPosition += length.toInt()
+            }
+        }
+
+        return domainParts.joinToString(".") to newPosition
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/MDNSListener.kt

@@ -0,0 +1,492 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.*
+import java.net.*
+import java.util.*
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
+
+class MDNSListener {
+    companion object {
+        private val TAG = "MDNSListener"
+        const val MulticastPort = 5353
+        val MulticastAddressIPv4: InetAddress = InetAddress.getByName("224.0.0.251")
+        val MulticastAddressIPv6: InetAddress = InetAddress.getByName("FF02::FB")
+        val MdnsEndpointIPv6: InetSocketAddress = InetSocketAddress(MulticastAddressIPv6, MulticastPort)
+        val MdnsEndpointIPv4: InetSocketAddress = InetSocketAddress(MulticastAddressIPv4, MulticastPort)
+    }
+
+    private val _lockObject = ReentrantLock()
+    private var _receiver4: MulticastSocket? = null
+    private var _receiver6: MulticastSocket? = null
+    private val _senders = mutableListOf<MulticastSocket>()
+    private val _nicMonitor = NICMonitor()
+    private val _serviceRecordAggregator = ServiceRecordAggregator()
+    private var _started = false
+    private var _threadReceiver4: Thread? = null
+    private var _threadReceiver6: Thread? = null
+    private var _scope: CoroutineScope? = null
+
+    var onPacket: ((DnsPacket) -> Unit)? = null
+    var onServicesUpdated: ((List<DnsService>) -> Unit)? = null
+
+    private val _recordLockObject = ReentrantLock()
+    private val _recordsA = mutableListOf<Pair<DnsResourceRecord, ARecord>>()
+    private val _recordsAAAA = mutableListOf<Pair<DnsResourceRecord, AAAARecord>>()
+    private val _recordsPTR = mutableListOf<Pair<DnsResourceRecord, PTRRecord>>()
+    private val _recordsTXT = mutableListOf<Pair<DnsResourceRecord, TXTRecord>>()
+    private val _recordsSRV = mutableListOf<Pair<DnsResourceRecord, SRVRecord>>()
+    private val _services = mutableListOf<BroadcastService>()
+
+    init {
+        _nicMonitor.added = { onNicsAdded(it) }
+        _nicMonitor.removed = { onNicsRemoved(it) }
+        _serviceRecordAggregator.onServicesUpdated = { onServicesUpdated?.invoke(it) }
+    }
+
+    fun start() {
+        if (_started) throw Exception("Already running.")
+        _started = true
+
+        _scope = CoroutineScope(Dispatchers.IO);
+
+        Logger.i(TAG, "Starting")
+        _lockObject.withLock {
+            val receiver4 = MulticastSocket(null).apply {
+                reuseAddress = true
+                bind(InetSocketAddress(InetAddress.getByName("0.0.0.0"), MulticastPort))
+            }
+            _receiver4 = receiver4
+
+            val receiver6 = MulticastSocket(null).apply {
+                reuseAddress = true
+                bind(InetSocketAddress(InetAddress.getByName("::"), MulticastPort))
+            }
+            _receiver6 = receiver6
+
+            _nicMonitor.start()
+            _serviceRecordAggregator.start()
+            onNicsAdded(_nicMonitor.current)
+
+            _threadReceiver4 = Thread {
+                receiveLoop(receiver4)
+            }.apply { start() }
+
+            _threadReceiver6 = Thread {
+                receiveLoop(receiver6)
+            }.apply { start() }
+        }
+    }
+
+    fun queryServices(names: Array<String>) {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+
+        val writer = DnsWriter()
+        writer.writePacket(
+            DnsPacketHeader(
+                identifier = 0u,
+                queryResponse = QueryResponse.Query.value.toInt(),
+                opcode = DnsOpcode.StandardQuery.value.toInt(),
+                truncated = false,
+                nonAuthenticatedData = false,
+                recursionDesired = false,
+                answerAuthenticated = false,
+                authoritativeAnswer = false,
+                recursionAvailable = false,
+                responseCode = DnsResponseCode.NoError
+            ),
+            questionCount = names.size,
+            questionWriter = { w, i ->
+                w.write(
+                    DnsQuestion(
+                        name = names[i],
+                        type = QuestionType.PTR.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            }
+        )
+
+        send(writer.toByteArray())
+    }
+
+    private fun send(data: ByteArray) {
+        _lockObject.withLock {
+            for (sender in _senders) {
+                try {
+                    val endPoint = if (sender.localAddress is Inet4Address) MdnsEndpointIPv4 else MdnsEndpointIPv6
+                    sender.send(DatagramPacket(data, data.size, endPoint))
+                } catch (e: Exception) {
+                    Logger.i(TAG, "Failed to send on ${sender.localSocketAddress}: ${e.message}.")
+                }
+            }
+        }
+    }
+
+    fun queryAllQuestions(names: Array<String>) {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+
+        val questions = names.flatMap { _serviceRecordAggregator.getAllQuestions(it) }
+        questions.groupBy { it.name }.forEach { (_, questionsForHost) ->
+            val writer = DnsWriter()
+            writer.writePacket(
+                DnsPacketHeader(
+                    identifier = 0u,
+                    queryResponse = QueryResponse.Query.value.toInt(),
+                    opcode = DnsOpcode.StandardQuery.value.toInt(),
+                    truncated = false,
+                    nonAuthenticatedData = false,
+                    recursionDesired = false,
+                    answerAuthenticated = false,
+                    authoritativeAnswer = false,
+                    recursionAvailable = false,
+                    responseCode = DnsResponseCode.NoError
+                ),
+                questionCount = questionsForHost.size,
+                questionWriter = { w, i -> w.write(questionsForHost[i]) }
+            )
+            send(writer.toByteArray())
+        }
+    }
+
+    private fun onNicsAdded(nics: List<NetworkInterface>) {
+        _lockObject.withLock {
+            if (!_started) return
+
+            val addresses = nics.flatMap { nic ->
+                nic.interfaceAddresses.map { it.address }
+                    .filter { it is Inet4Address || (it is Inet6Address && it.isLinkLocalAddress) }
+            }
+
+            addresses.forEach { address ->
+                Logger.i(TAG, "New address discovered $address")
+
+                try {
+                    when (address) {
+                        is Inet4Address -> {
+                            _receiver4?.let { receiver4 ->
+                                //receiver4.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver4.joinGroup(InetSocketAddress(MulticastAddressIPv4, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
+                            val sender = MulticastSocket(null).apply {
+                                reuseAddress = true
+                                bind(InetSocketAddress(address, MulticastPort))
+                                joinGroup(InetSocketAddress(MulticastAddressIPv4, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+                            _senders.add(sender)
+                        }
+
+                        is Inet6Address -> {
+                            _receiver6?.let { receiver6 ->
+                                //receiver6.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver6.joinGroup(InetSocketAddress(MulticastAddressIPv6, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
+                            val sender = MulticastSocket(null).apply {
+                                reuseAddress = true
+                                bind(InetSocketAddress(address, MulticastPort))
+                                joinGroup(InetSocketAddress(MulticastAddressIPv6, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+                            _senders.add(sender)
+                        }
+
+                        else -> throw UnsupportedOperationException("Address type ${address.javaClass.name} is not supported.")
+                    }
+                } catch (e: Exception) {
+                    Logger.i(TAG, "Exception occurred when processing added address $address: ${e.message}.")
+                    // Close the socket if there was an error
+                    (_senders.lastOrNull() as? MulticastSocket)?.close()
+                }
+            }
+        }
+
+        if (nics.isNotEmpty()) {
+            try {
+                updateBroadcastRecords()
+                broadcastRecords()
+            } catch (e: Exception) {
+                Logger.i(TAG, "Exception occurred when broadcasting records: ${e.message}.")
+            }
+        }
+    }
+
+    private fun onNicsRemoved(nics: List<NetworkInterface>) {
+        _lockObject.withLock {
+            if (!_started) return
+            //TODO: Cleanup?
+        }
+
+        if (nics.isNotEmpty()) {
+            try {
+                updateBroadcastRecords()
+                broadcastRecords()
+            } catch (e: Exception) {
+                Logger.e(TAG, "Exception occurred when broadcasting records", e)
+            }
+        }
+    }
+
+    private fun receiveLoop(client: DatagramSocket) {
+        Logger.i(TAG, "Started receive loop")
+
+        val buffer = ByteArray(8972)
+        val packet = DatagramPacket(buffer, buffer.size)
+        while (_started) {
+            try {
+                client.receive(packet)
+                handleResult(packet)
+            } catch (e: Exception) {
+                Logger.e(TAG, "An exception occurred while handling UDP result:", e)
+            }
+        }
+
+        Logger.i(TAG, "Stopped receive loop")
+    }
+
+    fun broadcastService(
+        deviceName: String,
+        serviceName: String,
+        port: UShort,
+        ttl: UInt = 120u,
+        weight: UShort = 0u,
+        priority: UShort = 0u,
+        texts: List<String>? = null
+    ) {
+        _recordLockObject.withLock {
+            _services.add(
+                BroadcastService(
+                    deviceName = deviceName,
+                    port = port,
+                    priority = priority,
+                    serviceName = serviceName,
+                    texts = texts,
+                    ttl = ttl,
+                    weight = weight
+                )
+            )
+        }
+
+        updateBroadcastRecords()
+        broadcastRecords()
+    }
+
+    private fun updateBroadcastRecords() {
+        _recordLockObject.withLock {
+            _recordsSRV.clear()
+            _recordsPTR.clear()
+            _recordsA.clear()
+            _recordsAAAA.clear()
+            _recordsTXT.clear()
+
+            _services.forEach { service ->
+                val id = UUID.randomUUID().toString()
+                val deviceDomainName = "${service.deviceName}.${service.serviceName}"
+                val addressName = "$id.local"
+
+                _recordsSRV.add(
+                    DnsResourceRecord(
+                        clazz = ResourceRecordClass.IN.value.toInt(),
+                        type = ResourceRecordType.SRV.value.toInt(),
+                        timeToLive = service.ttl,
+                        name = deviceDomainName,
+                        cacheFlush = false
+                    ) to SRVRecord(
+                        target = addressName,
+                        port = service.port,
+                        priority = service.priority,
+                        weight = service.weight
+                    )
+                )
+
+                _recordsPTR.add(
+                    DnsResourceRecord(
+                        clazz = ResourceRecordClass.IN.value.toInt(),
+                        type = ResourceRecordType.PTR.value.toInt(),
+                        timeToLive = service.ttl,
+                        name = service.serviceName,
+                        cacheFlush = false
+                    ) to PTRRecord(
+                        domainName = deviceDomainName
+                    )
+                )
+
+                val addresses = _nicMonitor.current.flatMap { nic ->
+                    nic.interfaceAddresses.map { it.address }
+                }
+
+                addresses.forEach { address ->
+                    when (address) {
+                        is Inet4Address -> _recordsA.add(
+                            DnsResourceRecord(
+                                clazz = ResourceRecordClass.IN.value.toInt(),
+                                type = ResourceRecordType.A.value.toInt(),
+                                timeToLive = service.ttl,
+                                name = addressName,
+                                cacheFlush = false
+                            ) to ARecord(
+                                address = address
+                            )
+                        )
+
+                        is Inet6Address -> _recordsAAAA.add(
+                            DnsResourceRecord(
+                                clazz = ResourceRecordClass.IN.value.toInt(),
+                                type = ResourceRecordType.AAAA.value.toInt(),
+                                timeToLive = service.ttl,
+                                name = addressName,
+                                cacheFlush = false
+                            ) to AAAARecord(
+                                address = address
+                            )
+                        )
+
+                        else -> Logger.i(TAG, "Invalid address type: $address.")
+                    }
+                }
+
+                if (service.texts != null) {
+                    _recordsTXT.add(
+                        DnsResourceRecord(
+                            clazz = ResourceRecordClass.IN.value.toInt(),
+                            type = ResourceRecordType.TXT.value.toInt(),
+                            timeToLive = service.ttl,
+                            name = deviceDomainName,
+                            cacheFlush = false
+                        ) to TXTRecord(
+                            texts = service.texts
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    private fun broadcastRecords(questions: List<DnsQuestion>? = null) {
+        val writer = DnsWriter()
+        _recordLockObject.withLock {
+            val recordsA: List<Pair<DnsResourceRecord, ARecord>>
+            val recordsAAAA: List<Pair<DnsResourceRecord, AAAARecord>>
+            val recordsPTR: List<Pair<DnsResourceRecord, PTRRecord>>
+            val recordsTXT: List<Pair<DnsResourceRecord, TXTRecord>>
+            val recordsSRV: List<Pair<DnsResourceRecord, SRVRecord>>
+
+            if (questions != null) {
+                recordsA = _recordsA.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsAAAA = _recordsAAAA.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsPTR = _recordsPTR.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsSRV = _recordsSRV.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+                recordsTXT = _recordsTXT.filter { r -> questions.any { q -> q.name == r.first.name && q.clazz == r.first.clazz && q.type == r.first.type } }
+            } else {
+                recordsA = _recordsA
+                recordsAAAA = _recordsAAAA
+                recordsPTR = _recordsPTR
+                recordsSRV = _recordsSRV
+                recordsTXT = _recordsTXT
+            }
+
+            val answerCount = recordsA.size + recordsAAAA.size + recordsPTR.size + recordsSRV.size + recordsTXT.size
+            if (answerCount < 1) return
+
+            val txtOffset = recordsA.size + recordsAAAA.size + recordsPTR.size + recordsSRV.size
+            val srvOffset = recordsA.size + recordsAAAA.size + recordsPTR.size
+            val ptrOffset = recordsA.size + recordsAAAA.size
+            val aaaaOffset = recordsA.size
+
+            writer.writePacket(
+                DnsPacketHeader(
+                    identifier = 0u,
+                    queryResponse = QueryResponse.Response.value.toInt(),
+                    opcode = DnsOpcode.StandardQuery.value.toInt(),
+                    truncated = false,
+                    nonAuthenticatedData = false,
+                    recursionDesired = false,
+                    answerAuthenticated = false,
+                    authoritativeAnswer = true,
+                    recursionAvailable = false,
+                    responseCode = DnsResponseCode.NoError
+                ),
+                answerCount = answerCount,
+                answerWriter = { w, i ->
+                    when {
+                        i >= txtOffset -> {
+                            val record = recordsTXT[i - txtOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= srvOffset -> {
+                            val record = recordsSRV[i - srvOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= ptrOffset -> {
+                            val record = recordsPTR[i - ptrOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        i >= aaaaOffset -> {
+                            val record = recordsAAAA[i - aaaaOffset]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+
+                        else -> {
+                            val record = recordsA[i]
+                            w.write(record.first) { it.write(record.second) }
+                        }
+                    }
+                }
+            )
+        }
+
+        send(writer.toByteArray())
+    }
+
+    private fun handleResult(result: DatagramPacket) {
+        try {
+            val packet = DnsPacket.parse(result.data)
+            if (packet.questions.isNotEmpty()) {
+                _scope?.launch(Dispatchers.IO) {
+                    try {
+                        broadcastRecords(packet.questions)
+                    } catch (e: Throwable) {
+                        Logger.i(TAG, "Broadcasting records failed", e)
+                    }
+                }
+
+            }
+            _serviceRecordAggregator.add(packet)
+            onPacket?.invoke(packet)
+        } catch (e: Exception) {
+            Logger.v(TAG, "Failed to handle packet: ${Base64.getEncoder().encodeToString(result.data.slice(IntRange(0, result.length - 1)).toByteArray())}", e)
+        }
+    }
+
+    fun stop() {
+        _lockObject.withLock {
+            _started = false
+
+            _scope?.cancel()
+            _scope = null
+
+            _nicMonitor.stop()
+            _serviceRecordAggregator.stop()
+
+            _receiver4?.close()
+            _receiver4 = null
+
+            _receiver6?.close()
+            _receiver6 = null
+
+            _senders.forEach { it.close() }
+            _senders.clear()
+        }
+
+        _threadReceiver4?.join()
+        _threadReceiver4 = null
+
+        _threadReceiver6?.join()
+        _threadReceiver6 = null
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/NICMonitor.kt

@@ -0,0 +1,66 @@
+package com.futo.platformplayer.mdns
+
+import kotlinx.coroutines.*
+import java.net.NetworkInterface
+
+class NICMonitor {
+    private val lockObject = Any()
+    private val nics = mutableListOf<NetworkInterface>()
+    private var cts: Job? = null
+
+    val current: List<NetworkInterface>
+        get() = synchronized(nics) { nics.toList() }
+
+    var added: ((List<NetworkInterface>) -> Unit)? = null
+    var removed: ((List<NetworkInterface>) -> Unit)? = null
+
+    fun start() {
+        synchronized(lockObject) {
+            if (cts != null) throw Exception("Already started.")
+
+            cts = CoroutineScope(Dispatchers.Default).launch {
+                loopAsync()
+            }
+        }
+
+        nics.clear()
+        nics.addAll(getCurrentInterfaces().toList())
+    }
+
+    fun stop() {
+        synchronized(lockObject) {
+            cts?.cancel()
+            cts = null
+        }
+
+        synchronized(nics) {
+            nics.clear()
+        }
+    }
+
+    private suspend fun loopAsync() {
+        while (cts?.isActive == true) {
+            try {
+                val currentNics = getCurrentInterfaces().toList()
+                removed?.invoke(nics.filter { k -> currentNics.none { n -> k.name == n.name } })
+                added?.invoke(currentNics.filter { nic -> nics.none { k -> k.name == nic.name } })
+
+                synchronized(nics) {
+                    nics.clear()
+                    nics.addAll(currentNics)
+                }
+            } catch (ex: Exception) {
+                // Ignored
+            }
+            delay(5000)
+        }
+    }
+
+    private fun getCurrentInterfaces(): List<NetworkInterface> {
+        val nics = NetworkInterface.getNetworkInterfaces().toList()
+            .filter { it.isUp && !it.isLoopback }
+
+        return if (nics.isNotEmpty()) nics else NetworkInterface.getNetworkInterfaces().toList()
+            .filter { it.isUp }
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt

@@ -0,0 +1,68 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import java.lang.Thread.sleep
+
+class ServiceDiscoverer(names: Array<String>, private val _onServicesUpdated: (List<DnsService>) -> Unit) {
+    private val _names: Array<String>
+    private var _listener: MDNSListener? = null
+    private var _started = false
+    private var _thread: Thread? = null
+
+    init {
+        if (names.isEmpty()) throw IllegalArgumentException("At least one name must be specified.")
+        _names = names
+    }
+
+    fun broadcastService(
+        deviceName: String,
+        serviceName: String,
+        port: UShort,
+        ttl: UInt = 120u,
+        weight: UShort = 0u,
+        priority: UShort = 0u,
+        texts: List<String>? = null
+    ) {
+        _listener?.let {
+            it.broadcastService(deviceName, serviceName, port, ttl, weight, priority, texts)
+        }
+    }
+
+    fun stop() {
+        _started = false
+        _listener?.stop()
+        _listener = null
+        _thread?.join()
+        _thread = null
+    }
+
+    fun start() {
+        if (_started) throw Exception("Already running.")
+        _started = true
+
+        val listener = MDNSListener()
+        _listener = listener
+        listener.onServicesUpdated = { _onServicesUpdated?.invoke(it) }
+        listener.start()
+
+        _thread = Thread {
+            try {
+                sleep(2000)
+
+                while (_started) {
+                    listener.queryServices(_names)
+                    sleep(2000)
+                    listener.queryAllQuestions(_names)
+                    sleep(2000)
+                }
+            } catch (e: Throwable) {
+                Logger.i(TAG, "Exception in loop thread", e)
+                stop()
+            }
+        }.apply { start() }
+    }
+
+    companion object {
+        private val TAG = "ServiceDiscoverer"
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/ServiceRecordAggregator.kt

@@ -0,0 +1,222 @@
+package com.futo.platformplayer.mdns
+
+import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import java.net.InetAddress
+import java.util.Date
+
+data class DnsService(
+    var name: String,
+    var target: String,
+    var port: UShort,
+    val addresses: MutableList<InetAddress> = mutableListOf(),
+    val pointers: MutableList<String> = mutableListOf(),
+    val texts: MutableList<String> = mutableListOf()
+)
+
+data class CachedDnsAddressRecord(
+    val expirationTime: Date,
+    val address: InetAddress
+)
+
+data class CachedDnsTxtRecord(
+    val expirationTime: Date,
+    val texts: List<String>
+)
+
+data class CachedDnsPtrRecord(
+    val expirationTime: Date,
+    val target: String
+)
+
+data class CachedDnsSrvRecord(
+    val expirationTime: Date,
+    val service: SRVRecord
+)
+
+class ServiceRecordAggregator {
+    private val _lockObject = Any()
+    private val _cachedAddressRecords = mutableMapOf<String, MutableList<CachedDnsAddressRecord>>()
+    private val _cachedTxtRecords = mutableMapOf<String, CachedDnsTxtRecord>()
+    private val _cachedPtrRecords = mutableMapOf<String, MutableList<CachedDnsPtrRecord>>()
+    private val _cachedSrvRecords = mutableMapOf<String, CachedDnsSrvRecord>()
+    private val _currentServices = mutableListOf<DnsService>()
+    private var _cts: Job? = null
+
+    var onServicesUpdated: ((List<DnsService>) -> Unit)? = null
+
+    fun start() {
+        synchronized(_lockObject) {
+            if (_cts != null) throw Exception("Already started.")
+
+            _cts = CoroutineScope(Dispatchers.Default).launch {
+                while (isActive) {
+                    val now = Date()
+                    synchronized(_currentServices) {
+                        _cachedAddressRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+                        _cachedTxtRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                        _cachedSrvRecords.entries.removeIf { now.after(it.value.expirationTime) }
+                        _cachedPtrRecords.forEach { it.value.removeAll { record -> now.after(record.expirationTime) } }
+
+                        val newServices = getCurrentServices()
+                        _currentServices.clear()
+                        _currentServices.addAll(newServices)
+                    }
+
+                    onServicesUpdated?.invoke(_currentServices.toList())
+                    delay(5000)
+                }
+            }
+        }
+    }
+
+    fun stop() {
+        synchronized(_lockObject) {
+            _cts?.cancel()
+            _cts = null
+        }
+    }
+
+    fun add(packet: DnsPacket) {
+        val dnsResourceRecords = packet.answers + packet.additionals + packet.authorities
+        val txtRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.TXT.value.toInt() }.map { it to it.getDataReader().readTXTRecord() }
+        val aRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.A.value.toInt() }.map { it to it.getDataReader().readARecord() }
+        val aaaaRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.AAAA.value.toInt() }.map { it to it.getDataReader().readAAAARecord() }
+        val srvRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.SRV.value.toInt() }.map { it to it.getDataReader().readSRVRecord() }
+        val ptrRecords = dnsResourceRecords.filter { it.type == ResourceRecordType.PTR.value.toInt() }.map { it to it.getDataReader().readPTRRecord() }
+
+        /*val builder = StringBuilder()
+        builder.appendLine("Received records:")
+        srvRecords.forEach { builder.appendLine("SRV ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: (Port: ${it.second.port}, Target: ${it.second.target}, Priority: ${it.second.priority}, Weight: ${it.second.weight})") }
+        ptrRecords.forEach { builder.appendLine("PTR ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.domainName}") }
+        txtRecords.forEach { builder.appendLine("TXT ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.texts.joinToString(", ")}") }
+        aRecords.forEach { builder.appendLine("A ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.address}") }
+        aaaaRecords.forEach { builder.appendLine("AAAA ${it.first.name} ${it.first.type} ${it.first.clazz} TTL ${it.first.timeToLive}: ${it.second.address}") }
+        Logger.i(TAG, "$builder")*/
+
+        val currentServices: MutableList<DnsService>
+        synchronized(this._currentServices) {
+            ptrRecords.forEach { record ->
+                val cachedPtrRecord = _cachedPtrRecords.getOrPut(record.first.name) { mutableListOf() }
+                val newPtrRecord = CachedDnsPtrRecord(Date(System.currentTimeMillis() + record.first.timeToLive.toLong() * 1000L), record.second.domainName)
+                cachedPtrRecord.replaceOrAdd(newPtrRecord) { it.target == record.second.domainName }
+            }
+
+            aRecords.forEach { aRecord ->
+                val cachedARecord = _cachedAddressRecords.getOrPut(aRecord.first.name) { mutableListOf() }
+                val newARecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aRecord.first.timeToLive.toLong() * 1000L), aRecord.second.address)
+                cachedARecord.replaceOrAdd(newARecord) { it.address == newARecord.address }
+            }
+
+            aaaaRecords.forEach { aaaaRecord ->
+                val cachedAaaaRecord = _cachedAddressRecords.getOrPut(aaaaRecord.first.name) { mutableListOf() }
+                val newAaaaRecord = CachedDnsAddressRecord(Date(System.currentTimeMillis() + aaaaRecord.first.timeToLive.toLong() * 1000L), aaaaRecord.second.address)
+                cachedAaaaRecord.replaceOrAdd(newAaaaRecord) { it.address == newAaaaRecord.address }
+            }
+
+            txtRecords.forEach { txtRecord ->
+                _cachedTxtRecords[txtRecord.first.name] = CachedDnsTxtRecord(Date(System.currentTimeMillis() + txtRecord.first.timeToLive.toLong() * 1000L), txtRecord.second.texts)
+            }
+
+            srvRecords.forEach { srvRecord ->
+                _cachedSrvRecords[srvRecord.first.name] = CachedDnsSrvRecord(Date(System.currentTimeMillis() + srvRecord.first.timeToLive.toLong() * 1000L), srvRecord.second)
+            }
+
+            currentServices = getCurrentServices()
+            this._currentServices.clear()
+            this._currentServices.addAll(currentServices)
+        }
+
+        onServicesUpdated?.invoke(currentServices)
+    }
+
+    fun getAllQuestions(serviceName: String): List<DnsQuestion> {
+        val questions = mutableListOf<DnsQuestion>()
+        synchronized(_currentServices) {
+            val servicePtrRecords = _cachedPtrRecords[serviceName] ?: return emptyList()
+
+            val ptrWithoutSrvRecord = servicePtrRecords.filterNot { _cachedSrvRecords.containsKey(it.target) }.map { it.target }
+            questions.addAll(ptrWithoutSrvRecord.flatMap { s ->
+                listOf(
+                    DnsQuestion(
+                        name = s,
+                        type = QuestionType.SRV.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            })
+
+            val incompleteCurrentServices = _currentServices.filter { it.addresses.isEmpty() && it.name.endsWith(serviceName) }
+            questions.addAll(incompleteCurrentServices.flatMap { s ->
+                listOf(
+                    DnsQuestion(
+                        name = s.name,
+                        type = QuestionType.TXT.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    ),
+                    DnsQuestion(
+                        name = s.target,
+                        type = QuestionType.A.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    ),
+                    DnsQuestion(
+                        name = s.target,
+                        type = QuestionType.AAAA.value.toInt(),
+                        clazz = QuestionClass.IN.value.toInt(),
+                        queryUnicast = false
+                    )
+                )
+            })
+        }
+        return questions
+    }
+
+    private fun getCurrentServices(): MutableList<DnsService> {
+        val currentServices = _cachedSrvRecords.map { (key, value) ->
+            DnsService(
+                name = key,
+                target = value.service.target,
+                port = value.service.port
+            )
+        }.toMutableList()
+
+        currentServices.forEach { service ->
+            _cachedAddressRecords[service.target]?.let {
+                service.addresses.addAll(it.map { record -> record.address })
+            }
+        }
+
+        currentServices.forEach { service ->
+            service.pointers.addAll(_cachedPtrRecords.filter { it.value.any { ptr -> ptr.target == service.name } }.map { it.key })
+        }
+
+        currentServices.forEach { service ->
+            _cachedTxtRecords[service.name]?.let {
+                service.texts.addAll(it.texts)
+            }
+        }
+
+        return currentServices
+    }
+
+    private inline fun <T> MutableList<T>.replaceOrAdd(newElement: T, predicate: (T) -> Boolean) {
+        val index = indexOfFirst(predicate)
+        if (index >= 0) {
+            this[index] = newElement
+        } else {
+            add(newElement)
+        }
+    }
+
+    private companion object {
+        private const val TAG = "ServiceRecordAggregator"
+    }
+}

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

@@ -15,6 +15,9 @@ import java.time.OffsetDateTime
 class Subscription {
     var channel: SerializedChannel;
 
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var creationTime: OffsetDateTime = OffsetDateTime.MIN;
+
     //Settings
     var doNotifications: Boolean = false;
     var doFetchLive: Boolean = false;
@@ -55,6 +58,8 @@ class Subscription {
 
     constructor(channel : SerializedChannel) {
         this.channel = channel;
+        if(this.creationTime == OffsetDateTime.MIN)
+            this.creationTime = OffsetDateTime.now();
     }
 
     fun isChannel(url: String): Boolean {

app/src/main/java/com/futo/platformplayer/noise/crypto/Blake2bMessageDigest.java

@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+import com.futo.platformplayer.noise.protocol.Destroyable;
+
+/**
+ * Fallback implementation of BLAKE2b for the Noise library.
+ * 
+ * This implementation only supports message digesting with an output
+ * length of 64 bytes and a limit of 2^64 - 1 bytes of input.
+ * Keyed hashing and variable-length digests are not supported.
+ */
+public class Blake2bMessageDigest extends MessageDigest implements Destroyable {
+
+	private long[] h;
+	private byte[] block;
+	private long[] m;
+	private long[] v;
+	private long length;
+	private int posn;
+
+	/**
+	 * Constructs a new BLAKE2b message digest object.
+	 */
+	public Blake2bMessageDigest() {
+		super("BLAKE2B-512");
+		h = new long [8];
+		block = new byte [128];
+		m = new long [16];
+		v = new long [16];
+		engineReset();
+	}
+
+	@Override
+	protected byte[] engineDigest() {
+		byte[] digest = new byte [64];
+		try {
+			engineDigest(digest, 0, 64);
+		} catch (DigestException e) {
+			// Shouldn't happen, but just in case.
+			Arrays.fill(digest, (byte)0);
+		}
+		return digest;
+	}
+	
+	@Override
+	protected int engineDigest(byte[] buf, int offset, int len) throws DigestException
+	{
+		if (len < 64)
+			throw new DigestException("Invalid digest length for BLAKE2b");
+		Arrays.fill(block, posn, 128, (byte)0);
+		transform(-1);
+		for (int index = 0; index < 8; ++index) {
+			long value = h[index];
+			buf[offset++] = (byte)value;
+			buf[offset++] = (byte)(value >> 8);
+			buf[offset++] = (byte)(value >> 16);
+			buf[offset++] = (byte)(value >> 24);
+			buf[offset++] = (byte)(value >> 32);
+			buf[offset++] = (byte)(value >> 40);
+			buf[offset++] = (byte)(value >> 48);
+			buf[offset++] = (byte)(value >> 56);
+		}
+		return 32;
+	}
+
+	@Override
+	protected int engineGetDigestLength() {
+		return 64;
+	}
+
+	@Override
+	protected void engineReset() {
+		h[0] = 0x6a09e667f3bcc908L ^ 0x01010040;
+		h[1] = 0xbb67ae8584caa73bL;
+		h[2] = 0x3c6ef372fe94f82bL;
+		h[3] = 0xa54ff53a5f1d36f1L;
+		h[4] = 0x510e527fade682d1L;
+		h[5] = 0x9b05688c2b3e6c1fL;
+		h[6] = 0x1f83d9abfb41bd6bL;
+		h[7] = 0x5be0cd19137e2179L;
+		length = 0;
+		posn = 0;
+	}
+
+	@Override
+	protected void engineUpdate(byte input) {
+		if (posn >= 128) {
+			transform(0);
+			posn = 0;
+		}
+		block[posn++] = input;
+		++length;
+	}
+
+	@Override
+	protected void engineUpdate(byte[] input, int offset, int len) {
+		while (len > 0) {
+			if (posn >= 128) {
+				transform(0);
+				posn = 0;
+			}
+			int temp = (128 - posn);
+			if (temp > len)
+				temp = len;
+			System.arraycopy(input, offset, block, posn, temp);
+			posn += temp;
+			length += temp;
+			offset += temp;
+			len -= temp;
+		}
+	}
+
+	// Permutation on the message input state for BLAKE2b.
+	static final byte[][] sigma = {
+	    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15},
+	    {14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3},
+	    {11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4},
+	    { 7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8},
+	    { 9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13},
+	    { 2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9},
+	    {12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11},
+	    {13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10},
+	    { 6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5},
+	    {10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0},
+	    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15},
+	    {14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3},
+	};
+	
+	private void transform(long f0)
+	{
+		int index;
+		int offset;
+		
+		// Unpack the input block from little-endian into host-endian.
+		for (index = 0, offset = 0; index < 16; ++index, offset += 8) {
+			m[index] = (block[offset] & 0xFFL) |
+					   ((block[offset + 1] & 0xFFL) << 8) |
+					   ((block[offset + 2] & 0xFFL) << 16) |
+					   ((block[offset + 3] & 0xFFL) << 24) |
+					   ((block[offset + 4] & 0xFFL) << 32) |
+					   ((block[offset + 5] & 0xFFL) << 40) |
+					   ((block[offset + 6] & 0xFFL) << 48) |
+					   ((block[offset + 7] & 0xFFL) << 56);
+		}
+		
+		// Format the block to be hashed.
+		for (index = 0; index < 8; ++index)
+			v[index] = h[index];
+		v[8] = 0x6a09e667f3bcc908L;
+		v[9] = 0xbb67ae8584caa73bL;
+		v[10] = 0x3c6ef372fe94f82bL;
+		v[11] = 0xa54ff53a5f1d36f1L;
+		v[12] = 0x510e527fade682d1L ^ length;
+		v[13] = 0x9b05688c2b3e6c1fL;
+		v[14] = 0x1f83d9abfb41bd6bL ^ f0;
+		v[15] = 0x5be0cd19137e2179L;
+		
+		// Perform the 12 BLAKE2b rounds.
+		for (index = 0; index < 12; ++index) {
+			// Column round.
+	        quarterRound(0, 4, 8,  12, 0, index);
+	        quarterRound(1, 5, 9,  13, 1, index);
+	        quarterRound(2, 6, 10, 14, 2, index);
+	        quarterRound(3, 7, 11, 15, 3, index);
+
+	        // Diagonal round.
+	        quarterRound(0, 5, 10, 15, 4, index);
+	        quarterRound(1, 6, 11, 12, 5, index);
+	        quarterRound(2, 7, 8,  13, 6, index);
+	        quarterRound(3, 4, 9,  14, 7, index);
+		}
+		
+		// Combine the new and old hash values.
+		for (index = 0; index < 8; ++index)
+			h[index] ^= (v[index] ^ v[index + 8]);
+	}
+
+	private static long rightRotate32(long v)
+	{
+		return v << 32 | (v >>> 32);
+	}
+
+	private static long rightRotate24(long v)
+	{
+		return v << 40 | (v >>> 24);
+	}
+
+	private static long rightRotate16(long v)
+	{
+		return v << 48 | (v >>> 16);
+	}
+
+	private static long rightRotate63(long v)
+	{
+		return v << 1 | (v >>> 63);
+	}
+
+	private void quarterRound(int a, int b, int c, int d, int i, int row)
+	{
+		v[a] += v[b] + m[sigma[row][2 * i]];
+		v[d] = rightRotate32(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = rightRotate24(v[b] ^ v[c]);
+		v[a] += v[b] + m[sigma[row][2 * i + 1]];
+		v[d] = rightRotate16(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = rightRotate63(v[b] ^ v[c]);
+	}
+
+	@Override
+	public void destroy() {
+		Arrays.fill(h, (long)0);
+		Arrays.fill(block, (byte)0);
+		Arrays.fill(m, (long)0);
+		Arrays.fill(v, (long)0);
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/Blake2sMessageDigest.java

@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+import com.futo.platformplayer.noise.protocol.Destroyable;
+
+/**
+ * Fallback implementation of BLAKE2s for the Noise library.
+ * 
+ * This implementation only supports message digesting with an output
+ * length of 32 bytes.  Keyed hashing and variable-length digests are
+ * not supported.
+ */
+public class Blake2sMessageDigest extends MessageDigest implements Destroyable {
+	
+	private int[] h;
+	private byte[] block;
+	private int[] m;
+	private int[] v;
+	private long length;
+	private int posn;
+
+	/**
+	 * Constructs a new BLAKE2s message digest object.
+	 */
+	public Blake2sMessageDigest() {
+		super("BLAKE2S-256");
+		h = new int [8];
+		block = new byte [64];
+		m = new int [16];
+		v = new int [16];
+		engineReset();
+	}
+	
+	@Override
+	protected byte[] engineDigest() {
+		byte[] digest = new byte [32];
+		try {
+			engineDigest(digest, 0, 32);
+		} catch (DigestException e) {
+			// Shouldn't happen, but just in case.
+			Arrays.fill(digest, (byte)0);
+		}
+		return digest;
+	}
+	
+	@Override
+	protected int engineDigest(byte[] buf, int offset, int len) throws DigestException
+	{
+		if (len < 32)
+			throw new DigestException("Invalid digest length for BLAKE2s");
+		Arrays.fill(block, posn, 64, (byte)0);
+		transform(-1);
+		for (int index = 0; index < 8; ++index) {
+			int value = h[index];
+			buf[offset++] = (byte)value;
+			buf[offset++] = (byte)(value >> 8);
+			buf[offset++] = (byte)(value >> 16);
+			buf[offset++] = (byte)(value >> 24);
+		}
+		return 32;
+	}
+
+	@Override
+	protected int engineGetDigestLength() {
+		return 32;
+	}
+
+	@Override
+	protected void engineReset() {
+		h[0] = 0x6A09E667 ^ 0x01010020;
+		h[1] = 0xBB67AE85;
+		h[2] = 0x3C6EF372;
+		h[3] = 0xA54FF53A;
+		h[4] = 0x510E527F;
+		h[5] = 0x9B05688C;
+		h[6] = 0x1F83D9AB;
+		h[7] = 0x5BE0CD19;
+		length = 0;
+		posn = 0;
+	}
+
+	@Override
+	protected void engineUpdate(byte input) {
+		if (posn >= 64) {
+			transform(0);
+			posn = 0;
+		}
+		block[posn++] = input;
+		++length;
+	}
+
+	@Override
+	protected void engineUpdate(byte[] input, int offset, int len) {
+		while (len > 0) {
+			if (posn >= 64) {
+				transform(0);
+				posn = 0;
+			}
+			int temp = (64 - posn);
+			if (temp > len)
+				temp = len;
+			System.arraycopy(input, offset, block, posn, temp);
+			posn += temp;
+			length += temp;
+			offset += temp;
+			len -= temp;
+		}
+	}
+
+	// Permutation on the message input state for BLAKE2s.
+	static final byte[][] sigma = {
+	    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15},
+	    {14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3},
+	    {11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4},
+	    { 7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8},
+	    { 9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13},
+	    { 2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9},
+	    {12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11},
+	    {13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10},
+	    { 6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5},
+	    {10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0}
+	};
+	
+	private void transform(int f0)
+	{
+		int index;
+		int offset;
+		
+		// Unpack the input block from little-endian into host-endian.
+		for (index = 0, offset = 0; index < 16; ++index, offset += 4) {
+			m[index] = (block[offset] & 0xFF) |
+					   ((block[offset + 1] & 0xFF) << 8) |
+					   ((block[offset + 2] & 0xFF) << 16) |
+					   ((block[offset + 3] & 0xFF) << 24);
+		}
+		
+		// Format the block to be hashed.
+		for (index = 0; index < 8; ++index)
+			v[index] = h[index];
+		v[8] = 0x6A09E667;
+		v[9] = 0xBB67AE85;
+		v[10] = 0x3C6EF372;
+		v[11] = 0xA54FF53A;
+		v[12] = 0x510E527F ^ (int)length;
+		v[13] = 0x9B05688C ^ (int)(length >> 32);
+		v[14] = 0x1F83D9AB ^ f0;
+		v[15] = 0x5BE0CD19;
+		
+		// Perform the 10 BLAKE2s rounds.
+		for (index = 0; index < 10; ++index) {
+			// Column round.
+	        quarterRound(0, 4, 8,  12, 0, index);
+	        quarterRound(1, 5, 9,  13, 1, index);
+	        quarterRound(2, 6, 10, 14, 2, index);
+	        quarterRound(3, 7, 11, 15, 3, index);
+
+	        // Diagonal round.
+	        quarterRound(0, 5, 10, 15, 4, index);
+	        quarterRound(1, 6, 11, 12, 5, index);
+	        quarterRound(2, 7, 8,  13, 6, index);
+	        quarterRound(3, 4, 9,  14, 7, index);
+		}
+		
+		// Combine the new and old hash values.
+		for (index = 0; index < 8; ++index)
+			h[index] ^= (v[index] ^ v[index + 8]);
+	}
+	
+	private static int rightRotate16(int v)
+	{
+		return v << 16 | (v >>> 16);
+	}
+
+	private static int rightRotate12(int v)
+	{
+		return v << 20 | (v >>> 12);
+	}
+
+	private static int rightRotate8(int v)
+	{
+		return v << 24 | (v >>> 8);
+	}
+
+	private static int rightRotate7(int v)
+	{
+		return v << 25 | (v >>> 7);
+	}
+
+	private void quarterRound(int a, int b, int c, int d, int i, int row)
+	{
+		v[a] += v[b] + m[sigma[row][2 * i]];
+		v[d] = rightRotate16(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = rightRotate12(v[b] ^ v[c]);
+		v[a] += v[b] + m[sigma[row][2 * i + 1]];
+		v[d] = rightRotate8(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = rightRotate7(v[b] ^ v[c]);
+	}
+
+	@Override
+	public void destroy() {
+		Arrays.fill(h, (int)0);
+		Arrays.fill(block, (byte)0);
+		Arrays.fill(m, (int)0);
+		Arrays.fill(v, (int)0);
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/ChaChaCore.java

@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+/**
+ * Implementation of the ChaCha20 core hash transformation.
+ */
+public final class ChaChaCore {
+
+	private ChaChaCore() {}
+	
+	/**
+	 * Hashes an input block with ChaCha20.
+	 * 
+	 * @param output The output block, which must contain at least 16
+	 * elements and must not overlap with the input.
+	 * @param input The input block, which must contain at least 16
+	 * elements.
+	 */
+	public static void hash(int[] output, int[] input)
+	{
+		int index;
+		
+		// Copy the input to the output to start with.
+		for (index = 0; index < 16; ++index)
+			output[index] = input[index];
+		
+		// Perform the 20 ChaCha rounds in groups of two.
+		for (index = 0; index < 20; index += 2) {
+	        // Column round.
+	        quarterRound(output, 0, 4, 8,  12);
+	        quarterRound(output, 1, 5, 9,  13);
+	        quarterRound(output, 2, 6, 10, 14);
+	        quarterRound(output, 3, 7, 11, 15);
+
+	        // Diagonal round.
+	        quarterRound(output, 0, 5, 10, 15);
+	        quarterRound(output, 1, 6, 11, 12);
+	        quarterRound(output, 2, 7, 8,  13);
+	        quarterRound(output, 3, 4, 9,  14);
+		}
+
+		// Add the input block to the output.
+		for (index = 0; index < 16; ++index)
+			output[index] += input[index];
+	}
+
+	private static int char4(char c1, char c2, char c3, char c4)
+	{
+		return (((int)c1) & 0xFF) | ((((int)c2) & 0xFF) << 8) | ((((int)c3) & 0xFF) << 16) | ((((int)c4) & 0xFF) << 24);
+	}
+
+	private static int fromLittleEndian(byte[] key, int offset)
+	{
+		return (key[offset] & 0xFF) | ((key[offset + 1] & 0xFF) << 8) | ((key[offset + 2] & 0xFF) << 16) | ((key[offset + 3] & 0xFF) << 24);
+	}
+
+	/**
+	 * Initializes a ChaCha20 block with a 128-bit key.
+	 * 
+	 * @param output The output block, which must consist of at
+	 * least 16 words.
+	 * @param key The buffer containing the key.
+	 * @param offset Offset of the key in the buffer.
+	 */
+	public static void initKey128(int[] output, byte[] key, int offset)
+	{
+		output[0] = char4('e', 'x', 'p', 'a');
+		output[1] = char4('n', 'd', ' ', '1');
+		output[2] = char4('6', '-', 'b', 'y');
+		output[3] = char4('t', 'e', ' ', 'k');
+		output[4] = fromLittleEndian(key, offset);
+		output[5] = fromLittleEndian(key, offset + 4);
+		output[6] = fromLittleEndian(key, offset + 8);
+		output[7] = fromLittleEndian(key, offset + 12);
+		output[8] = output[4];
+		output[9] = output[5];
+		output[10] = output[6];
+		output[11] = output[7];
+		output[12] = 0;
+		output[13] = 0;
+		output[14] = 0;
+		output[15] = 0;
+	}
+
+	/**
+	 * Initializes a ChaCha20 block with a 256-bit key.
+	 * 
+	 * @param output The output block, which must consist of at
+	 * least 16 words.
+	 * @param key The buffer containing the key.
+	 * @param offset Offset of the key in the buffer.
+	 */
+	public static void initKey256(int[] output, byte[] key, int offset)
+	{
+		output[0] = char4('e', 'x', 'p', 'a');
+		output[1] = char4('n', 'd', ' ', '3');
+		output[2] = char4('2', '-', 'b', 'y');
+		output[3] = char4('t', 'e', ' ', 'k');
+		output[4] = fromLittleEndian(key, offset);
+		output[5] = fromLittleEndian(key, offset + 4);
+		output[6] = fromLittleEndian(key, offset + 8);
+		output[7] = fromLittleEndian(key, offset + 12);
+		output[8] = fromLittleEndian(key, offset + 16);
+		output[9] = fromLittleEndian(key, offset + 20);
+		output[10] = fromLittleEndian(key, offset + 24);
+		output[11] = fromLittleEndian(key, offset + 28);
+		output[12] = 0;
+		output[13] = 0;
+		output[14] = 0;
+		output[15] = 0;
+	}
+
+	/**
+	 * Initializes the 64-bit initialization vector in a ChaCha20 block.
+	 * 
+	 * @param output The output block, which must consist of at
+	 * least 16 words and must have been initialized by initKey256()
+	 * or initKey128().
+	 * @param iv The 64-bit initialization vector value.
+	 * 
+	 * The counter portion of the output block is set to zero.
+	 */
+	public static void initIV(int[] output, long iv)
+	{
+		output[12] = 0;
+		output[13] = 0;
+		output[14] = (int)iv;
+		output[15] = (int)(iv >> 32);
+	}
+	
+	/**
+	 * Initializes the 64-bit initialization vector and counter in a ChaCha20 block.
+	 * 
+	 * @param output The output block, which must consist of at
+	 * least 16 words and must have been initialized by initKey256()
+	 * or initKey128().
+	 * @param iv The 64-bit initialization vector value.
+	 * @param counter The 64-bit counter value.
+	 */
+	public static void initIV(int[] output, long iv, long counter)
+	{
+		output[12] = (int)counter;
+		output[13] = (int)(counter >> 32);
+		output[14] = (int)iv;
+		output[15] = (int)(iv >> 32);
+	}
+	
+	private static int leftRotate16(int v)
+	{
+		return v << 16 | (v >>> 16);
+	}
+
+	private static int leftRotate12(int v)
+	{
+		return v << 12 | (v >>> 20);
+	}
+
+	private static int leftRotate8(int v)
+	{
+		return v << 8 | (v >>> 24);
+	}
+
+	private static int leftRotate7(int v)
+	{
+		return v << 7 | (v >>> 25);
+	}
+
+	private static void quarterRound(int[] v, int a, int b, int c, int d)
+	{
+		v[a] += v[b];
+		v[d] = leftRotate16(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = leftRotate12(v[b] ^ v[c]);
+		v[a] += v[b];
+		v[d] = leftRotate8(v[d] ^ v[a]);
+		v[c] += v[d];
+		v[b] = leftRotate7(v[b] ^ v[c]);
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/Curve25519.java

@@ -0,0 +1,531 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.util.Arrays;
+
+/**
+ * Implementation of the Curve25519 elliptic curve algorithm.
+ * 
+ * This implementation is based on that from arduinolibs:
+ * https://github.com/rweather/arduinolibs
+ *
+ * Differences in this version are due to using 26-bit limbs for the
+ * representation instead of the 8/16/32-bit limbs in the original.
+ * 
+ * References: http://cr.yp.to/ecdh.html, RFC 7748
+ */
+public final class Curve25519 {
+
+	// Numbers modulo 2^255 - 19 are broken up into ten 26-bit words.
+	private static final int NUM_LIMBS_255BIT = 10;
+	private static final int NUM_LIMBS_510BIT = 20;
+	private int[] x_1;
+	private int[] x_2;
+	private int[] x_3;
+	private int[] z_2;
+	private int[] z_3;
+	private int[] A;
+	private int[] B;
+	private int[] C;
+	private int[] D;
+	private int[] E;
+	private int[] AA;
+	private int[] BB;
+	private int[] DA;
+	private int[] CB;
+	private long[] t1;
+	private int[] t2;
+
+	/**
+	 * Constructs the temporary state holder for Curve25519 evaluation.
+	 */
+	private Curve25519()
+	{
+		// Allocate memory for all of the temporary variables we will need.
+		x_1 = new int [NUM_LIMBS_255BIT];
+		x_2 = new int [NUM_LIMBS_255BIT];
+		x_3 = new int [NUM_LIMBS_255BIT];
+		z_2 = new int [NUM_LIMBS_255BIT];
+		z_3 = new int [NUM_LIMBS_255BIT];
+		A = new int [NUM_LIMBS_255BIT];
+		B = new int [NUM_LIMBS_255BIT];
+		C = new int [NUM_LIMBS_255BIT];
+		D = new int [NUM_LIMBS_255BIT];
+		E = new int [NUM_LIMBS_255BIT];
+		AA = new int [NUM_LIMBS_255BIT];
+		BB = new int [NUM_LIMBS_255BIT];
+		DA = new int [NUM_LIMBS_255BIT];
+		CB = new int [NUM_LIMBS_255BIT];
+		t1 = new long [NUM_LIMBS_510BIT];
+		t2 = new int [NUM_LIMBS_510BIT];
+	}
+	
+
+	/**
+	 * Destroy all sensitive data in this object.
+	 */
+	private void destroy() {
+		// Destroy all temporary variables.
+		Arrays.fill(x_1, 0);
+		Arrays.fill(x_2, 0);
+		Arrays.fill(x_3, 0);
+		Arrays.fill(z_2, 0);
+		Arrays.fill(z_3, 0);
+		Arrays.fill(A, 0);
+		Arrays.fill(B, 0);
+		Arrays.fill(C, 0);
+		Arrays.fill(D, 0);
+		Arrays.fill(E, 0);
+		Arrays.fill(AA, 0);
+		Arrays.fill(BB, 0);
+		Arrays.fill(DA, 0);
+		Arrays.fill(CB, 0);
+		Arrays.fill(t1,  0L);
+		Arrays.fill(t2,  0);
+	}
+
+	/**
+	 * Reduces a number modulo 2^255 - 19 where it is known that the
+	 * number can be reduced with only 1 trial subtraction.
+	 * 
+	 * @param x The number to reduce, and the result.
+	 */
+	private void reduceQuick(int[] x)
+	{
+		int index, carry;
+		
+	    // Perform a trial subtraction of (2^255 - 19) from "x" which is
+	    // equivalent to adding 19 and subtracting 2^255.  We add 19 here;
+	    // the subtraction of 2^255 occurs in the next step.
+		carry = 19;
+		for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+			carry += x[index];
+			t2[index] = carry & 0x03FFFFFF;
+			carry >>= 26;
+		}
+
+	    // If there was a borrow, then the original "x" is the correct answer.
+	    // If there was no borrow, then "t2" is the correct answer.  Select the
+	    // correct answer but do it in a way that instruction timing will not
+	    // reveal which value was selected.  Borrow will occur if bit 21 of
+	    // "t2" is zero.  Turn the bit into a selection mask.
+		int mask = -((t2[NUM_LIMBS_255BIT - 1] >> 21) & 0x01);
+		int nmask = ~mask;
+		t2[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
+		for (index = 0; index < NUM_LIMBS_255BIT; ++index)
+			x[index] = (x[index] & nmask) | (t2[index] & mask);
+	}
+
+	/**
+	 * Reduce a number modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The value to be reduced.  This array will be
+	 * modified during the reduction.
+	 * @param size The number of limbs in the high order half of x.
+	 */
+	private void reduce(int[] result, int[] x, int size)
+	{
+		int index, limb, carry;
+		
+	    // Calculate (x mod 2^255) + ((x / 2^255) * 19) which will
+	    // either produce the answer we want or it will produce a
+	    // value of the form "answer + j * (2^255 - 19)".  There are
+		// 5 left-over bits in the top-most limb of the bottom half.
+		carry = 0;
+		limb = x[NUM_LIMBS_255BIT - 1] >> 21;
+		x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
+		for (index = 0; index < size; ++index) {
+			limb += x[NUM_LIMBS_255BIT + index] << 5;
+			carry += (limb & 0x03FFFFFF) * 19 + x[index];
+			x[index] = carry & 0x03FFFFFF;
+			limb >>= 26;
+			carry >>= 26;
+		}
+		if (size < NUM_LIMBS_255BIT) {
+	        // The high order half of the number is short; e.g. for mulA24().
+	        // Propagate the carry through the rest of the low order part.
+			for (index = size; index < NUM_LIMBS_255BIT; ++index) {
+				carry += x[index];
+				x[index] = carry & 0x03FFFFFF;
+				carry >>= 26;
+			}
+		}
+
+	    // The "j" value may still be too large due to the final carry-out.
+	    // We must repeat the reduction.  If we already have the answer,
+	    // then this won't do any harm but we must still do the calculation
+	    // to preserve the overall timing.  The "j" value will be between
+		// 0 and 19, which means that the carry we care about is in the
+		// top 5 bits of the highest limb of the bottom half.
+		carry = (x[NUM_LIMBS_255BIT - 1] >> 21) * 19;
+		x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
+		for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+			carry += x[index];
+			result[index] = carry & 0x03FFFFFF;
+			carry >>= 26;
+		}
+
+		// At this point "x" will either be the answer or it will be the
+	    // answer plus (2^255 - 19).  Perform a trial subtraction to
+		// complete the reduction process.
+		reduceQuick(result);
+	}
+
+	/**
+	 * Multiplies two numbers modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The first number to multiply.
+	 * @param y The second number to multiply.
+	 */
+	private void mul(int[] result, int[] x, int[] y)
+	{
+		int i, j;
+		
+		// Multiply the two numbers to create the intermediate result.
+		long v = x[0];
+		for (i = 0; i < NUM_LIMBS_255BIT; ++i) {
+			t1[i] = v * y[i];
+		}
+		for (i = 1; i < NUM_LIMBS_255BIT; ++i) {
+			v = x[i];
+			for (j = 0; j < (NUM_LIMBS_255BIT - 1); ++j) {
+				t1[i + j] += v * y[j];
+			}
+			t1[i + NUM_LIMBS_255BIT - 1] = v * y[NUM_LIMBS_255BIT - 1];
+		}
+		
+		// Propagate carries and convert back into 26-bit words.
+		v = t1[0];
+		t2[0] = ((int)v) & 0x03FFFFFF;
+		for (i = 1; i < NUM_LIMBS_510BIT; ++i) {
+			v = (v >> 26) + t1[i];
+			t2[i] = ((int)v) & 0x03FFFFFF;
+		}
+		
+		// Reduce the result modulo 2^255 - 19.
+		reduce(result, t2, NUM_LIMBS_255BIT);
+	}
+	
+	/**
+	 * Squares a number modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The number to square.
+	 */
+	private void square(int[] result, int[] x)
+	{
+		mul(result, x, x);
+	}
+
+	/**
+	 * Multiplies a number by the a24 constant, modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The number to multiply by a24.
+	 */
+	private void mulA24(int[] result, int[] x)
+	{
+		long a24 = 121665;
+		long carry = 0;
+		int index;
+		for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+			carry += a24 * x[index];
+			t2[index] = ((int)carry) & 0x03FFFFFF;
+			carry >>= 26;
+		}
+		t2[NUM_LIMBS_255BIT] = ((int)carry) & 0x03FFFFFF;
+		reduce(result, t2, 1);
+	}
+
+	/**
+	 * Adds two numbers modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The first number to add.
+	 * @param y The second number to add.
+	 */
+	private void add(int[] result, int[] x, int[] y)
+	{
+		int index, carry;
+		carry = x[0] + y[0];
+		result[0] = carry & 0x03FFFFFF;
+		for (index = 1; index < NUM_LIMBS_255BIT; ++index) {
+			carry = (carry >> 26) + x[index] + y[index];
+			result[index] = carry & 0x03FFFFFF;
+		}
+		reduceQuick(result);
+	}
+
+	/**
+	 * Subtracts two numbers modulo 2^255 - 19.
+	 * 
+	 * @param result The result.
+	 * @param x The first number to subtract.
+	 * @param y The second number to subtract.
+	 */
+	private void sub(int[] result, int[] x, int[] y)
+	{
+		int index, borrow;
+		
+	    // Subtract y from x to generate the intermediate result.
+		borrow = 0;
+		for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+			borrow = x[index] - y[index] - ((borrow >> 26) & 0x01);
+			result[index] = borrow & 0x03FFFFFF;
+		}
+
+	    // If we had a borrow, then the result has gone negative and we
+	    // have to add 2^255 - 19 to the result to make it positive again.
+	    // The top bits of "borrow" will be all 1's if there is a borrow
+	    // or it will be all 0's if there was no borrow.  Easiest is to
+	    // conditionally subtract 19 and then mask off the high bits.
+		borrow = result[0] - ((-((borrow >> 26) & 0x01)) & 19);
+		result[0] = borrow & 0x03FFFFFF;
+		for (index = 1; index < NUM_LIMBS_255BIT; ++index) {
+			borrow = result[index] - ((borrow >> 26) & 0x01);
+			result[index] = borrow & 0x03FFFFFF;
+		}
+		result[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
+	}
+	
+	/**
+	 * Conditional swap of two values.
+	 * 
+	 * @param select Set to 1 to swap, 0 to leave as-is.
+	 * @param x The first value.
+	 * @param y The second value.
+	 */
+	private static void cswap(int select, int[] x, int[] y)
+	{
+		int dummy;
+		select = -select;
+		for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
+			dummy = select & (x[index] ^ y[index]);
+			x[index] ^= dummy;
+			y[index] ^= dummy;
+		}
+	}
+
+	/**
+	 * Raise x to the power of (2^250 - 1).
+	 * 
+	 * @param result The result.  Must not overlap with x.
+	 * @param x The argument.
+	 */
+	private void pow250(int[] result, int[] x)
+	{
+		int i, j;
+		
+	    // The big-endian hexadecimal expansion of (2^250 - 1) is:
+	    // 03FFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF
+	    //
+	    // The naive implementation needs to do 2 multiplications per 1 bit and
+	    // 1 multiplication per 0 bit.  We can improve upon this by creating a
+	    // pattern 0000000001 ... 0000000001.  If we square and multiply the
+	    // pattern by itself we can turn the pattern into the partial results
+	    // 0000000011 ... 0000000011, 0000000111 ... 0000000111, etc.
+	    // This averages out to about 1.1 multiplications per 1 bit instead of 2.
+
+	    // Build a pattern of 250 bits in length of repeated copies of 0000000001.
+		square(A, x);
+		for (j = 0; j < 9; ++j)
+			square(A, A);
+		mul(result, A, x);
+		for (i = 0; i < 23; ++i) {
+			for (j = 0; j < 10; ++j)
+				square(A, A);
+			mul(result, result, A);
+		}
+
+	    // Multiply bit-shifted versions of the 0000000001 pattern into
+	    // the result to "fill in" the gaps in the pattern.
+		square(A, result);
+		mul(result, result, A);
+		for (j = 0; j < 8; ++j) {
+			square(A, A);
+			mul(result, result, A);
+		}
+	}
+
+	/**
+	 * Computes the reciprocal of a number modulo 2^255 - 19.
+	 * 
+	 * @param result The result.  Must not overlap with x.
+	 * @param x The argument.
+	 */
+	private void recip(int[] result, int[] x)
+	{
+	    // The reciprocal is the same as x ^ (p - 2) where p = 2^255 - 19.
+	    // The big-endian hexadecimal expansion of (p - 2) is:
+	    // 7FFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFEB
+	    // Start with the 250 upper bits of the expansion of (p - 2).
+	    pow250(result, x);
+
+	    // Deal with the 5 lowest bits of (p - 2), 01011, from highest to lowest.
+	    square(result, result);
+	    square(result, result);
+	    mul(result, result, x);
+	    square(result, result);
+	    square(result, result);
+	    mul(result, result, x);
+	    square(result, result);
+	    mul(result, result, x);
+	}
+
+	/**
+	 * Evaluates the curve for every bit in a secret key.
+	 * 
+	 * @param s The 32-byte secret key.
+	 */
+	private void evalCurve(byte[] s)
+	{
+		int sposn = 31;
+		int sbit = 6;
+		int svalue = s[sposn] | 0x40;
+		int swap = 0;
+		int select;
+
+	    // Iterate over all 255 bits of "s" from the highest to the lowest.
+	    // We ignore the high bit of the 256-bit representation of "s".
+		for (;;) {
+	        // Conditional swaps on entry to this bit but only if we
+	        // didn't swap on the previous bit.
+			select = (svalue >> sbit) & 0x01;
+			swap ^= select;
+	        cswap(swap, x_2, x_3);
+	        cswap(swap, z_2, z_3);
+	        swap = select;
+
+	        // Evaluate the curve.
+	        add(A, x_2, z_2);               // A = x_2 + z_2
+	        square(AA, A);                  // AA = A^2
+	        sub(B, x_2, z_2);               // B = x_2 - z_2
+	        square(BB, B);                  // BB = B^2
+	        sub(E, AA, BB);                 // E = AA - BB
+	        add(C, x_3, z_3);               // C = x_3 + z_3
+	        sub(D, x_3, z_3);               // D = x_3 - z_3
+	        mul(DA, D, A);                  // DA = D * A
+	        mul(CB, C, B);                  // CB = C * B
+	        add(x_3, DA, CB);               // x_3 = (DA + CB)^2
+	        square(x_3, x_3);
+	        sub(z_3, DA, CB);               // z_3 = x_1 * (DA - CB)^2
+	        square(z_3, z_3);
+	        mul(z_3, z_3, x_1);
+	        mul(x_2, AA, BB);               // x_2 = AA * BB
+	        mulA24(z_2, E);                 // z_2 = E * (AA + a24 * E)
+	        add(z_2, z_2, AA);
+	        mul(z_2, z_2, E);
+
+	        // Move onto the next lower bit of "s".
+	        if (sbit > 0) {
+	        	--sbit;
+	        } else if (sposn == 0) {
+	        	break;
+	        } else if (sposn == 1) {
+	        	--sposn;
+	        	svalue = s[sposn] & 0xF8;
+	        	sbit = 7;
+	        } else {
+	        	--sposn;
+	        	svalue = s[sposn];
+	        	sbit = 7;
+	        }
+		}
+
+	    // Final conditional swaps.
+	    cswap(swap, x_2, x_3);
+	    cswap(swap, z_2, z_3);
+	}
+
+	/**
+	 * Evaluates the Curve25519 curve.
+	 * 
+	 * @param result Buffer to place the result of the evaluation into.
+	 * @param offset Offset into the result buffer.
+	 * @param privateKey The private key to use in the evaluation.
+	 * @param publicKey The public key to use in the evaluation, or null
+	 * if the base point of the curve should be used.
+	 */
+	public static void eval(byte[] result, int offset, byte[] privateKey, byte[] publicKey)
+	{
+		Curve25519 state = new Curve25519();
+		try {
+			// Unpack the public key value.  If null, use 9 as the base point.
+			Arrays.fill(state.x_1, 0);
+			if (publicKey != null) {
+				// Convert the input value from little-endian into 26-bit limbs.
+			    for (int index = 0; index < 32; ++index) {
+			    	int bit = (index * 8) % 26;
+			    	int word = (index * 8) / 26;
+			    	int value = publicKey[index] & 0xFF;
+			    	if (bit <= (26 - 8)) {
+			    		state.x_1[word] |= value << bit;
+			    	} else {
+			    		state.x_1[word] |= value << bit;
+			    		state.x_1[word] &= 0x03FFFFFF;
+			    		state.x_1[word + 1] |= value >> (26 - bit);
+			    	}
+			    }
+
+				// Just in case, we reduce the number modulo 2^255 - 19 to
+				// make sure that it is in range of the field before we start.
+				// This eliminates values between 2^255 - 19 and 2^256 - 1.
+				state.reduceQuick(state.x_1);
+				state.reduceQuick(state.x_1);
+			} else {
+				state.x_1[0] = 9;
+			}
+
+			// Initialize the other temporary variables.
+			Arrays.fill(state.x_2, 0);			// x_2 = 1
+			state.x_2[0] = 1;
+			Arrays.fill(state.z_2, 0);			// z_2 = 0
+			System.arraycopy(state.x_1, 0, state.x_3, 0, state.x_1.length);  // x_3 = x_1
+			Arrays.fill(state.z_3, 0);			// z_3 = 1
+			state.z_3[0] = 1;
+			
+			// Evaluate the curve for every bit of the private key.
+			state.evalCurve(privateKey);
+
+		    // Compute x_2 * (z_2 ^ (p - 2)) where p = 2^255 - 19.
+		    state.recip(state.z_3, state.z_2);
+		    state.mul(state.x_2, state.x_2, state.z_3);
+
+		    // Convert x_2 into little-endian in the result buffer.
+		    for (int index = 0; index < 32; ++index) {
+		    	int bit = (index * 8) % 26;
+		    	int word = (index * 8) / 26;
+		    	if (bit <= (26 - 8))
+		    		result[offset + index] = (byte)(state.x_2[word] >> bit);
+		    	else
+		    		result[offset + index] = (byte)((state.x_2[word] >> bit) | (state.x_2[word + 1] << (26 - bit)));
+		    }
+		} finally {
+			// Clean up all temporary state before we exit.
+			state.destroy();
+		}
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/Curve448.java

@@ -0,0 +1,622 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+
+Portions of this code were extracted from the p448/arch_32 field
+arithmetic implementation in Ed448-Goldilocks and converted from
+C into Java.  The LICENSE.txt file for the imported code follows:
+
+----
+The MIT License (MIT)
+
+Copyright (c) 2011 Stanford University.
+Copyright (c) 2014 Cryptography Research, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+----
+
+*/
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.util.Arrays;
+
+/**
+ * Implementation of the Curve448 elliptic curve algorithm.
+ * 
+ * Reference: RFC 7748
+ */
+public final class Curve448 {
+
+	// Numbers modulo 2^448 - 2^224 - 1 are broken up into sixteen 28-bit words.
+	private int[] x_1;
+	private int[] x_2;
+	private int[] x_3;
+	private int[] z_2;
+	private int[] z_3;
+	private int[] A;
+	private int[] B;
+	private int[] C;
+	private int[] D;
+	private int[] E;
+	private int[] AA;
+	private int[] BB;
+	private int[] DA;
+	private int[] CB;
+	private int[] aa;
+	private int[] bb;
+
+	/**
+	 * Constructs the temporary state holder for Curve448 evaluation.
+	 */
+	private Curve448()
+	{
+		// Allocate memory for all of the temporary variables we will need.
+		x_1 = new int [16];
+		x_2 = new int [16];
+		x_3 = new int [16];
+		z_2 = new int [16];
+		z_3 = new int [16];
+		A = new int [16];
+		B = new int [16];
+		C = new int [16];
+		D = new int [16];
+		E = new int [16];
+		AA = new int [16];
+		BB = new int [16];
+		DA = new int [16];
+		CB = new int [16];
+		aa = new int [8];
+		bb = new int [8];
+	}
+
+	/**
+	 * Destroy all sensitive data in this object.
+	 */
+	private void destroy() {
+		// Destroy all temporary variables.
+		Arrays.fill(x_1, 0);
+		Arrays.fill(x_2, 0);
+		Arrays.fill(x_3, 0);
+		Arrays.fill(z_2, 0);
+		Arrays.fill(z_3, 0);
+		Arrays.fill(A, 0);
+		Arrays.fill(B, 0);
+		Arrays.fill(C, 0);
+		Arrays.fill(D, 0);
+		Arrays.fill(E, 0);
+		Arrays.fill(AA, 0);
+		Arrays.fill(BB, 0);
+		Arrays.fill(DA, 0);
+		Arrays.fill(CB, 0);
+		Arrays.fill(aa, 0);
+		Arrays.fill(bb, 0);
+	}
+
+	/* Beginning of code imported from Ed448-Goldilocks */
+	
+	private static long widemul_32(int a, int b)
+	{
+		return ((long)a) * b;
+	}
+
+	// p448_mul()
+	private void mul(int[] c, int[] a, int[] b)
+	{
+	    long accum0 = 0, accum1 = 0, accum2 = 0;
+	    int mask = (1<<28) - 1;
+
+	    int i,j;
+	    for (i=0; i<8; i++) {
+	        aa[i] = a[i] + a[i+8];
+	        bb[i] = b[i] + b[i+8];
+	    }
+
+	    for (j=0; j<8; j++) {
+	        accum2 = 0;
+
+	        for (i=0; i<=j; i++) {
+	            accum2 += widemul_32(a[j-i],b[i]);
+	            accum1 += widemul_32(aa[j-i],bb[i]);
+	            accum0 += widemul_32(a[8+j-i], b[8+i]);
+	        }
+
+	        accum1 -= accum2;
+	        accum0 += accum2;
+	        accum2 = 0;
+
+	        for (; i<8; i++) {
+	            accum0 -= widemul_32(a[8+j-i], b[i]);
+	            accum2 += widemul_32(aa[8+j-i], bb[i]);
+	            accum1 += widemul_32(a[16+j-i], b[8+i]);
+	        }
+
+	        accum1 += accum2;
+	        accum0 += accum2;
+
+	        c[j] = ((int)(accum0)) & mask;
+	        c[j+8] = ((int)(accum1)) & mask;
+
+	        accum0 >>>= 28;
+	        accum1 >>>= 28;
+	    }
+
+	    accum0 += accum1;
+	    accum0 += c[8];
+	    accum1 += c[0];
+	    c[8] = ((int)(accum0)) & mask;
+	    c[0] = ((int)(accum1)) & mask;
+
+	    accum0 >>>= 28;
+	    accum1 >>>= 28;
+	    c[9] += ((int)(accum0));
+	    c[1] += ((int)(accum1));
+	}
+
+	// p448_mulw()
+	private static void mulw(int[] c, int[] a, long b)
+	{
+	    int bhi = (int)(b>>28), blo = ((int)b) & ((1<<28)-1);
+
+	    long accum0, accum8;
+	    int mask = (1<<28) - 1;
+
+	    int i;
+
+	    accum0 = widemul_32(blo, a[0]);
+	    accum8 = widemul_32(blo, a[8]);
+	    accum0 += widemul_32(bhi, a[15]);
+	    accum8 += widemul_32(bhi, a[15] + a[7]);
+
+	    c[0] = ((int)accum0) & mask; accum0 >>>= 28;
+	    c[8] = ((int)accum8) & mask; accum8 >>>= 28;
+
+	    for (i=1; i<8; i++) {
+	        accum0 += widemul_32(blo, a[i]);
+	        accum8 += widemul_32(blo, a[i+8]);
+
+	        accum0 += widemul_32(bhi, a[i-1]);
+	        accum8 += widemul_32(bhi, a[i+7]);
+
+	        c[i] = ((int)accum0) & mask; accum0 >>>= 28;
+	        c[i+8] = ((int)accum8) & mask; accum8 >>>= 28;
+	    }
+
+	    accum0 += accum8 + c[8];
+	    c[8] = ((int)accum0) & mask;
+	    c[9] += accum0 >>> 28;
+
+	    accum8 += c[0];
+	    c[0] = ((int)accum8) & mask;
+	    c[1] += accum8 >>> 28;
+	}
+
+	// p448_weak_reduce
+	private static void weak_reduce(int[] a)
+	{
+	    int mask = (1<<28) - 1;
+	    int tmp = a[15] >>> 28;
+	    int i;
+	    a[8] += tmp;
+	    for (i=15; i>0; i--) {
+	        a[i] = (a[i] & mask) + (a[i-1]>>>28);
+	    }
+	    a[0] = (a[0] & mask) + tmp;
+	}
+
+	// p448_strong_reduce
+	private static void strong_reduce(int[] a)
+	{
+	    int mask = (1<<28) - 1;
+
+	    /* first, clear high */
+	    a[8] += a[15]>>>28;
+	    a[0] += a[15]>>>28;
+	    a[15] &= mask;
+
+	    /* now the total is less than 2^448 - 2^(448-56) + 2^(448-56+8) < 2p */
+
+	    /* compute total_value - p.  No need to reduce mod p. */
+
+	    long scarry = 0;
+	    int i;
+	    for (i=0; i<16; i++) {
+	        scarry = scarry + (a[i] & 0xFFFFFFFFL) - ((i==8)?mask-1:mask);
+	        a[i] = (int)(scarry & mask);
+	        scarry >>= 28;
+	    }
+
+	    /* uncommon case: it was >= p, so now scarry = 0 and this = x
+	     * common case: it was < p, so now scarry = -1 and this = x - p + 2^448
+	     * so let's add back in p.  will carry back off the top for 2^448.
+	     */
+
+	     int scarry_mask = (int)(scarry & mask);
+	     long carry = 0;
+
+	     /* add it back */
+	     for (i=0; i<16; i++) {
+	         carry = carry + (a[i] & 0xFFFFFFFFL) + ((i==8)?(scarry_mask&~1):scarry_mask);
+	         a[i] = (int)(carry & mask);
+	         carry >>>= 28;
+	     }
+	}
+
+	// field_add()
+	private static void add(int[] out, int[] a, int[] b)
+	{
+		for (int i = 0; i < 16; ++i)
+			out[i] = a[i] + b[i];
+		weak_reduce(out);
+	}
+	
+	// field_sub()
+	private static void sub(int[] out, int[] a, int[] b)
+	{
+		int i;
+		
+		// p448_sub_RAW(out, a, b)
+		for (i = 0; i < 16; ++i)
+			out[i] = a[i] - b[i];
+		
+		// p448_bias(out, 2)
+		int co1 = ((1 << 28) - 1) * 2;
+		int co2 = co1 - 2;
+		for (i = 0; i < 16; ++i) {
+			if (i != 8)
+				out[i] += co1;
+			else
+				out[i] += co2;
+		}
+		
+		weak_reduce(out);
+	}
+
+	// p448_serialize()
+	private static void serialize(byte[] serial, int offset, int[] x)
+	{
+	    int i,j;
+	    for (i=0; i<8; i++) {
+	        long limb = x[2*i] + (((long)x[2*i+1])<<28);
+	        for (j=0; j<7; j++) {
+	            serial[offset+7*i+j] = (byte)limb;
+	            limb >>= 8;
+	        }
+	    }
+	}
+
+	private static int is_zero(int x)
+	{
+	    long xx = x & 0xFFFFFFFFL;
+	    xx--;
+	    return (int)(xx >> 32);
+	}
+
+	// p448_deserialize()
+	private static int deserialize(int[] x, byte[] serial, int offset)
+	{
+	    int i,j;
+	    for (i=0; i<8; i++) {
+	        long out = 0;
+	        for (j=0; j<7; j++) {
+	            out |= (serial[offset+7*i+j] & 0xFFL)<<(8*j);
+	        }
+	        x[2*i] = ((int)out) & ((1<<28)-1);
+	        x[2*i+1] = (int)(out >>> 28);
+	    }
+
+	    /* Check for reduction.
+	     *
+	     * The idea is to create a variable ge which is all ones (rather, 56 ones)
+	     * if and only if the low $i$ words of $x$ are >= those of p.
+	     *
+	     * Remember p = little_endian(1111,1111,1111,1111,1110,1111,1111,1111)
+	     */
+	    int ge = -1, mask = (1<<28)-1;
+	    for (i=0; i<8; i++) {
+	        ge &= x[i];
+	    }
+
+	    /* At this point, ge = 1111 iff bottom are all 1111.  Now propagate if 1110, or set if 1111 */
+	    ge = (ge & (x[8] + 1)) | is_zero(x[8] ^ mask);
+
+	    /* Propagate the rest */
+	    for (i=9; i<16; i++) {
+	        ge &= x[i];
+	    }
+
+	    return ~is_zero(ge ^ mask);
+	}
+
+	/* End of code imported from Ed448-Goldilocks */
+	
+	/**
+	 * Squares a number modulo 2^448 - 2^224 - 1.
+	 * 
+	 * @param result The result.
+	 * @param x The number to square.
+	 */
+	private void square(int[] result, int[] x)
+	{
+		mul(result, x, x);
+	}
+
+	/**
+	 * Conditional swap of two values.
+	 * 
+	 * @param select Set to 1 to swap, 0 to leave as-is.
+	 * @param x The first value.
+	 * @param y The second value.
+	 */
+	private static void cswap(int select, int[] x, int[] y)
+	{
+		int dummy;
+		select = -select;
+		for (int index = 0; index < 16; ++index) {
+			dummy = select & (x[index] ^ y[index]);
+			x[index] ^= dummy;
+			y[index] ^= dummy;
+		}
+	}
+
+	/**
+	 * Computes the reciprocal of a number modulo 2^448 - 2^224 - 1.
+	 * 
+	 * @param result The result.  Must not overlap with z_2.
+	 * @param z_2 The argument.
+	 */
+	private void recip(int[] result, int[] z_2)
+	{
+		int posn;
+		
+	    /* Compute z_2 ^ (p - 2)
+
+	       The value p - 2 is: FF...FEFF...FD, which from highest to lowest is
+	       223 one bits, followed by a zero bit, followed by 222 one bits,
+	       followed by another zero bit, and a final one bit.
+
+	       The naive implementation that squares for every bit and multiplies
+	       for every 1 bit requires 893 multiplications.  The following can
+	       do the same operation in 483 multiplications.  The basic idea is to
+	       create bit patterns and then "shift" them into position.  We start
+	       with a 4 bit pattern 1111, which we can square 4 times to get
+	       11110000 and then multiply by the 1111 pattern to get 11111111.
+	       We then repeat that to turn 11111111 into 1111111111111111, etc.
+	    */
+	    square(B, z_2);                 /* Set A to a 4 bit pattern */
+	    mul(A, B, z_2);
+	    square(B, A);
+	    mul(A, B, z_2);
+	    square(B, A);
+	    mul(A, B, z_2);
+	    square(B, A);                   /* Set C to a 6 bit pattern */
+	    mul(C, B, z_2);
+	    square(B, C);
+	    mul(C, B, z_2);
+	    square(B, C);                   /* Set A to a 8 bit pattern */
+	    mul(A, B, z_2);
+	    square(B, A);
+	    mul(A, B, z_2);
+	    square(E, A);                   /* Set E to a 16 bit pattern */
+	    square(B, E);
+	    for (posn = 1; posn < 4; ++posn) {
+	        square(E, B);
+	        square(B, E);
+	    }
+	    mul(E, B, A);
+	    square(AA, E);                  /* Set AA to a 32 bit pattern */
+	    square(B, AA);
+	    for (posn = 1; posn < 8; ++posn) {
+	        square(AA, B);
+	        square(B, AA);
+	    }
+	    mul(AA, B, E);
+	    square(BB, AA);                 /* Set BB to a 64 bit pattern */
+	    square(B, BB);
+	    for (posn = 1; posn < 16; ++posn) {
+	        square(BB, B);
+	        square(B, BB);
+	    }
+	    mul(BB, B, AA);
+	    square(DA, BB);                 /* Set DA to a 128 bit pattern */
+	    square(B, DA);
+	    for (posn = 1; posn < 32; ++posn) {
+	        square(DA, B);
+	        square(B, DA);
+	    }
+	    mul(DA, B, BB);
+	    square(CB, DA);                 /* Set CB to a 192 bit pattern */
+	    square(B, CB);                  /* 192 = 128 + 64 */
+	    for (posn = 1; posn < 32; ++posn) {
+	        square(CB, B);
+	        square(B, CB);
+	    }
+	    mul(CB, B, BB);
+	    square(DA, CB);                 /* Set DA to a 208 bit pattern */
+	    square(B, DA);                  /* 208 = 128 + 64 + 16 */
+	    for (posn = 1; posn < 8; ++posn) {
+	        square(DA, B);
+	        square(B, DA);
+	    }
+	    mul(DA, B, E);
+	    square(CB, DA);                 /* Set CB to a 216 bit pattern */
+	    square(B, CB);                  /* 216 = 128 + 64 + 16 + 8 */
+	    for (posn = 1; posn < 4; ++posn) {
+	        square(CB, B);
+	        square(B, CB);
+	    }
+	    mul(CB, B, A);
+	    square(DA, CB);                 /* Set DA to a 222 bit pattern */
+	    square(B, DA);                  /* 222 = 128 + 64 + 16 + 8 + 6 */
+	    for (posn = 1; posn < 3; ++posn) {
+	        square(DA, B);
+	        square(B, DA);
+	    }
+	    mul(DA, B, C);
+	    square(CB, DA);                 /* Set CB to a 224 bit pattern */
+	    mul(B, CB, z_2);                /* CB = DA|1|0 */
+	    square(CB, B);
+	    square(BB, CB);                 /* Set BB to a 446 bit pattern */
+	    square(B, BB);                  /* BB = DA|1|0|DA */
+	    for (posn = 1; posn < 111; ++posn) {
+	        square(BB, B);
+	        square(B, BB);
+	    }
+	    mul(BB, B, DA);
+	    square(B, BB);                  /* Set result to a 448 bit pattern */
+	    square(BB, B);                  /* result = DA|1|0|DA|01 */
+	    mul(result, BB, z_2);
+	}
+
+	/**
+	 * Evaluates the curve for every bit in a secret key.
+	 * 
+	 * @param s The 56-byte secret key.
+	 */
+	private void evalCurve(byte[] s)
+	{
+		int sposn = 55;
+		int sbit = 7;
+		int svalue = s[sposn] | 0x80;
+		int swap = 0;
+		int select;
+
+	    // Iterate over all 448 bits of "s" from the highest to the lowest.
+		for (;;) {
+	        // Conditional swaps on entry to this bit but only if we
+	        // didn't swap on the previous bit.
+			select = (svalue >> sbit) & 0x01;
+			swap ^= select;
+	        cswap(swap, x_2, x_3);
+	        cswap(swap, z_2, z_3);
+	        swap = select;
+
+	        // Evaluate the curve.
+	        add(A, x_2, z_2);               // A = x_2 + z_2
+	        square(AA, A);                  // AA = A^2
+	        sub(B, x_2, z_2);               // B = x_2 - z_2
+	        square(BB, B);                  // BB = B^2
+	        sub(E, AA, BB);                 // E = AA - BB
+	        add(C, x_3, z_3);               // C = x_3 + z_3
+	        sub(D, x_3, z_3);               // D = x_3 - z_3
+	        mul(DA, D, A);                  // DA = D * A
+	        mul(CB, C, B);                  // CB = C * B
+	        add(z_2, DA, CB);               // x_3 = (DA + CB)^2
+	        square(x_3, z_2);
+	        sub(z_2, DA, CB);               // z_3 = x_1 * (DA - CB)^2
+	        square(x_2, z_2);
+	        mul(z_3, x_1, x_2);
+	        mul(x_2, AA, BB);               // x_2 = AA * BB
+	        mulw(z_2, E, 39081);            // z_2 = E * (AA + a24 * E)
+	        add(A, AA, z_2);
+	        mul(z_2, E, A);
+
+	        // Move onto the next lower bit of "s".
+	        if (sbit > 0) {
+	        	--sbit;
+	        } else if (sposn == 0) {
+	        	break;
+	        } else if (sposn == 1) {
+	        	--sposn;
+	        	svalue = s[sposn] & 0xFC;
+	        	sbit = 7;
+	        } else {
+	        	--sposn;
+	        	svalue = s[sposn];
+	        	sbit = 7;
+	        }
+		}
+
+	    // Final conditional swaps.
+	    cswap(swap, x_2, x_3);
+	    cswap(swap, z_2, z_3);
+	}
+
+	/**
+	 * Evaluates the Curve448 curve.
+	 * 
+	 * @param result Buffer to place the result of the evaluation into.
+	 * @param offset Offset into the result buffer.
+	 * @param privateKey The private key to use in the evaluation.
+	 * @param publicKey The public key to use in the evaluation, or null
+	 * if the base point of the curve should be used.
+	 * @return Returns true if the curve evaluation was successful,
+	 * false if the publicKey value is out of range.
+	 */
+	public static boolean eval(byte[] result, int offset, byte[] privateKey, byte[] publicKey)
+	{
+		Curve448 state = new Curve448();
+		int success = -1;
+		try {
+			// Unpack the public key value.  If null, use 5 as the base point.
+			Arrays.fill(state.x_1, 0);
+			if (publicKey != null) {
+				// Convert the input value from little-endian into 28-bit limbs.
+				// It is possible that the public key is out of range.  If so,
+				// delay reporting that state until the function completes.
+			    success = deserialize(state.x_1, publicKey, 0);
+			} else {
+				state.x_1[0] = 5;
+			}
+
+			// Initialize the other temporary variables.
+			Arrays.fill(state.x_2, 0);			// x_2 = 1
+			state.x_2[0] = 1;
+			Arrays.fill(state.z_2, 0);			// z_2 = 0
+			System.arraycopy(state.x_1, 0, state.x_3, 0, state.x_1.length);  // x_3 = x_1
+			Arrays.fill(state.z_3, 0);			// z_3 = 1
+			state.z_3[0] = 1;
+			
+			// Evaluate the curve for every bit of the private key.
+			state.evalCurve(privateKey);
+
+		    // Compute x_2 * (z_2 ^ (p - 2)) where p = 2^448 - 2^224 - 1.
+		    state.recip(state.z_3, state.z_2);
+		    state.mul(state.x_1, state.x_2, state.z_3);
+
+		    // Convert x_2 into little-endian in the result buffer.
+		    strong_reduce(state.x_1);
+		    serialize(result, offset, state.x_1);
+		} finally {
+			// Clean up all temporary state before we exit.
+			state.destroy();
+		}
+		return (success & 0x01) != 0;
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/GHASH.java

@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.util.Arrays;
+
+import com.futo.platformplayer.noise.protocol.Destroyable;
+
+/**
+ * Implementation of the GHASH primitive for GCM.
+ */
+public final class GHASH implements Destroyable {
+
+	private long[] H;
+	private byte[] Y;
+	int posn;
+	
+	/**
+	 * Constructs a new GHASH object.
+	 */
+	public GHASH()
+	{
+		H = new long [2];
+		Y = new byte [16];
+		posn = 0;
+	}
+
+	/**
+	 * Resets this GHASH object with a new key.
+	 * 
+	 * @param key The key, which must contain at least 16 bytes.
+	 * @param offset The offset of the first key byte.
+	 */
+	public void reset(byte[] key, int offset)
+	{
+		H[0] = readBigEndian(key, offset);
+		H[1] = readBigEndian(key, offset + 8);
+		Arrays.fill(Y, (byte)0);
+		posn = 0;
+	}
+
+	/**
+	 * Resets the GHASH object but retains the previous key.
+	 */
+	public void reset()
+	{
+		Arrays.fill(Y, (byte)0);
+		posn = 0;
+	}
+
+	/**
+	 * Updates this GHASH object with more data.
+	 * 
+	 * @param data Buffer containing the data.
+	 * @param offset Offset of the first data byte in the buffer.
+	 * @param length The number of bytes from the buffer to hash.
+	 */
+	public void update(byte[] data, int offset, int length)
+	{
+		while (length > 0) {
+			int size = 16 - posn;
+			if (size > length)
+				size = length;
+			for (int index = 0; index < size; ++index)
+				Y[posn + index] ^= data[offset + index];
+			posn += size;
+			length -= size;
+			offset += size;
+			if (posn == 16) {
+				GF128_mul(Y, H);
+				posn = 0;
+			}
+		}
+	}
+	
+	/**
+	 * Finishes the GHASH process and returns the tag.
+	 * 
+	 * @param tag Buffer to receive the tag.
+	 * @param offset Offset of the first byte of the tag.
+	 * @param length The length of the tag, which must be less
+	 * than or equal to 16.
+	 */
+	public void finish(byte[] tag, int offset, int length)
+	{
+		pad();
+		System.arraycopy(Y, 0, tag, offset, length);
+	}
+	
+	/**
+	 * Pads the input to a 16-byte boundary.
+	 */
+	public void pad()
+	{
+	    if (posn != 0) {
+	        // Padding involves XOR'ing the rest of state->Y with zeroes,
+	        // which does nothing.  Immediately process the next chunk.
+	        GF128_mul(Y, H);
+	        posn = 0;
+	    }
+	}
+
+	/**
+	 * Pads the input to a 16-byte boundary and then adds a block
+	 * containing the AD and data lengths.
+	 * 
+	 * @param adLen Length of the associated data in bytes.
+	 * @param dataLen Length of the data in bytes.
+	 */
+	public void pad(long adLen, long dataLen)
+	{
+		byte[] temp = new byte [16];
+		try {
+			pad();
+			writeBigEndian(temp, 0, adLen * 8);
+			writeBigEndian(temp, 8, dataLen * 8);
+			update(temp, 0, 16);
+		} finally {
+			Arrays.fill(temp, (byte)0);
+		}
+	}
+
+	@Override
+	public void destroy() {
+		Arrays.fill(H, 0L);
+		Arrays.fill(Y, (byte)0);
+	}
+
+	private static long readBigEndian(byte[] buf, int offset)
+	{
+		return ((buf[offset] & 0xFFL) << 56) |
+			   ((buf[offset + 1] & 0xFFL) << 48) |
+			   ((buf[offset + 2] & 0xFFL) << 40) |
+			   ((buf[offset + 3] & 0xFFL) << 32) |
+			   ((buf[offset + 4] & 0xFFL) << 24) |
+			   ((buf[offset + 5] & 0xFFL) << 16) |
+			   ((buf[offset + 6] & 0xFFL) << 8)  |
+			    (buf[offset + 7] & 0xFFL);
+	}
+
+	private static void writeBigEndian(byte[] buf, int offset, long value)
+	{
+		buf[offset]     = (byte)(value >> 56);
+		buf[offset + 1] = (byte)(value >> 48);
+		buf[offset + 2] = (byte)(value >> 40);
+		buf[offset + 3] = (byte)(value >> 32);
+		buf[offset + 4] = (byte)(value >> 24);
+		buf[offset + 5] = (byte)(value >> 16);
+		buf[offset + 6] = (byte)(value >> 8);
+		buf[offset + 7] = (byte)value;
+	}
+
+	private static void GF128_mul(byte[] Y, long[] H)
+	{
+	    long Z0 = 0;		// Z = 0
+	    long Z1 = 0;
+	    long V0 = H[0];		// V = H
+	    long V1 = H[1];
+
+	    // Multiply Z by V for the set bits in Y, starting at the top.
+	    // This is a very simple bit by bit version that may not be very
+	    // fast but it should be resistant to cache timing attacks.
+	    for (int posn = 0; posn < 16; ++posn) {
+	        int value = Y[posn] & 0xFF;
+	        for (int bit = 7; bit >= 0; --bit) {
+	            // Extract the high bit of "value" and turn it into a mask.
+	            long mask = -((long)((value >> bit) & 0x01));
+
+	            // XOR V with Z if the bit is 1.
+	            Z0 ^= (V0 & mask);
+	            Z1 ^= (V1 & mask);
+
+	            // Rotate V right by 1 bit.
+	            mask = ((~(V1 & 0x01)) + 1) & 0xE100000000000000L;
+	            V1 = (V1 >>> 1) | (V0 << 63);
+	            V0 = (V0 >>> 1) ^ mask;
+	        }
+	    }
+
+	    // We have finished the block so copy Z into Y and byte-swap.
+	    writeBigEndian(Y, 0, Z0);
+	    writeBigEndian(Y, 8, Z1);
+	}
+}

app/src/main/java/com/futo/platformplayer/noise/crypto/NewHopeTor.java

@@ -0,0 +1,982 @@
+/*
+ * Based on the public domain C reference code for New Hope.
+ * This Java version is also placed into the public domain.
+ * 
+ * Original authors: Erdem Alkim, Léo Ducas, Thomas Pöppelmann, Peter Schwabe
+ * Java port: Rhys Weatherley
+ */
+
+package com.futo.platformplayer.noise.crypto;
+
+import java.util.Arrays;
+
+/**
+ * New Hope key exchange algorithm, "torref" variant.
+ * 
+ * This version of New Hope implements the alternative constant-time
+ * method for generating the public "a" value for anonymity networks
+ * like Tor.  It is not binary-compatible with the standard New Hope
+ * implementation in the NewHope class.
+ * 
+ * Reference: https://cryptojedi.org/papers/newhope-20160803.pdf
+ * 
+ * @see NewHope
+ */
+public class NewHopeTor extends NewHope {
+
+	public NewHopeTor() {}
+
+	@Override
+	protected void uniform(char[] coeffs, byte[] seed)
+	{
+	  long[] state = new long [25];
+	  int nblocks=16;
+	  byte[] buf = new byte [SHAKE128_RATE*nblocks];
+	  char[] x = new char [buf.length / 2];
+
+	  try {
+		  shake128_absorb(state, seed, 0, SEEDBYTES);
+		  do
+		  {
+		    shake128_squeezeblocks(buf, 0, nblocks, state);
+		    for (int i = buf.length - 2; i >= 0; i -= 2)
+		    {
+		      x[i / 2] = (char)((buf[i] & 0xff) | ((buf[i+1] & 0xff) << 8));
+		    }
+		  }
+		  while (discardtopoly(coeffs, x));
+	  } finally {
+		  Arrays.fill(state, 0);
+		  Arrays.fill(buf, (byte)0);
+		  Arrays.fill(x, (char)0);
+	  }
+	}
+
+	private static boolean discardtopoly(char[] coeffs, char[] x)
+	{
+	  int i, r=0;
+
+	  for(i=0;i<16;i++)
+		  batcher84(x, i);
+
+	  // Check whether we're safe:
+	  for(i=1008;i<1024;i++)
+	    r |= 61444 - x[i];
+	  if((r >>= 31) != 0) return true;
+
+	  // If we are, copy coefficients to polynomial:
+	  for(i=0;i<PARAM_N;i++)
+	    coeffs[i] = x[i];
+
+	  return false;
+	}
+
+	private static void batcher84(char[] x, int offset)
+	{
+		int c, t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +   16]) & (c >> 31); x[offset +    0] ^= t; x[offset +   16] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   48]) & (c >> 31); x[offset +   32] ^= t; x[offset +   48] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +   32]) & (c >> 31); x[offset +    0] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   48]) & (c >> 31); x[offset +   16] ^= t; x[offset +   48] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +   80]) & (c >> 31); x[offset +   64] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  112]) & (c >> 31); x[offset +   96] ^= t; x[offset +  112] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +   96]) & (c >> 31); x[offset +   64] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  112]) & (c >> 31); x[offset +   80] ^= t; x[offset +  112] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +   64]) & (c >> 31); x[offset +    0] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   96]) & (c >> 31); x[offset +   32] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   64]) & (c >> 31); x[offset +   32] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   80]) & (c >> 31); x[offset +   16] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +  112]) & (c >> 31); x[offset +   48] ^= t; x[offset +  112] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   80]) & (c >> 31); x[offset +   48] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   64]) & (c >> 31); x[offset +   48] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  144]) & (c >> 31); x[offset +  128] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  176]) & (c >> 31); x[offset +  160] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  160]) & (c >> 31); x[offset +  128] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  176]) & (c >> 31); x[offset +  144] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  208]) & (c >> 31); x[offset +  192] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  240]) & (c >> 31); x[offset +  224] ^= t; x[offset +  240] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  224]) & (c >> 31); x[offset +  192] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  240]) & (c >> 31); x[offset +  208] ^= t; x[offset +  240] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  192]) & (c >> 31); x[offset +  128] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  224]) & (c >> 31); x[offset +  160] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  192]) & (c >> 31); x[offset +  160] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  208]) & (c >> 31); x[offset +  144] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  240]) & (c >> 31); x[offset +  176] ^= t; x[offset +  240] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  208]) & (c >> 31); x[offset +  176] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  192]) & (c >> 31); x[offset +  176] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +  128]) & (c >> 31); x[offset +    0] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  192]) & (c >> 31); x[offset +   64] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  128]) & (c >> 31); x[offset +   64] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +  160]) & (c >> 31); x[offset +   32] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  224]) & (c >> 31); x[offset +   96] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  160]) & (c >> 31); x[offset +   96] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   64]) & (c >> 31); x[offset +   32] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  128]) & (c >> 31); x[offset +   96] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  192]) & (c >> 31); x[offset +  160] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +  144]) & (c >> 31); x[offset +   16] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  208]) & (c >> 31); x[offset +   80] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  144]) & (c >> 31); x[offset +   80] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +  176]) & (c >> 31); x[offset +   48] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  240]) & (c >> 31); x[offset +  112] ^= t; x[offset +  240] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  176]) & (c >> 31); x[offset +  112] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   80]) & (c >> 31); x[offset +   48] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  144]) & (c >> 31); x[offset +  112] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  208]) & (c >> 31); x[offset +  176] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   64]) & (c >> 31); x[offset +   48] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  128]) & (c >> 31); x[offset +  112] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  192]) & (c >> 31); x[offset +  176] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  272]) & (c >> 31); x[offset +  256] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  304]) & (c >> 31); x[offset +  288] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  288]) & (c >> 31); x[offset +  256] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  304]) & (c >> 31); x[offset +  272] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  336]) & (c >> 31); x[offset +  320] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  368]) & (c >> 31); x[offset +  352] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  352]) & (c >> 31); x[offset +  320] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  368]) & (c >> 31); x[offset +  336] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  320]) & (c >> 31); x[offset +  256] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  352]) & (c >> 31); x[offset +  288] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  320]) & (c >> 31); x[offset +  288] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  336]) & (c >> 31); x[offset +  272] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  368]) & (c >> 31); x[offset +  304] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  336]) & (c >> 31); x[offset +  304] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  320]) & (c >> 31); x[offset +  304] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  400]) & (c >> 31); x[offset +  384] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  432]) & (c >> 31); x[offset +  416] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  416]) & (c >> 31); x[offset +  384] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  432]) & (c >> 31); x[offset +  400] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  464]) & (c >> 31); x[offset +  448] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  496]) & (c >> 31); x[offset +  480] ^= t; x[offset +  496] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  480]) & (c >> 31); x[offset +  448] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  496]) & (c >> 31); x[offset +  464] ^= t; x[offset +  496] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  448]) & (c >> 31); x[offset +  384] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  480]) & (c >> 31); x[offset +  416] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  448]) & (c >> 31); x[offset +  416] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  464]) & (c >> 31); x[offset +  400] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  496]) & (c >> 31); x[offset +  432] ^= t; x[offset +  496] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  464]) & (c >> 31); x[offset +  432] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  448]) & (c >> 31); x[offset +  432] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  384]) & (c >> 31); x[offset +  256] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  448]) & (c >> 31); x[offset +  320] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  384]) & (c >> 31); x[offset +  320] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  416]) & (c >> 31); x[offset +  288] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  480]) & (c >> 31); x[offset +  352] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  416]) & (c >> 31); x[offset +  352] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  320]) & (c >> 31); x[offset +  288] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  384]) & (c >> 31); x[offset +  352] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  448]) & (c >> 31); x[offset +  416] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  400]) & (c >> 31); x[offset +  272] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  464]) & (c >> 31); x[offset +  336] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  400]) & (c >> 31); x[offset +  336] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  432]) & (c >> 31); x[offset +  304] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  496]) & (c >> 31); x[offset +  368] ^= t; x[offset +  496] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  432]) & (c >> 31); x[offset +  368] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  336]) & (c >> 31); x[offset +  304] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  400]) & (c >> 31); x[offset +  368] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  464]) & (c >> 31); x[offset +  432] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  320]) & (c >> 31); x[offset +  304] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  384]) & (c >> 31); x[offset +  368] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  448]) & (c >> 31); x[offset +  432] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +  256]) & (c >> 31); x[offset +    0] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  384]) & (c >> 31); x[offset +  128] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  256]) & (c >> 31); x[offset +  128] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  320]) & (c >> 31); x[offset +   64] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  448]) & (c >> 31); x[offset +  192] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  320]) & (c >> 31); x[offset +  192] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  128]) & (c >> 31); x[offset +   64] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  256]) & (c >> 31); x[offset +  192] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  384]) & (c >> 31); x[offset +  320] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +  288]) & (c >> 31); x[offset +   32] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  416]) & (c >> 31); x[offset +  160] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  288]) & (c >> 31); x[offset +  160] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  352]) & (c >> 31); x[offset +   96] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  480]) & (c >> 31); x[offset +  224] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  352]) & (c >> 31); x[offset +  224] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  160]) & (c >> 31); x[offset +   96] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  288]) & (c >> 31); x[offset +  224] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  416]) & (c >> 31); x[offset +  352] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   64]) & (c >> 31); x[offset +   32] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  128]) & (c >> 31); x[offset +   96] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  192]) & (c >> 31); x[offset +  160] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  256]) & (c >> 31); x[offset +  224] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  320]) & (c >> 31); x[offset +  288] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  384]) & (c >> 31); x[offset +  352] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  448]) & (c >> 31); x[offset +  416] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +  272]) & (c >> 31); x[offset +   16] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  400]) & (c >> 31); x[offset +  144] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  272]) & (c >> 31); x[offset +  144] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  336]) & (c >> 31); x[offset +   80] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  464]) & (c >> 31); x[offset +  208] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  336]) & (c >> 31); x[offset +  208] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  144]) & (c >> 31); x[offset +   80] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  272]) & (c >> 31); x[offset +  208] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  400]) & (c >> 31); x[offset +  336] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +  304]) & (c >> 31); x[offset +   48] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  432]) & (c >> 31); x[offset +  176] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  304]) & (c >> 31); x[offset +  176] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  368]) & (c >> 31); x[offset +  112] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  496]) & (c >> 31); x[offset +  240] ^= t; x[offset +  496] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  368]) & (c >> 31); x[offset +  240] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  176]) & (c >> 31); x[offset +  112] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  304]) & (c >> 31); x[offset +  240] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  432]) & (c >> 31); x[offset +  368] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   80]) & (c >> 31); x[offset +   48] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  144]) & (c >> 31); x[offset +  112] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  208]) & (c >> 31); x[offset +  176] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  272]) & (c >> 31); x[offset +  240] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  336]) & (c >> 31); x[offset +  304] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  400]) & (c >> 31); x[offset +  368] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  464]) & (c >> 31); x[offset +  432] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   64]) & (c >> 31); x[offset +   48] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  128]) & (c >> 31); x[offset +  112] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  192]) & (c >> 31); x[offset +  176] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  256]) & (c >> 31); x[offset +  240] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  320]) & (c >> 31); x[offset +  304] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  384]) & (c >> 31); x[offset +  368] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  448]) & (c >> 31); x[offset +  432] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset +  528]) & (c >> 31); x[offset +  512] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  560]) & (c >> 31); x[offset +  544] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset +  544]) & (c >> 31); x[offset +  512] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  560]) & (c >> 31); x[offset +  528] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  592]) & (c >> 31); x[offset +  576] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  624]) & (c >> 31); x[offset +  608] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  608]) & (c >> 31); x[offset +  576] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  624]) & (c >> 31); x[offset +  592] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset +  576]) & (c >> 31); x[offset +  512] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  608]) & (c >> 31); x[offset +  544] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  576]) & (c >> 31); x[offset +  544] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  592]) & (c >> 31); x[offset +  528] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  624]) & (c >> 31); x[offset +  560] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  592]) & (c >> 31); x[offset +  560] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  576]) & (c >> 31); x[offset +  560] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  656]) & (c >> 31); x[offset +  640] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  688]) & (c >> 31); x[offset +  672] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  672]) & (c >> 31); x[offset +  640] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  688]) & (c >> 31); x[offset +  656] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  720]) & (c >> 31); x[offset +  704] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  752]) & (c >> 31); x[offset +  736] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  736]) & (c >> 31); x[offset +  704] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  752]) & (c >> 31); x[offset +  720] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  704]) & (c >> 31); x[offset +  640] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  736]) & (c >> 31); x[offset +  672] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  704]) & (c >> 31); x[offset +  672] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  720]) & (c >> 31); x[offset +  656] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  752]) & (c >> 31); x[offset +  688] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  720]) & (c >> 31); x[offset +  688] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  704]) & (c >> 31); x[offset +  688] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset +  640]) & (c >> 31); x[offset +  512] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  704]) & (c >> 31); x[offset +  576] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  640]) & (c >> 31); x[offset +  576] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  672]) & (c >> 31); x[offset +  544] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  736]) & (c >> 31); x[offset +  608] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  672]) & (c >> 31); x[offset +  608] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  576]) & (c >> 31); x[offset +  544] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  640]) & (c >> 31); x[offset +  608] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  704]) & (c >> 31); x[offset +  672] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  656]) & (c >> 31); x[offset +  528] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  720]) & (c >> 31); x[offset +  592] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  656]) & (c >> 31); x[offset +  592] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  688]) & (c >> 31); x[offset +  560] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  752]) & (c >> 31); x[offset +  624] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  688]) & (c >> 31); x[offset +  624] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  592]) & (c >> 31); x[offset +  560] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  656]) & (c >> 31); x[offset +  624] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  720]) & (c >> 31); x[offset +  688] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  576]) & (c >> 31); x[offset +  560] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  640]) & (c >> 31); x[offset +  624] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  704]) & (c >> 31); x[offset +  688] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset +  784]) & (c >> 31); x[offset +  768] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  816]) & (c >> 31); x[offset +  800] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset +  800]) & (c >> 31); x[offset +  768] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  816]) & (c >> 31); x[offset +  784] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  848]) & (c >> 31); x[offset +  832] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  880]) & (c >> 31); x[offset +  864] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  864]) & (c >> 31); x[offset +  832] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  880]) & (c >> 31); x[offset +  848] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset +  832]) & (c >> 31); x[offset +  768] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  864]) & (c >> 31); x[offset +  800] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  832]) & (c >> 31); x[offset +  800] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  848]) & (c >> 31); x[offset +  784] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  880]) & (c >> 31); x[offset +  816] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  848]) & (c >> 31); x[offset +  816] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  832]) & (c >> 31); x[offset +  816] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  896]; t = (x[offset +  896] ^ x[offset +  912]) & (c >> 31); x[offset +  896] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  944]) & (c >> 31); x[offset +  928] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  896]; t = (x[offset +  896] ^ x[offset +  928]) & (c >> 31); x[offset +  896] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  944]) & (c >> 31); x[offset +  912] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  960]; t = (x[offset +  960] ^ x[offset +  976]) & (c >> 31); x[offset +  960] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  992]; t = (x[offset +  992] ^ x[offset + 1008]) & (c >> 31); x[offset +  992] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  960]; t = (x[offset +  960] ^ x[offset +  992]) & (c >> 31); x[offset +  960] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset + 1008]) & (c >> 31); x[offset +  976] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  896]; t = (x[offset +  896] ^ x[offset +  960]) & (c >> 31); x[offset +  896] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  992]) & (c >> 31); x[offset +  928] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  960]) & (c >> 31); x[offset +  928] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  976]) & (c >> 31); x[offset +  912] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset + 1008]) & (c >> 31); x[offset +  944] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  976]) & (c >> 31); x[offset +  944] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  960]) & (c >> 31); x[offset +  944] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset +  896]) & (c >> 31); x[offset +  768] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  960]) & (c >> 31); x[offset +  832] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  896]) & (c >> 31); x[offset +  832] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  928]) & (c >> 31); x[offset +  800] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  992]) & (c >> 31); x[offset +  864] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  928]) & (c >> 31); x[offset +  864] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  832]) & (c >> 31); x[offset +  800] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  896]) & (c >> 31); x[offset +  864] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  960]) & (c >> 31); x[offset +  928] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  912]) & (c >> 31); x[offset +  784] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  976]) & (c >> 31); x[offset +  848] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  912]) & (c >> 31); x[offset +  848] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  944]) & (c >> 31); x[offset +  816] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset + 1008]) & (c >> 31); x[offset +  880] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  944]) & (c >> 31); x[offset +  880] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  848]) & (c >> 31); x[offset +  816] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  912]) & (c >> 31); x[offset +  880] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  976]) & (c >> 31); x[offset +  944] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  832]) & (c >> 31); x[offset +  816] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  896]) & (c >> 31); x[offset +  880] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  960]) & (c >> 31); x[offset +  944] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset +  768]) & (c >> 31); x[offset +  512] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  896]) & (c >> 31); x[offset +  640] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  768]) & (c >> 31); x[offset +  640] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  832]) & (c >> 31); x[offset +  576] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  960]) & (c >> 31); x[offset +  704] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  832]) & (c >> 31); x[offset +  704] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  640]) & (c >> 31); x[offset +  576] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  768]) & (c >> 31); x[offset +  704] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  896]) & (c >> 31); x[offset +  832] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  800]) & (c >> 31); x[offset +  544] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  928]) & (c >> 31); x[offset +  672] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  800]) & (c >> 31); x[offset +  672] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  864]) & (c >> 31); x[offset +  608] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  992]) & (c >> 31); x[offset +  736] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  864]) & (c >> 31); x[offset +  736] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  672]) & (c >> 31); x[offset +  608] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  800]) & (c >> 31); x[offset +  736] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  928]) & (c >> 31); x[offset +  864] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  576]) & (c >> 31); x[offset +  544] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  640]) & (c >> 31); x[offset +  608] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  704]) & (c >> 31); x[offset +  672] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  768]) & (c >> 31); x[offset +  736] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  832]) & (c >> 31); x[offset +  800] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  896]) & (c >> 31); x[offset +  864] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  960]) & (c >> 31); x[offset +  928] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  784]) & (c >> 31); x[offset +  528] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  912]) & (c >> 31); x[offset +  656] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  784]) & (c >> 31); x[offset +  656] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  848]) & (c >> 31); x[offset +  592] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  976]) & (c >> 31); x[offset +  720] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  848]) & (c >> 31); x[offset +  720] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  656]) & (c >> 31); x[offset +  592] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  784]) & (c >> 31); x[offset +  720] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  912]) & (c >> 31); x[offset +  848] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  816]) & (c >> 31); x[offset +  560] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  944]) & (c >> 31); x[offset +  688] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  816]) & (c >> 31); x[offset +  688] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  880]) & (c >> 31); x[offset +  624] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset + 1008]) & (c >> 31); x[offset +  752] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  880]) & (c >> 31); x[offset +  752] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  688]) & (c >> 31); x[offset +  624] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  816]) & (c >> 31); x[offset +  752] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  944]) & (c >> 31); x[offset +  880] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  592]) & (c >> 31); x[offset +  560] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  656]) & (c >> 31); x[offset +  624] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  720]) & (c >> 31); x[offset +  688] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  784]) & (c >> 31); x[offset +  752] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  848]) & (c >> 31); x[offset +  816] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  912]) & (c >> 31); x[offset +  880] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  976]) & (c >> 31); x[offset +  944] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  576]) & (c >> 31); x[offset +  560] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  640]) & (c >> 31); x[offset +  624] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  704]) & (c >> 31); x[offset +  688] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  768]) & (c >> 31); x[offset +  752] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  832]) & (c >> 31); x[offset +  816] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  896]) & (c >> 31); x[offset +  880] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  960]) & (c >> 31); x[offset +  944] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset +  512]) & (c >> 31); x[offset +    0] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  768]) & (c >> 31); x[offset +  256] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  512]) & (c >> 31); x[offset +  256] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  640]) & (c >> 31); x[offset +  128] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  896]) & (c >> 31); x[offset +  384] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  640]) & (c >> 31); x[offset +  384] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  256]) & (c >> 31); x[offset +  128] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  512]) & (c >> 31); x[offset +  384] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  768]) & (c >> 31); x[offset +  640] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  576]) & (c >> 31); x[offset +   64] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  832]) & (c >> 31); x[offset +  320] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  576]) & (c >> 31); x[offset +  320] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  704]) & (c >> 31); x[offset +  192] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  960]) & (c >> 31); x[offset +  448] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  704]) & (c >> 31); x[offset +  448] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  320]) & (c >> 31); x[offset +  192] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  576]) & (c >> 31); x[offset +  448] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  832]) & (c >> 31); x[offset +  704] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  128]) & (c >> 31); x[offset +   64] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  256]) & (c >> 31); x[offset +  192] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  384]) & (c >> 31); x[offset +  320] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  512]) & (c >> 31); x[offset +  448] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  640]) & (c >> 31); x[offset +  576] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  768]) & (c >> 31); x[offset +  704] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  896]) & (c >> 31); x[offset +  832] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +  544]) & (c >> 31); x[offset +   32] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  800]) & (c >> 31); x[offset +  288] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  544]) & (c >> 31); x[offset +  288] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  672]) & (c >> 31); x[offset +  160] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  928]) & (c >> 31); x[offset +  416] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  672]) & (c >> 31); x[offset +  416] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  288]) & (c >> 31); x[offset +  160] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  544]) & (c >> 31); x[offset +  416] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  800]) & (c >> 31); x[offset +  672] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  608]) & (c >> 31); x[offset +   96] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  864]) & (c >> 31); x[offset +  352] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  608]) & (c >> 31); x[offset +  352] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  736]) & (c >> 31); x[offset +  224] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  992]) & (c >> 31); x[offset +  480] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  736]) & (c >> 31); x[offset +  480] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  352]) & (c >> 31); x[offset +  224] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  608]) & (c >> 31); x[offset +  480] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  864]) & (c >> 31); x[offset +  736] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  160]) & (c >> 31); x[offset +   96] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  288]) & (c >> 31); x[offset +  224] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  416]) & (c >> 31); x[offset +  352] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  544]) & (c >> 31); x[offset +  480] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  672]) & (c >> 31); x[offset +  608] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  800]) & (c >> 31); x[offset +  736] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  928]) & (c >> 31); x[offset +  864] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   64]) & (c >> 31); x[offset +   32] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  128]) & (c >> 31); x[offset +   96] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  192]) & (c >> 31); x[offset +  160] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  256]) & (c >> 31); x[offset +  224] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  320]) & (c >> 31); x[offset +  288] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  384]) & (c >> 31); x[offset +  352] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  448]) & (c >> 31); x[offset +  416] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  512]) & (c >> 31); x[offset +  480] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  576]) & (c >> 31); x[offset +  544] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  640]) & (c >> 31); x[offset +  608] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  704]) & (c >> 31); x[offset +  672] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  768]) & (c >> 31); x[offset +  736] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  832]) & (c >> 31); x[offset +  800] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  896]) & (c >> 31); x[offset +  864] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  960]) & (c >> 31); x[offset +  928] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +  528]) & (c >> 31); x[offset +   16] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  784]) & (c >> 31); x[offset +  272] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  528]) & (c >> 31); x[offset +  272] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  656]) & (c >> 31); x[offset +  144] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  912]) & (c >> 31); x[offset +  400] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  656]) & (c >> 31); x[offset +  400] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  272]) & (c >> 31); x[offset +  144] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  528]) & (c >> 31); x[offset +  400] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  784]) & (c >> 31); x[offset +  656] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  592]) & (c >> 31); x[offset +   80] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  848]) & (c >> 31); x[offset +  336] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  592]) & (c >> 31); x[offset +  336] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  720]) & (c >> 31); x[offset +  208] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  976]) & (c >> 31); x[offset +  464] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  720]) & (c >> 31); x[offset +  464] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  336]) & (c >> 31); x[offset +  208] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  592]) & (c >> 31); x[offset +  464] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  848]) & (c >> 31); x[offset +  720] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  144]) & (c >> 31); x[offset +   80] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  272]) & (c >> 31); x[offset +  208] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  400]) & (c >> 31); x[offset +  336] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  528]) & (c >> 31); x[offset +  464] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  656]) & (c >> 31); x[offset +  592] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  784]) & (c >> 31); x[offset +  720] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  912]) & (c >> 31); x[offset +  848] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +  560]) & (c >> 31); x[offset +   48] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  816]) & (c >> 31); x[offset +  304] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  560]) & (c >> 31); x[offset +  304] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  688]) & (c >> 31); x[offset +  176] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  944]) & (c >> 31); x[offset +  432] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  688]) & (c >> 31); x[offset +  432] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  304]) & (c >> 31); x[offset +  176] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  560]) & (c >> 31); x[offset +  432] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  816]) & (c >> 31); x[offset +  688] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  624]) & (c >> 31); x[offset +  112] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  880]) & (c >> 31); x[offset +  368] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  624]) & (c >> 31); x[offset +  368] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  752]) & (c >> 31); x[offset +  240] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset + 1008]) & (c >> 31); x[offset +  496] ^= t; x[offset + 1008] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  752]) & (c >> 31); x[offset +  496] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  368]) & (c >> 31); x[offset +  240] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  624]) & (c >> 31); x[offset +  496] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  880]) & (c >> 31); x[offset +  752] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  176]) & (c >> 31); x[offset +  112] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  304]) & (c >> 31); x[offset +  240] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  432]) & (c >> 31); x[offset +  368] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  560]) & (c >> 31); x[offset +  496] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  688]) & (c >> 31); x[offset +  624] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  816]) & (c >> 31); x[offset +  752] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  944]) & (c >> 31); x[offset +  880] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   80]) & (c >> 31); x[offset +   48] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  144]) & (c >> 31); x[offset +  112] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  208]) & (c >> 31); x[offset +  176] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  272]) & (c >> 31); x[offset +  240] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  336]) & (c >> 31); x[offset +  304] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  400]) & (c >> 31); x[offset +  368] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  464]) & (c >> 31); x[offset +  432] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  528]) & (c >> 31); x[offset +  496] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  592]) & (c >> 31); x[offset +  560] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  656]) & (c >> 31); x[offset +  624] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  720]) & (c >> 31); x[offset +  688] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  784]) & (c >> 31); x[offset +  752] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  848]) & (c >> 31); x[offset +  816] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  912]) & (c >> 31); x[offset +  880] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  976]) & (c >> 31); x[offset +  944] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   64]) & (c >> 31); x[offset +   48] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  128]) & (c >> 31); x[offset +  112] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  192]) & (c >> 31); x[offset +  176] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  256]) & (c >> 31); x[offset +  240] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  320]) & (c >> 31); x[offset +  304] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  384]) & (c >> 31); x[offset +  368] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  448]) & (c >> 31); x[offset +  432] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  512]) & (c >> 31); x[offset +  496] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  576]) & (c >> 31); x[offset +  560] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  640]) & (c >> 31); x[offset +  624] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  704]) & (c >> 31); x[offset +  688] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  768]) & (c >> 31); x[offset +  752] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  832]) & (c >> 31); x[offset +  816] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  896]) & (c >> 31); x[offset +  880] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  960]) & (c >> 31); x[offset +  944] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset + 1024]; t = (x[offset + 1024] ^ x[offset + 1040]) & (c >> 31); x[offset + 1024] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1072]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset + 1024]; t = (x[offset + 1024] ^ x[offset + 1056]) & (c >> 31); x[offset + 1024] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1072]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1104]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1136]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1120]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1136]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1024]; t = (x[offset + 1024] ^ x[offset + 1088]) & (c >> 31); x[offset + 1024] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1120]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1088]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1104]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1136]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1104]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1088]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1168]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1200]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1184]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1200]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1216]; t = (x[offset + 1216] ^ x[offset + 1232]) & (c >> 31); x[offset + 1216] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1264]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset + 1216]; t = (x[offset + 1216] ^ x[offset + 1248]) & (c >> 31); x[offset + 1216] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1264]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1216]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1248]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1216]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1232]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1264]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1232]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1216]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1024]; t = (x[offset + 1024] ^ x[offset + 1152]) & (c >> 31); x[offset + 1024] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1216]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1152]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1184]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1248]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1184]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1088]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1152]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1216]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1168]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1232]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1168]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1200]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1264]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1200]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1104]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1168]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1232]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1088]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1152]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1216]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1280]; t = (x[offset + 1280] ^ x[offset + 1296]) & (c >> 31); x[offset + 1280] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1312]; t = (x[offset + 1312] ^ x[offset + 1328]) & (c >> 31); x[offset + 1312] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1280]; t = (x[offset + 1280] ^ x[offset + 1312]) & (c >> 31); x[offset + 1280] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1328]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1024]; t = (x[offset + 1024] ^ x[offset + 1280]) & (c >> 31); x[offset + 1024] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1280]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1152]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1216]; t = (x[offset + 1216] ^ x[offset + 1280]) & (c >> 31); x[offset + 1216] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1312]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1312]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1184]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1312]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1088]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1152]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1216]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1280]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1296]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1296]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1168]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1296]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1328]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1328]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1200]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1328]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1104]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1168]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1232]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1296]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1088]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1152]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1216]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1280]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1280]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1152]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1216]; t = (x[offset + 1216] ^ x[offset + 1280]) & (c >> 31); x[offset + 1216] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1312]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1184]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1312]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1088]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1152]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1216]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1280]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1296]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1168]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1296]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1328]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1200]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1328]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1104]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1168]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1232]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1296]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1088]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1152]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1216]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1280]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset +    0]; t = (x[offset +    0] ^ x[offset + 1024]) & (c >> 31); x[offset +    0] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset +  512]; t = (x[offset +  512] ^ x[offset + 1024]) & (c >> 31); x[offset +  512] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset + 1280]) & (c >> 31); x[offset +  256] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset + 1280]) & (c >> 31); x[offset +  768] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset +  256]; t = (x[offset +  256] ^ x[offset +  512]) & (c >> 31); x[offset +  256] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  768]; t = (x[offset +  768] ^ x[offset + 1024]) & (c >> 31); x[offset +  768] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset + 1152]) & (c >> 31); x[offset +  128] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset + 1152]) & (c >> 31); x[offset +  640] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  640]) & (c >> 31); x[offset +  384] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  896]; t = (x[offset +  896] ^ x[offset + 1152]) & (c >> 31); x[offset +  896] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset +  128]; t = (x[offset +  128] ^ x[offset +  256]) & (c >> 31); x[offset +  128] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  384]; t = (x[offset +  384] ^ x[offset +  512]) & (c >> 31); x[offset +  384] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  640]; t = (x[offset +  640] ^ x[offset +  768]) & (c >> 31); x[offset +  640] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  896]; t = (x[offset +  896] ^ x[offset + 1024]) & (c >> 31); x[offset +  896] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset + 1152]; t = (x[offset + 1152] ^ x[offset + 1280]) & (c >> 31); x[offset + 1152] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset + 1088]) & (c >> 31); x[offset +   64] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset + 1088]) & (c >> 31); x[offset +  576] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  576]) & (c >> 31); x[offset +  320] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset + 1088]) & (c >> 31); x[offset +  832] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset + 1216]) & (c >> 31); x[offset +  192] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset + 1216]) & (c >> 31); x[offset +  704] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  704]) & (c >> 31); x[offset +  448] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  960]; t = (x[offset +  960] ^ x[offset + 1216]) & (c >> 31); x[offset +  960] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  320]) & (c >> 31); x[offset +  192] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  576]) & (c >> 31); x[offset +  448] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  832]) & (c >> 31); x[offset +  704] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  960]; t = (x[offset +  960] ^ x[offset + 1088]) & (c >> 31); x[offset +  960] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset +   64]; t = (x[offset +   64] ^ x[offset +  128]) & (c >> 31); x[offset +   64] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  192]; t = (x[offset +  192] ^ x[offset +  256]) & (c >> 31); x[offset +  192] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  320]; t = (x[offset +  320] ^ x[offset +  384]) & (c >> 31); x[offset +  320] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  448]; t = (x[offset +  448] ^ x[offset +  512]) & (c >> 31); x[offset +  448] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  576]; t = (x[offset +  576] ^ x[offset +  640]) & (c >> 31); x[offset +  576] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  704]; t = (x[offset +  704] ^ x[offset +  768]) & (c >> 31); x[offset +  704] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  832]; t = (x[offset +  832] ^ x[offset +  896]) & (c >> 31); x[offset +  832] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  960]; t = (x[offset +  960] ^ x[offset + 1024]) & (c >> 31); x[offset +  960] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset + 1088]; t = (x[offset + 1088] ^ x[offset + 1152]) & (c >> 31); x[offset + 1088] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1216]; t = (x[offset + 1216] ^ x[offset + 1280]) & (c >> 31); x[offset + 1216] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset + 1056]) & (c >> 31); x[offset +   32] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset + 1056]) & (c >> 31); x[offset +  544] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset + 1312]) & (c >> 31); x[offset +  288] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset + 1312]) & (c >> 31); x[offset +  800] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  544]) & (c >> 31); x[offset +  288] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset + 1056]) & (c >> 31); x[offset +  800] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset + 1184]) & (c >> 31); x[offset +  160] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset + 1184]) & (c >> 31); x[offset +  672] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  672]) & (c >> 31); x[offset +  416] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset + 1184]) & (c >> 31); x[offset +  928] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  288]) & (c >> 31); x[offset +  160] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  544]) & (c >> 31); x[offset +  416] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  800]) & (c >> 31); x[offset +  672] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset + 1056]) & (c >> 31); x[offset +  928] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1312]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset + 1120]) & (c >> 31); x[offset +   96] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset + 1120]) & (c >> 31); x[offset +  608] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  608]) & (c >> 31); x[offset +  352] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset + 1120]) & (c >> 31); x[offset +  864] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset + 1248]) & (c >> 31); x[offset +  224] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset + 1248]) & (c >> 31); x[offset +  736] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  736]) & (c >> 31); x[offset +  480] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  992]; t = (x[offset +  992] ^ x[offset + 1248]) & (c >> 31); x[offset +  992] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  352]) & (c >> 31); x[offset +  224] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  608]) & (c >> 31); x[offset +  480] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  864]) & (c >> 31); x[offset +  736] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  992]; t = (x[offset +  992] ^ x[offset + 1120]) & (c >> 31); x[offset +  992] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  160]) & (c >> 31); x[offset +   96] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  288]) & (c >> 31); x[offset +  224] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  416]) & (c >> 31); x[offset +  352] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  544]) & (c >> 31); x[offset +  480] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  672]) & (c >> 31); x[offset +  608] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  800]) & (c >> 31); x[offset +  736] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  928]) & (c >> 31); x[offset +  864] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  992]; t = (x[offset +  992] ^ x[offset + 1056]) & (c >> 31); x[offset +  992] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1184]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1312]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1312] ^= t;
+		c = 61444 - x[offset +   32]; t = (x[offset +   32] ^ x[offset +   64]) & (c >> 31); x[offset +   32] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   96]; t = (x[offset +   96] ^ x[offset +  128]) & (c >> 31); x[offset +   96] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  160]; t = (x[offset +  160] ^ x[offset +  192]) & (c >> 31); x[offset +  160] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  224]; t = (x[offset +  224] ^ x[offset +  256]) & (c >> 31); x[offset +  224] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  288]; t = (x[offset +  288] ^ x[offset +  320]) & (c >> 31); x[offset +  288] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  352]; t = (x[offset +  352] ^ x[offset +  384]) & (c >> 31); x[offset +  352] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  416]; t = (x[offset +  416] ^ x[offset +  448]) & (c >> 31); x[offset +  416] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  480]; t = (x[offset +  480] ^ x[offset +  512]) & (c >> 31); x[offset +  480] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  544]; t = (x[offset +  544] ^ x[offset +  576]) & (c >> 31); x[offset +  544] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  608]; t = (x[offset +  608] ^ x[offset +  640]) & (c >> 31); x[offset +  608] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  672]; t = (x[offset +  672] ^ x[offset +  704]) & (c >> 31); x[offset +  672] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  736]; t = (x[offset +  736] ^ x[offset +  768]) & (c >> 31); x[offset +  736] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  800]; t = (x[offset +  800] ^ x[offset +  832]) & (c >> 31); x[offset +  800] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  864]; t = (x[offset +  864] ^ x[offset +  896]) & (c >> 31); x[offset +  864] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  928]; t = (x[offset +  928] ^ x[offset +  960]) & (c >> 31); x[offset +  928] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  992]; t = (x[offset +  992] ^ x[offset + 1024]) & (c >> 31); x[offset +  992] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset + 1056]; t = (x[offset + 1056] ^ x[offset + 1088]) & (c >> 31); x[offset + 1056] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1120]; t = (x[offset + 1120] ^ x[offset + 1152]) & (c >> 31); x[offset + 1120] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1184]; t = (x[offset + 1184] ^ x[offset + 1216]) & (c >> 31); x[offset + 1184] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1248]; t = (x[offset + 1248] ^ x[offset + 1280]) & (c >> 31); x[offset + 1248] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset + 1040]) & (c >> 31); x[offset +   16] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset + 1040]) & (c >> 31); x[offset +  528] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset + 1296]) & (c >> 31); x[offset +  272] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset + 1296]) & (c >> 31); x[offset +  784] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  528]) & (c >> 31); x[offset +  272] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset + 1040]) & (c >> 31); x[offset +  784] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset + 1168]) & (c >> 31); x[offset +  144] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset + 1168]) & (c >> 31); x[offset +  656] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  656]) & (c >> 31); x[offset +  400] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset + 1168]) & (c >> 31); x[offset +  912] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  272]) & (c >> 31); x[offset +  144] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  528]) & (c >> 31); x[offset +  400] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  784]) & (c >> 31); x[offset +  656] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset + 1040]) & (c >> 31); x[offset +  912] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1296]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset + 1104]) & (c >> 31); x[offset +   80] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset + 1104]) & (c >> 31); x[offset +  592] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  592]) & (c >> 31); x[offset +  336] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset + 1104]) & (c >> 31); x[offset +  848] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset + 1232]) & (c >> 31); x[offset +  208] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset + 1232]) & (c >> 31); x[offset +  720] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  720]) & (c >> 31); x[offset +  464] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset + 1232]) & (c >> 31); x[offset +  976] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  336]) & (c >> 31); x[offset +  208] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  592]) & (c >> 31); x[offset +  464] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  848]) & (c >> 31); x[offset +  720] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset + 1104]) & (c >> 31); x[offset +  976] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +  144]) & (c >> 31); x[offset +   80] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  272]) & (c >> 31); x[offset +  208] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  400]) & (c >> 31); x[offset +  336] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  528]) & (c >> 31); x[offset +  464] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  656]) & (c >> 31); x[offset +  592] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  784]) & (c >> 31); x[offset +  720] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  912]) & (c >> 31); x[offset +  848] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset + 1040]) & (c >> 31); x[offset +  976] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1168]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1296]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset + 1072]) & (c >> 31); x[offset +   48] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset + 1072]) & (c >> 31); x[offset +  560] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset + 1328]) & (c >> 31); x[offset +  304] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset + 1328]) & (c >> 31); x[offset +  816] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  560]) & (c >> 31); x[offset +  304] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset + 1072]) & (c >> 31); x[offset +  816] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset + 1200]) & (c >> 31); x[offset +  176] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset + 1200]) & (c >> 31); x[offset +  688] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  688]) & (c >> 31); x[offset +  432] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset + 1200]) & (c >> 31); x[offset +  944] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  304]) & (c >> 31); x[offset +  176] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  560]) & (c >> 31); x[offset +  432] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  816]) & (c >> 31); x[offset +  688] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset + 1072]) & (c >> 31); x[offset +  944] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1328]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset + 1136]) & (c >> 31); x[offset +  112] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset + 1136]) & (c >> 31); x[offset +  624] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  624]) & (c >> 31); x[offset +  368] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset + 1136]) & (c >> 31); x[offset +  880] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset + 1264]) & (c >> 31); x[offset +  240] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset + 1264]) & (c >> 31); x[offset +  752] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  752]) & (c >> 31); x[offset +  496] ^= t; x[offset +  752] ^= t;
+		c = 61444 - x[offset + 1008]; t = (x[offset + 1008] ^ x[offset + 1264]) & (c >> 31); x[offset + 1008] ^= t; x[offset + 1264] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  368]) & (c >> 31); x[offset +  240] ^= t; x[offset +  368] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  624]) & (c >> 31); x[offset +  496] ^= t; x[offset +  624] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  880]) & (c >> 31); x[offset +  752] ^= t; x[offset +  880] ^= t;
+		c = 61444 - x[offset + 1008]; t = (x[offset + 1008] ^ x[offset + 1136]) & (c >> 31); x[offset + 1008] ^= t; x[offset + 1136] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  176]) & (c >> 31); x[offset +  112] ^= t; x[offset +  176] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  304]) & (c >> 31); x[offset +  240] ^= t; x[offset +  304] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  432]) & (c >> 31); x[offset +  368] ^= t; x[offset +  432] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  560]) & (c >> 31); x[offset +  496] ^= t; x[offset +  560] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  688]) & (c >> 31); x[offset +  624] ^= t; x[offset +  688] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  816]) & (c >> 31); x[offset +  752] ^= t; x[offset +  816] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  944]) & (c >> 31); x[offset +  880] ^= t; x[offset +  944] ^= t;
+		c = 61444 - x[offset + 1008]; t = (x[offset + 1008] ^ x[offset + 1072]) & (c >> 31); x[offset + 1008] ^= t; x[offset + 1072] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1200]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1200] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1328]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1328] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   80]) & (c >> 31); x[offset +   48] ^= t; x[offset +   80] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  144]) & (c >> 31); x[offset +  112] ^= t; x[offset +  144] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  208]) & (c >> 31); x[offset +  176] ^= t; x[offset +  208] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  272]) & (c >> 31); x[offset +  240] ^= t; x[offset +  272] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  336]) & (c >> 31); x[offset +  304] ^= t; x[offset +  336] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  400]) & (c >> 31); x[offset +  368] ^= t; x[offset +  400] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  464]) & (c >> 31); x[offset +  432] ^= t; x[offset +  464] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  528]) & (c >> 31); x[offset +  496] ^= t; x[offset +  528] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  592]) & (c >> 31); x[offset +  560] ^= t; x[offset +  592] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  656]) & (c >> 31); x[offset +  624] ^= t; x[offset +  656] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  720]) & (c >> 31); x[offset +  688] ^= t; x[offset +  720] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  784]) & (c >> 31); x[offset +  752] ^= t; x[offset +  784] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  848]) & (c >> 31); x[offset +  816] ^= t; x[offset +  848] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  912]) & (c >> 31); x[offset +  880] ^= t; x[offset +  912] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  976]) & (c >> 31); x[offset +  944] ^= t; x[offset +  976] ^= t;
+		c = 61444 - x[offset + 1008]; t = (x[offset + 1008] ^ x[offset + 1040]) & (c >> 31); x[offset + 1008] ^= t; x[offset + 1040] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1104]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1104] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1168]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1168] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1232]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1232] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1296]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1296] ^= t;
+		c = 61444 - x[offset +   16]; t = (x[offset +   16] ^ x[offset +   32]) & (c >> 31); x[offset +   16] ^= t; x[offset +   32] ^= t;
+		c = 61444 - x[offset +   48]; t = (x[offset +   48] ^ x[offset +   64]) & (c >> 31); x[offset +   48] ^= t; x[offset +   64] ^= t;
+		c = 61444 - x[offset +   80]; t = (x[offset +   80] ^ x[offset +   96]) & (c >> 31); x[offset +   80] ^= t; x[offset +   96] ^= t;
+		c = 61444 - x[offset +  112]; t = (x[offset +  112] ^ x[offset +  128]) & (c >> 31); x[offset +  112] ^= t; x[offset +  128] ^= t;
+		c = 61444 - x[offset +  144]; t = (x[offset +  144] ^ x[offset +  160]) & (c >> 31); x[offset +  144] ^= t; x[offset +  160] ^= t;
+		c = 61444 - x[offset +  176]; t = (x[offset +  176] ^ x[offset +  192]) & (c >> 31); x[offset +  176] ^= t; x[offset +  192] ^= t;
+		c = 61444 - x[offset +  208]; t = (x[offset +  208] ^ x[offset +  224]) & (c >> 31); x[offset +  208] ^= t; x[offset +  224] ^= t;
+		c = 61444 - x[offset +  240]; t = (x[offset +  240] ^ x[offset +  256]) & (c >> 31); x[offset +  240] ^= t; x[offset +  256] ^= t;
+		c = 61444 - x[offset +  272]; t = (x[offset +  272] ^ x[offset +  288]) & (c >> 31); x[offset +  272] ^= t; x[offset +  288] ^= t;
+		c = 61444 - x[offset +  304]; t = (x[offset +  304] ^ x[offset +  320]) & (c >> 31); x[offset +  304] ^= t; x[offset +  320] ^= t;
+		c = 61444 - x[offset +  336]; t = (x[offset +  336] ^ x[offset +  352]) & (c >> 31); x[offset +  336] ^= t; x[offset +  352] ^= t;
+		c = 61444 - x[offset +  368]; t = (x[offset +  368] ^ x[offset +  384]) & (c >> 31); x[offset +  368] ^= t; x[offset +  384] ^= t;
+		c = 61444 - x[offset +  400]; t = (x[offset +  400] ^ x[offset +  416]) & (c >> 31); x[offset +  400] ^= t; x[offset +  416] ^= t;
+		c = 61444 - x[offset +  432]; t = (x[offset +  432] ^ x[offset +  448]) & (c >> 31); x[offset +  432] ^= t; x[offset +  448] ^= t;
+		c = 61444 - x[offset +  464]; t = (x[offset +  464] ^ x[offset +  480]) & (c >> 31); x[offset +  464] ^= t; x[offset +  480] ^= t;
+		c = 61444 - x[offset +  496]; t = (x[offset +  496] ^ x[offset +  512]) & (c >> 31); x[offset +  496] ^= t; x[offset +  512] ^= t;
+		c = 61444 - x[offset +  528]; t = (x[offset +  528] ^ x[offset +  544]) & (c >> 31); x[offset +  528] ^= t; x[offset +  544] ^= t;
+		c = 61444 - x[offset +  560]; t = (x[offset +  560] ^ x[offset +  576]) & (c >> 31); x[offset +  560] ^= t; x[offset +  576] ^= t;
+		c = 61444 - x[offset +  592]; t = (x[offset +  592] ^ x[offset +  608]) & (c >> 31); x[offset +  592] ^= t; x[offset +  608] ^= t;
+		c = 61444 - x[offset +  624]; t = (x[offset +  624] ^ x[offset +  640]) & (c >> 31); x[offset +  624] ^= t; x[offset +  640] ^= t;
+		c = 61444 - x[offset +  656]; t = (x[offset +  656] ^ x[offset +  672]) & (c >> 31); x[offset +  656] ^= t; x[offset +  672] ^= t;
+		c = 61444 - x[offset +  688]; t = (x[offset +  688] ^ x[offset +  704]) & (c >> 31); x[offset +  688] ^= t; x[offset +  704] ^= t;
+		c = 61444 - x[offset +  720]; t = (x[offset +  720] ^ x[offset +  736]) & (c >> 31); x[offset +  720] ^= t; x[offset +  736] ^= t;
+		c = 61444 - x[offset +  752]; t = (x[offset +  752] ^ x[offset +  768]) & (c >> 31); x[offset +  752] ^= t; x[offset +  768] ^= t;
+		c = 61444 - x[offset +  784]; t = (x[offset +  784] ^ x[offset +  800]) & (c >> 31); x[offset +  784] ^= t; x[offset +  800] ^= t;
+		c = 61444 - x[offset +  816]; t = (x[offset +  816] ^ x[offset +  832]) & (c >> 31); x[offset +  816] ^= t; x[offset +  832] ^= t;
+		c = 61444 - x[offset +  848]; t = (x[offset +  848] ^ x[offset +  864]) & (c >> 31); x[offset +  848] ^= t; x[offset +  864] ^= t;
+		c = 61444 - x[offset +  880]; t = (x[offset +  880] ^ x[offset +  896]) & (c >> 31); x[offset +  880] ^= t; x[offset +  896] ^= t;
+		c = 61444 - x[offset +  912]; t = (x[offset +  912] ^ x[offset +  928]) & (c >> 31); x[offset +  912] ^= t; x[offset +  928] ^= t;
+		c = 61444 - x[offset +  944]; t = (x[offset +  944] ^ x[offset +  960]) & (c >> 31); x[offset +  944] ^= t; x[offset +  960] ^= t;
+		c = 61444 - x[offset +  976]; t = (x[offset +  976] ^ x[offset +  992]) & (c >> 31); x[offset +  976] ^= t; x[offset +  992] ^= t;
+		c = 61444 - x[offset + 1008]; t = (x[offset + 1008] ^ x[offset + 1024]) & (c >> 31); x[offset + 1008] ^= t; x[offset + 1024] ^= t;
+		c = 61444 - x[offset + 1040]; t = (x[offset + 1040] ^ x[offset + 1056]) & (c >> 31); x[offset + 1040] ^= t; x[offset + 1056] ^= t;
+		c = 61444 - x[offset + 1072]; t = (x[offset + 1072] ^ x[offset + 1088]) & (c >> 31); x[offset + 1072] ^= t; x[offset + 1088] ^= t;
+		c = 61444 - x[offset + 1104]; t = (x[offset + 1104] ^ x[offset + 1120]) & (c >> 31); x[offset + 1104] ^= t; x[offset + 1120] ^= t;
+		c = 61444 - x[offset + 1136]; t = (x[offset + 1136] ^ x[offset + 1152]) & (c >> 31); x[offset + 1136] ^= t; x[offset + 1152] ^= t;
+		c = 61444 - x[offset + 1168]; t = (x[offset + 1168] ^ x[offset + 1184]) & (c >> 31); x[offset + 1168] ^= t; x[offset + 1184] ^= t;
+		c = 61444 - x[offset + 1200]; t = (x[offset + 1200] ^ x[offset + 1216]) & (c >> 31); x[offset + 1200] ^= t; x[offset + 1216] ^= t;
+		c = 61444 - x[offset + 1232]; t = (x[offset + 1232] ^ x[offset + 1248]) & (c >> 31); x[offset + 1232] ^= t; x[offset + 1248] ^= t;
+		c = 61444 - x[offset + 1264]; t = (x[offset + 1264] ^ x[offset + 1280]) & (c >> 31); x[offset + 1264] ^= t; x[offset + 1280] ^= t;
+		c = 61444 - x[offset + 1296]; t = (x[offset + 1296] ^ x[offset + 1312]) & (c >> 31); x[offset + 1296] ^= t; x[offset + 1312] ^= t;
+	}
+}