Changed intent codes for pip to match with intent codes from notification.

Possible ui fixes

See merge request videostreaming/grayjay!148

app/build.gradle

@@ -97,7 +97,7 @@ android {
 
     defaultConfig {
         minSdk 28
-        targetSdk 34
+        targetSdk 35
         versionCode gitVersionCode
         versionName gitVersionName
 

app/src/main/AndroidManifest.xml

@@ -153,30 +153,30 @@
         </activity>
         <activity
             android:name=".activities.TestActivity"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.SettingsActivity"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.DeveloperActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.ExceptionActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.CaptchaActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.LoginActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.AddSourceActivity"
             android:exported="true"
-            android:theme="@style/Theme.FutoVideo.NoActionBar">
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -189,54 +189,54 @@
         <activity
             android:name=".activities.AddSourceOptionsActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricHomeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricBackupActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricCreateProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricWhyActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.PolycentricImportProfileActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.ManageTabsActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.QRCaptureActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.FCastGuideActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.SyncHomeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.SyncPairActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
         <activity
             android:name=".activities.SyncShowPairingCodeActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/Theme.FutoVideo.NoActionBar" />
+            android:theme="@style/Theme.FutoVideo.NoActionBarFitsSystem" />
     </application>
 </manifest>

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

@@ -216,10 +216,9 @@ private fun ByteArray.toInetAddress(): InetAddress {
     return InetAddress.getByAddress(this);
 }
 
-fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket? {
+fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int, timeoutMs: Int = 10_000): Socket? {
     ensureNotMainThread()
 
-    val timeout = 10000
     val addresses = if(!Settings.instance.casting.allowIpv6) attemptAddresses.filterIsInstance<Inet4Address>() else attemptAddresses;
     if(addresses.isEmpty())
         throw IllegalStateException("No valid addresses found (ipv6: ${(if(Settings.instance.casting.allowIpv6) "enabled" else "disabled")})");
@@ -232,7 +231,7 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket?
         val socket = Socket()
 
         try {
-            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeout) }
+            return socket.apply { this.connect(InetSocketAddress(addresses[0], port), timeoutMs) }
         } catch (e: Throwable) {
             Log.i("getConnectedSocket", "Failed to connect to: ${addresses[0]}", e)
             socket.close()
@@ -263,7 +262,7 @@ fun getConnectedSocket(attemptAddresses: List<InetAddress>, port: Int): Socket?
                     }
                 }
 
-                socket.connect(InetSocketAddress(address, port), timeout);
+                socket.connect(InetSocketAddress(address, port), timeoutMs);
 
                 synchronized(syncObject) {
                     if (connectedSocket == null) {

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

@@ -7,11 +7,13 @@ import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueError
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.caoccao.javet.values.reference.V8ValuePromise
+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.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -21,7 +23,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.selects.SelectClause0
 import kotlinx.coroutines.selects.SelectClause1
-import java.util.concurrent.CancellationException
 import java.util.concurrent.CountDownLatch
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
@@ -268,12 +269,25 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
                 underlyingDef.complete(p0 as T);
             }
             override fun onRejected(p0: V8Value?) {
-                plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented.."));
+                try {
+                    plugin.resolvePromise(promise);
+                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented..");
+                    Logger.i("V8", "Promise rejected, setting exception");
+                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                }
+                catch(ex: Throwable) {
+                    Logger.e("V8", "Rejection handling failed?" , ex);
+                }
             }
             override fun onCatch(p0: V8Value?) {
-                plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented.."));
+                try {
+                    plugin.resolvePromise(promise);
+                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented..");
+                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                }
+                catch(ex: Throwable) {
+                    Logger.e("V8", "Catching handling failed?" , ex);
+                }
             }
         });
     }
@@ -287,13 +301,16 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
 fun V8Value.toException(config: IV8PluginConfig): Throwable {
     val p0 = this;
     if(p0 is V8ValueObject) {
+        return V8Plugin.getExceptionFromPlugin(config, p0, null, null, null, "P:");
+        /*
         val pluginType = p0.getOrDefault(config, "plugin_type", "Promise Exception", "")?.let { if(!it.isNullOrBlank()) it + "" else "" }
         val msg = p0.getOrDefault<String?>(config, "msg", "Promise Exception", null)
             ?: p0.getOrDefault(config, "message", "Promise Exception", "");
-        return Exception("Promise Failed: " + pluginType + msg);
+        return Throwable("Promise Failed: " + pluginType + msg);
+        */
     }
     else if(p0 is V8ValueString)
-        return Exception("Promise Failed:" + p0.value);
+        return Throwable("Promise Failed:" + p0.value);
     else
         return NotImplementedError("onCatch promise not implemented..");
 }
@@ -358,4 +375,16 @@ fun V8ValueObject.invokeV8VoidAsync(method: String, vararg obj: Any?): V8Deferre
         return result;
     }
     return V8Deferred(CompletableDeferred(result));
+}
+
+suspend fun <T> Deferred<T>.awaitCancelConverted(): T {
+    try {
+        return this.await();
+    }
+    catch(ex: CancellationException) {
+        if(ex.cause != null) {
+            throw ex.cause!!;
+        }
+        throw ex;
+    }
 }

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

