Fixed weird shit with android compatibility

MrBoomDeveloper · Mar 20, 2024 · 152596f · 152596f
1 parent d3c442f
commit 152596f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -63,7 +63,6 @@ android {
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -76,7 +75,6 @@ android {
 
 dependencies {
     // Compatibility for new methods in old Api
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.work:work-runtime-ktx:2.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"

diff --git a/app/src/main/java/com/mrboomdev/awery/ui/activity/settings/SettingsAdapter.java b/app/src/main/java/com/mrboomdev/awery/ui/activity/settings/SettingsAdapter.java
@@ -160,7 +160,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
 							var sorted = new ArrayList<>(items).stream()
 									.sorted((a, b) -> a.getTitle().compareToIgnoreCase(b.getTitle()))
-									.toList();
+									.collect(Collectors.toList());
 
 							AweryApp.runOnUiThread(() -> {
 								createRadioButtons(radioGroup, sorted, selectedItem);
@@ -178,7 +178,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 										settingItem.getKey(),
 										settingItem.getTitle(parent.getContext()),
 										settingItem.getKey().equals(selected)))
-								.toList(), selectedItem);
+								.collect(Collectors.toList()), selectedItem);
 
 						contentView.addView(radioGroup);
 					} else {

diff --git a/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java b/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java
@@ -30,6 +30,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 public class MediaUtils {
 	public static final String ACTION_INFO = "info";
@@ -49,7 +50,7 @@ public static void launchMediaActivity(Context context, CatalogMedia media) {
 	}
 
 	public static Collection<CatalogMedia> filterMedia(@NonNull Collection<CatalogMedia> items) {
-		return items.stream().filter(item -> !isMediaFiltered(item)).toList();
+		return items.stream().filter(item -> !isMediaFiltered(item)).collect(Collectors.toList());
 	}
 
 	@Contract(pure = true)
@@ -219,7 +220,7 @@ public static void openMediaBookmarkMenu(Context context, CatalogMedia media) {
 		new Thread(() -> {
 			var lists = AweryApp.getDatabase().getListDao().getAll().stream()
 					.filter(item -> !AweryApp.HIDDEN_LISTS.contains(item.getId()))
-					.toList();
+					.collect(Collectors.toList());
 
 			var current = AweryApp.getDatabase().getMediaDao().get(media.globalId);
 			var mediaDao = AweryApp.getDatabase().getMediaDao();