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

do not call setIntent() in onNewIntent() #1607

Merged
WonderCsabo merged 1 commit into from
Oct 29, 2015
Merged

do not call setIntent() in onNewIntent() #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ private void setOnNewIntent() {
JVar intent = onNewIntentMethod.param(getClasses().INTENT, "intent");
JBlock body = onNewIntentMethod.body();
body.invoke(_super(), onNewIntentMethod).arg(intent);
body.invoke(getSetIntent()).arg(intent);
onNewIntentAfterSuperBlock = body.blockSimple();
}

Expand Down Expand Up @@ -446,13 +445,6 @@ private void setInjectExtras() {
getInitBody().invoke(injectExtrasMethod);
}

public JMethod getOnNewIntent() {
if (onNewIntentMethod == null) {
setOnNewIntent();
}
return onNewIntentMethod;
}

public JBlock getOnNewIntentAfterSuperBlock() {
if (onNewIntentAfterSuperBlock == null) {
setOnNewIntent();
Expand Down
3 changes: 0 additions & 3 deletions ...ations/src/main/java/org/androidannotations/internal/core/handler/AfterExtrasHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,5 @@ public void validate(Element element, ElementValidation valid) {
public void process(Element element, EActivityHolder holder) {
String methodName = element.getSimpleName().toString();
holder.getInjectExtrasMethod().body().invoke(methodName);

// ensure that onNewIntent is overridden
holder.getOnNewIntent();
}
}