Feat/handshake config

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

@@ -19,6 +19,8 @@ import com.clevertap.android.sdk.task.CTExecutorFactory
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
 fun Context.isPackageAndOsTargetsAbove(apiLevel: Int) =
     VERSION.SDK_INT > apiLevel && targetSdkVersion > apiLevel
@@ -299,3 +301,9 @@ fun String?.toJsonOrNull(): JSONObject? {
         }
     }
 }
+
+@OptIn(ExperimentalContracts::class)
+fun String?.isNotNullAndBlank() : Boolean {
+    contract { returns(true) implies (this@isNotNullAndBlank != null) }
+    return isNullOrBlank().not()
+}

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

@@ -59,7 +59,6 @@
 import com.clevertap.android.sdk.interfaces.NotificationRenderedListener;
 import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;
 import com.clevertap.android.sdk.interfaces.SCDomainListener;
-import com.clevertap.android.sdk.network.BaseNetworkManager;
 import com.clevertap.android.sdk.network.NetworkManager;
 import com.clevertap.android.sdk.product_config.CTProductConfigController;
 import com.clevertap.android.sdk.product_config.CTProductConfigListener;
@@ -208,7 +207,12 @@ public static void changeCredentials(String accountID, String token, String regi
      * @param spikyProxyDomain  CleverTap Spiky Proxy Domain
      * @noinspection unused
      */
-    public static void changeCredentials(String accountID, String token, String proxyDomain, String spikyProxyDomain) {
+    public static void changeCredentials(
+            String accountID,
+            String token,
+            String proxyDomain,
+            String spikyProxyDomain
+    ) {
         if (defaultConfig != null) {
             Logger.i("CleverTap SDK already initialized with accountID:" + defaultConfig.getAccountId()
                     + ", token:" + defaultConfig.getAccountToken() + ", proxyDomain: " + defaultConfig.getProxyDomain() +
@@ -221,6 +225,36 @@ public static void changeCredentials(String accountID, String token, String prox
         ManifestInfo.changeCredentials(accountID, token, proxyDomain, spikyProxyDomain);
     }
 
+    /**
+     * This method is used to change the credentials of CleverTap account Id, token, proxyDomain, spikyProxyDomain programmatically
+     *
+     * @param accountID         CleverTap Account Id
+     * @param token             CleverTap Account Token
+     * @param proxyDomain       CleverTap Proxy Domain
+     * @param spikyProxyDomain  CleverTap Spiky Proxy Domain
+     * @param customHandshakeDomain  Custom handshake Domain
+     * @noinspection unused
+     */
+    public static void changeCredentials(
+            String accountID,
+            String token,
+            String proxyDomain,
+            String spikyProxyDomain,
+            String customHandshakeDomain
+    ) {
+        if (defaultConfig != null) {
+            Logger.i("CleverTap SDK already initialized with accountID:" + defaultConfig.getAccountId()
+                    + ", token:" + defaultConfig.getAccountToken() + ", proxyDomain: " + defaultConfig.getProxyDomain() +
+                    ", spikyDomain: " + defaultConfig.getSpikyProxyDomain() + ", handshakeDomain: " + defaultConfig.getCustomHandshakeDomain()
+                    + ". Cannot change credentials to accountID: " + accountID +
+                    ", token: " + token + ", proxyDomain: " + proxyDomain + ", spikyProxyDomain: " + spikyProxyDomain
+                    + "and customHandshakeDomain: " + customHandshakeDomain);
+            return;
+        }
+
+        ManifestInfo.changeCredentials(accountID, token, proxyDomain, spikyProxyDomain, customHandshakeDomain);
+    }
+
     /**
      * Launches an asynchronous task to download the notification icon from CleverTap,
      * and create the Android notification.
@@ -1133,7 +1167,7 @@ public void syncRegisteredInAppTemplates() {
         }
 
         TemplatesManager templatesManager = coreState.getTemplatesManager();
-        BaseNetworkManager networkManager = coreState.getNetworkManager();
+        NetworkManager networkManager = coreState.getNetworkManager();
 
         getCleverTapID(x -> {
             // getCleverTapID is executed on the main thread
@@ -1394,10 +1428,10 @@ public void flush() {
     public void setSCDomainListener(SCDomainListener scDomainListener) {
         coreState.getCallbackManager().setSCDomainListener(scDomainListener);
 
-        if(coreState.getNetworkManager() != null) {
-            NetworkManager networkManager = (NetworkManager) coreState.getNetworkManager();
+        if (coreState.getNetworkManager() != null) {
+            NetworkManager networkManager = coreState.getNetworkManager();
             String domain = networkManager.getDomain(EventGroup.REGULAR);
-            if(domain != null) {
+            if (domain != null) {
                 scDomainListener.onSCDomainAvailable(getSCDomain(domain));
             }
         }
@@ -3068,6 +3102,7 @@ private static CleverTapInstanceConfig getDefaultConfig(Context context) {
         String accountRegion = manifest.getAccountRegion();
         String proxyDomain = manifest.getProxyDomain();
         String spikyProxyDomain = manifest.getSpikeyProxyDomain();
+        String handshakeDomain = manifest.getHandshakeDomain();
         if (accountId == null || accountToken == null) {
             Logger.i(
                     "Account ID or Account token is missing from AndroidManifest.xml, unable to create default instance");
@@ -3084,6 +3119,9 @@ private static CleverTapInstanceConfig getDefaultConfig(Context context) {
         if (spikyProxyDomain != null && !spikyProxyDomain.trim().isEmpty()) {
             defaultInstanceConfig.setSpikyProxyDomain(spikyProxyDomain);
         }
+        if (handshakeDomain != null && !handshakeDomain.trim().isEmpty()) {
+            defaultInstanceConfig.setCustomHandshakeDomain(handshakeDomain);
+        }
         return defaultInstanceConfig;
     }
 

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

@@ -49,6 +49,8 @@ public CleverTapInstanceConfig[] newArray(int size) {
 
     private String spikyProxyDomain;
 
+    private String customHandshakeDomain;
+
     @NonNull
     private ArrayList<String> allowedPushTypes = getAll();
 
@@ -113,6 +115,7 @@ public static CleverTapInstanceConfig createInstance(Context context, @NonNull S
         this.accountRegion = config.accountRegion;
         this.proxyDomain = config.proxyDomain;
         this.spikyProxyDomain = config.spikyProxyDomain;
+        this.customHandshakeDomain = config.customHandshakeDomain;
         this.isDefaultInstance = config.isDefaultInstance;
         this.analyticsOnly = config.analyticsOnly;
         this.personalization = config.personalization;
@@ -181,6 +184,9 @@ private CleverTapInstanceConfig(String jsonString) throws Throwable {
             if (configJsonObject.has(Constants.KEY_SPIKY_PROXY_DOMAIN)) {
                 this.spikyProxyDomain = configJsonObject.getString(Constants.KEY_SPIKY_PROXY_DOMAIN);
             }
+            if (configJsonObject.has(Constants.KEY_CUSTOM_HANDSHAKE_DOMAIN)) {
+                this.customHandshakeDomain = configJsonObject.optString(Constants.KEY_CUSTOM_HANDSHAKE_DOMAIN, null);
+            }
             if (configJsonObject.has(Constants.KEY_ACCOUNT_REGION)) {
                 this.accountRegion = configJsonObject.getString(Constants.KEY_ACCOUNT_REGION);
             }
@@ -243,6 +249,7 @@ private CleverTapInstanceConfig(Parcel in) {
         accountRegion = in.readString();
         proxyDomain = in.readString();
         spikyProxyDomain = in.readString();
+        customHandshakeDomain = in.readString();
         analyticsOnly = in.readByte() != 0x00;
         isDefaultInstance = in.readByte() != 0x00;
         useGoogleAdId = in.readByte() != 0x00;
@@ -313,6 +320,14 @@ public void setSpikyProxyDomain(String spikyProxyDomain) {
         this.spikyProxyDomain = spikyProxyDomain;
     }
 
+    public String getCustomHandshakeDomain() {
+        return customHandshakeDomain;
+    }
+
+    public void setCustomHandshakeDomain(String handshakeDomain) {
+        this.customHandshakeDomain = handshakeDomain;
+    }
+
     @SuppressWarnings({"unused"})
     public void setDebugLevel(CleverTapAPI.LogLevel debugLevel) {
         setDebugLevel(debugLevel.intValue());
@@ -394,6 +409,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(accountRegion);
         dest.writeString(proxyDomain);
         dest.writeString(spikyProxyDomain);
+        dest.writeString(customHandshakeDomain);
         dest.writeByte((byte) (analyticsOnly ? 0x01 : 0x00));
         dest.writeByte((byte) (isDefaultInstance ? 0x01 : 0x00));
         dest.writeByte((byte) (useGoogleAdId ? 0x01 : 0x00));
@@ -474,6 +490,7 @@ String toJSONString() {
             configJsonObject.put(Constants.KEY_ACCOUNT_REGION, getAccountRegion());
             configJsonObject.put(Constants.KEY_PROXY_DOMAIN, getProxyDomain());
             configJsonObject.put(Constants.KEY_SPIKY_PROXY_DOMAIN, getSpikyProxyDomain());
+            configJsonObject.put(Constants.KEY_CUSTOM_HANDSHAKE_DOMAIN, getCustomHandshakeDomain());
             configJsonObject.put(Constants.KEY_FCM_SENDER_ID, getFcmSenderId());
             configJsonObject.put(Constants.KEY_ANALYTICS_ONLY, isAnalyticsOnly());
             configJsonObject.put(Constants.KEY_DEFAULT_INSTANCE, isDefaultInstance());

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

@@ -32,6 +32,7 @@ public interface Constants {
     String LABEL_REGION = "CLEVERTAP_REGION";
     String LABEL_PROXY_DOMAIN = "CLEVERTAP_PROXY_DOMAIN";
     String LABEL_SPIKY_PROXY_DOMAIN = "CLEVERTAP_SPIKY_PROXY_DOMAIN";
+    String LABEL_CLEVERTAP_HANDSHAKE_DOMAIN = "CLEVERTAP_HANDSHAKE_DOMAIN";
     String LABEL_DISABLE_APP_LAUNCH = "CLEVERTAP_DISABLE_APP_LAUNCHED";
     String LABEL_SSL_PINNING = "CLEVERTAP_SSL_PINNING";
     String LABEL_BACKGROUND_SYNC = "CLEVERTAP_BACKGROUND_SYNC";
@@ -190,6 +191,7 @@ public interface Constants {
     String KEY_ACCOUNT_REGION = "accountRegion";
     String KEY_PROXY_DOMAIN = "proxyDomain";
     String KEY_SPIKY_PROXY_DOMAIN = "spikyProxyDomain";
+    String KEY_CUSTOM_HANDSHAKE_DOMAIN = "customHandshakeDomain";
     String KEY_ANALYTICS_ONLY = "analyticsOnly";
     String KEY_DEFAULT_INSTANCE = "isDefaultInstance";
     String KEY_USE_GOOGLE_AD_ID = "useGoogleAdId";

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

@@ -11,7 +11,7 @@
 import com.clevertap.android.sdk.inapp.evaluation.EvaluationManager;
 import com.clevertap.android.sdk.inapp.store.preference.StoreRegistry;
 import com.clevertap.android.sdk.login.LoginController;
-import com.clevertap.android.sdk.network.BaseNetworkManager;
+import com.clevertap.android.sdk.network.NetworkManager;
 import com.clevertap.android.sdk.product_config.CTProductConfigController;
 import com.clevertap.android.sdk.product_config.CTProductConfigFactory;
 import com.clevertap.android.sdk.pushnotification.PushProviders;
@@ -21,7 +21,9 @@
 import com.clevertap.android.sdk.variables.Parser;
 import com.clevertap.android.sdk.variables.VarCache;
 
-public class CoreState extends CleverTapState {
+public class CoreState {
+
+    private final Context context;
 
     private BaseLocationManager baseLocationManager;
 
@@ -63,7 +65,7 @@ public class CoreState extends CleverTapState {
 
     private MainLooperHandler mainLooperHandler;
 
-    private BaseNetworkManager networkManager;
+    private NetworkManager networkManager;
 
     private PushProviders pushProviders;
 
@@ -110,7 +112,7 @@ public void setParser(final Parser parser) {
     }
 
     CoreState(final Context context) {
-        super(context);
+        this.context = context;
     }
 
     public ActivityLifeCycleManager getActivityLifeCycleManager() {
@@ -192,12 +194,10 @@ public CTProductConfigController getCtProductConfigController() {
         return getControllerManager().getCTProductConfigController();
     }
 
-    @Override
     public BaseDatabaseManager getDatabaseManager() {
         return databaseManager;
     }
 
-    @Override
     void setDatabaseManager(final BaseDatabaseManager databaseManager) {
         this.databaseManager = databaseManager;
     }
@@ -242,13 +242,11 @@ public void setLoginController(final LoginController loginController) {
         this.loginController = loginController;
     }
 
-    @Override
-    public BaseNetworkManager getNetworkManager() {
+    public NetworkManager getNetworkManager() {
         return networkManager;
     }
 
-    @Override
-    void setNetworkManager(final BaseNetworkManager networkManager) {
+    void setNetworkManager(final NetworkManager networkManager) {
         this.networkManager = networkManager;
     }
 
@@ -276,12 +274,10 @@ public void setValidationResultStack(final ValidationResultStack validationResul
         this.validationResultStack = validationResultStack;
     }
 
-    @Override
     BaseLocationManager getLocationManager() {
         return baseLocationManager;
     }
 
-    @Override
     void setLocationManager(final BaseLocationManager baseLocationManager) {
         this.baseLocationManager = baseLocationManager;
     }

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

@@ -20,6 +20,8 @@ public class ManifestInfo {
 
     private static String spikyProxyDomain;
 
+    private static String handshakeDomain;
+
     private static boolean useADID;
 
     private static boolean appLaunchedDisabled;
@@ -84,6 +86,9 @@ private ManifestInfo(Context context) {
         if (spikyProxyDomain == null) {
             spikyProxyDomain = _getManifestStringValueForKey(metaData, Constants.LABEL_SPIKY_PROXY_DOMAIN);
         }
+        if (handshakeDomain == null) {
+            handshakeDomain = _getManifestStringValueForKey(metaData, Constants.LABEL_CLEVERTAP_HANDSHAKE_DOMAIN);
+        }
         notificationIcon = _getManifestStringValueForKey(metaData, Constants.LABEL_NOTIFICATION_ICON);
         useADID = "1".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));
         appLaunchedDisabled = "1".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));
@@ -176,6 +181,12 @@ public String getSpikeyProxyDomain() {
         return spikyProxyDomain;
     }
 
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public String getHandshakeDomain() {
+        Logger.v("ManifestInfo: getHandshakeDomain called, returning handshakeDomain:" + handshakeDomain);
+        return handshakeDomain;
+    }
+
     String getPackageName() {
         return packageName;
     }
@@ -221,6 +232,14 @@ static void changeCredentials(String id, String token, String _proxyDomain, Stri
         spikyProxyDomain = _spikyProxyDomain;
     }
 
+    static void changeCredentials(String id, String token, String _proxyDomain, String _spikyProxyDomain, String customHandshakeDomain) {
+        accountId = id;
+        accountToken = token;
+        proxyDomain = _proxyDomain;
+        spikyProxyDomain = _spikyProxyDomain;
+        handshakeDomain = customHandshakeDomain;
+    }
+
     /**
      * This returns string representation of int,boolean,string,float value of given key
      *

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

@@ -146,9 +146,13 @@ static long getLong(Context context, String nameSpace, String key, long defaultV
     }
 
     @SuppressWarnings("SameParameterValue")
-    public static long getLongFromPrefs(Context context, CleverTapInstanceConfig config, String rawKey,
+    public static long getLongFromPrefs(
+            Context context,
+            CleverTapInstanceConfig config,
+            String rawKey,
             int defaultValue,
-            String nameSpace) {
+            String nameSpace
+    ) {
         if (config.isDefaultInstance()) {
             long dummy = -1000;
             long _new = getLong(context, nameSpace, storageKeyWithSuffix(config, rawKey), dummy);