[app] Query enabled modules in reloadInstalledModules() (#655)
* This ensures that enabled modules will be updated together with installed modules.
This commit is contained in:
parent
c9d93b9b47
commit
7257181e2e
|
|
@ -47,13 +47,12 @@ public final class ModuleUtil {
|
||||||
private static ModuleUtil instance = null;
|
private static ModuleUtil instance = null;
|
||||||
private final PackageManager pm;
|
private final PackageManager pm;
|
||||||
private final List<ModuleListener> listeners = new CopyOnWriteArrayList<>();
|
private final List<ModuleListener> listeners = new CopyOnWriteArrayList<>();
|
||||||
private final HashSet<String> enabledModules;
|
private HashSet<String> enabledModules;
|
||||||
private Map<Pair<String, Integer>, InstalledModule> installedModules;
|
private Map<Pair<String, Integer>, InstalledModule> installedModules;
|
||||||
private boolean isReloading = false;
|
private boolean isReloading = false;
|
||||||
|
|
||||||
private ModuleUtil() {
|
private ModuleUtil() {
|
||||||
pm = App.getInstance().getPackageManager();
|
pm = App.getInstance().getPackageManager();
|
||||||
enabledModules = new HashSet<>(Arrays.asList(ConfigManager.getEnabledModules()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static synchronized ModuleUtil getInstance() {
|
public static synchronized ModuleUtil getInstance() {
|
||||||
|
|
@ -93,8 +92,10 @@ public final class ModuleUtil {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
installedModules = modules;
|
installedModules = modules;
|
||||||
|
|
||||||
|
enabledModules = new HashSet<>(Arrays.asList(ConfigManager.getEnabledModules()));
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
isReloading = false;
|
isReloading = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue