From ba21c718ecd0c116d0f329e231c231d2f0f929d6 Mon Sep 17 00:00:00 2001
From: Gideon Okuro <gideonollonde@gmail.com>
Date: Fri, 24 Jan 2025 22:33:43 +0300
Subject: [PATCH] courses: smoother exams submissions (fixes #5104) (#5105)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 app/build.gradle                               |  4 ++--
 .../myplanet/ui/exam/TakeExamFragment.kt       | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index aadb6e9ddf..452049c972 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2234
-        versionName "0.22.34"
+        versionCode 2235
+        versionName "0.22.35"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/exam/TakeExamFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/exam/TakeExamFragment.kt
index af0183729a..07bf512914 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/exam/TakeExamFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/exam/TakeExamFragment.kt
@@ -197,15 +197,17 @@ class TakeExamFragment : BaseExamFragment(), View.OnClickListener, CompoundButto
 
     override fun onClick(view: View) {
         if (view.id == R.id.btn_submit) {
-            val type = questions?.get(currentIndex)?.type
-            showTextInput(type)
-            if (showErrorMessage(getString(R.string.please_select_write_your_answer_to_continue))) {
-                return
+            if (questions != null && currentIndex in 0 until (questions?.size ?: 0)) {
+                val type = questions?.get(currentIndex)?.type
+                showTextInput(type)
+                if (showErrorMessage(getString(R.string.please_select_write_your_answer_to_continue))) {
+                    return
+                }
+                val cont = updateAnsDb()
+                capturePhoto()
+                hideSoftKeyboard(requireActivity())
+                checkAnsAndContinue(cont)
             }
-            val cont = updateAnsDb()
-            capturePhoto()
-            hideSoftKeyboard(requireActivity())
-            checkAnsAndContinue(cont)
         }
     }