diff --git a/exam/src/main/java/in/testpress/exam/ui/TestFragment.java b/exam/src/main/java/in/testpress/exam/ui/TestFragment.java index 903b30388..8dc2e7a2a 100644 --- a/exam/src/main/java/in/testpress/exam/ui/TestFragment.java +++ b/exam/src/main/java/in/testpress/exam/ui/TestFragment.java @@ -1547,25 +1547,40 @@ void showResumeExamDialog() { if (getActivity() == null) { return; } - resumeExamDialog = - new AlertDialog.Builder(getActivity(), R.style.TestpressAppCompatAlertDialogStyle) - .setCancelable(false) - .setMessage(R.string.testpress_exam_paused) - .setPositiveButton(R.string.testpress_resume, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - resumeExam(); - } - }) - .setNegativeButton(R.string.testpress_not_now, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - returnToHistory(); - } - }) - .show(); + if (exam != null && exam.isAttemptResumeDisabled()) { + resumeExamDialog = + new AlertDialog.Builder(getActivity(), R.style.TestpressAppCompatAlertDialogStyle) + .setCancelable(false) + .setMessage(R.string.testpress_exam_ended_due_to_interruption) + .setPositiveButton(R.string.testpress_ok, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + endExam(); + } + }) + .show(); + } else { + resumeExamDialog = + new AlertDialog.Builder(getActivity(), R.style.TestpressAppCompatAlertDialogStyle) + .setCancelable(false) + .setMessage(R.string.testpress_exam_paused) + .setPositiveButton(R.string.testpress_resume, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + resumeExam(); + } + }) + .setNegativeButton(R.string.testpress_not_now, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + returnToHistory(); + } + }) + .show(); + } } void resumeExam() { diff --git a/exam/src/main/res/values/strings.xml b/exam/src/main/res/values/strings.xml index d641d8edb..9c7797b03 100644 --- a/exam/src/main/res/values/strings.xml +++ b/exam/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ Exam not available This is no longer available or not published yet. Exam is paused, click resume to continue + You navigated away from the app, so your exam attempt has ended. Analytics @@ -78,6 +79,7 @@ Are you sure? Want to Pause the exam & resume later before the end date. Exit Exam? You can pause the exam & resume later before the end date. + OK Email MCQs