Skip to content

Commit 9dcdf29

Browse files
WonderCsaboWonderCsabo
committed
Upgrade to RoboGuice 2
This commit adds RoboGuice 2 support, RoboGuice 1 support is dropped.
1 parent 5e769c2 commit 9dcdf29

6 files changed

Lines changed: 140 additions & 106 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java‎

Lines changed: 39 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
public class RoboGuiceHandler extends BaseAnnotationHandler<EActivityHolder> {
5151

52-
private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
52+
private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
5353

5454
public RoboGuiceHandler(ProcessingEnvironment processingEnvironment) {
5555
super(RoboGuice.class, processingEnvironment);
@@ -66,25 +66,25 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
6666
public void process(Element element, EActivityHolder holder) {
6767
RoboGuiceHolder roboGuiceHolder = holder.getRoboGuiceHolder();
6868

69-
holder.getGeneratedClass()._implements(classes().INJECTOR_PROVIDER);
69+
holder.getGeneratedClass()._implements(classes().ROBO_CONTEXT);
7070

71-
JFieldVar scope = roboGuiceHolder.getScopeField();
71+
JFieldVar scopedObjects = roboGuiceHolder.getScopedObjectsField();
7272
JFieldVar eventManager = roboGuiceHolder.getEventManagerField();
73-
JMethod getInjector = roboGuiceHolder.getGetInjector();
73+
roboGuiceHolder.getContentViewListenerField();
7474
listenerFields(element, holder);
7575

76-
beforeCreateMethod(holder, scope, eventManager, getInjector);
77-
afterSetContentView(holder, scope, eventManager);
78-
onRestartMethod(roboGuiceHolder, scope, eventManager);
79-
onStartMethod(roboGuiceHolder, scope, eventManager);
80-
onResumeMethod(roboGuiceHolder, scope, eventManager);
76+
beforeCreateMethod(holder, eventManager);
77+
onRestartMethod(roboGuiceHolder, eventManager);
78+
onStartMethod(roboGuiceHolder, eventManager);
79+
onResumeMethod(roboGuiceHolder, eventManager);
8180
onPauseMethod(roboGuiceHolder, eventManager);
82-
onNewIntentMethod(roboGuiceHolder, scope, eventManager);
83-
onStopMethod(roboGuiceHolder, scope, eventManager);
84-
onDestroyMethod(roboGuiceHolder, scope, eventManager);
81+
onNewIntentMethod(roboGuiceHolder, eventManager);
82+
onStopMethod(roboGuiceHolder, eventManager);
83+
onDestroyMethod(roboGuiceHolder, eventManager);
8584
onConfigurationChangedMethod(roboGuiceHolder, eventManager);
8685
onContentChangedMethod(roboGuiceHolder, eventManager);
87-
onActivityResultMethod(roboGuiceHolder, scope, eventManager);
86+
onActivityResultMethod(roboGuiceHolder, eventManager);
87+
getScopedObjectMap(holder, scopedObjects);
8888
}
8989

9090
private void listenerFields(Element element, EActivityHolder holder) {
@@ -130,39 +130,25 @@ private List<String> extractListenerClasses(Element activityElement) {
130130
return new ArrayList<String>(0);
131131
}
132132

133-
private void beforeCreateMethod(EActivityHolder holder, JFieldVar scope, JFieldVar eventManager, JMethod getInjector) {
133+
private void beforeCreateMethod(EActivityHolder holder, JFieldVar eventManager) {
134134
JBlock body = holder.getInitBody();
135-
JVar injector = body.decl(classes().INJECTOR, "injector_", invoke(getInjector));
136-
body.assign(scope, invoke(injector, "getInstance").arg(classes().CONTEXT_SCOPE.dotclass()));
137-
body.invoke(scope, "enter").arg(_this());
138-
body.invoke(injector, "injectMembers").arg(_this());
135+
JVar injector = body.decl(classes().INJECTOR, "injector_", classes().ROBO_GUICE.staticInvoke("getInjector").arg(_this()));
139136
body.assign(eventManager, invoke(injector, "getInstance").arg(classes().EVENT_MANAGER.dotclass()));
137+
injector.invoke("injectMembersWithoutViews").arg(_this());
140138
fireEvent(eventManager, body, classes().ON_CREATE_EVENT, holder.getInitSavedInstanceParam());
141139
}
142140

143-
private void afterSetContentView(EActivityHolder holder, JFieldVar scope, JFieldVar eventManager) {
144-
JBlock onViewChanged = holder.getOnViewChangedBody();
145-
onViewChanged.invoke(scope, "injectViews");
146-
fireEvent(eventManager, onViewChanged, classes().ON_CONTENT_VIEW_AVAILABLE_EVENT);
147-
}
148-
149-
private void onRestartMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
150-
JBlock onRestartBeforeSuperBlock = holder.getOnRestartBeforeSuperBlock();
151-
onRestartBeforeSuperBlock.invoke(scope, "enter").arg(_this());
141+
private void onRestartMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
152142
JBlock onRestartAfterSuperBlock = holder.getOnRestartAfterSuperBlock();
153143
fireEvent(eventManager, onRestartAfterSuperBlock, classes().ON_RESTART_EVENT);
154144
}
155145

156-
private void onStartMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
157-
JBlock onStartBeforeSuperBlock = holder.getOnStartBeforeSuperBlock();
158-
onStartBeforeSuperBlock.invoke(scope, "enter").arg(_this());
146+
private void onStartMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
159147
JBlock onStartAfterSuperBlock = holder.getOnStartAfterSuperBlock();
160148
fireEvent(eventManager, onStartAfterSuperBlock, classes().ON_START_EVENT);
161149
}
162150

163-
private void onResumeMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
164-
JBlock onResumeBeforeSuperBlock = holder.getOnResumeBeforeSuperBlock();
165-
onResumeBeforeSuperBlock.invoke(scope, "enter").arg(_this());
151+
private void onResumeMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
166152
JBlock onResumeAfterSuperBlock = holder.getOnResumeAfterSuperBlock();
167153
fireEvent(eventManager, onResumeAfterSuperBlock, classes().ON_RESUME_EVENT);
168154
}
@@ -172,42 +158,37 @@ private void onPauseMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
172158
fireEvent(eventManager, onPauseAfterSuperBlock, classes().ON_PAUSE_EVENT);
173159
}
174160

