Merge pull request #71 from chrqls/dev

[#53] Removing crash in 'use prepared questions'
SMILEConsortium · Dec 11, 2013 · db2420d · db2420d
2 parents ad88f90 + 2fadea1
commit db2420d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java b/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java
@@ -135,7 +135,7 @@ public void onClick(View v) {
             intent.putExtra(GeneralActivity.PARAM_RESULTS, results);
             intent.putExtra(GeneralActivity.PARAM_STATUS, status);
             startActivity(intent);
-            ChooseActivityFlowDialog.this.finish();
+            //ChooseActivityFlowDialog.this.finish();
         }
     }
 

diff --git a/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java b/src/main/java/org/smilec/smile/ui/UsePreparedQuestionsActivity.java
@@ -279,15 +279,15 @@ private void clearSelection() {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-
-        //if (fileQuestionsList.length == 0) {
-        if (iqsets.size() == 0) {
-            Intent intent = new Intent(this, ChooseActivityFlowDialog.class);
-            intent.putExtra(GeneralActivity.PARAM_IP, ip);
-            intent.putExtra(GeneralActivity.PARAM_RESULTS, results);
-            startActivity(intent);
-        }
-
+        
+        // TODO Why does this condition exist?? (12/11/13)
+//        if (fileQuestionsList.length == 0) {
+//        if (iqsets.size() == 0) {
+//        Intent intent = new Intent(this, ChooseActivityFlowDialog.class);
+//        intent.putExtra(GeneralActivity.PARAM_IP, ip);
+//        intent.putExtra(GeneralActivity.PARAM_RESULTS, results);
+//        startActivity(intent);
+//        }
         this.finish();
     }