API codebase change; add org.apache:commons-cli

Author: BC100Dev

build.sh

@@ -118,7 +118,7 @@ echo "// Compiling the Osintgram4j API"
 find modapi/src -name "*.java" -type f -print0 | xargs -0 "$JAVAC_CMD" -cp out/project/commons:out/libs/json.jar -d out/project/modapi
 
 echo "// Compiling the Core Application"
-find src -name "*.java" -type f -print0 | xargs -0 "$JAVAC_CMD" -cp out/project/modapi:out/project/commons:out/project/instagram-api:out/libs/json.jar -d out/project/core
+find src -name "*.java" -type f -print0 | xargs -0 "$JAVAC_CMD" -cp out/project/modapi:out/project/commons:out/project/instagram-api:out/libs/commons-cli.jar:out/libs/json.jar -d out/project/core
 
 echo "// Adding resources to the Core Application"
 cp -r src/net/bc100dev/osintgram4j/res out/project/core/net/bc100dev/osintgram4j/
@@ -191,4 +191,4 @@ if [[ "$INSTALL_CHOICE" =~ ^[Yy]$ ]]; then
     echo "Osintgram4j automatically uninstalled."
 else
     echo "You can run Osintgram from this directory and forwards by going to $PWD and run './bin/osintgram4j'"
-fi
+fi

commons/src/net/bc100dev/commons/utils/io/FileEncryption.java

@@ -16,13 +16,13 @@
 
 public class FileEncryption {
 
-    private static final byte[] salt = {
+    private static final byte[] defaultEncryptionSalt = {
             (byte) 0x43, (byte) 0x76, (byte) 0x95, (byte) 0xc7,
             (byte) 0x5b, (byte) 0xd7, (byte) 0x45, (byte) 0x17
     };
 
     private static Cipher makeCipher(String pass, boolean doEncrypt) throws GeneralSecurityException {
-        PBEKeySpec keySpec = new PBEKeySpec(pass.toCharArray(), salt, 65536, 256);
+        PBEKeySpec keySpec = new PBEKeySpec(pass.toCharArray(), defaultEncryptionSalt, 65536, 256);
         SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         SecretKey key = keyFactory.generateSecret(keySpec);
         SecretKeySpec secretKeySpec = new SecretKeySpec(key.getEncoded(), "AES");