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

[app] Fix module list crashes (#578)

This commit is contained in:
tehcneko 2021-05-15 09:47:18 +08:00 committed by GitHub
parent c9f4970ccc
commit fe17834fa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/java/org/lsposed/manager/ui/activity/ModulesActivity.java
View File

@ -92,21 +92,22 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
protected ActivityModuleDetailBinding binding; protected ActivityModuleDetailBinding binding;
protected SearchView searchView; protected SearchView searchView;
private SearchView.OnQueryTextListener mSearchListener; private SearchView.OnQueryTextListener mSearchListener;
private final PagerAdapter pagerAdapter = new PagerAdapter();
private final ArrayList<ModuleAdapter> adapters = new ArrayList<>(); private final ArrayList<ModuleAdapter> adapters = new ArrayList<>();
private static final Handler uninstallHandler; private Handler uninstallHandler;
private PackageManager pm; private PackageManager pm;
private ModuleUtil moduleUtil; private ModuleUtil moduleUtil;
private ModuleUtil.InstalledModule selectedModule; private ModuleUtil.InstalledModule selectedModule;
static { @Override
public void onCreate(Bundle savedInstanceState) {
HandlerThread uninstallThread = new HandlerThread("uninstall"); HandlerThread uninstallThread = new HandlerThread("uninstall");
uninstallThread.start(); uninstallThread.start();
uninstallHandler = new Handler(uninstallThread.getLooper()); uninstallHandler = new Handler(uninstallThread.getLooper());
} moduleUtil = ModuleUtil.getInstance();
pm = getPackageManager();
@Override moduleUtil.addListener(this);
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
binding = ActivityModuleDetailBinding.inflate(getLayoutInflater()); binding = ActivityModuleDetailBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot()); setContentView(binding.getRoot());
@ -117,28 +118,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
if (bar != null) { if (bar != null) {
bar.setDisplayHomeAsUpEnabled(true); bar.setDisplayHomeAsUpEnabled(true);
} }
int[] users = ConfigManager.getUsers();
if (users != null) {
adapters.clear();
if (users.length != 1) {
binding.viewPager.setUserInputEnabled(true);
ArrayList<String> titles = new ArrayList<>();
for (int userId : users) {
var adapter = new ModuleAdapter(userId);
adapter.setHasStableIds(true);
adapters.add(adapter);
titles.add(getString(R.string.user_title, userId));
}
new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(titles.get(position))).attach();
binding.tabLayout.setVisibility(View.VISIBLE);
} else {
binding.viewPager.setUserInputEnabled(false);
var adapter = new ModuleAdapter(0);
adapter.setHasStableIds(true);
adapters.add(adapter);
binding.tabLayout.setVisibility(View.GONE);
}
}
binding.viewPager.setAdapter(new PagerAdapter()); binding.viewPager.setAdapter(new PagerAdapter());
binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override @Override
@ -167,9 +146,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
return false; return false;
} }
}; };
moduleUtil = ModuleUtil.getInstance();
pm = getPackageManager();
moduleUtil.addListener(this);
if (ConfigManager.getXposedVersionName() == null) { if (ConfigManager.getXposedVersionName() == null) {
Toast.makeText(this, R.string.lsposed_not_active, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.lsposed_not_active, Toast.LENGTH_LONG).show();
finish(); finish();
@ -195,6 +171,31 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
int[] users = ConfigManager.getUsers();
if (users != null) {
if (users.length != adapters.size()) {
adapters.clear();
if (users.length != 1) {
binding.viewPager.setUserInputEnabled(true);
ArrayList<String> titles = new ArrayList<>();
for (int userId : users) {
var adapter = new ModuleAdapter(userId);
adapter.setHasStableIds(true);
adapters.add(adapter);
titles.add(getString(R.string.user_title, userId));
}
new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(titles.get(position))).attach();
binding.tabLayout.setVisibility(View.VISIBLE);
} else {
binding.viewPager.setUserInputEnabled(false);
var adapter = new ModuleAdapter(0);
adapter.setHasStableIds(true);
adapters.add(adapter);
binding.tabLayout.setVisibility(View.GONE);
}
pagerAdapter.notifyDataSetChanged();
}
}
adapters.forEach(ModuleAdapter::refresh); adapters.forEach(ModuleAdapter::refresh);
} }

2
app/src/main/java/org/lsposed/manager/util/ModuleUtil.java
View File

@ -110,7 +110,7 @@ public final class ModuleUtil {
throw new NameNotFoundException(); throw new NameNotFoundException();
} }
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
InstalledModule old = installedModules.remove(packageName); InstalledModule old = installedModules.remove(Pair.create(packageName, userId));
if (old != null) { if (old != null) {
for (ModuleListener listener : listeners) { for (ModuleListener listener : listeners) {
listener.onSingleInstalledModuleReloaded(); listener.onSingleInstalledModuleReloaded();