Merge branch 'master' of github.com:android-hacker/VAExposed

维术 · 维术 · commit 2e2f19ca1df5 · 2018-01-10T17:09:01.000+08:00
diff --git a/VirtualApp/.gitignore b/VirtualApp/.gitignore
@@ -7,3 +7,4 @@
 .DS_Store
 /build
 /captures
+!*.apk
diff --git a/VirtualApp/VAExposed_0.1.5.apk b/VirtualApp/VAExposed_0.1.5.apk
diff --git a/VirtualApp/lib/build.gradle b/VirtualApp/lib/build.gradle
@@ -35,4 +35,5 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'me.weishu.exposed:exposed-core:0.1.4'
 }
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/am/HCallbackStub.java b/VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/am/HCallbackStub.java
@@ -3,7 +3,6 @@
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Handler;
 import android.os.IBinder;
@@ -19,6 +18,9 @@
 import com.lody.virtual.remote.InstalledAppInfo;
 import com.lody.virtual.remote.StubActivityRecord;
 
+import java.util.List;
+
+import me.weishu.exposed.ExposedBridge;
 import mirror.android.app.ActivityManagerNative;
 import mirror.android.app.ActivityThread;
 import mirror.android.app.IActivityManager;
@@ -107,6 +109,8 @@ private boolean handleLaunchActivity(Message msg) {
             ComponentName caller = saveInstance.caller;
             IBinder token = ActivityThread.ActivityClientRecord.token.get(r);
             ActivityInfo info = saveInstance.info;
+            ClassLoader appClassLoader = VClientImpl.get().getClassLoader(info.applicationInfo);
+
             if (VClientImpl.get().getToken() == null) {
                 InstalledAppInfo installedAppInfo = VirtualCore.get().getInstalledAppInfo(info.packageName, 0);
                 if(installedAppInfo == null){
@@ -117,6 +121,12 @@ private boolean handleLaunchActivity(Message msg) {
                 return false;
             }
             if (!VClientImpl.get().isBound()) {
+                ExposedBridge.initOnce(VirtualCore.get().getContext(), info.applicationInfo, appClassLoader);
+                List<InstalledAppInfo> installedApps = VirtualCore.get().getInstalledApps(0);
+                for (InstalledAppInfo installedApp : installedApps) {
+                    ExposedBridge.loadModule(installedApp.apkPath, installedApp.getOdexFile().getParent(),
+                            installedApp.libPath, info.applicationInfo, appClassLoader);
+                }
                 VClientImpl.get().bindApplication(info.packageName, info.processName);
                 getH().sendMessageAtFrontOfQueue(Message.obtain(msg));
                 return false;
@@ -127,8 +137,8 @@ private boolean handleLaunchActivity(Message msg) {
                     false
             );
             VActivityManager.get().onActivityCreate(ComponentUtils.toComponentName(info), caller, token, info, intent, ComponentUtils.getTaskAffinity(info), taskId, info.launchMode, info.flags);
-            ClassLoader appClassLoader = VClientImpl.get().getClassLoader(info.applicationInfo);
-            intent.setExtrasClassLoader(appClassLoader);
+
+            intent.setExtrasClassLoader(ExposedBridge.getAppClassLoaderWithXposed(appClassLoader));
             ActivityThread.ActivityClientRecord.intent.set(r, intent);
             ActivityThread.ActivityClientRecord.activityInfo.set(r, info);
             return true;

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ android {`
`35`	`35`
`36`	`36`	`dependencies {`
`37`	`37`	`compile fileTree(include: ['*.jar'], dir: 'libs')`
	`38`	`+ compile 'me.weishu.exposed:exposed-core:0.1.4'`
`38`	`39`	`}`