Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 6.1.1 core #573

Merged
merged 5 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## CHANGE LOG.

### February 27, 2024

* [CleverTap Android SDK v6.1.1](docs/CTCORECHANGELOG.md)

### February 21, 2024

* [CleverTap Android SDK v6.1.0](docs/CTCORECHANGELOG.md)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend

```groovy
dependencies {
implementation "com.clevertap.android:clevertap-android-sdk:6.1.0"
implementation "com.clevertap.android:clevertap-android-sdk:6.1.1"
}
```

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-6.1.0", ext: 'aar')
implementation (name: "clevertap-android-sdk-6.1.1", ext: 'aar')
}
```

Expand All @@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie

```groovy
dependencies {
implementation "com.clevertap.android:clevertap-android-sdk:6.1.0"
implementation "com.clevertap.android:clevertap-android-sdk:6.1.1"
implementation "androidx.core:core:1.9.0"
implementation "com.google.firebase:firebase-messaging:23.0.6"
implementation "com.google.android.gms:play-services-ads:22.3.0" // Required only if you enable Google ADID collection in the SDK (turned off by default).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,13 @@ public JSONArray getInAppsCount(final Context context) {
final SharedPreferences prefs = StorageHelper
.getPreferences(context, storageKeyWithSuffix(getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP, deviceId)));
final Map<String, ?> all = prefs.getAll();
for (Map.Entry<String,?> inapp : all.entrySet()) {
if (inapp.getValue() instanceof String) {
final String[] parts = ((String) inapp.getValue()).split(",");
for (Map.Entry<String, ?> inApp : all.entrySet()) {
//inApp: "targetID" -> "todayCount,lifetime"
if (inApp.getValue() instanceof String) {
final String[] parts = ((String) inApp.getValue()).split(",");
if (parts.length == 2) {
JSONArray a = new JSONArray();
a.put(0, inapp);
a.put(0, inApp.getKey());
a.put(1, Integer.parseInt(parts[0]));
a.put(2, Integer.parseInt(parts[1]));
arr.put(a);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,20 @@ class CtApi(
private set

fun sendQueue(useSpikyDomain: Boolean, body: SendQueueRequestBody): Response =
httpClient.execute(createRequest("a1", body.toString(), useSpikyDomain, includeTs = true))
httpClient.execute(createRequest(
relativePath = "a1",
body = body.toString(),
useSpikyDomain = useSpikyDomain,
includeTs = true)
)

fun performHandshakeForDomain(useSpikyDomain: Boolean): Response {
val request = createRequest("hello", null, useSpikyDomain, includeTs = false)
val request = createRequest(
relativePath = "hello",
body = null,
useSpikyDomain = useSpikyDomain,
includeTs = false
)
logger.verbose(logTag, "Performing handshake with ${request.url}")
return httpClient.execute(request)
}
Expand Down Expand Up @@ -92,7 +102,7 @@ class CtApi(
private fun getUriForPath(path: String, useSpikyDomain: Boolean, includeTs: Boolean): Uri {
val builder = Uri.Builder()
.scheme("https")
.authority(getActualDomain(useSpikyDomain))
.authority(getActualDomain(useSpikyDomain) ?: defaultDomain)
.appendPath(path)
.appendDefaultQueryParams()
if (includeTs) {
Expand Down
8 changes: 8 additions & 0 deletions docs/CTCORECHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
## CleverTap Android SDK CHANGE LOG

### Version 6.1.1 (February 27, 2024)

#### Bug Fixes
* Fixes an issue of incorrect endpoint in the case of network handshake.
* Fixes a bug in Client Side InApps with regards to frequency limits.

### Version 6.1.0 (February 21, 2024)
> ⚠️ **NOTE**
Please update to 6.1.1 and above

#### New Features

Expand Down
2 changes: 1 addition & 1 deletion docs/CTGEOFENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`

```Groovy
implementation "com.clevertap.android:clevertap-geofence-sdk:1.3.0"
implementation "com.clevertap.android:clevertap-android-sdk:6.1.0" // 3.9.0 and above
implementation "com.clevertap.android:clevertap-android-sdk:6.1.1" // 3.9.0 and above
implementation "com.google.android.gms:play-services-location:21.0.0"
implementation "androidx.work:work-runtime:2.7.1" // required for FETCH_LAST_LOCATION_PERIODIC
implementation "androidx.concurrent:concurrent-futures:1.1.0" // required for FETCH_LAST_LOCATION_PERIODIC
Expand Down
2 changes: 1 addition & 1 deletion docs/CTPUSHTEMPLATES.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n

```groovy
implementation "com.clevertap.android:push-templates:1.2.3"
implementation "com.clevertap.android:clevertap-android-sdk:6.1.0" // 4.4.0 and above
implementation "com.clevertap.android:clevertap-android-sdk:6.1.1" // 4.4.0 and above
```

2. Add the following line to your Application class before the `onCreate()`
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ coroutines_test = "1.7.3"
installreferrer = "2.2"

#SDK Versions
clevertap_android_sdk = "6.1.0"
clevertap_android_sdk = "6.1.1"
clevertap_rendermax_sdk = "1.0.3"
clevertap_geofence_sdk = "1.3.0"
clevertap_hms_sdk = "1.3.4"
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"*/

remoteImplementation("com.clevertap.android:clevertap-android-sdk:6.1.0")
remoteImplementation("com.clevertap.android:clevertap-android-sdk:6.1.1")
remoteImplementation("com.clevertap.android:clevertap-geofence-sdk:1.3.0")
remoteImplementation("com.clevertap.android:clevertap-xiaomi-sdk:1.5.4")
remoteImplementation("com.clevertap.android:push-templates:1.2.3")
remoteImplementation("com.clevertap.android:clevertap-hms-sdk:1.3.4")

stagingImplementation("com.clevertap.android:clevertap-android-sdk:6.1.0")
stagingImplementation("com.clevertap.android:clevertap-android-sdk:6.1.1")
stagingImplementation("com.clevertap.android:clevertap-geofence-sdk:1.3.0")
stagingImplementation("com.clevertap.android:clevertap-xiaomi-sdk:1.5.4")
stagingImplementation("com.clevertap.android:push-templates:1.2.3")
Expand Down
8 changes: 8 additions & 0 deletions templates/CTCORECHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
## CleverTap Android SDK CHANGE LOG

### Version 6.1.1 (February 27, 2024)

#### Bug Fixes
* Fixes an issue of incorrect endpoint in the case of network handshake.
* Fixes a bug in Client Side InApps with regards to frequency limits.

### Version 6.1.0 (February 21, 2024)
> ⚠️ **NOTE**
Please update to 6.1.1 and above

#### New Features

Expand Down
Loading