Merge remote-tracking branch 'origin/master'

recloudstream · Aug 24, 2023 · e526997 · e526997
2 parents 1ed560c + c92ac3e
commit e526997
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
 
-    <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages  -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages  -->
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/storage/MediaFile.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/storage/MediaFile.kt
@@ -129,6 +129,9 @@ class MediaFile(
 
         // VideoDownloadManager.sanitizeFilename(path.replace(File.separator, ""))
 
+        // in case of duplicate path, aka Download -> Download
+        if(relativePath == path) return this
+
         val newPath =
             sanitizedAbsolutePath + path + if (folder) File.separator else ""