NEWS

+Changes between 3.6.2 and 3.6.3:
+------------------
+ * Fix SMB navigation
+ * Cast only audio setting
+ * Behavior and crash fixes
+
 Changes between 3.6.1 and 3.6.2:
 ------------------
  * Update the remote access dependency to fix a crash loop

application/app/build.gradle

@@ -162,12 +162,9 @@ android {
 dependencies {
     implementation project(':application:vlc-android')
     implementation project(':application:television')
-    devImplementation project(':application:webserver')
-    debugImplementation project(':application:webserver')
-    releaseImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion"
-    vlcBundleImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion"
+    implementation project(':application:remote-access-server')
     testImplementation project(':application:television')
-    testImplementation project(':application:webserver')
+    testImplementation project(':application:remote-access-server')
 
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"

application/remote-access-client/build.gradle

+/*
+ * ************************************************************************
+ *  build.gradle
+ * *************************************************************************
+ * Copyright © 2025 VLC authors and VideoLAN
+ * Author: Nicolas POMEPUY
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * **************************************************************************
+ *
+ *
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'com.vanniktech.maven.publish'
+}
+
+ext {
+    library_version = "$rootProject.ext.remoteAccessVersion"
+}
+
+android {
+    namespace 'org.videolan.vlc.remoteaccessclient'
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        compileSdk rootProject.ext.compileSdkVersion
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+        resValue "string", "build_remote_access_revision", remoteAccessRevision()
+        resValue "string", "remote_access_version", remoteAccessVersion()
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    task webCopy(type: Copy) {
+        from 'remoteaccess/dist'
+        into 'assets/dist'
+    }
+
+    sourceSets.main {
+        assets.srcDirs = ['assets']
+    }
+
+    sourceSets.main {
+        assets.srcDirs = ['assets']
+    }
+
+    // Make per-variant version code
+    libraryVariants.all { variant ->
+        //Custom APK name
+        variant.outputs.each { output ->
+            if (output.outputFileName != null && output.outputFileName.endsWith('.aar')) {
+                output.outputFileName = "vlc-android-remote-access-${library_version}.aar"
+            }
+        }
+    }
+}
+
+preBuild.dependsOn(webCopy)
+
+def remoteAccessVersion() {
+    def code = new ByteArrayOutputStream()
+    try {
+        if (file("remoteaccess/package.json").exists()) {
+
+            exec {
+                commandLine = ['bash', '-c', 'grep -m1 "version" remoteaccess/package.json']
+                standardOutput = code
+            }
+            return code.toString().split("\"")[3]
+
+        }
+    } catch (Exception e) {
+    }
+    return "unknown"
+}
+
+def remoteAccessRevision() {
+    try {
+        def hash = new ByteArrayOutputStream()
+        exec {
+            commandLine = ['bash', '-c', 'git -C remoteaccess rev-parse --short HEAD']
+            standardOutput = hash
+        }
+        return hash.toString()
+    } catch (Exception e) {
+    }
+    return "unknown"
+}
+
+dependencies {
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+}
+
+apply from: '../../buildsystem/publish.gradle'

application/webserver/gradle.properties → application/remote-access-client/gradle.properties

@@ -2,7 +2,7 @@
 # *************************************************************************
 #  gradle.properties
 # **************************************************************************
-# Copyright © 2024 VLC authors and VideoLAN
+# Copyright © 2025 VLC authors and VideoLAN
 # Author: Nicolas POMEPUY
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,4 +28,4 @@ POM_ARTIFACT_ID=remote-access
 
 POM_NAME=VLC-Android-RemoteAccess
 POM_DESCRIPTION=Android port of VLC's Remote Access
-POM_INCEPTION_YEAR=2021
\ No newline at end of file
+POM_INCEPTION_YEAR=2024
\ No newline at end of file

application/remote-access-client/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ *************************************************************************
+  ~  AndroidManifest.xml
+  ~ **************************************************************************
+  ~ Copyright © 2025 VLC authors and VideoLAN
+  ~ Author: Nicolas POMEPUY
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  ~ ***************************************************************************
+  ~
+  ~
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file

application/remote-access-server/.gitignore

+/build
\ No newline at end of file

application/webserver/build.gradle → application/remote-access-server/build.gradle

 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id 'com.vanniktech.maven.publish'
 }
 
-ext {
-    library_version = "$rootProject.ext.remoteAccessVersion"
-}
 android {
-    namespace 'org.videolan.vlc.webserver'
+    namespace 'org.videolan.vlc.remoteaccessserver'
 
     dataBinding {
         enabled = true
@@ -23,8 +19,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
         buildConfigField 'Boolean', 'VLC_REMOTE_ACCESS_DEBUG', project.hasProperty("vlc_remote_access_debug") ? vlc_remote_access_debug : "false"
-        resValue "string", "build_remote_access_revision", remoteAccessRevision()
-        resValue "string", "remote_access_version", remoteAccessVersion()
 
     }
 
@@ -43,11 +37,6 @@ android {
         }
     }
 
-    task webCopy(type: Copy) {
-        from '../../remoteaccess/dist'
-        into 'assets/dist'
-    }
-
     sourceSets.main {
         assets.srcDirs = ['assets']
     }
@@ -68,56 +57,20 @@ android {
         buildConfig true
     }
 
-    // Make per-variant version code
-    libraryVariants.all { variant ->
-        //Custom APK name
-        variant.outputs.each { output ->
-            if (output.outputFileName != null && output.outputFileName.endsWith('.aar')) {
-                output.outputFileName = "vlc-android-remote-access-${library_version}.aar"
-            }
-        }
-    }
-}
-
-def remoteAccessVersion() {
-    def code = new ByteArrayOutputStream()
-    try {
-        if (file("../../remoteaccess/package.json").exists()) {
-
-            exec {
-                commandLine = ['bash', '-c', 'grep -m1 "version" ../../remoteaccess/package.json']
-                standardOutput = code
-            }
-            return code.toString().split("\"")[3]
-
-        }
-    } catch (Exception e) {
-    }
-    return "unknown"
-}
-
-def remoteAccessRevision() {
-    try {
-        def hash = new ByteArrayOutputStream()
-        exec {
-            commandLine = ['bash', '-c', 'git -C ../../remoteaccess rev-parse --short HEAD']
-            standardOutput = hash
-        }
-        return hash.toString()
-    } catch (Exception e) {
-    }
-    return "unknown"
 }
 
-preBuild.dependsOn(webCopy)
-
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    devImplementation project(':application:remote-access-client')
+    debugImplementation project(':application:remote-access-client')
+    releaseImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion"
+    vlcBundleImplementation "org.videolan.android:remote-access:$rootProject.ext.remoteAccessVersion"
     implementation project(':application:vlc-android')
     implementation "io.ktor:ktor:$rootProject.ext.ktorVersion"
     implementation "io.ktor:ktor-server-netty:$rootProject.ext.ktorVersion"
     implementation "io.ktor:ktor-server-websockets:$rootProject.ext.ktorVersion"
     implementation "io.ktor:ktor-server-caching-headers:$rootProject.ext.ktorVersion"
+    implementation "io.ktor:ktor-server-compression:$rootProject.ext.ktorVersion"
     implementation "io.ktor:ktor-server-cors:$rootProject.ext.ktorVersion"
     implementation("io.ktor:ktor-server-auth:$rootProject.ext.ktorVersion")
     implementation("io.ktor:ktor-server-partial-content:$rootProject.ext.ktorVersion")
@@ -130,6 +83,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
-
-apply from: '../../buildsystem/publish.gradle'
+}
\ No newline at end of file

application/remote-access-server/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

application/webserver/src/androidTest/java/org/videolan/vlc/webserver/ExampleInstrumentedTest.kt → application/remote-access-server/src/androidTest/java/org/videolan/vlc/remoteaccessserver/ExampleInstrumentedTest.kt

@@ -22,7 +22,7 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -43,6 +43,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.videolan.vlc.webserver.test", appContext.packageName)
+        assertEquals("org.videolan.vlc.remoteaccessserver.test", appContext.packageName)
     }
 }
\ No newline at end of file

application/webserver/src/main/java/org/videolan/vlc/webserver/RemoteAccessOTP.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessOTP.kt

@@ -2,7 +2,7 @@
  * ************************************************************************
  *  RemoteAccessOTP.kt
  * *************************************************************************
- * Copyright © 2023 VLC authors and VideoLAN
+ * Copyright © 2025 VLC authors and VideoLAN
  * Author: Nicolas POMEPUY
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,14 +22,14 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import org.videolan.vlc.gui.helpers.NotificationHelper
 import org.videolan.vlc.gui.helpers.REMOTE_ACCESS_CODE_ID
-import org.videolan.vlc.webserver.ssl.SecretGenerator
-import org.videolan.vlc.webserver.utils.CypherUtils
+import org.videolan.vlc.remoteaccessserver.ssl.SecretGenerator
+import org.videolan.vlc.remoteaccessserver.utils.CypherUtils
 import java.security.SecureRandom
 
 

application/webserver/src/main/java/org/videolan/vlc/webserver/RemoteAccessRouting.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessRouting.kt

@@ -2,7 +2,7 @@
  * ************************************************************************
  *  RemoteAccessRouting.kt
  * *************************************************************************
- * Copyright © 2023 VLC authors and VideoLAN
+ * Copyright © 2025 VLC authors and VideoLAN
  * Author: Nicolas POMEPUY
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import android.content.Context
 import android.content.res.Resources
@@ -107,6 +107,7 @@ import org.videolan.vlc.BuildConfig
 import org.videolan.vlc.gui.dialogs.getPlaylistByName
 import org.videolan.vlc.gui.helpers.AudioUtil
 import org.videolan.vlc.gui.helpers.BitmapUtil
+import org.videolan.vlc.gui.helpers.VectorDrawableUtil
 import org.videolan.vlc.gui.helpers.getBitmapFromDrawable
 import org.videolan.vlc.gui.helpers.getColoredBitmapFromColor
 import org.videolan.vlc.gui.preferences.search.PreferenceParser
@@ -131,16 +132,16 @@ import org.videolan.vlc.util.slugify
 import org.videolan.vlc.util.toByteArray
 import org.videolan.vlc.viewmodels.browser.FavoritesProvider
 import org.videolan.vlc.viewmodels.browser.PathOperationDelegate
-import org.videolan.vlc.webserver.RemoteAccessServer.Companion.getServerFiles
-import org.videolan.vlc.webserver.RemoteAccessServer.PlayerStatus
-import org.videolan.vlc.webserver.RemoteAccessSession.verifyLogin
-import org.videolan.vlc.webserver.utils.MediaZipUtils
-import org.videolan.vlc.webserver.utils.serveAudios
-import org.videolan.vlc.webserver.utils.servePlaylists
-import org.videolan.vlc.webserver.utils.serveSearch
-import org.videolan.vlc.webserver.utils.serveVideos
-import org.videolan.vlc.webserver.websockets.RemoteAccessWebSockets
-import org.videolan.vlc.webserver.websockets.WSIncomingMessage
+import org.videolan.vlc.remoteaccessserver.RemoteAccessServer.Companion.getServerFiles
+import org.videolan.vlc.remoteaccessserver.RemoteAccessServer.PlayerStatus
+import org.videolan.vlc.remoteaccessserver.RemoteAccessSession.verifyLogin
+import org.videolan.vlc.remoteaccessserver.utils.MediaZipUtils
+import org.videolan.vlc.remoteaccessserver.utils.serveAudios
+import org.videolan.vlc.remoteaccessserver.utils.servePlaylists
+import org.videolan.vlc.remoteaccessserver.utils.serveSearch
+import org.videolan.vlc.remoteaccessserver.utils.serveVideos
+import org.videolan.vlc.remoteaccessserver.websockets.RemoteAccessWebSockets
+import org.videolan.vlc.remoteaccessserver.websockets.WSIncomingMessage
 import java.io.BufferedWriter
 import java.io.File
 import java.io.FileNotFoundException
@@ -275,7 +276,7 @@ fun Route.setupRouting(appContext: Context, scope: CoroutineScope) {
     // Sends an icon
     get("/icon") {
         val idString = call.request.queryParameters["id"]
-        val width = call.request.queryParameters["width"]?.toInt() ?: 32
+        val width = call.request.queryParameters["width"]?.toInt()?.coerceAtLeast(1) ?: 32
         val preventTint = call.request.queryParameters["preventTint"]?.toBoolean() ?: false
 
         val id = try {
@@ -289,6 +290,17 @@ fun Route.setupRouting(appContext: Context, scope: CoroutineScope) {
             call.respond(HttpStatusCode.NotFound)
             return@get
         }
+
+        idString?.let {
+            try {
+                call.respondText(VectorDrawableUtil.convertToSvg(appContext, width, id, it), ContentType.Image.SVG)
+                return@get
+            } catch (e: Resources.NotFoundException) {
+                Log.w(this::class.java.simpleName, "Failed to convert vector drawable. ${e.message}", )
+                // Continue on and let BitmapUtil attempt to load the file
+            }
+        }
+
         val bmp = if (preventTint)
             BitmapUtil.vectorToBitmap(appContext, id, width, width)
         else

application/webserver/src/main/java/org/videolan/vlc/webserver/RemoteAccessServer.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessServer.kt

@@ -2,7 +2,7 @@
  * ************************************************************************
  *  RemoteAccessServer.kt
  * *************************************************************************
- * Copyright © 2023 VLC authors and VideoLAN
+ * Copyright © 2025 VLC authors and VideoLAN
  * Author: Nicolas POMEPUY
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -54,6 +54,9 @@ import io.ktor.server.netty.Netty
 import io.ktor.server.netty.NettyApplicationEngine
 import io.ktor.server.plugins.cachingheaders.CachingHeaders
 import io.ktor.server.plugins.callloging.CallLogging
+import io.ktor.server.plugins.compression.Compression
+import io.ktor.server.plugins.compression.matchContentType
+import io.ktor.server.plugins.compression.minimumSize
 import io.ktor.server.plugins.cors.routing.CORS
 import io.ktor.server.plugins.origin
 import io.ktor.server.plugins.partialcontent.PartialContent
@@ -112,9 +115,9 @@ import org.videolan.vlc.viewmodels.CallBackDelegate
 import org.videolan.vlc.viewmodels.ICallBackHandler
 import org.videolan.vlc.viewmodels.browser.IPathOperationDelegate
 import org.videolan.vlc.viewmodels.browser.PathOperationDelegate
-import org.videolan.vlc.webserver.ssl.SecretGenerator
-import org.videolan.vlc.webserver.websockets.RemoteAccessWebSockets
-import org.videolan.vlc.webserver.websockets.RemoteAccessWebSockets.setupWebSockets
+import org.videolan.vlc.remoteaccessserver.ssl.SecretGenerator
+import org.videolan.vlc.remoteaccessserver.websockets.RemoteAccessWebSockets
+import org.videolan.vlc.remoteaccessserver.websockets.RemoteAccessWebSockets.setupWebSockets
 import java.io.File
 import java.math.BigInteger
 import java.net.InetAddress
@@ -492,6 +495,18 @@ class RemoteAccessServer(private val context: Context) : PlaybackService.Callbac
                     maxFrameSize = Long.MAX_VALUE
                     masking = false
                 }
+                install(Compression) {
+                    default()
+                    matchContentType(
+                        ContentType.Text.Plain,
+                        ContentType.Image.SVG,
+                        ContentType.Text.CSS,
+                        ContentType.Text.Xml,
+                        ContentType.Text.Html,
+                        ContentType.Text.JavaScript,
+                        ContentType.Application.JavaScript
+                    )
+                }
                 install(CachingHeaders) {
                     options { _, content ->
                         when (content.contentType?.withoutParameters()) {

application/webserver/src/main/java/org/videolan/vlc/webserver/RemoteAccessService.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessService.kt

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import android.annotation.SuppressLint
 import android.app.ForegroundServiceStartNotAllowedException

application/webserver/src/main/java/org/videolan/vlc/webserver/RemoteAccessSession.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/RemoteAccessSession.kt

@@ -2,7 +2,7 @@
  * ************************************************************************
  *  RemoteAccessSession.kt
  * *************************************************************************
- * Copyright © 2023 VLC authors and VideoLAN
+ * Copyright © 2025 VLC authors and VideoLAN
  * Author: Nicolas POMEPUY
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 import android.content.SharedPreferences
 import com.squareup.moshi.JsonAdapter
@@ -36,7 +36,7 @@ import io.ktor.server.response.respond
 import io.ktor.server.sessions.sessions
 import io.ktor.util.pipeline.PipelineContext
 import org.videolan.tools.putSingle
-import org.videolan.vlc.webserver.ssl.SecretGenerator
+import org.videolan.vlc.remoteaccessserver.ssl.SecretGenerator
 
 private const val VALID_SESSIONS = "valid_sessions"
 

application/webserver/src/main/java/org/videolan/vlc/webserver/ServerStatus.kt → application/remote-access-server/src/main/java/org/videolan/vlc/remoteaccessserver/ServerStatus.kt

@@ -22,7 +22,7 @@
  *
  */
 
-package org.videolan.vlc.webserver
+package org.videolan.vlc.remoteaccessserver
 
 /**
  * Describe the sharing server status