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

Commit 3f6e510

Browse files
yDelouisWonderCsabo
authored andcommitted
Fix validation of Extra and FragmentArg annotated field
1 parent c3e4623 commit 3f6e510

4 files changed

Lines changed: 8 additions & 18 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ExtraHandler.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
6464
validatorHelper.enclosingElementHasEActivity(element, validatedElements, valid);
6565

6666
validatorHelper.isNotPrivate(element, valid);
67+
68+
validatorHelper.canBePutInABundle(element, valid);
6769
}
6870

6971
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentArgHandler.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5959
validatorHelper.enclosingElementHasEFragment(element, validatedElements, valid);
6060

6161
validatorHelper.isNotPrivate(element, valid);
62+
63+
validatorHelper.canBePutInABundle(element, valid);
6264
}
6365

6466
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/BundleHelper.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -185,26 +185,12 @@ public BundleHelper(AnnotationHelper helper, TypeMirror element) {
185185
}
186186
}
187187

188-
public boolean restoreCallNeedCastStatement() {
189-
return restoreCallNeedCastStatement;
190-
}
191-
192-
public boolean restoreCallNeedsSuppressWarning() {
193-
return restoreCallNeedsSuppressWarning;
194-
}
195-
196188
public String getMethodNameToSave() {
197189
return methodNameToSave;
198190
}
199191

200-
public String getMethodNameToRestore() {
201-
return methodNameToRestore;
202-
}
203-
204192
private boolean isTypeParcelable(TypeElement elementType) {
205-
206193
TypeElement parcelableType = annotationHelper.typeElementFromQualifiedName(CanonicalNameConstants.PARCELABLE);
207-
208194
return elementType != null && annotationHelper.isSubtype(elementType, parcelableType);
209195
}
210196

@@ -225,10 +211,10 @@ public JExpression getExpressionToRestoreFromBundle(JClass variableClass, JExpre
225211
expressionToRestore = JExpr.invoke(bundle, methodNameToRestore).arg(extraKey);
226212
}
227213

228-
if (restoreCallNeedCastStatement()) {
214+
if (restoreCallNeedCastStatement) {
229215
expressionToRestore = JExpr.cast(variableClass, expressionToRestore);
230216

231-
if (restoreCallNeedsSuppressWarning()) {
217+
if (restoreCallNeedsSuppressWarning) {
232218
codeModelHelper.addSuppressWarnings(method, "unchecked");
233219
}
234220
}

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ExtraInjectedActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.androidannotations.test15;
1717

18-
import java.util.List;
18+
import java.util.ArrayList;
1919

2020
import org.androidannotations.annotations.EActivity;
2121
import org.androidannotations.annotations.Extra;
@@ -33,7 +33,7 @@ public class ExtraInjectedActivity extends Activity {
3333
CustomData[] arrayExtra;
3434

3535
@Extra("listExtra")
36-
List<String> listExtra;
36+
ArrayList<String> listExtra;
3737

3838
@Extra("intExtra")
3939
int intExtra;

0 commit comments

Comments
 (0)