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

Interpret @Extra annotated params as extras with @Receiver{Action} #1718

Merged
WonderCsabo merged 4 commits into from
Mar 4, 2016
Merged

Interpret @Extra annotated params as extras with @Receiver{Action} #1718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92051dd
Interpret @Extra annotated params as extras with @Receiver{Action}
WonderCsabo Mar 4, 2016
8833bce
Test Intent parameters of @Receiver, @ReceiverAction and @OnActivityR…
WonderCsabo Mar 4, 2016
8c176d4
Refactor setup of AwaitingResultActivityTest
WonderCsabo Mar 4, 2016
50a27c5
Refactor: extract String constants in @Receiver tests
WonderCsabo Mar 4, 2016
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
Next Next commit
Interpret @extra annotated params as extras with @receiver{Action}
  • Loading branch information
@WonderCsabo
WonderCsabo committed Mar 4, 2016
commit 92051dd90368fcd102bdab45816e0a8852a79dbe
2 changes: 1 addition & 1 deletion ...ons/src/main/java/org/androidannotations/internal/core/handler/ReceiverActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private void addActionInOnReceive(EReceiverHolder holder, ExecutableElement exec

if (extraParamClass.equals(getClasses().CONTEXT)) {
callActionInvocation.arg(holder.getOnReceiveContext());
} else if (extraParamClass.equals(getClasses().INTENT)) {
} else if (extraParamClass.equals(getClasses().INTENT) && param.getAnnotation(ReceiverAction.Extra.class) == null) {
callActionInvocation.arg(intent);
} else if (param.getAnnotation(ReceiverAction.Extra.class) != null) {
if (extras == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...notations/src/main/java/org/androidannotations/internal/core/handler/ReceiverHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private JFieldVar createReceiverField(HasReceiverRegistration holder, String rec

if (extraParamClass.equals(getClasses().CONTEXT)) {
methodCall.arg(contextVar);
} else if (extraParamClass.equals(getClasses().INTENT)) {
} else if (extraParamClass.equals(getClasses().INTENT) && param.getAnnotation(Receiver.Extra.class) == null) {
methodCall.arg(intentVar);
} else if (param.getAnnotation(Receiver.Extra.class) != null) {
if (extras == null) {
Expand Down