Disable shared flg

Covid-19Radar · Jul 12, 2020 · 4c4aca3 · 4c4aca3
1 parent 6b3ef73
commit 4c4aca3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/Covid19Radar/Covid19Radar/Model/PositiveDiagnosisState.cs b/Covid19Radar/Covid19Radar/Model/PositiveDiagnosisState.cs
@@ -8,6 +8,5 @@ public class PositiveDiagnosisState
 
 		public DateTimeOffset DiagnosisDate { get; set; }
 
-		public bool Shared { get; set; }
 	}
 }
diff --git a/Covid19Radar/Covid19Radar/Model/UserDataModel.cs b/Covid19Radar/Covid19Radar/Model/UserDataModel.cs
@@ -114,7 +114,7 @@ public void AddDiagnosis(string diagnosisUid, DateTimeOffset submissionDate)
                 return;
 
             // Remove ones that were not submitted as the new one is better
-            PositiveDiagnoses.RemoveAll(d => !d.Shared);
+            PositiveDiagnoses.Clear();
 
             PositiveDiagnoses.Add(new PositiveDiagnosisState
             {
@@ -128,13 +128,6 @@ public void ClearDiagnosis()
 
         public PositiveDiagnosisState LatestDiagnosis
             => PositiveDiagnoses
-                .Where(d => d.Shared)
-                .OrderByDescending(p => p.DiagnosisDate)
-                .FirstOrDefault();
-
-        public PositiveDiagnosisState PendingDiagnosis
-            => PositiveDiagnoses
-                .Where(d => !d.Shared)
                 .OrderByDescending(p => p.DiagnosisDate)
                 .FirstOrDefault();
 

diff --git a/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs b/Covid19Radar/Covid19Radar/Services/ExposureNotificationHandler.cs
@@ -222,14 +222,14 @@ public async Task FetchExposureKeyBatchFilesFromServerAsync(Func<IEnumerable<str
         // this will be called when the user is submitting a diagnosis and the local keys need to go to the server
         public async Task UploadSelfExposureKeysToServerAsync(IEnumerable<TemporaryExposureKey> temporaryExposureKeys)
         {
-            var pendingDiagnosis = userData.PendingDiagnosis;
+            var latestDiagnosis = userData.LatestDiagnosis;
 
-            if (pendingDiagnosis == null || string.IsNullOrEmpty(pendingDiagnosis.DiagnosisUid))
+            if (latestDiagnosis == null || string.IsNullOrEmpty(latestDiagnosis.DiagnosisUid))
             {
                 throw new InvalidOperationException();
             }
 
-            var selfDiag = await CreateSubmissionAsync(temporaryExposureKeys, pendingDiagnosis);
+            var selfDiag = await CreateSubmissionAsync(temporaryExposureKeys, latestDiagnosis);
 
             HttpStatusCode httpStatusCode = await httpDataService.PutSelfExposureKeysAsync(selfDiag);
             if (httpStatusCode == HttpStatusCode.NotAcceptable)
@@ -256,8 +256,6 @@ await UserDialogs.Instance.AlertAsync(
                     Resources.AppResources.ButtonOk);
                 throw new InvalidOperationException();
             }
-            // Update pending status
-            pendingDiagnosis.Shared = true;
             await userDataService.SetAsync(userData);
         }