.tx/config

@@ -9,4 +9,13 @@ minimum_perc           = 50
 resource_name          = android
 replace_edited_strings = false
 keep_translations      = false
-lang_map = zh_CN: zh-rCN, zh_TW: zh-rTW, zgh: zgh-rMA, en_GB: en-rGB, es_MX: es-rMX, pt_BR: pt-rBR, pt_PT: pt
\ No newline at end of file
+lang_map = zh_CN: zh-rCN, zh_TW: zh-rTW, zgh: zgh-rMA, en_GB: en-rGB, es_MX: es-rMX, pt_BR: pt-rBR, pt_PT: pt
+
+[o:yaron:p:vlc-trans:r:android_store]
+file_filter            = buildsystem/automation/framing/locale/<lang>.po
+source_file            = buildsystem/automation/framing/locale/en.po
+type                   = PO
+minimum_perc           = 100
+resource_name          = android (Store screenshots)
+replace_edited_strings = false
+keep_translations      = false
\ No newline at end of file

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
+ * Fix a bug making the video played twice
+
+Changes between 3.6.0 and 3.6.1:
+------------------
+ * Behavior and crash fixes
+
 Changes between 3.6.0 Beta 6 and 3.6.0:
 ------------------
  * Improve the orientation user experience in the video player

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/app/src/androidTest/java/org/videolan/vlc/PhoneScreenhotsInstrumentedTest.kt

@@ -26,26 +26,36 @@ package org.videolan.vlc
 
 import android.content.Intent
 import android.content.pm.ActivityInfo
+import android.net.Uri
 import android.os.SystemClock
 import android.util.Log
+import androidx.core.view.get
+import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiDevice
+import androidx.viewpager.widget.ViewPager
 import org.hamcrest.core.AllOf
 import org.junit.ClassRule
 import org.junit.Rule
 import org.junit.Test
+import org.videolan.medialibrary.MLServiceLocator
+import org.videolan.medialibrary.interfaces.media.MediaWrapper
+import org.videolan.resources.EXTRA_FOR_ESPRESSO
 import org.videolan.resources.EXTRA_TARGET
 import org.videolan.tools.Settings
 import org.videolan.vlc.gui.MainActivity
 import org.videolan.vlc.gui.helpers.UiTools.isTablet
+import org.videolan.vlc.gui.view.TitleListView
 import org.videolan.vlc.util.DpadHelper.pressHome
 import org.videolan.vlc.util.DpadHelper.pressPip
 import org.videolan.vlc.util.DpadHelper.pressStop
+import org.videolan.vlc.util.DummyMediaWrapperProvider
 import org.videolan.vlc.util.ScreenshotUtil
 import org.videolan.vlc.util.UiUtils.waitId
 import org.videolan.vlc.util.UiUtils.waitUntilLoaded
