Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

This commit is contained in:
Kelvin K
2025-11-27 10:30:09 -06:00
4 changed files with 6 additions and 7 deletions
+1 -1
View File
@@ -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) implementation 'com.google.code.gson:gson:2.13.2' //Used for complex/anonymous cases like during development conversions (eg. V8RemoteObject)
//JS //JS
implementation 'com.caoccao.javet:javet-v8-android:5.0.1' implementation 'com.caoccao.javet:javet-v8-android:4.1.5'
//Exoplayer //Exoplayer
implementation 'androidx.media3:media3-exoplayer:1.8.0' implementation 'androidx.media3:media3-exoplayer:1.8.0'
@@ -124,11 +124,10 @@ class LibraryFilesFragment : MainFragment() {
} }
} }
fun leaveDirectory() { fun leaveDirectory() {
if(navStack.size > 1) { if (navStack.size > 1) {
navStack.removeLast(); navStack.removeAt(navStack.size - 1)
openDirectory(navStack.last()); openDirectory(navStack.last())
} }
else {}
} }
fun openDirectory(stack: FileStack, addToStack: Boolean = false) { fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
if(addToStack) if(addToStack)
@@ -21,7 +21,7 @@ class StateAssets {
if(part == "." || part == "..") { if(part == "." || part == "..") {
if(parentAllowance <= 0) if(parentAllowance <= 0)
throw IllegalStateException("Path [${path}] attempted to escape path.."); throw IllegalStateException("Path [${path}] attempted to escape path..");
parts1.removeLast(); parts1.removeAt(parts1.size - 1);
toSkip++; toSkip++;
} }
else else
@@ -11,7 +11,7 @@ class SearchHistoryStorage : FragmentedStorageFileJson() {
if (!lastQueries.contains(text)) { if (!lastQueries.contains(text)) {
lastQueries.add(0, text); lastQueries.add(0, text);
if (lastQueries.size > 10) if (lastQueries.size > 10)
lastQueries.removeLast(); lastQueries.removeAt(lastQueries.size - 1);
} }
else { else {
lastQueries.remove(text); lastQueries.remove(text);