175-
private void onNewIntentMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
161+
private void onNewIntentMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
176162
JBlock onNewIntentAfterSuperBlock = holder.getOnNewIntentAfterSuperBlock();
177-
onNewIntentAfterSuperBlock.invoke(scope, "enter").arg(_this());
178163
fireEvent(eventManager, onNewIntentAfterSuperBlock, classes().ON_NEW_INTENT_EVENT);
179164
}
180165

181-
private void onStopMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
166+
private void onStopMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
182167
JBlock onStopBlock = new JBlock(false, false);
183-
onStopBlock.invoke(scope, "enter").arg(_this());
184168

185169
JTryBlock tryBlock = onStopBlock._try();
186170
fireEvent(eventManager, tryBlock.body(), classes().ON_STOP_EVENT);
187171
JBlock finallyBody = tryBlock._finally();
188172

189-
finallyBody.invoke(scope, "exit").arg(_this());
190173
finallyBody.invoke(_super(), "onStop");
191174

192-
JMethod onStop = holder.getOnStop();
193-
codeModelHelper.replaceSuperCall(onStop, onStopBlock);
175+
JMethod onStop = holder.getOnStop();
176+
codeModelHelper.replaceSuperCall(onStop, onStopBlock);
194177
}
195178

196-
private void onDestroyMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
197-
JBlock onDestroyBlock = new JBlock(false, false);
198-
onDestroyBlock.invoke(scope, "enter").arg(_this());
179+
private void onDestroyMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
180+
JBlock onDestroyBlock = new JBlock(false, false);
199181

