menu bar contrast removal

Revert "Revert old ffmpeg"

See merge request videostreaming/grayjay!157

app/aar/ffmpeg-kit-full-6.0-2.LTS.aar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea10d3c5562c9f449a4e89e9c3dfcf881ed79a952f3409bc005bcc62c2cf4b81
-size 65512557

app/aar/ffmpeg-kit.aar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22c06ca0d1a5808b2fc0a12227d5915b3126bc0b9b1305cf6bab855f2ec6fcbb
+size 36133152

app/build.gradle

@@ -181,7 +181,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.13.2' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
 
     //JS
-    implementation 'com.caoccao.javet:javet-v8-android:5.0.1'
+    implementation 'com.caoccao.javet:javet-v8-android:4.1.5'
 
     //Exoplayer
     implementation 'androidx.media3:media3-exoplayer:1.8.0'

app/src/main/AndroidManifest.xml

@@ -29,6 +29,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FutoVideo"
         android:usesCleartextTraffic="true"
+        tools:replace="android:enableOnBackInvokedCallback"
+        android:enableOnBackInvokedCallback="false"
         tools:targetApi="31"
         android:largeHeap="true">
         <provider
@@ -61,6 +63,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
             android:exported="true"
             android:theme="@style/Theme.FutoVideo.NoActionBar"
+            android:windowSoftInputMode="adjustPan"
             android:launchMode="singleInstance"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true">

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

@@ -8,6 +8,7 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -211,7 +212,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     //State
     private val _queue: LinkedList<Pair<MainFragment, Any?>> = LinkedList();
-    lateinit var fragCurrent: MainFragment private set;
+    var fragCurrent: MainFragment? = null; private set;
     private var _parameterCurrent: Any? = null;
 
     var fragBeforeOverlay: MainFragment? = null; private set;
@@ -332,6 +333,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
         }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
+
         //Preload common files to memory
         FragmentedStorage.get<SubscriptionStorage>();
         FragmentedStorage.get<Settings>();
@@ -566,7 +571,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         defaultTab.action(_fragBotBarMenu);
         StateSubscriptions.instance;
 
-        fragCurrent.onShown(null, false);
+        fragCurrent?.onShown(null, false);
 
         //Other stuff
         rootView.progress = 0f;
@@ -1153,7 +1158,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         if (_fragVideoDetail.state == VideoDetailFragment.State.MAXIMIZED && _fragVideoDetail.onBackPressed())
             return;
 
-        if (!fragCurrent.onBackPressed())
+        if (!(fragCurrent?.onBackPressed() ?: true))
             closeSegment();
     }
 
@@ -1231,27 +1236,27 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 return;
             }
 
-            fragCurrent.onHide();
+            fragCurrent?.onHide();
 
             if (segment.isMainView) {
                 var transaction = supportFragmentManager.beginTransaction();
                 if (segment.topBar != null) {
-                    if (segment.topBar != fragCurrent.topBar) {
+                    if (segment.topBar != fragCurrent?.topBar) {
                         transaction = transaction
                             .show(segment.topBar as Fragment)
                             .replace(R.id.fragment_top_bar, segment.topBar as Fragment);
-                        fragCurrent.topBar?.onHide();
+                        fragCurrent?.topBar?.onHide();
                     }
-                } else if (fragCurrent.topBar != null)
-                    transaction.hide(fragCurrent.topBar as Fragment);
+                } else if (fragCurrent?.topBar != null)
+                    transaction.hide(fragCurrent?.topBar as Fragment);
 
                 transaction = transaction.replace(R.id.fragment_main, segment);
 
                 if (segment.hasBottomBar) {
-                    if (!fragCurrent.hasBottomBar)
+                    if (!(fragCurrent?.hasBottomBar ?: false))
                         transaction = transaction.show(_fragBotBarMenu);
                 } else {
-                    if (fragCurrent.hasBottomBar)
+                    if (fragCurrent?.hasBottomBar ?: false)
                         transaction = transaction.hide(_fragBotBarMenu);
                 }
                 transaction.commitNow();
@@ -1264,10 +1269,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                 }
             }
 
