Skip to content
Snippets Groups Projects
Unverified Commit 6c3ec34c authored by Juraj Kusnier's avatar Juraj Kusnier Committed by GitHub
Browse files

Remove app shortcut during submission process (TAN) (EXPOSUREAPP-5425) #2493

parent d5def0f8
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment ...@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentSubmissionTestResultPositiveNoConsentBinding import de.rki.coronawarnapp.databinding.FragmentSubmissionTestResultPositiveNoConsentBinding
import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper
import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.doNavigate
import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.viewBindingLazy import de.rki.coronawarnapp.util.ui.viewBindingLazy
...@@ -24,6 +25,7 @@ class SubmissionTestResultNoConsentFragment : ...@@ -24,6 +25,7 @@ class SubmissionTestResultNoConsentFragment :
Fragment(R.layout.fragment_submission_test_result_positive_no_consent), Fragment(R.layout.fragment_submission_test_result_positive_no_consent),
AutoInject { AutoInject {
@Inject lateinit var appShortcutsHelper: AppShortcutsHelper
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
private val viewModel: SubmissionTestResultNoConsentViewModel by cwaViewModels { viewModelFactory } private val viewModel: SubmissionTestResultNoConsentViewModel by cwaViewModels { viewModelFactory }
private val binding: FragmentSubmissionTestResultPositiveNoConsentBinding by viewBindingLazy() private val binding: FragmentSubmissionTestResultPositiveNoConsentBinding by viewBindingLazy()
...@@ -58,6 +60,7 @@ class SubmissionTestResultNoConsentFragment : ...@@ -58,6 +60,7 @@ class SubmissionTestResultNoConsentFragment :
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
appShortcutsHelper.removeAppShortcut()
viewModel.onTestOpened() viewModel.onTestOpened()
binding.submissionTestResultContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT) binding.submissionTestResultContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
} }
......
...@@ -11,6 +11,7 @@ import de.rki.coronawarnapp.tracing.ui.TracingConsentDialog ...@@ -11,6 +11,7 @@ import de.rki.coronawarnapp.tracing.ui.TracingConsentDialog
import de.rki.coronawarnapp.ui.submission.SubmissionBlockingDialog import de.rki.coronawarnapp.ui.submission.SubmissionBlockingDialog
import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.di.AutoInject import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper
import de.rki.coronawarnapp.util.ui.doNavigate import de.rki.coronawarnapp.util.ui.doNavigate
import de.rki.coronawarnapp.util.ui.observe2 import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.viewBindingLazy import de.rki.coronawarnapp.util.ui.viewBindingLazy
...@@ -25,6 +26,7 @@ import javax.inject.Inject ...@@ -25,6 +26,7 @@ import javax.inject.Inject
class SubmissionResultPositiveOtherWarningNoConsentFragment : class SubmissionResultPositiveOtherWarningNoConsentFragment :
Fragment(R.layout.fragment_submission_no_consent_positive_other_warning), AutoInject { Fragment(R.layout.fragment_submission_no_consent_positive_other_warning), AutoInject {
@Inject lateinit var appShortcutsHelper: AppShortcutsHelper
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
private val viewModel: SubmissionResultPositiveOtherWarningNoConsentViewModel by cwaViewModelsAssisted( private val viewModel: SubmissionResultPositiveOtherWarningNoConsentViewModel by cwaViewModelsAssisted(
factoryProducer = { viewModelFactory }, factoryProducer = { viewModelFactory },
...@@ -90,6 +92,7 @@ class SubmissionResultPositiveOtherWarningNoConsentFragment : ...@@ -90,6 +92,7 @@ class SubmissionResultPositiveOtherWarningNoConsentFragment :
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
viewModel.onResume() viewModel.onResume()
appShortcutsHelper.removeAppShortcut()
binding.submissionPositiveOtherPrivacyContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT) binding.submissionPositiveOtherPrivacyContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
} }
......
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