Move to Code library for Android compatibility

Author: artemlos

.idea/artifacts/cryptolens_android_jar.xml

@@ -29,5 +29,10 @@
       <artifactId>oshi-core</artifactId>
       <version>LATEST</version>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>LATEST</version>
+    </dependency>
   </dependencies>
 </project>

.idea/artifacts/cryptolens_jar.xml

@@ -81,10 +81,9 @@ public Base64Response parseBase64Response(String response) {
 
     if (resp.result != 0) { return new Base64Response(resp.message); }
 
-    Base64.Decoder decoder = Base64.getDecoder();
 
-    byte[] licenseKey = decoder.decode(resp.licenseKey);
-    byte[] signature  = decoder.decode(resp.signature);
+    byte[] licenseKey = Shared.defaultBase64Decoder(resp.licenseKey);
+    byte[] signature  = Shared.defaultBase64Decoder(resp.signature);
 
     return new Base64Response(licenseKey, signature);
   }

pom.xml

@@ -4,11 +4,10 @@
 import java.nio.*;
 import java.nio.charset.*;
 import java.net.*;
-import java.util.*;
 
-import javax.net.ssl.*;
 
 import com.google.gson.*;
+import org.apache.commons.codec.binary.BaseNCodec;
 
 import java.math.BigInteger;
 import java.security.*;
@@ -17,8 +16,8 @@
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.security.spec.RSAPublicKeySpec;
-import java.util.Base64;
-import java.util.*;
+
+
 @Deprecated
 public class JavaSecuritySignatureVerifier {
   private BigInteger mod;
@@ -37,14 +36,11 @@ public boolean verify(byte[] message, byte[] signature) throws Exception {
   }
 
   public void setExponentBase64(String exponent) {
-    Base64.Decoder decoder = Base64.getDecoder();
-    byte[] bytes = decoder.decode(exponent.getBytes());
-    exp = new BigInteger(1, bytes);
+
+    exp = new BigInteger(1, Shared.defaultBase64Decoder(exponent));
   }
 
   public void setModulusBase64(String modulus) {
-    Base64.Decoder decoder = Base64.getDecoder();
-    byte[] bytes = decoder.decode(modulus.getBytes());
-    mod = new BigInteger(1, bytes);
+    mod = new BigInteger(1, Shared.defaultBase64Decoder(modulus));
   }
 }

src/main/java/io/cryptolens/legacy/GsonResponseParser.java

@@ -0,0 +1,12 @@
+package io.cryptolens.legacy;
+
+import org.apache.commons.codec.binary.Base64;
+
+public class Shared {
+
+    public static byte[] defaultBase64Decoder(String str) {
+
+        Base64 decoder = new Base64();
+        return decoder.decode(str.getBytes());
+    }
+}

src/main/java/io/cryptolens/legacy/JavaSecuritySignatureVerifier.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import io.cryptolens.internal.ActivateResult;
 import io.cryptolens.legacy.JavaSecuritySignatureVerifier;
+import io.cryptolens.legacy.Shared;
 import io.cryptolens.methods.Helpers;
 
 import java.nio.charset.StandardCharsets;
@@ -77,10 +78,8 @@ public static LicenseKey LoadFromString(String RSAPubKey, String licenseString,
 
         ActivateResult result = new Gson().fromJson(licenseString, ActivateResult.class);
 
-        Base64.Decoder decoder = Base64.getDecoder();
-
-        byte[] licenseKey = decoder.decode(result.licenseKey);
-        byte[] signature = decoder.decode(result.signature);
+        byte[] licenseKey = Shared.defaultBase64Decoder(result.licenseKey);
+        byte[] signature = Shared.defaultBase64Decoder(result.signature);
 
         try {