#450 Move Settings#isEmailCorrect to Utils class

src/main/java/fr/xephi/authme/process/Management.java

@@ -8,6 +8,7 @@ import fr.xephi.authme.process.logout.AsynchronousLogout;
 import fr.xephi.authme.process.quit.AsynchronousQuit;
 import fr.xephi.authme.process.register.AsyncRegister;
 import fr.xephi.authme.process.unregister.AsynchronousUnregister;
+import fr.xephi.authme.settings.NewSetting;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitScheduler;
 
@@ -17,15 +18,17 @@ public class Management {
 
     private final AuthMe plugin;
     private final BukkitScheduler sched;
+    private final NewSetting settings;
 
     /**
      * Constructor for Management.
      *
      * @param plugin AuthMe
      */
-    public Management(AuthMe plugin) {
+    public Management(AuthMe plugin, NewSetting settings) {
         this.plugin = plugin;
         this.sched = this.plugin.getServer().getScheduler();
+        this.settings = settings;
     }
 
     public void performLogin(final Player player, final String password, final boolean forceLogin) {
@@ -94,7 +97,7 @@ public class Management {
         sched.runTaskAsynchronously(plugin, new Runnable() {
             @Override
             public void run() {
-                new AsyncChangeEmail(player, plugin, null, newEmail, newEmailVerify).process();
+                new AsyncChangeEmail(player, plugin, null, newEmail, newEmailVerify, settings).process();
             }
         });
     }
@@ -103,7 +106,7 @@ public class Management {
         sched.runTaskAsynchronously(plugin, new Runnable() {
             @Override
             public void run() {
-                new AsyncChangeEmail(player, plugin, oldEmail, newEmail).process();
+                new AsyncChangeEmail(player, plugin, oldEmail, newEmail, settings).process();
             }
         });
     }

src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -5,8 +5,10 @@ import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
+import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.StringUtils;
+import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 
 /**
@@ -19,18 +21,21 @@ public class AsyncChangeEmail {
     private final String newEmail;
     private final String newEmailVerify;
     private final Messages m;
+    private final NewSetting settings;
 
-    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail, String newEmailVerify) {
+    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail, String newEmailVerify,
+                            NewSetting settings) {
         this.m = plugin.getMessages();
         this.player = player;
         this.plugin = plugin;
         this.oldEmail = oldEmail;
         this.newEmail = newEmail;
         this.newEmailVerify = newEmailVerify;
+        this.settings = settings;
     }
 
-    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail) {
-        this(player, plugin, oldEmail, newEmail, newEmail);
+    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail, NewSetting settings) {
+        this(player, plugin, oldEmail, newEmail, newEmail, settings);
     }
 
     public void process() {
@@ -57,7 +62,7 @@ public class AsyncChangeEmail {
                     return;
                 }
             }
-            if (!Settings.isEmailCorrect(newEmail)) {
+            if (!Utils.isEmailCorrect(newEmail, settings)) {
                 m.send(player, MessageKey.INVALID_NEW_EMAIL);
                 return;
             }