Optimize code

app/src/main/java/com/fongmi/android/tv/ui/adapter/BaseDiffAdapter.java

@@ -83,7 +83,7 @@ public abstract class BaseDiffAdapter<T extends Diffable<T> & Comparable<? super
     }
 
     public void sort(T item, Runnable runnable) {
-        List<T> current = Stream.concat(getItems().stream(), Stream.of(item)).distinct().sorted().collect(Collectors.toList());
+        List<T> current = Stream.concat(getItems().stream(), Stream.of(item)).distinct().sorted().toList();
         setItems(current, runnable);
     }
 

thunder/build.gradle

@@ -15,8 +15,15 @@ android {
         minSdk 24
         targetSdk 36
     }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
     implementation project(':catvod')
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
 }

thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentFileInfo.java

@@ -9,7 +9,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-public class TorrentFileInfo {
+public class TorrentFileInfo implements Comparable<TorrentFileInfo> {
 
     public boolean isSelected;
     public String mFileName;
@@ -52,16 +52,8 @@ public class TorrentFileInfo {
         return getFileName().contains(".") ? getFileName().substring(getFileName().lastIndexOf(".") + 1).toLowerCase() : "";
     }
 
-    public static class Sorter implements Comparator<TorrentFileInfo> {
-
-        public static List<TorrentFileInfo> sort(List<TorrentFileInfo> items) {
-            if (items.size() > 1) Collections.sort(items, new Sorter());
-            return items;
-        }
-
-        @Override
-        public int compare(TorrentFileInfo o1, TorrentFileInfo o2) {
-            return o1.getFileName().compareTo(o2.getFileName());
-        }
+    @Override
+    public int compareTo(TorrentFileInfo other) {
+        return this.getFileName().compareToIgnoreCase(other.getFileName());
     }
 }

thunder/src/main/java/com/xunlei/downloadlib/parameter/TorrentInfo.java

@@ -4,7 +4,10 @@ import com.xunlei.downloadlib.Util;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class TorrentInfo {
 
@@ -23,14 +26,11 @@ public class TorrentInfo {
         return mFile;
     }
 
-    private TorrentFileInfo[] getSubFileInfo() {
-        return mSubFileInfo == null ? new TorrentFileInfo[0] : mSubFileInfo;
+    private List<TorrentFileInfo> getSubFileList() {
+        return mSubFileInfo == null ? Collections.emptyList() : Arrays.asList(mSubFileInfo);
     }
 
     public List<TorrentFileInfo> getMedias() {
-        List<TorrentFileInfo> items = new ArrayList<>();
-        for (TorrentFileInfo item : getSubFileInfo()) if (Util.isMedia(item.getExt(), item.getFileSize())) items.add(item.file(getFile()));
-        TorrentFileInfo.Sorter.sort(items);
-        return items;
+        return getSubFileList().stream().filter(item -> Util.isMedia(item.getExt(), item.getFileSize())).map(item -> item.file(getFile())).sorted().toList();
     }
 }