Merge pull request #45 from chrqls/dev

[#40] After a reset, there is no more "Session already running" popup
RazortoothRTC · Nov 15, 2013 · b700e0f · b700e0f
2 parents a9562b8 + 4e6fa88
commit b700e0f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 /bin
 
 lint.xml
+smiledb-test/
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -72,6 +72,7 @@
 
 	<string name="starting">Starting...</string>
 	<string name="solving">Solving...</string>
+	<string name="recovering">Recovering...</string>
 
 	<string name="question_number">Question Number</string>
 	<string name="correct_answer">Correct Answer</string>

diff --git a/src/main/java/org/smilec/smile/bu/SmilePlugServerManager.java b/src/main/java/org/smilec/smile/bu/SmilePlugServerManager.java
@@ -43,7 +43,6 @@
 
 public class SmilePlugServerManager extends AbstractBaseManager {
 
-    // XXX TODO: Add arguments to take Teacher Name, Session Name, and Group Name
     public void startMakingQuestions(String ip, Context context) throws NetworkErrorException {
         String url = SmilePlugUtil.createUrl(ip, SmilePlugUtil.START_MAKING_QUESTIONS_URL);
         put(ip, context, url, "{}");
@@ -86,6 +85,7 @@ public void resetGame(String ip, Context context) throws NetworkErrorException {
 
     }
 
+    // XXX TODO: Add arguments to take Teacher Name, Session Name, and Group Name
     public void createSession(String ip, String teacherName, String sessionTitle, String groupName, Context context) throws NetworkErrorException {
 
     	String url = SmilePlugUtil.createUrl(ip, SmilePlugUtil.CREATE_SESSION);

diff --git a/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java b/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java
@@ -98,26 +98,25 @@ private class StartButtonListener implements OnClickListener {
 
         @Override
         public void onClick(View v) {
-            if (status != null) {
-                if (!status.equals("")) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(
-                        ChooseActivityFlowDialog.this);
-                    builder.setMessage(R.string.game_running).setCancelable(false)
-                        .setNeutralButton("Ok", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int id) {
-                                new LoadTask(ChooseActivityFlowDialog.this).execute();
-                            }
-                        });
-                    AlertDialog alert = builder.create();
-                    alert.show();
-                } else {
-                    new LoadTask(ChooseActivityFlowDialog.this).execute();
-                }
+
+            if (status != null && !status.equals("") && !status.equals("RESET")) {
+
+//                AlertDialog.Builder builder = new AlertDialog.Builder(ChooseActivityFlowDialog.this);
+//                builder.setMessage(R.string.game_running).setCancelable(false).setNeutralButton("Ok", new DialogInterface.OnClickListener() {
+//                	
+//                        @Override
+//                        public void onClick(DialogInterface dialog, int id) {
+//                            new LoadTask(ChooseActivityFlowDialog.this).execute();
+//                        }
+//                    });
+                new LoadTask(ChooseActivityFlowDialog.this).execute();
+                ActivityUtil.showLongToast(ChooseActivityFlowDialog.this, R.string.recovering);
+//                AlertDialog alert = builder.create();
+//                alert.show();
             } else {
                 new LoadTask(ChooseActivityFlowDialog.this).execute();
+                ActivityUtil.showLongToast(ChooseActivityFlowDialog.this, R.string.starting);
             }
-            ActivityUtil.showLongToast(ChooseActivityFlowDialog.this, R.string.starting);
         }
     }