WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[app] Use HashSet for scope list

This commit is contained in:
tehcneko 2021-02-20 21:29:11 +08:00
parent bb173abbe4
commit 70d9dbf744
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/github/lsposed/manager/ConfigManager.java
View File

@ -25,6 +25,7 @@ import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import io.github.lsposed.lspd.Application; import io.github.lsposed.lspd.Application;
@ -89,7 +90,7 @@ public class ConfigManager {
} }
} }
public static boolean setModuleScope(String packageName, List<ScopeAdapter.ApplicationWithEquals> applications) { public static boolean setModuleScope(String packageName, HashSet<ScopeAdapter.ApplicationWithEquals> applications) {
try { try {
List<Application> list = new ArrayList<>(); List<Application> list = new ArrayList<>();
applications.forEach(application -> { applications.forEach(application -> {

15
app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java
View File

@ -63,8 +63,10 @@ import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import io.github.lsposed.lspd.Application; import io.github.lsposed.lspd.Application;
import io.github.lsposed.manager.App; import io.github.lsposed.manager.App;
@ -89,8 +91,8 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
private final String modulePackageName; private final String modulePackageName;
private final String moduleName; private final String moduleName;
private final SwitchBar masterSwitch; private final SwitchBar masterSwitch;
private final List<ApplicationWithEquals> recommendedList = new ArrayList<>(); private final HashSet<ApplicationWithEquals> recommendedList = new HashSet<>();
private final List<ApplicationWithEquals> checkedList = new ArrayList<>(); private final HashSet<ApplicationWithEquals> checkedList = new HashSet<>();
private final List<AppInfo> searchList = new ArrayList<>(); private final List<AppInfo> searchList = new ArrayList<>();
private List<AppInfo> showList = new ArrayList<>(); private List<AppInfo> showList = new ArrayList<>();
private ApplicationInfo selectedInfo; private ApplicationInfo selectedInfo;
@ -132,14 +134,14 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
activity.runOnUiThread(() -> masterSwitch.setChecked(enabled)); activity.runOnUiThread(() -> masterSwitch.setChecked(enabled));
checkedList.addAll(ConfigManager.getModuleScope(modulePackageName)); checkedList.addAll(ConfigManager.getModuleScope(modulePackageName));
ArrayList<ApplicationWithEquals> installedList = new ArrayList<>(); HashSet<ApplicationWithEquals> installedList = new HashSet<>();
List<String> scopeList = ModuleUtil.getInstance().getModule(modulePackageName).getScopeList(); List<String> scopeList = ModuleUtil.getInstance().getModule(modulePackageName).getScopeList();
boolean emptyCheckedList = checkedList.isEmpty(); boolean emptyCheckedList = checkedList.isEmpty();
for (PackageInfo info : appList) { for (PackageInfo info : appList) {
int uid = info.applicationInfo.uid; int uid = info.applicationInfo.uid;
ApplicationWithEquals application = new ApplicationWithEquals(info.packageName, uid / 100000); ApplicationWithEquals application = new ApplicationWithEquals(info.packageName, uid / 100000);
if (!installedList.contains(application)) installedList.add(application); installedList.add(application);
if (scopeList != null && scopeList.contains(info.packageName)) { if (scopeList != null && scopeList.contains(info.packageName)) {
recommendedList.add(application); recommendedList.add(application);
@ -589,5 +591,10 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
} }
return packageName.equals(((Application) obj).packageName) && userId == ((Application) obj).userId; return packageName.equals(((Application) obj).packageName) && userId == ((Application) obj).userId;
} }
@Override
public int hashCode() {
return Objects.hash(packageName, userId);
}
} }
} }