ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

added email field to sync daemon. issue 39

Browse source
This commit is contained in:
Ziver Koc 2016-11-16 21:29:55 +01:00
parent a55064846f
commit dfa07de6c8
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/se/hal/deamon/PCDataSynchronizationClient.java
View file

@ -66,6 +66,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
out.writeObject(new PeerDataReqDTO()); out.writeObject(new PeerDataReqDTO());
PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject(); PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject();
user.setUsername(peerData.username); user.setUsername(peerData.username);
user.setEmail(peerData.email);
user.setAddress(peerData.address); user.setAddress(peerData.address);
user.save(db); user.save(db);

4
src/se/hal/deamon/PCDataSynchronizationDaemon.java
View file

@ -29,7 +29,7 @@ import java.util.logging.Logger;
public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon { public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon {
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
public static final int PROTOCOL_VERSION = 4; public static final int PROTOCOL_VERSION = 5; // Increment for protocol changes
public PCDataSynchronizationDaemon() { public PCDataSynchronizationDaemon() {
@ -81,6 +81,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
PeerDataRspDTO rsp = new PeerDataRspDTO(); PeerDataRspDTO rsp = new PeerDataRspDTO();
User localUser = User.getLocalUser(db); User localUser = User.getLocalUser(db);
rsp.username = localUser.getUsername(); rsp.username = localUser.getUsername();
rsp.email = localUser.getEmail();
rsp.address = localUser.getAddress(); rsp.address = localUser.getAddress();
rsp.sensors = new ArrayList<>(); rsp.sensors = new ArrayList<>();
@ -151,6 +152,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
/////////////// DTO /////////////////////// /////////////// DTO ///////////////////////
protected static class PeerDataRspDTO implements Serializable{ protected static class PeerDataRspDTO implements Serializable{
public String username; public String username;
public String email;
public String address; public String address;
public ArrayList<SensorDTO> sensors; public ArrayList<SensorDTO> sensors;