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

Adding startForResult on activity intent builders. #271

Merged
pyricau merged 1 commit into from
Aug 2, 2012
Merged

Adding startForResult on activity intent builders. #271

Show file tree
Hide file tree
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
17 changes: 16 additions & 1 deletion ...ations/src/main/java/com/googlecode/androidannotations/processing/EActivityProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JConditional;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JFieldRef;
import com.sun.codemodel.JFieldVar;
Expand Down Expand Up @@ -243,11 +244,25 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder activiti
}

{
// start
// start()
JMethod method = holder.intentBuilderClass.method(PUBLIC, codeModel.VOID, "start");
method.body().invoke(contextField, "startActivity").arg(holder.intentField);
}

{
// startForResult()
JMethod method = holder.intentBuilderClass.method(PUBLIC, codeModel.VOID, "startForResult");
JVar requestCode = method.param(codeModel.INT, "requestCode");

JBlock body = method.body();
JClass activityClass = holder.classes().ACTIVITY;
JConditional condition = body._if(contextField._instanceof(activityClass));
condition._then() //
.invoke(JExpr.cast(activityClass, contextField), "startActivityForResult").arg(holder.intentField).arg(requestCode);
condition._else() //
.invoke(contextField, "startActivity").arg(holder.intentField);
}

{
// intent()
JMethod method = holder.eBean.method(STATIC | PUBLIC, holder.intentBuilderClass, "intent");
Expand Down
1 change: 1 addition & 0 deletions ...test-1-5/src/main/java/com/googlecode/androidannotations/test15/ActivityWithServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public class ActivityWithServices extends Activity {
@SystemService
WifiManager wifiManager;


@SystemService
InputMethodManager inputMethodManager;

Expand Down
8 changes: 7 additions & 1 deletion ...est-1-5/src/main/java/com/googlecode/androidannotations/test15/ExtraInjectedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@ public class ExtraInjectedActivity extends Activity {

@Extra("byteArrayExtra")
byte[] byteArrayExtra;

@Extra
String extraWithoutValue;

@Override
protected void onNewIntent(Intent intent) {
setIntent(intent);
}

void intentWithExtras() {
ExtraInjectedActivity_.intent(this).arrayExtra(null).start();
ExtraInjectedActivity_.intent(this).intExtra(42).get();
ExtraInjectedActivity_.intent(this).stringExtra("hello").startForResult(42);
}
}
1 change: 0 additions & 1 deletion ...est-1-5/src/main/java/com/googlecode/androidannotations/test15/ViewsInjectedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public class ViewsInjectedActivity extends Activity {
@AfterViews
void incrementCounter() {
counter++;
startActivityForResult(ActivityWithServices_.intent(this).flags(0).get(), 0);
}

}