diff --git a/app/src/main/java/lightcontainer/storage/JsonAdapter.java b/app/src/main/java/lightcontainer/storage/JsonAdapter.java index 026dc37..c54722c 100644 --- a/app/src/main/java/lightcontainer/storage/JsonAdapter.java +++ b/app/src/main/java/lightcontainer/storage/JsonAdapter.java @@ -13,7 +13,7 @@ public class JsonAdapter implements Adapter { * @return A Json String containing AppData properties */ @Override - public String toString(AppData appData) { + public synchronized String toString(AppData appData) { return addData(appData); } diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index 8a76dfd..3de13f0 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -1 +1,80 @@ -{"unicast_port":8000,"multicast_ip":"226.66.66.1","multicast_port":15502,"network_interface":"My network interface","tls":true,"storagePath":"/home/benjamin/ffe","users":[{"name":"endmove","password":"1f82407cace28cd7d97d23f82e8235d9da97575d033a12334fc71d3517f6a90fa04af829df3c722c38d3b68842e4ca2b","aes_key":"p0G+iViPp656O6aMKgcXSDT/e9/00wQH/ztUWf4tyr4=","passwordSalt":"ItYiXkwPa84Gwb6dGHQvXQ==","files":[]},{"name":"aaaaa","password":"5d628c274ebb008324f1e199d3bfff0a3fe839730a7f2355e82850d7acca5e5ca64db9071abf3d91034295695f84a617","aes_key":"qlTH6TijnfMRnrS0Qf+k6IPKGp5LoRMXGxCq16e+mF4=","passwordSalt":"Ns8Al6DpqPsIDlCSRBVTEg==","files":[{"name":"ca.crt","fileNameSalt":"Mjo7iQeEl2PYX1RDUZbSlQ==","size":4207,"iv":"uALI+Feo1lIg1lBxbCMwIQ==","storage":["lightcontainerSB01"]},{"name":"main.py","fileNameSalt":"YRwnBiXINCJ+zyxwADgNRQ==","size":854,"iv":"9LXrJFtcgU4DeUBghc4Dgw==","storage":["lightcontainerSB01"]}]}]} \ No newline at end of file +{ + "unicast_port": 8000, + "multicast_ip": "226.66.66.1", + "multicast_port": 15502, + "network_interface": "My network interface", + "tls": true, + "storagePath": "/home/benjamin/ffe", + "users": [ + { + "name": "endmove", + "password": "1f82407cace28cd7d97d23f82e8235d9da97575d033a12334fc71d3517f6a90fa04af829df3c722c38d3b68842e4ca2b", + "aes_key": "p0G+iViPp656O6aMKgcXSDT/e9/00wQH/ztUWf4tyr4=", + "passwordSalt": "ItYiXkwPa84Gwb6dGHQvXQ==", + "files": [ + { + "name": "ca.crt", + "fileNameSalt": "aLLsH6DvoSUj7o8oGuBxhw==", + "size": 4207, + "iv": "MShYLgwYd8SHDK6FifpORg==", + "storage": [ + "lightcontainerSB01" + ] + }, + { + "name": "main.py", + "fileNameSalt": "mtyoHXGKxT0DL+1EF+RhSw==", + "size": 854, + "iv": "tnJyZHlVvboRl8uD9HWDow==", + "storage": [ + "lightcontainerSB01" + ] + }, + { + "name": "README.md", + "fileNameSalt": "ZpiL943DSaBgBbLXNsw1rw==", + "size": 17, + "iv": "1eDj0cCSHWGZzBG96ugR1A==", + "storage": [ + "lightcontainerSB01" + ] + } + ] + }, + { + "name": "aaaaa", + "password": "5d628c274ebb008324f1e199d3bfff0a3fe839730a7f2355e82850d7acca5e5ca64db9071abf3d91034295695f84a617", + "aes_key": "qlTH6TijnfMRnrS0Qf+k6IPKGp5LoRMXGxCq16e+mF4=", + "passwordSalt": "Ns8Al6DpqPsIDlCSRBVTEg==", + "files": [ + { + "name": "ca.crt", + "fileNameSalt": "woKUXAfV5cNodEH8O7h5kA==", + "size": 4207, + "iv": "Cy3rbfGdXuLf0aT+LS1wsA==", + "storage": [ + "lightcontainerSB01" + ] + }, + { + "name": "main.py", + "fileNameSalt": "YRwnBiXINCJ+zyxwADgNRQ==", + "size": 854, + "iv": "9LXrJFtcgU4DeUBghc4Dgw==", + "storage": [ + "lightcontainerSB01" + ] + }, + { + "name": "README.md", + "fileNameSalt": "/upxjjFW8GUayXngbfV3fA==", + "size": 17, + "iv": "QCkcjqYsUfWAE0klUTVTzQ==", + "storage": [ + "lightcontainerSB01" + ] + } + ] + } + ] +} \ No newline at end of file