Merge pull request #1025 from cocoa-mhlw/feature/diagnosis-api-v3

use diagnosis api v3
cocoa-mhlw · Jun 1, 2022 · dd9b150 · dd9b150
2 parents 437f4df + a53e40c
commit dd9b150
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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; }
         }
     }