Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit 87491b6

Browse files
WonderCsaboWonderCsabo
committed
Use normal R class even when validating with R2
The final resource values will not be the same as the compile-time values, so we have to use the R class in the generated code, even if the user set to use the R2 class in annotation parameters. Follow-up fix for: #2022
1 parent 75dcb3d commit 87491b6

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/rclass/RInnerClass.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ public static JFieldRef extractIdStaticRef(AndroidAnnotationsEnvironment environ
129129
String rClassQualifiedName = rInnerClassName.substring(0, innerClassSuffix);
130130
String innerClassSimpleName = rInnerClassName.substring(innerClassSuffix + 1);
131131

132+
if (rClassQualifiedName.endsWith("R2")) {
133+
rClassQualifiedName = rClassQualifiedName.substring(0, rClassQualifiedName.length() - 1);
134+
}
135+
132136
JDirectClass rClass = (JDirectClass) environment.getJClass(rClassQualifiedName);
133137

134138
AbstractJClass innerClass = null;

0 commit comments

Comments
 (0)