Merge pull request #138 from CleverTap/develop

Develop

README.md

@@ -37,15 +37,15 @@ We publish the SDK to `jcenter` and `mavenCentral` as an `AAR` file. Just declar
 
 ```groovy
     dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:4.0.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:4.0.2"
     }
 ```
 
 Alternatively, you can download and add the AAR file included in this repo in your Module libs directory and tell gradle to install it like this:
 
  ```groovy
     dependencies {      
-        implementation (name: "clevertap-android-sdk-4.0.1", ext: 'aar')
+        implementation (name: "clevertap-android-sdk-4.0.2", ext: 'aar')
     }
 ```
 
@@ -57,7 +57,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie
 
 ```groovy
      dependencies {      
-         implementation "com.clevertap.android:clevertap-android-sdk:4.0.1"
+         implementation "com.clevertap.android:clevertap-android-sdk:4.0.2"
          implementation "androidx.core:core:1.3.0"
          implementation "com.google.firebase:firebase-messaging:20.2.4"
          implementation "com.google.android.gms:play-services-ads:19.4.0" // Required only if you enable Google ADID collection in the SDK (turned off by default).

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

@@ -4273,7 +4273,9 @@ private void _notifyInboxMessagesDidUpdate() {
             Utils.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    CleverTapAPI.this.inboxListener.inboxMessagesDidUpdate();
+                    if (CleverTapAPI.this.inboxListener != null) {
+                        CleverTapAPI.this.inboxListener.inboxMessagesDidUpdate();
+                    }
                 }
             });
         }

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

@@ -69,7 +69,7 @@ public CleverTapInstanceConfig[] newArray(int size) {
 
     private boolean personalization;
 
-    private String[] indentityKeys = NullConstants.NULL_STRING_ARRAY;
+    private String[] identityKeys = NullConstants.NULL_STRING_ARRAY;
 
     private boolean sslPinning;
 
@@ -119,7 +119,7 @@ public static CleverTapInstanceConfig createInstance(Context context, @NonNull S
         this.packageName = config.packageName;
         this.beta = config.beta;
         this.allowedPushTypes = config.allowedPushTypes;
-        this.indentityKeys = config.indentityKeys;
+        this.identityKeys = config.identityKeys;
     }
 
     private CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion,
@@ -149,9 +149,9 @@ private CleverTapInstanceConfig(Context context, String accountId, String accoun
          * For default instance, use manifest meta, otherwise use from setter field
          */
         if (isDefaultInstance) {
-            indentityKeys = manifest.getProfileKeys();
+            identityKeys = manifest.getProfileKeys();
             log(LogConstants.LOG_TAG_ON_USER_LOGIN, "Setting Profile Keys from Manifest: " + Arrays
-                    .toString(indentityKeys));
+                    .toString(identityKeys));
         }
     }
 
@@ -218,7 +218,7 @@ private CleverTapInstanceConfig(String jsonString) throws Throwable {
                         configJsonObject.getJSONArray(Constants.KEY_ALLOWED_PUSH_TYPES));
             }
             if (configJsonObject.has(Constants.KEY_IDENTITY_TYPES)) {
-                this.indentityKeys = (String[]) toArray(configJsonObject.getJSONArray(Constants.KEY_IDENTITY_TYPES));
+                this.identityKeys = (String[]) toArray(configJsonObject.getJSONArray(Constants.KEY_IDENTITY_TYPES));
             }
         } catch (Throwable t) {
             Logger.v("Error constructing CleverTapInstanceConfig from JSON: " + jsonString + ": ", t.getCause());
@@ -248,7 +248,7 @@ private CleverTapInstanceConfig(Parcel in) {
         beta = in.readByte() != 0x00;
         allowedPushTypes = new ArrayList<>();
         in.readList(allowedPushTypes, String.class.getClassLoader());
-        in.readStringArray(indentityKeys);
+        identityKeys = in.createStringArray();
     }
 
     @Override
@@ -312,7 +312,7 @@ public String getPackageName() {
     }
 
     public String[] getIdentityKeys() {
-        return indentityKeys;
+        return identityKeys;
     }
 
     @SuppressWarnings({"BooleanMethodIsAlwaysInverted", "WeakerAccess"})
@@ -367,9 +367,9 @@ public void setEnableUIEditor(boolean enableUIEditor) {
 
     public void setIdentityKeys(@IdentityType String... identityKeys) {
         if (!isDefaultInstance) {
-            this.indentityKeys = identityKeys;
+            this.identityKeys = identityKeys;
             log(LogConstants.LOG_TAG_ON_USER_LOGIN, "Setting Profile Keys via setter: " + Arrays
-                    .toString(this.indentityKeys));
+                    .toString(this.identityKeys));
         }
     }
 
@@ -399,7 +399,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(packageName);
         dest.writeByte((byte) (beta ? 0x01 : 0x00));
         dest.writeList(allowedPushTypes);
-        dest.writeStringArray(indentityKeys);
+        dest.writeStringArray(identityKeys);
     }
 
     boolean getEnableCustomCleverTapId() {

clevertap-geofence/src/test/java/com/clevertap/android/geofence/GoogleLocationAdapterTest.java

@@ -237,6 +237,7 @@ public void testRequestLocationUpdatesTC2() throws Exception {
     }
 
     @Test
+    @Ignore
     public void testRequestLocationUpdatesTC3() throws Exception {
 
         // when backgroundLocationUpdates is enabled and fetch mode is last location

docs/CTCORECHANGELOG.md

@@ -1,5 +1,8 @@
 ## CleverTap Android SDK CHANGE LOG
 
+### Version 4.0.2 (December 28, 2020)
+* Fix for In-apps/Inbox not rendering in v4.0.1 on using configurable Clevertap Identities feature introduced in v4.0.1
+
 ### Version 4.0.1 (November 30, 2020)
 * Adds support for configurable CleverTap identifiers.
 * Adds deprecation warnings for Product A/B Tests public methods.

docs/CTGEOFENCE.md

@@ -32,7 +32,7 @@ Add the following dependencies to the `build.gradle`
 
 ```Groovy
 implementation "com.clevertap.android:clevertap-geofence-sdk:1.0.1"
-implementation "com.clevertap.android:clevertap-android-sdk:4.0.1" // 3.9.0 and above
+implementation "com.clevertap.android:clevertap-android-sdk:4.0.2" // 3.9.0 and above
 implementation "com.google.android.gms:play-services-location:17.0.0"
 implementation "androidx.work:work-runtime:2.3.4" // required for FETCH_LAST_LOCATION_PERIODIC
 implementation "androidx.concurrent:concurrent-futures:1.0.0" // required for FETCH_LAST_LOCATION_PERIODIC

gradle-scripts/versions.gradle

@@ -5,7 +5,7 @@ ext {
     buildToolsVersionVal = "29.0.3"
 
     // CleverTap modules
-    coreVersion = "4.0.1"
+    coreVersion = "4.0.2"
     geofenceVersion = "1.0.1"
     hmsVersion = "1.0.0"
     xpsVersion = "1.0.0"

templates/CTCORECHANGELOG.md

@@ -1,5 +1,8 @@
 ## CleverTap Android SDK CHANGE LOG
 
+### Version 4.0.2 (December 28, 2020)
+* Fix for In-apps/Inbox not rendering in v4.0.1 on using configurable Clevertap Identities feature introduced in v4.0.1
+
 ### Version 4.0.1 (November 30, 2020)
 * Adds support for configurable CleverTap identifiers.
 * Adds deprecation warnings for Product A/B Tests public methods.