add java desugaring to CodecMod

Author: programminghoch10

CodecMod/build.gradle.kts

@@ -9,7 +9,11 @@ android {
         minSdk = 16
         targetSdk = 35
     }
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
 dependencies {
     implementation(libs.androidx.preference)
+    coreLibraryDesugaring(libs.android.desugarJdkLibs)
 }

CodecMod/src/main/java/com/programminghoch10/CodecMod/Hook.java

@@ -20,19 +20,11 @@ public class Hook implements IXposedHookLoadPackage {
 
     MediaCodecInfo[] getFilteredMediaCodecInfos(MediaCodecInfo[] unfilteredMediaCodecInfos) {
         CodecStore codecStore = new CodecStore();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            return Arrays.stream(unfilteredMediaCodecInfos)
-                    .filter(mediaCodecInfo ->
-                            codecStore.getCodecPreference(new MediaCodecInfoWrapper(mediaCodecInfo))
-                    )
-                    .toArray(MediaCodecInfo[]::new);
-        }
-        LinkedList<MediaCodecInfo> filteredMediaCodecs = new LinkedList<>();
-        for (MediaCodecInfo mediaCodecInfo : unfilteredMediaCodecInfos) {
-            if (codecStore.getCodecPreference(new MediaCodecInfoWrapper(mediaCodecInfo)))
-                filteredMediaCodecs.add(mediaCodecInfo);
-        }
-        return filteredMediaCodecs.toArray(new MediaCodecInfo[0]);
+        return Arrays.stream(unfilteredMediaCodecInfos)
+                .map(MediaCodecInfoWrapper::new)
+                .filter(codecStore::getCodecPreference)
+                .map(MediaCodecInfoWrapper::getOriginalMediaCodecInfo)
+                .toArray(MediaCodecInfo[]::new);
     }
 
     // helper function, only to be used on <LOLLIPOP
@@ -42,7 +34,7 @@ MediaCodecInfo[] getFilteredMediaCodecInfos() throws InvocationTargetException,
         final int codecCount = (int) XposedBridge.invokeOriginalMethod(XposedHelpers.findMethodExact(MediaCodecList.class, "getCodecCount"), null, null);
         for (int i = 0; i < codecCount; i++)
             mediaCodecs.add((MediaCodecInfo) XposedBridge.invokeOriginalMethod(XposedHelpers.findMethodExact(MediaCodecList.class, "getCodecInfoAt"), null, new Object[]{i}));
-        return getFilteredMediaCodecInfos(mediaCodecs.toArray(new MediaCodecInfo[0]));
+        return getFilteredMediaCodecInfos(mediaCodecs.toArray(MediaCodecInfo[]::new));
     }
 
     @Override

CodecMod/src/main/java/com/programminghoch10/CodecMod/MediaCodecInfoWrapper.java

@@ -1,5 +1,6 @@
 package com.programminghoch10.CodecMod;
 
+import android.media.MediaCodecInfo;
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
@@ -8,15 +9,19 @@
  * drop in replacement for MediaCodecInfo
  * with compatibility checks for older SDKs
  *
- * @see android.media.MediaCodecInfo
+ * @see MediaCodecInfo
  */
 public class MediaCodecInfoWrapper {
-    private final android.media.MediaCodecInfo mediaCodecInfo;
+    private final MediaCodecInfo mediaCodecInfo;
 
-    MediaCodecInfoWrapper(android.media.MediaCodecInfo mediaCodecInfo) {
+    MediaCodecInfoWrapper(MediaCodecInfo mediaCodecInfo) {
         this.mediaCodecInfo = mediaCodecInfo;
     }
 
+    public MediaCodecInfo getOriginalMediaCodecInfo() {
+        return mediaCodecInfo;
+    }
+    
     public String getCanonicalName() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             return mediaCodecInfo.getCanonicalName();

CodecMod/src/main/java/com/programminghoch10/CodecMod/SettingsActivity.java

@@ -45,12 +45,14 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             PreferenceCategory decodersPreferenceCategory = findPreference("category_decoders");
             PreferenceCategory encodersPreferenceCategory = findPreference("category_encoders");
 
-            List<MediaCodecInfoWrapper> mediaCodecs = new LinkedList<>();
+            List<MediaCodecInfoWrapper> mediaCodecs;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
-                for (android.media.MediaCodecInfo mediaCodecInfo : mediaCodecList.getCodecInfos())
-                    mediaCodecs.add(new MediaCodecInfoWrapper(mediaCodecInfo));
+                mediaCodecs = Arrays.stream(mediaCodecList.getCodecInfos())
+                        .map(MediaCodecInfoWrapper::new)
+                        .toList();
             } else {
+                mediaCodecs = new LinkedList<>();
                 for (int i = 0; i < MediaCodecList.getCodecCount(); i++)
                     mediaCodecs.add(new MediaCodecInfoWrapper(MediaCodecList.getCodecInfoAt(i)));
             }