diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/EraseErrorRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/EraseErrorRule.java index 1ce0b0b..cb25c5e 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/EraseErrorRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/EraseErrorRule.java @@ -3,11 +3,14 @@ package lightcontainer.protocol.rules.reader; import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; +import lightcontainer.protocol.StandardizedDefinitions; import lightcontainer.protocol.rules.writer.RemoveFileErrorRule; -public class EraseErrorRule extends ProtocolReader { +import static lightcontainer.protocol.StandardizedDefinitions.SBE_ERASE_RESULT_ERROR; - private static final String PATTERN = "^ERASE_ERROR\r\n$"; +public class EraseErrorRule extends ProtocolReader { + //"^ERASE_ERROR\r\n$" + private static final String PATTERN = SBE_ERASE_RESULT_ERROR; private static final String NAME = "ERASE_ERROR"; diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java index c1ec1b1..4cd2e57 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java @@ -19,7 +19,7 @@ import java.io.InputStream; */ public class SavefileRule extends ProtocolReader { // Constants - private static final String PATTERN = "^SAVE_FILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$"; + private static final String PATTERN = "^SAVEFILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$"; private static final String NAME = "SAVEFILE"; diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index a99218c..e781d45 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -10,7 +10,17 @@ "name": "aaaaa", "password": "$2a$10$Tuh5xmGEy0g26hQO1SHNY.TNy8rY9VCkpzRLP3rlpnVHtwYew4.km", "aes_key": "a68CqbWmmf0cuvgvMhm9OC+Y24ut3DY/0WBqtd3nGfU=", - "files": [] + "files": [ + { + "name": "test.txt", + "fileNameSalt": "a+Nyu4hArJSdKdG6EvdxjQ==", + "size": 301, + "iv": "dzQdyPXANcb8sToyY84YzA==", + "storage": [ + "lightcontainerSB01" + ] + } + ] } ] } \ No newline at end of file