From ee2601d240acc6efcc70122b172aff6be4e28c18 Mon Sep 17 00:00:00 2001
From: Jim Wu <mlgmxyysd@meowcat.org>
Date: Fri, 3 Apr 2020 11:48:14 +0800
Subject: [PATCH] Fix crash on first installation

# Conflicts:
#	app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
---
 .../meowcat/edxposed/manager/XposedApp.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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 41dbf0a6..a0bcceda 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/XposedApp.java
@@ -124,16 +124,6 @@ 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();
@@ -205,6 +195,16 @@ public class XposedApp extends de.robv.android.xposed.installer.XposedApp implem
 
         RepoLoader.getInstance().triggerFirstLoadIfNecessary();
         isUiLoaded = true;
+
+        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");
+        }
     }
 
     @Override