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

Ignore null-Intents in EIntentService classes #2016

Merged
WonderCsabo merged 1 commit into from
Jun 16, 2017
Merged

Ignore null-Intents in EIntentService classes #2016

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
5 changes: 5 additions & 0 deletions .../androidannotations/src/main/java/org/androidannotations/holder/EIntentServiceHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
* Copyright (C) 2016-2017 the AndroidAnnotations project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -15,6 +16,7 @@
*/
Copy link
Copy Markdown
Member

@WonderCsabo WonderCsabo Jun 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the licence please.

Copy link
Copy Markdown
Member Author

@dodgex dodgex Jun 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

package org.androidannotations.holder;

import static com.helger.jcodemodel.JExpr._null;
import static com.helger.jcodemodel.JMod.PUBLIC;

import javax.lang.model.element.TypeElement;
Expand Down Expand Up @@ -73,6 +75,9 @@ private void createOnHandleIntent() {
onHandleIntentMethod.annotate(Override.class);
onHandleIntentBody = onHandleIntentMethod.body();
codeModelHelper.callSuperMethod(onHandleIntentMethod, this, onHandleIntentBody);

onHandleIntentBody._if(onHandleIntentIntent.eq(_null()))._then()._return();

JInvocation getActionInvocation = JExpr.invoke(onHandleIntentIntent, "getAction");
onHandleIntentIntentAction = onHandleIntentBody.decl(getClasses().STRING, "action", getActionInvocation);
}
Expand Down