Better Hidden

dalvikdx/.gitignore

@@ -1 +1,2 @@
 /build
+dex

dalvikdx/build.gradle

@@ -23,21 +23,31 @@ task findDx {
     }
 }
 
-task dexInJar(type: Jar) {
+task makeDex(type: Exec) {
     dependsOn jar
     dependsOn findDx
-    doFirst {
-        exec {
-            workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows()){
-                executable "dx.bat"
-                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            } else {
-                executable "bash"
-                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            }
-        }
+    def dexName = "classes.dex"
+    workingDir jar.destinationDir
+    if (OperatingSystem.current().isWindows()) {
+        executable "dx.bat"
+        args "--dex", "--output", dexName, "${jar.archiveName}"
+    } else {
+        executable "bash"
+        args rootProject.ext.dxPath.trim(), "--dex", "--output", dexName, "${jar.archiveName}"
     }
+}
+
+task dex(type: Copy) {
+    dependsOn makeDex
+    from (jar.destinationDir) {
+        include "classes.dex"
+        rename "classes.dex", "eddalvikdx.dex"
+    }
+    destinationDir new File(projectDir, "dex")
+}
+
+task dexInJar(type: Jar) {
+    dependsOn makeDex
     from "${jar.destinationDir}/classes.dex"
     destinationDir jar.destinationDir
     baseName "eddalvikdx"

dexmaker/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+dex

dexmaker/build.gradle

@@ -14,20 +14,30 @@ dependencies {
     compileOnly project(':dalvikdx')
 }
 
-task dexInJar(type: Jar) {
+task makeDex(type: Exec) {
     dependsOn jar
-    doFirst {
-        exec {
-            workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows()){
-                executable "dx.bat"
-                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            } else {
-                executable "bash"
-                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            }
-        }
+    def dexName = "classes.dex"
+    workingDir jar.destinationDir
+    if (OperatingSystem.current().isWindows()) {
+        executable "dx.bat"
+        args "--dex", "--output", dexName, "${jar.archiveName}"
+    } else {
+        executable "bash"
+        args rootProject.ext.dxPath.trim(), "--dex", "--output", dexName, "${jar.archiveName}"
+    }
+}
+
+task dex(type: Copy) {
+    dependsOn makeDex
+    from (jar.destinationDir) {
+        include "classes.dex"
+        rename "classes.dex", "eddexmaker.dex"
     }
+    destinationDir new File(projectDir, "dex")
+}
+
+task dexInJar(type: Jar) {
+    dependsOn makeDex
     from "${jar.destinationDir}/classes.dex"
     destinationDir jar.destinationDir
     baseName "eddexmaker"

edxp-common/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     compileOnly project(':hiddenapi-stubs')
     api project(':xposed-bridge')
     compileOnly project(':dexmaker')
-    api "androidx.annotation:annotation:1.1.0-rc01"
+    compileOnly 'com.android.support:support-annotations:28.0.0'
 }
 
 

edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/BaseEdxpConfig.java

@@ -51,4 +51,7 @@ public boolean isNoModuleLogEnabled() {
     public boolean isBlackWhiteListMode() {
         return ConfigManager.isBlackWhiteListEnabled();
     }
+
+    @Override
+    public String getModulesList() { return ConfigManager.getModulesList(); }
 }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java

@@ -50,4 +50,6 @@ private static boolean isFileExists(String path) {
     public static native String getDataPathPrefix();
 
     public static native boolean isAppNeedHook(String appDataDir);
+
+    public static native String getModulesList();
 }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java

@@ -1,14 +1,12 @@
 package com.elderdrivers.riru.edxp.core;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
-import com.elderdrivers.riru.edxp.proxy.BlackWhiteListProxy;
 import com.elderdrivers.riru.edxp.proxy.NormalProxy;
 import com.elderdrivers.riru.edxp.proxy.Router;
 
 public abstract class BaseEdxpImpl implements EdxpImpl {
 
-    protected Proxy mBlackWhiteListProxy;
     protected Proxy mNormalProxy;
     protected Router mRouter;
 
@@ -23,15 +21,6 @@ public boolean isInitialized() {
         return mInitialized;
     }
 
-    @NonNull
-    @Override
-    public Proxy getBlackWhiteListProxy() {
-        if (mBlackWhiteListProxy == null) {
-            mBlackWhiteListProxy = createBlackWhiteListProxy();
-        }
-        return mBlackWhiteListProxy;
-    }
-
     @NonNull
     @Override
     public Proxy getNormalProxy() {
@@ -50,10 +39,6 @@ public Router getRouter() {
         return mRouter;
     }
 
-    protected Proxy createBlackWhiteListProxy() {
-        return new BlackWhiteListProxy(getRouter());
-    }
-
     protected Proxy createNormalProxy() {
         return new NormalProxy(getRouter());
     }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java

@@ -1,7 +1,7 @@
 package com.elderdrivers.riru.edxp.core;
 
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
 
 import com.elderdrivers.riru.common.KeepAll;
 import com.elderdrivers.riru.edxp.proxy.Router;
@@ -20,9 +20,6 @@ public interface EdxpImpl extends KeepAll {
     @NonNull
     Proxy getNormalProxy();
 
-    @NonNull
-    Proxy getBlackWhiteListProxy();
-
     @NonNull
     Router getRouter();