Skip to content

Commit

Permalink
Merge pull request #97 from CleverTap/feature/geofence/SDK-105
Browse files Browse the repository at this point in the history
Release 3.9.0 SDK-340
  • Loading branch information
darshanclevertap authored Sep 1, 2020
2 parents a8822b9 + 12bcd88 commit 9fb4eeb
Show file tree
Hide file tree
Showing 24 changed files with 325 additions and 64 deletions.
2 changes: 1 addition & 1 deletion AndroidStarter/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

//CleverTap Android SDK, make sure the AAR file is in the libs folder
implementation (name: 'clevertap-android-sdk-3.8.2', ext: 'aar')
implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')

implementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM
implementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids
Expand Down
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## CHANGE LOG

### Version 3.9.0 (August 31, 2020)
* Adds support for CleverTap Geofence SDK
* Fixed all InApp related bugs and crashes
* Fixed the Product Experiences AB Testing crash on few Samsung devices

### Version 3.8.2 (July 25, 2020)
* Fixes a bug where ARP was not being sent back to servers

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ For more information check out our [website](https://clevertap.com "CleverTap")

```markdown
dependencies {
implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'
implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'
}
```

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:

```markdown
dependencies {
implementation (name: 'clevertap-android-sdk-3.8.1', ext: 'aar')
implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')
}
```

Then add the Firebase Messaging library and Android Support Library v4 as dependencies to your Module `build.gradle` file.

```markdown
dependencies {
implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'
implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.google.firebase:firebase-messaging:17.3.0'
implementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).
Expand Down
Binary file removed clevertap-android-sdk-3.8.2.aar
Binary file not shown.
Binary file added clevertap-android-sdk-3.9.0.aar
Binary file not shown.
12 changes: 9 additions & 3 deletions clevertap-android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ext {
siteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'
gitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'

libraryVersion = '3.8.2'
libraryVersion = '3.9.0'

developerId = 'clevertap'
developerName = 'CleverTap'
Expand Down Expand Up @@ -57,11 +57,11 @@ android {

buildTypes {
debug {
buildConfigField "String", "SDK_VERSION_STRING", '"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0"'
buildConfigField "String", "SDK_VERSION_STRING", '"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0"'
}

release {
buildConfigField "String", "SDK_VERSION_STRING", '"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0"'
buildConfigField "String", "SDK_VERSION_STRING", '"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0"'
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
Expand Down Expand Up @@ -153,6 +153,7 @@ install {
}
}
dependencies {
compileOnly fileTree(dir: 'libs', include: ['*.aar'])
compileOnly 'com.google.firebase:firebase-messaging:17.3.0'
compileOnly 'com.android.support:support-v4:28.0.0'
compileOnly 'com.google.android.exoplayer:exoplayer:2.8.4'
Expand All @@ -162,6 +163,7 @@ dependencies {
compileOnly 'com.android.support:design:28.0.0'
compileOnly 'com.github.bumptech.glide:glide:4.9.0'
implementation 'com.android.installreferrer:installreferrer:1.0'

// Unit testing dependencies
testImplementation 'junit:junit:4.13'
testImplementation 'org.mockito:mockito-core:2.25.0'
Expand All @@ -170,6 +172,10 @@ dependencies {
testImplementation 'androidx.test:core:1.2.0'
testImplementation "androidx.test.ext:junit:1.1.1"

testImplementation 'org.powermock:powermock-core:2.0.7'
testImplementation 'org.powermock:powermock-api-mockito2:2.0.7'
testImplementation 'org.powermock:powermock-module-junit4:2.0.7'

// AndroidJUnitRunner and JUnit Rules
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions clevertap-android-sdk/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.clevertap.android.sdk"
android:versionCode="30802"
android:versionName="3.8.2">
android:versionCode="30900"
android:versionName="3.9.0">
<application>
<activity
android:name="com.clevertap.android.sdk.InAppNotificationActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ boolean isTablet(){
float yInches= dm.heightPixels/dm.ydpi;
float xInches= dm.widthPixels/dm.xdpi;
double diagonalInches = Math.sqrt(xInches*xInches + yInches*yInches);
if (diagonalInches>=6.5){
if (diagonalInches>=7){
Logger.v("Screen size is : "+diagonalInches);
return true;
}else{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void generateListener() {

@Override
void cleanup() {
if (!isCleanedUp.get()) {
if (!Utils.isActivityDead(getActivity()) && !isCleanedUp.get()) {
final FragmentManager fragmentManager = parent.getFragmentManager();
FragmentTransaction transaction = fragmentManager.beginTransaction();
try {
Expand All @@ -39,4 +39,10 @@ void cleanup() {
}
isCleanedUp.set(true);
}

@Override
public void onDestroy() {
super.onDestroy();
didDismiss(null);
}
}
Loading

0 comments on commit 9fb4eeb

Please sign in to comment.