Feat/sdk 4214/Encryption v2

clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java

@@ -12,10 +12,9 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
-import androidx.annotation.VisibleForTesting;
 
 import com.clevertap.android.sdk.Constants.IdentityType;
-import com.clevertap.android.sdk.cryption.CryptHandler;
+import com.clevertap.android.sdk.cryption.EncryptionLevel;
 import com.clevertap.android.sdk.login.LoginConstants;
 
 import org.json.JSONObject;
@@ -491,7 +490,7 @@ boolean isUseGoogleAdId() {
     void setCreatedPostAppLaunch() {
         this.createdPostAppLaunch = true;
     }
-    public void setEncryptionLevel(CryptHandler.EncryptionLevel encryptionLevel) {
+    public void setEncryptionLevel(EncryptionLevel encryptionLevel) {
         this.encryptionLevel = encryptionLevel.intValue();
     }
     public int getEncryptionLevel() {

clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java

@@ -135,6 +135,7 @@ public interface Constants {
     String KEY_I = "comms_i";
     String KEY_J = "comms_j";
     String CACHED_GUIDS_KEY = "cachedGUIDsKey";
+    String CACHED_GUIDS_LENGTH_KEY = "cachedGUIDsLengthKey";
     String CACHED_VARIABLES_KEY = "variablesKey";
     String MULTI_USER_PREFIX = "mt_";
     String NOTIFICATION_TAG = "wzrk_pn";
@@ -325,6 +326,12 @@ public interface Constants {
     String CRYPTION_SALT = "W1ZRCl3>";
     String CRYPTION_IV = "__CL3>3Rt#P__1V_";
 
+    String AES_PREFIX = "[";
+    String AES_SUFFIX = "]";
+
+    String AES_GCM_PREFIX = "<ct<";
+    String AES_GCM_SUFFIX = ">ct>";
+
     int FETCH_TYPE_PC = 0;
     int FETCH_TYPE_FF = 1;
     int FETCH_TYPE_VARIABLES = 4;

clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java

@@ -28,6 +28,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.WorkerThread;
+
 import com.clevertap.android.sdk.login.LoginInfoProvider;
 import com.clevertap.android.sdk.task.CTExecutorFactory;
 import com.clevertap.android.sdk.task.OnSuccessListener;
@@ -119,8 +120,7 @@ private class DeviceCachedInfo {
 
         private String getBluetoothVersion() {
             String bluetoothVersion = "none";
-            if (android.os.Build.VERSION.SDK_INT >= 18 &&
-                    context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
+            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
                 bluetoothVersion = "ble";
             } else if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
                 bluetoothVersion = "classic";
@@ -548,7 +548,7 @@ public JSONObject getAppLaunchedFields() {
         try {
             boolean deviceIsMultiUser = false;
             if (getGoogleAdID() != null) {
-                deviceIsMultiUser = new LoginInfoProvider(context, config, this).deviceIsMultiUser();
+                deviceIsMultiUser = new LoginInfoProvider(context, config).deviceIsMultiUser();
             }
             return CTJsonConverter.from(this, mCoreMetaData, enableNetworkInfoReporting,
                     deviceIsMultiUser);
@@ -844,9 +844,9 @@ private synchronized void fetchGoogleAdID() {
             } catch (Throwable t) {
                 if (t.getCause() != null) {
                     getConfigLogger().verbose(config.getAccountId(),
-                            "Failed to get Advertising ID: " + t.toString() + t.getCause().toString());
+                            "Failed to get Advertising ID: " + t + t.getCause().toString());
                 } else {
-                    getConfigLogger().verbose(config.getAccountId(), "Failed to get Advertising ID: " + t.toString());
+                    getConfigLogger().verbose(config.getAccountId(), "Failed to get Advertising ID: " + t);
                 }
             }
             if (advertisingID != null && advertisingID.trim().length() > 2) {

clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java

@@ -11,7 +11,6 @@
 import androidx.annotation.WorkerThread;
 
 import com.clevertap.android.sdk.cryption.CryptHandler;
-import com.clevertap.android.sdk.cryption.CryptUtils;
 import com.clevertap.android.sdk.db.BaseDatabaseManager;
 import com.clevertap.android.sdk.db.DBAdapter;
 import com.clevertap.android.sdk.events.EventDetail;
@@ -587,7 +586,7 @@ public void run() {
                     JSONObject jsonObjectEncrypted = new JSONObject(profile);
 
                     if (!passFlag)
-                        CryptUtils.updateEncryptionFlagOnFailure(context, config, Constants.ENCRYPTION_FLAG_DB_SUCCESS, cryptHandler);
+                        cryptHandler.updateMigrationFailureCount(false);
 
                     DBAdapter dbAdapter = baseDatabaseManager.loadDBAdapter(context);
                     long status = dbAdapter.storeUserProfile(profileID, deviceInfo.getDeviceID(), jsonObjectEncrypted);

clevertap-core/src/main/java/com/clevertap/android/sdk/Logger.java

@@ -6,6 +6,10 @@ public final class Logger implements ILogger {
 
     private int debugLevel;
 
+    Logger(int level) {
+        this.debugLevel = level;
+    }
+
     /**
      * Logs to Debug if the debug level is greater than 1.
      */
@@ -90,10 +94,6 @@ public static void v(String message, Throwable t) {
         }
     }
 
-    Logger(int level) {
-        this.debugLevel = level;
-    }
-
     @Override
     public void debug(String message) {
         if (getStaticDebugLevel() > CleverTapAPI.LogLevel.INFO.intValue()) {

clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java

@@ -102,10 +102,20 @@ public static void removeImmediate(Context context, String key) {
     }
 
     //Preferences
+
+    @Deprecated
+    /*
+      Use the method storageKeyWithSuffix(String accountID, String key) instead.")
+     */
     public static String storageKeyWithSuffix(@NonNull CleverTapInstanceConfig config,@NonNull String key) {
         return key + ":" + config.getAccountId();
     }
 
+    public static String storageKeyWithSuffix(String accountID, @NonNull String key) {
+        // todo - use this throughout the sdk instead of the one-above
+        return key + ":" + accountID;
+    }
+
     @SuppressWarnings("SameParameterValue")
     public static boolean getBoolean(Context context, String key, boolean defaultValue) {
         return getPreferences(context).getBoolean(key, defaultValue);

clevertap-core/src/main/java/com/clevertap/android/sdk/cryption/AESCrypt.kt

@@ -14,30 +14,25 @@ import javax.crypto.spec.SecretKeySpec
 /**
  * This class implements the AES Cryption algorithm
  */
-class AESCrypt : Crypt() {
+class AESCrypt(accountID: String) : Crypt() {
     /**
      * This method returns the key-password to be used for encryption/decryption
      *
-     * @param accountID : accountId of the current instance
      * @return key-password
      */
-    private fun generateKeyPassword(accountID: String): String {
-        return APP_ID_KEY_PREFIX + accountID + APP_ID_KEY_SUFFIX
-    }
+    private val keyPassword: String = APP_ID_KEY_PREFIX + accountID + APP_ID_KEY_SUFFIX
 
     /**
      * This method is used internally to encrypt the plain text
      *
      * @param plainText - plainText to be encrypted
-     * @param accountID - accountID used for password generation
      * @return encrypted text
      */
-    override fun encryptInternal(plainText: String, accountID: String): String? {
-
+    override fun encryptInternal(plainText: String): String? {
         return performCryptOperation(
-            Cipher.ENCRYPT_MODE, generateKeyPassword(accountID), plainText.toByteArray(
-                StandardCharsets.UTF_8
-            )
+            mode = Cipher.ENCRYPT_MODE,
+            password = keyPassword,
+            text = plainText.toByteArray(StandardCharsets.UTF_8)
         )?.let { encryptedBytes ->
             encryptedBytes.contentToString()
         }
@@ -48,12 +43,15 @@ class AESCrypt : Crypt() {
      * This method is used internally to decrypt the cipher text
      *
      * @param cipherText - cipherText to be decrypted
-     * @param accountID - accountID used for password generation
      * @return decrypted text
      */
-    override fun decryptInternal(cipherText: String, accountID: String): String? {
+    override fun decryptInternal(cipherText: String): String? {
         return parseCipherText(cipherText)?.let { bytes ->
-            performCryptOperation(Cipher.DECRYPT_MODE, generateKeyPassword(accountID), bytes)
+            performCryptOperation(
+                mode = Cipher.DECRYPT_MODE,
+                password = keyPassword,
+                text = bytes
+            )
         }?.let { decryptedBytes ->
             String(decryptedBytes, StandardCharsets.UTF_8)
         }
@@ -65,7 +63,7 @@ class AESCrypt : Crypt() {
      * @param cipherText - cipher text to be parsed
      * @return Parsed string in the form of a byte array
      */
-    override fun parseCipherText(cipherText: String): ByteArray? {
+    private fun parseCipherText(cipherText: String): ByteArray? {
         return try {
             // Removes the enclosing brackets, trims any leading or trailing whitespace, and then splits the resulting string based on commas
             val byteStrings =