Add persistance of timestamp and whether user is allowed to submit keys (#74)

* Store timestamp of receiving registration token

* also reset this timestamp when deleting the registration token

* use correct timestamp for display of test time

* replace tracing activation time by test result reception time

* rename TAN request to match context

* set isAllowedToSubmitDiagnosisKeys properly

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt

@@ -192,7 +192,7 @@ object WebRequestBuilder {
     ) =
         suspendCoroutine<String> { cont ->
             val requestID = UUID.randomUUID()
-            val getTestResultRequest =
+            val getTANRequest =
                 TanRequest(
                     url,
                     requestID,
@@ -209,7 +209,7 @@ object WebRequestBuilder {
                     },
                     RequestErrorListener(requestID, cont)
                 )
-            RequestQueueHolder.addToRequestQueue(getTestResultRequest)
+            RequestQueueHolder.addToRequestQueue(getTANRequest)
             Log.d(TAG, "$requestID: Added $url to queue.")
         }
 

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/submission/SubmissionService.kt

@@ -22,6 +22,7 @@ object SubmissionService {
             testTAN != null -> asyncRegisterDeviceViaTAN(testTAN)
             else -> throw NoGUIDOrTANSetException()
         }
+        LocalData.devicePairingSuccessfulTimestamp(System.currentTimeMillis())
     }
 
     private suspend fun asyncRegisterDeviceViaGUID(guid: String) {
@@ -73,6 +74,7 @@ object SubmissionService {
 
     fun deleteRegistrationToken() {
         LocalData.registrationToken(null)
+        LocalData.devicePairingSuccessfulTimestamp(0L)
     }
 
     private fun deleteAuthCode() {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt

@@ -386,6 +386,24 @@ object LocalData {
         return timestamp
     }
 
+    fun devicePairingSuccessfulTimestamp(value: Long) =
+        with(getSharedPreferenceInstance().edit()) {
+            putLong(
+                CoronaWarnApplication.getAppContext()
+                    .getString(R.string.preference_device_pairing_successful_time),
+                value
+            )
+            commit()
+        }
+
+    fun devicePairingSuccessfulTimestamp(): Long? {
+        return getSharedPreferenceInstance().getLong(
+            CoronaWarnApplication.getAppContext()
+                .getString(R.string.preference_device_pairing_successful_time),
+            0L
+        )
+    }
+
     fun numberOfSuccessfulSubmissions(value: Int) =
         getSharedPreferenceInstance().edit(true) {
             putInt(

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt

@@ -19,12 +19,14 @@ object SubmissionRepository {
         val testResultValue =
             WebRequestBuilder.asyncGetTestResult(TEST_RESULT_URL, registrationToken)
         testResult.value = TestResult.fromInt(testResultValue)
-
+        if (testResult == TestResult.POSITIVE) {
+            LocalData.isAllowedToSubmitDiagnosisKeys(true)
+        }
         val initialTestResultReceivedTimestamp = LocalData.inititalTestResultReceivedTimestamp()
 
         if (initialTestResultReceivedTimestamp == null) {
             val currentTime = System.currentTimeMillis()
-            LocalData.initialTracingActivationTimestamp(currentTime)
+            LocalData.inititalTestResultReceivedTimestamp(currentTime)
             testResultReceivedDate.value = Date(currentTime)
         } else {
             testResultReceivedDate.value = Date(initialTestResultReceivedTimestamp)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt

@@ -60,6 +60,8 @@ class SubmissionViewModel : ViewModel() {
     fun deregisterTestFromDevice() {
         deleteTestGUID()
         SubmissionService.deleteRegistrationToken()
+        LocalData.isAllowedToSubmitDiagnosisKeys(false)
+        LocalData.inititalTestResultReceivedTimestamp(0L)
     }
 
     private fun executeRequestWithState(apiRequest: suspend () -> Unit, state: MutableLiveData<ApiRequestState>) {

Corona-Warn-App/src/main/res/values/strings.xml

@@ -47,6 +47,9 @@
     <string name="preference_m_registration_token">
         <xliff:g id="preference">preference_m_registration_token</xliff:g>
     </string>
+    <string name="preference_device_pairing_successful_time">
+        <xliff:g id="preference">preference_device_pairing_successful_time</xliff:g>
+    </string>
     <string name="preference_initial_tracing_activation_time">
         <xliff:g id="preference">preference_initial_tracing_activation_time</xliff:g>
     </string>