diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml index 96f41340c..6fbc46fdd 100644 --- a/airsonic-main/pom.xml +++ b/airsonic-main/pom.xml @@ -21,7 +21,7 @@ 1.4.14 5.10.0 3.3.2 - 1.9.22 + 1.9.22.1 diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java b/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java index 52b665832..4031ce614 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java @@ -170,7 +170,7 @@ private List retrieveInternetRadioSources(InternetRadio rad SpecificPlaylist inputPlaylist = null; HttpURLConnection urlConnection = connectToURLWithRedirects(new URL(streamUrl), maxRedirects); try (InputStream in = urlConnection.getInputStream(); - BoundedInputStream bin = new BoundedInputStream(in, maxByteSize);) { + BoundedInputStream bin = BoundedInputStream.builder().setInputStream(in).setMaxCount(maxByteSize).get();) { String contentType = urlConnection.getContentType(); if (contentType != null && DIRECT_PLAYABLE_TYPES.contains(contentType)) { //for direct binary streams, just return a collection with a single internet radio source diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java index 9877f2f63..0ee0f0bcf 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java @@ -576,7 +576,7 @@ public void createGuestUserIfNotExists() { user.setRoles(Set.of(Role.STREAM)); RandomStringGenerator generator = new RandomStringGenerator.Builder().withinRange('0', 'z') .filteredBy(c -> Character.isLetterOrDigit(c)) - .build(); + .get(); createUser(user, generator.generate(30), "Autogenerated for " + User.USERNAME_GUEST + " user"); } diff --git a/airsonic-main/src/main/resources/templates/help.html b/airsonic-main/src/main/resources/templates/help.html index ff8ea16e1..8baa07b5f 100644 --- a/airsonic-main/src/main/resources/templates/help.html +++ b/airsonic-main/src/main/resources/templates/help.html @@ -24,7 +24,7 @@

- + GPL 3.0 diff --git a/airsonic-main/src/main/resources/templates/podcastChannel.html b/airsonic-main/src/main/resources/templates/podcastChannel.html index 7b2c9c1e2..91048fd53 100644 --- a/airsonic-main/src/main/resources/templates/podcastChannel.html +++ b/airsonic-main/src/main/resources/templates/podcastChannel.html @@ -99,7 +99,7 @@ var result = []; for (var i = 0; i < /*[(${#lists.size(model.episodes)})]*/ 3; i++) { var checkbox = $("#episode" + i); - if (checkbox.is(":checked")) { + if (checkbox.is(":checked") && checkbox.val() && !isNaN(parseInt(checkbox.val()))) { result.push(checkbox.val()); } } diff --git a/airsonic-main/src/main/resources/templates/right.html b/airsonic-main/src/main/resources/templates/right.html index 215751072..5cf1c5a29 100644 --- a/airsonic-main/src/main/resources/templates/right.html +++ b/airsonic-main/src/main/resources/templates/right.html @@ -92,7 +92,7 @@ var minutesAgo = status.minutesAgo; if (minutesAgo > 4) { - html += "" + minutesAgo + "[(#{main.minutesago})]"; + html += "" + minutesAgo + " [(#{main.minutesago})]"; } $('.playstatus-'+status.transferId).remove(); diff --git a/pom.xml b/pom.xml index 28c024456..f9f8b15d9 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ org.apache.commons commons-text - 1.11.0 + 1.12.0 commons-io @@ -111,7 +111,7 @@ com.google.guava guava - 32.1.3-jre + 33.2.0-jre jakarta.xml.bind