diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt index 6f2a1b4b719753cf830a3f455dcfb938cc6a9b3d..2bdf021dc13c4bf6aed4e915c1470272a20c10c3 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt @@ -45,12 +45,12 @@ internal class QrCodePosterTemplateServerTest : BaseTest() { createInstance().downloadQrCodePosterTemplate().apply { template.toStringUtf8().substring(0, 22) shouldBe "<vector xmlns:android=" - offsetX shouldBe 10 - offsetY shouldBe 10 + offsetX shouldBe 10.0f + offsetY shouldBe 10.0f qrCodeSideLength shouldBe 100 with(descriptionTextBox) { - offsetX shouldBe 10 - offsetY shouldBe 50 + offsetX shouldBe 0.0f + offsetY shouldBe 0.0f width shouldBe 100 height shouldBe 20 fontSize shouldBe 10 @@ -127,6 +127,7 @@ internal class QrCodePosterTemplateServerTest : BaseTest() { "</vector>\n""")) .build()*/ + // TODO update this bundle to send PDF file not XML private val POSTER_BUNDLE = ( "504b03040a000000080014867d52008c85fefb000000ab0100000a0000006578706f72742e62" + "696e7d90cf4bc33014c7071e949c0415bc0825bbc8685f9676edbad216440fbb78f61c9a6a8ae912da9089ff80ffb66957700e" + diff --git a/Server-Protocol-Buffer/src/main/proto/internal/pt/qr_code_poster_template.proto b/Server-Protocol-Buffer/src/main/proto/internal/pt/qr_code_poster_template.proto index 76a0b921cabfb724875d5ea13db33ca63dc39a51..6fdbbcdd9957131b034b0d8c5c6cecda1b1d447d 100644 --- a/Server-Protocol-Buffer/src/main/proto/internal/pt/qr_code_poster_template.proto +++ b/Server-Protocol-Buffer/src/main/proto/internal/pt/qr_code_poster_template.proto @@ -15,8 +15,8 @@ message QRCodePosterTemplateAndroid { QRCodeTextBoxAndroid descriptionTextBox = 5; message QRCodeTextBoxAndroid { - uint32 offsetX = 1; - uint32 offsetY = 2; + float offsetX = 1; + float offsetY = 2; uint32 width = 3; uint32 height = 4; diff --git a/Server-Protocol-Buffer/src/main/proto/internal/pt/trace_location.proto b/Server-Protocol-Buffer/src/main/proto/internal/pt/trace_location.proto index baf364df29eddd47d9dde80956f7b884b7225a20..d169f942a70706d1243379d263f70f69f657029d 100644 --- a/Server-Protocol-Buffer/src/main/proto/internal/pt/trace_location.proto +++ b/Server-Protocol-Buffer/src/main/proto/internal/pt/trace_location.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package de.rki.coronawarnapp.server.protocols.internal.pt; + message QRCodePayload { uint32 version = 1; TraceLocation locationData = 2;