lightcontainer/FileFrontEnd
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Json adapter : AppData vers Json -> testé

Browse Source
This commit is contained in:
Maximilien LEDOUX
2022-03-08 11:00:36 +01:00
parent 2b2bdd3467
commit 558e4427fd
3 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/lightcontainer/storage/JsonAdapter.java
View File

@@ -28,7 +28,7 @@ public class JsonAdapter implements Adapter {
JsonArray users = new JsonArray();
Iterator<User> userIterator = appData.usersIterator();
addUsers(users, userIterator);
config.addProperty("users", users.toString());
config.add("users", users);
return config.toString();
}
@@ -41,13 +41,13 @@ public class JsonAdapter implements Adapter {
user.addProperty("aes_key", current.getAesKey());
JsonArray files = new JsonArray();
Iterator<File> fileIterator = current.fileIterator();
addFiles(fileIterator);
user.addProperty("files", files.toString());
addFiles(fileIterator, files);
user.add("files", files);
users.add(user);
}
}
private void addFiles(Iterator<File> fileIterator) {
private void addFiles(Iterator<File> fileIterator, JsonArray files) {
while (fileIterator.hasNext()) {
File currentFile = fileIterator.next();
JsonObject file = new JsonObject();
@@ -57,7 +57,8 @@ public class JsonAdapter implements Adapter {
JsonArray storage = new JsonArray();
Iterator<String> storageIterator = currentFile.getStorageIterator();
addStorage(storage, storageIterator);
file.addProperty("storage", storage.toString());
file.add("storage", storage);
files.add(file);
}
}