From 1aab6f57ce4b9425fe9fc1d5f56ce2385d3aae2b Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Thu, 24 Apr 2014 18:50:20 +0000
Subject: [PATCH] a better solution for restoring the state of the main
 activity when the device is flipped. This one doesn't require hacks.

---
 .../res/layout/first_person_utterance.xml     |  1 -
 .../ui/android/ConversationView.java          | 31 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/ui/android/res/layout/first_person_utterance.xml b/src/ui/android/res/layout/first_person_utterance.xml
index be3b0eb08..97171149c 100644
--- a/src/ui/android/res/layout/first_person_utterance.xml
+++ b/src/ui/android/res/layout/first_person_utterance.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <EditText xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/input_text"
 	android:layout_height="wrap_content"
 	android:layout_width="wrap_content"
 	android:layout_marginBottom="16dp"
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
index 5800498fe..a69821528 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
@@ -205,26 +205,21 @@ public class ConversationView extends ScrollView {
     }
 
 	public void restoreConversation(Bundle state) {
-		final ArrayList<String> firstPersonUtterances  = state.getStringArrayList("first_person_uterances");
-		final ArrayList<String> secondPersonUtterances = state.getStringArrayList("second_person_uterances");
-		final ArrayList<Object> translationAlternatives= (ArrayList<Object>) state.getSerializable("translation_alternatives");
+		ArrayList<String> firstPersonUtterances  = state.getStringArrayList("first_person_uterances");
+		ArrayList<String> secondPersonUtterances = state.getStringArrayList("second_person_uterances");
+		ArrayList<Object> translationAlternatives= (ArrayList<Object>) state.getSerializable("translation_alternatives");
 
-		post(new Runnable() {
-			@Override
-			public void run() {
-				int i = 0;
-				while (i < firstPersonUtterances.size() && 
-					   i < Math.min(secondPersonUtterances.size(), translationAlternatives.size())) {
-					String text = firstPersonUtterances.get(i);
-					addFirstPersonUtterance(text, false);
+		int i = 0;
+		while (i < firstPersonUtterances.size() && 
+			   i < Math.min(secondPersonUtterances.size(), translationAlternatives.size())) {
+			String text = firstPersonUtterances.get(i);
+			addFirstPersonUtterance(text, false);
 
-					String translation  = secondPersonUtterances.get(i);
-					Object alternatives = translationAlternatives.get(i);
-					addSecondPersonUtterance(text, translation, alternatives);
+			String translation  = secondPersonUtterances.get(i);
+			Object alternatives = translationAlternatives.get(i);
+			addSecondPersonUtterance(text, translation, alternatives);
 
-					i++;
-				}
-			}
-		});		
+			i++;
+		}
 	}
 }