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

Commit b1e1903

Browse files
WonderCsaboWonderCsabo
authored
Merge pull request #1848 from dodgex/1847_fix_method_injection_for_resources
Fix method injection for resources
2 parents f68b8d5 + 9c134b0 commit b1e1903

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

  • AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public abstract class EComponentHolder extends BaseGeneratedClassHolder {
3434

3535
protected IJExpression contextRef;
3636
protected JMethod init;
37+
private JBlock initBodyBeforeInjectionBlock;
3738
private JBlock initBodyInjectionBlock;
3839
private JBlock initBodyAfterInjectionBlock;
3940
private JVar resourcesRef;
@@ -81,7 +82,16 @@ public JBlock getInitBodyAfterInjectionBlock() {
8182
return initBodyAfterInjectionBlock;
8283
}
8384

85+
public JBlock getInitBodyBeforeInjectionBlock() {
86+
if (initBodyBeforeInjectionBlock == null) {
87+
setInitBodyBlocks();
88+
}
89+
90+
return initBodyBeforeInjectionBlock;
91+
}
92+
8493
private void setInitBodyBlocks() {
94+
initBodyBeforeInjectionBlock = getInitBody().blockVirtual();
8595
initBodyInjectionBlock = getInitBody().blockVirtual();
8696
initBodyAfterInjectionBlock = getInitBody().blockVirtual();
8797
}
@@ -94,7 +104,7 @@ public JVar getResourcesRef() {
94104
}
95105

96106
private void setResourcesRef() {
97-
resourcesRef = getInitBodyInjectionBlock().decl(getClasses().RESOURCES, "resources" + generationSuffix(), getContextRef().invoke("getResources"));
107+
resourcesRef = getInitBodyBeforeInjectionBlock().decl(getClasses().RESOURCES, "resources" + generationSuffix(), getContextRef().invoke("getResources"));
98108
}
99109

100110
public JFieldVar getPowerManagerRef() {

0 commit comments

Comments
 (0)