@@ -0,0 +1,118 @@
+package com.futo.platformplayer
+
+import android.app.Activity
+import android.graphics.Color
+import android.os.Build
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsCompat.Type
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.doOnAttach
+import androidx.core.view.updatePadding
+import kotlin.math.max
+
+class RootInsetsController private constructor(
+    private val activity: Activity,
+    private val window: Window,
+    private val root: ViewGroup
+) {
+    private val controller by lazy { WindowInsetsControllerCompat(window, root) }
+
+    private val basePaddingLeft = root.paddingLeft
+    private val basePaddingTop = root.paddingTop
+    private val basePaddingRight = root.paddingRight
+    private val basePaddingBottom = root.paddingBottom
+
+    private var currentInsets: WindowInsetsCompat = WindowInsetsCompat.CONSUMED
+    private var fullscreen = false
+
+    init {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.statusBarColor = Color.TRANSPARENT
+        window.navigationBarColor = Color.TRANSPARENT
+        controller.systemBarsBehavior =
+            WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+
+        ViewCompat.setOnApplyWindowInsetsListener(root) { _, insets ->
+            currentInsets = insets
+            applyPadding()
+            insets
+        }
+
+        root.doOnAttach { ViewCompat.requestApplyInsets(root) }
+    }
+
+    private fun effectiveInsets(): Insets {
+        if (fullscreen) return Insets.NONE
+
+        val sys = currentInsets.getInsets(Type.systemBars())
+        val cut = currentInsets.getInsetsIgnoringVisibility(Type.displayCutout())
+        val portrait = activity.resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT
+
+        val top = if (portrait) max(sys.top, cut.top) else sys.top
+        return Insets.of(sys.left, top, sys.right, sys.bottom)
+    }
+
+
+    private fun applyPadding() {
+        val e = effectiveInsets()
+        root.updatePadding(
+            left = basePaddingLeft + e.left,
+            top = basePaddingTop + e.top,
+            right = basePaddingRight + e.right,
+            bottom = basePaddingBottom + e.bottom
+        )
+    }
+
+    private fun forceRelayoutAndInsets() {
+        root.post {
+            ViewCompat.requestApplyInsets(root)
+            applyPadding()
+            root.post {
+                ViewCompat.requestApplyInsets(root)
+                applyPadding()
+            }
+        }
+    }
+
+    fun enterFullscreen(allowCutoutShortEdges: Boolean = true) {
+        fullscreen = true
+        if (allowCutoutShortEdges) {
+            window.attributes = window.attributes.apply {
+                layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            }
+        }
+        controller.hide(Type.systemBars())
+        forceRelayoutAndInsets()
+    }
+
+    fun exitFullscreen() {
+        fullscreen = false
+        window.attributes = window.attributes.apply {
+            layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+        }
+        controller.show(Type.systemBars())
+        forceRelayoutAndInsets()
+    }
+
+    fun onConfigurationChanged() {
+        forceRelayoutAndInsets()
+    }
+
+    fun setLightSystemBarAppearance(lightStatus: Boolean, lightNav: Boolean) {
+        controller.isAppearanceLightStatusBars = lightStatus
+        controller.isAppearanceLightNavigationBars = lightNav
+    }
+
+    companion object {
+        fun attach(activity: Activity, root: ViewGroup): RootInsetsController {
+            return RootInsetsController(activity, activity.window, root)
+        }
+    }
+}

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

@@ -16,7 +16,6 @@ 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
@@ -36,6 +35,7 @@ import androidx.lifecycle.withStateAtLeast
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.R
+import com.futo.platformplayer.RootInsetsController
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
@@ -199,6 +199,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     private var _privateModeEnabled = false
     private var _pictureInPictureEnabled = false
     private var _isFullscreen = false
+    private lateinit var _rootInsetsController: RootInsetsController
 
     private val _urlQrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
@@ -284,9 +285,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
         setContentView(R.layout.activity_main);
         setNavigationBarColorAndIcons();