@@ -69,23 +79,38 @@ class PhoneScreenhotsInstrumentedTest : BaseUITest() {
     fun testTakeScreenshot() {
         onView(isRoot()).perform(waitId(R.id.audio_list, 5000))
         //Audio
-       // ScreenshotUtil.takeScreenshot("01_trash")
+        waitUntilLoaded { activity.findViewById(R.id.audio_list) }
         onView(withId(R.id.sliding_tabs)).perform(TabsMatcher(0))
         waitUntilLoaded { activity.findViewById(R.id.audio_list) }
+        SystemClock.sleep(1500)
+        waitUntilLoaded { activity.findViewById<ViewPager>(R.id.pager).get(0).findViewById(R.id.audio_list) }
         SystemClock.sleep(500)
-        ScreenshotUtil.takeScreenshot(3, "audio_list")
+        ScreenshotUtil.takeScreenshot(2, "audio_list")
         onView(withId(R.id.sliding_tabs)).perform(TabsMatcher(2))
-        SystemClock.sleep(500)
-        waitUntilLoaded { activity.findViewById(R.id.audio_list) }
+        waitUntilLoaded { activity.findViewById<ViewPager>(R.id.pager).get(2).findViewById(R.id.audio_list) }
+        SystemClock.sleep(1500)
+        //We use the audio list as PiP background. The PiP img is static
+        ScreenshotUtil.takeScreenshot(7,"pip_video")
 
         onView(withId(R.id.ml_menu_last_playlist)).perform(click())
         onView(isRoot()).perform(waitId(R.id.audio_media_switcher, 5000))
-        onView(withId(R.id.audio_media_switcher)).perform(click())
-        SystemClock.sleep(300)
-        ScreenshotUtil.takeScreenshot(6,"audio_player_playlist")
+        activity.slideUpOrDownAudioPlayer()
+        SystemClock.sleep(1500)
+        waitUntilLoaded { activity.findViewById(R.id.songs_list) }
+        SystemClock.sleep(1500)
+        ScreenshotUtil.takeScreenshot(4,"audio_player_playlist")
         onView(withId(R.id.playlist_switch)).perform(click())
-        ScreenshotUtil.takeScreenshot(5,"audio_player")
+        ScreenshotUtil.takeScreenshot(3,"audio_player")
         onView(withId(R.id.playlist_switch)).perform(click())
+
+        onView(withId(R.id.adv_function)).perform(click())
+        waitUntilLoaded { activity.findViewById(R.id.options_list) }
+        onView(withId(R.id.options_list))
+            .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(3, click()))
+        waitId(R.id.equalizer_bands, 5000)
+        ScreenshotUtil.takeScreenshot(9,"equalizer")
+        pressBack()
+
         //close audio player
         onView(withId(R.id.header)).perform(click())
         pressStop()
@@ -97,6 +122,7 @@ class PhoneScreenhotsInstrumentedTest : BaseUITest() {
                 .perform(click())
         Log.d("Espresso", "0")
         waitUntilLoaded { activity.findViewById(R.id.video_grid) }
+        SystemClock.sleep(1500)
         Log.d("Espresso", "1")
 
         ScreenshotUtil.takeScreenshot(1, "video_list")
@@ -106,34 +132,23 @@ class PhoneScreenhotsInstrumentedTest : BaseUITest() {
         onView(rvMatcher.atPosition(2)).perform(click())
         Log.d("Espresso", "3")
 
-        rotateLandscape()
         onView(isRoot()).perform(orientationLandscape())
         onView(isRoot()).perform(waitId(R.id.player_root, 5000))
 
         SystemClock.sleep(1500)
         onView(withId(R.id.player_root)).perform(click())
         SystemClock.sleep(500)
-        ScreenshotUtil.takeScreenshot(2, "video_player")
-        onView(withId(R.id.player_overlay_adv_function)).perform(ForceClickAction())
-        SystemClock.sleep(500)
-        ScreenshotUtil.takeScreenshot(7,"video_player_advanced_options")
-        disableRotateLandscape()
-        SystemClock.sleep(500)
-        onView(withRecyclerView(R.id.options_list).atPositionOnView(4, R.id.option_title)).perform(click())
-//        ScreenshotUtil.takeScreenshot(9,"video_player_equalizer")
-        pressBack()
-        onView(withId(R.id.player_overlay_adv_function)).perform(ForceClickAction())
-        onView(withRecyclerView(R.id.options_list).atPositionOnView(6, R.id.option_title)).perform(click())
-        pressHome()
-        pressPip()
-        ScreenshotUtil.takeScreenshot(8,"pip")
+        ScreenshotUtil.takeScreenshot(6, "video_player")
+
     }
 
     @Test
     fun testTakeScreenshotBrowser() {
         onView(AllOf.allOf(withId(R.id.nav_directories), withEffectiveVisibility(Visibility.VISIBLE)))
                  .perform(click())
-         ScreenshotUtil.takeScreenshot(4,"browser")
+        waitUntilLoaded { activity.findViewById<TitleListView>(R.id.network_browser_entry).findViewById(R.id.list) }
+
+        ScreenshotUtil.takeScreenshot(5,"browser")
      }
 
     private fun rotateLandscape() = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).setOrientationLeft()
@@ -150,11 +165,31 @@ class PhoneScreenhotsInstrumentedTest : BaseUITest() {
         Settings.getInstance(context).edit().putBoolean("auto_rescan", false).putBoolean("audio_resume_card", false).commit()
         val intent = Intent().apply {
             putExtra(EXTRA_TARGET, R.id.nav_audio)
+            putParcelableArrayListExtra(
+                EXTRA_FOR_ESPRESSO, arrayListOf(
+                    MLServiceLocator.getAbstractMediaWrapper(
+                        Uri.parse("upnp://test/mock"), 0L, 0F, 0L, MediaWrapper.TYPE_ALL,
+                        null, "My NAS", -1, -1, "",
+                        "", -1, "", "",
+                        0, 0, "/storage/emulated/0/Download/upnp2.png",
+                        0, 0, 0,
+                        0, 0L, 0L,
+                        0L
+                    ),
+                    MLServiceLocator.getAbstractMediaWrapper(
+                        Uri.parse("upnp://test/mock"), 0L, 0F, 0L, MediaWrapper.TYPE_ALL,
+                        null, "My SMB server", -1, -1, "",
+                        "", -1, "", "",
+                        0, 0, "/storage/emulated/0/Download/upnp1.png",
+                        0, 0, 0,
+                        0, 0L, 0L,
+                        0L
+                    )
+
+                    )
+            )
         }
         activityTestRule.launchActivity(intent)
         activity = activityTestRule.activity
-        if (activity.isTablet()) {
-            activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-        }
     }
 }

