Merge branch 'Fox2Code:master' into master

Author: DerGoogler

app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java

@@ -164,13 +164,17 @@ protected void onCreate(Bundle savedInstanceState) {
                     Files.fixJavaZipHax(rawModule);
                     boolean noPatch = false;
                     boolean isModule = false;
+                    boolean isAnyKernel = false;
                     errMessage = "File is not a valid zip file";
                     try (ZipInputStream zipInputStream = new ZipInputStream(
                             new ByteArrayInputStream(rawModule))) {
                         ZipEntry zipEntry;
                         while ((zipEntry = zipInputStream.getNextEntry()) != null) {
                             String entryName = zipEntry.getName();
-                            if (entryName.equals("module.prop")) {
+                            if (entryName.equals("anykernel.sh")) {
+                                isAnyKernel = true;
+                                break;
+                            } else if (entryName.equals("module.prop")) {
                                 noPatch = true;
                                 isModule = true;
                                 break;
@@ -180,7 +184,8 @@ protected void onCreate(Bundle savedInstanceState) {
                         }
                     }
                     if (!isModule) {
-                        this.setInstallStateFinished(false,
+                        this.setInstallStateFinished(false, isAnyKernel ?
+                                "! AnyKernel modules can only be installed on recovery" :
                                 "! File is not a valid magisk module", "");
                         return;
                     }

app/src/main/java/com/fox2code/mmm/utils/PropUtils.java

@@ -249,9 +249,7 @@ public static void readProperties(ModuleInfo moduleInfo, InputStream inputStream
             if (readIdSec && local) {
                 // Using the name for module id is not really appropriate, so beautify it a bit
                 moduleInfo.name = makeNameFromId(moduleInfo.id);
-            } else if (local) { // Allow local module to not declare ids
-                invalid = true;
-            } else {
+            } else if (!local) { // Allow local modules to not declare ids
                 throw new IOException("Didn't read module id at least once!");
             }
         }