Fix conflicts with 32bit app.

Signed-off-by: tiann <twsxtd@gmail.com>
android-hacker · Dec 15, 2020 · 212db8e · 212db8e · AureliusPatiens · Feb 19, 2021
1 parent 62b1d7d
commit 212db8e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/VirtualApp/app/src/main/AndroidManifest.xml b/VirtualApp/app/src/main/AndroidManifest.xml
@@ -87,7 +87,7 @@
             android:excludeFromRecents="true"
             android:label="@string/shared_to_vxp"
             android:screenOrientation="portrait"
-            android:taskAffinity="io.va.exposed.share"
+            android:taskAffinity="${applicationId}.share"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -105,7 +105,7 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_installer_label"
             android:noHistory="true"
-            android:taskAffinity="io.va.exposed.installer"
+            android:taskAffinity="${applicationId}.installer"
             android:theme="@style/Theme.AppCompat.Light" />
 
         <activity-alias
@@ -157,7 +157,7 @@
             android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="io.va.exposed.CMD" />
+                <action android:name="${applicationId}.CMD" />
             </intent-filter>
         </receiver>
     </application>

diff --git a/VirtualApp/app/src/main/java/io/virtualapp/dev/CmdReceiver.java b/VirtualApp/app/src/main/java/io/virtualapp/dev/CmdReceiver.java
@@ -12,6 +12,7 @@
 import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.remote.InstallResult;
 
+import io.virtualapp.BuildConfig;
 import io.virtualapp.home.LoadingActivity;
 
 /**
@@ -20,7 +21,7 @@
 
 public class CmdReceiver extends BroadcastReceiver {
 
-    private static final String ACTION = "io.va.exposed.CMD";
+    private static final String ACTION = BuildConfig.APPLICATION_ID + ".CMD";
     private static final String KEY_CMD = "cmd";
     private static final String KEY_PKG = "pkg";
     private static final String KEY_UID = "uid";

diff --git a/VirtualApp/launcher b/VirtualApp/launcher
diff --git a/...pp/lib/src/main/java/com/lody/virtual/client/hook/proxies/account/AccountManagerStub.java b/...pp/lib/src/main/java/com/lody/virtual/client/hook/proxies/account/AccountManagerStub.java
@@ -62,6 +62,8 @@ protected void onBindMethods() {
 		addMethodProxy(new renameAccount());
 		addMethodProxy(new getPreviousName());
 		addMethodProxy(new renameSharedAccountAsUser());
+
+		addMethodProxy(new setAccountVisibility());
 	}
 
 	private static class getPassword extends MethodProxy {
@@ -594,4 +596,17 @@ public Object call(Object who, Method method, Object... args) throws Throwable {
 			return method.invoke(who, args);
 		}
 	}
+
+	private static class setAccountVisibility extends MethodProxy {
+
+		@Override
+		public String getMethodName() {
+			return "setAccountVisibility";
+		}
+
+		@Override
+		public Object call(Object who, Method method, Object... args) throws Throwable {
+			return true;
+		}
+	}
 }