From a53e40c9d458dc630facf74b8376e5e47bf0b694 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 31 May 2022 15:05:58 +0900
Subject: [PATCH] use diagnosis api v3

---
 .../Covid19Radar.Android/Services/DeviceCheckService.cs     | 2 +-
 Covid19Radar/Covid19Radar/Common/AppConstants.cs            | 4 ++--
 .../Covid19Radar/Model/DiagnosisSubmissionParameter.cs      | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
index 9bf23bae2..81b48a26e 100644
--- a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
+++ b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
@@ -16,7 +16,7 @@ public class DeviceCheckService : IDeviceVerifier
     {
         public Task<string> VerifyAsync(DiagnosisSubmissionParameter submission)
         {
-            var nonce = DeviceVerifierUtils.CreateAndroidNonceV2(submission);
+            var nonce = DeviceVerifierUtils.CreateAndroidNonceV3(submission);
             return GetSafetyNetAttestationAsync(nonce);
         }
 
diff --git a/Covid19Radar/Covid19Radar/Common/AppConstants.cs b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
index 864659927..467ac036b 100644
--- a/Covid19Radar/Covid19Radar/Common/AppConstants.cs
+++ b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
@@ -28,7 +28,7 @@ public static readonly DateTime COCOA_FIRST_RELEASE_DATE
         /// <summary>
         /// Number of days covered from the date of diagnosis or onset
         /// </summary>
-        public const int DaysToSendTek = -3;
+        public const int DaysToSendTek = -15;
 
         /// <summary>
         /// Max Error Count
@@ -61,7 +61,7 @@ public static readonly DateTime COCOA_FIRST_RELEASE_DATE
         /// DiagnosisApi version.
         /// (e.g. v2, v3)
         /// </summary>
-        public const string DiagnosisApiVersionCode = "v2";
+        public const string DiagnosisApiVersionCode = "v3";
 
         /// <summary>
         /// Number of day(s) that ExposureConfiguration file downloaded cache.
diff --git a/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs b/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
index 2367de405..70a0b2ccd 100644
--- a/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
+++ b/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
@@ -28,8 +28,7 @@ public class DiagnosisSubmissionParameter
         [JsonProperty("verificationPayload")]
         public string VerificationPayload { get; set; }
 
-        //[JsonProperty("idempotency_key")]
-        [JsonIgnore]
+        [JsonProperty("idempotency_key")]
         public string IdempotencyKey { get; set; }
 
         // Random data to obscure the size of the request network packet sniffers.
@@ -45,8 +44,7 @@ public class Key
             [JsonProperty("rollingPeriod")]
             public uint RollingPeriod { get; set; }
 
-            //[JsonProperty("reportType")]
-            [JsonIgnore]
+            [JsonProperty("reportType")]
             public uint ReportType { get; set; }
         }
     }