From 73b915e5a7b4ab65175d3c3cb21c09546374db7c Mon Sep 17 00:00:00 2001 From: LoveSy Date: Tue, 3 Jan 2023 11:18:16 +0800 Subject: [PATCH] No need export typedarray --- core/build.gradle.kts | 2 +- core/src/main/java/android/content/res/XResources.java | 4 ++-- .../java/io/github/libxposed/XposedTypedArray.java | 10 ---------- magisk-loader/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b5d6f58e..1fb19626 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -61,5 +61,5 @@ dependencies { implementation(projects.hiddenapi.bridge) implementation(projects.services.daemonService) implementation(projects.services.managerService) - implementation(projects.libxposed.api) + api(projects.libxposed.api) } diff --git a/core/src/main/java/android/content/res/XResources.java b/core/src/main/java/android/content/res/XResources.java index 37a63af5..fe76524e 100644 --- a/core/src/main/java/android/content/res/XResources.java +++ b/core/src/main/java/android/content/res/XResources.java @@ -68,7 +68,7 @@ import de.robv.android.xposed.callbacks.XC_LayoutInflated; import de.robv.android.xposed.callbacks.XC_LayoutInflated.LayoutInflatedParam; import de.robv.android.xposed.callbacks.XCallback; import io.github.libxposed.XposedResources; -import io.github.libxposed.XposedTypedArray; +import xposed.dummy.XTypedArraySuperClass; /** * {@link android.content.res.Resources} subclass that allows replacing individual resources. @@ -1279,7 +1279,7 @@ public class XResources extends XposedResources { * Mainly used when inflating layouts. * @hide */ - public static class XTypedArray extends XposedTypedArray { + public static class XTypedArray extends XTypedArraySuperClass { public XTypedArray(Resources resources) { super(resources); diff --git a/libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java b/libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java deleted file mode 100644 index 3f62ae58..00000000 --- a/libxposed/api/src/main/java/io/github/libxposed/XposedTypedArray.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.github.libxposed; - -import android.content.res.Resources; -import android.content.res.TypedArray; - -public abstract class XposedTypedArray extends TypedArray { - public XposedTypedArray(Resources resources) { - super(resources); - } -} diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts index 8990f70a..21e6f688 100644 --- a/magisk-loader/build.gradle.kts +++ b/magisk-loader/build.gradle.kts @@ -408,7 +408,7 @@ abstract class ExampleClassVisitorFactory : } override fun isInstrumentable(classData: ClassData): Boolean { - return classData.className == "io.github.libxposed.XposedResources" || classData.className == "io.github.libxposed.XposedTypedArray" + return classData.className == "io.github.libxposed.XposedResources" } }