diff --git a/app/build.gradle b/app/build.gradle index 3ef6defc2..3e8726949 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,7 @@ dependencies { fullImplementation project(':app-core') fullImplementation 'ru.noties:markwon:2.0.1' fullImplementation 'com.caverock:androidsvg-aar:1.3' + fullImplementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0' def androidXVersion = "1.0.0" implementation 'androidx.core:core:1.0.1' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 01d749710..210723a1c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,6 +35,9 @@ # SVG -dontwarn com.caverock.androidsvg.SVGAndroidRenderer +# RetroStreams +-dontwarn java9.** + # Strip logging -assumenosideeffects class com.topjohnwu.magisk.utils.Logger { public *** debug(...); diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java index 2de8c17e6..d0c2fe40c 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java +++ b/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java @@ -33,6 +33,7 @@ import androidx.annotation.WorkerThread; import androidx.collection.ArraySet; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; +import java9.util.Comparators; public class ApplicationAdapter extends RecyclerView.Adapter { @@ -218,12 +219,13 @@ public class ApplicationAdapter extends RecyclerView.Adapter t.hidden) - .reversed() - .thenComparing((a, b) -> a.name.compareToIgnoreCase(b.name)) - .thenComparing(t -> t.info.packageName) - .thenComparing(t -> t.process) - .compare(this, o); + Comparator c; + c = Comparators.comparing((HideAppInfo t) -> t.hidden); + c = Comparators.reversed(c); + c = Comparators.thenComparing(c, (a, b) -> a.name.compareToIgnoreCase(b.name)); + c = Comparators.thenComparing(c, t -> t.info.packageName); + c = Comparators.thenComparing(c, t -> t.process); + return c.compare(this, o); } }