200182
JTryBlock tryBlock = onDestroyBlock._try();
201183
fireEvent(eventManager, tryBlock.body(), classes().ON_DESTROY_EVENT);
202184
JBlock finallyBody = tryBlock._finally();
203185

204-
finallyBody.invoke(eventManager, "clear").arg(_this());
205-
finallyBody.invoke(scope, "exit").arg(_this());
206-
finallyBody.invoke(scope, "dispose").arg(_this());
207-
finallyBody.invoke(_super(), "onDestroy");
186+
JTryBlock tryInFinally = finallyBody._try();
187+
tryInFinally.body().add(classes().ROBO_GUICE.staticInvoke("destroyInjector").arg(_this()));
188+
tryInFinally._finally().invoke(_super(), "onDestroy");
208189

209-
JMethod onDestroy = holder.getOnDestroy();
210-
codeModelHelper.replaceSuperCall(onDestroy, onDestroyBlock);
190+
JMethod onDestroy = holder.getOnDestroy();
191+
codeModelHelper.replaceSuperCall(onDestroy, onDestroyBlock);
211192
}
212193

213194
private void onConfigurationChangedMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
@@ -219,22 +200,17 @@ private void onConfigurationChangedMethod(RoboGuiceHolder holder, JFieldVar even
219200

220201
private void onContentChangedMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
221202
JBlock onContentChangedAfterSuperBlock = holder.getOnContentChangedAfterSuperBlock();
203+
onContentChangedAfterSuperBlock.add(classes().ROBO_GUICE.staticInvoke("getInjector").arg(_this()).invoke("injectViewMembers").arg(_this()));
222204
fireEvent(eventManager, onContentChangedAfterSuperBlock, classes().ON_CONTENT_CHANGED_EVENT);
223205
}
224206

225-
private void onActivityResultMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
207+
private void onActivityResultMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
226208
JBlock onActivityResultAfterSuperBlock = holder.getOnActivityResultAfterSuperBlock();
227209
JVar requestCode = holder.getRequestCode();
228210
JVar resultCode = holder.getResultCode();
229211
JVar data = holder.getData();
230212

231-
onActivityResultAfterSuperBlock.invoke(scope, "enter").arg(_this());
232-
233-
JTryBlock tryBlock = onActivityResultAfterSuperBlock._try();
234-
fireEvent(eventManager, tryBlock.body(), classes().ON_ACTIVITY_RESULT_EVENT, requestCode, resultCode, data);
235-
236-
JBlock finallyBody = tryBlock._finally();
237-
finallyBody.invoke(scope, "exit").arg(_this());
213+
fireEvent(eventManager, onActivityResultAfterSuperBlock, classes().ON_ACTIVITY_RESULT_EVENT, requestCode, resultCode, data);
238214
}
239215

