Clean code (LSPosed#863)

.gitignore

@@ -5,14 +5,3 @@
 .DS_Store
 /build
 /captures
-/release
-.externalNativeBuild
-elf-cleaner.sh
-
-# vscode
-.project
-.classpath
-.settings/
-.vscode/
-
-.cxx

app/proguard-rules.pro

@@ -2,11 +2,6 @@
     public static void showErrorToast(int);
     public static void setBinder(android.os.IBinder);
 }
-
--keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
     public static void check*(...);
     public static void throw*(...);

app/src/main/java/org/lsposed/manager/ConfigManager.java

@@ -29,7 +29,6 @@
 
 import org.lsposed.lspd.models.Application;
 import org.lsposed.lspd.models.UserInfo;
-import org.lsposed.lspd.utils.ParceledListSlice;
 import org.lsposed.manager.adapters.ScopeAdapter;
 import org.lsposed.manager.receivers.LSPManagerServiceHolder;
 
@@ -39,6 +38,8 @@
 import java.util.HashSet;
 import java.util.List;
 
+import io.github.xposed.xposedservice.utils.ParceledListSlice;
+
 public class ConfigManager {
 
     public static boolean isBinderAlive() {

app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java

@@ -131,9 +131,9 @@ protected String doInBackground(String... commands) {
                     result = "Error ";
                 }
                 if (TextUtils.isEmpty(err)) {
-                    return result + input.toString();
+                    return result + input;
                 } else {
-                    return result + err.toString();
+                    return result + err;
                 }
             } catch (Exception e) {
                 e.printStackTrace();

core/.gitignore

@@ -1,7 +1,3 @@
-/.externalNativeBuild
 /build
-/obj
 /release
-*.iml
-/.cxx
-src/main/cpp/main/src/config.cpp
+/src/main/cpp/main/src/config.cpp

core/build.gradle.kts

@@ -63,7 +63,6 @@ dependencies {
     implementation("de.upb.cs.swt:axml:2.1.1")
     compileOnly("androidx.annotation:annotation:1.2.0")
     compileOnly(project(":hiddenapi-stubs"))
-    implementation(project(":interface"))
     implementation(project(":hiddenapi-bridge"))
     implementation(project(":manager-service"))
 }

core/proguard-rules.pro

@@ -1,8 +1,5 @@
 -keep class de.robv.android.xposed.** {*;}
 -keep class android.** { *; }
--keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
 -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);

core/src/main/java/org/lsposed/lspd/core/yahfa/HookMain.java

@@ -61,18 +61,18 @@ public static void backupAndHook(Executable target, Method hook, Method backup)
     private static void checkCompatibleMethods(Executable original, Method replacement, String replacementName) {
         ArrayList<Class<?>> originalParams;
         if (original instanceof Method) {
-            originalParams = new ArrayList<>(Arrays.asList(((Method) original).getParameterTypes()));
+            originalParams = new ArrayList<>(Arrays.asList(original.getParameterTypes()));
         } else if (original instanceof Constructor) {
-            originalParams = new ArrayList<>(Arrays.asList(((Constructor<?>) original).getParameterTypes()));
+            originalParams = new ArrayList<>(Arrays.asList(original.getParameterTypes()));
         } else {
             throw new IllegalArgumentException("Type of target method is wrong");
         }
 
         ArrayList<Class<?>> replacementParams = new ArrayList<>(Arrays.asList(replacement.getParameterTypes()));
 
         if (original instanceof Method
-                && !Modifier.isStatic(((Method) original).getModifiers())) {
-            originalParams.add(0, ((Method) original).getDeclaringClass());
+                && !Modifier.isStatic(original.getModifiers())) {
+            originalParams.add(0, original.getDeclaringClass());
         } else if (original instanceof Constructor) {
             originalParams.add(0, ((Constructor<?>) original).getDeclaringClass());
         }

core/src/main/java/org/lsposed/lspd/service/LSPManagerService.java

@@ -39,13 +39,13 @@
 import org.lsposed.lspd.ILSPManagerService;
 import org.lsposed.lspd.models.Application;
 import org.lsposed.lspd.models.UserInfo;
-import org.lsposed.lspd.utils.ParceledListSlice;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedList;
 import java.util.List;
 
 import de.robv.android.xposed.XposedBridge;
+import io.github.xposed.xposedservice.utils.ParceledListSlice;
 
 public class LSPManagerService extends ILSPManagerService.Stub {
 

core/src/main/java/org/lsposed/lspd/service/PackageService.java

@@ -49,7 +49,6 @@
 import org.lsposed.lspd.BuildConfig;
 import org.lsposed.lspd.models.Application;
 import org.lsposed.lspd.util.InstallerVerifier;
-import org.lsposed.lspd.utils.ParceledListSlice;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -67,6 +66,7 @@
 import java.util.concurrent.CountDownLatch;
 
 import hidden.HiddenApiBridge;
+import io.github.xposed.xposedservice.utils.ParceledListSlice;
 
 public class PackageService {
 

gradle.properties

@@ -10,6 +10,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Sat Jan 30 19:20:27 CST 202130.0.322.0.7026061
 android.useAndroidX=true
 android.enableResourceOptimizations=false

hiddenapi-stubs/.gitignore

@@ -1,2 +1 @@
 /build
-/libs

manager-service/build.gradle.kts

@@ -49,8 +49,6 @@ android {
     }
 }
 
-configurations.all {
-    resolutionStrategy {
-        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
-    }
+dependencies {
+    api(project(":interface"))
 }

manager-service/proguard-rules.pro

@@ -1 +1 @@
--keepnames class * implements android.os.Parcelable
+

manager-service/src/main/aidl/org/lsposed/lspd/ILSPManagerService.aidl

@@ -1,6 +1,6 @@
 package org.lsposed.lspd;
 
-import org.lsposed.lspd.utils.ParceledListSlice;
+import io.github.xposed.xposedservice.utils.ParceledListSlice;
 import org.lsposed.lspd.models.UserInfo;
 import org.lsposed.lspd.models.Application;