diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java index cc09441ba1..4d9d00acce 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java +++ b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/OnActivityResultValidator.java @@ -56,7 +56,7 @@ public boolean validate(Element element, AnnotationElements validatedElements) { IsValid valid = new IsValid(); - validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid); + validatorHelper.enclosingElementHasEActivityOrEFragment(element, validatedElements, valid); validatorHelper.isNotPrivate(element, valid); diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultFragment.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultFragment.java new file mode 100644 index 0000000000..67135cc1e2 --- /dev/null +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/AwaitingResultFragment.java @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2010-2012 eBusiness Information, Excilys Group + * + * 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 + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed To in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.googlecode.androidannotations.test15; + +import android.app.Fragment; +import android.content.Intent; + +import com.googlecode.androidannotations.annotations.EFragment; +import com.googlecode.androidannotations.annotations.OnActivityResult; + +@EFragment(R.layout.views_injected) +public class AwaitingResultFragment extends Fragment { + + private static final int FIRST_REQUEST = 11; + private static final int SECOND_REQUEST = 22; + private static final int THIRD_REQUEST = 33; + + @OnActivityResult(FIRST_REQUEST) + void onResult() { + } + + @OnActivityResult(SECOND_REQUEST) + void onResultWithData(Intent intentData) { + } + + @OnActivityResult(SECOND_REQUEST) + void onActivityResultWithResultCodeAndData(int result, Intent intentData) { + } + + @OnActivityResult(SECOND_REQUEST) + void onActivityResultWithDataAndResultCode(Intent intentData, int result) { + } + + @OnActivityResult(THIRD_REQUEST) + void onResultWithIntResultCode(int resultCode) { + } + + @OnActivityResult(THIRD_REQUEST) + void onResultWithIntegerResultCode(Integer resultCodeInteger) { + } + +}