Adding improvements (#32)

* Updating SDK versions. Fixing test bug.

* Updated JSON library version from "20180813" to "20230227"

* Deprecating config calls

Author: ArtursKadikis

.idea/modules/sdk-java/countly-sdk-java.sdk-java.iml

@@ -1,36 +1,46 @@
-22.06.0
-* The "resetDeviceId", "login", and "logout" have been deprecated.
-* ! Minor breaking change ! The following methods and their functionality are deprecated from the "Config" class and will not function anymore: 
-	- "enableTestMode"
-	- "disableTestMode"
-	- "isTestModeEnabled".
-	- "setLoggingTag"
-* ! Minor breaking change ! The "TestMode" functionality is being removed from the SDK.
-* ! Minor breaking change ! It is not possible to set the logging tag anymore.
-* Fixed a bug where the wrong platform field value was being sent in the view request.
-
-20.11.5
-* Fixed a bug where the backend mode module produces "null pointer exceptions" in case not initialized.
-
-20.11.4
-* Adding mitigations to an issue that would surface when stopping a view that was not started.
-
-20.11.3
-* Fixed a threading issue in the backend mode feature.
-
-20.11.2
-* Added backend mode feature and a new configuration field to enable it.
-
-20.11.1
-* Fixed a bug related to server response handling.
-* Fixed a potential issue with parameters tampering protection while adding checksum.
-
-20.11.0
-* Added a new method to retrieve the current device id.
-* Added new methods to change device ID with and without server merge.
-* "Countly::getSession" has been deprecated and this is going to be removed in the future.
-* "resetDeviceId" in the SDK public methods has been deprecated and this is going to be removed in the future.
-
-19.09-sdk2-rc
-* initial SDK release
-* MavenCentral rerelease 
+22.09.0
+* The "resetDeviceId", "login", and "logout" have been deprecated.
+* ! Minor breaking change ! The following methods and their functionality are deprecated from the "Config" class and will not function anymore: 
+	- "enableTestMode"
+	- "disableTestMode"
+	- "isTestModeEnabled"
+	- "setLoggingTag"
+  - "setSdkName"
+  - "setSdkVersion"
+  - "getSdkName"
+  - "getSdkVersion"
+  - "isDeviceIdFallbackAllowed"
+  - "setDeviceIdFallbackAllowed"
+  - "overrideModule"
+  - "getModuleOverride"
+* ! Minor breaking change ! The "TestMode" functionality is being removed from the SDK.
+* ! Minor breaking change ! The module override functionality is being removed from the SDK.
+* ! Minor breaking change ! It is not possible to set the logging tag anymore.
+* Fixed a bug where the wrong platform field value was being sent in the view request.
+* Updated JSON library version from "20180813" to "20230227". 
+
+20.11.5
+* Fixed a bug where the backend mode module produces "null pointer exceptions" in case not initialized.
+
+20.11.4
+* Adding mitigations to an issue that would surface when stopping a view that was not started.
+
+20.11.3
+* Fixed a threading issue in the backend mode feature.
+
+20.11.2
+* Added backend mode feature and a new configuration field to enable it.
+
+20.11.1
+* Fixed a bug related to server response handling.
+* Fixed a potential issue with parameters tampering protection while adding checksum.
+
+20.11.0
+* Added a new method to retrieve the current device id.
+* Added new methods to change device ID with and without server merge.
+* "Countly::getSession" has been deprecated and this is going to be removed in the future.
+* "resetDeviceId" in the SDK public methods has been deprecated and this is going to be removed in the future.
+
+19.09-sdk2-rc
+* initial SDK release
+* MavenCentral rerelease 

.idea/modules/sdk-java/countly-sdk-java.sdk-java.main.iml

@@ -109,7 +109,7 @@ public static void main(String[] args) throws Exception {
                 .setDeviceIdStrategy(Config.DeviceIdStrategy.UUID)
                 .enableFeatures(Config.Feature.Events, Config.Feature.Sessions, Config.Feature.CrashReporting, Config.Feature.Views, Config.Feature.UserProfiles, Config.Feature.Location)
                 .setRequiresConsent(true)
-                .enableParameterTamperingProtection("test-salt-checksum")
+                //.enableParameterTamperingProtection("test-salt-checksum")
                 .setLogListener(new LogCallback() {
                     @Override
                     public void LogHappened(String logMessage, Config.LoggingLevel logLevel) {

.idea/modules/sdk-java/countly-sdk-java.sdk-java.test.iml

@@ -20,7 +20,7 @@ buildscript {
 }
 
 allprojects {
-    ext.CLY_VERSION = "20.11.1"
+    ext.CLY_VERSION = "20.11.5"
     ext.POWERMOCK_VERSION = "1.7.1"
 
     tasks.withType(Javadoc) {

CHANGELOG.md

@@ -18,7 +18,7 @@
 # org.gradle.parallel=true
 
 # RELEASE FIELD SECTION
-VERSION_NAME=20.11.5
+VERSION_NAME=22.09.0
 GROUP=ly.count.sdk
 
 POM_URL=https://github.com/Countly/countly-sdk-java

app-java/src/main/java/ly/count/java/demo/Sample.java

@@ -13,13 +13,13 @@ buildscript {
 }
 
 dependencies {
-    implementation 'org.json:json:20180813'
+    implementation 'org.json:json:20230227'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.8.9'
     testImplementation "org.powermock:powermock-core:${POWERMOCK_VERSION}"
     testImplementation "org.powermock:powermock-module-junit4:${POWERMOCK_VERSION}"
-    testImplementation 'com.squareup.okhttp3:mockwebserver:3.7.0'
+    //testImplementation 'com.squareup.okhttp3:mockwebserver:3.7.0'
 }
 
 apply plugin: "com.vanniktech.maven.publish"

build.gradle

@@ -118,7 +118,8 @@ public static Config.Feature byIndex(int index) {
     }
 
     /**
-     * Holder class for various ids metadata and id itself. Final, unmodifiable.
+     * Holder class for various ids met
+     * adata and id itself. Final, unmodifiable.
      */
     public static final class DID implements Byteable {
         public static final int STRATEGY_UUID = 0;
@@ -273,10 +274,10 @@ public boolean restore(byte[] data) {
     /**
      * Countly SDK version to be sent in HTTP requests
      */
-    protected String sdkVersion = "20.11.5";
+    protected String sdkVersion = "22.09.0";
 
     /**
-     * Countly SDK name to be sent in HTTP requests
+     * Countly Application name to be sent in HTTP requests
      */
     protected String applicationName;
 
@@ -603,10 +604,10 @@ public Config(String serverURL, String serverAppKey) {
      * Whether to allow fallback from unavailable device id strategy to Countly OpenUDID derivative.
      *
      * @param deviceIdFallbackAllowed true if fallback is allowed
+     * @deprecated this will do nothing
      * @return {@code this} instance for method chaining
      */
     public Config setDeviceIdFallbackAllowed(boolean deviceIdFallbackAllowed) {
-        this.deviceIdFallbackAllowed = deviceIdFallbackAllowed;
         return this;
     }
 
@@ -924,29 +925,21 @@ public Config setSessionCooldownPeriod(int sessionCooldownPeriod) {
      * Change name of SDK used in HTTP requests
      *
      * @param sdkName new name of SDK
+     * @deprecated Calling this function will do nothing
      * @return {@code this} instance for method chaining
      */
     public Config setSdkName(String sdkName) {
-        if (Utils.isEmptyOrNull(sdkName)) {
-            System.out.print("[ConfigCore] sdkName cannot be empty");
-        } else {
-            this.sdkName = sdkName;
-        }
         return this;
     }
 
     /**
      * Change version of SDK used in HTTP requests
      *
      * @param sdkVersion new version of SDK
+     * @deprecated Calling this function will do nothing
      * @return {@code this} instance for method chaining
      */
     public Config setSdkVersion(String sdkVersion) {
-        if (Utils.isEmptyOrNull(sdkVersion)) {
-            System.out.print("[ConfigCore] sdkVersion cannot be empty");
-        } else {
-            this.sdkVersion = sdkVersion;
-        }
         return this;
     }
 
@@ -1159,18 +1152,20 @@ public Config setCrashProcessorClass(Class<? extends CrashProcessor> crashProces
      *
      * @param feature feature index to override
      * @param cls {@link Class} to use instead of Countly SDK standard class
+     * @deprecated this will do nothing
      * @return {@code this} instance for method chaining
      */
     protected Config overrideModule(Integer feature, Class<? extends Module> cls) {
-        if (feature == null || cls == null) {
-            System.out.print("[ConfigCore] Feature & class cannot be null");
-        } else {
-            if (moduleOverrides == null) {
-                moduleOverrides = new HashMap<>();
-            }
-            moduleOverrides.put(feature, cls);
-        }
         return this;
+        //if (feature == null || cls == null) {
+        //    System.out.print("[ConfigCore] Feature & class cannot be null");
+        //} else {
+        //    if (moduleOverrides == null) {
+        //        moduleOverrides = new HashMap<>();
+        //    }
+        //    moduleOverrides.put(feature, cls);
+        //}
+        //return this;
     }
 
     /**
@@ -1314,7 +1309,7 @@ public int getDeviceIdStrategy() {
 
     /**
      * Whether to allow fallback from unavailable device id strategy to any other available.
-     *
+     * @deprecated this will always return "true"
      * @return true if fallback is allowed
      */
     public boolean isDeviceIdFallbackAllowed() {
@@ -1359,7 +1354,7 @@ public String getParameterTamperingProtectionSalt() {
 
     /**
      * Getter for {@link #sdkName}
-     *
+     * @deprecated this will be removed
      * @return {@link #sdkName} value
      */
     public String getSdkName() {
@@ -1368,7 +1363,7 @@ public String getSdkName() {
 
     /**
      * Getter for {@link #sdkVersion}
-     *
+     * @deprecated this will be removed
      * @return {@link #sdkVersion} value
      */
     public String getSdkVersion() {
@@ -1539,11 +1534,12 @@ public String getCrashProcessorClass() {
 
     /**
      * Getter for {@link #moduleOverrides}
-     *
+     * @deprecated this always return "null"
      * @return {@link #moduleOverrides} value for {@code Feature} specified
      */
     public Class<? extends Module> getModuleOverride(int feature) {
-        return moduleOverrides == null ? null : moduleOverrides.get(feature);
+        return null;
+        //return moduleOverrides == null ? null : moduleOverrides.get(feature);
     }
 
     /**

gradle.properties

@@ -94,7 +94,7 @@ private void setUpSDK(Config config, boolean limited) throws Exception {
         Log L = new Log(Config.LoggingLevel.VERBOSE, null);
 
         this.dummy = mock(ModuleBase.class);
-        Utils.reflectiveSetField(SDKInterface.class, "testDummyModule", dummy);
+        Utils.reflectiveSetField(SDKCore.class, "testDummyModule", dummy);
         this.sdk = mock(SDKCore.class);
         this.sdk.init(new CtxImpl(this.sdk, new InternalConfig(defaultConfig()), getContext(), L));
         this.config = this.sdk.config();
@@ -129,6 +129,6 @@ public void tearDown() throws Exception {
             this.sdk.stop(ctx, true);
             this.sdk = null;
         }
-        Utils.reflectiveSetField(SDKInterface.class, "testDummyModule", null);
+        Utils.reflectiveSetField(SDKCore.class, "testDummyModule", null);
     }
 }