240216
private void fireEvent(JFieldVar eventManager, JBlock body, JClass eventClass, JExpression... eventArguments) {
@@ -244,4 +220,10 @@ private void fireEvent(JFieldVar eventManager, JBlock body, JClass eventClass, J
244220
}
245221
body.invoke(eventManager, "fire").arg(newEvent);
246222
}
223+
224+
private void getScopedObjectMap(EActivityHolder holder, JFieldVar scopedObjectMap) {
225+
JMethod getScopedObjectMapMethod = holder.getGeneratedClass().method(JMod.PUBLIC, scopedObjectMap.type(), "getScopedObjectMap");
226+
getScopedObjectMapMethod.annotate(Override.class);
227+
getScopedObjectMapMethod.body()._return(scopedObjectMap);
228+
}
247229
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,18 @@ public final class CanonicalNameConstants {
140140
/*
141141
* RoboGuice
142142
*/
143-
public static final String INJECTOR_PROVIDER = "roboguice.inject.InjectorProvider";
143+
public static final String ROBO_CONTEXT = "roboguice.util.RoboContext";
144144
public static final String INJECTOR = "com.google.inject.Injector";
145+
public static final String KEY = "com.google.inject.Key";
146+
public static final String CONTENT_VIEW_LISTENER = "roboguice.inject.ContentViewListener";
145147
public static final String ON_RESTART_EVENT = "roboguice.activity.event.OnRestartEvent";
146148
public static final String ON_START_EVENT = "roboguice.activity.event.OnStartEvent";
147149
public static final String ON_RESUME_EVENT = "roboguice.activity.event.OnResumeEvent";
148150
public static final String ON_PAUSE_EVENT = "roboguice.activity.event.OnPauseEvent";
149151
public static final String ON_NEW_INTENT_EVENT = "roboguice.activity.event.OnNewIntentEvent";
150152
public static final String EVENT_MANAGER = "roboguice.event.EventManager";
151153
public static final String CONTEXT_SCOPE = "roboguice.inject.ContextScope";
154+
public static final String ROBO_GUICE = "roboguice.RoboGuice";
152155
public static final String INJECT = "com.google.inject.Inject";
153156
public static final String ON_STOP_EVENT = "roboguice.activity.event.OnStopEvent";
154157
public static final String ON_DESTROY_EVENT = "roboguice.activity.event.OnDestroyEvent";

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java‎

Lines changed: 62 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,66 @@
1515
*/
1616
package org.androidannotations.helper;
1717

18-
import org.androidannotations.annotations.*;
19-
import org.androidannotations.annotations.rest.*;
20-
import org.androidannotations.annotations.sharedpreferences.*;
18+
import static java.util.Arrays.asList;
19+
import static org.androidannotations.helper.AndroidConstants.LOG_DEBUG;
20+
import static org.androidannotations.helper.AndroidConstants.LOG_ERROR;
21+
import static org.androidannotations.helper.AndroidConstants.LOG_INFO;
22+
import static org.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
23+
import static org.androidannotations.helper.AndroidConstants.LOG_WARN;
24+
import static org.androidannotations.helper.CanonicalNameConstants.CLIENT_HTTP_REQUEST_FACTORY;
25+
import static org.androidannotations.helper.CanonicalNameConstants.CLIENT_HTTP_REQUEST_INTERCEPTOR;
26+
import static org.androidannotations.helper.CanonicalNameConstants.HTTP_MESSAGE_CONVERTER;
27+
import static org.androidannotations.helper.CanonicalNameConstants.INTERNET_PERMISSION;
28+
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
29+
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
30+
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_VIEW_SUPPORT_ANNOTATIONS;
31+
32+
import java.lang.annotation.Annotation;
33+
import java.util.ArrayList;
34+
import java.util.Arrays;
35+
import java.util.Collection;
36+
import java.util.HashMap;
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.Set;
40+
import java.util.TreeSet;
41+
42+
import javax.lang.model.element.AnnotationMirror;
43+
import javax.lang.model.element.Element;
44+
import javax.lang.model.element.ElementKind;
45+
import javax.lang.model.element.ExecutableElement;
46+
import javax.lang.model.element.Modifier;
47+
import javax.lang.model.element.TypeElement;
48+
import javax.lang.model.element.VariableElement;
49+
import javax.lang.model.type.ArrayType;
50+
import javax.lang.model.type.DeclaredType;
51+
import javax.lang.model.type.ErrorType;
52+
import javax.lang.model.type.TypeKind;
53+
import javax.lang.model.type.TypeMirror;
54+
import javax.lang.model.util.ElementFilter;
55+
import javax.lang.model.util.Elements;
56+
57+
import org.androidannotations.annotations.EActivity;
58+
import org.androidannotations.annotations.EBean;
59+
import org.androidannotations.annotations.EFragment;
60+
import org.androidannotations.annotations.EIntentService;
61+
import org.androidannotations.annotations.EService;
62+
import org.androidannotations.annotations.Receiver;
63+
import org.androidannotations.annotations.Trace;
64+
import org.androidannotations.annotations.ViewById;
65+
import org.androidannotations.annotations.rest.Delete;
66+
import org.androidannotations.annotations.rest.Get;
67+
import org.androidannotations.annotations.rest.Head;
68+
import org.androidannotations.annotations.rest.Options;
69+
import org.androidannotations.annotations.rest.Post;
70+
import org.androidannotations.annotations.rest.Put;
71+
import org.androidannotations.annotations.rest.Rest;
72+
import org.androidannotations.annotations.sharedpreferences.DefaultBoolean;
73+
import org.androidannotations.annotations.sharedpreferences.DefaultFloat;
74+
import org.androidannotations.annotations.sharedpreferences.DefaultInt;
75+
import org.androidannotations.annotations.sharedpreferences.DefaultLong;
76+
import org.androidannotations.annotations.sharedpreferences.DefaultString;
77+
import org.androidannotations.annotations.sharedpreferences.SharedPref;
2178
import org.androidannotations.api.rest.RestClientErrorHandling;
2279
import org.androidannotations.api.rest.RestClientHeaders;
2380
import org.androidannotations.api.rest.RestClientRootUrl;
@@ -27,18 +84,6 @@
2784
import org.androidannotations.model.AnnotationElements;
2885
import org.androidannotations.process.IsValid;
2986

30-
import javax.lang.model.element.*;
31-
import javax.lang.model.type.*;
32-
import javax.lang.model.util.ElementFilter;
33-
import javax.lang.model.util.Elements;
34-
import java.lang.annotation.Annotation;
35-
import java.util.*;
36-
37-
import static java.util.Arrays.asList;
38-
import static org.androidannotations.helper.AndroidConstants.*;
39-
import static org.androidannotations.helper.CanonicalNameConstants.*;
40-
import static org.androidannotations.helper.ModelConstants.*;
41-
4287
public class ValidatorHelper {
4388

4489
private static final List<String> VALID_REST_INTERFACES = asList(RestClientHeaders.class.getName(), RestClientErrorHandling.class.getName(), RestClientRootUrl.class.getName(), RestClientSupport.class.getName());
@@ -599,14 +644,9 @@ public void allowedType(Element element, IsValid valid, TypeMirror fieldTypeMirr
599644
public void hasRoboGuiceJars(Element element, IsValid valid) {
600645
Elements elementUtils = annotationHelper.getElementUtils();
601646

602-
if (elementUtils.getTypeElement(CanonicalNameConstants.INJECTOR_PROVIDER) == null) {
603-
valid.invalidate();
604-
annotationHelper.printAnnotationError(element, "Could not find the RoboGuice framework in the classpath, the following class is missing: " + CanonicalNameConstants.INJECTOR_PROVIDER);
605-
}
606-
607-
if (elementUtils.getTypeElement(RoboGuiceConstants.ROBOGUICE_APPLICATION_CLASS) == null) {
647+
if (elementUtils.getTypeElement(CanonicalNameConstants.ROBO_CONTEXT) == null) {
608648
valid.invalidate();
609-
annotationHelper.printAnnotationError(element, "Could not find the RoboApplication class in the classpath, are you using RoboGuice 1.1.1 ?");
649+
annotationHelper.printAnnotationError(element, "Could not find the RoboGuice framework in the classpath, the following class is missing: " + CanonicalNameConstants.ROBO_CONTEXT);
610650
}
611651

612652
try {

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
import static com.sun.codemodel.JExpr._this;
2424
import static com.sun.codemodel.JExpr.cast;
2525
import static com.sun.codemodel.JExpr.invoke;
26-
import static com.sun.codemodel.JMod.FINAL;
2726
import static com.sun.codemodel.JMod.PRIVATE;
2827
import static com.sun.codemodel.JMod.PUBLIC;
28+
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
2929

30-
import java.util.*;
30+
import java.util.ArrayList;
31+
import java.util.List;
3132

3233
import javax.lang.model.element.Element;
3334
import javax.lang.model.element.ExecutableElement;
@@ -37,7 +38,13 @@
3738
import javax.lang.model.util.ElementFilter;
3839

3940
import org.androidannotations.api.SdkVersionHelper;
40-
import org.androidannotations.helper.*;
41+
import org.androidannotations.helper.ActionBarSherlockHelper;
42+
import org.androidannotations.helper.ActivityIntentBuilder;
43+
import org.androidannotations.helper.AndroidManifest;
44+
import org.androidannotations.helper.AnnotationHelper;
45+
import org.androidannotations.helper.CanonicalNameConstants;
46+
import org.androidannotations.helper.GreenDroidHelper;
47+
import org.androidannotations.helper.IntentBuilder;
4148
import org.androidannotations.process.ProcessHolder;
4249

4350
import com.sun.codemodel.JBlock;
@@ -451,20 +458,21 @@ public RoboGuiceHolder getRoboGuiceHolder() {
451458
return roboGuiceHolder;
452459
}
453460

454-
protected void setScopeField() {
455-
getRoboGuiceHolder().scope = getGeneratedClass().field(JMod.PRIVATE, classes().CONTEXT_SCOPE, "scope_");
461+
protected void setScopedObjectsField() {
462+
JClass keyWildCard = classes().KEY.narrow(codeModel().wildcard());
463+
JClass scopedHashMap = classes().HASH_MAP.narrow(keyWildCard, classes().OBJECT);
464+
465+
getRoboGuiceHolder().scopedObjects = getGeneratedClass().field(JMod.PROTECTED, scopedHashMap, "scopedObjects" + GENERATION_SUFFIX);
466+
getRoboGuiceHolder().scopedObjects.assign(JExpr._new(scopedHashMap));
456467
}
457468

458469
protected void setEventManagerField() {
459-
getRoboGuiceHolder().eventManager = generatedClass.field(JMod.PRIVATE, classes().EVENT_MANAGER, "eventManager_");
470+
getRoboGuiceHolder().eventManager = generatedClass.field(JMod.PROTECTED, classes().EVENT_MANAGER, "eventManager" + GENERATION_SUFFIX);
460471
}
461472

462-
public void setGetInjector() {
463-
JMethod method = generatedClass.method(JMod.PUBLIC, classes().INJECTOR, "getInjector");
464-
method.annotate(Override.class);
465-
JExpression castApplication = cast(classes().INJECTOR_PROVIDER, invoke("getApplication"));
466-
method.body()._return(castApplication.invoke("getInjector"));
467-
getRoboGuiceHolder().getInjector = method;
473+
protected void setContentViewListenerField() {
474+
getRoboGuiceHolder().contentViewListenerField = generatedClass.field(JMod.NONE, classes().CONTENT_VIEW_LISTENER, "ignored" + GENERATION_SUFFIX);
475+
getRoboGuiceHolder().contentViewListenerField.annotate(classes().INJECT);
468476
}
469477

470478
@Override
@@ -696,6 +704,7 @@ public JBlock getOnDestroyAfterSuperBlock() {
696704
return onDestroyAfterSuperBlock;
697705
}
698706

707+
@Override
699708
public JBlock getOnResumeAfterSuperBlock() {
700709
if (onResumeAfterSuperBlock == null) {
701710
setOnResume();
@@ -755,5 +764,4 @@ public JFieldVar getIntentFilterField(String[] actions) {
755764
return receiverRegistrationHolder.getIntentFilterField(actions);
756765
}
757766

758-
759767
}

0 commit comments

Comments
 (0)