From 8070404eefbe53fd0ddda43641424f4f1c3c0073 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <130586233+HundEdFeteTree@users.noreply.github.com> Date: Fri, 5 Dec 2025 08:48:27 +0200 Subject: [PATCH] fix: Move conflicting Android classes to a different package --- .../morphe/apktool}/content/res/XmlResourceParser.java | 4 ++-- .../{android => app/morphe/apktool}/util/AttributeSet.java | 2 +- .../{android => app/morphe/apktool}/util/TypedValue.java | 2 +- .../brut/androlib/res/decoder/BinaryResourceParser.java | 3 +-- .../brut/androlib/res/decoder/BinaryXmlResourceParser.java | 6 ++---- .../main/java/brut/androlib/res/table/value/ResItem.java | 2 +- .../java/brut/androlib/res/table/value/ResPrimitive.java | 2 +- .../src/main/java/brut/androlib/res/xml/ResXmlEncoders.java | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) rename brut.apktool/apktool-lib/src/main/java/{android => app/morphe/apktool}/content/res/XmlResourceParser.java (93%) rename brut.apktool/apktool-lib/src/main/java/{android => app/morphe/apktool}/util/AttributeSet.java (99%) rename brut.apktool/apktool-lib/src/main/java/{android => app/morphe/apktool}/util/TypedValue.java (99%) diff --git a/brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/content/res/XmlResourceParser.java similarity index 93% rename from brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java rename to brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/content/res/XmlResourceParser.java index 951972ca70..e69877500b 100644 --- a/brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java +++ b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/content/res/XmlResourceParser.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.content.res; +package app.morphe.apktool.content.res; -import android.util.AttributeSet; +import app.morphe.apktool.util.AttributeSet; import org.xmlpull.v1.XmlPullParser; /** diff --git a/brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/AttributeSet.java similarity index 99% rename from brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java rename to brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/AttributeSet.java index 30a7715556..9505e1cb73 100644 --- a/brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java +++ b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/AttributeSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.util; +package app.morphe.apktool.util; /** * A collection of attributes, as found associated with a tag in an XML diff --git a/brut.apktool/apktool-lib/src/main/java/android/util/TypedValue.java b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/TypedValue.java similarity index 99% rename from brut.apktool/apktool-lib/src/main/java/android/util/TypedValue.java rename to brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/TypedValue.java index c5ababb533..77d6721c3d 100644 --- a/brut.apktool/apktool-lib/src/main/java/android/util/TypedValue.java +++ b/brut.apktool/apktool-lib/src/main/java/app/morphe/apktool/util/TypedValue.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.util; +package app.morphe.apktool.util; /** * Container for a dynamically typed data value. Primarily used with diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryResourceParser.java index 264eddb2c7..25c1d2bcac 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryResourceParser.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryResourceParser.java @@ -16,11 +16,10 @@ */ package brut.androlib.res.decoder; -import android.util.TypedValue; +import app.morphe.apktool.util.TypedValue; import brut.androlib.Config; import brut.androlib.exceptions.AndrolibException; import brut.androlib.exceptions.UndefinedResObjectException; -import brut.androlib.meta.ApkInfo; import brut.androlib.res.decoder.data.FlagsOffset; import brut.androlib.res.decoder.data.ResChunkHeader; import brut.androlib.res.decoder.data.ResStringPool; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryXmlResourceParser.java index c47831cf4b..cfecbeca7d 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryXmlResourceParser.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/BinaryXmlResourceParser.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.decoder; -import android.content.res.XmlResourceParser; -import android.util.TypedValue; +import app.morphe.apktool.content.res.XmlResourceParser; +import app.morphe.apktool.util.TypedValue; import brut.androlib.exceptions.AndrolibException; import brut.androlib.exceptions.FrameworkNotFoundException; import brut.androlib.exceptions.UndefinedResObjectException; @@ -32,9 +32,7 @@ import java.io.InputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.Reader; -import java.util.logging.Level; import java.util.logging.Logger; /** diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResItem.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResItem.java index 0de084cdca..d71c72d7f4 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResItem.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResItem.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.table.value; -import android.util.TypedValue; +import app.morphe.apktool.util.TypedValue; import brut.androlib.res.table.ResId; import brut.androlib.res.table.ResPackage; import com.google.common.collect.Sets; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResPrimitive.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResPrimitive.java index c0efa03b60..8d74de4cd4 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResPrimitive.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/table/value/ResPrimitive.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.table.value; -import android.util.TypedValue; +import app.morphe.apktool.util.TypedValue; import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.table.ResEntry; import brut.androlib.res.xml.ResXmlEncodable; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java index 5ac6c4682f..341945d44b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.xml; -import android.util.TypedValue; +import app.morphe.apktool.util.TypedValue; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair;