Support the new machine code method in IsOnRightMachine

Author: artemlos

src/main/java/io/cryptolens/methods/Helpers.java

@@ -106,7 +106,7 @@ public static String GetMachineCode(int v) {
     public static boolean IsOnRightMachine(LicenseKey license) {
         return IsOnRightMachine(license, false);
     }
-    
+
     /**
      * Check if the device is registered with the license key.
      * @param license The license key object.
@@ -118,6 +118,32 @@ public static boolean IsOnRightMachine(LicenseKey license, boolean isFloatingLic
         return IsOnRightMachine(license, isFloatingLicense, false);
     }
 
+    /**
+     * Check if the device is registered with the license key.
+     * @param license The license key object.
+     * @param v If set to 2, this method will use the UUID of the device instead of depending
+     *          on slf4j. Note, it currently only supports Windows. You can read more
+     *          here: https://help.cryptolens.io/faq/index#java.
+     * @return True if the license is registered with this machine and False otherwise.
+     */
+    public static boolean IsOnRightMachine(LicenseKey license, int v) {
+        return IsOnRightMachine(license, v, false);
+    }
+
+    /**
+     * Check if the device is registered with the license key.
+     * @param license The license key object.
+     * @param isFloatingLicense If this is a floating license, this parameter has to be set to true.
+     *                          You can enable floating licenses by setting @see ActivateModel.FloatingTimeInterval.
+     * @param v If set to 2, this method will use the UUID of the device instead of depending
+     *          on slf4j. Note, it currently only supports Windows. You can read more
+     *          here: https://help.cryptolens.io/faq/index#java.
+     * @return True if the license is registered with this machine and False otherwise.
+     */
+    public static boolean IsOnRightMachine(LicenseKey license, int v, boolean isFloatingLicense) {
+        return IsOnRightMachine(license, v, isFloatingLicense, false);
+    }
+
     /**
      * Check if the device is registered with the license key.
      * @param license The license key object
@@ -134,6 +160,26 @@ public static boolean IsOnRightMachine(LicenseKey license, boolean isFloatingLic
         return IsOnRightMachine(license, current_mid, isFloatingLicense, allowOverdraft);
     }
 
+    /**
+     * Check if the device is registered with the license key.
+     * @param license The license key object.
+     * @param v If set to 2, this method will use the UUID of the device instead of depending
+     *          on slf4j. Note, it currently only supports Windows. You can read more
+     *          here: https://help.cryptolens.io/faq/index#java.
+     * @param isFloatingLicense If this is a floating license, this parameter has to be set to true.
+     *                          You can enable floating licenses by setting @see ActivateModel.FloatingTimeInterval.
+     * @param allowOverdraft If floating licensing is enabled with overdraft, this parameter should be set to true.
+     *                       You can enable overdraft by setting ActivateModel.MaxOverdraft" to a value greater than 0.
+     * @return True if the license is registered with this machine and False otherwise.
+     */
+    public static boolean IsOnRightMachine(LicenseKey license, int v, boolean isFloatingLicense, boolean allowOverdraft) {
+
+        String current_mid =  Helpers.GetMachineCode(v);
+
+        return IsOnRightMachine(license, current_mid, isFloatingLicense, allowOverdraft);
+    }
+
+
 
     /**
      * Check if the device is registered with the license key. This method is useful for platforms where the

src/test/java/io/cryptolens/HelpersTest.java

@@ -1,12 +1,16 @@
 package io.cryptolens;
 
 import io.cryptolens.methods.Helpers;
+import io.cryptolens.models.ActivatedMachine;
 import io.cryptolens.models.DataObject;
 import io.cryptolens.models.LicenseKey;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 
 /**
@@ -64,5 +68,25 @@ public void testApp()
 
         String[] featurePath = "moduleA.video".split(".");
 
+    }
+
+    public void testMachineCode() throws IOException {
+
+        Helpers.GetMachineCode();
+
+        String mc = Helpers.GetMachineCode(2);
+
+        LicenseKey license = new LicenseKey();
+        license.ActivatedMachines = new ArrayList<>();
+        ActivatedMachine machine = new ActivatedMachine();
+        machine.Mid = mc;
+        license.ActivatedMachines.add(machine);
+
+        Helpers.IsOnRightMachine(license, 2);
+
+        assertTrue(Helpers.IsOnRightMachine(license, 2));
+
+
+
     }
 }