androidannotations · WonderCsabo · Mar 14, 2017 · Mar 7, 2017 · Mar 14, 2017
diff --git a/...tions-test/src/main/java/org/androidannotations/test/instancestate/InstanceStateView.java b/...tions-test/src/main/java/org/androidannotations/test/instancestate/InstanceStateView.java
@@ -0,0 +1,42 @@
+/**
+ * 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
+ * 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 org.androidannotations.test.instancestate;
+
+import org.androidannotations.annotations.EView;
+import org.androidannotations.annotations.InstanceState;
+
+import android.content.Context;
+import android.os.Parcelable;
+import android.view.View;
+
+@EView
+public class InstanceStateView extends View {
+
+	@InstanceState
+	int instanceField = -1;
+
+	int restoredInRestoreInstanceState = -2;
+
+	public InstanceStateView(Context context) {
+		super(context);
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Parcelable state) {
+		super.onRestoreInstanceState(state);
+		restoredInRestoreInstanceState = instanceField;
+	}
+}
diff --git a/...s-test/src/test/java/org/androidannotations/test/instancestate/InstanceStateViewTest.java b/...s-test/src/test/java/org/androidannotations/test/instancestate/InstanceStateViewTest.java
@@ -0,0 +1,50 @@
+/**
+ * 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
+ * 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 org.androidannotations.test.instancestate;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+import org.androidannotations.test.EmptyActivityWithoutLayout_;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+import android.content.Context;
+import android.os.Bundle;
+
+@RunWith(RobolectricTestRunner.class)
+public class InstanceStateViewTest {
+
+	@Test
+	public void testInstanceState() {
+		int restoredValue = 42;
+
+		Bundle bundle = new Bundle();
+		bundle.putInt("instanceField", restoredValue);
+
+		Context context = Robolectric.buildActivity(EmptyActivityWithoutLayout_.class).create().get();
+		InstanceStateView stateView = InstanceStateView_.build(context);
+
+		assertThat(stateView.instanceField).isEqualTo(-1);
+		assertThat(stateView.restoredInRestoreInstanceState).isEqualTo(-2);
+
+		stateView.onRestoreInstanceState(bundle);
+
+		assertThat(stateView.instanceField).isEqualTo(restoredValue);
+		assertThat(stateView.restoredInRestoreInstanceState).isEqualTo(restoredValue);
+	}
+}
diff --git a/...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java b/...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
@@ -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
@@ -468,6 +469,11 @@ public JMethod getRestoreStateMethod() {
 		return instanceStateDelegate.getRestoreStateMethod();
 	}

+	@Override
+	public JBlock getRestoreStateMethodBody() {
+		return instanceStateDelegate.getRestoreStateMethodBody();
+	}
+
 	@Override
 	public JVar getRestoreStateBundleParam() {
 		return instanceStateDelegate.getRestoreStateBundleParam();

diff --git a/...-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java b/...-core/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
@@ -401,6 +401,11 @@ public JMethod getRestoreStateMethod() {
 		return instanceStateDelegate.getRestoreStateMethod();
 	}

+	@Override
+	public JBlock getRestoreStateMethodBody() {
+		return instanceStateDelegate.getRestoreStateMethodBody();
+	}
+
 	@Override
 	public JVar getRestoreStateBundleParam() {
 		return instanceStateDelegate.getRestoreStateBundleParam();

diff --git a/...ions-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java b/...ions-core/androidannotations/src/main/java/org/androidannotations/holder/EViewHolder.java
@@ -266,6 +266,11 @@ public JMethod getRestoreStateMethod() {
 		return instanceStateDelegate.getRestoreStateMethod();
 	}

+	@Override
+	public JBlock getRestoreStateMethodBody() {
+		return instanceStateDelegate.getRestoreStateMethodBody();
+	}
+
 	@Override
 	public JVar getRestoreStateBundleParam() {
 		return instanceStateDelegate.getRestoreStateBundleParam();

diff --git a/...core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java b/...core/androidannotations/src/main/java/org/androidannotations/holder/HasInstanceState.java
@@ -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
@@ -26,5 +27,7 @@ public interface HasInstanceState extends GeneratedClassHolder {

 	JMethod getRestoreStateMethod();

+	JBlock getRestoreStateMethodBody();
+
 	JVar getRestoreStateBundleParam();
 }
diff --git a/...androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java b/...androidannotations/src/main/java/org/androidannotations/holder/InstanceStateDelegate.java
@@ -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
@@ -31,6 +32,7 @@ public class InstanceStateDelegate extends GeneratedClassHolderDelegate<ECompone
 	private JBlock saveStateMethodBody;
 	private JVar saveStateBundleParam;
 	private JMethod restoreStateMethod;
+	private JBlock restoreStateMethodBody;
 	private JVar restoreStateBundleParam;

 	public InstanceStateDelegate(EComponentHolder holder) {
@@ -71,6 +73,14 @@ public JMethod getRestoreStateMethod() {
 		return restoreStateMethod;
 	}

+	@Override
+	public JBlock getRestoreStateMethodBody() {
+		if (restoreStateMethodBody == null) {
+			setRestoreStateMethod();
+		}
+		return restoreStateMethodBody;
+	}
+
 	@Override
 	public JVar getRestoreStateBundleParam() {
 		if (restoreStateBundleParam == null) {
@@ -84,7 +94,8 @@ private void setRestoreStateMethod() {
 		restoreStateBundleParam = restoreStateMethod.param(getClasses().BUNDLE, "savedInstanceState");
 		holder.getInitBodyInjectionBlock().invoke(restoreStateMethod).arg(restoreStateBundleParam);

-		restoreStateMethod.body() //
+		restoreStateMethodBody = restoreStateMethod.body();
+		restoreStateMethodBody //
 				._if(ref("savedInstanceState").eq(_null())) //
 				._then()._return();
 	}

diff --git a/...oidannotations/src/main/java/org/androidannotations/holder/ViewInstanceStateDelegate.java b/...oidannotations/src/main/java/org/androidannotations/holder/ViewInstanceStateDelegate.java
@@ -35,6 +35,7 @@ public class ViewInstanceStateDelegate extends GeneratedClassHolderDelegate<ECom
 	private JBlock saveStateMethodBody;
 	private JVar saveStateBundleParam;
 	private JMethod restoreStateMethod;
+	private JBlock restoreStateMethodBody;
 	private JVar restoreStateBundleParam;

 	public ViewInstanceStateDelegate(EComponentHolder holder) {
@@ -84,6 +85,14 @@ public JMethod getRestoreStateMethod() {
 		return restoreStateMethod;
 	}

+	@Override
+	public JBlock getRestoreStateMethodBody() {
+		if (restoreStateMethodBody == null) {
+			setRestoreStateMethod();
+		}
+		return restoreStateMethodBody;
+	}
+
 	@Override
 	public JVar getRestoreStateBundleParam() {
 		if (restoreStateBundleParam == null) {
@@ -97,10 +106,13 @@ private void setRestoreStateMethod() {
 		restoreStateMethod.annotate(Override.class);
 		JVar state = restoreStateMethod.param(getClasses().PARCELABLE, "state");

-		JBlock restoreStateMethodBody = restoreStateMethod.body();
-		restoreStateBundleParam = restoreStateMethodBody.decl(getClasses().BUNDLE, "bundle" + generationSuffix(), cast(getClasses().BUNDLE, state));
-		JVar instanceState = restoreStateMethodBody.decl(getClasses().PARCELABLE, "instanceState", restoreStateBundleParam.invoke("getParcelable").arg(getInstanceStateKey()));
-		restoreStateMethodBody.invoke(_super(), "onRestoreInstanceState").arg(instanceState);
+		JBlock body = restoreStateMethod.body();
+		restoreStateBundleParam = body.decl(getClasses().BUNDLE, "bundle" + generationSuffix(), cast(getClasses().BUNDLE, state));
+		JVar instanceState = body.decl(getClasses().PARCELABLE, "instanceState", restoreStateBundleParam.invoke("getParcelable").arg(getInstanceStateKey()));
+
+		restoreStateMethodBody = body.blockSimple();
+
+		body.invoke(_super(), "onRestoreInstanceState").arg(instanceState);
 	}

 	private JVar getInstanceStateKey() {

diff --git a/...ions/src/main/java/org/androidannotations/internal/core/handler/InstanceStateHandler.java b/...ions/src/main/java/org/androidannotations/internal/core/handler/InstanceStateHandler.java
@@ -59,7 +59,7 @@ public void process(Element element, HasInstanceState holder) {
 		JBlock saveStateBody = holder.getSaveStateMethodBody();
 		JVar saveStateBundleParam = holder.getSaveStateBundleParam();
 		JMethod restoreStateMethod = holder.getRestoreStateMethod();
-		JBlock restoreStateBody = restoreStateMethod.body();
+		JBlock restoreStateBody = holder.getRestoreStateMethodBody();
 		JVar restoreStateBundleParam = holder.getRestoreStateBundleParam();

 		TypeMirror type = codeModelHelper.getActualType(element, holder);