mirror of
https://github.com/revanced/Apktool.git
synced 2025-01-06 10:05:54 +01:00
Ignore multiple types
This commit is contained in:
parent
3cdc026d86
commit
559a3024cc
1
CHANGES
1
CHANGES
@ -28,6 +28,7 @@ v2.0.0 (TBA)
|
||||
-Fixed (issue #531) - JAR disassembling borking is fixed
|
||||
-Fixed (issue #550) - Correctly labels incorrect type handling of <array>
|
||||
-Fixed (issue #571) - Fixed truncated strings (Thanks jtmuhone)
|
||||
-Fixed (issue #578) - Fixed apk's with multiple empty types via ignoring them
|
||||
-Added output to list Apktool version to help debugging.
|
||||
-Updated known bytes for configurations to 38 (from addition of layout direction)
|
||||
-Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi)
|
||||
|
@ -23,6 +23,7 @@ import brut.androlib.res.data.value.ResValueFactory;
|
||||
import brut.androlib.res.xml.ResValuesXmlSerializable;
|
||||
import brut.util.Duo;
|
||||
import java.util.*;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* @author Ryszard Wiśniewski <brut.alll@gmail.com>
|
||||
@ -168,9 +169,11 @@ public class ResPackage {
|
||||
}
|
||||
|
||||
public void addType(ResType type) throws AndrolibException {
|
||||
if (mTypes.put(type.getName(), type) != null) {
|
||||
throw new AndrolibException("Multiple types: " + type);
|
||||
}
|
||||
if (mTypes.containsKey(type.getName())) {
|
||||
LOGGER.warning("Multiple types detected! " + type + " ignored!");
|
||||
} else {
|
||||
mTypes.put(type.getName(), type);
|
||||
}
|
||||
}
|
||||
|
||||
public void addResource(ResResource res) {
|
||||
@ -220,4 +223,7 @@ public class ResPackage {
|
||||
}
|
||||
return mValueFactory;
|
||||
}
|
||||
|
||||
private final static Logger LOGGER = Logger
|
||||
.getLogger(ResPackage.class.getName());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user