From 75854c1122eadaf638d8099443a39e904a58fe1f Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:59:51 +0800
Subject: [PATCH] Fixes

---
 app/build.gradle                                     |  2 +-
 .../org/meowcat/edxposed/manager/MainActivity.java   |  3 +++
 .../java/org/meowcat/edxposed/manager/XposedApp.java | 12 ++++++++++++
 .../meowcat/edxposed/manager/adapters/AppHelper.java |  2 +-
 .../edxposed/manager/adapters/BlackListAdapter.java  |  2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c3eda76f..18635773 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
         minSdkVersion 26
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 45600
+        versionCode 45611
         versionName "4.5.6.1"
         signingConfig signingConfigs.release
     }
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java
index 9b108c7d..b82aecb6 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/MainActivity.java
@@ -8,6 +8,8 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.core.content.ContextCompat;
 
+import org.meowcat.edxposed.manager.adapters.AppHelper;
+import org.meowcat.edxposed.manager.adapters.BlackListAdapter;
 import org.meowcat.edxposed.manager.databinding.ActivityMainBinding;
 import org.meowcat.edxposed.manager.util.ModuleUtil;
 import org.meowcat.edxposed.manager.util.RepoLoader;
@@ -95,6 +97,7 @@ public class MainActivity extends BaseActivity implements RepoLoader.RepoListene
             binding.statusIcon.setImageDrawable(getDrawable(R.drawable.ic_error));
         }
         notifyDataSetChanged();
+        new Thread(() -> new BlackListAdapter(getApplicationContext(), AppHelper.isWhiteListMode(), null).generateCheckedList());
     }
 
     private int extractIntPart(String str) {
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java b/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
index 2faad8ec..41dbf0a6 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
@@ -19,6 +19,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import org.meowcat.edxposed.manager.adapters.AppHelper;
 import org.meowcat.edxposed.manager.receivers.PackageChangeReceiver;
 import org.meowcat.edxposed.manager.util.ModuleUtil;
 import org.meowcat.edxposed.manager.util.NotificationUtil;
@@ -30,6 +31,7 @@ import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Objects;
 
@@ -122,6 +124,16 @@ public class XposedApp extends de.robv.android.xposed.installer.XposedApp implem
 
         pref = PreferenceManager.getDefaultSharedPreferences(this);
 
+        if (pref.getBoolean("hook_modules", true)) {
+            Collection<ModuleUtil.InstalledModule> installedModules = ModuleUtil.getInstance().getModules().values();
+            for (ModuleUtil.InstalledModule info : installedModules) {
+                if (!AppHelper.FORCE_WHITE_LIST_MODULE.contains(info.packageName)) {
+                    AppHelper.FORCE_WHITE_LIST_MODULE.add(info.packageName);
+                }
+            }
+            Log.d(TAG, "ApplicationList: Force add modules to list");
+        }
+
         de.robv.android.xposed.installer.XposedApp.getInstance().reloadXposedProp();
         createDirectories();
         NotificationUtil.init();
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java
index e3f542c4..bd867157 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java
@@ -45,7 +45,7 @@ public class AppHelper {
     private static final String BLACK_LIST_MODE = "conf/blackwhitelist";
 
     private static final List<String> FORCE_WHITE_LIST = new ArrayList<>(Collections.singletonList(BuildConfig.APPLICATION_ID));
-    static List<String> FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST);
+    public static List<String> FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST);
 
     @SuppressWarnings("OctalInteger")
     static void makeSurePath() {
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java
index 82f0244b..1b6b5b1f 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/BlackListAdapter.java
@@ -25,7 +25,7 @@ public class BlackListAdapter extends AppAdapter {
     }
 
     @Override
-    protected List<String> generateCheckedList() {
+    public List<String> generateCheckedList() {
         if (XposedApp.getPreferences().getBoolean("hook_modules", true)) {
             Collection<ModuleUtil.InstalledModule> installedModules = ModuleUtil.getInstance().getModules().values();
             for (ModuleUtil.InstalledModule info : installedModules) {