diff --git a/app/build.gradle b/app/build.gradle index 6c97a21e8b..e24ce3ce4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1470 - versionName "0.14.70" + versionCode 1471 + versionName "0.14.71" 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/BaseExamFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt index d8aff69cdc..066186475c 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt @@ -113,7 +113,7 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback { AlertDialog.Builder(requireActivity()) .setTitle(getString(R.string.thank_you_for_taking_this) + type + getString(R.string.we_wish_you_all_the_best)) .setPositiveButton("Finish") { _: DialogInterface?, _: Int -> - requireActivity().onBackPressed() + parentFragmentManager.popBackStack() try { } catch (e: Exception) { e.printStackTrace() @@ -141,7 +141,7 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback { sub?.status = "complete" mRealm.commitTransaction() Utilities.toast(activity, getString(R.string.thank_you_for_taking_this_survey)) - requireActivity().onBackPressed() + parentFragmentManager.popBackStack() } } diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/exam/UserInformationFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/exam/UserInformationFragment.kt index dbed4ebb76..c4d652c6d4 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/exam/UserInformationFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/exam/UserInformationFragment.kt @@ -130,7 +130,7 @@ class UserInformationFragment : BaseDialogFragment(), View.OnClickListener { override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) Utilities.toast(activity, getString(R.string.thank_you_for_taking_this_survey)) - requireActivity().onBackPressed() + parentFragmentManager.popBackStack() } private fun showDatePickerDialog() {