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

[app] Adapt to new service api

This commit is contained in:
tehcneko 2021-02-19 23:39:32 +08:00
parent 2e58c6a3e7
commit 50c1713306
3 changed files with 71 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,8 @@ import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.github.lsposed.lspd.Application;
import io.github.lsposed.lspd.utils.ParceledListSlice;
import io.github.lsposed.manager.receivers.LSPosedManagerServiceClient; import io.github.lsposed.manager.receivers.LSPosedManagerServiceClient;
public class ConfigManager { public class ConfigManager {
@ -86,25 +88,19 @@ public class ConfigManager {
} }
} }
public static boolean setModuleScope(String packageName, List<Integer> uidList) { public static boolean setModuleScope(String packageName, List<Application> applications) {
try { try {
int[] uids = new int[uidList.size()]; return LSPosedManagerServiceClient.setModuleScope(packageName, new ParceledListSlice<>(applications));
for (int i = 0; i < uidList.size(); i++) {
uids[i] = uidList.get(i);
}
return LSPosedManagerServiceClient.setModuleScope(packageName, uids);
} catch (RemoteException | NullPointerException e) { } catch (RemoteException | NullPointerException e) {
Log.e(App.TAG, Log.getStackTraceString(e)); Log.e(App.TAG, Log.getStackTraceString(e));
return false; return false;
} }
} }
public static List<Integer> getModuleScope(String packageName) { public static List<Application> getModuleScope(String packageName) {
List<Integer> list = new ArrayList<>(); List<Application> list = new ArrayList<>();
try { try {
for (int uid : LSPosedManagerServiceClient.getModuleScope(packageName)) { list.addAll(LSPosedManagerServiceClient.getModuleScope(packageName).getList());
list.add(uid);
}
} catch (RemoteException | NullPointerException e) { } catch (RemoteException | NullPointerException e) {
Log.e(App.TAG, Log.getStackTraceString(e)); Log.e(App.TAG, Log.getStackTraceString(e));
} }

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

@ -63,11 +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.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import io.github.lsposed.lspd.Application;
import io.github.lsposed.manager.App; import io.github.lsposed.manager.App;
import io.github.lsposed.manager.BuildConfig; import io.github.lsposed.manager.BuildConfig;
import io.github.lsposed.manager.ConfigManager; import io.github.lsposed.manager.ConfigManager;
@ -90,11 +89,11 @@ 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<Integer> moduleList = new ArrayList<>(); private final List<Application> moduleList = new ArrayList<>();
private final List<Integer> recommendedList = new ArrayList<>(); private final List<Application> recommendedList = new ArrayList<>();
private final List<Application> checkedList = new ArrayList<>();
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 List<Integer> checkedList = new ArrayList<>();
private boolean enabled = true; private boolean enabled = true;
private ApplicationInfo selectedInfo; private ApplicationInfo selectedInfo;
@ -125,7 +124,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
private void loadApps() { private void loadApps() {
List<PackageInfo> appList = ConfigManager.getInstalledPackagesFromAllUsers(PackageManager.GET_META_DATA); List<PackageInfo> appList = ConfigManager.getInstalledPackagesFromAllUsers(PackageManager.GET_META_DATA);
checkedList = ConfigManager.getModuleScope(modulePackageName); checkedList.clear();
moduleList.clear(); moduleList.clear();
recommendedList.clear(); recommendedList.clear();
searchList.clear(); searchList.clear();
@ -134,77 +133,38 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
enabled = ModuleUtil.getInstance().isModuleEnabled(modulePackageName); enabled = ModuleUtil.getInstance().isModuleEnabled(modulePackageName);
activity.runOnUiThread(() -> masterSwitch.setChecked(enabled)); activity.runOnUiThread(() -> masterSwitch.setChecked(enabled));
ArrayList<Integer> installedList = new ArrayList<>(); checkedList.addAll(ConfigManager.getModuleScope(modulePackageName));
List<String> recommendedPackageNames = ModuleUtil.getInstance().getModule(modulePackageName).getScopeList(); ArrayList<Application> installedList = new ArrayList<>();
Map<String, ArrayList<PackageInfo>> sharedUidPackages = new HashMap<>(); List<String> scopeList = ModuleUtil.getInstance().getModule(modulePackageName).getScopeList();
for (PackageInfo info : appList) { for (PackageInfo info : appList) {
int uid = info.applicationInfo.uid; int uid = info.applicationInfo.uid;
if (!installedList.contains(uid)) installedList.add(uid); Application application = new Application();
application.userId = uid / 100000;
application.packageName = info.packageName;
if (!installedList.contains(application)) installedList.add(application);
if (info.packageName.equals(this.modulePackageName)) { if (info.packageName.equals(this.modulePackageName)) {
if (!checkedList.contains(uid)) checkedList.add(uid); if (!checkedList.contains(application)) checkedList.add(application);
if (!moduleList.contains(uid)) moduleList.add(uid); if (!moduleList.contains(application)) moduleList.add(application);
}
if (recommendedPackageNames != null && recommendedPackageNames.contains(info.packageName) && !recommendedList.contains(uid)) {
recommendedList.add(uid);
} }
if (shouldHideApp(info)) { if (scopeList != null && scopeList.contains(info.packageName)) {
recommendedList.add(application);
}
if (shouldHideApp(info, application)) {
continue; continue;
} }
if (info.sharedUserId != null) {
ArrayList<PackageInfo> packageInfos = sharedUidPackages.computeIfAbsent(info.sharedUserId + "!" + uid / 100000, k -> new ArrayList<>());
packageInfos.add(info);
} else {
AppInfo appInfo = new AppInfo(); AppInfo appInfo = new AppInfo();
appInfo.packageInfo = info; appInfo.packageInfo = info;
appInfo.label = getAppLabel(info.applicationInfo, pm); appInfo.label = getAppLabel(info.applicationInfo, pm);
appInfo.application = application;
appInfo.packageName = info.packageName;
appInfo.applicationInfo = info.applicationInfo;
searchList.add(appInfo); searchList.add(appInfo);
} }
}
for (List<PackageInfo> packageInfos : sharedUidPackages.values()) {
AppInfo appInfo = new AppInfo();
String[] packageLabels = new String[packageInfos.size()];
String name = null;
for (int i = 0; i < packageLabels.length; i++) {
ApplicationInfo ai = packageInfos.get(i).applicationInfo;
CharSequence label = ai.loadLabel(pm);
if (label != null) {
packageLabels[i] = label.toString();
}
if (ai.icon != 0) {
appInfo.packageInfo = packageInfos.get(i);
break;
}
}
if (packageLabels.length == 1) {
name = packageLabels[0];
} else {
for (PackageInfo packageInfo : packageInfos) {
if (packageInfo.sharedUserLabel != 0) {
final CharSequence nm = pm.getText(packageInfo.packageName, packageInfo.sharedUserLabel, packageInfo.applicationInfo);
if (nm != null) {
name = nm.toString();
appInfo.packageInfo = packageInfo;
break;
}
}
}
}
if (name == null) {
name = packageInfos.get(0).sharedUserId;
}
appInfo.label = String.format("[SharedUID] %s", name);
if (appInfo.packageInfo != null) {
searchList.add(appInfo);
}
}
checkedList.retainAll(installedList); checkedList.retainAll(installedList);
if (selectedNothing() && hasRecommended()) { if (selectedNothing() && hasRecommended()) {
checkRecommended(); checkRecommended();
@ -213,7 +173,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
activity.onDataReady(); activity.onDataReady();
} }
private boolean shouldHideApp(PackageInfo info) { private boolean shouldHideApp(PackageInfo info, Application app) {
if (info.packageName.equals(this.modulePackageName)) { if (info.packageName.equals(this.modulePackageName)) {
return true; return true;
} }
@ -221,10 +181,10 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
if (info.packageName.equals(BuildConfig.APPLICATION_ID)) { if (info.packageName.equals(BuildConfig.APPLICATION_ID)) {
return true; return true;
} }
if (info.packageName.equals("android") && info.applicationInfo.uid / 100000 != 0) { if (info.packageName.equals("android")) {
return true; return app.userId != 0;
} }
if (checkedList.contains(info.applicationInfo.uid)) { if (checkedList.contains(app)) {
return false; return false;
} }
if (!preferences.getBoolean("show_modules", false)) { if (!preferences.getBoolean("show_modules", false)) {
@ -249,18 +209,18 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
private List<AppInfo> sortApps(List<AppInfo> list) { private List<AppInfo> sortApps(List<AppInfo> list) {
Comparator<PackageInfo> comparator = AppHelper.getAppListComparator(preferences.getInt("list_sort", 0), pm); Comparator<PackageInfo> comparator = AppHelper.getAppListComparator(preferences.getInt("list_sort", 0), pm);
Comparator<PackageInfo> frameworkComparator = (a, b) -> { Comparator<AppInfo> frameworkComparator = (a, b) -> {
if (a.packageName.equals("android") == b.packageName.equals("android")) { if (a.packageName.equals("android") == b.packageName.equals("android")) {
return comparator.compare(a, b); return comparator.compare(a.packageInfo, b.packageInfo);
} else if (a.packageName.equals("android")) { } else if (a.packageName.equals("android")) {
return -1; return -1;
} else { } else {
return 1; return 1;
} }
}; };
Comparator<PackageInfo> recommendedComparator = (a, b) -> { Comparator<AppInfo> recommendedComparator = (a, b) -> {
boolean aRecommended = hasRecommended() && recommendedList.contains(a.applicationInfo.uid); boolean aRecommended = hasRecommended() && recommendedList.contains(a.application);
boolean bRecommended = hasRecommended() && recommendedList.contains(b.applicationInfo.uid); boolean bRecommended = hasRecommended() && recommendedList.contains(b.application);
if (aRecommended == bRecommended) { if (aRecommended == bRecommended) {
return frameworkComparator.compare(a, b); return frameworkComparator.compare(a, b);
} else if (aRecommended) { } else if (aRecommended) {
@ -270,10 +230,10 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
} }
}; };
list.sort((a, b) -> { list.sort((a, b) -> {
boolean aChecked = checkedList.contains(a.packageInfo.applicationInfo.uid); boolean aChecked = checkedList.contains(a.application);
boolean bChecked = checkedList.contains(b.packageInfo.applicationInfo.uid); boolean bChecked = checkedList.contains(b.application);
if (aChecked == bChecked) { if (aChecked == bChecked) {
return recommendedComparator.compare(a.packageInfo, b.packageInfo); return recommendedComparator.compare(a, b);
} else if (aChecked) { } else if (aChecked) {
return -1; return -1;
} else { } else {
@ -284,6 +244,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
} }
private void checkRecommended() { private void checkRecommended() {
checkedList.clear();
checkedList.addAll(recommendedList); checkedList.addAll(recommendedList);
ConfigManager.setModuleScope(modulePackageName, checkedList); ConfigManager.setModuleScope(modulePackageName, checkedList);
} }
@ -420,11 +381,11 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
public void onBindViewHolder(@NonNull ViewHolder holder, int position) { public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
holder.root.setAlpha(enabled ? 1.0f : .5f); holder.root.setAlpha(enabled ? 1.0f : .5f);
AppInfo appInfo = showList.get(position); AppInfo appInfo = showList.get(position);
boolean android = appInfo.packageInfo.packageName.equals("android"); boolean android = appInfo.packageName.equals("android");
CharSequence appName; CharSequence appName;
int userId = appInfo.packageInfo.applicationInfo.uid / 100000; int userId = appInfo.applicationInfo.uid / 100000;
if (userId != 0) { if (userId != 0) {
appName = String.format("%s (%s)", android ? activity.getString(R.string.android_framework) : appInfo.label, userId); appName = String.format("%s (%s)", appInfo.label, userId);
} else { } else {
appName = android ? activity.getString(R.string.android_framework) : appInfo.label; appName = android ? activity.getString(R.string.android_framework) : appInfo.label;
} }
@ -447,9 +408,9 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
holder.appIcon.setImageDrawable(pm.getDefaultActivityIcon()); holder.appIcon.setImageDrawable(pm.getDefaultActivityIcon());
} }
}); });
SpannableStringBuilder sb = new SpannableStringBuilder(android ? "" : activity.getString(R.string.app_description, appInfo.packageInfo.packageName, appInfo.packageInfo.versionName)); SpannableStringBuilder sb = new SpannableStringBuilder(android ? "" : activity.getString(R.string.app_description, appInfo.packageName, appInfo.packageInfo.versionName));
holder.appDescription.setVisibility(View.VISIBLE); holder.appDescription.setVisibility(View.VISIBLE);
if (hasRecommended() && recommendedList.contains(appInfo.packageInfo.applicationInfo.uid)) { if (hasRecommended() && recommendedList.contains(appInfo.application)) {
if (!android) sb.append("\n"); if (!android) sb.append("\n");
String recommended = activity.getString(R.string.requested_by_module); String recommended = activity.getString(R.string.requested_by_module);
sb.append(recommended); sb.append(recommended);
@ -469,7 +430,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> { holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> {
activity.getMenuInflater().inflate(R.menu.menu_app_item, menu); activity.getMenuInflater().inflate(R.menu.menu_app_item, menu);
Intent launchIntent = pm.getLaunchIntentForPackage(appInfo.packageInfo.packageName); Intent launchIntent = pm.getLaunchIntentForPackage(appInfo.packageName);
if (launchIntent == null) { if (launchIntent == null) {
menu.removeItem(R.id.menu_launch); menu.removeItem(R.id.menu_launch);
} }
@ -484,14 +445,14 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
}); });
holder.checkbox.setOnCheckedChangeListener(null); holder.checkbox.setOnCheckedChangeListener(null);
holder.checkbox.setChecked(checkedList.contains(appInfo.packageInfo.applicationInfo.uid)); holder.checkbox.setChecked(checkedList.contains(appInfo.application));
holder.checkbox.setOnCheckedChangeListener((v, isChecked) -> onCheckedChange(v, isChecked, appInfo.packageInfo.applicationInfo.uid)); holder.checkbox.setOnCheckedChangeListener((v, isChecked) -> onCheckedChange(v, isChecked, appInfo));
holder.itemView.setOnClickListener(v -> { holder.itemView.setOnClickListener(v -> {
if (enabled) holder.checkbox.toggle(); if (enabled) holder.checkbox.toggle();
}); });
holder.itemView.setOnLongClickListener(v -> { holder.itemView.setOnLongClickListener(v -> {
selectedInfo = appInfo.packageInfo.applicationInfo; selectedInfo = appInfo.applicationInfo;
return false; return false;
}); });
} }
@ -516,18 +477,18 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps); AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
} }
protected void onCheckedChange(CompoundButton buttonView, boolean isChecked, int uid) { protected void onCheckedChange(CompoundButton buttonView, boolean isChecked, AppInfo appInfo) {
if (isChecked) { if (isChecked) {
checkedList.add(uid); checkedList.add(appInfo.application);
} else { } else {
checkedList.remove((Integer) uid); checkedList.remove(appInfo.application);
} }
if (!ConfigManager.setModuleScope(modulePackageName, checkedList)) { if (!ConfigManager.setModuleScope(modulePackageName, checkedList)) {
activity.makeSnackBar(R.string.failed_to_save_scope_list, Snackbar.LENGTH_SHORT); activity.makeSnackBar(R.string.failed_to_save_scope_list, Snackbar.LENGTH_SHORT);
if (!isChecked) { if (!isChecked) {
checkedList.add(uid); checkedList.add(appInfo.application);
} else { } else {
checkedList.remove((Integer) uid); checkedList.remove(appInfo.application);
} }
buttonView.setChecked(!isChecked); buttonView.setChecked(!isChecked);
} }
@ -567,7 +528,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
String filter = constraint.toString().toLowerCase(); String filter = constraint.toString().toLowerCase();
for (AppInfo info : searchList) { for (AppInfo info : searchList) {
if (lowercaseContains(info.label.toString(), filter) if (lowercaseContains(info.label.toString(), filter)
|| lowercaseContains(info.packageInfo.packageName, filter)) { || lowercaseContains(info.packageName, filter)) {
filtered.add(info); filtered.add(info);
} }
} }
@ -583,7 +544,7 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
} }
private boolean selectedNothing() { private boolean selectedNothing() {
List<Integer> list = new ArrayList<>(checkedList); List<Application> list = new ArrayList<>(checkedList);
list.removeAll(moduleList); list.removeAll(moduleList);
return list.isEmpty(); return list.isEmpty();
} }
@ -619,6 +580,9 @@ public class ScopeAdapter extends RecyclerView.Adapter<ScopeAdapter.ViewHolder>
public static class AppInfo { public static class AppInfo {
public PackageInfo packageInfo; public PackageInfo packageInfo;
public Application application;
public ApplicationInfo applicationInfo;
public String packageName;
public CharSequence label = null; public CharSequence label = null;
} }
} }

7
app/src/main/java/io/github/lsposed/manager/receivers/LSPosedManagerServiceClient.java
View File

@ -7,6 +7,7 @@ import android.os.RemoteException;
import java.util.List; import java.util.List;
import io.github.lsposed.lspd.Application;
import io.github.lsposed.lspd.ILSPManagerService; import io.github.lsposed.lspd.ILSPManagerService;
import io.github.lsposed.lspd.utils.ParceledListSlice; import io.github.lsposed.lspd.utils.ParceledListSlice;
@ -65,12 +66,12 @@ public class LSPosedManagerServiceClient {
return service.disableModule(packageName); return service.disableModule(packageName);
} }
public static boolean setModuleScope(String packageName, int[] uid) throws RemoteException, NullPointerException { public static boolean setModuleScope(String packageName, ParceledListSlice<Application> list) throws RemoteException, NullPointerException {
ensureService(); ensureService();
return service.setModuleScope(packageName, uid); return service.setModuleScope(packageName, list);
} }
public static int[] getModuleScope(String packageName) throws RemoteException, NullPointerException { public static ParceledListSlice<Application> getModuleScope(String packageName) throws RemoteException, NullPointerException {
ensureService(); ensureService();
return service.getModuleScope(packageName); return service.getModuleScope(packageName);
} }