From a020d7dae5142fcdea5ce53607495ce7a350e9c2 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Fri, 6 Aug 2021 15:53:00 +0800 Subject: [PATCH] [core] Fix R8 misobfusion (#849) --- core/proguard-rules.pro | 1 + .../aidl/org/lsposed/lspd/{service => models}/Module.aidl | 4 ++-- core/src/main/aidl/org/lsposed/lspd/models/ModuleConfig.aidl | 4 ++++ .../aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl | 2 +- core/src/main/aidl/org/lsposed/lspd/service/ModuleConfig.aidl | 4 ---- .../org/lsposed/lspd/config/ApplicationServiceClient.java | 3 ++- .../org/lsposed/lspd/config/LSPApplicationServiceClient.java | 2 +- .../src/main/java/org/lsposed/lspd/service/ConfigManager.java | 2 +- .../java/org/lsposed/lspd/service/LSPApplicationService.java | 3 ++- 9 files changed, 14 insertions(+), 11 deletions(-) rename core/src/main/aidl/org/lsposed/lspd/{service => models}/Module.aidl (50%) create mode 100644 core/src/main/aidl/org/lsposed/lspd/models/ModuleConfig.aidl delete mode 100644 core/src/main/aidl/org/lsposed/lspd/service/ModuleConfig.aidl diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro index 7927cae4..fcc1827b 100644 --- a/core/proguard-rules.pro +++ b/core/proguard-rules.pro @@ -25,6 +25,7 @@ -keepclassmembers class * implements android.os.Parcelable { public static final ** CREATOR; } +-keepclasseswithmembers class org.lsposed.lspd.models.* { *; } -keepclasseswithmembers class org.lsposed.lspd.core.Main { public static void forkSystemServerPost(android.os.IBinder); public static void forkAndSpecializePost(java.lang.String, java.lang.String, android.os.IBinder); diff --git a/core/src/main/aidl/org/lsposed/lspd/service/Module.aidl b/core/src/main/aidl/org/lsposed/lspd/models/Module.aidl similarity index 50% rename from core/src/main/aidl/org/lsposed/lspd/service/Module.aidl rename to core/src/main/aidl/org/lsposed/lspd/models/Module.aidl index c0af5b86..b5530ead 100644 --- a/core/src/main/aidl/org/lsposed/lspd/service/Module.aidl +++ b/core/src/main/aidl/org/lsposed/lspd/models/Module.aidl @@ -1,5 +1,5 @@ -package org.lsposed.lspd.service; -import org.lsposed.lspd.service.ModuleConfig; +package org.lsposed.lspd.models; +import org.lsposed.lspd.models.ModuleConfig; parcelable Module { String name; diff --git a/core/src/main/aidl/org/lsposed/lspd/models/ModuleConfig.aidl b/core/src/main/aidl/org/lsposed/lspd/models/ModuleConfig.aidl new file mode 100644 index 00000000..0d663e09 --- /dev/null +++ b/core/src/main/aidl/org/lsposed/lspd/models/ModuleConfig.aidl @@ -0,0 +1,4 @@ +package org.lsposed.lspd.models; + +parcelable ModuleConfig { +} diff --git a/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl b/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl index d5e3f476..c99e9353 100644 --- a/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl +++ b/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl @@ -1,6 +1,6 @@ package org.lsposed.lspd.service; -import org.lsposed.lspd.service.Module; +import org.lsposed.lspd.models.Module; interface ILSPApplicationService { IBinder requestModuleBinder(String name); diff --git a/core/src/main/aidl/org/lsposed/lspd/service/ModuleConfig.aidl b/core/src/main/aidl/org/lsposed/lspd/service/ModuleConfig.aidl deleted file mode 100644 index 31c06664..00000000 --- a/core/src/main/aidl/org/lsposed/lspd/service/ModuleConfig.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package org.lsposed.lspd.service; - -parcelable ModuleConfig { -} diff --git a/core/src/main/java/org/lsposed/lspd/config/ApplicationServiceClient.java b/core/src/main/java/org/lsposed/lspd/config/ApplicationServiceClient.java index 18114d9b..abfd18b4 100644 --- a/core/src/main/java/org/lsposed/lspd/config/ApplicationServiceClient.java +++ b/core/src/main/java/org/lsposed/lspd/config/ApplicationServiceClient.java @@ -3,8 +3,9 @@ package org.lsposed.lspd.config; import android.os.IBinder; import android.os.ParcelFileDescriptor; +import org.lsposed.lspd.models.Module; import org.lsposed.lspd.service.ILSPApplicationService; -import org.lsposed.lspd.service.Module; + import java.util.List; abstract public class ApplicationServiceClient implements ILSPApplicationService { diff --git a/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java b/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java index c8b98205..5f15e373 100644 --- a/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java +++ b/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java @@ -24,8 +24,8 @@ import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.RemoteException; +import org.lsposed.lspd.models.Module; import org.lsposed.lspd.service.ILSPApplicationService; -import org.lsposed.lspd.service.Module; import org.lsposed.lspd.util.Utils; import java.util.Collections; diff --git a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java index 58543f07..aa3d13dc 100644 --- a/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java +++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java @@ -45,7 +45,7 @@ import androidx.annotation.Nullable; import org.apache.commons.lang3.SerializationUtils; import org.lsposed.lspd.BuildConfig; import org.lsposed.lspd.models.Application; -import org.lsposed.lspd.service.Module; +import org.lsposed.lspd.models.Module; import java.io.File; import java.io.FileNotFoundException; diff --git a/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java b/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java index e1d5aa12..f7adb791 100644 --- a/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java +++ b/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java @@ -19,15 +19,16 @@ package org.lsposed.lspd.service; -import android.os.Bundle; import static org.lsposed.lspd.service.ServiceManager.TAG; +import android.os.Bundle; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.Log; import android.util.Pair; +import org.lsposed.lspd.models.Module; import org.lsposed.lspd.util.InstallerVerifier; import org.lsposed.lspd.util.Utils;