diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index f4eb738..963d4bb 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -544,7 +544,6 @@ public class delegationServices { UserName = (String) accountServer.get("User"); lastNet = (String) accountServer.get("lastNet"); keychainUUID = (String) accountServer.get("UUID"); - localNet.macRead(Macid, lastNet, Email, UserName, Token); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("_id", ClientID); BasicDBObject updateQuery = new BasicDBObject(); @@ -618,6 +617,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery8); //delegationTimer.trigger(); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); + localNet.macRead(Macid, lastNet, Email, UserName, Token); } else { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("_id", ClientID); @@ -838,7 +838,6 @@ public class delegationServices { UserName = (String) accountServer.get("User"); lastNet = (String) accountServer.get("lastNet"); keychainUUID = (String) accountServer.get("UUID"); - localNet.macRead(Macid, lastNet, Email, UserName, TKN); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("_id", ClientID); @@ -892,6 +891,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery6); //delegationTimer.trigger(); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); + localNet.macRead(Macid, lastNet, Email, UserName, TKN); } else { System.out.println("Login Failure"); BasicDBObject searchQuery = new BasicDBObject(); diff --git a/src/main/java/com/jamesquinley/DelegationServices/localNet.java b/src/main/java/com/jamesquinley/DelegationServices/localNet.java index 34fe64f..5651c34 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/localNet.java +++ b/src/main/java/com/jamesquinley/DelegationServices/localNet.java @@ -15,12 +15,7 @@ public class localNet { } else { System.out.println("Hey this user Logged In From A new Location, dispatching email!"); - final Runnable runnable = new Runnable() { - public void run() { - secureCalls.locationBasedEmail(email,UName,NewMac, OldMac); - } - }; - runnable.run(); + secureCalls.locationBasedEmail(email,UName,NewMac, OldMac); System.out.println("Switching Trusted Net To New Local"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("Token", Token);