Skip to content
Snippets Groups Projects
Unverified Commit 707c8fa3 authored by Rituraj Sambherao's avatar Rituraj Sambherao Committed by GitHub
Browse files

Fix/submission error dialog (#791)


* submission error dialog

* submission_error_dialog_german_strings_added

* submission error dialog unit test added

* pipeline related changes

* code review changes

* integration test added for No diagnosisKey available:

Test added for No Diagnosis key available

* No submission keys error sliently handled

* silently handled no key error submission

1. Removed  unceccesary strings
2. redirection to SubmissionDoneFragment when there are no keys available
3. removed navigation action for SubmissionResultPositiveOtherWarningFragment to MainFragment

* code ruse and test case removed at it was not needed

* removed unused import

* comment adjusted

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: default avatarPhilipp Woessner <64482866+pwoessner@users.noreply.github.com>
parent b19e00a5
No related branches found
No related tags found
No related merge requests found
...@@ -129,10 +129,7 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(), ...@@ -129,10 +129,7 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(),
submissionViewModel.submissionState.observe(viewLifecycleOwner, Observer { submissionViewModel.submissionState.observe(viewLifecycleOwner, Observer {
if (it == ApiRequestState.SUCCESS) { if (it == ApiRequestState.SUCCESS) {
findNavController().doNavigate( navigateToSubmissionDoneFragment()
SubmissionResultPositiveOtherWarningFragmentDirections
.actionSubmissionResultPositiveOtherWarningFragmentToSubmissionDoneFragment()
)
} }
}) })
} }
...@@ -152,6 +149,16 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(), ...@@ -152,6 +149,16 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(),
.actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment() .actionSubmissionResultPositiveOtherWarningFragmentToSubmissionResultFragment()
) )
/**
* Navigate to submission done Fragment
* @see SubmissionDoneFragment
*/
private fun navigateToSubmissionDoneFragment() =
findNavController().doNavigate(
SubmissionResultPositiveOtherWarningFragmentDirections
.actionSubmissionResultPositiveOtherWarningFragmentToSubmissionDoneFragment()
)
private fun initiateWarningOthers() { private fun initiateWarningOthers() {
if (tracingViewModel.isTracingEnabled.value != true) { if (tracingViewModel.isTracingEnabled.value != true) {
val tracingRequiredDialog = DialogHelper.DialogInstance( val tracingRequiredDialog = DialogHelper.DialogInstance(
...@@ -177,7 +184,11 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(), ...@@ -177,7 +184,11 @@ class SubmissionResultPositiveOtherWarningFragment : Fragment(),
// InternalExposureNotificationPermissionHelper - callbacks // InternalExposureNotificationPermissionHelper - callbacks
override fun onKeySharePermissionGranted(keys: List<TemporaryExposureKey>) { override fun onKeySharePermissionGranted(keys: List<TemporaryExposureKey>) {
super.onKeySharePermissionGranted(keys) super.onKeySharePermissionGranted(keys)
submissionViewModel.submitDiagnosisKeys(keys) if (keys.isNotEmpty()) {
submissionViewModel.submitDiagnosisKeys(keys)
} else {
navigateToSubmissionDoneFragment()
}
} }
override fun onFailure(exception: Exception?) { override fun onFailure(exception: Exception?) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment