ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-29 04:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't trim empty parameter annotations

Browse Source
This commit is contained in:
Ben Gruver 2013-11-10 21:16:05 -08:00
parent 263083faed
commit f6958ae4bc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderClassPool.java
View File

@ -248,18 +248,18 @@ public class BuilderClassPool implements ClassSection<BuilderStringReference, Bu
@Nullable @Override public List<? extends BuilderAnnotationSet> getParameterAnnotations( @Nullable @Override public List<? extends BuilderAnnotationSet> getParameterAnnotations(
@Nonnull final BuilderMethod method) { @Nonnull final BuilderMethod method) {
final int lastIndex = CollectionUtils.lastIndexOf(method.getParameters(), HAS_PARAMETER_ANNOTATIONS); final List<? extends BuilderMethodParameter> parameters = method.getParameters();
boolean hasParameterAnnotations = Iterables.any(parameters, HAS_PARAMETER_ANNOTATIONS);
if (lastIndex > -1) { if (hasParameterAnnotations) {
return new AbstractForwardSequentialList<BuilderAnnotationSet>() { return new AbstractForwardSequentialList<BuilderAnnotationSet>() {
@Nonnull @Override public Iterator<BuilderAnnotationSet> iterator() { @Nonnull @Override public Iterator<BuilderAnnotationSet> iterator() {
return FluentIterable.from(method.getParameters()) return FluentIterable.from(parameters)
.limit(lastIndex+1)
.transform(PARAMETER_ANNOTATIONS).iterator(); .transform(PARAMETER_ANNOTATIONS).iterator();
} }
@Override public int size() { @Override public int size() {
return lastIndex+1; return parameters.size();
} }
}; };
} }

10
dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
View File

@ -371,18 +371,18 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
@Nullable @Override public List<? extends Set<? extends Annotation>> getParameterAnnotations( @Nullable @Override public List<? extends Set<? extends Annotation>> getParameterAnnotations(
@Nonnull final PoolMethod method) { @Nonnull final PoolMethod method) {
final int lastIndex = CollectionUtils.lastIndexOf(method.getParameters(), HAS_PARAMETER_ANNOTATIONS); final List<? extends MethodParameter> parameters = method.getParameters();
boolean hasParameterAnnotations = Iterables.any(parameters, HAS_PARAMETER_ANNOTATIONS);
if (lastIndex > -1) { if (hasParameterAnnotations) {
return new AbstractForwardSequentialList<Set<? extends Annotation>>() { return new AbstractForwardSequentialList<Set<? extends Annotation>>() {
@Nonnull @Override public Iterator<Set<? extends Annotation>> iterator() { @Nonnull @Override public Iterator<Set<? extends Annotation>> iterator() {
return FluentIterable.from(method.getParameters()) return FluentIterable.from(parameters)
.limit(lastIndex+1)
.transform(PARAMETER_ANNOTATIONS).iterator(); .transform(PARAMETER_ANNOTATIONS).iterator();
} }
@Override public int size() { @Override public int size() {
return lastIndex+1; return parameters.size();
} }
}; };
} }