application/app/src/androidTest/java/org/videolan/vlc/util/TestUtil.kt

@@ -73,12 +73,12 @@ object TestUtil {
             mediaPath: String,
             subLanguageID: String,
             movieReleaseName: String): org.videolan.vlc.mediadb.models.ExternalSub {
-        return org.videolan.vlc.mediadb.models.ExternalSub(idSubtitle, subtitlePath, mediaPath, subLanguageID, movieReleaseName)
+        return org.videolan.vlc.mediadb.models.ExternalSub(idSubtitle, subtitlePath, mediaPath, subLanguageID, movieReleaseName, false)
     }
 
     fun createExternalSubsForMedia(mediaPath: String, mediaName: String, count: Int): List<org.videolan.vlc.mediadb.models.ExternalSub> {
         return (0 until count).map {
-            org.videolan.vlc.mediadb.models.ExternalSub(it.toString(), "${fakeSubUri}$mediaName$it", mediaPath, "en", mediaName)
+            org.videolan.vlc.mediadb.models.ExternalSub(it.toString(), "${fakeSubUri}$mediaName$it", mediaPath, "en", mediaName, false)
         }
     }
 
@@ -108,6 +108,6 @@ object TestUtil {
             mediaUri: Uri,
             subLanguageID: String,
             movieReleaseName: String,
-            zipDownloadLink: String): SubtitleItem = SubtitleItem(idSubtitle, mediaUri, subLanguageID, movieReleaseName, State.Downloading, zipDownloadLink)
+            zipDownloadLink: String): SubtitleItem = SubtitleItem(idSubtitle, -1L, mediaUri, subLanguageID, movieReleaseName, State.Downloading, zipDownloadLink, false, 0F, 0L, "")
 
 }

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
@@ -41,11 +37,6 @@ android {
         }
     }
 
-    task webCopy(type: Copy) {
-        from '../../remoteaccess/dist'
-        into 'assets/dist'
-    }
-
     sourceSets.main {
         assets.srcDirs = ['assets']
     }
@@ -66,21 +57,14 @@ 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"
-            }
-        }
-    }
 }
 
-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"
@@ -98,6 +82,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
@@ -131,16 +131,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
@@ -758,6 +758,10 @@ fun Route.setupRouting(appContext: Context, scope: CoroutineScope) {
                 call.respond(HttpStatusCode.Forbidden)
                 return@get
             }
+            if (!Permissions.canReadStorage(appContext)) {
+                call.respond(HttpStatusCode.Forbidden)
+                return@get
+            }
             //Get content synchronously
             val dataset = LiveDataset<MediaLibraryItem>()
             val provider = withContext(Dispatchers.Main) {

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
@@ -112,9 +112,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