-        if (Settings.instance.playback.allowVideoToGoUnderCutout)
-            window.attributes.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 
         runBlocking {
             try {
@@ -301,6 +299,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         FragmentedStorage.get<Settings>();
 
         rootView = findViewById(R.id.rootView);
+        _rootInsetsController = RootInsetsController.attach(this, rootView)
+        _rootInsetsController.setLightSystemBarAppearance(lightStatus = false, lightNav = false)
+
         _fragContainerTopBar = findViewById(R.id.fragment_top_bar);
         _fragContainerMain = findViewById(R.id.fragment_main);
         _fragContainerBotBar = findViewById(R.id.fragment_bottom_bar);
@@ -411,6 +412,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             Logger.i(TAG, "onFullscreenChanged ${it}");
             _isFullscreen = it
             updatePrivateModeVisibility()
+            if (it) {
+                _rootInsetsController.enterFullscreen(allowCutoutShortEdges = Settings.instance.playback.allowVideoToGoUnderCutout)
+            } else {
+                _rootInsetsController.exitFullscreen()
+            }
         }
 
         _fragVideoDetail.onMinimize.subscribe {
@@ -639,6 +645,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     private var _qrCodeLoadingDialog: AlertDialog? = null
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        _rootInsetsController.onConfigurationChanged()
+    }
+
     fun showUrlQrCodeScanner() {
         try {
             _qrCodeLoadingDialog = UIDialogs.showDialog(this, R.drawable.ic_loader_animated, true,

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

@@ -110,7 +110,7 @@ class SyncPairActivity : AppCompatActivity() {
 
             lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    StateSync.instance.syncService?.connect(deviceInfo) { complete, message ->
+                    StateSync.instance.syncService?.connect(deviceInfo, true) { complete, message ->
                         lifecycleScope.launch(Dispatchers.Main) {
                             if (complete != null) {
                                 if (complete) {

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

@@ -33,6 +33,7 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 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.awaitCancelConverted
 import com.futo.platformplayer.builders.DashBuilder
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.constructs.Event1
@@ -1183,7 +1184,7 @@ abstract class StateCasting {
                             onLoading?.invoke(true)
                         }
                     }
-                    deferred.await()
+                    deferred.awaitCancelConverted()
                 } finally {
                     if (castId == _castId.get()) {
                         withContext(Dispatchers.Main) {

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

@@ -18,6 +18,7 @@ import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.engine.exceptions.NoInternetException
 import com.futo.platformplayer.engine.exceptions.PluginEngineStoppedException
+import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptCompilationException
@@ -36,6 +37,7 @@ import com.futo.platformplayer.engine.packages.PackageHttp
 import com.futo.platformplayer.engine.packages.PackageJSDOM
 import com.futo.platformplayer.engine.packages.PackageUtilities
 import com.futo.platformplayer.engine.packages.V8Package
+import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateAssets
@@ -513,18 +515,29 @@ class V8Plugin {
         }
 
         private fun throwExceptionFromV8(config: IV8PluginConfig, pluginType: String, msg: String, innerEx: Exception? = null, stack: String? = null, code: String? = null) {
+            throw getExceptionFromPlugin(config, pluginType, msg, innerEx, stack, code);
+        }
+        fun getExceptionFromPlugin(config: IV8PluginConfig, obj: V8ValueObject, innerEx: Exception? = null, stack: String? = null, code: String? = null, prefix: String? = null): PluginException {
+            val pluginType = obj.getOrDefault(config, "plugin_type", "Exception Handling", "")?.let { if(!it.isNullOrBlank()) it + "" else "" } ?: "";
+            var msg = obj.getOrDefault<String?>(config, "msg", "Exception Handling", null)
+                ?: obj.getOrDefault(config, "message", "Exception Handling", "");
+            if(!prefix.isNullOrBlank())
+                msg = prefix + msg;
+            return getExceptionFromPlugin(config, pluginType, msg ?: "Unknown exception", innerEx, stack, code);
+        }
+        fun getExceptionFromPlugin(config: IV8PluginConfig, pluginType: String, msg: String, innerEx: Exception? = null, stack: String? = null, code: String? = null): PluginException {
             when(pluginType) {
-                "ScriptException" -> throw ScriptException(config, msg, innerEx, stack, code);
-                "CriticalException" -> throw ScriptCriticalException(config, msg, innerEx, stack, code);
-                "AgeException" -> throw ScriptAgeException(config, msg, innerEx, stack, code);
-                "UnavailableException" -> throw ScriptUnavailableException(config, msg, innerEx, stack, code);
-                "ScriptLoginRequiredException" -> throw ScriptLoginRequiredException(config, msg, innerEx, stack, code);
-                "ScriptExecutionException" -> throw ScriptExecutionException(config, msg, innerEx, stack, code);
-                "ScriptCompilationException" -> throw ScriptCompilationException(config, msg, innerEx, code);
-                "ScriptImplementationException" -> throw ScriptImplementationException(config, msg, innerEx, null, code);
-                "ScriptTimeoutException" -> throw ScriptTimeoutException(config, msg, innerEx);
-                "NoInternetException" -> throw NoInternetException(config, msg, innerEx, stack, code);
-                else -> throw ScriptExecutionException(config, msg, innerEx, stack, code);
+                "ScriptException" -> return ScriptException(config, msg, innerEx, stack, code);
+                "CriticalException" -> return ScriptCriticalException(config, msg, innerEx, stack, code);
+                "AgeException" -> return ScriptAgeException(config, msg, innerEx, stack, code);
+                "UnavailableException" -> return ScriptUnavailableException(config, msg, innerEx, stack, code);
+                "ScriptLoginRequiredException" -> return ScriptLoginRequiredException(config, msg, innerEx, stack, code);
+                "ScriptExecutionException" -> return ScriptExecutionException(config, msg, innerEx, stack, code);
+                "ScriptCompilationException" -> return ScriptCompilationException(config, msg, innerEx, code);
+                "ScriptImplementationException" -> return ScriptImplementationException(config, msg, innerEx, null, code);
+                "ScriptTimeoutException" -> return ScriptTimeoutException(config, msg, innerEx);
+                "NoInternetException" -> return NoInternetException(config, msg, innerEx, stack, code);
+                else -> return ScriptExecutionException(config, msg, innerEx, stack, code);
             }
         }
 

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

@@ -254,7 +254,7 @@ class PackageHttp: V8Package {
 
     //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)
-    class BatchBuilder(private val _package: PackageHttp, existingRequests: MutableList<Pair<PackageHttpClient, RequestDescriptor>> = mutableListOf()): V8BindObject() {
+    class BatchBuilder(@Transient private val _package: PackageHttp, existingRequests: MutableList<Pair<PackageHttpClient, RequestDescriptor>> = mutableListOf()): V8BindObject() {
         @Transient
         private val _reqs = existingRequests;
 

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

@@ -3038,9 +3038,9 @@ class VideoDetailView : ConstraintLayout {
         }
 
         val playpauseAction = if(_player.playing)
-            RemoteAction(Icon.createWithResource(context, R.drawable.ic_pause_notif), context.getString(R.string.pause), context.getString(R.string.pauses_the_video), MediaControlReceiver.getPauseIntent(context, 5));
+            RemoteAction(Icon.createWithResource(context, R.drawable.ic_pause_notif), context.getString(R.string.pause), context.getString(R.string.pauses_the_video), MediaControlReceiver.getPauseIntent(context, 2));
         else
-            RemoteAction(Icon.createWithResource(context, R.drawable.ic_play_notif), context.getString(R.string.play), context.getString(R.string.resumes_the_video), MediaControlReceiver.getPlayIntent(context, 6));
+            RemoteAction(Icon.createWithResource(context, R.drawable.ic_play_notif), context.getString(R.string.play), context.getString(R.string.resumes_the_video), MediaControlReceiver.getPlayIntent(context, 1));
 
         val toBackgroundAction = RemoteAction(Icon.createWithResource(context, R.drawable.ic_screen_share), context.getString(R.string.background), context.getString(R.string.background_switch_audio), MediaControlReceiver.getToBackgroundIntent(context, 7));
 

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

@@ -66,10 +66,9 @@ class DownloadService : Service() {
                 return START_NOT_STICKY;
 
             if(!FragmentedStorage.isInitialized) {
-                Logger.i(TAG, "Attempted to start DownloadService without initialized files");
-                stopSelf()
-                closeDownloadSession();
-                return START_NOT_STICKY;
+                Logger.i(TAG, "Attempted to start DownloadService without initialized files")
+                closeDownloadSession()
+                return START_NOT_STICKY
             }
             _started = true;
         }
@@ -107,12 +106,19 @@ class DownloadService : Service() {
         return START_STICKY;
     }
     fun setupNotificationRequirements() {
-        _notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-        _notificationChannel = NotificationChannel(DOWNLOAD_NOTIF_CHANNEL_ID, DOWNLOAD_NOTIF_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
-            this.enableVibration(false);
-            this.setSound(null, null);
-        };
-        _notificationManager!!.createNotificationChannel(_notificationChannel!!);
+        _notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (_notificationChannel == null) {
+            _notificationChannel = NotificationChannel(
+                DOWNLOAD_NOTIF_CHANNEL_ID,
+                DOWNLOAD_NOTIF_CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                enableVibration(false)
+                setSound(null, null)
+                setShowBadge(false)
+            }
+        }
+        _notificationManager?.createNotificationChannel(_notificationChannel!!)
     }
 
     override fun onCreate() {
@@ -293,21 +299,28 @@ class DownloadService : Service() {
         val notif = builder.build();
         notif.flags = notif.flags or NotificationCompat.FLAG_ONGOING_EVENT or NotificationCompat.FLAG_NO_CLEAR;
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(DOWNLOAD_NOTIF_ID, notif, FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+        if (_isForeground) {
+            _notificationManager?.notify(DOWNLOAD_NOTIF_ID, notif)
         } else {
-            startForeground(DOWNLOAD_NOTIF_ID, notif);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+                startForeground(DOWNLOAD_NOTIF_ID, notif, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+            else
+                startForeground(DOWNLOAD_NOTIF_ID, notif)
+            _isForeground = true
         }
     }
 
     fun closeDownloadSession() {
-        Logger.i(TAG, "closeDownloadSession");
-        stopForeground(STOP_FOREGROUND_REMOVE);
-        _notificationManager?.cancel(DOWNLOAD_NOTIF_ID);
-        stopService();
-        _started = false;
-        super.stopSelf();
+        Logger.i(TAG, "closeDownloadSession")
+        if (_isForeground) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+            _isForeground = false
+        }
+        _notificationManager?.cancel(DOWNLOAD_NOTIF_ID)
+        _started = false
+        super.stopSelf()
     }
+
     override fun onDestroy() {
         Logger.i(TAG, "onDestroy");
         _instance = null;

app/src/main/java/com/futo/platformplayer/sync/internal/SyncService.kt

@@ -6,6 +6,7 @@ import android.net.nsd.NsdServiceInfo
 import android.os.Build
 import android.util.Log
 import com.futo.platformplayer.Settings
+import com.futo.platformplayer.ensureNotMainThread
 import com.futo.platformplayer.generateReadablePassword
 import com.futo.platformplayer.getConnectedSocket
 import com.futo.platformplayer.logging.Logger
@@ -17,14 +18,23 @@ import com.futo.polycentric.core.base64UrlToByteArray
 import com.futo.polycentric.core.toBase64
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.selects.select
+import kotlinx.coroutines.withContext
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.ServerSocket
 import java.net.Socket
 import java.nio.ByteBuffer
+import java.nio.channels.ClosedChannelException
+import java.nio.channels.ServerSocketChannel
+import java.nio.channels.SocketChannel
 import java.util.Base64
 import java.util.Locale
 import kotlin.math.min
@@ -64,11 +74,7 @@ class SyncService(
     private val database: ISyncDatabaseProvider,
     private val settings: SyncServiceSettings = SyncServiceSettings()
 ) {
-    private var _serverSocket: ServerSocket? = null
-    private var _thread: Thread? = null
-    private var _connectThread: Thread? = null
-    private var _mdnsThread: Thread? = null
-    @Volatile private var _started = false
+    private var _serverSocket: ServerSocketChannel? = null
     private val _sessions: MutableMap<String, SyncSession> = mutableMapOf()
     private val _lastConnectTimesMdns: MutableMap<String, Long> = mutableMapOf()
     private val _lastConnectTimesIp: MutableMap<String, Long> = mutableMapOf()
@@ -82,10 +88,10 @@ class SyncService(
     private val _pairingCode: String? = generateReadablePassword(8)
     val pairingCode: String? get() = _pairingCode
     private var _relaySession: SyncSocketSession? = null
-    private var _threadRelay: Thread? = null
-    private val _remotePendingStatusUpdate = mutableMapOf<String, (complete: Boolean?, message: String) -> Unit>()
+    private val _remotePendingStatusUpdateRelayed = mutableMapOf<String, (complete: Boolean?, message: String) -> Unit>()
+    private val _remotePendingStatusUpdateDirect = mutableMapOf<String, (complete: Boolean?, message: String) -> Unit>()
     private var _nsdManager: NsdManager? = null
-    private var _scope: CoroutineScope? = null
+    @Volatile private var _scope: CoroutineScope? = null
     private val _mdnsCache = mutableMapOf<String, SyncDeviceInfo>()
     private var _discoveryListener: NsdManager.DiscoveryListener = object : NsdManager.DiscoveryListener {
         override fun onDiscoveryStarted(regType: String) {
@@ -216,11 +222,12 @@ class SyncService(
     var authorizePrompt: ((String, (Boolean) -> Unit) -> Unit)? = null
 
     fun start(context: Context) {
-        if (_started) {
-            Logger.i(TAG, "Already started.")
+        if (_scope != null) {
+            Log.i(TAG, "Already started.")
             return
         }
-        _started = true
+
+        Log.i(TAG, "Start SyncService.")
         _scope = CoroutineScope(Dispatchers.IO)
 
         try {
@@ -294,27 +301,30 @@ class SyncService(
     private fun startListener() {
         serverSocketFailedToStart = false
         serverSocketStarted = false
-        _thread = Thread {
+        _scope?.launch(Dispatchers.IO) {
             try {
-                val serverSocket = ServerSocket(settings.listenerPort)
+                val serverSocket = ServerSocketChannel.open()
+                serverSocket.socket().bind(InetSocketAddress("0.0.0.0", settings.listenerPort))
                 _serverSocket = serverSocket
 
-                serverSocketStarted = true
                 Log.i(TAG, "Running on port ${settings.listenerPort} (TCP)")
+                serverSocketStarted = true
 
-                while (_started) {
+                while (isActive) {
                     val socket = serverSocket.accept()
-                    val session = createSocketSession(socket, true)
+                    //TODO: Switch to SocketChannel?
+                    val session = createSocketSession(socket.socket(), true)
                     session.startAsResponder()
                 }
-
-                serverSocketStarted = false
+            } catch (e: ClosedChannelException) {
+                // normal shutdown
             } catch (e: Throwable) {
-                Logger.e(TAG, "Failed to bind server socket to port ${settings.listenerPort}", e)
+                Log.e(TAG, "Failed to bind server socket to port ${settings.listenerPort}", e)
                 serverSocketFailedToStart = true
+            } finally {
                 serverSocketStarted = false
             }
-        }.apply { start() }
+        }
     }
 
     private fun startMdnsRetryLoop() {
@@ -322,43 +332,44 @@ class SyncService(
             discoverServices(serviceName, NsdManager.PROTOCOL_DNS_SD, _discoveryListener)
         }
 
-        _mdnsThread = Thread {
-            while (_started) {
+        _scope?.launch(Dispatchers.IO) {
+            while (isActive) {
                 try {
                     val now = System.currentTimeMillis()
-                    synchronized(_mdnsCache) {
-                        for ((pkey, info) in _mdnsCache) {
-                            if (!database.isAuthorized(pkey) || getLinkType(pkey) == LinkType.Direct) continue
+                    val pairs = synchronized (_mdnsCache) { _mdnsCache.toList() }
+                    for ((pkey, info) in pairs) {
+                        if (!database.isAuthorized(pkey) || getLinkType(pkey) == LinkType.Direct) continue
 
-                            val last = synchronized(_lastConnectTimesMdns) {
-                                _lastConnectTimesMdns[pkey] ?: 0L
-                            }
-                            if (now - last > 30_000L) {
+                        val last = synchronized(_lastConnectTimesMdns) {
+                            _lastConnectTimesMdns[pkey] ?: 0L
+                        }
+                        if (now - last > 30_000L) {
+                            synchronized(_lastConnectTimesMdns) {
                                 _lastConnectTimesMdns[pkey] = now
-                                try {
-                                    Logger.i(TAG, "MDNS-retry: connecting to $pkey")
-                                    connect(info)
-                                } catch (ex: Throwable) {
-                                    Logger.w(TAG, "MDNS retry failed for $pkey", ex)
-                                }
+                            }
+                            try {
+                                Log.i(TAG, "MDNS-retry: connecting to $pkey")
+                                connect(info)
+                                if (!isActive) break
+                            } catch (ex: Throwable) {
+                                Log.w(TAG, "MDNS retry failed for $pkey", ex)
                             }
                         }
                     }
                 } catch (ex: Throwable) {
-                    Logger.e(TAG, "Error in MDNS retry loop", ex)
+                    Log.e(TAG, "Error in MDNS retry loop", ex)
                 }
-                Thread.sleep(5000)
+                delay(5000)
             }
-        }.apply { start() }
+        }
     }
 
-
     private fun startConnectLastLoop() {
-        _connectThread = Thread {
+        _scope?.launch(Dispatchers.IO) {
             Log.i(TAG, "Running auto reconnector")
 
-            while (_started) {
-                val authorizedDevices = database.getAllAuthorizedDevices() ?: arrayOf()
+            while (isActive) {
+                val authorizedDevices = database.getAllAuthorizedDevices()?.toList() ?: listOf()
                 val addressesToConnect = authorizedDevices.mapNotNull {
                     val connectedDirectly = getLinkType(it) == LinkType.Direct
                     if (connectedDirectly) {
@@ -382,26 +393,26 @@ class SyncService(
                                 _lastConnectTimesIp[connectPair.first] = now
                             }
 
-                            Logger.i(TAG, "Attempting to connect to authorized device by last known IP '${connectPair.first}' with pkey=${connectPair.first}")
+                            Log.i(TAG, "Attempting to connect to authorized device by last known IP '${connectPair.first}' with pkey=${connectPair.first}")
                             connect(arrayOf(connectPair.second), settings.listenerPort, connectPair.first, null)
                         }
                     } catch (e: Throwable) {
-                        Logger.i(TAG, "Failed to connect to " + connectPair.first, e)
+                        Log.i(TAG, "Failed to connect to " + connectPair.first, e)
                     }
                 }
-                Thread.sleep(5000)
+                delay(5000)
             }
-        }.apply { start() }
+        }
     }
 
     private fun startRelayLoop() {
         relayConnected = false
-        _threadRelay = Thread {
+        _scope?.launch(Dispatchers.IO) {
             try {
                 var backoffs: Array<Long> = arrayOf(1000, 5000, 10000, 20000)
                 var backoffIndex = 0;
 
-                while (_started) {
+                while (isActive) {
                     try {
                         Log.i(TAG, "Starting relay session...")
                         relayConnected = false
@@ -465,7 +476,7 @@ class SyncService(
 
                                 Thread {
                                     try {
-                                        while (_started && !socketClosed) {
+                                        while (isActive && !socketClosed) {
                                             val unconnectedAuthorizedDevices =
                                                 database.getAllAuthorizedDevices()
                                                     ?.filter {
@@ -503,27 +514,14 @@ class SyncService(
                                                     connectionInfo.ipv4Addresses
                                                         .filter { it != connectionInfo.remoteIp }
                                                 if (getLinkType(targetKey) != LinkType.Direct && connectionInfo.allowLocalDirect && Settings.instance.synchronization.connectLocalDirectThroughRelay) {
-                                                    Thread {
+                                                    launch(Dispatchers.IO) {
                                                         try {
-                                                            Log.v(
-                                                                TAG,
-                                                                "Attempting to connect directly, locally to '$targetKey'."
-                                                            )
-                                                            connect(
-                                                                potentialLocalAddresses.map { it }
-                                                                    .toTypedArray(),
-                                                                settings.listenerPort,
-                                                                targetKey,
-                                                                null
-                                                            )
+                                                            Log.v(TAG, "Attempting to connect directly, locally to '$targetKey'.")
+                                                            connect(potentialLocalAddresses.map { it }.toTypedArray(), settings.listenerPort, targetKey, null)
                                                         } catch (e: Throwable) {
-                                                            Log.e(
-                                                                TAG,
-                                                                "Failed to start direct connection using connection info with $targetKey.",
-                                                                e
-                                                            )
+                                                            Log.e(TAG, "Failed to start direct connection using connection info with $targetKey.", e)
                                                         }
-                                                    }.start()
+                                                    }
                                                 }
 
                                                 if (connectionInfo.allowRemoteDirect) {
@@ -587,7 +585,7 @@ class SyncService(
             } catch (ex: Throwable) {
                 Log.i(TAG, "Unhandled exception in relay loop.", ex)
             }
-        }.apply { start() }
+        }
     }
 
     private fun createSocketSession(socket: Socket, isResponder: Boolean): SyncSocketSession {
@@ -699,14 +697,21 @@ class SyncService(
         return _pairingCode == pairingCode
     }
 
+    private fun sendRemotePendingStatusUpdate(remotePublicKey: String, complete: Boolean, message: String) {
+        synchronized(_remotePendingStatusUpdateDirect) {
+            _remotePendingStatusUpdateDirect.remove(remotePublicKey)?.invoke(complete, message)
+        }
+        synchronized(_remotePendingStatusUpdateRelayed) {
+            _remotePendingStatusUpdateRelayed.remove(remotePublicKey)?.invoke(complete, message)
+        }
+    }
+
     private fun createNewSyncSession(rpk: String, remoteDeviceName: String?): SyncSession {
         val remotePublicKey = rpk.base64ToByteArray().toBase64()
         return SyncSession(
             remotePublicKey,
             onAuthorized = { it, isNewlyAuthorized, isNewSession ->
-                synchronized(_remotePendingStatusUpdate) {
-                    _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(true, "Authorized")
-                }
+                sendRemotePendingStatusUpdate(remotePublicKey, true, "Authorized")
 
                 if (isNewSession) {
                     it.remoteDeviceName?.let { remoteDeviceName ->
@@ -719,10 +724,7 @@ class SyncService(
                 onAuthorized?.invoke(it, isNewlyAuthorized, isNewSession)
             },
             onUnauthorized = {
-                synchronized(_remotePendingStatusUpdate) {
-                    _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(false, "Unauthorized")
-                }
-
+                sendRemotePendingStatusUpdate(remotePublicKey, false, "Unauthorized")
                 onUnauthorized?.invoke(it)
             },
             onConnectedChanged = { it, connected ->
@@ -733,9 +735,7 @@ class SyncService(
                 Logger.i(TAG, "$remotePublicKey closed")
 
                 removeSession(it.remotePublicKey)
-                synchronized(_remotePendingStatusUpdate) {
-                    _remotePendingStatusUpdate.remove(remotePublicKey)?.invoke(false, "Connection closed")
-                }
+                sendRemotePendingStatusUpdate(remotePublicKey, false, "Connection closed")
 
                 onClose?.invoke(it)
             },
@@ -757,42 +757,67 @@ class SyncService(
     fun getAllAuthorizedDevices(): Array<String>? = database.getAllAuthorizedDevices()
     fun removeAuthorizedDevice(publicKey: String) = database.removeAuthorizedDevice(publicKey)
 
-    fun connect(deviceInfo: SyncDeviceInfo, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null) {
-        try {
-            connect(deviceInfo.addresses, deviceInfo.port, deviceInfo.publicKey, deviceInfo.pairingCode, onStatusUpdate)
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to connect directly", e)
-            val relaySession = _relaySession
-            if (relaySession != null && Settings.instance.synchronization.pairThroughRelay) {
-                onStatusUpdate?.invoke(null, "Connecting via relay...")
 
-                runBlocking {
-                    if (onStatusUpdate != null) {
-                        synchronized(_remotePendingStatusUpdate) {
-                            _remotePendingStatusUpdate[deviceInfo.publicKey.base64ToByteArray().toBase64()] = onStatusUpdate
-                        }
-                    }
-                    relaySession.startRelayedChannel(deviceInfo.publicKey.base64ToByteArray().toBase64(), appId, deviceInfo.pairingCode)
+    suspend fun connect(deviceInfo: SyncDeviceInfo, alsoTryRelayed: Boolean = false, timeout_ms: Int = 5_000, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null) {
+        val rs = _relaySession
+        val startTime = System.currentTimeMillis()
+        if (alsoTryRelayed && rs != null && settings.relayPairAllowed) {
+            onStatusUpdate?.invoke(null, "Connecting via relay...")
+
+            if (onStatusUpdate != null) {
+                synchronized(_remotePendingStatusUpdateRelayed) {
+                    _remotePendingStatusUpdateRelayed[deviceInfo.publicKey.base64ToByteArray().toBase64()] = onStatusUpdate
                 }
-            } else {
-                throw e
+            }
+            //TODO: Do not try relayed channel here only for pairing mode?
+            rs.startRelayedChannel(deviceInfo.publicKey.base64ToByteArray().toBase64(), appId, deviceInfo.pairingCode)
+        }
+
+        try {
+            connect(deviceInfo.addresses, deviceInfo.port, deviceInfo.publicKey, deviceInfo.pairingCode, onStatusUpdate, timeout_ms)
+        } catch (e: Throwable) {
+            Log.e(TAG, "Failed to connect directly", e)
+
+            val waitTime_ms = timeout_ms - (System.currentTimeMillis() - startTime)
+            if (waitTime_ms > 0)
+                delay(waitTime_ms)
+
+            onStatusUpdate?.invoke(false, "Failed to connect.")
+            synchronized(_remotePendingStatusUpdateRelayed) {
+                _remotePendingStatusUpdateRelayed.remove(deviceInfo.publicKey.base64ToByteArray().toBase64())
             }
         }
     }
 
-    fun connect(addresses: Array<String>, port: Int, publicKey: String, pairingCode: String?, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null): SyncSocketSession {
+    suspend fun connect(addresses: Array<String>, port: Int, publicKey: String, pairingCode: String?, onStatusUpdate: ((complete: Boolean?, message: String) -> Unit)? = null, timeout_ms: Int = 10_000): SyncSocketSession {
+        val startTime_ms = System.currentTimeMillis()
+
         onStatusUpdate?.invoke(null, "Connecting directly...")
-        val socket = getConnectedSocket(addresses.map { InetAddress.getByName(it) }, port) ?: throw Exception("Failed to connect")
+        val socket = getConnectedSocket(addresses.map { InetAddress.getByName(it) }, port, timeout_ms) ?: throw Exception("Failed to connect")
         onStatusUpdate?.invoke(null, "Handshaking...")
 
         val session = createSocketSession(socket, false)
         if (onStatusUpdate != null) {
-            synchronized(_remotePendingStatusUpdate) {
-                _remotePendingStatusUpdate[publicKey.base64ToByteArray().toBase64()] = onStatusUpdate
+            synchronized(_remotePendingStatusUpdateDirect) {
+                _remotePendingStatusUpdateDirect[publicKey.base64ToByteArray().toBase64()] = onStatusUpdate
             }
         }
 
         session.startAsInitiator(publicKey, appId, pairingCode)
+
+        while (timeout_ms - (startTime_ms - System.currentTimeMillis()) > 0 && !session.isAuthorized && session.started) {
+            delay(100)
+        }
+
+        if (!session.isAuthorized) {
+            Log.i(TAG, "Session is not authorized after timeout, cancelling connection.")
+            session.stop()
+            onStatusUpdate?.invoke(false, "Session not authorized.")
+            synchronized(_remotePendingStatusUpdateDirect) {
+                _remotePendingStatusUpdateDirect.remove(publicKey.base64ToByteArray().toBase64())
+            }
+        }
+
         return session
     }
 
@@ -811,6 +836,8 @@ class SyncService(
         synchronized(_sessions) {
             _sessions.clear()
         }
+        _remotePendingStatusUpdateDirect.clear()
+        _remotePendingStatusUpdateRelayed.clear()
     }
 
     private fun getDeviceName(): String {

app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt

@@ -56,6 +56,7 @@ class SyncSocketSession {
     private var _remotePublicKey: String? = null
     val remotePublicKey: String? get() = _remotePublicKey
     private var _started: Boolean = false
+    val started get() = _started
     private val _localKeyPair: DHState
     private var _thread: Thread? = null
     private var _localPublicKey: String

app/src/main/java/com/futo/platformplayer/views/behavior/SafeTextView.kt

@@ -0,0 +1,25 @@
+package com.futo.platformplayer.views.behavior
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import com.futo.platformplayer.logging.Logger
+
+class SafeTextView : AppCompatTextView {
+    constructor(context: Context) : super(context) {}
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
+
+    override fun performLongClick(): Boolean {
+        try {
+            return super.performLongClick()
+        } catch (e: IllegalStateException) {
+            Logger.w(TAG, "Swallowed exception", e)
+            return false
+        }
+    }
+
+    companion object {
+        private const val TAG = "SafeTextView"
+    }
+}

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

@@ -69,6 +69,7 @@ import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAud
 import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
 import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
 import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.awaitCancelConverted
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
@@ -643,7 +644,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
                             setLoading(true)
                         }
                     }
-                    val generated = generatedDef.await();
+                    val generated = generatedDef.awaitCancelConverted();
                     if (_swapIdVideo.get() != swapId) {
                         return@launch
                     }
@@ -807,7 +808,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
                             setLoading(true)
                         }
                     }
-                    val generated = generatedDef.await();
+                    val generated = generatedDef.awaitCancelConverted();
                     if (_swapIdAudio.get() != swapId) {
                         return@launch
                     }

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

@@ -15,7 +15,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:paddingTop="20dp"
         android:paddingBottom="15dp">
 
         <ImageButton

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

@@ -19,7 +19,6 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:paddingTop="20dp"
             android:paddingBottom="15dp">
 
             <ImageButton

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

@@ -15,7 +15,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:paddingTop="20dp"
         android:paddingBottom="15dp">
 
         <ImageButton

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

@@ -18,7 +18,6 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:paddingTop="20dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:paddingBottom="15dp">

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

@@ -14,7 +14,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:paddingTop="20dp"
         android:paddingBottom="15dp">
 
         <ImageButton

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

@@ -64,7 +64,6 @@
             android:id="@+id/layout_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="20dp"
             android:paddingBottom="20dp"
             android:orientation="vertical">
 

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

@@ -17,7 +17,6 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:paddingTop="20dp"
             android:paddingBottom="15dp">
 
             <ImageButton

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="false"
     android:background="@drawable/bottom_menu_border"
     android:id="@+id/root"
     android:clickable="true">

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="false"
     android:background="@drawable/bottom_menu_border"
     android:id="@+id/root"
     android:clickable="true">

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="false"
     android:background="@drawable/bottom_menu_border"
     android:id="@+id/videodetail_root"
     android:clickable="true">

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

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="false"
     android:background="@drawable/bottom_menu_border"
     android:id="@+id/root"
     android:clickable="true">

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

@@ -26,7 +26,7 @@
         app:layout_constraintTop_toBottomOf="@id/topbar"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
+        <com.futo.platformplayer.views.behavior.SafeTextView
             android:id="@+id/text_description"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/values-v29/themes.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.FutoVideo.NoActionBarFitsSystem" parent="Theme.FutoVideo.NoActionBar">
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
+</resources>

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

@@ -42,7 +42,8 @@
         <item name="colorSecondaryVariant">@color/gray_30</item>
         <item name="colorOnSecondary">@color/black</item>
 
-        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
 
         <item name="imageButtonStyle">@style/Theme.FutoVideo.ImageButton</item>
         <item name="editTextStyle">@style/Theme.FutoVideo.EditText</item>
@@ -91,6 +92,16 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:navigationBarDividerColor">@color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="Theme.FutoVideo.NoActionBarFitsSystem" parent="Theme.FutoVideo.NoActionBar">
+        <item name="android:fitsSystemWindows">true</item>
     </style>
 
     <style name="Theme.FutoVideo.TextAppearance.TabLayout" parent="@android:style/TextAppearance.Medium">