From 525c378c5f141360e5f34231726c7761963f4c90 Mon Sep 17 00:00:00 2001
From: "David J. Kordsmeier" <dkords@gmail.com>
Date: Wed, 11 Dec 2013 07:51:04 -0800
Subject: [PATCH] refs #73,#40 Get rid of the "already started" message. 
 Shouldn't happen on a new session when you start from preloaded question. 
 Also add version #

---
 AndroidManifest.xml                                         | 4 ++--
 res/values/strings.xml                                      | 6 +++---
 .../org/smilec/smile/ui/UsePreparedQuestionsActivity.java   | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed37684..f9e0eec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.smilec.smile"
-	android:versionCode="5"
-	android:versionName="0.2.11">
+	android:versionCode="6"
+	android:versionName="0.3.1">
 
 	<uses-sdk android:minSdkVersion="7" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22090d8..7036e7c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -49,14 +49,14 @@
 	<string name="top_scores">TOP SCORER</string>
 
 	<string name="about">About</string>
-	<string name="about_text">SMILE Teacher SMILE Teacher Desktop App 0.2.7:  The activity management application for teachers,
+	<string name="about_text">SMILE Teacher App 0.3.1:  The activity management application for teachers,
 	called the SMILE Teacher, serves to manage and
 	save data from the activity via an ad-hoc network. It is a
 	Graphic User Interface-based application that can be
 	launched on an Android tablet in conjuction with a the Server
 	running on a PlugComputer. The application
-	allows the teacher to control and monitor all of the students’
-	activity in real time. It also allows the teacher to save the
+	allows the teacher to facilitate inquiry-based learning in a collaborative environment
+    It also allows the teacher to save the
 	data from a given learning activity for later access.</string>
 	<string name="ok">OK</string>
 
diff --git a/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java b/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java
index 8403ff0..ec38a1a 100644
--- a/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java
+++ b/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java
@@ -55,6 +55,7 @@
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.util.Log;
 
 public class UsePreparedQuestionsActivity extends ListActivity {
 
@@ -164,7 +165,8 @@ private class LoadButtonListener implements OnClickListener {
         @Override
         public void onClick(View v) {
             if (status != null) {
-                if (!status.equals("")) {
+                Log.d("SMILE Teacher", "Status = " + status);
+                if (!status.equals("") && !status.equals("START_MAKE")) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(
                         UsePreparedQuestionsActivity.this);
                     builder.setMessage(R.string.game_running).setCancelable(false)