-            if (fragCurrent.isHistory && withHistory && _queue.lastOrNull() != fragCurrent)
-                _queue.add(Pair(fragCurrent, _parameterCurrent));
+            if (fragCurrent?.isHistory ?: false && withHistory && _queue.lastOrNull() != fragCurrent)
+                _queue.add(Pair(fragCurrent!!, _parameterCurrent));
 
-            if (segment.isOverlay && !fragCurrent.isOverlay && withHistory)// && fragCurrent.isHistory)
+            if (segment.isOverlay && !(fragCurrent?.isOverlay ?: false) && withHistory)// && fragCurrent.isHistory)
                 fragBeforeOverlay = fragCurrent;
 
             fragCurrent = segment;
@@ -1364,7 +1369,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     private fun updateSegmentPaddings() {
         var paddingBottom = 0f;
-        if (fragCurrent.hasBottomBar)
+        if (fragCurrent?.hasBottomBar ?: false)
             paddingBottom += HEIGHT_MENU_DP;
 
         _fragContainerOverlay.setPadding(

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

@@ -153,8 +153,8 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
+        _httpClient = JSHttpClient(this, null, _captcha, config);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
         _plugin = V8Plugin(context, descriptor.config, null, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
@@ -186,8 +186,8 @@ open class JSClient : IPlatformClient {
         _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _httpClient = JSHttpClient(this, null, _captcha);
-        _httpClientAuth = JSHttpClient(this, _auth, _captcha);
+        _httpClient = JSHttpClient(this, null, _captcha, config);
+        _httpClientAuth = JSHttpClient(this, _auth, _captcha, config);
         _plugin = V8Plugin(context, descriptor.config, script, _httpClient, _httpClientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");

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

@@ -23,6 +23,7 @@ import java.util.UUID
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
     private val _jsConfig: SourcePluginConfig?;
+    val config get() = _jsConfig
     private val _auth: SourceAuth?;
     private val _captcha: SourceCaptchaData?;
 

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

@@ -1,6 +1,9 @@
 package com.futo.platformplayer.downloads
 
 import android.content.Context
+import android.media.MediaCodec
+import android.media.MediaExtractor
+import android.media.MediaMuxer
 import android.util.Log
 import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.ReturnCode
@@ -585,55 +588,44 @@ class VideoDownload {
         return cipher.doFinal(encryptedSegment)
     }
 
-    private fun remuxWithFfmpegInPlace(inputFile: File): Boolean {
-        val inputPath = inputFile.absolutePath
-        if (!inputFile.exists()) {
-            Logger.w(TAG, "remuxWithFfmpegInPlace: input does not exist: $inputPath")
-            return false
-        }
+    private suspend fun combineSegments(context: Context, segmentFiles: List<File>, targetFile: File) = withContext(Dispatchers.IO) {
+        suspendCancellableCoroutine { continuation ->
+            val fileList = File(context.cacheDir, "fileList-${UUID.randomUUID()}.txt")
+            fileList.writeText(segmentFiles.joinToString("\n") { "file '${it.absolutePath}'" })
 
-        val parent = inputFile.parentFile
-        if (parent == null) {
-            Logger.w(TAG, "remuxWithFfmpegInPlace: input has no parent: $inputPath")
-            return false
-        }
-
-        val tmpFile = File(parent, inputFile.nameWithoutExtension + "_fixed." + inputFile.extension)
-        val cmd = buildString {
-            append("-y ")
-            append("-i \"").append(inputFile.absolutePath).append("\" ")
-            append("-c copy ")
-            append("-movflags +faststart ")
-            append("\"").append(tmpFile.absolutePath).append("\"")
-        }
-
-        Logger.i(TAG, "FFmpeg remux command: $cmd")
-
-        val session = FFmpegKit.execute(cmd)
-        val returnCode = session.returnCode
-
-        if (ReturnCode.isSuccess(returnCode)) {
-            val newLen = tmpFile.length()
-
-            if (!inputFile.delete()) {
-                Logger.w(TAG, "remuxWithFfmpegInPlace: failed to delete original: ${inputFile.absolutePath}")
+            val cmd = "-f concat -safe 0 -i \"${fileList.absolutePath}\" -c copy \"${targetFile.absolutePath}\""
+            val statisticsCallback = StatisticsCallback { _ ->
+                //TODO: Show progress?
             }
 
-            if (!tmpFile.renameTo(inputFile)) {
-                Logger.w(TAG, "remuxWithFfmpegInPlace: failed to move tmp: ${tmpFile.absolutePath}")
-            } else {
-                Logger.i(TAG, "remuxWithFfmpegInPlace: success for $inputPath (size=$newLen bytes)")
-            }
+            val executorService = Executors.newSingleThreadExecutor()
+            val session = FFmpegKit.executeAsync(cmd,
+                { session ->
+                    if (ReturnCode.isSuccess(session.returnCode)) {
+                        fileList.delete()
+                        continuation.resumeWith(Result.success(Unit))
+                    } else {
+                        val errorMessage = if (ReturnCode.isCancel(session.returnCode)) {
+                            "Command cancelled"
+                        } else {
+                            "Command failed with state '${session.state}' and return code ${session.returnCode}, stack trace ${session.failStackTrace}"
+                        }
+                        fileList.delete()
+                        continuation.resumeWithException(RuntimeException(errorMessage))
+                    }
+                },
+                { Logger.v(TAG, it.message) },
+                statisticsCallback,
+                executorService
+            )
 
-            return true
-        } else {
-            Logger.e(TAG, "FFmpeg remux failed for $inputPath. rc=$returnCode, logs=${session.allLogsAsString}")
-            tmpFile.delete()
-            return false
+            continuation.invokeOnCancellation {
+                session.cancel()
+            }
         }
     }
 
-    private fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
+    private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
         if (targetFile.exists())
             targetFile.delete()
 
@@ -678,6 +670,7 @@ class VideoDownload {
                 .array()
         }
 
+        val segmentFiles = arrayListOf<File>()
         try {
             val playlistHeaders = mutableMapOf<String, String>()
             val modifiedPlaylistReq = modifier?.modifyRequest(hlsUrl, playlistHeaders)
@@ -713,123 +706,134 @@ class VideoDownload {
             val mediaSequence = variantPlaylist.mediaSequence ?: 0L
             val rangeOffsets = mutableMapOf<String, Long>()
 
-            targetFile.outputStream().use { outStr ->
-                if (!variantPlaylist.mapUrl.isNullOrEmpty()) {
-                    if (isCancelled) throw CancellationException("Cancelled")
+            if (!variantPlaylist.mapUrl.isNullOrEmpty()) {
+                if (isCancelled) throw CancellationException("Cancelled")
 
-                    Logger.i(TAG, "Downloading HLS initialization map")
+                Logger.i(TAG, "Downloading HLS initialization map")
 
-                    var mapRangeStart: Long? = null
-                    var mapRangeLength: Long? = null
+                var mapRangeStart: Long? = null
+                var mapRangeLength: Long? = null
 
-                    if (variantPlaylist.mapBytesLength > 0) {
-                        mapRangeLength = variantPlaylist.mapBytesLength
+                if (variantPlaylist.mapBytesLength > 0) {
+                    mapRangeLength = variantPlaylist.mapBytesLength
 
-                        val mapUrl = variantPlaylist.mapUrl!!
-                        if (variantPlaylist.mapBytesStart >= 0) {
-                            mapRangeStart = variantPlaylist.mapBytesStart
-                            rangeOffsets[mapUrl] =
-                                variantPlaylist.mapBytesStart + variantPlaylist.mapBytesLength
-                        } else {
-                            val offset = rangeOffsets[mapUrl] ?: 0L
-                            mapRangeStart = offset
-                            rangeOffsets[mapUrl] = offset + variantPlaylist.mapBytesLength
-                        }
+                    val mapUrl = variantPlaylist.mapUrl
+                    if (variantPlaylist.mapBytesStart >= 0) {
+                        mapRangeStart = variantPlaylist.mapBytesStart
+                        rangeOffsets[mapUrl] =
+                            variantPlaylist.mapBytesStart + variantPlaylist.mapBytesLength
+                    } else {
+                        val offset = rangeOffsets[mapUrl] ?: 0L
+                        mapRangeStart = offset
+                        rangeOffsets[mapUrl] = offset + variantPlaylist.mapBytesLength
                     }
+                }
 
-                    var mapBytes = downloadBytes(variantPlaylist.mapUrl!!, mapRangeStart, mapRangeLength)
+                var mapBytes = downloadBytes(variantPlaylist.mapUrl!!, mapRangeStart, mapRangeLength)
 
-                    if (useDecryption) {
-                        val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                        val iv = staticIvBytes
-                            ?: throw UnsupportedOperationException("Encrypted EXT-X-MAP without explicit IV is not supported.")
-                        mapBytes = decryptSegment(mapBytes, kb, iv)
-                    }
+                if (useDecryption) {
+                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
+                    val iv = staticIvBytes
+                        ?: throw UnsupportedOperationException("Encrypted EXT-X-MAP without explicit IV is not supported.")
+                    mapBytes = decryptSegment(mapBytes, kb, iv)
+                }
 
-                    if (mapBytes.size.toLong() > Int.MAX_VALUE) {
-                        throw IllegalStateException("HLS MAP segment too large to handle.")
-                    }
+                if (mapBytes.size.toLong() > Int.MAX_VALUE) {
+                    throw IllegalStateException("HLS MAP segment too large to handle.")
+                }
 
+                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
+                val outStr = segmentFile.outputStream()
+                try {
+                    segmentFiles.add(segmentFile)
                     outStr.write(mapBytes)
                     outStr.flush()
-                    downloadedTotalLength += mapBytes.size
-                }
-
-                val totalSegments = variantPlaylist.segments.size
-                var mediaSegmentIndex = 0
-
-                var bytesSinceLastSpeedUpdate = 0L
-                var lastSpeedUpdateTime = System.currentTimeMillis()
-                var lastSpeed = 0L
-
-                variantPlaylist.segments.forEachIndexed { index, segment ->
-                    if (segment !is HLS.MediaSegment) return@forEachIndexed
-                    if (isCancelled) throw CancellationException("Cancelled")
-
-                    Logger.i(TAG, "Download '$name' segment $index sequential")
-
-                    var rangeStart: Long? = null
-                    var rangeLength: Long? = null
-
-                    if (segment.bytesLength > 0) {
-                        rangeLength = segment.bytesLength
-
-                        val urlKey = segment.uri
-                        if (segment.bytesStart >= 0) {
-                            rangeStart = segment.bytesStart
-                            rangeOffsets[urlKey] = segment.bytesStart + segment.bytesLength
-                        } else {
-                            val offset = rangeOffsets[urlKey] ?: 0L
-                            rangeStart = offset
-                            rangeOffsets[urlKey] = offset + segment.bytesLength
-                        }
-                    }
-
-                    var segmentBytes = downloadBytes(segment.uri, rangeStart, rangeLength)
-
-                    if (useDecryption) {
-                        val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
-                        val ivBytes = if (staticIvBytes != null) {
-                            staticIvBytes!!
-                        } else {
-                            val sequenceNumber = mediaSequence + mediaSegmentIndex
-                            buildSequenceIv(sequenceNumber)
-                        }
-
-                        segmentBytes = decryptSegment(segmentBytes, kb, ivBytes)
-                    }
-
-                    val segmentLength = segmentBytes.size.toLong()
-                    if (segmentLength > Int.MAX_VALUE) {
-                        throw IllegalStateException("HLS media segment too large to handle.")
-                    }
-
-                    val avgLen = if (index == 0) {
-                        segmentLength
-                    } else {
-                        if (index > 0) downloadedTotalLength / index else segmentLength
-                    }
-                    val expectedTotal = avgLen * (totalSegments - 1) + segmentLength
-
-                    outStr.write(segmentBytes)
-                    downloadedTotalLength += segmentLength
-
-                    bytesSinceLastSpeedUpdate += segmentLength
-                    val now = System.currentTimeMillis()
-                    val elapsed = now - lastSpeedUpdateTime
-                    if (elapsed >= 500 && bytesSinceLastSpeedUpdate > 0) {
-                        lastSpeed = (bytesSinceLastSpeedUpdate * 1000L / elapsed)
-                        bytesSinceLastSpeedUpdate = 0
-                        lastSpeedUpdateTime = now
-                    }
-
-                    onProgress(expectedTotal, downloadedTotalLength, lastSpeed)
-                    mediaSegmentIndex++
+                } finally {
+                    outStr.close()
                 }
+                downloadedTotalLength += mapBytes.size
             }
 
-            remuxWithFfmpegInPlace(targetFile)
+            val totalSegments = variantPlaylist.segments.size
+            var mediaSegmentIndex = 0
 
+            var bytesSinceLastSpeedUpdate = 0L
+            var lastSpeedUpdateTime = System.currentTimeMillis()
+            var lastSpeed = 0L
+
+            variantPlaylist.segments.forEachIndexed { index, segment ->
+                if (segment !is HLS.MediaSegment) return@forEachIndexed
+                if (isCancelled) throw CancellationException("Cancelled")
+
+                Logger.i(TAG, "Download '$name' segment $index sequential")
+
+                var rangeStart: Long? = null
+                var rangeLength: Long? = null
+
+                if (segment.bytesLength > 0) {
+                    rangeLength = segment.bytesLength
+
+                    val urlKey = segment.uri
+                    if (segment.bytesStart >= 0) {
+                        rangeStart = segment.bytesStart
+                        rangeOffsets[urlKey] = segment.bytesStart + segment.bytesLength
+                    } else {
+                        val offset = rangeOffsets[urlKey] ?: 0L
+                        rangeStart = offset
+                        rangeOffsets[urlKey] = offset + segment.bytesLength
+                    }
+                }
+
+                var segmentBytes = downloadBytes(segment.uri, rangeStart, rangeLength)
+
+                if (useDecryption) {
+                    val kb = keyBytes ?: throw IllegalStateException("Decryption key bytes are missing.")
+                    val ivBytes = if (staticIvBytes != null) {
+                        staticIvBytes
+                    } else {
+                        val sequenceNumber = mediaSequence + mediaSegmentIndex
+                        buildSequenceIv(sequenceNumber)
+                    }
+
+                    segmentBytes = decryptSegment(segmentBytes, kb, ivBytes)
+                }
+
+                val segmentLength = segmentBytes.size.toLong()
+                if (segmentLength > Int.MAX_VALUE) {
+                    throw IllegalStateException("HLS media segment too large to handle.")
+                }
+
+                val avgLen = if (index == 0) {
+                    segmentLength
+                } else {
+                    if (index > 0) downloadedTotalLength / index else segmentLength
+                }
+                val expectedTotal = avgLen * (totalSegments - 1) + segmentLength
+
+                val segmentFile = File(context.cacheDir, "segment-${UUID.randomUUID()}")
+                val outStr = segmentFile.outputStream()
+                try {
+                    segmentFiles.add(segmentFile)
+                    outStr.write(segmentBytes)
+                } finally {
+                    outStr.close()
+                }
+                downloadedTotalLength += segmentLength
+
+                bytesSinceLastSpeedUpdate += segmentLength
+                val now = System.currentTimeMillis()
+                val elapsed = now - lastSpeedUpdateTime
+                if (elapsed >= 500 && bytesSinceLastSpeedUpdate > 0) {
+                    lastSpeed = (bytesSinceLastSpeedUpdate * 1000L / elapsed)
+                    bytesSinceLastSpeedUpdate = 0
+                    lastSpeedUpdateTime = now
+                }
+
+                onProgress(expectedTotal, downloadedTotalLength, lastSpeed)
+                mediaSegmentIndex++
+            }
+
+            combineSegments(context, segmentFiles, targetFile)
             Logger.i(TAG, "Finished HLS Source for $name")
         } catch (ioex: IOException) {
             if (targetFile.exists())
@@ -843,6 +847,11 @@ class VideoDownload {
                 targetFile.delete()
             throw ex
         }
+        finally {
+            for (segmentFile in segmentFiles) {
+                segmentFile.delete()
+            }
+        }
 
         return downloadedTotalLength
     }

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

@@ -23,10 +23,7 @@ object Libcurl {
         var body: ByteArray? = null,
         var impersonateTarget: String = "chrome136",
         var useBuiltInHeaders: Boolean = true,
-        var timeoutMs: Int = 30_000,
-        var cookieJarPath: String? = null,
-        var sendCookies: Boolean = true,
-        var persistCookies: Boolean = true,
+        var timeoutMs: Int = 30_000
     )
 
     @Keep
@@ -121,12 +118,6 @@ object Libcurl {
                 if (slist != 0L) checkOK(ce_setopt_ptr(easy, CURLOPT.HTTPHEADER, slist))
             }
 
-            if (req.sendCookies || req.persistCookies) {
-                val jar = (req.cookieJarPath ?: defaultCookieJarPath())
-                if (req.sendCookies) checkOK(ce_setopt_str(easy, CURLOPT.COOKIEFILE, jar))
-                if (req.persistCookies) checkOK(ce_setopt_str(easy, CURLOPT.COOKIEJAR,  jar))
-            }
-
             val method = req.method
             if (!method.equals("GET", ignoreCase = true)) {
                 checkOK(ce_setopt_str(easy, CURLOPT.CUSTOMREQUEST, method))

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

@@ -1,5 +1,7 @@
 package com.futo.platformplayer.engine.packages
 
+import android.net.Uri
+import androidx.core.net.toUri
 import com.caoccao.javet.annotations.V8Convert
 import com.caoccao.javet.annotations.V8Function
 import com.caoccao.javet.annotations.V8Property
@@ -10,9 +12,13 @@ import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.primitive.V8ValueString
 import com.caoccao.javet.values.reference.V8ValueTypedArray
 import com.curlbind.Libcurl
+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
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.engine.exceptions.ScriptException
+import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.internal.IV8Convertable
 import com.futo.platformplayer.engine.internal.V8BindObject
 import com.futo.platformplayer.logging.Logger
@@ -43,8 +49,8 @@ class PackageHttpImp : V8Package {
 
     constructor(plugin: V8Plugin, config: IV8PluginConfig) : super(plugin) {
         _config = config
-        _packageClient = PackageHttpClient(this, withAuth = false)
-        _packageClientAuth = PackageHttpClient(this, withAuth = true)
+        _packageClient = PackageHttpClient(this, plugin.httpClient)
+        _packageClientAuth = PackageHttpClient(this, plugin.httpClientAuth)
     }
 
     fun cleanup() {
@@ -95,7 +101,10 @@ class PackageHttpImp : V8Package {
 
     @V8Function
     fun newClient(withAuth: Boolean): PackageHttpClient {
-        val client = PackageHttpClient(this, withAuth)
+        val httpClient = if(withAuth) _plugin.httpClientAuth.clone() else _plugin.httpClient.clone();
+        if(httpClient is JSHttpClient)
+            _plugin.registerHttpClient(httpClient);
+        val client = PackageHttpClient(this, httpClient)
         client.clientId()?.let { _clients[it] = client }
         return client
     }
@@ -672,9 +681,6 @@ class PackageHttpImp : V8Package {
         @Transient
         private val _package: PackageHttpImp
 
-        @Transient
-        private val _withAuth: Boolean
-
         val parentConfig: IV8PluginConfig
             get() = _package._config
 
@@ -686,44 +692,21 @@ class PackageHttpImp : V8Package {
 
         @Volatile
         private var timeoutMs: Int = 30_000
-
-        @Volatile
-        private var sendCookies: Boolean = true
-
-        @Volatile
-        private var updateCookies: Boolean = true
-
-        @Volatile
-        private var allowNewCookies: Boolean = true
-
-        @Volatile
-        private var cookieJarPath: String? = null
-
         @Volatile
         private var impersonateTarget: String = "chrome136"
 
         @Volatile
         private var useBuiltInHeaders: Boolean = true
 
+        @Transient
+        private val _client: ManagedHttpClient;
+
         @V8Property
         fun clientId(): String? = _clientId
 
-        constructor(pack: PackageHttpImp, withAuth: Boolean) : super() {
+        constructor(pack: PackageHttpImp, baseClient: ManagedHttpClient) : super() {
             _package = pack
-            _withAuth = withAuth
-        }
-
-        private fun ensureCookieJarPath(): String {
-            val existing = cookieJarPath
-            if (existing != null) return existing
-
-            val tmp = System.getProperty("java.io.tmpdir") ?: "/data/local/tmp"
-            val safeName = parentConfig.name.replace(Regex("[^a-zA-Z0-9._-]"), "_")
-            val fileName =
-                if (_withAuth) "imphttp.$safeName.auth.cookies.txt" else "imphttp.$safeName.cookies.txt"
-            val path = if (tmp.endsWith("/")) tmp + fileName else "$tmp/$fileName"
-            cookieJarPath = path
-            return path
+            _client = baseClient
         }
 
         @V8Function
@@ -737,17 +720,18 @@ class PackageHttpImp : V8Package {
 
         @V8Function
         fun setDoApplyCookies(apply: Boolean) {
-            sendCookies = apply
+            if(_client is JSHttpClient)
+                _client.doApplyCookies = apply;
         }
-
         @V8Function
         fun setDoUpdateCookies(update: Boolean) {
-            updateCookies = update
+            if(_client is JSHttpClient)
+                _client.doUpdateCookies = update;
         }
-
         @V8Function
         fun setDoAllowNewCookies(allow: Boolean) {
-            allowNewCookies = allow
+            if(_client is JSHttpClient)
+                _client.doAllowNewCookies = allow;
         }
 
         @V8Function
@@ -1060,18 +1044,29 @@ class PackageHttpImp : V8Package {
         private fun performCurl(
             method: String,
             url: String,
-            headers: Map<String, String>,
+            hs: Map<String, String>, //TODO: Why is this not a Map<String, List<String>>
             bodyBytes: ByteArray?,
             impersonateTargetOverride: String? = null,
             useBuiltInHeadersOverride: Boolean? = null,
             timeoutMsOverride: Int? = null
         ): Libcurl.Response {
-            val jar = ensureCookieJarPath()
+            val client = _client
+            if (client is JSHttpClient) {
+                if (!(client.config?.isUrlAllowed(url) ?: false)) {
+                    throw Exception( "Attempted to access non-whitelisted url: $url\nAdd it to your config");
+                }
+            }
 
             val finalImpersonateTarget = impersonateTargetOverride ?: this.impersonateTarget
             val finalUseBuiltInHeaders = useBuiltInHeadersOverride ?: this.useBuiltInHeaders
             val finalTimeoutMs = timeoutMsOverride ?: this.timeoutMs
 
+            val uri = url.toUri()
+            val headers = hs.toMutableMap()
+            if (client is JSHttpClient) {
+                client.applyHeaders(uri, headers, _client.isLoggedIn, true)
+            }
+
             val req = Libcurl.Request(
                 url = url,
                 method = method,
@@ -1079,12 +1074,13 @@ class PackageHttpImp : V8Package {
                 body = bodyBytes,
                 impersonateTarget = finalImpersonateTarget,
                 useBuiltInHeaders = finalUseBuiltInHeaders,
-                timeoutMs = finalTimeoutMs,
-                cookieJarPath = jar,
-                sendCookies = sendCookies,
-                persistCookies = updateCookies && allowNewCookies
+                timeoutMs = finalTimeoutMs
             )
-            return Libcurl.perform(req)
+            val resp = Libcurl.perform(req)
+            if (client is JSHttpClient) {
+                client.processRequest(method, resp.status, uri, resp.headers)
+            }
+            return resp
         }
 
         private fun executeRequest(

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

@@ -6,7 +6,7 @@ import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
 
 open class MainActivityFragment : Fragment() {
-    protected val currentMain : MainFragment
+    protected val currentMain : MainFragment?
         get() {
         isValidMainActivity();
         return (activity as MainActivity).fragCurrent;

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

@@ -102,6 +102,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
 
         private var currentButtonDefinitions: List<ButtonDefinition>? = null;
 
+        private var moreColumns = 3;
+
         constructor(fragment: MenuBottomBarFragment, inflater: LayoutInflater) : super(inflater.context) {
             _fragment = fragment;
             _inflater = inflater;
@@ -170,6 +172,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
                     setMoreVisible(false);
                 }
             })
+            moreColumns = columns;
             val layoutManager = GridLayoutManager(context, columns, GridLayoutManager.VERTICAL, true);
             _layoutMoreButtons.layoutManager = layoutManager;
 
@@ -321,29 +324,37 @@ class MenuBottomBarFragment : MainActivityFragment() {
             _layoutMoreButtons.removeAllViews();
 
             var insertedButtons = 0;
+            //Force settings to be first
+            val settingsIndex = buttons.indexOfFirst { b -> b.id == 7 };
+            if (settingsIndex != -1) {
+                val button = buttons[settingsIndex]
+                buttons.removeAt(settingsIndex)
+                buttons.add(0, button)
+                //insertedButtons++;
+            }
             //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++;
+                buttons.add(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 (insertedButtons == 1) 1 else 0, button)
-                insertedButtons++;
+                buttons.add(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++;
+                buttons.add(button)
+                //insertedButtons++;
             }
 
             val newButtons = mutableListOf<MenuButtonItem>();
@@ -602,7 +613,7 @@ 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 (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
@@ -612,7 +623,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
                     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, withHistory = false);
             })

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

@@ -484,7 +484,8 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
         recyclerData.resultsUnfiltered.addAll(toAdd);
         recyclerData.adapter.notifyDataSetChanged();
         recyclerData.loadedFeedStyle = feedStyle;
-        ensureEnoughContentVisible(filteredResults)
+        if(pager.hasMorePages())
+            ensureEnoughContentVisible(filteredResults)
     }
 
     private fun detachPagerEvents() {

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

@@ -365,8 +365,10 @@ class HomeFragment : MainFragment() {
             finishRefreshLayoutLoader();
             setLoading(false);
             setPager(pager);
-            if(pager.getResults().isEmpty() && !pager.hasMorePages())
+            if(pager.getResults().isEmpty() && !pager.hasMorePages()) {
+                setLoading(false);
                 setEmptyPager(true);
+            }
         }
     }
 

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

@@ -124,11 +124,10 @@ class LibraryFilesFragment : MainFragment() {
             }
         }
         fun leaveDirectory() {
-            if(navStack.size > 1) {
-                navStack.removeLast();
-                openDirectory(navStack.last());
+            if (navStack.size > 1) {
+                navStack.removeAt(navStack.size - 1)
+                openDirectory(navStack.last())
             }
-            else {}
         }
         fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
             if(addToStack)

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

@@ -436,9 +436,9 @@ class StateApp {
             try {
                 val caFile = AppCaUpdater.ensureCaBundle(context)
                 Libcurl.setDefaultCAPath(caFile.absolutePath)
+                Logger.i(TAG, "Libcurl initialized")
             } catch (t: Throwable) {
-                val fallback = File(context.noBackupFilesDir, "curl-ca-bundle.pem")
-                if (fallback.exists()) Libcurl.setDefaultCAPath(fallback.absolutePath)
+                Logger.e(TAG, "Failed to initialize Libcurl", t);
             }
         }
 

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

@@ -21,7 +21,7 @@ class StateAssets {
                 if(part == "." || part == "..") {
                     if(parentAllowance <= 0)
                         throw IllegalStateException("Path [${path}] attempted to escape path..");
-                    parts1.removeLast();
+                    parts1.removeAt(parts1.size - 1);
                     toSkip++;
                 }
                 else

app/src/main/java/com/futo/platformplayer/stores/SearchHistoryStorage.kt

@@ -11,7 +11,7 @@ class SearchHistoryStorage : FragmentedStorageFileJson() {
         if (!lastQueries.contains(text)) {
             lastQueries.add(0, text);
             if (lastQueries.size > 10)
-                lastQueries.removeLast();
+                lastQueries.removeAt(lastQueries.size - 1);
         }
         else {
             lastQueries.remove(text);

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

@@ -109,6 +109,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
+                android:layoutDirection="rtl"
 
                 android:gravity="end">
             </androidx.recyclerview.widget.RecyclerView>