Merge pull request #8 from team-supercharge/7_processingOrder

Fix not compiling code when AA is running first

Author: AleksanderMielczarek

androidannotationspermissionsdispatcherplugin/src/main/java/com/github/aleksandermielczarek/androidannotationspermissionsdispatcherplugin/AndroidAnnotationsPermissionsDispatcherPlugin.java

@@ -20,7 +20,6 @@ public String getName() {
     @Override
     public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
         List<AnnotationHandler<?>> handlers = new ArrayList<>();
-        handlers.add(new RuntimePermissionsHandler(androidAnnotationEnv));
         handlers.add(new NeedsPermissionHandler(androidAnnotationEnv));
         return handlers;
     }

androidannotationspermissionsdispatcherplugin/src/main/java/com/github/aleksandermielczarek/androidannotationspermissionsdispatcherplugin/NeedsPermissionHandler.java

@@ -10,9 +10,12 @@
 import com.helger.jcodemodel.JVar;
 import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.ElementValidation;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.EFragment;
 import org.androidannotations.handler.BaseAnnotationHandler;
 import org.androidannotations.holder.EComponentHolder;
 
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
@@ -25,10 +28,12 @@ public NeedsPermissionHandler(AndroidAnnotationsEnvironment environment) {
 
 	@Override
 	protected void validate(Element element, ElementValidation validation) {
-		validatorHelper.enclosingElementHasEActivityOrEFragment(element, validation);
-		validatorHelper.isNotPrivate(element, validation);
-		validatorHelper.isNotFinal(element, validation);
-		validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
+		if (validatorHelper.elementHasAnnotation(EActivity.class, element.getEnclosingElement())
+				|| validatorHelper.elementHasAnnotation(EFragment.class, element.getEnclosingElement())) {
+			validatorHelper.isNotPrivate(element, validation);
+			validatorHelper.isNotFinal(element, validation);
+			validatorHelper.returnTypeIsVoid((ExecutableElement) element, validation);
+		}
 	}
 
 	@Override
@@ -64,10 +69,22 @@ public void process(Element element, EComponentHolder holder) throws Exception {
 			delegateCall.arg(overrideMethod.varParam());
 		}
 
+		codeModelHelper.copyAnnotation(overrideMethod, findAnnotation(element));
+
 		thenBlock.add(delegateCall);
 
 		JBlock elseBlock = conditional._else();
 		elseBlock.assign(dispatcherCalledField, JExpr.FALSE);
 		elseBlock.add(previousMethodBody);
 	}
+
+	private AnnotationMirror findAnnotation(Element element) {
+		for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
+			if (annotationMirror.getAnnotationType().asElement().getSimpleName().toString().equals("NeedsPermission")) {
+				return annotationMirror;
+			}
+		}
+
+		throw new IllegalStateException("Handled annotation should be on the method!");
+	}
 }