Android Tricks

Sentient Android Dalvik Runtime Defining ClassLoader
hypersoft · May 1, 2019 · 59b4782 · 59b4782
1 parent c7a381a
commit 59b4782
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 279 deletions.
diff --git a/.idea/artifacts/Libraries.xml b/.idea/artifacts/Libraries.xml
diff --git a/module/dalvik/rhino-android-1.5-sources.jar b/module/dalvik/rhino-android-1.5-sources.jar
diff --git a/module/dalvik/rhino-android-1.5.jar b/module/dalvik/rhino-android-1.5.jar
diff --git a/module/jre/NanoStarbox Rhino/.idea/artifacts/NanoStarbox_Rhino_jar.xml b/module/jre/NanoStarbox Rhino/.idea/artifacts/NanoStarbox_Rhino_jar.xml
diff --git a/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/Android.java b/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/Android.java
@@ -1,14 +1,21 @@
 package box.star.js.android;
 
+import org.mozilla.javascript.Context;
+
 import java.io.File;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 
 public class Android {
 
   private static boolean tryDalvik = true;
   private static Class dalvikClassLoader;
   private static Constructor<ClassLoader> dalvikConstructor;
 
+  public static boolean isNotLoaded(){
+    return dalvikConstructor == null;
+  }
+
   public static boolean isPlatform(){
     if (tryDalvik) {
       try {
@@ -24,16 +31,14 @@ public static boolean isPlatform(){
     return  dalvikConstructor != null;
   }
 
-  public static ClassLoader getDalvikClassLoader(String path, ClassLoader parent) throws ClassNotFoundException {
-    if (isPlatform()){
-      try { return dalvikConstructor.newInstance(path, parent); }
-      catch (Exception e) { throw new RuntimeException(e); }
-    }
-    throw new ClassNotFoundException("dalvik.system.PathClassLoader");
-  }
-
-  public static File getApplicationCacheDirectory(){
-    return new File(System.getProperty("java.io.tmpdir"));
+  public static Context init() {
+    try {
+      Class rhinoHelper = Class.forName("com.faendir.rhino_android.RhinoAndroidHelper");
+      Constructor<?>  constructor = rhinoHelper.getConstructor();
+      Object rh = constructor.newInstance();
+      Method m = rhinoHelper.getDeclaredMethod("enterContext");
+      return (Context) m.invoke(rh);
+    } catch (Exception e) {throw new RuntimeException(e);}
   }
 
 }
diff --git a/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/DexClassLoader.java b/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/DexClassLoader.java
diff --git a/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/DexFileClassLoader.java b/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/DexFileClassLoader.java
diff --git a/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/NullSecurityController.java b/module/jre/NanoStarbox Rhino/src/java/main/box/star/js/android/NullSecurityController.java
diff --git a/module/jre/NanoStarbox Rhino/src/java/main/org/mozilla/javascript/Context.java b/module/jre/NanoStarbox Rhino/src/java/main/org/mozilla/javascript/Context.java
@@ -28,6 +28,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
+import box.star.js.android.Android;
 import org.mozilla.javascript.ast.AstRoot;
 import org.mozilla.javascript.ast.ScriptNode;
 import org.mozilla.javascript.debug.DebuggableScript;
@@ -410,6 +411,7 @@ public static Context getCurrentContext()
      */
     public static Context enter()
     {
+        if (Android.isNotLoaded() && Android.isPlatform())return Android.init();
         return enter(null);
     }
 

diff --git a/module/jre/NanoStarbox Rhino/src/java/main/org/mozilla/javascript/DefiningClassLoader.java b/module/jre/NanoStarbox Rhino/src/java/main/org/mozilla/javascript/DefiningClassLoader.java
@@ -4,52 +4,34 @@
 
 package org.mozilla.javascript;
 
-import box.star.js.android.DexFileClassLoader;
-import box.star.js.android.Android;
 
 /**
  * Load generated classes.
-
+ *
  * @author Norris Boyd
-
- * Android Support:
-
- * @author Triston-Jerard: Taylor
-
  */
 public class DefiningClassLoader extends ClassLoader
     implements GeneratedClassLoader
 {
 
-    private static DexFileClassLoader dexLoader;
-
     public DefiningClassLoader() {
         this(DefiningClassLoader.class.getClassLoader());
 
     }
 
     public DefiningClassLoader(ClassLoader parentLoader) {
-        if (Android.isPlatform() && dexLoader == null){
-            dexLoader = new DexFileClassLoader(parentLoader);
-        }
         this.parentLoader = parentLoader;
     }
 
     public Class<?> defineClass(String name, byte[] data) {
         // Use our own protection domain for the generated classes.
         // TODO: we might want to use a separate protection domain for classes
         // compiled from scripts, based on where the script was loaded from.
-        if (dexLoader != null){
-            return dexLoader.defineClass(name, data);
-        }
         return super.defineClass(name, data, 0, data.length,
                 SecurityUtilities.getProtectionDomain(getClass()));
     }
 
     public void linkClass(Class<?> cl) {
-        if (dexLoader != null){
-            return;
-        }
         resolveClass(cl);
     }
 
@@ -58,10 +40,6 @@ public Class<?> loadClass(String name, boolean resolve)
         throws ClassNotFoundException
     {
 
-        if (dexLoader != null) {
-            return dexLoader.loadClass(name, resolve);
-        }
-
         Class<?> cl = findLoadedClass(name);
         if (cl == null) {
             if (parentLoader != null) {