From 69500593f80965700e9e8054d2c788ead9dadb70 Mon Sep 17 00:00:00 2001
From: CWA Technical User
<67319337+Corona-Warn-App-Technical-User@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:10:38 +0200
Subject: [PATCH] Protocol Buffer update for release 2.1.x at Sat Apr 10
09:22:53 UTC 2021 (#2799)
* Update from https://github.com/corona-warn-app/cwa-protocol-buffers/commit/3933969897a5aee2b1259e961eb4ec6ed587674e
* Update from https://github.com/corona-warn-app/cwa-protocol-buffers/commit/766532dbd5f9f27b5279b69d00fd0dc89369d56d
---
.../main/proto/internal/submission_payload.proto | 6 ++++++
.../main/proto/internal/v2/app_config_android.proto | 2 ++
.../src/main/proto/internal/v2/app_config_ios.proto | 3 +++
.../proto/internal/v2/corona_test_parameters.proto | 13 +++++++++++++
4 files changed, 24 insertions(+)
create mode 100644 Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto b/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
index c307356d2..bd159f8d4 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
@@ -12,4 +12,10 @@ message SubmissionPayload {
optional string origin = 4;
optional bool consentToFederation = 5;
repeated de.rki.coronawarnapp.server.protocols.internal.pt.CheckIn checkIns = 6;
+ optional SubmissionType submissionType = 7 [default = SUBMISSION_TYPE_PCR_TEST];
+
+ enum SubmissionType {
+ SUBMISSION_TYPE_PCR_TEST = 0;
+ SUBMISSION_TYPE_RAPID_TEST = 1;
+ }
}
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
index 910b687cd..4eb56db06 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
package de.rki.coronawarnapp.server.protocols.internal.v2;
import "internal/v2/app_features.proto";
+import "internal/v2/corona_test_parameters.proto";
import "internal/v2/exposure_detection_parameters.proto";
import "internal/v2/key_download_parameters.proto";
import "internal/v2/ppdd_edus_parameters.proto";
@@ -36,6 +37,7 @@ message ApplicationConfigurationAndroid {
PresenceTracingParameters presenceTracingParameters = 13;
+ CoronaTestParameters coronaTestParameters = 14;
}
message DiagnosisKeysDataMapping {
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
index 903269ff8..98c90fa8b 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
package de.rki.coronawarnapp.server.protocols.internal.v2;
import "internal/v2/app_features.proto";
+import "internal/v2/corona_test_parameters.proto";
import "internal/v2/exposure_detection_parameters.proto";
import "internal/v2/key_download_parameters.proto";
import "internal/v2/ppdd_edus_parameters.proto";
@@ -34,6 +35,8 @@ message ApplicationConfigurationIOS {
PPDDErrorLogSharingParametersIOS errorLogSharingParameters = 11;
PresenceTracingParameters presenceTracingParameters = 12;
+
+ CoronaTestParameters coronaTestParameters = 13;
}
message ExposureConfiguration {
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto
new file mode 100644
index 000000000..4b8664b47
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto
@@ -0,0 +1,13 @@
+// This file is auto-generated, DO NOT make any changes here
+syntax = "proto3";
+package de.rki.coronawarnapp.server.protocols.internal.v2;
+
+
+message CoronaTestParameters {
+
+ CoronaRapidAntigenTestParameters coronaRapidAntigenTestParameters = 1;
+}
+
+message CoronaRapidAntigenTestParameters {
+ uint32 hoursToDeemTestOutdated = 1;
+}
\ No newline at end of file
--
GitLab