WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Do not proxy AppComponentFactory when there's no one in Manifest

This commit is contained in:
Nullptr 2021-07-16 15:55:37 +08:00 committed by LoveSy
parent 6a814e571b
commit ed6eaec32c
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patch/src/main/java/org/lsposed/patch/LSPatch.java
View File

@ -55,9 +55,6 @@ public class LSPatch {
@Parameter(names = {"-f", "--force"}, description = "Force overwrite exists output file") @Parameter(names = {"-f", "--force"}, description = "Force overwrite exists output file")
private boolean forceOverwrite = false; private boolean forceOverwrite = false;
private String proxyApplication = "org.lsposed.lspatch.appstub.LSPApplicationStub";
private String proxyAppComponentFactory = "org.lsposed.lspatch.appstub.LSPAppComponentFactoryStub";
@Parameter(names = {"-d", "--debuggable"}, description = "Set app to be debuggable") @Parameter(names = {"-d", "--debuggable"}, description = "Set app to be debuggable")
private boolean debuggableFlag = false; private boolean debuggableFlag = false;
@ -79,6 +76,9 @@ public class LSPatch {
@Parameter(names = {"-m", "--embed"}, description = "Embed provided modules to apk") @Parameter(names = {"-m", "--embed"}, description = "Embed provided modules to apk")
private List<String> modules = new ArrayList<>(); private List<String> modules = new ArrayList<>();
private static final String PROXY_APP_COMPONENT_FACTORY = "org.lsposed.lspatch.appstub.LSPAppComponentFactoryStub";
private static final String PROXY_APPLICATION = "org.lsposed.lspatch.appstub.LSPApplicationStub";
private static final String APP_COMPONENT_FACTORY_ASSET_PATH = "assets/original_app_component_factory.ini"; private static final String APP_COMPONENT_FACTORY_ASSET_PATH = "assets/original_app_component_factory.ini";
private static final String APPLICATION_NAME_ASSET_PATH = "assets/original_application_name.ini"; private static final String APPLICATION_NAME_ASSET_PATH = "assets/original_application_name.ini";
private static final String SIGNATURE_INFO_ASSET_PATH = "assets/original_signature_info.ini"; private static final String SIGNATURE_INFO_ASSET_PATH = "assets/original_signature_info.ini";
@ -94,6 +94,7 @@ public class LSPatch {
)); ));
private static JCommander jCommander; private static JCommander jCommander;
private boolean hasAppComponentFactory;
public static void main(String... args) throws IOException { public static void main(String... args) throws IOException {
LSPatch lsPatch = new LSPatch(); LSPatch lsPatch = new LSPatch();
@ -192,7 +193,8 @@ public class LSPatch {
if (triple == null) if (triple == null)
throw new PatchError("Failed to parse AndroidManifest.xml"); throw new PatchError("Failed to parse AndroidManifest.xml");
String applicationName = triple.applicationName == null ? "" : triple.applicationName; String applicationName = triple.applicationName == null ? "" : triple.applicationName;
String appComponentFactory = triple.appComponentFactory == null ? "" : triple.appComponentFactory; String appComponentFactory = triple.appComponentFactory;
hasAppComponentFactory = appComponentFactory != null;
if (verbose) { if (verbose) {
System.out.println("original application name: " + applicationName); System.out.println("original application name: " + applicationName);
@ -208,6 +210,7 @@ public class LSPatch {
} }
// save original appComponentFactory name to asset file even its empty // save original appComponentFactory name to asset file even its empty
if (appComponentFactory != null)
try (var is = new ByteArrayInputStream(appComponentFactory.getBytes(StandardCharsets.UTF_8))) { try (var is = new ByteArrayInputStream(appComponentFactory.getBytes(StandardCharsets.UTF_8))) {
zFile.add(APP_COMPONENT_FACTORY_ASSET_PATH, is); zFile.add(APP_COMPONENT_FACTORY_ASSET_PATH, is);
} catch (Throwable e) { } catch (Throwable e) {
@ -347,8 +350,9 @@ public class LSPatch {
ModificationProperty property = new ModificationProperty(); ModificationProperty property = new ModificationProperty();
property.addApplicationAttribute(new AttributeItem(NodeValue.Application.DEBUGGABLE, debuggableFlag)); property.addApplicationAttribute(new AttributeItem(NodeValue.Application.DEBUGGABLE, debuggableFlag));
property.addApplicationAttribute(new AttributeItem(NodeValue.Application.NAME, proxyApplication)); property.addApplicationAttribute(new AttributeItem(NodeValue.Application.NAME, PROXY_APPLICATION));
property.addApplicationAttribute(new AttributeItem("appComponentFactory", proxyAppComponentFactory)); if (hasAppComponentFactory)
property.addApplicationAttribute(new AttributeItem("appComponentFactory", PROXY_APP_COMPONENT_FACTORY));
var os = new ByteArrayOutputStream(); var os = new ByteArrayOutputStream();
(new ManifestEditor(is, os, property)).processManifest(); (new ManifestEditor(is, os, property)).processManifest();