From 2fadea13bc85e1e9b3d0b11beed368417d9ff8cc Mon Sep 17 00:00:00 2001 From: chrqls Date: Wed, 11 Dec 2013 02:03:20 -0800 Subject: [PATCH] [#53] Removing crash when we close or hit back button in 'use prepared questions' --- .../smile/ui/ChooseActivityFlowDialog.java | 2 +- .../smile/ui/UsePreparedQuestionsActivity.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java b/src/main/java/org/smilec/smile/ui/ChooseActivityFlowDialog.java index d846d48..5aa7487 100644 --- 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 index 2373a1d..8403ff0 100644 --- 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(); }