Merge pull request #472 from kagemomiji/issue466-fix-ui-small-problems

#466 fix UI small problems
kagemomiji · May 18, 2024 · 7939edd · 7939edd
2 parents 05975b6 + 3ebf70e
commit 7939edd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml
@@ -21,7 +21,7 @@
         <logback.version>1.4.14</logback.version>
         <mockito.version>5.10.0</mockito.version>
         <mariadb.version>3.3.2</mariadb.version>
-        <aspectj.version>1.9.22</aspectj.version>
+        <aspectj.version>1.9.22.1</aspectj.version>
     </properties>
 
     <dependencies>

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
@@ -170,7 +170,7 @@ private List<InternetRadioSource> 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
@@ -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
@@ -24,7 +24,7 @@ <h1>
         <td class="ruleTableCell" th:text="|${model.serverInfo} (${model.usedMemory} / ${model.totalMemory})|"></td>
     </tr>
     <tr>
-        <td class="ruleTableHeader" th:text="#{help.license.title}"></td>
+        <td class="ruleTableHeader" th:utext="#{help.license.title}"></td>
         <td class="ruleTableCell">
         <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank"><img style="float:right;margin-left: 10px" alt="GPL 3.0" th:src="@{/icons/default_light/gpl.png}"></a>
         <span th:utext="#{help.license.text(${model.brand})}"></span></td></tr>

diff --git 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
@@ -92,7 +92,7 @@
 
             var minutesAgo = status.minutesAgo;
             if (minutesAgo > 4) {
-                html += "<tr><td class='detail' colspan='2'>" + minutesAgo + "[(#{main.minutesago})]</td></tr>";
+                html += "<tr><td class='detail' colspan='2'>" + minutesAgo + " [(#{main.minutesago})]</td></tr>";
             }
 
             $('.playstatus-'+status.transferId).remove();

diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.11.0</version>
+                <version>1.12.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
@@ -111,7 +111,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.1.3-jre</version>
+                <version>33.2.0-jre</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>