Update analytics token

Author: adimiz1

cloudinary-core/src/main/java/com/cloudinary/utils/Analytics.java

@@ -8,7 +8,7 @@
 public class Analytics {
     private String sdkTokenQueryKey = "_a"; //sdkTokenQueryKey
     private String sdkQueryDelimiter = "=";
-    public String algoVersion = "C";
+    public String algoVersion = "D";
     public String prodcut = "A";
     public String SDKCode = ""; // Java = G, Android = F
     public String SDKSemver = ""; // Calculate the SDK version .
@@ -67,12 +67,19 @@ private String versionArrayToString(String[] versions) throws Exception {
         return getPaddedString(StringUtils.join(versions, "."));
     }
 
+    private String versionArrayToOsString(String[] versions) throws  Exception {
+        if (versions.length > 2) {
+            versions = Arrays.copyOf(versions, versions.length - 1);
+        }
+        return getOsVersionString(StringUtils.join(versions, "."));
+    }
+
     private String getOsType() {
         return (osType != null) ? osType : "Z"; //System.getProperty("os.name");
     }
 
     private String getOsVersion() throws Exception {
-        return (osVersion != null) ? versionArrayToString(osVersion.split("\\.")) : versionArrayToString(System.getProperty("os.version").split("\\."));
+        return (osVersion != null) ? versionArrayToOsString(osVersion.split("\\.")) : versionArrayToString(System.getProperty("os.version").split("\\."));
     }
 
     private String getSDKType() {
@@ -91,6 +98,18 @@ private String getSDKVersion() throws Exception {
         return getPaddedString(SDKSemver);
     }
 
+    private String getOsVersionString(String string) throws Exception {
+        String[] parts = string.split("\\.");
+        String result = "";
+        for(int i = 0 ; i < parts.length ; i++) {
+            int num = Integer.parseInt(parts[i]);
+            String binaryString = Integer.toBinaryString(num);
+            binaryString = StringUtils.padStart(binaryString, 6, '0');
+            result = result + Base64Map.values.get(binaryString);
+        }
+        return result;
+    }
+
     private String getPaddedString(String string) throws Exception {
         String paddedReversedSemver = "";
         int parts = string.split("\\.").length;

cloudinary-core/src/test/java/com/cloudinary/analytics/AnalyticsTest.java

@@ -29,19 +29,19 @@ public void testEncodeVersion() {
         analytics.setSDKSemver("1.24.0");
         analytics.setTechVersion("12.0.0");
         String result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAGAlhAMZAA0");
+        Assert.assertEquals(result, "_a=DAGAlhAMZAA0");
 
         analytics.setSDKSemver("12.0");
         result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAGAMAMZAA0");
+        Assert.assertEquals(result, "_a=DAGAMAMZAA0");
 
         analytics.setSDKSemver("43.21.26");
         result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAG///AMZAA0");
+        Assert.assertEquals(result, "_a=DAG///AMZAA0");
 
         analytics.setSDKSemver("0.0.0");
         result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAGAAAAMZAA0");
+        Assert.assertEquals(result, "_a=DAGAAAAMZAA0");
 
         analytics.setSDKSemver("43.21.27");
         result = analytics.toQueryParam();
@@ -53,15 +53,19 @@ public void testEncodeVersion() {
     public void testToQueryParam() {
         Analytics analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0");
         String result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAFAACMhZ1J0");
+        Assert.assertEquals(result, "_a=DAFAACMhZBi0");
+
+        analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "16.3");
+        result = analytics.toQueryParam();
+        Assert.assertEquals(result, "_a=DAFAACMhZQD0");
     }
 
     @Test
     public void testUrlWithAnalytics() {
         cloudinary.config.analytics = true;
         cloudinary.setAnalytics(new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0"));
         String url = cloudinary.url().generate("test");
-        Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=CAFAACMhZ1J0");
+        Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=DAFAACMhZBi0");
     }
 
     @Test
@@ -89,15 +93,15 @@ public void testUrlWithNoAnalyticsNullAndTrue() {
         cloudinary.analytics.setSDKSemver("1.30.0");
         cloudinary.analytics.setTechVersion("12.0.0");
         String url = cloudinary.url().generate("test");
-        Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=CAGAu5AMZAA0");
+        Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=DAGAu5AMZAA0");
     }
 
     @Test
     public void testMiscAnalyticsObject() {
         cloudinary.config.analytics = true;
         Analytics analytics = new Analytics("Z", "1.24.0", "12.0.0", "Z", "1.34.0");
         String result = analytics.toQueryParam();
-        Assert.assertEquals(result, "_a=CAZAlhAMZ1J0");
+        Assert.assertEquals(result, "_a=DAZAlhAMZBi0");
     }
 
     @Test