MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Play with Java streams

Browse Source
This commit is contained in:
topjohnwu 2019-03-07 03:43:28 -05:00
parent 32c65d8a88
commit 3e73e3a906
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View File

@ -13,6 +13,11 @@ import android.widget.CheckBox;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import androidx.collection.ArraySet;
import androidx.recyclerview.widget.RecyclerView;
import com.topjohnwu.magisk.App; import com.topjohnwu.magisk.App;
import com.topjohnwu.magisk.Config; import com.topjohnwu.magisk.Config;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
@ -28,12 +33,11 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import androidx.collection.ArraySet;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import java9.util.Comparators; import java9.util.Comparators;
import java9.util.stream.Collectors;
import java9.util.stream.Stream;
import java9.util.stream.StreamSupport;
public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> { public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
@ -54,8 +58,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
public ApplicationAdapter(Context context) { public ApplicationAdapter(Context context) {
showList = Collections.emptyList(); showList = Collections.emptyList();
hideList = Collections.emptyList();
fullList = new ArrayList<>(); fullList = new ArrayList<>();
hideList = new ArrayList<>();
pm = context.getPackageManager(); pm = context.getPackageManager();
showSystem = Config.get(Config.Key.SHOW_SYSTEM_APP); showSystem = Config.get(Config.Key.SHOW_SYSTEM_APP);
AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps); AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
@ -97,26 +101,27 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
private void loadApps() { private void loadApps() {
List<ApplicationInfo> installed = pm.getInstalledApplications(0); List<ApplicationInfo> installed = pm.getInstalledApplications(0);
fullList.clear(); hideList = StreamSupport.stream(Shell.su("magiskhide --ls").exec().getOut())
hideList.clear(); .map(HideTarget::new).collect(Collectors.toList());
for (String line : Shell.su("magiskhide --ls").exec().getOut()) fullList.clear();
hideList.add(new HideTarget(line));
for (ApplicationInfo info : installed) { for (ApplicationInfo info : installed) {
// Do not show black-listed and disabled apps // Do not show black-listed and disabled apps
if (!HIDE_BLACKLIST.contains(info.packageName) && info.enabled) { if (!HIDE_BLACKLIST.contains(info.packageName) && info.enabled) {
Set<String> set = new ArraySet<>(); Set<String> set = new ArraySet<>();
set.add(info.packageName);
PackageInfo pkg = getPackageInfo(info.packageName); PackageInfo pkg = getPackageInfo(info.packageName);
if (pkg != null) { if (pkg != null) {
addProcesses(set, pkg.activities); addProcesses(set, pkg.activities);
addProcesses(set, pkg.services); addProcesses(set, pkg.services);
addProcesses(set, pkg.receivers); addProcesses(set, pkg.receivers);
addProcesses(set, pkg.providers); addProcesses(set, pkg.providers);
} else {
set.add(info.packageName);
} }
for (String process : set) fullList.addAll(StreamSupport.stream(set)
fullList.add(new HideAppInfo(info, process)); .map(process -> new HideAppInfo(info, process))
.collect(Collectors.toList()));
} }
} }
@ -188,12 +193,11 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
public void filter(String constraint) { public void filter(String constraint) {
AsyncTask.SERIAL_EXECUTOR.execute(() -> { AsyncTask.SERIAL_EXECUTOR.execute(() -> {
List<HideAppInfo> newList = new ArrayList<>(); Stream<HideAppInfo> s = StreamSupport.stream(fullList)
for (HideAppInfo target : fullList) .filter(this::systemFilter)
if (systemFilter(target) && nameFilter(target, constraint)) .filter(t -> nameFilter(t, constraint));
newList.add(target);
UiThreadHandler.run(() -> { UiThreadHandler.run(() -> {
showList = newList; showList = s.collect(Collectors.toList());
notifyDataSetChanged(); notifyDataSetChanged();
}); });
}); });