From dfa07de6c8cb02f3677ced29f5e1327a997afc83 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 16 Nov 2016 21:29:55 +0100
Subject: [PATCH] added email field to sync daemon. issue 39

---
 src/se/hal/deamon/PCDataSynchronizationClient.java | 1 +
 src/se/hal/deamon/PCDataSynchronizationDaemon.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java
index d25743ab..37ae2326 100755
--- a/src/se/hal/deamon/PCDataSynchronizationClient.java
+++ b/src/se/hal/deamon/PCDataSynchronizationClient.java
@@ -66,6 +66,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
                     out.writeObject(new PeerDataReqDTO());
                     PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject();
                     user.setUsername(peerData.username);
+                    user.setEmail(peerData.email);
                     user.setAddress(peerData.address);
                     user.save(db);
 
diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
index 458c0494..9cc0bd50 100755
--- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java
+++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 
 public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon {
 	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() {
@@ -81,6 +81,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
                         PeerDataRspDTO rsp = new PeerDataRspDTO();
                         User localUser = User.getLocalUser(db);
                         rsp.username = localUser.getUsername();
+                        rsp.email = localUser.getEmail();
                         rsp.address = localUser.getAddress();
 
                         rsp.sensors = new ArrayList<>();
@@ -151,6 +152,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
 	///////////////  DTO ///////////////////////
     protected static class PeerDataRspDTO implements Serializable{
         public String username;
+        public String email;
         public String address;
 
         public ArrayList<SensorDTO> sensors;