From 168aa1abc0608a877b932caa6fdfffd0d9c3988e Mon Sep 17 00:00:00 2001 From: sv99 Date: Sat, 10 Jun 2023 20:16:31 +0300 Subject: [PATCH] move AndrolidExceptions to the package brut.androlib.exceptions (renamed from brut.androlib.err) (#3088) --- .../apktool-cli/src/main/java/brut/apktool/Main.java | 7 ++++--- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 1 + .../src/main/java/brut/androlib/ApkDecoder.java | 7 ++++--- .../{err => exceptions}/AXmlDecodingException.java | 4 +--- .../brut/androlib/{ => exceptions}/AndrolibException.java | 2 +- .../{err => exceptions}/CantFind9PatchChunkException.java | 4 +--- .../{err => exceptions}/CantFindFrameworkResException.java | 4 +--- .../{err => exceptions}/InFileNotFoundException.java | 4 +--- .../{err => exceptions}/OutDirExistsException.java | 4 +--- .../{err => exceptions}/RawXmlEncounteredException.java | 4 +--- .../{err => exceptions}/UndefinedResObjectException.java | 4 +--- .../src/main/java/brut/androlib/res/AndrolibResources.java | 4 ++-- .../src/main/java/brut/androlib/res/data/ResPackage.java | 4 ++-- .../src/main/java/brut/androlib/res/data/ResResSpec.java | 4 ++-- .../src/main/java/brut/androlib/res/data/ResResource.java | 2 +- .../src/main/java/brut/androlib/res/data/ResTable.java | 4 ++-- .../src/main/java/brut/androlib/res/data/ResType.java | 4 ++-- .../src/main/java/brut/androlib/res/data/ResTypeSpec.java | 4 ++-- .../java/brut/androlib/res/data/value/ResArrayValue.java | 2 +- .../main/java/brut/androlib/res/data/value/ResAttr.java | 2 +- .../java/brut/androlib/res/data/value/ResBagValue.java | 2 +- .../java/brut/androlib/res/data/value/ResDimenValue.java | 2 +- .../java/brut/androlib/res/data/value/ResEmptyValue.java | 2 +- .../java/brut/androlib/res/data/value/ResEnumAttr.java | 2 +- .../java/brut/androlib/res/data/value/ResFileValue.java | 2 +- .../java/brut/androlib/res/data/value/ResFlagsAttr.java | 2 +- .../brut/androlib/res/data/value/ResFractionValue.java | 2 +- .../java/brut/androlib/res/data/value/ResIntValue.java | 2 +- .../java/brut/androlib/res/data/value/ResPluralsValue.java | 2 +- .../brut/androlib/res/data/value/ResReferenceValue.java | 4 ++-- .../java/brut/androlib/res/data/value/ResScalarValue.java | 2 +- .../java/brut/androlib/res/data/value/ResStringValue.java | 2 +- .../java/brut/androlib/res/data/value/ResStyleValue.java | 2 +- .../java/brut/androlib/res/data/value/ResValueFactory.java | 4 ++-- .../main/java/brut/androlib/res/decoder/ARSCDecoder.java | 3 +-- .../java/brut/androlib/res/decoder/AXmlResourceParser.java | 2 +- .../brut/androlib/res/decoder/Res9patchStreamDecoder.java | 4 ++-- .../java/brut/androlib/res/decoder/ResAttrDecoder.java | 4 ++-- .../java/brut/androlib/res/decoder/ResFileDecoder.java | 6 +++--- .../brut/androlib/res/decoder/ResRawStreamDecoder.java | 2 +- .../java/brut/androlib/res/decoder/ResStreamDecoder.java | 2 +- .../androlib/res/decoder/ResStreamDecoderContainer.java | 2 +- .../brut/androlib/res/decoder/XmlPullStreamDecoder.java | 6 +++--- .../brut/androlib/res/xml/ResValuesXmlSerializable.java | 2 +- .../main/java/brut/androlib/res/xml/ResXmlEncodable.java | 2 +- .../src/main/java/brut/androlib/res/xml/ResXmlPatcher.java | 2 +- .../src/main/java/brut/androlib/src/SmaliBuilder.java | 2 +- .../src/main/java/brut/androlib/src/SmaliDecoder.java | 2 +- .../apktool-lib/src/test/java/brut/androlib/TestUtils.java | 1 + .../test/java/brut/androlib/aapt1/SharedLibraryTest.java | 1 + .../java/brut/androlib/aapt2/NonStandardPkgIdTest.java | 1 + .../brut/androlib/decode/DecodeKotlinCoroutinesTest.java | 1 + .../test/java/brut/androlib/decode/DuplicateDexTest.java | 1 + 53 files changed, 73 insertions(+), 80 deletions(-) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/AXmlDecodingException.java (92%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{ => exceptions}/AndrolibException.java (96%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/CantFind9PatchChunkException.java (92%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/CantFindFrameworkResException.java (94%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/InFileNotFoundException.java (92%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/OutDirExistsException.java (92%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/RawXmlEncounteredException.java (92%) rename brut.apktool/apktool-lib/src/main/java/brut/androlib/{err => exceptions}/UndefinedResObjectException.java (92%) diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index 510c0123..0ac59f34 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -17,9 +17,10 @@ package brut.apktool; import brut.androlib.*; -import brut.androlib.err.CantFindFrameworkResException; -import brut.androlib.err.InFileNotFoundException; -import brut.androlib.err.OutDirExistsException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.CantFindFrameworkResException; +import brut.androlib.exceptions.InFileNotFoundException; +import brut.androlib.exceptions.OutDirExistsException; import brut.androlib.options.BuildOptions; import brut.common.BrutException; import brut.directory.DirectoryException; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index f03cbd0f..f39cf92b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -16,6 +16,7 @@ */ package brut.androlib; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.meta.MetaInfo; import brut.androlib.meta.UsesFramework; import brut.androlib.options.BuildOptions; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java index bd8ad964..5b9a8898 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java @@ -16,9 +16,10 @@ */ package brut.androlib; -import brut.androlib.err.InFileNotFoundException; -import brut.androlib.err.OutDirExistsException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.InFileNotFoundException; +import brut.androlib.exceptions.OutDirExistsException; +import brut.androlib.exceptions.UndefinedResObjectException; import brut.androlib.meta.MetaInfo; import brut.androlib.meta.PackageInfo; import brut.androlib.meta.UsesFramework; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/AXmlDecodingException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AXmlDecodingException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/AXmlDecodingException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AXmlDecodingException.java index 50fa6ef3..1e740b28 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/AXmlDecodingException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AXmlDecodingException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class AXmlDecodingException extends AndrolibException { public AXmlDecodingException(String message, Throwable cause) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AndrolibException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AndrolibException.java similarity index 96% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/AndrolibException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AndrolibException.java index 07005374..e72da574 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AndrolibException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/AndrolibException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib; +package brut.androlib.exceptions; import brut.common.BrutException; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFind9PatchChunkException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFind9PatchChunkException.java index c0ec5892..841f9823 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFind9PatchChunkException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFind9PatchChunkException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class CantFind9PatchChunkException extends AndrolibException { public CantFind9PatchChunkException(String message, Throwable cause) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFindFrameworkResException.java similarity index 94% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFindFrameworkResException.java index 98185031..1dc55231 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/CantFindFrameworkResException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class CantFindFrameworkResException extends AndrolibException { public CantFindFrameworkResException(int id) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/InFileNotFoundException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/InFileNotFoundException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/InFileNotFoundException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/InFileNotFoundException.java index a48f672c..508682b2 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/InFileNotFoundException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/InFileNotFoundException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class InFileNotFoundException extends AndrolibException { public InFileNotFoundException() { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/OutDirExistsException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/OutDirExistsException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/OutDirExistsException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/OutDirExistsException.java index 06400845..2cd8346d 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/OutDirExistsException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/OutDirExistsException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class OutDirExistsException extends AndrolibException { public OutDirExistsException() { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/RawXmlEncounteredException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/RawXmlEncounteredException.java index 587680e6..c8a4aabe 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/RawXmlEncounteredException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/RawXmlEncounteredException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class RawXmlEncounteredException extends AndrolibException { public RawXmlEncounteredException(String message, Throwable cause) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/UndefinedResObjectException.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/UndefinedResObjectException.java similarity index 92% rename from brut.apktool/apktool-lib/src/main/java/brut/androlib/err/UndefinedResObjectException.java rename to brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/UndefinedResObjectException.java index 79acdcda..14b61d84 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/err/UndefinedResObjectException.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/exceptions/UndefinedResObjectException.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package brut.androlib.err; - -import brut.androlib.AndrolibException; +package brut.androlib.exceptions; public class UndefinedResObjectException extends AndrolibException { public UndefinedResObjectException(String message) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index 0cdb5d78..0b69d821 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -16,9 +16,9 @@ */ package brut.androlib.res; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.options.BuildOptions; -import brut.androlib.err.CantFindFrameworkResException; +import brut.androlib.exceptions.CantFindFrameworkResException; import brut.androlib.meta.MetaInfo; import brut.androlib.meta.PackageInfo; import brut.androlib.meta.VersionInfo; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java index 19028a43..49f01fd2 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import brut.androlib.res.data.value.ResFileValue; import brut.androlib.res.data.value.ResValueFactory; import brut.androlib.res.xml.ResValuesXmlSerializable; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java index e2441f2d..c12b8240 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import org.apache.commons.lang3.StringUtils; import java.util.Arrays; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java index bf13ffaf..f35aecff 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.value.ResValue; public class ResResource { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java index 1728b43f..ea85b6df 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import brut.androlib.meta.VersionInfo; import brut.androlib.res.AndrolibResources; import brut.androlib.res.data.value.ResValue; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java index 87d4c9c2..b93bf0fa 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import java.util.*; public class ResType { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java index fb62751d..fa357b92 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import java.util.*; public final class ResTypeSpec { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java index bb789cba..231c4eac 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.util.Duo; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java index 9ce16577..09530f53 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResPackage; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java index a432caf5..faa36f81 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.util.Duo; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java index 31912aa7..bfdb24f2 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java @@ -17,7 +17,7 @@ package brut.androlib.res.data.value; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public class ResDimenValue extends ResIntValue { public ResDimenValue(int value, String rawValue) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java index b6ede155..3de842ec 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public class ResEmptyValue extends ResScalarValue { protected final int mValue; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java index 64e51f0c..1cffc3b6 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResSpec; import brut.androlib.res.data.ResResource; import brut.util.Duo; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java index 2fa0d448..f4ea0ce5 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public class ResFileValue extends ResIntBasedValue { private final String mPath; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java index ec3d7b4d..d69ea509 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.util.Duo; import org.xmlpull.v1.XmlSerializer; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java index dd7b6ffe..a98c2bb0 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java @@ -17,7 +17,7 @@ package brut.androlib.res.data.value; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public class ResFractionValue extends ResIntValue { public ResFractionValue(int value, String rawValue) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java index 40a3bc1c..3a00b1b1 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java @@ -17,7 +17,7 @@ package brut.androlib.res.data.value; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public class ResIntValue extends ResScalarValue { protected final int mValue; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java index e4fd647a..50b3cda5 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.androlib.res.xml.ResXmlEncoders; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java index dd8de888..4cf2c842 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import brut.androlib.res.data.ResPackage; import brut.androlib.res.data.ResResSpec; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java index 4331e193..30ee763b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; import brut.androlib.res.xml.ResXmlEncodable; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java index 60e3cde7..e9ccc684 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResXmlEncoders; import org.xmlpull.v1.XmlSerializer; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java index f8777da2..ab8dc271 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.data.value; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResSpec; import brut.androlib.res.data.ResResource; import brut.androlib.res.xml.ResValuesXmlSerializable; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java index 3df2ed83..99e6811c 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java @@ -17,7 +17,7 @@ package brut.androlib.res.data.value; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResPackage; import brut.androlib.res.data.ResTypeSpec; import brut.util.Duo; @@ -107,7 +107,7 @@ public class ResValueFactory { if (ResTypeSpec.RES_TYPE_NAME_ATTR.equals(resTypeName)) { return new ResAttr(parentVal, 0, null, null, null); } - + if (resTypeName.startsWith(ResTypeSpec.RES_TYPE_NAME_STYLES)) { return new ResStyleValue(parentVal, items, this); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index a91d8531..2dcc1a7e 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -17,7 +17,7 @@ package brut.androlib.res.decoder; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.*; import brut.androlib.res.data.value.*; import brut.util.Duo; @@ -31,7 +31,6 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java index ba5fe0ad..23c109bf 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java @@ -18,7 +18,7 @@ package brut.androlib.res.decoder; import android.content.res.XmlResourceParser; import android.util.TypedValue; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResID; import brut.androlib.res.xml.ResXmlEncoders; import brut.util.ExtDataInput; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java index 33619e58..719be8e9 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; -import brut.androlib.err.CantFind9PatchChunkException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.CantFind9PatchChunkException; import brut.util.ExtDataInput; import org.apache.commons.io.IOUtils; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java index d3358619..2ce60dfe 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java @@ -16,8 +16,8 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; -import brut.androlib.err.UndefinedResObjectException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.UndefinedResObjectException; import brut.androlib.res.data.ResID; import brut.androlib.res.data.ResPackage; import brut.androlib.res.data.ResResSpec; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java index a3174411..4f9813d7 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java @@ -16,9 +16,9 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; -import brut.androlib.err.CantFind9PatchChunkException; -import brut.androlib.err.RawXmlEncounteredException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.CantFind9PatchChunkException; +import brut.androlib.exceptions.RawXmlEncounteredException; import brut.androlib.res.data.ResResource; import brut.androlib.res.data.value.ResBoolValue; import brut.androlib.res.data.value.ResFileValue; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java index a87f74e0..5472d525 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import org.apache.commons.io.IOUtils; import java.io.IOException; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java index 3154c341..4e270799 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import java.io.InputStream; import java.io.OutputStream; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java index 12ff097a..ea6c04ef 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import java.io.InputStream; import java.io.OutputStream; import java.util.HashMap; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java index 0358c00d..8bff042f 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java @@ -16,9 +16,9 @@ */ package brut.androlib.res.decoder; -import brut.androlib.AndrolibException; -import brut.androlib.err.AXmlDecodingException; -import brut.androlib.err.RawXmlEncounteredException; +import brut.androlib.exceptions.AndrolibException; +import brut.androlib.exceptions.AXmlDecodingException; +import brut.androlib.exceptions.RawXmlEncounteredException; import brut.androlib.res.data.ResTable; import brut.androlib.res.util.ExtXmlSerializer; import org.xmlpull.v1.XmlPullParser; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java index 4dbe0f64..0ee8c522 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.xml; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.res.data.ResResource; import org.xmlpull.v1.XmlSerializer; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java index a2991bf9..61c365f4 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncodable.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.xml; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; public interface ResXmlEncodable { String encodeAsResXmlAttr() throws AndrolibException; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java index e83784a4..a7043767 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlPatcher.java @@ -16,7 +16,7 @@ */ package brut.androlib.res.xml; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import org.w3c.dom.*; import org.xml.sax.SAXException; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java index 1853b410..63efa7b7 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java @@ -16,7 +16,7 @@ */ package brut.androlib.src; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.mod.SmaliMod; import brut.directory.DirectoryException; import brut.directory.ExtFile; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java index 9394488e..2ee83ac7 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java @@ -16,7 +16,7 @@ */ package brut.androlib.src; -import brut.androlib.AndrolibException; +import brut.androlib.exceptions.AndrolibException; import com.android.tools.smali.baksmali.Baksmali; import com.android.tools.smali.baksmali.BaksmaliOptions; import com.android.tools.smali.dexlib2.DexFileFactory; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java index b9aee31e..eb183b6d 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java @@ -16,6 +16,7 @@ */ package brut.androlib; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.options.BuildOptions; import brut.androlib.res.AndrolibResources; import brut.common.BrutException; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java index fb8f6a1a..53680fb6 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java @@ -17,6 +17,7 @@ package brut.androlib.aapt1; import brut.androlib.*; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.options.BuildOptions; import brut.directory.ExtFile; import brut.common.BrutException; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java index bb80c701..688d8569 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java @@ -17,6 +17,7 @@ package brut.androlib.aapt2; import brut.androlib.*; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.options.BuildOptions; import brut.androlib.res.data.ResTable; import brut.common.BrutException; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java index 1ec3631e..6d7e9aa8 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java @@ -17,6 +17,7 @@ package brut.androlib.decode; import brut.androlib.*; +import brut.androlib.exceptions.AndrolibException; import brut.common.BrutException; import brut.directory.DirectoryException; import brut.directory.ExtFile; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java index c6e40152..356747cf 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java @@ -17,6 +17,7 @@ package brut.androlib.decode; import brut.androlib.*; +import brut.androlib.exceptions.AndrolibException; import brut.androlib.options.BuildOptions; import brut.common.BrutException; import brut.directory.ExtFile;