From dedfeeff7d51122e4893f3461647893a32dfa1ef Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Sat, 19 Mar 2022 12:44:31 +0100 Subject: [PATCH] =?UTF-8?q?Nouvelles=20Regex=20:=20ERASE=5FRESULT=5FOK=20v?= =?UTF-8?q?alid=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/rules/reader/EraseOkRule.java | 4 +++- app/src/main/resources/appdata.json | 12 +----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/EraseOkRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/EraseOkRule.java index 9125c7a..04c9ab7 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/EraseOkRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/EraseOkRule.java @@ -5,9 +5,11 @@ import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; import lightcontainer.protocol.rules.writer.RemoveFileOkRule; +import static lightcontainer.protocol.StandardizedDefinitions.SBE_ERASE_RESULT_OK; + public class EraseOkRule extends ProtocolReader { - private static final String PATTERN = "^ERASE_OK\r\n$"; + private static final String PATTERN = SBE_ERASE_RESULT_OK; private static final String NAME = "ERASE_OK"; diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index e781d45..a99218c 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -10,17 +10,7 @@ "name": "aaaaa", "password": "$2a$10$Tuh5xmGEy0g26hQO1SHNY.TNy8rY9VCkpzRLP3rlpnVHtwYew4.km", "aes_key": "a68CqbWmmf0cuvgvMhm9OC+Y24ut3DY/0WBqtd3nGfU=", - "files": [ - { - "name": "test.txt", - "fileNameSalt": "a+Nyu4hArJSdKdG6EvdxjQ==", - "size": 301, - "iv": "dzQdyPXANcb8sToyY84YzA==", - "storage": [ - "lightcontainerSB01" - ] - } - ] + "files": [] } ] } \ No newline at end of file