author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
116,621 | 30.11.2020 16:44:46 | -19,080 | a6531076eabeb1bea3129d7a0e6f00d3bf46e8da | fix(SDK-395): Added logs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyIdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyIdentityRepo.java",
"diff": "@@ -11,13 +11,21 @@ import com.clevertap.android.sdk.BaseCTApiListener;\n*/\npublic class LegacyIdentityRepo implements IdentityRepo {\n- private final IdentitySet identities;\n+ private static final String TAG = \"LegacyIdentityRepo\";\nprivate final BaseCTApiListener mCTApiListener;\n+ private IdentitySet identities;\n+\npublic LegacyIdentityRepo(final BaseCTApiListener ctApiListener) {\nthis.mCTApiListener = ctApiListener;\n+ loadIdentitySet();\n+ }\n+\n+ private void loadIdentitySet() {\nthis.identities = IdentitySet.getDefault();\n+ mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \" Setting the default IdentitySet[\" + identities + \"]\");\n}\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-395): Added logs |
116,612 | 30.11.2020 17:12:31 | -19,080 | e9708f21a37aa70f13e583cabe6799353158317f | fix(inApp tablet size): return immediately if device type is a TV | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -688,6 +688,7 @@ class DeviceInfo {\nUiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);\nif (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {\nsDeviceType = TV;\n+ return sDeviceType;\n}\n} catch (Exception e) {\n//uiModeManager or context is null\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet size): return immediately if device type is a TV #116 SDK-492 |
116,623 | 30.11.2020 23:03:41 | -19,080 | 4b02d469cceb0bfb9c1864f4df2e17469bcf6fb1 | chore: Updated CHANGELOG and modified README | [
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n+* Adds support for Android 11.\n+* Adds deprecation warnings for Product A/B Tests public methods.\n* Fix for multiple App Launched and App Installed events in the first session.\n* Fixes crash which occurred due to wrong classification of some mobile devices as tablets #116.\n* Optimized proguard rules for better obfuscation.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n+* Adds support for Android 11.\n+* Adds deprecation warnings for Product A/B Tests public methods.\n* Fix for multiple App Launched and App Installed events in the first session.\n* Fixes crash which occurred due to wrong classification of some mobile devices as tablets #116.\n* Optimized proguard rules for better obfuscation.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/README.md",
"new_path": "templates/README.md",
"diff": "</p>\n# CleverTap Android SDKs\n-[](https://app.bitrise.io/app/09efc6b9404a6341)\n+[](https://app.bitrise.io/app/09efc6b9404a6341)\n[](https://codebeat.co/projects/github-com-clevertap-clevertap-android-sdk-master)\n[  ](https://bintray.com/clevertap/Maven/CleverTapAndroidSDK/_latestVersion)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore: Updated CHANGELOG and modified README |
116,612 | 02.12.2020 15:18:51 | -19,080 | 119cd58fa375d4907a0fc9e13d1ffd184043a469 | chore(android 11): remove android 11 support,schedule for next release | [
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n-* Adds support for Android 11.\n* Adds deprecation warnings for Product A/B Tests public methods.\n* Fix for multiple App Launched and App Installed events in the first session.\n* Fixes crash which occurred due to wrong classification of some mobile devices as tablets #116.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n-* Adds support for Android 11.\n* Adds deprecation warnings for Product A/B Tests public methods.\n* Fix for multiple App Launched and App Installed events in the first session.\n* Fixes crash which occurred due to wrong classification of some mobile devices as tablets #116.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(android 11): remove android 11 support,schedule for next release |
116,621 | 22.12.2020 17:49:25 | -19,080 | b5a4a18d0f5a4a8f9cf77aa8e2e5c312ec7edc3e | bug(SDK-590): Fix for Inapp not working SDK V4.0.1 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -248,7 +248,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nbeta = in.readByte() != 0x00;\nallowedPushTypes = new ArrayList<>();\nin.readList(allowedPushTypes, String.class.getClassLoader());\n- in.readStringArray(indentityKeys);\n+ indentityKeys = in.createStringArray();\n}\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | bug(SDK-590): Fix for Inapp not working SDK V4.0.1 |
116,621 | 23.12.2020 12:59:11 | -19,080 | ba5190d9ca72e4260a19963ba1015998f0956480 | fix(SDK-591): fixes Github | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -4273,8 +4273,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n+ if (CleverTapAPI.this.inboxListener != null) {\nCleverTapAPI.this.inboxListener.inboxMessagesDidUpdate();\n}\n+ }\n});\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-591): fixes Github : #134 |
116,621 | 28.12.2020 11:48:31 | -19,080 | 9bad22c2c325554c988c97d815543a3fd771c285 | fix(SDK-583): Release config updated for v4.0.2 | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -5,7 +5,7 @@ ext {\nbuildToolsVersionVal = \"29.0.3\"\n// CleverTap modules\n- coreVersion = \"4.0.1\"\n+ coreVersion = \"4.0.2\"\ngeofenceVersion = \"1.0.1\"\nhmsVersion = \"1.0.0\"\nxpsVersion = \"1.0.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.0.2 (December 28, 2020)\n+* Fix for In-apps/Inbox not rendering in v4.0.1 on using configurable Clevertap Identities feature introduced in v4.0.1\n+\n### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n* Adds deprecation warnings for Product A/B Tests public methods.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-583): Release config updated for v4.0.2 |
116,621 | 28.12.2020 12:36:21 | -19,080 | f10c9c352c729bb12401c80951d6339c4044f503 | fix(SDK-583): Release docs updated for v4.0.2 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/GoogleLocationAdapterTest.java",
"new_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/GoogleLocationAdapterTest.java",
"diff": "@@ -237,6 +237,7 @@ public class GoogleLocationAdapterTest extends BaseTestCase {\n}\n@Test\n+ @Ignore\npublic void testRequestLocationUpdatesTC3() throws Exception {\n// when backgroundLocationUpdates is enabled and fetch mode is last location\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.0.2 (December 28, 2020)\n+* Fix for In-apps/Inbox not rendering in v4.0.1 on using configurable Clevertap Identities feature introduced in v4.0.1\n+\n### Version 4.0.1 (November 30, 2020)\n* Adds support for configurable CleverTap identifiers.\n* Adds deprecation warnings for Product A/B Tests public methods.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-583): Release docs updated for v4.0.2 |
116,621 | 28.12.2020 12:38:44 | -19,080 | d1a77ae5af04fd0bcf82658daeea3f228ed67eca | chore(SDK-583): renaming of fields | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -69,7 +69,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean personalization;\n- private String[] indentityKeys = NullConstants.NULL_STRING_ARRAY;\n+ private String[] identityKeys = NullConstants.NULL_STRING_ARRAY;\nprivate boolean sslPinning;\n@@ -119,7 +119,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.packageName = config.packageName;\nthis.beta = config.beta;\nthis.allowedPushTypes = config.allowedPushTypes;\n- this.indentityKeys = config.indentityKeys;\n+ this.identityKeys = config.identityKeys;\n}\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion,\n@@ -149,9 +149,9 @@ public class CleverTapInstanceConfig implements Parcelable {\n* For default instance, use manifest meta, otherwise use from setter field\n*/\nif (isDefaultInstance) {\n- indentityKeys = manifest.getProfileKeys();\n+ identityKeys = manifest.getProfileKeys();\nlog(LogConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys from Manifest: \" + Arrays\n- .toString(indentityKeys));\n+ .toString(identityKeys));\n}\n}\n@@ -218,7 +218,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.getJSONArray(Constants.KEY_ALLOWED_PUSH_TYPES));\n}\nif (configJsonObject.has(Constants.KEY_IDENTITY_TYPES)) {\n- this.indentityKeys = (String[]) toArray(configJsonObject.getJSONArray(Constants.KEY_IDENTITY_TYPES));\n+ this.identityKeys = (String[]) toArray(configJsonObject.getJSONArray(Constants.KEY_IDENTITY_TYPES));\n}\n} catch (Throwable t) {\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString + \": \", t.getCause());\n@@ -248,7 +248,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nbeta = in.readByte() != 0x00;\nallowedPushTypes = new ArrayList<>();\nin.readList(allowedPushTypes, String.class.getClassLoader());\n- indentityKeys = in.createStringArray();\n+ identityKeys = in.createStringArray();\n}\n@Override\n@@ -312,7 +312,7 @@ public class CleverTapInstanceConfig implements Parcelable {\n}\npublic String[] getIdentityKeys() {\n- return indentityKeys;\n+ return identityKeys;\n}\n@SuppressWarnings({\"BooleanMethodIsAlwaysInverted\", \"WeakerAccess\"})\n@@ -367,9 +367,9 @@ public class CleverTapInstanceConfig implements Parcelable {\npublic void setIdentityKeys(@IdentityType String... identityKeys) {\nif (!isDefaultInstance) {\n- this.indentityKeys = identityKeys;\n+ this.identityKeys = identityKeys;\nlog(LogConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys via setter: \" + Arrays\n- .toString(this.indentityKeys));\n+ .toString(this.identityKeys));\n}\n}\n@@ -399,7 +399,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeString(packageName);\ndest.writeByte((byte) (beta ? 0x01 : 0x00));\ndest.writeList(allowedPushTypes);\n- dest.writeStringArray(indentityKeys);\n+ dest.writeStringArray(identityKeys);\n}\nboolean getEnableCustomCleverTapId() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-583): renaming of fields |
116,623 | 05.01.2021 11:31:35 | -19,080 | 03968d37b6c695699b49b2c7542c7019b6253966 | task(SDK-610): Fixes versionCode and versionName issue due to AGP 4.1.0 | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -34,6 +34,10 @@ android {\nversionCode \"${major}0${minor}0${patch}\".toInteger()\nversionName libraryVersion\n+ //AGP 4.1.0 change https://developer.android.com/studio/releases/gradle-plugin#version_properties_removed_from_buildconfig_class_in_library_projects\n+ buildConfigField (\"int\", \"VERSION_CODE\", \"\\\"$versionCode\\\"\")\n+ buildConfigField (\"String\", \"VERSION_NAME\", \"\\\"$versionName\\\"\")\n+\ntestInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\nconsumerProguardFiles 'consumer-rules.pro'\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-610): Fixes versionCode and versionName issue due to AGP 4.1.0 |
116,623 | 05.01.2021 11:45:44 | -19,080 | 4534549ec1707497dc476d0cdabf9208aa6dd752 | task(SDK-610): Fixes versionCode to int and removed deprecated method from TestApplication.kt | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -35,7 +35,7 @@ android {\nversionName libraryVersion\n//AGP 4.1.0 change https://developer.android.com/studio/releases/gradle-plugin#version_properties_removed_from_buildconfig_class_in_library_projects\n- buildConfigField (\"int\", \"VERSION_CODE\", \"\\\"$versionCode\\\"\")\n+ buildConfigField (\"int\", \"VERSION_CODE\", \"$versionCode\")\nbuildConfigField (\"String\", \"VERSION_NAME\", \"\\\"$versionName\\\"\")\ntestInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/TestApplication.kt",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/TestApplication.kt",
"diff": "@@ -9,7 +9,6 @@ import com.clevertap.android.sdk.CleverTapAPI\nclass TestApplication : Application() {\noverride fun onCreate() {\n- CleverTapAPI.setUIEditorConnectionEnabled(true)\nCleverTapAPI.setDebugLevel(3)\nActivityLifecycleCallback.register(this)\nsuper.onCreate()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-610): Fixes versionCode to int and removed deprecated method from TestApplication.kt |
116,612 | 13.01.2021 19:03:36 | -19,080 | a192e5a289d351a96c2f424247d0022962caf2b7 | task(refactor): Create stubs | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class BaseResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+abstract class CleverTapResponse {\n+\n+ abstract void processResponse();\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class DisplayUnitResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventProcessor.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import org.json.JSONObject;\n+\n+class EventProcessor {\n+\n+ void processEvent(final Context context, final JSONObject event, final int eventType) {\n+ // TODO implementation\n+ }\n+\n+ void processPushNotificationViewedEvent(final Context context, final JSONObject event) {\n+ // TODO implementation\n+ }\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class FeatureFlagResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/GeofenceResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class GeofenceResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class InAppResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class InboxResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO Implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/JobManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import androidx.annotation.Nullable;\n+import java.util.concurrent.Future;\n+\n+class JobManager {\n+\n+ @Nullable\n+ Future<?> postAsyncSafely(final String name, final Runnable runnable) {\n+ // TODO implementation\n+ return null;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import java.io.IOException;\n+import javax.net.ssl.HttpsURLConnection;\n+import org.json.JSONArray;\n+\n+class NetworkManager {\n+\n+ HttpsURLConnection buildHttpsURLConnection(final String endpoint)\n+ throws IOException {\n+ // TODO implementation\n+ return null;\n+ }\n+\n+ String getDomain(boolean defaultToHandshakeURL, final EventGroup eventGroup) {\n+ // TODO implementation\n+ return null;\n+ }\n+\n+ String getDomainFromPrefsOrMetadata(final EventGroup eventGroup) {\n+ // TODO implementation\n+ return null;\n+ }\n+\n+ String getEndpoint(final boolean defaultToHandshakeURL, final EventGroup eventGroup) {\n+ // TODO implementation\n+ return null;\n+ }\n+\n+ boolean hasDomainChanged(final String newDomain) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ String insertHeader(Context context, JSONArray arr) {\n+ // TODO implementation\n+ return null;\n+ }\n+\n+ boolean isNetworkOnline(Context context) {\n+\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ boolean needsHandshakeForDomain(final EventGroup eventGroup) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ void performHandshakeForDomain(final Context context, final EventGroup eventGroup,\n+ final Runnable handshakeSuccessCallback) {\n+ // TODO implementation\n+ }\n+\n+ boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ boolean sendQueue(final Context context, final EventGroup eventGroup, final JSONArray queue) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ void setDomain(final Context context, String domainName) {\n+ // TODO implementation\n+ }\n+\n+ void setSpikyDomain(final Context context, String spikyDomainName) {\n+ // TODO implementation\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class ProductConfigResponse extends CleverTapResponse {\n+\n+ @Override\n+ void processResponse() {\n+ // TODO implementation\n+ }\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): Create stubs SDK-628 |
116,621 | 14.01.2021 19:33:20 | -19,080 | 3f4e2da12da93bd520e13bcd2a01d4713f19a5e8 | tasj(SDK-627): Added Event mediator | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -110,6 +110,10 @@ import org.json.JSONObject;\n*/\npublic class CleverTapAPI implements CleverTapAPIListener {\n+ private final EventMediator mEventMediator;\n+\n+ private final CleverTapMetaData mCleverTapMetaData;\n+\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -1266,6 +1270,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nLogger.i(\"CleverTap SDK initialized with accountId: \" + config.getAccountId() + \" accountToken: \" + config\n.getAccountToken() + \" accountRegion: \" + config.getAccountRegion());\n+ mCleverTapMetaData = new CleverTapMetaData();\n+ mEventMediator = new EventMediator(mCleverTapMetaData, this.config);\n}\n/**\n@@ -6722,10 +6728,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn postAsyncSafely(\"queueEvent\", new Runnable() {\n@Override\npublic void run() {\n- if (shouldDropEvent(event, eventType)) {\n+ if (mEventMediator.shouldDropEvent(event, eventType)) {\nreturn;\n}\n- if (shouldDeferProcessingEvent(event, eventType)) {\n+ if (mEventMediator.shouldDeferProcessingEvent(event, eventType)) {\ngetConfigLogger().debug(getAccountId(),\n\"App Launched not yet processed, re-queuing event \" + event + \"after 2s\");\ngetHandlerUsingMainLooper().postDelayed(new Runnable() {\n@@ -7208,43 +7214,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nspikyDomainName);\n}\n- private boolean shouldDeferProcessingEvent(JSONObject event, int eventType) {\n- //noinspection SimplifiableIfStatement\n- if (getConfig().isCreatedPostAppLaunch()) {\n- return false;\n- }\n- if (event.has(\"evtName\")) {\n- try {\n- if (Arrays.asList(Constants.SYSTEM_EVENTS).contains(event.getString(\"evtName\"))) {\n- return false;\n- }\n- } catch (JSONException e) {\n- //no-op\n- }\n- }\n- return (eventType == Constants.RAISED_EVENT && !isAppLaunchPushed());\n- }\n-\n// ******** Feature Flags Internal methods *****//\n- private boolean shouldDropEvent(JSONObject event, int eventType) {\n- if (eventType == Constants.FETCH_EVENT) {\n- return false;\n- }\n-\n- if (isCurrentUserOptedOut()) {\n- String eventString = event == null ? \"null\" : event.toString();\n- getConfigLogger().debug(getAccountId(), \"Current user is opted out dropping event: \" + eventString);\n- return true;\n- }\n-\n- if (isMuted()) {\n- getConfigLogger().verbose(getAccountId(), \"CleverTap is muted, dropping event - \" + event.toString());\n- return true;\n- }\n-\n- return false;\n- }\nprivate void showInAppNotificationIfAny() {\nif (!this.config.isAnalyticsOnly()) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Event.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+\n+import org.json.JSONObject;\n+\n+public class Event {\n+\n+ private final String eventName;\n+\n+ private final int eventType;\n+\n+ private final JSONObject payload;\n+\n+ private Event(final Builder builder) {\n+ eventName = builder.eventName;\n+ eventType = builder.eventType;\n+ payload = builder.payload;\n+ }\n+\n+ public static class Builder {\n+\n+ private final String eventName;\n+\n+ private final int eventType;\n+\n+ private JSONObject payload;\n+\n+ public Builder(final String eventName, final int eventType) {\n+ this.eventName = eventName;\n+ this.eventType = eventType;\n+ }\n+\n+ public Builder payload(JSONObject jsonObject) {\n+ this.payload = jsonObject;\n+ return this;\n+ }\n+\n+ public Event build() {\n+ return new Event(this);\n+ }\n+ }\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventManager.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import org.json.JSONObject;\n-\n-public class EventManager {\n- boolean shouldDropEvent(JSONObject event, int eventType){\n- //TODO\n- return false;\n- }\n- boolean shouldDeferProcessingEvent(JSONObject event, int eventType){\n- //TODO\n- return false;\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventMediator.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import java.util.Arrays;\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\n+public class EventMediator {\n+\n+ public EventMediator(final CleverTapMetaData cleverTapMetaData, final CleverTapInstanceConfig config) {\n+ mCleverTapMetaData = cleverTapMetaData;\n+ mConfig = config;\n+ }\n+\n+ private final CleverTapMetaData mCleverTapMetaData;\n+\n+ private final CleverTapInstanceConfig mConfig;\n+\n+ boolean shouldDropEvent(JSONObject event, int eventType) {\n+ if (eventType == Constants.FETCH_EVENT) {\n+ return false;\n+ }\n+\n+ if (mCleverTapMetaData.isCurrentUserOptedOut()) {\n+ String eventString = event == null ? \"null\" : event.toString();\n+ mConfig.getLogger()\n+ .debug(mConfig.getAccountId(), \"Current user is opted out dropping event: \" + eventString);\n+ return true;\n+ }\n+\n+ if (mCleverTapMetaData.isMuted()) {\n+ mConfig.getLogger()\n+ .verbose(mConfig.getAccountId(), \"CleverTap is muted, dropping event - \" + event.toString());\n+ return true;\n+ }\n+\n+ return false;\n+ }\n+\n+ boolean shouldDeferProcessingEvent(JSONObject event, int eventType) {\n+ //noinspection SimplifiableIfStatement\n+ if (mConfig.isCreatedPostAppLaunch()) {\n+ return false;\n+ }\n+ if (event.has(\"evtName\")) {\n+ try {\n+ if (Arrays.asList(Constants.SYSTEM_EVENTS).contains(event.getString(\"evtName\"))) {\n+ return false;\n+ }\n+ } catch (JSONException e) {\n+ //no-op\n+ }\n+ }\n+ return (eventType == Constants.RAISED_EVENT && !mCleverTapMetaData.isAppLaunchPushed());\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle/wrapper/gradle-wrapper.properties",
"new_path": "gradle/wrapper/gradle-wrapper.properties",
"diff": "-#Mon Jan 04 19:17:11 IST 2021\n+#Wed Jan 13 18:15:35 IST 2021\ndistributionBase=GRADLE_USER_HOME\ndistributionPath=wrapper/dists\nzipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-bin.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-all.zip\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | tasj(SDK-627): Added Event mediator |
116,621 | 15.01.2021 02:39:04 | -19,080 | d53d91b4c926d80b4255ed302451076d7dfcc2ed | task(609):Add synchronized as per CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -237,8 +237,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate String currentScreenName = \"\";\n- private boolean currentUserOptedOut = false;\n-\nprivate DBAdapter dbAdapter;\nprivate final DeviceInfo deviceInfo;\n@@ -317,8 +315,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate boolean offline = false;\n- private final Object optOutFlagLock = new Object();\n-\nprivate Runnable pendingInappRunnable = null;\nprivate String processingUserLoginIdentifier = null;\n@@ -3243,9 +3239,9 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// determine order of operations depending on enabled/disabled\nif (enable) { // if opting out first push profile event then set the flag\npushProfile(optOutMap);\n- setCurrentUserOptedOut(true);\n+ mCleverTapMetaData.setCurrentUserOptedOut(true);\n} else { // if opting back in first reset the flag to false then push the profile event\n- setCurrentUserOptedOut(false);\n+ mCleverTapMetaData.setCurrentUserOptedOut(false);\npushProfile(optOutMap);\n}\n// persist the new optOut state\n@@ -4270,7 +4266,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n+ \" with Cached GUID \" + ((cacheGuid != null) ? cachedGUID\n: \"NULL\" + \" and cleverTapID \" + cleverTapID));\n//set optOut to false on the current user to unregister the device token\n- setCurrentUserOptedOut(false);\n+ mCleverTapMetaData.setCurrentUserOptedOut(false);\n// unregister the device token on the current user\nforcePushDeviceToken(false);\n@@ -5445,17 +5441,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn this.mConfig.isDisableAppLaunchedEvent();\n}\n- private boolean isCurrentUserOptedOut() {\n- synchronized (optOutFlagLock) {\n- return currentUserOptedOut;\n- }\n- }\n-\n- private void setCurrentUserOptedOut(boolean enable) {\n- synchronized (optOutFlagLock) {\n- currentUserOptedOut = enable;\n- }\n- }\nprivate boolean isErrorDeviceId() {\nreturn this.deviceInfo.isErrorDeviceId();\n@@ -6805,7 +6790,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn;\n}\nboolean storedOptOut = StorageHelper.getBooleanFromPrefs(context, mConfig, key);\n- setCurrentUserOptedOut(storedOptOut);\n+ mCleverTapMetaData.setCurrentUserOptedOut(storedOptOut);\ngetConfigLogger().verbose(getAccountId(),\n\"Set current user OptOut state from storage to: \" + storedOptOut + \" for key: \" + key);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapMetaData.java",
"diff": "@@ -18,6 +18,12 @@ class CleverTapMetaData {\nprivate boolean appLaunchPushed = false;\n+ private boolean currentUserOptedOut = false;\n+\n+ private final Object optOutFlagLock = new Object();\n+\n+ private final Object appLaunchPushedLock = new Object();\n+\nvoid setFirstSession(final boolean firstSession) {\nthis.firstSession = firstSession;\n@@ -70,26 +76,30 @@ class CleverTapMetaData {\nreturn false;\n}\n- void setCurrentUserOptedOut(boolean enable){\n- //TODO\n- }\n- boolean isCurrentUserOptedOut(){\n- //TODO\n- return false;\n- }\n-\nboolean isAppLaunchPushed() {\n- synchronized (this){\n+ synchronized (appLaunchPushedLock) {\nreturn appLaunchPushed;\n}\n}\nvoid setAppLaunchPushed(boolean pushed) {\n- synchronized (this) {\n+ synchronized (appLaunchPushedLock) {\nappLaunchPushed = pushed;\n}\n}\n+ boolean isCurrentUserOptedOut() {\n+ synchronized (optOutFlagLock) {\n+ return currentUserOptedOut;\n+ }\n+ }\n+\n+ void setCurrentUserOptedOut(boolean enable) {\n+ synchronized (optOutFlagLock) {\n+ currentUserOptedOut = enable;\n+ }\n+ }\n+\n//Session\nint getLastSessionLength() {\nreturn lastSessionLength;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(609):Add synchronized as per CleverTapAPI |
116,621 | 18.01.2021 14:19:40 | -19,080 | 91bde568129ab61a09a913f19c5db450d89fb6ce | task(SDK-609):Use Clevertapstate for accessing common classes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -335,8 +335,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate final Validator validator;\n-\n- private CoreState mCoreState;\n+ private CleverTapState mCleverTapState;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -1291,8 +1290,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- CoreState getCoreState() {\n- return mCoreState;\n+ CleverTapState getCleverTapState() {\n+ return mCleverTapState;\n}\n/**\n@@ -4337,8 +4336,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n});\n}\n- void setCoreState(final CoreState coreState) {\n- mCoreState = coreState;\n+ void setCoreState(final CleverTapState cleverTapState) {\n+ mCleverTapState = cleverTapState;\n}\n/**\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Use Clevertapstate for accessing common classes |
116,612 | 19.01.2021 12:06:33 | -19,080 | c631e0d88ad0d34ca644a6c66c1d25bf2b5ec519 | task(refactor): move performHandshakeForDomain() to NetworkManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -137,6 +137,64 @@ class NetworkManager extends BaseNetworkManager {\nreturn StorageHelper.getIntFromPrefs(mContext, mConfig, Constants.KEY_FIRST_TS, 0);\n}\n+ void performHandshakeForDomain(final Context context, final EventGroup eventGroup,\n+ final Runnable handshakeSuccessCallback) {\n+ final String endpoint = getEndpoint(true, eventGroup);\n+ if (endpoint == null) {\n+ mLogger.verbose(mConfig.getAccountId(), \"Unable to perform handshake, endpoint is null\");\n+ }\n+ mLogger.verbose(mConfig.getAccountId(), \"Performing handshake with \" + endpoint);\n+\n+ HttpsURLConnection conn = null;\n+ try {\n+ conn = buildHttpsURLConnection(endpoint);\n+ final int responseCode = conn.getResponseCode();\n+ if (responseCode != 200) {\n+ mLogger\n+ .verbose(mConfig.getAccountId(),\n+ \"Invalid HTTP status code received for handshake - \" + responseCode);\n+ return;\n+ }\n+\n+ mLogger.verbose(mConfig.getAccountId(), \"Received success from handshake :)\");\n+\n+ if (processIncomingHeaders(context, conn)) {\n+ mLogger.verbose(mConfig.getAccountId(), \"We are not muted\");\n+ // We have a new domain, run the callback\n+ handshakeSuccessCallback.run();\n+ }\n+ } catch (Throwable t) {\n+ mLogger.verbose(mConfig.getAccountId(), \"Failed to perform handshake!\", t);\n+ } finally {\n+ if (conn != null) {\n+ try {\n+ conn.getInputStream().close();\n+ conn.disconnect();\n+ } catch (Throwable t) {\n+ // Ignore\n+ }\n+ }\n+ }\n+ }\n+\n+ boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ boolean sendQueue(final Context context, final EventGroup eventGroup, final JSONArray queue) {\n+ // TODO implementation\n+ return true;\n+ }\n+\n+ void setDomain(final Context context, String domainName) {\n+ // TODO implementation\n+ }\n+\n+ void setSpikyDomain(final Context context, String spikyDomainName) {\n+ // TODO implementation\n+ }\n+\nint getLastRequestTimestamp() {\nreturn StorageHelper.getIntFromPrefs(mContext, mConfig, Constants.KEY_LAST_TS, 0);\n}\n@@ -178,25 +236,6 @@ class NetworkManager extends BaseNetworkManager {\nreturn true;\n}\n- void performHandshakeForDomain(final Context context, final EventGroup eventGroup,\n- final Runnable handshakeSuccessCallback) {\n- // TODO implementation\n- }\n-\n- boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n- // TODO implementation\n- return true;\n- }\n-\n- boolean sendQueue(final Context context, final EventGroup eventGroup, final JSONArray queue) {\n- // TODO implementation\n- return true;\n- }\n-\n- void setDomain(final Context context, String domainName) {\n- // TODO implementation\n- }\n-\nvoid setFirstRequestTimestampIfNeeded(int ts) {\nif (getFirstRequestTimestamp() > 0) {\nreturn;\n@@ -204,10 +243,6 @@ class NetworkManager extends BaseNetworkManager {\nStorageHelper.putInt(mContext, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_FIRST_TS), ts);\n}\n- void setSpikyDomain(final Context context, String spikyDomainName) {\n- // TODO implementation\n- }\n-\nstatic boolean isNetworkOnline(Context context) {\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): move performHandshakeForDomain() to NetworkManager SDK-628 |
116,621 | 19.01.2021 17:36:25 | -19,080 | b979f58e745d67a4cb0aab92d98e3b06375c5cad | task(SDK-609):Fixed build error due to refactoring | [
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsMessageHandlerImpl.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsMessageHandlerImpl.java",
"diff": "@@ -44,7 +44,7 @@ class HmsMessageHandlerImpl implements IHmsMessageHandler {\n.getGlobalInstance(context, getAccountIdFromNotificationBundle(messageBundle));\nCleverTapAPI.createNotification(context, messageBundle);\nif (cleverTapAPI != null) {\n- cleverTapAPI.config().log(LOG_TAG, HMS_LOG_TAG + \"Creating Notification\");\n+ cleverTapAPI.getCoreState().getConfig().log(LOG_TAG, HMS_LOG_TAG + \"Creating Notification\");\n} else {\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"Creating Notification\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageHandlerImpl.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageHandlerImpl.java",
"diff": "@@ -57,7 +57,7 @@ class XiaomiMessageHandlerImpl implements IMiMessageHandler {\n.getGlobalInstance(context, getAccountIdFromNotificationBundle(messageBundle));\nCleverTapAPI.createNotification(context, messageBundle);\nif (cleverTapAPI != null) {\n- cleverTapAPI.config().log(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n+ cleverTapAPI.getCoreState().getConfig().log(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n} else {\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Fixed build error due to refactoring |
116,621 | 19.01.2021 19:30:20 | -19,080 | c57b8fae2c6e9431e87e831a08b2020516d0ba0d | task(SDK-609):Added methods of Dbmanager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -206,8 +206,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate final int currentRequestTimestamp = 0;\n- private DBAdapter dbAdapter;\n-\nprivate final Object displayUnitControllerLock = new Object();\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n@@ -3454,9 +3452,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\ntry {\ngetConfigLogger()\n.debug(getAccountId(), \"Handling notification: \" + extras.toString());\n- dbAdapter = loadDBAdapter(context);\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\n- if (dbAdapter\n+ if (getCoreState().getDatabaseManager().loadDBAdapter(context)\n.doesPushNotificationIdExist(extras.getString(Constants.WZRK_PUSH_ID))) {\ngetConfigLogger().debug(getAccountId(),\n\"Push Notification already rendered, not showing again\");\n@@ -3470,7 +3467,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\ngetConfigLogger()\n.verbose(getAccountId(),\n\"Push notification message is empty, not rendering\");\n- loadDBAdapter(context).storeUninstallTimestamp();\n+ getCoreState().getDatabaseManager().loadDBAdapter(context).storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n@@ -3595,7 +3592,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn;\n}\nif (getCleverTapID() != null) {\n- this.ctInboxController = new CTInboxController(getCleverTapID(), loadDBAdapter(context),\n+ this.ctInboxController = new CTInboxController(getCleverTapID(), getCoreState().getDatabaseManager().loadDBAdapter(context),\nhaveVideoPlayerSupport);\n_notifyInboxInitialized();\n} else {\n@@ -4362,7 +4359,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate void clearQueues(final Context context) {\nsynchronized (getCoreState().getCTLockManager().getEventLock()) {\n- DBAdapter adapter = loadDBAdapter(context);\n+ DBAdapter adapter = getCoreState().getDatabaseManager().loadDBAdapter(context);\nDBAdapter.Table tableName = DBAdapter.Table.EVENTS;\nadapter.removeEvents(tableName);\n@@ -4919,7 +4916,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nString key = iterator.next().toString();\npushBundle.putString(key, pushObject.getString(key));\n}\n- if (!pushBundle.isEmpty() && !dbAdapter\n+ if (!pushBundle.isEmpty() && !getCoreState().getDatabaseManager().loadDBAdapter(context)\n.doesPushNotificationIdExist(pushObject.getString(\"wzrk_pid\"))) {\ngetConfigLogger().verbose(\"Creating Push Notification locally\");\nif (pushAmpListener != null) {\n@@ -5045,7 +5042,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nheader.put(\"bk\", 1);\ngetCoreState().getCoreMetaData().setBgPing(false);\n}\n- header.put(\"rtl\", getRenderedTargetList(this.dbAdapter));\n+ header.put(\"rtl\", getRenderedTargetList(getCoreState().getDatabaseManager().loadDBAdapter(context)));\nif (!installReferrerDataSent) {\nheader.put(\"rct\", getReferrerClickTime());\nheader.put(\"ait\", getAppInstallTime());\n@@ -5155,16 +5152,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n//Util\n- private DBAdapter loadDBAdapter(Context context) {\n- if (dbAdapter == null) {\n- dbAdapter = new DBAdapter(context, getCoreState().getConfig());\n- dbAdapter.cleanupStaleEvents(DBAdapter.Table.EVENTS);\n- dbAdapter.cleanupStaleEvents(DBAdapter.Table.PROFILE_EVENTS);\n- dbAdapter.cleanupStaleEvents(DBAdapter.Table.PUSH_NOTIFICATION_VIEWED);\n- dbAdapter.cleanUpPushNotifications();\n- }\n- return dbAdapter;\n- }\n//Run manifest validation in async\nprivate void manifestAsyncValidation() {\n@@ -5398,7 +5385,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (notifMessage.isEmpty()) {\n//silent notification\ngetConfigLogger().verbose(getAccountId(), \"Push notification message is empty, not rendering\");\n- loadDBAdapter(context).storeUninstallTimestamp();\n+ getCoreState().getDatabaseManager().loadDBAdapter(context).storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n@@ -5408,7 +5395,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nString ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\n- DBAdapter dbAdapter = loadDBAdapter(context);\n+ DBAdapter dbAdapter = getCoreState().getDatabaseManager().loadDBAdapter(context);\ngetConfigLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\ndbAdapter.storePushNotificationId(wzrk_pid, wzrk_ttl);\n}\n@@ -5831,7 +5818,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nboolean ack = pushAmpObject.getBoolean(\"ack\");\ngetConfigLogger().verbose(\"Received ACK -\" + ack);\nif (ack) {\n- JSONArray rtlArray = getRenderedTargetList(this.dbAdapter);\n+ JSONArray rtlArray = getRenderedTargetList(getCoreState().getDatabaseManager().loadDBAdapter(context));\nString[] rtlStringArray = new String[0];\nif (rtlArray != null) {\nrtlStringArray = new String[rtlArray.length()];\n@@ -5840,7 +5827,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nrtlStringArray[i] = rtlArray.getString(i);\n}\ngetConfigLogger().verbose(\"Updating RTL values...\");\n- this.dbAdapter.updatePushNotificationIds(rtlStringArray);\n+ getCoreState().getDatabaseManager().loadDBAdapter(context).updatePushNotificationIds(rtlStringArray);\n}\n}\n}\n@@ -6081,7 +6068,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn;\n}\n- long lastTS = loadDBAdapter(context).getLastUninstallTimestamp();\n+ long lastTS = getCoreState().getDatabaseManager().loadDBAdapter(context).getLastUninstallTimestamp();\nif (lastTS == 0 || lastTS > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {\ntry {\n@@ -6724,7 +6711,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n- DBAdapter dbAdapter = loadDBAdapter(context);\n+ DBAdapter dbAdapter = getCoreState().getDatabaseManager().loadDBAdapter(context);\ngetConfigLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\ndbAdapter.storePushNotificationId(wzrk_pid, wzrk_ttl);\n@@ -6763,27 +6750,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// ******** PRODUCT CONFIG Public API *****//\n- // helper extracts the cursor data from the db object\n- private QueueCursor updateCursorForDBObject(JSONObject dbObject, QueueCursor cursor) {\n-\n- if (dbObject == null) {\n- return cursor;\n- }\n-\n- Iterator<String> keys = dbObject.keys();\n- if (keys.hasNext()) {\n- String key = keys.next();\n- cursor.setLastId(key);\n- try {\n- cursor.setData(dbObject.getJSONArray(key));\n- } catch (JSONException e) {\n- cursor.setLastId(null);\n- cursor.setData(null);\n- }\n- }\n-\n- return cursor;\n- }\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBManager.java",
"diff": "@@ -2,13 +2,16 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport com.clevertap.android.sdk.DBAdapter.Table;\n+import java.util.Iterator;\nimport org.json.JSONArray;\n+import org.json.JSONException;\nimport org.json.JSONObject;\npublic class DBManager extends BaseDatabaseManager {\nprivate final CleverTapInstanceConfig mConfig;\nprivate final CTLockManager mCTLockManager;\nprivate final BaseNetworkManager mBaseNetworkManager;\n+ private DBAdapter dbAdapter;\npublic DBManager(CoreState coreState) {\nmConfig = coreState.getConfig();\nmCTLockManager =coreState.getCTLockManager();\n@@ -32,14 +35,39 @@ public class DBManager extends BaseDatabaseManager {\nqueueEventInternal(context, event, DBAdapter.Table.PUSH_NOTIFICATION_VIEWED);\n}\n+ // helper extracts the cursor data from the db object\n+\n@Override\nQueueCursor updateCursorForDBObject(final JSONObject dbObject, final QueueCursor cursor) {\n- return null;\n+ if (dbObject == null) {\n+ return cursor;\n+ }\n+\n+ Iterator<String> keys = dbObject.keys();\n+ if (keys.hasNext()) {\n+ String key = keys.next();\n+ cursor.setLastId(key);\n+ try {\n+ cursor.setData(dbObject.getJSONArray(key));\n+ } catch (JSONException e) {\n+ cursor.setLastId(null);\n+ cursor.setData(null);\n+ }\n+ }\n+\n+ return cursor;\n}\n@Override\nDBAdapter loadDBAdapter(final Context context) {\n- return null;\n+ if (dbAdapter == null) {\n+ dbAdapter = new DBAdapter(context, mConfig);\n+ dbAdapter.cleanupStaleEvents(DBAdapter.Table.EVENTS);\n+ dbAdapter.cleanupStaleEvents(DBAdapter.Table.PROFILE_EVENTS);\n+ dbAdapter.cleanupStaleEvents(DBAdapter.Table.PUSH_NOTIFICATION_VIEWED);\n+ dbAdapter.cleanUpPushNotifications();\n+ }\n+ return dbAdapter;\n}\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Added methods of Dbmanager |
116,612 | 21.01.2021 15:03:23 | -19,080 | ce9221ac5432ab2505e92d38292fd4af9f6606e1 | task(refactor): move methods to NetworkManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -203,7 +203,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate CoreState mCoreState;\n- private int mResponseFailureCount = 0;\n+ private final int mResponseFailureCount = 0;\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\n@@ -4116,50 +4116,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- //Session\n- private void clearFirstRequestTimestampIfNeeded(Context context) {\n- StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.KEY_FIRST_TS), 0);\n- }\n-\n- //Session\n- private void clearIJ(Context context) {\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n- final SharedPreferences.Editor editor = prefs.edit();\n- editor.clear();\n- StorageHelper.persist(editor);\n- }\n-\n- //Session\n- private void clearLastRequestTimestamp(Context context) {\n- StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.KEY_LAST_TS), 0);\n- }\n-\n- /**\n- * Only call async\n- */\n- private void clearQueues(final Context context) {\n- synchronized (getCoreState().getCTLockManager().getEventLock()) {\n-\n- DBAdapter adapter = getCoreState().getDatabaseManager().loadDBAdapter(context);\n- DBAdapter.Table tableName = DBAdapter.Table.EVENTS;\n-\n- adapter.removeEvents(tableName);\n- tableName = DBAdapter.Table.PROFILE_EVENTS;\n- adapter.removeEvents(tableName);\n-\n- clearUserContext(context);\n- }\n- }\n-\n- //Session\n- private void clearUserContext(final Context context) {\n- clearIJ(context);\n- clearFirstRequestTimestampIfNeeded(context);\n- clearLastRequestTimestamp(context);\n- }\n-\n- //util\n-\n//InApp\nprivate void displayNotification(final CTInAppNotification inAppNotification) {\n@@ -4253,30 +4209,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn 0;\n}\n- private String getDomainFromPrefsOrMetadata(final EventGroup eventGroup) {\n- try {\n- final String region = getCoreState().getConfig().getAccountRegion();\n- if (region != null && region.trim().length() > 0) {\n- // Always set this to 0 so that the handshake is not performed during a HTTP failure\n- mResponseFailureCount = 0;\n- if (eventGroup.equals(EventGroup.PUSH_NOTIFICATION_VIEWED)) {\n- return region.trim().toLowerCase() + eventGroup.httpResource + \".\" + Constants.PRIMARY_DOMAIN;\n- } else {\n- return region.trim().toLowerCase() + \".\" + Constants.PRIMARY_DOMAIN;\n- }\n- }\n- } catch (Throwable t) {\n- // Ignore\n- }\n- if (eventGroup.equals(EventGroup.PUSH_NOTIFICATION_VIEWED)) {\n- return StorageHelper\n- .getStringFromPrefs(context, getCoreState().getConfig(), Constants.SPIKY_KEY_DOMAIN_NAME, null);\n- } else {\n- return StorageHelper\n- .getStringFromPrefs(context, getCoreState().getConfig(), Constants.KEY_DOMAIN_NAME, null);\n- }\n- }\n-\nprivate String getEndpoint(final boolean defaultToHandshakeURL, final EventGroup eventGroup) {\n// TODO dummy method, remove after complete development\nreturn null;\n@@ -4385,12 +4317,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- private boolean hasDomainChanged(final String newDomain) {\n- final String oldDomain = StorageHelper\n- .getStringFromPrefs(context, getCoreState().getConfig(), Constants.KEY_DOMAIN_NAME, null);\n- return !newDomain.equals(oldDomain);\n- }\n-\nprivate void initFeatureFlags(boolean fromPlayServices) {\nLogger.v(\"Initializing Feature Flags with device Id = \" + getCleverTapID());\n@@ -4424,16 +4350,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn getCoreState().getDeviceInfo().isErrorDeviceId();\n}\n- /**\n- * @return true if the mute command was sent anytime between now and now - 24 hours.\n- */\n- private boolean isMuted() {\n- final int now = (int) (System.currentTimeMillis() / 1000);\n- final int muteTS = StorageHelper.getIntFromPrefs(context, getCoreState().getConfig(), Constants.KEY_MUTED, 0);\n-\n- return now - muteTS < 24 * 60 * 60;\n- }\n-\n//Session\nprivate boolean isProcessUserLoginWithIdentifier(String identifier) {\n@@ -4476,12 +4392,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n});\n}\n- //Networking\n- private boolean needsHandshakeForDomain(final EventGroup eventGroup) {\n- final String domain = getDomainFromPrefsOrMetadata(eventGroup);\n- return domain == null || mResponseFailureCount > 5;\n- }\n-\n//Profile\nprivate void notifyUserProfileInitialized(String deviceID) {\n@@ -4572,125 +4482,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n});\n}\n- //ABTesting\n-\n- private void processGeofenceResponse(JSONObject response) {\n-\n- }\n-\n- //InApp\n- private void processInAppResponse(final JSONObject response, final Context context) {\n- try {\n- getConfigLogger().verbose(getAccountId(), \"InApp: Processing response\");\n-\n- if (!response.has(\"inapp_notifs\")) {\n- getConfigLogger().verbose(getAccountId(),\n- \"InApp: Response JSON object doesn't contain the inapp key, failing\");\n- return;\n- }\n-\n- int perSession = 10;\n- int perDay = 10;\n- if (response.has(Constants.INAPP_MAX_PER_SESSION) && response\n- .get(Constants.INAPP_MAX_PER_SESSION) instanceof Integer) {\n- perSession = response.getInt(Constants.INAPP_MAX_PER_SESSION);\n- }\n-\n- if (response.has(\"imp\") && response.get(\"imp\") instanceof Integer) {\n- perDay = response.getInt(\"imp\");\n- }\n-\n- if (getCoreState().getInAppFCManager() != null) {\n- Logger.v(\"Updating InAppFC Limits\");\n- getCoreState().getInAppFCManager().updateLimits(context, perDay, perSession);\n- }\n-\n- JSONArray inappNotifs;\n- try {\n- inappNotifs = response.getJSONArray(Constants.INAPP_JSON_RESPONSE_KEY);\n- } catch (JSONException e) {\n- getConfigLogger().debug(getAccountId(), \"InApp: In-app key didn't contain a valid JSON array\");\n- return;\n- }\n-\n- // Add all the new notifications to the queue\n- SharedPreferences prefs = StorageHelper.getPreferences(context);\n- SharedPreferences.Editor editor = prefs.edit();\n- try {\n- JSONArray inappsFromPrefs = new JSONArray(\n- StorageHelper\n- .getStringFromPrefs(context, getCoreState().getConfig(), Constants.INAPP_KEY, \"[]\"));\n-\n- // Now add the rest of them :)\n- if (inappNotifs != null && inappNotifs.length() > 0) {\n- for (int i = 0; i < inappNotifs.length(); i++) {\n- try {\n- JSONObject inappNotif = inappNotifs.getJSONObject(i);\n- inappsFromPrefs.put(inappNotif);\n- } catch (JSONException e) {\n- Logger.v(\"InAppManager: Malformed inapp notification\");\n- }\n- }\n- }\n-\n- // Commit all the changes\n- editor.putString(StorageHelper.storageKeyWithSuffix(getConfig(), Constants.INAPP_KEY),\n- inappsFromPrefs.toString());\n- StorageHelper.persist(editor);\n- } catch (Throwable e) {\n- getConfigLogger().verbose(getAccountId(), \"InApp: Failed to parse the in-app notifications properly\");\n- getConfigLogger().verbose(getAccountId(), \"InAppManager: Reason: \" + e.getMessage(), e);\n- }\n- // Fire the first notification, if any\n- runOnNotificationQueue(new Runnable() {\n- @Override\n- public void run() {\n- _showNotificationIfAvailable(context);\n- }\n- });\n- } catch (Throwable t) {\n- Logger.v(\"InAppManager: Failed to parse response\", t);\n- }\n- }\n-\n-\n- /**\n- * Processes the incoming response headers for a change in domain and/or mute.\n- *\n- * @return True to continue sending requests, false otherwise.\n- */\n- private boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n-\n- final String muteCommand = conn.getHeaderField(Constants.HEADER_MUTE);\n- if (muteCommand != null && muteCommand.trim().length() > 0) {\n- if (muteCommand.equals(\"true\")) {\n- setMuted(context, true);\n- return false;\n- } else {\n- setMuted(context, false);\n- }\n- }\n-\n- final String domainName = conn.getHeaderField(Constants.HEADER_DOMAIN_NAME);\n- Logger.v(\"Getting domain from header - \" + domainName);\n- if (domainName == null || domainName.trim().length() == 0) {\n- return true;\n- }\n-\n- final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n- Logger.v(\"Getting spiky domain from header - \" + spikyDomainName);\n-\n- setMuted(context, false);\n- setDomain(context, domainName);\n- Logger.v(\"Setting spiky domain from header as -\" + spikyDomainName);\n- if (spikyDomainName == null) {\n- setSpikyDomain(context, domainName);\n- } else {\n- setSpikyDomain(context, spikyDomainName);\n- }\n- return true;\n- }\n-\nprivate void pushAmazonRegistrationId(String token, boolean register) {\ngetCoreState().getPushProviders().handleToken(token, PushType.ADM, register);\n}\n@@ -4933,12 +4724,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n\"Set current user OptOut state from storage to: \" + storedOptOut + \" for key: \" + key);\n}\n- private void setDomain(final Context context, String domainName) {\n- getConfigLogger().verbose(getAccountId(), \"Setting domain to \" + domainName);\n- StorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.KEY_DOMAIN_NAME),\n- domainName);\n- }\n-\nprivate void setFirstRequestTimestampIfNeeded(Context context, int ts) {\nif (getFirstRequestTimestamp() > 0) {\nreturn;\n@@ -4962,23 +4747,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n//Util\n- private void setMuted(final Context context, boolean mute) {\n- if (mute) {\n- final int now = (int) (System.currentTimeMillis() / 1000);\n- StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.KEY_MUTED), now);\n- setDomain(context, null);\n-\n- // Clear all the queues\n- getCoreState().getPostAsyncSafelyHandler().postAsyncSafely(\"CommsManager#setMuted\", new Runnable() {\n- @Override\n- public void run() {\n- clearQueues(context);\n- }\n- });\n- } else {\n- StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.KEY_MUTED), 0);\n- }\n- }\n// -----------------------------------------------------------------------//\n// ******** Feature Flags Logic *****//\n@@ -4986,13 +4754,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// ******** Feature Flags Public API *****//\n- private void setSpikyDomain(final Context context, String spikyDomainName) {\n- getConfigLogger().verbose(getAccountId(), \"Setting spiky domain to \" + spikyDomainName);\n- StorageHelper\n- .putString(context, StorageHelper.storageKeyWithSuffix(getConfig(), Constants.SPIKY_KEY_DOMAIN_NAME),\n- spikyDomainName);\n- }\n-\n// ******** Feature Flags Internal methods *****//\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventMediator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventMediator.java",
"diff": "package com.clevertap.android.sdk;\n+import android.content.Context;\nimport java.util.Arrays;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -10,9 +11,12 @@ class EventMediator {\nprivate final CleverTapInstanceConfig mConfig;\n+ private final Context mContext;\n+\npublic EventMediator(final CoreState coreState) {\nmConfig = coreState.getConfig();\nmCleverTapMetaData = coreState.getCoreMetaData();\n+ mContext = coreState.getContext();\n}\nboolean shouldDeferProcessingEvent(JSONObject event, int eventType) {\n@@ -44,7 +48,7 @@ class EventMediator {\nreturn true;\n}\n- if (mCleverTapMetaData.isMuted()) {\n+ if (isMuted()) {\nmConfig.getLogger()\n.verbose(mConfig.getAccountId(), \"CleverTap is muted, dropping event - \" + event.toString());\nreturn true;\n@@ -52,4 +56,15 @@ class EventMediator {\nreturn false;\n}\n+\n+\n+ /**\n+ * @return true if the mute command was sent anytime between now and now - 24 hours.\n+ */\n+ private boolean isMuted() {\n+ final int now = (int) (System.currentTimeMillis() / 1000);\n+ final int muteTS = StorageHelper.getIntFromPrefs(mContext, mConfig, Constants.KEY_MUTED, 0);\n+\n+ return now - muteTS < 24 * 60 * 60;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -38,6 +38,8 @@ class NetworkManager extends BaseNetworkManager {\nprivate final BaseQueueManager mBaseEventQueueManager;\n+ private final CTLockManager mCtLockManager;\n+\nprivate int mCurrentRequestTimestamp = 0;\nprivate CleverTapResponse mCleverTapResponse;\n@@ -50,6 +52,8 @@ class NetworkManager extends BaseNetworkManager {\nprivate final BaseDatabaseManager mDatabaseManager;\n+ private final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\n+\nprivate int mResponseFailureCount = 0;// TODO encapsulate into NetworkState class\nprivate final InAppFCManager mInAppFCManager;\n@@ -71,7 +75,9 @@ class NetworkManager extends BaseNetworkManager {\nmPushProvider = coreState.getPushProviders();\nmInAppFCManager = coreState.getInAppFCManager();\nmDatabaseManager = coreState.getDatabaseManager();\n+ mCtLockManager = coreState.getCTLockManager();\nmBaseEventQueueManager = coreState.getBaseEventQueueManager();\n+ mPostAsyncSafelyHandler = coreState.getPostAsyncSafelyHandler();\nsetCleverTapResponse(new BaseResponse(coreState));\n}\n@@ -217,9 +223,15 @@ class NetworkManager extends BaseNetworkManager {\n}\n}\n- boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n- // TODO implementation\n- return true;\n+ boolean hasDomainChanged(final String newDomain) {\n+ final String oldDomain = StorageHelper.getStringFromPrefs(mContext, mConfig, Constants.KEY_DOMAIN_NAME, null);\n+ return !newDomain.equals(oldDomain);\n+ }\n+\n+ @Override\n+ boolean needsHandshakeForDomain(final EventGroup eventGroup) {\n+ final String domain = getDomainFromPrefsOrMetadata(eventGroup);\n+ return domain == null || mResponseFailureCount > 5;\n}\nvoid enableDeviceNetworkInfoReporting(boolean value) {\n@@ -239,12 +251,46 @@ class NetworkManager extends BaseNetworkManager {\nmCleverTapResponse = cleverTapResponse;\n}\n- void setDomain(final Context context, String domainName) {\n- // TODO implementation\n+ /**\n+ * Processes the incoming response headers for a change in domain and/or mute.\n+ *\n+ * @return True to continue sending requests, false otherwise.\n+ */\n+ boolean processIncomingHeaders(final Context context, final HttpsURLConnection conn) {\n+ final String muteCommand = conn.getHeaderField(Constants.HEADER_MUTE);\n+ if (muteCommand != null && muteCommand.trim().length() > 0) {\n+ if (muteCommand.equals(\"true\")) {\n+ setMuted(context, true);\n+ return false;\n+ } else {\n+ setMuted(context, false);\n+ }\n}\n- void setSpikyDomain(final Context context, String spikyDomainName) {\n- // TODO implementation\n+ final String domainName = conn.getHeaderField(Constants.HEADER_DOMAIN_NAME);\n+ Logger.v(\"Getting domain from header - \" + domainName);\n+ if (domainName == null || domainName.trim().length() == 0) {\n+ return true;\n+ }\n+\n+ final String spikyDomainName = conn.getHeaderField(Constants.SPIKY_HEADER_DOMAIN_NAME);\n+ Logger.v(\"Getting spiky domain from header - \" + spikyDomainName);\n+\n+ setMuted(context, false);\n+ setDomain(context, domainName);\n+ Logger.v(\"Setting spiky domain from header as -\" + spikyDomainName);\n+ if (spikyDomainName == null) {\n+ setSpikyDomain(context, domainName);\n+ } else {\n+ setSpikyDomain(context, spikyDomainName);\n+ }\n+ return true;\n+ }\n+\n+ void setDomain(final Context context, String domainName) {\n+ mLogger.verbose(mConfig.getAccountId(), \"Setting domain to \" + domainName);\n+ StorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_DOMAIN_NAME),\n+ domainName);\n}\nint getLastRequestTimestamp() {\n@@ -300,9 +346,10 @@ class NetworkManager extends BaseNetworkManager {\n}\n}\n- boolean hasDomainChanged(final String newDomain) {\n- // TODO implementation\n- return true;\n+ void setSpikyDomain(final Context context, String spikyDomainName) {\n+ mLogger.verbose(mConfig.getAccountId(), \"Setting spiky domain to \" + spikyDomainName);\n+ StorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.SPIKY_KEY_DOMAIN_NAME),\n+ spikyDomainName);\n}\n@Override\n@@ -324,10 +371,9 @@ class NetworkManager extends BaseNetworkManager {\nreturn \"ARP:\" + accountId + \":\" + mDeviceInfo.getDeviceID();\n}\n- @Override\n- boolean needsHandshakeForDomain(final EventGroup eventGroup) {\n- // TODO implementation\n- return true;\n+ //Session\n+ private void clearFirstRequestTimestampIfNeeded(Context context) {\n+ StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_FIRST_TS), 0);\n}\nvoid setFirstRequestTimestampIfNeeded(int ts) {\n@@ -733,5 +779,59 @@ class NetworkManager extends BaseNetworkManager {\nreturn newPrefs;\n}\n+ //Session\n+ private void clearIJ(Context context) {\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n+ final SharedPreferences.Editor editor = prefs.edit();\n+ editor.clear();\n+ StorageHelper.persist(editor);\n+ }\n+\n+ //Session\n+ private void clearLastRequestTimestamp(Context context) {\n+ StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_LAST_TS), 0);\n+ }\n+\n+ /**\n+ * Only call async\n+ */\n+ private void clearQueues(final Context context) {\n+ synchronized (mCtLockManager.getEventLock()) {\n+\n+ DBAdapter adapter = mDatabaseManager.loadDBAdapter(context);\n+ DBAdapter.Table tableName = DBAdapter.Table.EVENTS;\n+\n+ adapter.removeEvents(tableName);\n+ tableName = DBAdapter.Table.PROFILE_EVENTS;\n+ adapter.removeEvents(tableName);\n+\n+ clearUserContext(context);\n+ }\n+ }\n+\n+ //Session\n+ private void clearUserContext(final Context context) {\n+ clearIJ(context);\n+ clearFirstRequestTimestampIfNeeded(context);\n+ clearLastRequestTimestamp(context);\n+ }\n+\n+ private void setMuted(final Context context, boolean mute) {\n+ if (mute) {\n+ final int now = (int) (System.currentTimeMillis() / 1000);\n+ StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_MUTED), now);\n+ setDomain(context, null);\n+\n+ // Clear all the queues\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"CommsManager#setMuted\", new Runnable() {\n+ @Override\n+ public void run() {\n+ clearQueues(context);\n+ }\n+ });\n+ } else {\n+ StorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_MUTED), 0);\n+ }\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): move methods to NetworkManager SDK-628 |
116,621 | 21.01.2021 17:33:53 | -19,080 | ed02d6336cc7adcf76f0b5069d5e1eea4b82808e | task(SDK-609):Refactored Notification controller | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseQueueManager.java",
"diff": "@@ -14,8 +14,6 @@ public abstract class BaseQueueManager {\nabstract void addToQueue(final Context context, final JSONObject event, final int eventType) ;\n- abstract void clearQueues(final Context context);\n-\nabstract void flush();\nabstract void flushQueueAsync(final Context context, final EventGroup eventGroup);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -15,39 +15,32 @@ import java.util.ArrayList;\n@RestrictTo(Scope.LIBRARY)\npublic class CallbackManager {\n- public CTPushNotificationListener getPushNotificationListener() {\n- return pushNotificationListener;\n- }\n-\n- public void setPushNotificationListener(\n- final CTPushNotificationListener pushNotificationListener) {\n- this.pushNotificationListener = pushNotificationListener;\n- }\n-\n- private CTPushNotificationListener pushNotificationListener = null;\n-\n- public CTPushAmpListener getPushAmpListener() {\n- return pushAmpListener;\n- }\n-\n- public void setPushAmpListener(final CTPushAmpListener pushAmpListener) {\n- this.pushAmpListener = pushAmpListener;\n- }\n-\n- private CTPushAmpListener pushAmpListener = null;\n-\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n+ private GeofenceCallback geofenceCallback;\n+\nprivate CTInboxListener inboxListener;\nprivate final CleverTapInstanceConfig mConfig;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n+ private CTPushAmpListener pushAmpListener = null;\n+\n+ private CTPushNotificationListener pushNotificationListener = null;\n+\nCallbackManager(final CleverTapInstanceConfig config) {\nmConfig = config;\n}\n+ public GeofenceCallback getGeofenceCallback() {\n+ return geofenceCallback;\n+ }\n+\n+ public void setGeofenceCallback(final GeofenceCallback geofenceCallback) {\n+ this.geofenceCallback = geofenceCallback;\n+ }\n+\npublic CTInboxListener getInboxListener() {\nreturn inboxListener;\n}\n@@ -67,6 +60,23 @@ public class CallbackManager {\n}\n}\n+ public CTPushAmpListener getPushAmpListener() {\n+ return pushAmpListener;\n+ }\n+\n+ public void setPushAmpListener(final CTPushAmpListener pushAmpListener) {\n+ this.pushAmpListener = pushAmpListener;\n+ }\n+\n+ public CTPushNotificationListener getPushNotificationListener() {\n+ return pushNotificationListener;\n+ }\n+\n+ public void setPushNotificationListener(\n+ final CTPushNotificationListener pushNotificationListener) {\n+ this.pushNotificationListener = pushNotificationListener;\n+ }\n+\npublic void setDisplayUnitListener(DisplayUnitListener listener) {\nif (listener != null) {\ndisplayUnitListenerWeakReference = new WeakReference<>(listener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -176,8 +176,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\n- private GeofenceCallback geofenceCallback;\n-\nprivate WeakReference<InAppNotificationButtonListener> inAppNotificationButtonListener;\nprivate InAppNotificationListener inAppNotificationListener;\n@@ -252,7 +250,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (instances == null) {\nCleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\nif (instance != null) {\n- instance._createNotification(context, extras, notificationId);\n+ instance.getCoreState().getPushProviders()._createNotification(context, extras, notificationId);\n}\nreturn;\n}\n@@ -268,7 +266,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nif (shouldProcess) {\ntry {\n- instance._createNotification(context, extras, notificationId);\n+ instance.getCoreState().getPushProviders()._createNotification(context, extras, notificationId);\n} catch (Throwable t) {\n// no-op\n}\n@@ -956,7 +954,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (instances == null) {\nCleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\nif (instance != null) {\n- instance.processCustomPushNotification(extras);\n+ instance.getCoreState().getPushProviders().processCustomPushNotification(extras);\n}\nreturn;\n}\n@@ -964,7 +962,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nfor (String accountId : CleverTapAPI.instances.keySet()) {\nCleverTapAPI instance = CleverTapAPI.instances.get(accountId);\nif (instance != null) {\n- instance.processCustomPushNotification(extras);\n+ instance.getCoreState().getPushProviders().processCustomPushNotification(extras);\n}\n}\n}\n@@ -975,7 +973,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nCleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\nif (instance != null) {\nif (instance.getConfig().isBackgroundSync()) {\n- instance.runInstanceJobWork(context, null);\n+ instance.getCoreState().getPushProviders().runInstanceJobWork(context, null);\n} else {\nLogger.d(\"Instance doesn't allow Background sync, not running the Job\");\n}\n@@ -995,7 +993,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nLogger.d(accountId, \"Instance doesn't allow Background sync, not running the Job\");\ncontinue;\n}\n- instance.runInstanceJobWork(context, null);\n+ instance.getCoreState().getPushProviders().runInstanceJobWork(context, null);\n}\n}\n@@ -1005,7 +1003,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nCleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\nif (instance != null) {\nif (instance.getConfig().isBackgroundSync()) {\n- instance.runInstanceJobWork(context, parameters);\n+ instance.getCoreState().getPushProviders().runInstanceJobWork(context, parameters);\n} else {\nLogger.d(\"Instance doesn't allow Background sync, not running the Job\");\n}\n@@ -1022,7 +1020,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nLogger.d(accountId, \"Instance doesn't allow Background sync, not running the Job\");\ncontinue;\n}\n- instance.runInstanceJobWork(context, parameters);\n+ instance.getCoreState().getPushProviders().runInstanceJobWork(context, parameters);\n}\n}\n@@ -1109,19 +1107,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n});\n- if (this.getCoreState().getConfig().isBackgroundSync() && !this.getCoreState().getConfig()\n- .isAnalyticsOnly()) {\n- coreState.getPostAsyncSafelyHandler().postAsyncSafely(\"createOrResetJobScheduler\", new Runnable() {\n- @Override\n- public void run() {\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\n- createOrResetJobScheduler(context);\n- } else {\n- createAlarmScheduler(context);\n- }\n- }\n- });\n- }\nLogger.i(\"CleverTap SDK initialized with accountId: \" + config.getAccountId() + \" accountToken: \" + config\n.getAccountToken() + \" accountRegion: \" + config.getAccountRegion());\n@@ -1296,7 +1281,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic void flush() {\n- flushQueueAsync(context, EventGroup.REGULAR);\n+ mCoreState.getBaseEventQueueManager().flush();\n}\npublic String getAccountId() {\n@@ -1583,7 +1568,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@SuppressWarnings(\"unused\")\npublic GeofenceCallback getGeofenceCallback() {\n- return this.geofenceCallback;\n+ return mCoreState.getCallbackManager().getGeofenceCallback();\n}\n/**\n@@ -1596,7 +1581,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n@SuppressWarnings(\"unused\")\npublic void setGeofenceCallback(GeofenceCallback geofenceCallback) {\n- this.geofenceCallback = geofenceCallback;\n+ mCoreState.getCallbackManager().setGeofenceCallback(geofenceCallback);\n}\n/**\n@@ -3690,8 +3675,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n});\ntry {\n- if (geofenceCallback != null) {\n- geofenceCallback.triggerLocation();\n+ if (mCoreState.getCallbackManager().getGeofenceCallback() != null) {\n+ mCoreState.getCallbackManager().getGeofenceCallback().triggerLocation();\n}\n} catch (IllegalStateException e) {\ngetConfigLogger().verbose(getAccountId(), e.getLocalizedMessage());\n@@ -4079,26 +4064,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- private boolean isTimeBetweenDNDTime(Date startTime, Date stopTime, Date currentTime) {\n- //Start Time\n- Calendar startTimeCalendar = Calendar.getInstance();\n- startTimeCalendar.setTime(startTime);\n- //Current Time\n- Calendar currentTimeCalendar = Calendar.getInstance();\n- currentTimeCalendar.setTime(currentTime);\n- //Stop Time\n- Calendar stopTimeCalendar = Calendar.getInstance();\n- stopTimeCalendar.setTime(stopTime);\n-\n- if (stopTime.compareTo(startTime) < 0) {\n- if (currentTimeCalendar.compareTo(stopTimeCalendar) < 0) {\n- currentTimeCalendar.add(Calendar.DATE, 1);\n- }\n- stopTimeCalendar.add(Calendar.DATE, 1);\n- }\n- return currentTimeCalendar.compareTo(startTimeCalendar) >= 0\n- && currentTimeCalendar.compareTo(stopTimeCalendar) < 0;\n- }\n//Util\n@@ -4152,16 +4117,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n- private Date parseTimeToDate(String time) {\n-\n- final String inputFormat = \"HH:mm\";\n- SimpleDateFormat inputParser = new SimpleDateFormat(inputFormat, Locale.US);\n- try {\n- return inputParser.parse(time);\n- } catch (java.text.ParseException e) {\n- return new Date(0);\n- }\n- }\n//InApp\nprivate void prepareNotificationForDisplay(final JSONObject jsonObject) {\n@@ -4169,39 +4124,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nrunOnNotificationQueue(new NotificationPrepareRunnable(this, jsonObject));\n}\n- /**\n- * Stores silent push notification in DB for smooth working of Push Amplification\n- * Background Job Service and also stores wzrk_pid to the DB to avoid duplication of Push\n- * Notifications from Push Amplification.\n- *\n- * @param extras - Bundle\n- */\n- private void processCustomPushNotification(final Bundle extras) {\n- getCoreState().getPostAsyncSafelyHandler().postAsyncSafely(\"customHandlePushAmplification\", new Runnable() {\n- @Override\n- public void run() {\n- String notifMessage = extras.getString(Constants.NOTIF_MSG);\n- notifMessage = (notifMessage != null) ? notifMessage : \"\";\n- if (notifMessage.isEmpty()) {\n- //silent notification\n- getConfigLogger().verbose(getAccountId(), \"Push notification message is empty, not rendering\");\n- getCoreState().getDatabaseManager().loadDBAdapter(context).storeUninstallTimestamp();\n- String pingFreq = extras.getString(\"pf\", \"\");\n- if (!TextUtils.isEmpty(pingFreq)) {\n- updatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n- }\n- } else {\n- String wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n- String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n- (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n- long wzrk_ttl = Long.parseLong(ttl);\n- DBAdapter dbAdapter = getCoreState().getDatabaseManager().loadDBAdapter(context);\n- getConfigLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\n- dbAdapter.storePushNotificationId(wzrk_pid, wzrk_ttl);\n- }\n- }\n- });\n- }\n+\nprivate void pushAmazonRegistrationId(String token, boolean register) {\ngetCoreState().getPushProviders().handleToken(token, PushType.ADM, register);\n@@ -4227,7 +4150,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nJSONObject event = new JSONObject();\ntry {\nevent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT);\n- event.put(\"evtData\", getAppLaunchedFields());\n+\n+ event.put(\"evtData\", ((NetworkManager)mCoreState.getNetworkManager()).getAppLaunchedFields());//TODO move this outside n/w mgr\n} catch (Throwable t) {\n// We won't get here\n}\n@@ -4362,73 +4286,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\ngetConfigLogger().verbose(getConfig().getAccountId(), \"Product Config reset\");\n}\n- private void runInstanceJobWork(final Context context, final JobParameters parameters) {\n- getCoreState().getPostAsyncSafelyHandler().postAsyncSafely(\"runningJobService\", new Runnable() {\n- @Override\n- public void run() {\n- if (getCoreState().getPushProviders().isNotificationSupported()) {\n- Logger.v(getAccountId(), \"Token is not present, not running the Job\");\n- return;\n- }\n-\n- Calendar now = Calendar.getInstance();\n-\n- int hour = now.get(Calendar.HOUR_OF_DAY); // Get hour in 24 hour format\n- int minute = now.get(Calendar.MINUTE);\n-\n- Date currentTime = parseTimeToDate(hour + \":\" + minute);\n- Date startTime = parseTimeToDate(Constants.DND_START);\n- Date endTime = parseTimeToDate(Constants.DND_STOP);\n-\n- if (isTimeBetweenDNDTime(startTime, endTime, currentTime)) {\n- Logger.v(getAccountId(), \"Job Service won't run in default DND hours\");\n- return;\n- }\n-\n- long lastTS = getCoreState().getDatabaseManager().loadDBAdapter(context).getLastUninstallTimestamp();\n-\n- if (lastTS == 0 || lastTS > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {\n- try {\n- JSONObject eventObject = new JSONObject();\n- eventObject.put(\"bk\", 1);\n- getCoreState().getBaseEventQueueManager()\n- .queueEvent(context, eventObject, Constants.PING_EVENT);\n-\n- if (parameters == null) {\n- int pingFrequency = getPingFrequency(context);\n- AlarmManager alarmManager = (AlarmManager) context\n- .getSystemService(Context.ALARM_SERVICE);\n- Intent cancelIntent = new Intent(CTBackgroundIntentService.MAIN_ACTION);\n- cancelIntent.setPackage(context.getPackageName());\n- PendingIntent alarmPendingIntent = PendingIntent\n- .getService(context, getAccountId().hashCode(), cancelIntent,\n- PendingIntent.FLAG_UPDATE_CURRENT);\n- if (alarmManager != null) {\n- alarmManager.cancel(alarmPendingIntent);\n- }\n- Intent alarmIntent = new Intent(CTBackgroundIntentService.MAIN_ACTION);\n- alarmIntent.setPackage(context.getPackageName());\n- PendingIntent alarmServicePendingIntent = PendingIntent\n- .getService(context, getAccountId().hashCode(), alarmIntent,\n- PendingIntent.FLAG_UPDATE_CURRENT);\n- if (alarmManager != null) {\n- if (pingFrequency != -1) {\n- alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,\n- SystemClock.elapsedRealtime() + (pingFrequency\n- * Constants.ONE_MIN_IN_MILLIS),\n- Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n- }\n- }\n- }\n- } catch (JSONException e) {\n- Logger.v(\"Unable to raise background Ping event\");\n- }\n-\n- }\n- }\n- });\n- }\n-\n// -----------------------------------------------------------------------//\n// ******** Display Unit LOGIC *****//\n// -----------------------------------------------------------------------//\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPIListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPIListener.java",
"diff": "@@ -8,6 +8,5 @@ public interface CleverTapAPIListener extends\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\nCTInboxActivity.InboxActivityListener,\n- FeatureFlagListener,\n- CTProductConfigListener{\n+ FeatureFlagListener{\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBAdapter.java",
"diff": "@@ -496,7 +496,7 @@ public class DBAdapter {\nreturn profile;\n}\n- synchronized long getLastUninstallTimestamp() {\n+ public synchronized long getLastUninstallTimestamp() {\nfinal String tName = Table.UNINSTALL_TS.getName();\nCursor cursor = null;\nlong timestamp = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DBManager.java",
"diff": "@@ -59,7 +59,7 @@ public class DBManager extends BaseDatabaseManager {\n}\n@Override\n- DBAdapter loadDBAdapter(final Context context) {\n+ public DBAdapter loadDBAdapter(final Context context) {\nif (dbAdapter == null) {\ndbAdapter = new DBAdapter(context, mConfig);\ndbAdapter.cleanupStaleEvents(DBAdapter.Table.EVENTS);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -197,14 +197,9 @@ class EventQueueManager extends BaseQueueManager {\n}\n}\n- @Override\n- void clearQueues(final Context context) {\n- //TODO\n- }\n-\n@Override\nvoid flush() {\n-//TOD\n+ flushQueueAsync(mContext, EventGroup.REGULAR);\n}\nprivate String getCleverTapID() {\n@@ -268,7 +263,7 @@ class EventQueueManager extends BaseQueueManager {\n}\n// Cancel any outstanding send runnables, and issue a new delayed one\nmMainLooperHandler.removeCallbacks(commsRunnable);\n- //TODO merge\n+\nmMainLooperHandler.postDelayed(commsRunnable, mNetworkManager.getDelayFrequency());\nmLogger.verbose(mConfig.getAccountId(), \"Scheduling delayed queue flush on main event loop\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/GeofenceResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/GeofenceResponse.java",
"diff": "@@ -8,11 +8,13 @@ class GeofenceResponse extends CleverTapResponse {\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Logger mLogger;\n+ private final CallbackManager mCallbackManager;\nGeofenceResponse() {\nCoreState coreState = getCoreState();\nmConfig = coreState.getConfig();\nmLogger = mConfig.getLogger();\n+ mCallbackManager = coreState.getCallbackManager();\n}\n@Override\n@@ -37,14 +39,14 @@ class GeofenceResponse extends CleverTapResponse {\nreturn;\n}\ntry {\n- if (this.geofenceCallback != null) {\n+ if (mCallbackManager.getGeofenceCallback() != null) {\nJSONObject jsonObject = new JSONObject();\njsonObject.put(\"geofences\", response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\nmLogger\n.verbose(mConfig.getAccountId(),\nConstants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n- this.geofenceCallback.handleGeoFences(jsonObject);\n+ mCallbackManager.getGeofenceCallback().handleGeoFences(jsonObject);\n} else {\nmLogger.debug(mConfig.getAccountId(),\nConstants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -712,7 +712,7 @@ class NetworkManager extends BaseNetworkManager {\n}\n//Event\n- private JSONObject getAppLaunchedFields() {\n+ JSONObject getAppLaunchedFields() {\ntry {\nboolean deviceIsMultiUser = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"diff": "@@ -17,6 +17,8 @@ class PushAmpResponse extends CleverTapResponse {\nprivate final CleverTapInstanceConfig mConfig;\n+ private final Context mContext;\n+\nprivate final DBAdapter mDBAdapter;\nprivate final Logger mLogger;\n@@ -29,6 +31,7 @@ class PushAmpResponse extends CleverTapResponse {\ninboxControllerLock = coreState.getCTLockManager().getInboxControllerLock();\nmDBAdapter = coreState.getDatabaseManager().loadDBAdapter(coreState.getContext());\n+ mContext = coreState.context;\n}\n@Override\n@@ -108,7 +111,8 @@ class PushAmpResponse extends CleverTapResponse {\nif (getCoreState().getCallbackManager().getPushAmpListener() != null) {\ngetCoreState().getCallbackManager().getPushAmpListener().onPushAmpPayloadReceived(pushBundle);\n} else {\n- createNotification(context, pushBundle);\n+ getCoreState().getPushProviders()\n+ ._createNotification(mContext, pushBundle, Constants.EMPTY_NOTIFICATION_ID);\n}\n} else {\nmLogger.verbose(mConfig.getAccountId(),\n@@ -122,9 +126,4 @@ class PushAmpResponse extends CleverTapResponse {\n}\n-\n-\n-\n-\n-\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -12,6 +12,7 @@ import android.app.Notification;\nimport android.app.NotificationManager;\nimport android.app.PendingIntent;\nimport android.app.job.JobInfo;\n+import android.app.job.JobParameters;\nimport android.app.job.JobScheduler;\nimport android.content.ComponentName;\nimport android.content.ContentResolver;\n@@ -57,10 +58,15 @@ import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushnotification.amp.CTBackgroundIntentService;\nimport com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService;\nimport java.lang.reflect.Constructor;\n+import java.text.SimpleDateFormat;\nimport java.util.ArrayList;\n+import java.util.Calendar;\n+import java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\n+import java.util.Locale;\nimport org.json.JSONArray;\n+import org.json.JSONException;\nimport org.json.JSONObject;\n/**\n@@ -124,6 +130,7 @@ public class PushProviders {\nmValidationResultStack = coreState.getValidationResultStack();\nmCoreMetaData = coreState.getCoreMetaData();\nmCallbackManager = coreState.getCallbackManager();\n+ initPushAmp();\n}\n/**\n@@ -229,6 +236,22 @@ public class PushProviders {\nreturn tokenRefreshListener;\n}\n+ private void initPushAmp() {\n+ if (mConfig.isBackgroundSync() && !mConfig\n+ .isAnalyticsOnly()) {\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"createOrResetJobScheduler\", new Runnable() {\n+ @Override\n+ public void run() {\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\n+ createOrResetJobScheduler(mContext);\n+ } else {\n+ createAlarmScheduler(mContext);\n+ }\n+ }\n+ });\n+ }\n+ }\n+\npublic void setDevicePushTokenRefreshListener(final DevicePushTokenRefreshListener tokenRefreshListener) {\nthis.tokenRefreshListener = tokenRefreshListener;\n}\n@@ -314,7 +337,7 @@ public class PushProviders {\nr.put(Constants.INAPP_JSON_RESPONSE_KEY, inappNotifs);\ninappNotifs.put(new JSONObject(extras.getString(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY)));\n- processInAppResponse(r, context);\n+ processInAppResponse(r, mContext);\n} catch (Throwable t) {\nLogger.v(\"Failed to display inapp notification from push notification payload\", t);\n}\n@@ -513,7 +536,7 @@ public class PushProviders {\n* @param extras The {@link Bundle} object received by the broadcast receiver\n* @param notificationId A custom id to build a notification\n*/\n- private void _createNotification(final Context context, final Bundle extras, final int notificationId) {\n+ public void _createNotification(final Context context, final Bundle extras, final int notificationId) {\nif (extras == null || extras.get(Constants.NOTIFICATION_TAG) == null) {\nreturn;\n}\n@@ -1301,4 +1324,138 @@ public class PushProviders {\n}\nreturn null;\n}\n+\n+ public void runInstanceJobWork(final Context context, final JobParameters parameters) {\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"runningJobService\", new Runnable() {\n+ @Override\n+ public void run() {\n+ if (isNotificationSupported()) {\n+ Logger.v(mConfig.getAccountId(), \"Token is not present, not running the Job\");\n+ return;\n+ }\n+\n+ Calendar now = Calendar.getInstance();\n+\n+ int hour = now.get(Calendar.HOUR_OF_DAY); // Get hour in 24 hour format\n+ int minute = now.get(Calendar.MINUTE);\n+\n+ Date currentTime = parseTimeToDate(hour + \":\" + minute);\n+ Date startTime = parseTimeToDate(Constants.DND_START);\n+ Date endTime = parseTimeToDate(Constants.DND_STOP);\n+\n+ if (isTimeBetweenDNDTime(startTime, endTime, currentTime)) {\n+ Logger.v(mConfig.getAccountId(), \"Job Service won't run in default DND hours\");\n+ return;\n+ }\n+\n+ long lastTS = mBaseDatabaseManager.loadDBAdapter(context).getLastUninstallTimestamp();\n+\n+ if (lastTS == 0 || lastTS > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {\n+ try {\n+ JSONObject eventObject = new JSONObject();\n+ eventObject.put(\"bk\", 1);\n+ mBaseQueueManager\n+ .queueEvent(context, eventObject, Constants.PING_EVENT);\n+\n+ if (parameters == null) {\n+ int pingFrequency = getPingFrequency(context);\n+ AlarmManager alarmManager = (AlarmManager) context\n+ .getSystemService(Context.ALARM_SERVICE);\n+ Intent cancelIntent = new Intent(CTBackgroundIntentService.MAIN_ACTION);\n+ cancelIntent.setPackage(context.getPackageName());\n+ PendingIntent alarmPendingIntent = PendingIntent\n+ .getService(context, mConfig.getAccountId().hashCode(), cancelIntent,\n+ PendingIntent.FLAG_UPDATE_CURRENT);\n+ if (alarmManager != null) {\n+ alarmManager.cancel(alarmPendingIntent);\n+ }\n+ Intent alarmIntent = new Intent(CTBackgroundIntentService.MAIN_ACTION);\n+ alarmIntent.setPackage(context.getPackageName());\n+ PendingIntent alarmServicePendingIntent = PendingIntent\n+ .getService(context, mConfig.getAccountId().hashCode(), alarmIntent,\n+ PendingIntent.FLAG_UPDATE_CURRENT);\n+ if (alarmManager != null) {\n+ if (pingFrequency != -1) {\n+ alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,\n+ SystemClock.elapsedRealtime() + (pingFrequency\n+ * Constants.ONE_MIN_IN_MILLIS),\n+ Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n+ }\n+ }\n+ }\n+ } catch (JSONException e) {\n+ Logger.v(\"Unable to raise background Ping event\");\n+ }\n+\n+ }\n+ }\n+ });\n+ }\n+\n+ private Date parseTimeToDate(String time) {\n+\n+ final String inputFormat = \"HH:mm\";\n+ SimpleDateFormat inputParser = new SimpleDateFormat(inputFormat, Locale.US);\n+ try {\n+ return inputParser.parse(time);\n+ } catch (java.text.ParseException e) {\n+ return new Date(0);\n+ }\n+ }\n+\n+ private boolean isTimeBetweenDNDTime(Date startTime, Date stopTime, Date currentTime) {\n+ //Start Time\n+ Calendar startTimeCalendar = Calendar.getInstance();\n+ startTimeCalendar.setTime(startTime);\n+ //Current Time\n+ Calendar currentTimeCalendar = Calendar.getInstance();\n+ currentTimeCalendar.setTime(currentTime);\n+ //Stop Time\n+ Calendar stopTimeCalendar = Calendar.getInstance();\n+ stopTimeCalendar.setTime(stopTime);\n+\n+ if (stopTime.compareTo(startTime) < 0) {\n+ if (currentTimeCalendar.compareTo(stopTimeCalendar) < 0) {\n+ currentTimeCalendar.add(Calendar.DATE, 1);\n+ }\n+ stopTimeCalendar.add(Calendar.DATE, 1);\n+ }\n+ return currentTimeCalendar.compareTo(startTimeCalendar) >= 0\n+ && currentTimeCalendar.compareTo(stopTimeCalendar) < 0;\n+ }\n+\n+ /**\n+ * Stores silent push notification in DB for smooth working of Push Amplification\n+ * Background Job Service and also stores wzrk_pid to the DB to avoid duplication of Push\n+ * Notifications from Push Amplification.\n+ *\n+ * @param extras - Bundle\n+ */\n+ public void processCustomPushNotification(final Bundle extras) {\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"customHandlePushAmplification\", new Runnable() {\n+ @Override\n+ public void run() {\n+ String notifMessage = extras.getString(Constants.NOTIF_MSG);\n+ notifMessage = (notifMessage != null) ? notifMessage : \"\";\n+ if (notifMessage.isEmpty()) {\n+ //silent notification\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"Push notification message is empty, not rendering\");\n+ mBaseDatabaseManager.loadDBAdapter(mContext).storeUninstallTimestamp();\n+ String pingFreq = extras.getString(\"pf\", \"\");\n+ if (!TextUtils.isEmpty(pingFreq)) {\n+ updatePingFrequencyIfNeeded(mContext, Integer.parseInt(pingFreq));\n+ }\n+ } else {\n+ String wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n+ (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ long wzrk_ttl = Long.parseLong(ttl);\n+ DBAdapter dbAdapter = mBaseDatabaseManager.loadDBAdapter(mContext);\n+ mConfig.getLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\n+ dbAdapter.storePushNotificationId(wzrk_pid, wzrk_ttl);\n+ }\n+ }\n+ });\n+ }\n+\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Refactored Notification controller |
116,612 | 21.01.2021 17:49:02 | -19,080 | b34b46d90c50ee0b285f3c9adc0157a8583693e5 | task(refactor): refactor chain of responsibility to decorator for response | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ARPResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ARPResponse.java",
"diff": "@@ -8,7 +8,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class ARPResponse extends CleverTapResponse {\n+class ARPResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"diff": "@@ -3,9 +3,9 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport org.json.JSONObject;\n-class BaseResponse extends CleverTapResponse {\n+class BaseResponse extends CleverTapResponseDecorator {\n- private CleverTapResponse mCleverTapResponse;\n+ private final CleverTapResponse mCleverTapResponse;\nprivate final CleverTapInstanceConfig mConfig;\n@@ -19,7 +19,11 @@ class BaseResponse extends CleverTapResponse {\nprivate final NetworkManager mNetworkManager;\n- BaseResponse(final CoreState coreState) {\n+ BaseResponse(CleverTapResponse cleverTapResponse) {\n+ mCleverTapResponse = cleverTapResponse;\n+\n+ CoreState coreState = getCoreState();\n+\nmContext = coreState.getContext();\nmConfig = coreState.getConfig();\nmDeviceInfo = coreState.getDeviceInfo();\n@@ -28,21 +32,6 @@ class BaseResponse extends CleverTapResponse {\nmNetworkManager = (NetworkManager) coreState.getNetworkManager();\nmLocalDataStore = coreState.getLocalDataStore();\n- setCoreState(coreState);\n-\n- // maintain order\n- mCleverTapResponse = new GeofenceResponse();\n- mCleverTapResponse = new ProductConfigResponse(mCleverTapResponse);\n- mCleverTapResponse = new FeatureFlagResponse(mCleverTapResponse);\n- mCleverTapResponse = new DisplayUnitResponse(mCleverTapResponse);\n- mCleverTapResponse = new PushAmpResponse(mCleverTapResponse);\n- mCleverTapResponse = new InboxResponse(mCleverTapResponse);\n-\n- mCleverTapResponse = new ConsoleResponse(mCleverTapResponse);\n- mCleverTapResponse = new ARPResponse(mCleverTapResponse);\n- mCleverTapResponse = new MetadataResponse(mCleverTapResponse);\n- mCleverTapResponse = new InAppResponse(mCleverTapResponse);\n-\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapResponse.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import android.util.Log;\nimport org.json.JSONObject;\nabstract class CleverTapResponse {\n- private CoreState mCorestate;\n+ protected CoreState mCorestate;\nCoreState getCoreState() {\nreturn mCorestate;\n@@ -15,6 +16,8 @@ abstract class CleverTapResponse {\nmCorestate = coreState;\n}\n- abstract void processResponse(final JSONObject jsonBody, final String stringBody,\n- final Context context);\n+ void processResponse(final JSONObject jsonBody, final String stringBody,\n+ final Context context) {\n+ Log.i(\"CleverTapResponse\", \"Done processing response!\");\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapResponseDecorator.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import org.json.JSONObject;\n+\n+abstract class CleverTapResponseDecorator extends CleverTapResponse {\n+\n+ abstract void processResponse(JSONObject jsonBody, String stringBody,\n+ Context context);\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapResponseHelper.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+class CleverTapResponseHelper extends CleverTapResponse {\n+\n+ CleverTapResponseHelper(CoreState coreState) {\n+ mCorestate = coreState;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ConsoleResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ConsoleResponse.java",
"diff": "@@ -4,7 +4,7 @@ import android.content.Context;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-class ConsoleResponse extends CleverTapResponse {\n+class ConsoleResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"diff": "@@ -7,7 +7,7 @@ import java.util.ArrayList;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-class DisplayUnitResponse extends CleverTapResponse {\n+class DisplayUnitResponse extends CleverTapResponseDecorator {\nprivate final Object displayUnitControllerLock = new Object();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"diff": "@@ -5,7 +5,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class FeatureFlagResponse extends CleverTapResponse {\n+class FeatureFlagResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/GeofenceResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/GeofenceResponse.java",
"diff": "@@ -3,14 +3,18 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport org.json.JSONObject;\n-class GeofenceResponse extends CleverTapResponse {\n+class GeofenceResponse extends CleverTapResponseDecorator {\n+\n+ private final CleverTapResponse mCleverTapResponse;\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Logger mLogger;\n+\nprivate final CallbackManager mCallbackManager;\n- GeofenceResponse() {\n+ GeofenceResponse(final CleverTapResponse cleverTapResponse) {\n+ mCleverTapResponse = cleverTapResponse;\nCoreState coreState = getCoreState();\nmConfig = coreState.getConfig();\nmLogger = mConfig.getLogger();\n@@ -24,6 +28,9 @@ class GeofenceResponse extends CleverTapResponse {\nif (mConfig.isAnalyticsOnly()) {\nmLogger.verbose(mConfig.getAccountId(),\n\"CleverTap instance is configured to analytics only, not processing geofence response\");\n+\n+ // process further response\n+ mCleverTapResponse.processResponse(response, stringBody, context);\nreturn;\n}\n@@ -57,6 +64,8 @@ class GeofenceResponse extends CleverTapResponse {\nConstants.LOG_TAG_GEOFENCES + \"Failed to handle Geofences response\", t);\n}\n+ // process further response\n+ mCleverTapResponse.processResponse(response, stringBody, context);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"diff": "@@ -6,7 +6,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class InAppResponse extends CleverTapResponse {\n+class InAppResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"diff": "@@ -4,7 +4,7 @@ import android.content.Context;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-class InboxResponse extends CleverTapResponse {\n+class InboxResponse extends CleverTapResponseDecorator {\nprivate final Object inboxControllerLock;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/MetadataResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/MetadataResponse.java",
"diff": "@@ -3,7 +3,7 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport org.json.JSONObject;\n-class MetadataResponse extends CleverTapResponse {\n+class MetadataResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -78,7 +78,25 @@ class NetworkManager extends BaseNetworkManager {\nmCtLockManager = coreState.getCTLockManager();\nmBaseEventQueueManager = coreState.getBaseEventQueueManager();\nmPostAsyncSafelyHandler = coreState.getPostAsyncSafelyHandler();\n- setCleverTapResponse(new BaseResponse(coreState));\n+\n+ // maintain order\n+ CleverTapResponse cleverTapResponse = new CleverTapResponseHelper(coreState);\n+\n+ cleverTapResponse = new GeofenceResponse(cleverTapResponse);\n+ cleverTapResponse = new ProductConfigResponse(cleverTapResponse);\n+ cleverTapResponse = new FeatureFlagResponse(cleverTapResponse);\n+ cleverTapResponse = new DisplayUnitResponse(cleverTapResponse);\n+ cleverTapResponse = new PushAmpResponse(cleverTapResponse);\n+ cleverTapResponse = new InboxResponse(cleverTapResponse);\n+\n+ cleverTapResponse = new ConsoleResponse(cleverTapResponse);\n+ cleverTapResponse = new ARPResponse(cleverTapResponse);\n+ cleverTapResponse = new MetadataResponse(cleverTapResponse);\n+ cleverTapResponse = new InAppResponse(cleverTapResponse);\n+\n+ cleverTapResponse = new BaseResponse(cleverTapResponse);\n+\n+ setCleverTapResponse(cleverTapResponse);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"diff": "@@ -5,7 +5,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class ProductConfigResponse extends CleverTapResponse {\n+class ProductConfigResponse extends CleverTapResponseDecorator {\nprivate final CleverTapResponse mCleverTapResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"diff": "@@ -9,7 +9,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class PushAmpResponse extends CleverTapResponse {\n+class PushAmpResponse extends CleverTapResponseDecorator {\nprivate final Object inboxControllerLock;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): refactor chain of responsibility to decorator for response SDK-628 |
116,623 | 25.01.2021 14:57:05 | -19,080 | 3d3b720e8149d563b791618e26419aefb932f9fb | task(SDK-609): Decoupled NetworkManager, EventQueueManager & AnalyticsManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -41,8 +41,6 @@ public class AnalyticsManager {\nprivate final MainLooperHandler mMainLooperHandler;\n- private final NetworkManager mNetworkManager;\n-\nprivate final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\nprivate final ValidationResultStack mValidationResultStack;\n@@ -64,7 +62,6 @@ public class AnalyticsManager {\nPostAsyncSafelyHandler postAsyncSafelyHandler,\nLocalDataStore localDataStore,\nDeviceInfo deviceInfo,\n- NetworkManager networkManager,\nMainLooperHandler mainLooperHandler,\nCallbackManager callbackManager) {\nmContext = context;\n@@ -76,7 +73,6 @@ public class AnalyticsManager {\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\nmLocalDataStore = localDataStore;\nmDeviceInfo = deviceInfo;\n- mNetworkManager = networkManager;\nmMainLooperHandler = mainLooperHandler;\nmCallbackManager = callbackManager;\n//TODO set display unit using observer pattern once it's created lazily, check for it's usage in\n@@ -141,8 +137,7 @@ public class AnalyticsManager {\ntry {\nevent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT);\n- event.put(\"evtData\", mNetworkManager\n- .getAppLaunchedFields());//TODO move this outside n/w mgr\n+ event.put(\"evtData\", mDeviceInfo.getAppLaunchedFields());\n} catch (Throwable t) {\n// We won't get here\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"diff": "@@ -22,7 +22,7 @@ class BaseResponse extends CleverTapResponseDecorator {\nBaseResponse(CleverTapResponse cleverTapResponse) {\nmCleverTapResponse = cleverTapResponse;\n- CoreState coreState = getCoreState();\n+ //CoreState coreState = getCoreState();\nmContext = coreState.getContext();\nmConfig = coreState.getConfig();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -6,6 +6,7 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n+import com.clevertap.android.sdk.inapp.InAppController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n@@ -15,6 +16,8 @@ import java.util.ArrayList;\n@RestrictTo(Scope.LIBRARY)\npublic class CallbackManager {\n+ private FailureFlushListener mFailureFlushListener;\n+\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\nprivate GeofenceCallback geofenceCallback;\n@@ -44,6 +47,10 @@ public class CallbackManager {\nmDeviceInfo = deviceInfo;\n}\n+ public FailureFlushListener getFailureFlushListener() {\n+ return mFailureFlushListener;\n+ }\n+\npublic CTFeatureFlagsListener getFeatureFlagListener() {\nif (mFeatureFlagListenerWeakReference != null && mFeatureFlagListenerWeakReference.get() != null) {\nreturn mFeatureFlagListenerWeakReference.get();\n@@ -51,6 +58,10 @@ public class CallbackManager {\nreturn null;\n}\n+ public void setFailureFlushListener(final FailureFlushListener failureFlushListener) {\n+ mFailureFlushListener = failureFlushListener;\n+ }\n+\npublic void setFeatureFlagListener(final CTFeatureFlagsListener listener) {\nthis.mFeatureFlagListenerWeakReference = new WeakReference<>(listener);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -956,7 +956,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\ncoreState.getPostAsyncSafelyHandler().postAsyncSafely(\"setStatesAsync\", new Runnable() {\n@Override\npublic void run() {\n- ((NetworkManager) mCoreState.getNetworkManager()).setDeviceNetworkInfoReportingFromStorage();\n+ mCoreState.getDeviceInfo().setDeviceNetworkInfoReportingFromStorage();\nmCoreState.setCurrentUserOptOutStateFromStorage();\n}\n});\n@@ -1073,7 +1073,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@SuppressWarnings({\"unused\"})\npublic void enableDeviceNetworkInfoReporting(boolean value) {\n- ((NetworkManager) mCoreState.getNetworkManager()).enableDeviceNetworkInfoReporting(value);\n+ mCoreState.getDeviceInfo().enableDeviceNetworkInfoReporting(value);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -39,7 +39,7 @@ class CleverTapFactory {\nLocalDataStore localDataStore = new LocalDataStore(context, config);\ncoreState.setLocalDataStore(localDataStore);\n- DeviceInfo deviceInfo = new DeviceInfo(context, config, cleverTapID);\n+ DeviceInfo deviceInfo = new DeviceInfo(context, config, cleverTapID, coreMetaData);\ncoreState.setDeviceInfo(deviceInfo);\nCallbackManager callbackManager = new CallbackManager(config, deviceInfo);\n@@ -64,34 +64,30 @@ class CleverTapFactory {\n// initializing feature flag so that feature flag will automatically gets initialized\ncoreState.getCtFeatureFlagsController();\n-\n-\n- LocationManager locationManager = new LocationManager(context, config, coreMetaData, baseEventQueueManager);\n- coreState.setLocationManager(locationManager);\n-\n- InAppController inAppController = new InAppController(context, config, mainLooperHandler,\n- postAsyncSafelyHandler, inAppFCManager, callbackManager, analyticsManager, coreMetaData);\n- coreState.setInAppController(inAppController);\n-\nNetworkManager networkManager = new NetworkManager(context, config, deviceInfo, coreMetaData,\n- validationResultStack, pushProviders, inAppFCManager, baseDatabaseManager, ctLockManager,baseEventQueueManager,\n- postAsyncSafelyHandler, inAppController,\n- coreState.getCtProductConfigController(), validator, coreState.getCtInboxController(),\n- coreState.getCTDisplayUnitController(), callbackManager, coreState.getCtFeatureFlagsController());\n+ validationResultStack, pushProviders, inAppFCManager, baseDatabaseManager, ctLockManager,\n+ postAsyncSafelyHandler, validator);\ncoreState.setNetworkManager(networkManager);\n-\n- EventQueueManager baseEventQueueManager = new EventQueueManager(baseDatabaseManager, context, config, eventMediator,\n- sessionManager,\n+ EventQueueManager baseEventQueueManager = new EventQueueManager(baseDatabaseManager, context, config,\n+ eventMediator,\n+ sessionManager, callbackManager,\nmainLooperHandler, postAsyncSafelyHandler, deviceInfo, validationResultStack,\nnetworkManager, baseDatabaseManager, coreMetaData, ctLockManager, localDataStore);\ncoreState.setBaseEventQueueManager(baseEventQueueManager);\nAnalyticsManager analyticsManager = new AnalyticsManager(context, config, baseEventQueueManager, validator,\nvalidationResultStack, coreMetaData, postAsyncSafelyHandler, localDataStore, deviceInfo,\n- networkManager, mainLooperHandler, callbackManager);\n+ mainLooperHandler, callbackManager);\ncoreState.setAnalyticsManager(analyticsManager);\n+ InAppController inAppController = new InAppController(context, config, mainLooperHandler,\n+ postAsyncSafelyHandler, inAppFCManager, callbackManager, analyticsManager, coreMetaData);\n+ coreState.setInAppController(inAppController);\n+\n+\n+ LocationManager locationManager = new LocationManager(context, config, coreMetaData, baseEventQueueManager);\n+ coreState.setLocationManager(locationManager);\nPushProviders pushProviders = PushProviders\n.load(context, config, baseDatabaseManager, postAsyncSafelyHandler, validationResultStack,\n@@ -99,7 +95,6 @@ class CleverTapFactory {\ncoreState.setPushProviders(pushProviders);\n-\nActivityLifeCycleManager activityLifeCycleManager = new ActivityLifeCycleManager(context, config,\nanalyticsManager, coreMetaData, sessionManager, pushProviders, callbackManager, inAppController,\nbaseEventQueueManager, postAsyncSafelyHandler);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -279,11 +279,6 @@ public class CoreMetaData extends CleverTapMetaData {\nisLocationForGeofence = locationForGeofence;\n}\n- boolean isMuted() {\n- //TODO\n- return false;\n- }\n-\nboolean isOffline() {\nreturn offline;\n}\n@@ -292,10 +287,6 @@ public class CoreMetaData extends CleverTapMetaData {\noffline = value;\n}\n- void setMuted(final Context context, boolean mute) {\n- //TODO\n- }\n-\nvoid setSessionId(int sessionId) {\nthis.currentSessionId = sessionId;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -372,8 +372,8 @@ public class CoreState extends CleverTapState {\n}\nif (getCtFeatureFlagsController() == null) {\n- setCtFeatureFlagsController(new CTFeatureFlagsController(context, getDeviceInfo().getDeviceID(),\n- getConfig(), mCallbackManager, mAnalyticsManager));\n+ CTFeatureFlagsController ctFeatureFlagsController = new CTFeatureFlagsController(context, getDeviceInfo().getDeviceID(),\n+ getConfig(), mCallbackManager, mAnalyticsManager);\ngetConfig().getLogger().verbose(getConfig().getAccountId(), \"Feature Flags initialized\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -19,11 +19,13 @@ import androidx.annotation.IntDef;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationManagerCompat;\n+import com.clevertap.android.sdk.login.LoginInfoProvider;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n+import org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY)\npublic class DeviceInfo {\n@@ -304,11 +306,15 @@ public class DeviceInfo {\nprivate final ArrayList<ValidationResult> validationResults = new ArrayList<>();\n+ private boolean enableNetworkInfoReporting = false;\n- DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID) {\n+ private final CoreMetaData mCoreMetaData;\n+\n+ DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID, CoreMetaData coreMetaData) {\nthis.context = context;\nthis.config = config;\nthis.library = null;\n+ mCoreMetaData = coreMetaData;\nThread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n@@ -711,4 +717,37 @@ public class DeviceInfo {\n}\nreturn sDeviceType;\n}\n+\n+ void enableDeviceNetworkInfoReporting(boolean value) {\n+ enableNetworkInfoReporting = value;\n+ StorageHelper.putBoolean(context, StorageHelper.storageKeyWithSuffix(config, Constants.NETWORK_INFO),\n+ enableNetworkInfoReporting);\n+ config.getLogger()\n+ .verbose(config.getAccountId(),\n+ \"Device Network Information reporting set to \" + enableNetworkInfoReporting);\n+ }\n+\n+ void setDeviceNetworkInfoReportingFromStorage() {\n+ boolean enabled = StorageHelper.getBooleanFromPrefs(context, config, Constants.NETWORK_INFO);\n+ config.getLogger()\n+ .verbose(config.getAccountId(),\n+ \"Setting device network info reporting state from storage to \" + enabled);\n+ enableNetworkInfoReporting = enabled;\n+ }\n+\n+ //Event\n+ JSONObject getAppLaunchedFields() {\n+\n+ try {\n+ boolean deviceIsMultiUser = false;\n+ if (getGoogleAdID() != null) {\n+ deviceIsMultiUser = new LoginInfoProvider(context, config, this).deviceIsMultiUser();\n+ }\n+ return CTJsonConverter.from(this, mCoreMetaData.getLocationFromUser(), enableNetworkInfoReporting,\n+ deviceIsMultiUser);\n+ } catch (Throwable t) {\n+ config.getLogger().verbose(config.getAccountId(), \"Failed to construct App Launched event\", t);\n+ return new JSONObject();\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"diff": "@@ -23,12 +23,10 @@ class DisplayUnitResponse extends CleverTapResponseDecorator {\nDisplayUnitResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\n- CTDisplayUnitController ctDisplayUnitController,\nCallbackManager callbackManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n- mCTDisplayUnitController = ctDisplayUnitController;\nmCallbackManager = callbackManager;\n}\n@@ -87,7 +85,7 @@ class DisplayUnitResponse extends CleverTapResponseDecorator {\nif (mCTDisplayUnitController == null) {\nmCTDisplayUnitController = new CTDisplayUnitController();\n//TODO add a mechanism to transfer display unit lazily without using corestate instance\n- getCoreState().setCTDisplayUnitController(mCTDisplayUnitController);\n+ //getCoreState().setCTDisplayUnitController(mCTDisplayUnitController);//TODO\n}\n}\nArrayList<CleverTapDisplayUnit> displayUnits = mCTDisplayUnitController.updateDisplayUnits(messages);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -4,6 +4,7 @@ import static com.clevertap.android.sdk.CTJsonConverter.getErrorObject;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n+import android.telecom.Call;\nimport com.clevertap.android.sdk.login.IdentityRepo;\nimport com.clevertap.android.sdk.login.IdentityRepoFactory;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n@@ -13,12 +14,14 @@ import java.util.concurrent.Future;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-class EventQueueManager extends BaseEventQueueManager {\n+class EventQueueManager extends BaseEventQueueManager implements FailureFlushListener {\nprivate Runnable commsRunnable = null;\nprivate final BaseDatabaseManager mBaseDatabaseManager;\n+ private final CallbackManager mCallbackManager;\n+\nprivate final CoreMetaData mCleverTapMetaData;\nprivate final CleverTapInstanceConfig mConfig;\n@@ -46,12 +49,15 @@ class EventQueueManager extends BaseEventQueueManager {\nprivate final SessionManager mSessionManager;\nprivate final ValidationResultStack mValidationResultStack;\n+\nprivate Runnable pushNotificationViewedRunnable = null;\n- public EventQueueManager(final BaseDatabaseManager baseDatabaseManager, Context context,\n+ public EventQueueManager(final BaseDatabaseManager baseDatabaseManager,\n+ Context context,\nCleverTapInstanceConfig config,\nEventMediator eventMediator,\nSessionManager sessionManager,\n+ CallbackManager callbackManager,\nMainLooperHandler mainLooperHandler,\nPostAsyncSafelyHandler postAsyncSafelyHandler,\nDeviceInfo deviceInfo,\n@@ -59,12 +65,14 @@ class EventQueueManager extends BaseEventQueueManager {\nNetworkManager networkManager,\nDBManager dbManager,\nCoreMetaData coreMetaData,\n- CTLockManager ctLockManager, final LocalDataStore localDataStore) {\n+ CTLockManager ctLockManager,\n+ final LocalDataStore localDataStore) {\nmBaseDatabaseManager = baseDatabaseManager;\nmContext = context;\nmConfig = config;\nmEventMediator = eventMediator;\nmSessionManager = sessionManager;\n+ mCallbackManager = callbackManager;\nmMainLooperHandler = mainLooperHandler;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\nmDeviceInfo = deviceInfo;\n@@ -75,6 +83,13 @@ class EventQueueManager extends BaseEventQueueManager {\nmLogger = mConfig.getLogger();\nmCleverTapMetaData = coreMetaData;\nmCtLockManager = ctLockManager;\n+\n+ callbackManager.setFailureFlushListener(this);\n+ }\n+\n+ @Override\n+ public void failureFlush(Context context) {\n+ scheduleQueueFlush(context);\n}\n@@ -268,7 +283,6 @@ class EventQueueManager extends BaseEventQueueManager {\n}\n@Override\n- //Event\nvoid scheduleQueueFlush(final Context context) {\nif (commsRunnable == null) {\ncommsRunnable = new Runnable() {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FailureFlushListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+\n+public interface FailureFlushListener {\n+\n+ void failureFlush(Context context);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import android.telecom.Call;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -8,7 +9,7 @@ import org.json.JSONObject;\nclass FeatureFlagResponse extends CleverTapResponseDecorator {\n- private final CTFeatureFlagsController mCTFeatureFlagsController;\n+ private CTFeatureFlagsController mCTFeatureFlagsController;\nprivate final CleverTapResponse mCleverTapResponse;\n@@ -17,11 +18,9 @@ class FeatureFlagResponse extends CleverTapResponseDecorator {\nprivate final Logger mLogger;\nFeatureFlagResponse(CleverTapResponse cleverTapResponse,\n- CleverTapInstanceConfig config,\n- final CTFeatureFlagsController ctFeatureFlagsController) {\n+ CleverTapInstanceConfig config) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\n- mCTFeatureFlagsController = ctFeatureFlagsController;\nmLogger = mConfig.getLogger();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"diff": "@@ -13,7 +13,7 @@ class InAppResponse extends CleverTapResponseDecorator {\nprivate final CleverTapInstanceConfig mConfig;\n- private final InAppController mInAppController;\n+ private InAppController mInAppController;\nprivate final InAppFCManager mInAppFCManager;\n@@ -22,13 +22,12 @@ class InAppResponse extends CleverTapResponseDecorator {\nprivate final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\nInAppResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config, InAppFCManager inAppFCManager,\n- PostAsyncSafelyHandler postAsyncSafelyHandler, InAppController inAppController) {\n+ PostAsyncSafelyHandler postAsyncSafelyHandler) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\nmInAppFCManager = inAppFCManager;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\n- mInAppController = inAppController;\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -37,20 +37,8 @@ public class NetworkManager extends BaseNetworkManager {\nprivate static SSLContext sslContext;\n- private boolean enableNetworkInfoReporting = false;\n-\n- private final BaseEventQueueManager mBaseEventQueueManager;\n-\n- private final CTFeatureFlagsController mCTFeatureFlagsController;\n-\n- private final CTInboxController mCTInboxController;\n-\n- private final CTProductConfigController mCTProductConfigController;\n-\nprivate final CallbackManager mCallbackManager;\n- private final CoreMetaData mCleverTapMetaData;\n-\nprivate CleverTapResponse mCleverTapResponse;\nprivate final CleverTapInstanceConfig mConfig;\n@@ -67,8 +55,6 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final DeviceInfo mDeviceInfo;\n- private final InAppController mInAppController;\n-\nprivate final InAppFCManager mInAppFCManager;\nprivate final Logger mLogger;\n@@ -95,25 +81,14 @@ public class NetworkManager extends BaseNetworkManager {\nInAppFCManager inAppFCManager,\nBaseDatabaseManager baseDatabaseManager,\nCTLockManager ctLockManager,\n- BaseEventQueueManager baseEventQueueManager,\nPostAsyncSafelyHandler postAsyncSafelyHandler,\n- final InAppController inAppController,\n- final CTProductConfigController ctProductConfigController,\nfinal Validator validator,\n- final CTInboxController ctInboxController,\n- final CTDisplayUnitController displayUnitController,\n- final CallbackManager callbackManager,\n- final CTFeatureFlagsController ctFeatureFlagsController) {\n+ final CallbackManager callbackManager) {\nmContext = context;\nmConfig = config;\nmDeviceInfo = deviceInfo;\n- mInAppController = inAppController;\n- mCTProductConfigController = ctProductConfigController;\nmValidator = validator;\n- mCTInboxController = ctInboxController;\nmCallbackManager = callbackManager;\n- mCTFeatureFlagsController = ctFeatureFlagsController;\n- mCleverTapMetaData = cleverTapMetaData;\nmLogger = mConfig.getLogger();\nmCoreMetaData = coreMetaData;\n@@ -122,27 +97,24 @@ public class NetworkManager extends BaseNetworkManager {\nmInAppFCManager = inAppFCManager;\nmDatabaseManager = baseDatabaseManager;\nmCtLockManager = ctLockManager;\n- mBaseEventQueueManager = baseEventQueueManager;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\n// maintain order\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\ncleverTapResponse = new GeofenceResponse(cleverTapResponse, config, callbackManager);\n- cleverTapResponse = new ProductConfigResponse(cleverTapResponse, config, coreMetaData,\n- ctProductConfigController);\n- cleverTapResponse = new FeatureFlagResponse(cleverTapResponse, config, ctFeatureFlagsController);\n- cleverTapResponse = new DisplayUnitResponse(cleverTapResponse, config, displayUnitController,\n+ cleverTapResponse = new ProductConfigResponse(cleverTapResponse, config, coreMetaData);\n+ cleverTapResponse = new FeatureFlagResponse(cleverTapResponse, config);\n+ cleverTapResponse = new DisplayUnitResponse(cleverTapResponse, config,\ncallbackManager);\ncleverTapResponse = new PushAmpResponse(cleverTapResponse, context, config, ctLockManager,\nbaseDatabaseManager, callbackManager, pushProviders);\n- cleverTapResponse = new InboxResponse(cleverTapResponse, config, ctLockManager, ctInboxController,\n+ cleverTapResponse = new InboxResponse(cleverTapResponse, config, ctLockManager,\ncallbackManager);\ncleverTapResponse = new ConsoleResponse(cleverTapResponse, config);\n- cleverTapResponse = new ARPResponse(cleverTapResponse, config, this, ctProductConfigController, validator);\n+ cleverTapResponse = new ARPResponse(cleverTapResponse, config, this, validator);\ncleverTapResponse = new MetadataResponse(cleverTapResponse, config, deviceInfo, this);\n- cleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager, postAsyncSafelyHandler,\n- inAppController);\n+ cleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager, postAsyncSafelyHandler);\ncleverTapResponse = new BaseResponse(cleverTapResponse);\n@@ -169,15 +141,6 @@ public class NetworkManager extends BaseNetworkManager {\nreturn conn;\n}\n- void enableDeviceNetworkInfoReporting(boolean value) {\n- enableNetworkInfoReporting = value;\n- StorageHelper.putBoolean(mContext, StorageHelper.storageKeyWithSuffix(mConfig, Constants.NETWORK_INFO),\n- enableNetworkInfoReporting);\n- mLogger\n- .verbose(mConfig.getAccountId(),\n- \"Device Network Information reporting set to \" + enableNetworkInfoReporting);\n- }\n-\n@Override\nvoid flushDBQueue(final Context context, final EventGroup eventGroup) {\nmConfig.getLogger()\n@@ -208,22 +171,6 @@ public class NetworkManager extends BaseNetworkManager {\n}\n}\n- //Event\n- JSONObject getAppLaunchedFields() {\n-\n- try {\n- boolean deviceIsMultiUser = false;\n- if (mDeviceInfo.getGoogleAdID() != null) {\n- deviceIsMultiUser = new LoginInfoProvider(mContext, mConfig, mDeviceInfo).deviceIsMultiUser();\n- }\n- return CTJsonConverter.from(mDeviceInfo, mCoreMetaData.getLocationFromUser(), enableNetworkInfoReporting,\n- deviceIsMultiUser);\n- } catch (Throwable t) {\n- mLogger.verbose(mConfig.getAccountId(), \"Failed to construct App Launched event\", t);\n- return new JSONObject();\n- }\n- }\n-\nCleverTapResponse getCleverTapResponse() {\nreturn mCleverTapResponse;\n}\n@@ -411,7 +358,7 @@ public class NetworkManager extends BaseNetworkManager {\nheader.put(\"type\", \"meta\");\n- JSONObject appFields = getAppLaunchedFields();\n+ JSONObject appFields = mDeviceInfo.getAppLaunchedFields();\nheader.put(\"af\", appFields);\nlong i = getI();\n@@ -679,7 +626,7 @@ public class NetworkManager extends BaseNetworkManager {\n\"An exception occurred while sending the queue, will retry: \" + e.getLocalizedMessage());\nmResponseFailureCount++;\nnetworkRetryCount++;\n- mBaseEventQueueManager.scheduleQueueFlush(context);\n+ mCallbackManager.getFailureFlushListener().failureFlush(context);\nreturn false;\n} finally {\nif (conn != null) {\n@@ -693,14 +640,6 @@ public class NetworkManager extends BaseNetworkManager {\n}\n}\n- void setDeviceNetworkInfoReportingFromStorage() {\n- boolean enabled = StorageHelper.getBooleanFromPrefs(mContext, mConfig, Constants.NETWORK_INFO);\n- mLogger\n- .verbose(mConfig.getAccountId(),\n- \"Setting device network info reporting state from storage to \" + enabled);\n- enableNetworkInfoReporting = enabled;\n- }\n-\nvoid setDomain(final Context context, String domainName) {\nmLogger.verbose(mConfig.getAccountId(), \"Setting domain to \" + domainName);\nStorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_DOMAIN_NAME),\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"diff": "@@ -21,8 +21,7 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nProductConfigResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\n- CoreMetaData coreMetaData,\n- CTProductConfigController ctProductConfigController) {\n+ CoreMetaData coreMetaData) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "@@ -2,12 +2,14 @@ package com.clevertap.android.sdk.login;\nimport android.content.Context;\nimport com.clevertap.android.sdk.AnalyticsManager;\n+import com.clevertap.android.sdk.BaseDatabaseManager;\nimport com.clevertap.android.sdk.BaseEventQueueManager;\nimport com.clevertap.android.sdk.CallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.CoreState;\n+import com.clevertap.android.sdk.DBManager;\nimport com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.EventGroup;\nimport com.clevertap.android.sdk.InAppFCManager;\n@@ -53,6 +55,8 @@ public class LoginController {\nprivate final ValidationResultStack mValidationResultStack;\n+ private final BaseDatabaseManager mDBManager;\n+\nprivate String processingUserLoginIdentifier = null;\nprivate final Boolean processingUserLoginLock = true;\n@@ -72,6 +76,7 @@ public class LoginController {\nmLocalDataStore = coreState.getLocalDataStore();\nmCallbackManager = coreState.getCallbackManager();\nmCoreState = coreState;\n+ mDBManager = coreState.getDatabaseManager();\n}\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n@@ -194,7 +199,7 @@ public class LoginController {\n// try and flush and then reset the queues\nmBaseEventQueueManager.flushQueueSync(mContext, EventGroup.REGULAR);\nmBaseEventQueueManager.flushQueueSync(mContext, EventGroup.PUSH_NOTIFICATION_VIEWED);\n- mBaseEventQueueManager.clearQueues(mContext);\n+ mDBManager.clearQueues(mContext);\n// clear out the old data\nmLocalDataStore.changeUser();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609): Decoupled NetworkManager, EventQueueManager & AnalyticsManager |
116,623 | 25.01.2021 17:32:06 | -19,080 | 92fa326d0f557a87fac34bd927265d58ea45379e | task(SDK-609): Introduces ControllerManager to manage controller dependencies | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ARPResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ARPResponse.java",
"diff": "@@ -24,10 +24,10 @@ class ARPResponse extends CleverTapResponseDecorator {\nprivate final Validator mValidator;\nARPResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config, NetworkManager networkManager,\n- final CTProductConfigController ctProductConfigController, Validator validator) {\n+ Validator validator, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\n- mCTProductConfigController = ctProductConfigController;\n+ mCTProductConfigController = controllerManager.getCTProductConfigController();\nmLogger = mConfig.getLogger();\nmNetworkManager = networkManager;\nmValidator = validator;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -63,7 +63,7 @@ public class AnalyticsManager {\nLocalDataStore localDataStore,\nDeviceInfo deviceInfo,\nMainLooperHandler mainLooperHandler,\n- CallbackManager callbackManager) {\n+ CallbackManager callbackManager, ControllerManager controllerManager) {\nmContext = context;\nmConfig = config;\nmBaseEventQueueManager = baseEventQueueManager;\n@@ -77,7 +77,7 @@ public class AnalyticsManager {\nmCallbackManager = callbackManager;\n//TODO set display unit using observer pattern once it's created lazily, check for it's usage in\n// pushDisplayUnitClickedEventForID & pushDisplayUnitViewedEventForID\n-// mCTDisplayUnitController = ctDisplayUnitController;\n+ mCTDisplayUnitController = controllerManager.getCTDisplayUnitController();\n}\npublic void addMultiValuesForKey(final String key, final ArrayList<String> values) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1090,7 +1090,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* Handler to get the feature flag values\n*/\npublic CTFeatureFlagsController featureFlag() {\n- return mCoreState.getCtFeatureFlagsController();\n+ return mCoreState.getControllerManager().getCTFeatureFlagsController();\n}\n/**\n@@ -1113,8 +1113,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n@Nullable\npublic ArrayList<CleverTapDisplayUnit> getAllDisplayUnits() {\n- if (mCoreState.getCTDisplayUnitController() != null) {\n- return mCoreState.getCTDisplayUnitController().getAllDisplayUnits();\n+ if (mCoreState.getControllerManager().getCTDisplayUnitController() != null) {\n+ return mCoreState.getControllerManager().getCTDisplayUnitController().getAllDisplayUnits();\n} else {\ngetConfigLogger()\n.verbose(getAccountId(), Constants.FEATURE_DISPLAY_UNIT + \"Failed to get all Display Units\");\n@@ -1314,8 +1314,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@Nullable\npublic CleverTapDisplayUnit getDisplayUnitForId(String unitID) {\n- if (mCoreState.getCTDisplayUnitController() != null) {\n- return mCoreState.getCTDisplayUnitController().getDisplayUnitForID(unitID);\n+ if (mCoreState.getControllerManager().getCTDisplayUnitController() != null) {\n+ return mCoreState.getControllerManager().getCTDisplayUnitController().getDisplayUnitForID(unitID);\n} else {\ngetConfigLogger().verbose(getAccountId(),\nConstants.FEATURE_DISPLAY_UNIT + \"Failed to get Display Unit for id: \" + unitID);\n@@ -2287,8 +2287,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nReinitialising product config & Feature Flag controllers with google ad id.\n*/\n- mCoreState.getCtFeatureFlagsController().setGuidAndInit(deviceId);\n- mCoreState.getCtProductConfigController().setGuidAndInit(deviceId);\n+ mCoreState.getControllerManager().getCTFeatureFlagsController().setGuidAndInit(deviceId);\n+ mCoreState.getControllerManager().getCTProductConfigController().setGuidAndInit(deviceId);\ngetConfigLogger()\n.verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nmCoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inapp.InAppController;\nimport com.clevertap.android.sdk.login.LoginController;\nimport com.clevertap.android.sdk.pushnotification.PushProviders;\n@@ -27,6 +28,9 @@ class CleverTapFactory {\nMainLooperHandler mainLooperHandler = new MainLooperHandler();\ncoreState.setMainLooperHandler(mainLooperHandler);\n+ ControllerManager controllerManager = new ControllerManager();\n+ coreState.setControllerManager(controllerManager);\n+\nCleverTapInstanceConfig config = new CleverTapInstanceConfig(cleverTapInstanceConfig);\ncoreState.setConfig(config);\n@@ -62,11 +66,11 @@ class CleverTapFactory {\n//config\n// initializing feature flag so that feature flag will automatically gets initialized\n- coreState.getCtFeatureFlagsController();\n+ coreState.getControllerManager().getCTFeatureFlagsController();\nNetworkManager networkManager = new NetworkManager(context, config, deviceInfo, coreMetaData,\n- validationResultStack, pushProviders, inAppFCManager, baseDatabaseManager, ctLockManager,\n- postAsyncSafelyHandler, validator);\n+ validationResultStack, controllerManager, inAppFCManager, baseDatabaseManager,\n+ postAsyncSafelyHandler,callbackManager,ctLockManager,validator);\ncoreState.setNetworkManager(networkManager);\nEventQueueManager baseEventQueueManager = new EventQueueManager(baseDatabaseManager, context, config,\n@@ -78,20 +82,22 @@ class CleverTapFactory {\nAnalyticsManager analyticsManager = new AnalyticsManager(context, config, baseEventQueueManager, validator,\nvalidationResultStack, coreMetaData, postAsyncSafelyHandler, localDataStore, deviceInfo,\n- mainLooperHandler, callbackManager);\n+ mainLooperHandler, callbackManager,controllerManager);\ncoreState.setAnalyticsManager(analyticsManager);\nInAppController inAppController = new InAppController(context, config, mainLooperHandler,\npostAsyncSafelyHandler, inAppFCManager, callbackManager, analyticsManager, coreMetaData);\ncoreState.setInAppController(inAppController);\n+ coreState.getControllerManager().setInAppController(inAppController);\n+ initFeatureFlags(context,coreState,config,deviceInfo,callbackManager,analyticsManager);\nLocationManager locationManager = new LocationManager(context, config, coreMetaData, baseEventQueueManager);\ncoreState.setLocationManager(locationManager);\nPushProviders pushProviders = PushProviders\n.load(context, config, baseDatabaseManager, postAsyncSafelyHandler, validationResultStack,\n- analyticsManager);\n+ analyticsManager,controllerManager);\ncoreState.setPushProviders(pushProviders);\n@@ -104,4 +110,18 @@ class CleverTapFactory {\ncoreState.setLoginController(loginController);\nreturn coreState;\n}\n+\n+ static void initFeatureFlags(Context context, CoreState coreState, CleverTapInstanceConfig config, DeviceInfo deviceInfo, CallbackManager callbackManager, AnalyticsManager analyticsManager){\n+ Logger.v(\"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\n+ if (config.isAnalyticsOnly()) {\n+ config.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n+ }else {\n+ CTFeatureFlagsController ctFeatureFlagsController = new CTFeatureFlagsController(context,\n+ deviceInfo.getDeviceID(),\n+ config, callbackManager, analyticsManager);\n+ config.getLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n+ coreState.getControllerManager().setCTFeatureFlagsController(ctFeatureFlagsController);\n+\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n+import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n+import com.clevertap.android.sdk.inapp.InAppController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigController;\n+import com.clevertap.android.sdk.pushnotification.PushProviders;\n+\n+public class ControllerManager {\n+\n+ private PushProviders mPushProviders;\n+\n+ private InAppController mInAppController;\n+\n+ private CTDisplayUnitController mCTDisplayUnitController;\n+\n+ private CTInboxController mCTInboxController;\n+\n+ private CTProductConfigController mCTProductConfigController;\n+\n+ private CTFeatureFlagsController mCTFeatureFlagsController;\n+\n+ public CTDisplayUnitController getCTDisplayUnitController() {\n+ return mCTDisplayUnitController;\n+ }\n+\n+ public CTFeatureFlagsController getCTFeatureFlagsController() {\n+\n+ return mCTFeatureFlagsController;\n+ }\n+\n+ public CTInboxController getCTInboxController() {\n+ return mCTInboxController;\n+ }\n+\n+ public CTProductConfigController getCTProductConfigController() {\n+ return mCTProductConfigController;\n+ }\n+\n+ public InAppController getInAppController() {\n+ return mInAppController;\n+ }\n+\n+ public PushProviders getPushProviders() {\n+ return mPushProviders;\n+ }\n+\n+ public void setCTDisplayUnitController(\n+ final CTDisplayUnitController CTDisplayUnitController) {\n+ mCTDisplayUnitController = CTDisplayUnitController;\n+ }\n+\n+ public void setCTFeatureFlagsController(\n+ final CTFeatureFlagsController CTFeatureFlagsController) {\n+ mCTFeatureFlagsController = CTFeatureFlagsController;\n+ }\n+\n+ public void setCTInboxController(final CTInboxController CTInboxController) {\n+ mCTInboxController = CTInboxController;\n+ }\n+\n+ public void setCTProductConfigController(\n+ final CTProductConfigController CTProductConfigController) {\n+ mCTProductConfigController = CTProductConfigController;\n+ }\n+\n+ public void setInAppController(final InAppController inAppController) {\n+ mInAppController = inAppController;\n+ }\n+\n+ public void setPushProviders(final PushProviders pushProviders) {\n+ mPushProviders = pushProviders;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -12,6 +12,8 @@ import com.clevertap.android.sdk.pushnotification.PushProviders;\n//TODO move this to builder pattern & add sanity check for dependencies at the time of creation\npublic class CoreState extends CleverTapState {\n+ private ControllerManager mControllerManager;\n+\nprivate BaseLocationManager baseLocationManager;\nprivate CleverTapInstanceConfig config;\n@@ -72,6 +74,10 @@ public class CoreState extends CleverTapState {\nreturn mActivityLifeCycleManager;\n}\n+ public ControllerManager getControllerManager() {\n+ return mControllerManager;\n+ }\n+\npublic void setActivityLifeCycleManager(final ActivityLifeCycleManager activityLifeCycleManager) {\nmActivityLifeCycleManager = activityLifeCycleManager;\n}\n@@ -88,17 +94,12 @@ public class CoreState extends CleverTapState {\nreturn mBaseEventQueueManager;\n}\n- void setBaseEventQueueManager(final BaseEventQueueManager baseEventQueueManager) {\n- this.mBaseEventQueueManager = baseEventQueueManager;\n+ public void setControllerManager(final ControllerManager controllerManager) {\n+ mControllerManager = controllerManager;\n}\n- public CTDisplayUnitController getCTDisplayUnitController() {\n- return mCTDisplayUnitController;\n- }\n-\n- public void setCTDisplayUnitController(\n- final CTDisplayUnitController CTDisplayUnitController) {\n- mCTDisplayUnitController = CTDisplayUnitController;\n+ void setBaseEventQueueManager(final BaseEventQueueManager baseEventQueueManager) {\n+ this.mBaseEventQueueManager = baseEventQueueManager;\n}\npublic CTLockManager getCTLockManager() {\n@@ -133,19 +134,9 @@ public class CoreState extends CleverTapState {\nthis.coreMetaData = coreMetaData;\n}\n- public CTFeatureFlagsController getCtFeatureFlagsController() {\n- initFeatureFlags();\n- return ctFeatureFlagsController;\n- }\n-\n- public void setCtFeatureFlagsController(\n- final CTFeatureFlagsController ctFeatureFlagsController) {\n- this.ctFeatureFlagsController = ctFeatureFlagsController;\n- }\n-\npublic CTInboxController getCtInboxController() {\nreturn ctInboxController;\n- }\n+ } //TODO move to Controller Manager\npublic void setCtInboxController(final CTInboxController ctInboxController) {\nthis.ctInboxController = ctInboxController;\n@@ -335,14 +326,15 @@ public class CoreState extends CleverTapState {\n// always call async\nprivate void _initializeInbox() {\nsynchronized (mCTLockManager.getInboxControllerLock()) {\n- if (this.ctInboxController != null) {\n+ if (getControllerManager().getInAppController() != null) {\nmCallbackManager._notifyInboxInitialized();\nreturn;\n}\nif (deviceInfo.getDeviceID() != null) {\n- this.ctInboxController = new CTInboxController(deviceInfo.getDeviceID(),\n+ ctInboxController = new CTInboxController(deviceInfo.getDeviceID(),\ndatabaseManager.loadDBAdapter(context),\nUtils.haveVideoPlayerSupport);\n+ getControllerManager().setCTInboxController(ctInboxController);\nmCallbackManager._notifyInboxInitialized();\n} else {\nconfig.getLogger().info(\"CRITICAL : No device ID found!\");\n@@ -358,23 +350,9 @@ public class CoreState extends CleverTapState {\nreturn;\n}\nif (ctProductConfigController == null) {\n- setCtProductConfigController(new CTProductConfigController(context, getDeviceInfo().getDeviceID(),\n- getConfig(), mBaseEventQueueManager, coreMetaData, mCallbackManager));\n- }\n- }\n-\n- private void initFeatureFlags() {\n- Logger.v(\"Initializing Feature Flags with device Id = \" + getDeviceInfo().getDeviceID());\n-\n- if (getConfig().isAnalyticsOnly()) {\n- getConfig().getLogger().debug(getConfig().getAccountId(), \"Feature Flag is not enabled for this instance\");\n- return;\n- }\n-\n- if (getCtFeatureFlagsController() == null) {\n- CTFeatureFlagsController ctFeatureFlagsController = new CTFeatureFlagsController(context, getDeviceInfo().getDeviceID(),\n- getConfig(), mCallbackManager, mAnalyticsManager);\n- getConfig().getLogger().verbose(getConfig().getAccountId(), \"Feature Flags initialized\");\n+ CTProductConfigController ctProductConfigController = new CTProductConfigController(context, getDeviceInfo().getDeviceID(),\n+ getConfig(), mBaseEventQueueManager, coreMetaData, mCallbackManager);\n+ getControllerManager().setCTProductConfigController(ctProductConfigController);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DisplayUnitResponse.java",
"diff": "@@ -21,13 +21,16 @@ class DisplayUnitResponse extends CleverTapResponseDecorator {\nprivate final Logger mLogger;\n+ private ControllerManager mControllerManager;\n+\nDisplayUnitResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\n- CallbackManager callbackManager) {\n+ CallbackManager callbackManager, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\nmCallbackManager = callbackManager;\n+ mControllerManager = controllerManager;\n}\n//Logic for the processing of Display Unit response\n@@ -86,9 +89,10 @@ class DisplayUnitResponse extends CleverTapResponseDecorator {\nmCTDisplayUnitController = new CTDisplayUnitController();\n//TODO add a mechanism to transfer display unit lazily without using corestate instance\n//getCoreState().setCTDisplayUnitController(mCTDisplayUnitController);//TODO\n+ mControllerManager.setCTDisplayUnitController(mCTDisplayUnitController);\n}\n}\n- ArrayList<CleverTapDisplayUnit> displayUnits = mCTDisplayUnitController.updateDisplayUnits(messages);\n+ ArrayList<CleverTapDisplayUnit> displayUnits = mControllerManager.getCTDisplayUnitController().updateDisplayUnits(messages);\nmCallbackManager.notifyDisplayUnitsLoaded(displayUnits);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"diff": "@@ -18,10 +18,11 @@ class FeatureFlagResponse extends CleverTapResponseDecorator {\nprivate final Logger mLogger;\nFeatureFlagResponse(CleverTapResponse cleverTapResponse,\n- CleverTapInstanceConfig config) {\n+ CleverTapInstanceConfig config, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n+ mCTFeatureFlagsController = controllerManager.getCTFeatureFlagsController();\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"diff": "@@ -22,12 +22,13 @@ class InAppResponse extends CleverTapResponseDecorator {\nprivate final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\nInAppResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config, InAppFCManager inAppFCManager,\n- PostAsyncSafelyHandler postAsyncSafelyHandler) {\n+ PostAsyncSafelyHandler postAsyncSafelyHandler, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\nmInAppFCManager = inAppFCManager;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\n+ mInAppController = controllerManager.getInAppController();\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"diff": "@@ -19,11 +19,10 @@ class InboxResponse extends CleverTapResponseDecorator {\nprivate final Logger mLogger;\nInboxResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config, CTLockManager ctLockManager,\n- final CTInboxController ctInboxController,\n- final CallbackManager callbackManager) {\n+ final CallbackManager callbackManager, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\n- mCTInboxController = ctInboxController;\n+ mCTInboxController = controllerManager.getCTInboxController();\nmCallbackManager = callbackManager;\nmLogger = mConfig.getLogger();\ninboxControllerLock = ctLockManager.getInboxControllerLock();\n@@ -32,7 +31,6 @@ class InboxResponse extends CleverTapResponseDecorator {\n//NotificationInbox\n@Override\nvoid processResponse(final JSONObject response, final String stringBody, final Context context) {\n- // TODO Implementation\nif (mConfig.isAnalyticsOnly()) {\nmLogger.verbose(mConfig.getAccountId(),\n@@ -66,7 +64,8 @@ class InboxResponse extends CleverTapResponseDecorator {\nprivate void _processInboxMessages(JSONArray messages) {\nsynchronized (inboxControllerLock) {\nif (mCTInboxController == null) {\n- mCTInboxController.initializeInbox();\n+ //mCTInboxController.initializeInbox();\n+ //TODO logging\n}\nif (mCTInboxController != null) {\nboolean update = mCTInboxController.updateMessages(messages);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -9,13 +9,7 @@ import android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n-import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n-import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n-import com.clevertap.android.sdk.inapp.InAppController;\nimport com.clevertap.android.sdk.login.IdentityRepoFactory;\n-import com.clevertap.android.sdk.login.LoginInfoProvider;\n-import com.clevertap.android.sdk.product_config.CTProductConfigController;\n-import com.clevertap.android.sdk.pushnotification.PushProviders;\nimport java.io.BufferedReader;\nimport java.io.IOException;\nimport java.io.InputStreamReader;\n@@ -33,6 +27,8 @@ import org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY)\npublic class NetworkManager extends BaseNetworkManager {\n+ private final ControllerManager mControllerManager;\n+\nprivate static SSLSocketFactory sslSocketFactory;\nprivate static SSLContext sslContext;\n@@ -47,8 +43,6 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final CoreMetaData mCoreMetaData;\n- private final CTLockManager mCtLockManager;\n-\nprivate int mCurrentRequestTimestamp = 0;\nprivate final BaseDatabaseManager mDatabaseManager;\n@@ -61,14 +55,10 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\n- private final PushProviders mPushProvider;\n-\nprivate int mResponseFailureCount = 0;// TODO encapsulate into NetworkState class\nprivate final ValidationResultStack mValidationResultStack;\n- private final Validator mValidator;\n-\nprivate int networkRetryCount = 0;// TODO encapsulate into NetworkState class\nNetworkManager(\n@@ -77,44 +67,42 @@ public class NetworkManager extends BaseNetworkManager {\nDeviceInfo deviceInfo,\nCoreMetaData coreMetaData,\nValidationResultStack validationResultStack,\n- PushProviders pushProviders,\n+ ControllerManager controllerManager,\nInAppFCManager inAppFCManager,\nBaseDatabaseManager baseDatabaseManager,\n- CTLockManager ctLockManager,\nPostAsyncSafelyHandler postAsyncSafelyHandler,\n- final Validator validator,\n- final CallbackManager callbackManager) {\n+ final CallbackManager callbackManager,\n+ CTLockManager ctLockManager,\n+ Validator validator) {\nmContext = context;\nmConfig = config;\nmDeviceInfo = deviceInfo;\n- mValidator = validator;\nmCallbackManager = callbackManager;\nmLogger = mConfig.getLogger();\nmCoreMetaData = coreMetaData;\nmValidationResultStack = validationResultStack;\n- mPushProvider = pushProviders;\n+ mControllerManager = controllerManager;\nmInAppFCManager = inAppFCManager;\nmDatabaseManager = baseDatabaseManager;\n- mCtLockManager = ctLockManager;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\n// maintain order\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\ncleverTapResponse = new GeofenceResponse(cleverTapResponse, config, callbackManager);\n- cleverTapResponse = new ProductConfigResponse(cleverTapResponse, config, coreMetaData);\n- cleverTapResponse = new FeatureFlagResponse(cleverTapResponse, config);\n+ cleverTapResponse = new ProductConfigResponse(cleverTapResponse, config, coreMetaData, controllerManager);\n+ cleverTapResponse = new FeatureFlagResponse(cleverTapResponse, config,controllerManager);\ncleverTapResponse = new DisplayUnitResponse(cleverTapResponse, config,\n- callbackManager);\n+ callbackManager,controllerManager);\ncleverTapResponse = new PushAmpResponse(cleverTapResponse, context, config, ctLockManager,\n- baseDatabaseManager, callbackManager, pushProviders);\n+ baseDatabaseManager, callbackManager, controllerManager);\ncleverTapResponse = new InboxResponse(cleverTapResponse, config, ctLockManager,\n- callbackManager);\n+ callbackManager,controllerManager);\ncleverTapResponse = new ConsoleResponse(cleverTapResponse, config);\n- cleverTapResponse = new ARPResponse(cleverTapResponse, config, this, validator);\n+ cleverTapResponse = new ARPResponse(cleverTapResponse, config, this, validator,controllerManager);\ncleverTapResponse = new MetadataResponse(cleverTapResponse, config, deviceInfo, this);\n- cleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager, postAsyncSafelyHandler);\n+ cleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager, postAsyncSafelyHandler,controllerManager);\ncleverTapResponse = new BaseResponse(cleverTapResponse);\n@@ -389,7 +377,7 @@ public class NetworkManager extends BaseNetworkManager {\n.getRepo(mContext, mConfig, mDeviceInfo,\nmValidationResultStack).getIdentitySet().toString());\nheader.put(\"ddnd\",\n- !(mDeviceInfo.getNotificationsEnabledForUser() && (mPushProvider.isNotificationSupported())));\n+ !(mDeviceInfo.getNotificationsEnabledForUser() && (mControllerManager.getPushProviders().isNotificationSupported())));\nif (mCoreMetaData.isBgPing()) {\nheader.put(\"bk\", 1);\nmCoreMetaData.setBgPing(false);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"diff": "@@ -21,13 +21,12 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nProductConfigResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\n- CoreMetaData coreMetaData) {\n+ CoreMetaData coreMetaData, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n-\nmCoreMetaData = coreMetaData;\n- mCTProductConfigController = ctProductConfigController;\n+ mCTProductConfigController = controllerManager.getCTProductConfigController();\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushAmpResponse.java",
"diff": "@@ -34,15 +34,14 @@ class PushAmpResponse extends CleverTapResponseDecorator {\nCTLockManager ctLockManager,\nBaseDatabaseManager dbManager,\nCallbackManager callbackManager,\n- final PushProviders pushProviders) {\n+ ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmContext = context;\nmConfig = config;\n- mPushProviders = pushProviders;\n+ mPushProviders = controllerManager.getPushProviders();\nmLogger = mConfig.getLogger();\ninboxControllerLock = ctLockManager.getInboxControllerLock();\nmDBAdapter = dbManager.loadDBAdapter(context);\n-\nmCallbackManager = callbackManager;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "@@ -254,8 +254,8 @@ public class LoginController {\n* Resets the Display Units in the cache\n*/\nprivate void resetDisplayUnits() {\n- if (mCoreState.getCTDisplayUnitController() != null) {\n- mCoreState.getCTDisplayUnitController().reset();\n+ if (mCoreState.getControllerManager().getCTDisplayUnitController() != null) {\n+ mCoreState.getControllerManager().getCTDisplayUnitController().reset();\n} else {\nmConfig.getLogger().verbose(mConfig.getAccountId(),\nConstants.FEATURE_DISPLAY_UNIT + \"Can't reset Display Units, DisplayUnitcontroller is null\");\n@@ -263,17 +263,17 @@ public class LoginController {\n}\nprivate void resetFeatureFlags() {\n- if (mCoreState.getCtFeatureFlagsController() != null && mCoreState.getCtFeatureFlagsController()\n+ if (mCoreState.getControllerManager().getCTFeatureFlagsController() != null && mCoreState.getControllerManager().getCTFeatureFlagsController()\n.isInitialized()) {\n- mCoreState.getCtFeatureFlagsController().resetWithGuid(mDeviceInfo.getDeviceID());\n- mCoreState.getCtFeatureFlagsController().fetchFeatureFlags();\n+ mCoreState.getControllerManager().getCTFeatureFlagsController().resetWithGuid(mDeviceInfo.getDeviceID());\n+ mCoreState.getControllerManager().getCTFeatureFlagsController().fetchFeatureFlags();\n}\n}\n// always call async\nprivate void resetInbox() {\nsynchronized (mCoreState.getCTLockManager().getInboxControllerLock()) {\n- mCoreState.setCtInboxController(null);\n+ mCoreState.getControllerManager().setCTInboxController(null);\n}\nmCoreState.initializeInbox();\n}\n@@ -284,12 +284,13 @@ public class LoginController {\nmConfig.getLogger().debug(mConfig.getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\n- if (mCoreState.getCtProductConfigController() != null) {\n- mCoreState.getCtProductConfigController().resetSettings();\n+ if (mCoreState.getControllerManager().getCTProductConfigController() != null) {\n+ mCoreState.getControllerManager().getCTProductConfigController().resetSettings();\n}\n- mCoreState.setCtProductConfigController(new CTProductConfigController(mContext, mDeviceInfo.getDeviceID(),\n+ CTProductConfigController ctProductConfigController = new CTProductConfigController(mContext, mDeviceInfo.getDeviceID(),\nmConfig, mCoreState.getBaseEventQueueManager(), mCoreState.getCoreMetaData(),\n- mCoreState.getCallbackManager()));\n+ mCoreState.getCallbackManager());\n+ mCoreState.getControllerManager().setCTProductConfigController(ctProductConfigController);\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Product Config reset\");\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -40,6 +40,7 @@ import com.clevertap.android.sdk.CTExecutors;\nimport com.clevertap.android.sdk.CleverTapAPI.DevicePushTokenRefreshListener;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.DBAdapter;\nimport com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.Logger;\n@@ -104,10 +105,11 @@ public class PushProviders {\nBaseDatabaseManager baseDatabaseManager,\nPostAsyncSafelyHandler postAsyncSafelyHandler,\nValidationResultStack validationResultStack,\n- AnalyticsManager analyticsManager) {\n+ AnalyticsManager analyticsManager, ControllerManager controllerManager) {\nPushProviders providers = new PushProviders(context, config, baseDatabaseManager,\npostAsyncSafelyHandler, validationResultStack, analyticsManager);\nproviders.init();\n+ controllerManager.setPushProviders(providers);\nreturn providers;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609): Introduces ControllerManager to manage controller dependencies |
116,623 | 25.01.2021 18:41:29 | -19,080 | bb0260fa7c34b3f66571224a6ca5653b6b6086f2 | task(SDK-609): Decoupling LoginController dependencies and moved initializeInbox to ControllerManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -108,8 +108,7 @@ public class AnalyticsManager {\n} catch (JSONException e) {\ne.printStackTrace();\n}\n-\n- mBaseEventQueueManager.queueEvent(mContext, event, Constants.FETCH_EVENT);\n+ sendFetchEvent(event);\n}\n//Event\n@@ -1188,4 +1187,9 @@ public class AnalyticsManager {\nmBaseEventQueueManager\n.queueEvent(mContext, eventObject, Constants.PING_EVENT);\n}\n+\n+ public void sendFetchEvent(final JSONObject eventObject){\n+ mBaseEventQueueManager\n+ .queueEvent(mContext, eventObject, Constants.FETCH_EVENT);\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1623,7 +1623,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@SuppressWarnings({\"unused\"})\npublic void initializeInbox() {\n- mCoreState.initializeInbox();\n+ mCoreState.getControllerManager().initializeInbox();\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -28,9 +28,6 @@ class CleverTapFactory {\nMainLooperHandler mainLooperHandler = new MainLooperHandler();\ncoreState.setMainLooperHandler(mainLooperHandler);\n- ControllerManager controllerManager = new ControllerManager();\n- coreState.setControllerManager(controllerManager);\n-\nCleverTapInstanceConfig config = new CleverTapInstanceConfig(cleverTapInstanceConfig);\ncoreState.setConfig(config);\n@@ -63,7 +60,9 @@ class CleverTapFactory {\nDBManager baseDatabaseManager = new DBManager(config, ctLockManager);\ncoreState.setDatabaseManager(baseDatabaseManager);\n- //config\n+ ControllerManager controllerManager = new ControllerManager(context,config,postAsyncSafelyHandler,\n+ ctLockManager,callbackManager,deviceInfo,baseDatabaseManager);\n+ coreState.setControllerManager(controllerManager);\n// initializing feature flag so that feature flag will automatically gets initialized\ncoreState.getControllerManager().getCTFeatureFlagsController();\n@@ -106,7 +105,10 @@ class CleverTapFactory {\nbaseEventQueueManager, postAsyncSafelyHandler);\ncoreState.setActivityLifeCycleManager(activityLifeCycleManager);\n- LoginController loginController = new LoginController(coreState);\n+ LoginController loginController = new LoginController(context,config,deviceInfo,\n+ validationResultStack,baseEventQueueManager,analyticsManager,inAppFCManager,\n+ postAsyncSafelyHandler,coreMetaData,controllerManager,sessionManager,\n+ localDataStore,callbackManager,baseDatabaseManager,ctLockManager);\ncoreState.setLoginController(loginController);\nreturn coreState;\n}\n@@ -116,12 +118,10 @@ class CleverTapFactory {\nif (config.isAnalyticsOnly()) {\nconfig.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n}else {\n- CTFeatureFlagsController ctFeatureFlagsController = new CTFeatureFlagsController(context,\n+ coreState.getControllerManager().setCTFeatureFlagsController(new CTFeatureFlagsController(context,\ndeviceInfo.getDeviceID(),\n- config, callbackManager, analyticsManager);\n+ config, callbackManager, analyticsManager));\nconfig.getLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n- coreState.getControllerManager().setCTFeatureFlagsController(ctFeatureFlagsController);\n-\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "package com.clevertap.android.sdk;\n+import android.content.Context;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inapp.InAppController;\n@@ -8,6 +9,30 @@ import com.clevertap.android.sdk.pushnotification.PushProviders;\npublic class ControllerManager {\n+ private final CleverTapInstanceConfig mConfig;\n+ private final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\n+ private final CTLockManager mCTLockManager;\n+ private final CallbackManager mCallbackManager;\n+ private final DeviceInfo mDeviceInfo;\n+ private final Context mContext;\n+ private final BaseDatabaseManager mBaseDatabaseManager;\n+\n+ public ControllerManager(Context context,\n+ CleverTapInstanceConfig config,\n+ PostAsyncSafelyHandler postAsyncSafelyHandler,\n+ CTLockManager ctLockManager,\n+ CallbackManager callbackManager,\n+ DeviceInfo deviceInfo,\n+ BaseDatabaseManager databaseManager) {\n+ mConfig = config;\n+ mPostAsyncSafelyHandler = postAsyncSafelyHandler;\n+ mCTLockManager = ctLockManager;\n+ mCallbackManager = callbackManager;\n+ mDeviceInfo = deviceInfo;\n+ mContext = context;\n+ mBaseDatabaseManager = databaseManager;\n+ }\n+\nprivate PushProviders mPushProviders;\nprivate InAppController mInAppController;\n@@ -71,4 +96,36 @@ public class ControllerManager {\npublic void setPushProviders(final PushProviders pushProviders) {\nmPushProviders = pushProviders;\n}\n+\n+ public void initializeInbox() {\n+ if (mConfig.isAnalyticsOnly()) {\n+ mConfig.getLogger()\n+ .debug(mConfig.getAccountId(), \"Instance is analytics only, not initializing Notification Inbox\");\n+ return;\n+ }\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"initializeInbox\", new Runnable() {\n+ @Override\n+ public void run() {\n+ _initializeInbox();\n+ }\n+ });\n+ }\n+\n+ // always call async\n+ private void _initializeInbox() {\n+ synchronized (mCTLockManager.getInboxControllerLock()) {\n+ if (getInAppController() != null) {\n+ mCallbackManager._notifyInboxInitialized();\n+ return;\n+ }\n+ if (mDeviceInfo.getDeviceID() != null) {\n+ setCTInboxController(new CTInboxController(mDeviceInfo.getDeviceID(),\n+ mBaseDatabaseManager.loadDBAdapter(mContext),\n+ Utils.haveVideoPlayerSupport));\n+ mCallbackManager._notifyInboxInitialized();\n+ } else {\n+ mConfig.getLogger().info(\"CRITICAL : No device ID found!\");\n+ }\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -270,32 +270,7 @@ public class CoreState extends CleverTapState {\nmValidator = validator;\n}\n- public void initializeInbox() {\n- if (getConfig().isAnalyticsOnly()) {\n- config.getLogger()\n- .debug(config.getAccountId(), \"Instance is analytics only, not initializing Notification Inbox\");\n- return;\n- }\n- postAsyncSafelyHandler.postAsyncSafely(\"initializeInbox\", new Runnable() {\n- @Override\n- public void run() {\n- _initializeInbox();\n- }\n- });\n- }\n- public void setCurrentUserOptOutStateFromStorage() {\n- String key = optOutKey();\n- if (key == null) {\n- getConfig().getLogger().verbose(getConfig().getAccountId(),\n- \"Unable to set current user OptOut state from storage: storage key is null\");\n- return;\n- }\n- boolean storedOptOut = StorageHelper.getBooleanFromPrefs(context, getConfig(), key);\n- getCoreMetaData().setCurrentUserOptedOut(storedOptOut);\n- getConfig().getLogger().verbose(getConfig().getAccountId(),\n- \"Set current user OptOut state from storage to: \" + storedOptOut + \" for key: \" + key);\n- }\nEventMediator getEventMediator() {\nreturn eventMediator;\n@@ -315,32 +290,7 @@ public class CoreState extends CleverTapState {\nthis.baseLocationManager = baseLocationManager;\n}\n- String optOutKey() {\n- String guid = getDeviceInfo().getDeviceID();\n- if (guid == null) {\n- return null;\n- }\n- return \"OptOut:\" + guid;\n- }\n- // always call async\n- private void _initializeInbox() {\n- synchronized (mCTLockManager.getInboxControllerLock()) {\n- if (getControllerManager().getInAppController() != null) {\n- mCallbackManager._notifyInboxInitialized();\n- return;\n- }\n- if (deviceInfo.getDeviceID() != null) {\n- ctInboxController = new CTInboxController(deviceInfo.getDeviceID(),\n- databaseManager.loadDBAdapter(context),\n- Utils.haveVideoPlayerSupport);\n- getControllerManager().setCTInboxController(ctInboxController);\n- mCallbackManager._notifyInboxInitialized();\n- } else {\n- config.getLogger().info(\"CRITICAL : No device ID found!\");\n- }\n- }\n- }\nprivate void initProductConfig() {\nLogger.v(\"Initializing Product Config with device Id = \" + getDeviceInfo().getDeviceID());\n@@ -351,7 +301,7 @@ public class CoreState extends CleverTapState {\n}\nif (ctProductConfigController == null) {\nCTProductConfigController ctProductConfigController = new CTProductConfigController(context, getDeviceInfo().getDeviceID(),\n- getConfig(), mBaseEventQueueManager, coreMetaData, mCallbackManager);\n+ getConfig(), mAnalyticsManager, coreMetaData, mCallbackManager);\ngetControllerManager().setCTProductConfigController(ctProductConfigController);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -750,4 +750,25 @@ public class DeviceInfo {\nreturn new JSONObject();\n}\n}\n+\n+ public void setCurrentUserOptOutStateFromStorage() {\n+ String key = optOutKey();\n+ if (key == null) {\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Unable to set current user OptOut state from storage: storage key is null\");\n+ return;\n+ }\n+ boolean storedOptOut = StorageHelper.getBooleanFromPrefs(context, config, key);\n+ mCoreMetaData.setCurrentUserOptedOut(storedOptOut);\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Set current user OptOut state from storage to: \" + storedOptOut + \" for key: \" + key);\n+ }\n+\n+ String optOutKey() {\n+ String guid = getDeviceID();\n+ if (guid == null) {\n+ return null;\n+ }\n+ return \"OptOut:\" + guid;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "package com.clevertap.android.sdk.login;\nimport android.content.Context;\n+import android.telecom.Call;\nimport com.clevertap.android.sdk.AnalyticsManager;\nimport com.clevertap.android.sdk.BaseDatabaseManager;\nimport com.clevertap.android.sdk.BaseEventQueueManager;\n+import com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.CoreState;\nimport com.clevertap.android.sdk.DBManager;\n@@ -39,8 +42,6 @@ public class LoginController {\nprivate final CoreMetaData mCoreMetaData;\n- private final CoreState mCoreState;\n-\nprivate final DeviceInfo mDeviceInfo;\nprivate final InAppFCManager mInAppFCManager;\n@@ -61,22 +62,41 @@ public class LoginController {\nprivate final Boolean processingUserLoginLock = true;\n- public LoginController(CoreState coreState) {\n- mConfig = coreState.getConfig();\n- mContext = coreState.getContext();\n- mDeviceInfo = coreState.getDeviceInfo();\n- mValidationResultStack = coreState.getValidationResultStack();\n- mBaseEventQueueManager = coreState.getBaseEventQueueManager();\n- mAnalyticsManager = coreState.getAnalyticsManager();\n- mInAppFCManager = coreState.getInAppFCManager();\n- mPostAsyncSafelyHandler = coreState.getPostAsyncSafelyHandler();\n- mCoreMetaData = coreState.getCoreMetaData();\n- mPushProviders = coreState.getPushProviders();\n- mSessionManager = coreState.getSessionManager();\n- mLocalDataStore = coreState.getLocalDataStore();\n- mCallbackManager = coreState.getCallbackManager();\n- mCoreState = coreState;\n- mDBManager = coreState.getDatabaseManager();\n+ private final ControllerManager mControllerManager;\n+\n+ private final CTLockManager mCTLockManager;\n+\n+ public LoginController(Context context,\n+ CleverTapInstanceConfig config,\n+ DeviceInfo deviceInfo,\n+ ValidationResultStack validationResultStack,\n+ BaseEventQueueManager eventQueueManager,\n+ AnalyticsManager analyticsManager,\n+ InAppFCManager inAppFCManager,\n+ PostAsyncSafelyHandler postAsyncSafelyHandler,\n+ CoreMetaData coreMetaData,\n+ ControllerManager controllerManager,\n+ SessionManager sessionManager,\n+ LocalDataStore localDataStore,\n+ CallbackManager callbackManager,\n+ DBManager dbManager,\n+ CTLockManager ctLockManager){\n+ mConfig = config;\n+ mContext = context;\n+ mDeviceInfo = deviceInfo;\n+ mValidationResultStack = validationResultStack;\n+ mBaseEventQueueManager = eventQueueManager;\n+ mAnalyticsManager = analyticsManager;\n+ mInAppFCManager = inAppFCManager;\n+ mPostAsyncSafelyHandler = postAsyncSafelyHandler;\n+ mCoreMetaData = coreMetaData;\n+ mPushProviders = controllerManager.getPushProviders();\n+ mSessionManager = sessionManager;\n+ mLocalDataStore = localDataStore;\n+ mCallbackManager = callbackManager;\n+ mDBManager = dbManager;\n+ mControllerManager = controllerManager;\n+ mCTLockManager = ctLockManager;\n}\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n@@ -216,7 +236,7 @@ public class LoginController {\nmDeviceInfo.forceNewDeviceID();\n}\nmCallbackManager.notifyUserProfileInitialized(mDeviceInfo.getDeviceID());\n- mCoreState.setCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\n+ mDeviceInfo.setCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\nmAnalyticsManager.forcePushAppLaunchedEvent();\nif (profile != null) {\nmAnalyticsManager.pushProfile(profile);\n@@ -245,8 +265,8 @@ public class LoginController {\n}\npublic void recordDeviceIDErrors() {\n- for (ValidationResult validationResult : mCoreState.getDeviceInfo().getValidationResults()) {\n- mCoreState.getValidationResultStack().pushValidationResult(validationResult);\n+ for (ValidationResult validationResult : mDeviceInfo.getValidationResults()) {\n+ mValidationResultStack.pushValidationResult(validationResult);\n}\n}\n@@ -254,8 +274,8 @@ public class LoginController {\n* Resets the Display Units in the cache\n*/\nprivate void resetDisplayUnits() {\n- if (mCoreState.getControllerManager().getCTDisplayUnitController() != null) {\n- mCoreState.getControllerManager().getCTDisplayUnitController().reset();\n+ if (mControllerManager.getCTDisplayUnitController() != null) {\n+ mControllerManager.getCTDisplayUnitController().reset();\n} else {\nmConfig.getLogger().verbose(mConfig.getAccountId(),\nConstants.FEATURE_DISPLAY_UNIT + \"Can't reset Display Units, DisplayUnitcontroller is null\");\n@@ -263,19 +283,19 @@ public class LoginController {\n}\nprivate void resetFeatureFlags() {\n- if (mCoreState.getControllerManager().getCTFeatureFlagsController() != null && mCoreState.getControllerManager().getCTFeatureFlagsController()\n+ if (mControllerManager.getCTFeatureFlagsController() != null && mControllerManager.getCTFeatureFlagsController()\n.isInitialized()) {\n- mCoreState.getControllerManager().getCTFeatureFlagsController().resetWithGuid(mDeviceInfo.getDeviceID());\n- mCoreState.getControllerManager().getCTFeatureFlagsController().fetchFeatureFlags();\n+ mControllerManager.getCTFeatureFlagsController().resetWithGuid(mDeviceInfo.getDeviceID());\n+ mControllerManager.getCTFeatureFlagsController().fetchFeatureFlags();\n}\n}\n// always call async\nprivate void resetInbox() {\n- synchronized (mCoreState.getCTLockManager().getInboxControllerLock()) {\n- mCoreState.getControllerManager().setCTInboxController(null);\n+ synchronized (mCTLockManager.getInboxControllerLock()) {\n+ mControllerManager.setCTInboxController(null);\n}\n- mCoreState.initializeInbox();\n+ mControllerManager.initializeInbox();\n}\n//Session\n@@ -284,13 +304,13 @@ public class LoginController {\nmConfig.getLogger().debug(mConfig.getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\n- if (mCoreState.getControllerManager().getCTProductConfigController() != null) {\n- mCoreState.getControllerManager().getCTProductConfigController().resetSettings();\n+ if (mControllerManager.getCTProductConfigController() != null) {\n+ mControllerManager.getCTProductConfigController().resetSettings();\n}\nCTProductConfigController ctProductConfigController = new CTProductConfigController(mContext, mDeviceInfo.getDeviceID(),\n- mConfig, mCoreState.getBaseEventQueueManager(), mCoreState.getCoreMetaData(),\n- mCoreState.getCallbackManager());\n- mCoreState.getControllerManager().setCTProductConfigController(ctProductConfigController);\n+ mConfig, mAnalyticsManager, mCoreMetaData,\n+ mCallbackManager);\n+ mControllerManager.setCTProductConfigController(ctProductConfigController);\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Product Config reset\");\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -9,6 +9,7 @@ import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.\nimport android.content.Context;\nimport android.text.TextUtils;\n+import com.clevertap.android.sdk.AnalyticsManager;\nimport com.clevertap.android.sdk.BaseEventQueueManager;\nimport com.clevertap.android.sdk.CallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -48,8 +49,6 @@ public class CTProductConfigController {\nprivate boolean isInitialized = false;\n- private final BaseEventQueueManager mBaseEventQueueManager;\n-\nprivate final CallbackManager mCallbackManager;\nprivate final CoreMetaData mCoreMetaData;\n@@ -58,19 +57,21 @@ public class CTProductConfigController {\nprivate final HashMap<String, String> waitingTobeActivatedConfig = new HashMap<>();\n+ private final AnalyticsManager mAnalyticsManager;\n+\n// -----------------------------------------------------------------------//\n// ******** Public API *****//\n// -----------------------------------------------------------------------//\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config,\n- final BaseEventQueueManager baseEventQueueManager, final CoreMetaData coreMetaData,\n+ final AnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\nfinal CallbackManager callbackManager) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\n- this.mBaseEventQueueManager = baseEventQueueManager;\nmCoreMetaData = coreMetaData;\nmCallbackManager = callbackManager;\n+ mAnalyticsManager = analyticsManager;\nthis.settings = new ProductConfigSettings(context, guid, config);\ninitAsync();\n}\n@@ -164,8 +165,7 @@ public class CTProductConfigController {\n} catch (JSONException e) {\ne.printStackTrace();\n}\n-\n- mBaseEventQueueManager.queueEvent(context, event, Constants.FETCH_EVENT);\n+ mAnalyticsManager.sendFetchEvent(event);\nmCoreMetaData.setProductConfigRequested(true);\nconfig.getLogger()\n.verbose(config.getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Fetching product config\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609): Decoupling LoginController dependencies and moved initializeInbox to ControllerManager |
116,621 | 25.01.2021 19:03:33 | -19,080 | 059539c28bb339866064f47a737d39b5c057f90e | task(SDK-609):Merged COde with ControllerManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/TODO.md",
"new_path": "clevertap-core/TODO.md",
"diff": "10. Test In-app/inbox/display-unit - piyush\n11. Callbackmanage weakreference listeners getters null check\n12. Add null check for InappFCManager\n+13. InappNotificationActivity :-> Oncreate :-> setListener incompatible types: CleverTapAPI cannot be converted to InAppActivityListener\n+14. CleverTapAPI :-> processDisplayUnitsResponse\n+15.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"diff": "@@ -106,9 +106,7 @@ class ActivityLifeCycleManager {\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Failed to trigger location\");\n}\n}\n- if (!mCoreMetaData.inCurrentSession()) {\nmBaseEventQueueManager.pushInitialEventsAsync();\n- }\nmInAppController.checkExistingInAppNotifications(activity);\nmInAppController.checkPendingInAppNotifications(activity);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -446,8 +446,8 @@ public class AnalyticsManager {\nJSONArray inappNotifs = new JSONArray();\nr.put(Constants.INAPP_JSON_RESPONSE_KEY, inappNotifs);\ninappNotifs.put(new JSONObject(extras.getString(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY)));\n-\n- processInAppResponse(r, mContext);\n+ //TODO Refactoring\n+ //processInAppResponse(r, mContext);\n} catch (Throwable t) {\nLogger.v(\"Failed to display inapp notification from push notification payload\", t);\n}\n@@ -472,7 +472,8 @@ public class AnalyticsManager {\nextras.getString(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY));\ntestPushObject.put(\"_id\", String.valueOf(System.currentTimeMillis() / 1000));\ninappNotifs.put(testPushObject);\n- processInboxResponse(r);\n+ //TODO Refactoring\n+ //processInboxResponse(r);\n} catch (Throwable t) {\nLogger.v(\"Failed to process inbox message from push notification payload\", t);\n}\n@@ -483,7 +484,8 @@ public class AnalyticsManager {\n}\nif (extras.containsKey(Constants.DISPLAY_UNIT_PREVIEW_PUSH_PAYLOAD_KEY)) {\n- handleSendTestForDisplayUnits(extras);\n+ //TODO Refactoring\n+ //handleSendTestForDisplayUnits(extras);\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseResponse.java",
"diff": "@@ -19,18 +19,17 @@ class BaseResponse extends CleverTapResponseDecorator {\nprivate final NetworkManager mNetworkManager;\n- BaseResponse(CleverTapResponse cleverTapResponse) {\n+ BaseResponse(Context context, CleverTapInstanceConfig config,\n+ DeviceInfo deviceInfo, NetworkManager networkManager, LocalDataStore localDataStore, CleverTapResponse cleverTapResponse) {\nmCleverTapResponse = cleverTapResponse;\n- //CoreState coreState = getCoreState();\n-\n- mContext = coreState.getContext();\n- mConfig = coreState.getConfig();\n- mDeviceInfo = coreState.getDeviceInfo();\n+ mContext = context;\n+ mConfig = config;\n+ mDeviceInfo = deviceInfo;\nmLogger = mConfig.getLogger();\n- mNetworkManager = (NetworkManager) coreState.getNetworkManager();\n- mLocalDataStore = coreState.getLocalDataStore();\n+ mNetworkManager = networkManager;\n+ mLocalDataStore = localDataStore;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -957,7 +957,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n@Override\npublic void run() {\nmCoreState.getDeviceInfo().setDeviceNetworkInfoReportingFromStorage();\n- mCoreState.setCurrentUserOptOutStateFromStorage();\n+ mCoreState.getDeviceInfo().setCurrentUserOptOutStateFromStorage();\n}\n});\n@@ -2218,7 +2218,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\npushProfile(optOutMap);\n}\n// persist the new optOut state\n- String key = mCoreState.optOutKey();\n+ String key = mCoreState.getDeviceInfo().optOutKey();\nif (key == null) {\ngetConfigLogger()\n.verbose(getAccountId(), \"Unable to persist user OptOut state, storage key is null\");\n@@ -2358,7 +2358,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nr.put(Constants.DISPLAY_UNIT_JSON_RESPONSE_KEY, displayUnits);\nJSONObject testPushObject = new JSONObject(pushJsonPayload);\ndisplayUnits.put(testPushObject);\n- processDisplayUnitsResponse(r);\n+ //TODO Refactoring\n+ //processDisplayUnitsResponse(r);\n} catch (Throwable t) {\nLogger.v(\"Failed to process Display Unit from push notification payload\", t);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -69,14 +69,14 @@ class CleverTapFactory {\nNetworkManager networkManager = new NetworkManager(context, config, deviceInfo, coreMetaData,\nvalidationResultStack, controllerManager, inAppFCManager, baseDatabaseManager,\n- postAsyncSafelyHandler,callbackManager,ctLockManager,validator);\n+ postAsyncSafelyHandler, callbackManager, ctLockManager, validator, localDataStore);\ncoreState.setNetworkManager(networkManager);\nEventQueueManager baseEventQueueManager = new EventQueueManager(baseDatabaseManager, context, config,\neventMediator,\nsessionManager, callbackManager,\nmainLooperHandler, postAsyncSafelyHandler, deviceInfo, validationResultStack,\n- networkManager, baseDatabaseManager, coreMetaData, ctLockManager, localDataStore);\n+ networkManager, coreMetaData, ctLockManager, localDataStore);\ncoreState.setBaseEventQueueManager(baseEventQueueManager);\nAnalyticsManager analyticsManager = new AnalyticsManager(context, config, baseEventQueueManager, validator,\n@@ -99,7 +99,6 @@ class CleverTapFactory {\nanalyticsManager, controllerManager);\ncoreState.setPushProviders(pushProviders);\n-\nActivityLifeCycleManager activityLifeCycleManager = new ActivityLifeCycleManager(context, config,\nanalyticsManager, coreMetaData, sessionManager, pushProviders, callbackManager, inAppController,\nbaseEventQueueManager, postAsyncSafelyHandler);\n@@ -113,7 +112,8 @@ class CleverTapFactory {\nreturn coreState;\n}\n- static void initFeatureFlags(Context context, CoreState coreState, CleverTapInstanceConfig config, DeviceInfo deviceInfo, CallbackManager callbackManager, AnalyticsManager analyticsManager){\n+ static void initFeatureFlags(Context context, CoreState coreState, CleverTapInstanceConfig config,\n+ DeviceInfo deviceInfo, CallbackManager callbackManager, AnalyticsManager analyticsManager) {\nLogger.v(\"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\nif (config.isAnalyticsOnly()) {\nconfig.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -20,8 +20,6 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nprivate final BaseDatabaseManager mBaseDatabaseManager;\n- private final CallbackManager mCallbackManager;\n-\nprivate final CoreMetaData mCleverTapMetaData;\nprivate final CleverTapInstanceConfig mConfig;\n@@ -30,8 +28,6 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nprivate CTLockManager mCtLockManager;\n- private final BaseDatabaseManager mDatabaseManager;\n-\nprivate final DeviceInfo mDeviceInfo;\nprivate final EventMediator mEventMediator;\n@@ -63,7 +59,6 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nDeviceInfo deviceInfo,\nValidationResultStack validationResultStack,\nNetworkManager networkManager,\n- DBManager dbManager,\nCoreMetaData coreMetaData,\nCTLockManager ctLockManager,\nfinal LocalDataStore localDataStore) {\n@@ -72,13 +67,11 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nmConfig = config;\nmEventMediator = eventMediator;\nmSessionManager = sessionManager;\n- mCallbackManager = callbackManager;\nmMainLooperHandler = mainLooperHandler;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\nmDeviceInfo = deviceInfo;\nmValidationResultStack = validationResultStack;\nmNetworkManager = networkManager;\n- mDatabaseManager = dbManager;\nmLocalDataStore = localDataStore;\nmLogger = mConfig.getLogger();\nmCleverTapMetaData = coreMetaData;\n@@ -268,7 +261,7 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n@Override\nvoid pushInitialEventsAsync() {\n-\n+ if(!mCleverTapMetaData.inCurrentSession()){\nmPostAsyncSafelyHandler.postAsyncSafely(\"CleverTapAPI#pushInitialEventsAsync\", new Runnable() {\n@Override\npublic void run() {\n@@ -281,6 +274,7 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n}\n});\n}\n+ }\n@Override\nvoid scheduleQueueFlush(final Context context) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/FeatureFlagResponse.java",
"diff": "@@ -9,20 +9,19 @@ import org.json.JSONObject;\nclass FeatureFlagResponse extends CleverTapResponseDecorator {\n- private CTFeatureFlagsController mCTFeatureFlagsController;\n-\nprivate final CleverTapResponse mCleverTapResponse;\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Logger mLogger;\n+ private final ControllerManager mControllerManager;\nFeatureFlagResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n- mCTFeatureFlagsController = controllerManager.getCTFeatureFlagsController();\n+ mControllerManager = controllerManager;\n}\n@Override\n@@ -65,8 +64,8 @@ class FeatureFlagResponse extends CleverTapResponseDecorator {\nprivate void parseFeatureFlags(JSONObject responseKV) throws JSONException {\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n- if (kvArray != null && mCTFeatureFlagsController != null) {\n- mCTFeatureFlagsController.updateFeatureFlags(responseKV);\n+ if (kvArray != null && mControllerManager.getCTFeatureFlagsController() != null) {\n+ mControllerManager.getCTFeatureFlagsController().updateFeatureFlags(responseKV);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -61,8 +61,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n}\n- //TODO\n- setListener(CleverTapAPI.instanceWithConfig(getApplicationContext(), config));\n+ //TODO Refactoring\n+ // setListener(CleverTapAPI.instanceWithConfig(getApplicationContext(), config));\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\nfinish();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppResponse.java",
"diff": "@@ -13,11 +13,10 @@ class InAppResponse extends CleverTapResponseDecorator {\nprivate final CleverTapInstanceConfig mConfig;\n- private InAppController mInAppController;\n-\nprivate final InAppFCManager mInAppFCManager;\nprivate final Logger mLogger;\n+ private final ControllerManager mControllerManager;\nprivate final PostAsyncSafelyHandler mPostAsyncSafelyHandler;\n@@ -28,7 +27,7 @@ class InAppResponse extends CleverTapResponseDecorator {\nmLogger = mConfig.getLogger();\nmInAppFCManager = inAppFCManager;\nmPostAsyncSafelyHandler = postAsyncSafelyHandler;\n- mInAppController = controllerManager.getInAppController();\n+ mControllerManager = controllerManager;\n}\n@Override\n@@ -107,7 +106,7 @@ class InAppResponse extends CleverTapResponseDecorator {\nmPostAsyncSafelyHandler.runOnNotificationQueue(new Runnable() {\n@Override\npublic void run() {\n- mInAppController.showNotificationIfAvailable(context);\n+ mControllerManager.getInAppController().showNotificationIfAvailable(context);\n}\n});\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxResponse.java",
"diff": "@@ -8,8 +8,6 @@ class InboxResponse extends CleverTapResponseDecorator {\nprivate final Object inboxControllerLock;\n- private final CTInboxController mCTInboxController;\n-\nprivate final CallbackManager mCallbackManager;\nprivate final CleverTapResponse mCleverTapResponse;\n@@ -17,15 +15,16 @@ class InboxResponse extends CleverTapResponseDecorator {\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Logger mLogger;\n+ private final ControllerManager mControllerManager;\nInboxResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config, CTLockManager ctLockManager,\nfinal CallbackManager callbackManager, ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\n- mCTInboxController = controllerManager.getCTInboxController();\nmCallbackManager = callbackManager;\nmLogger = mConfig.getLogger();\ninboxControllerLock = ctLockManager.getInboxControllerLock();\n+ mControllerManager = controllerManager;\n}\n//NotificationInbox\n@@ -63,12 +62,12 @@ class InboxResponse extends CleverTapResponseDecorator {\n// always call async\nprivate void _processInboxMessages(JSONArray messages) {\nsynchronized (inboxControllerLock) {\n- if (mCTInboxController == null) {\n+ if (mControllerManager.getCTInboxController() == null) {\n//mCTInboxController.initializeInbox();\n//TODO logging\n}\n- if (mCTInboxController != null) {\n- boolean update = mCTInboxController.updateMessages(messages);\n+ if (mControllerManager.getCTInboxController() != null) {\n+ boolean update = mControllerManager.getCTInboxController().updateMessages(messages);\nif (update) {\nmCallbackManager._notifyInboxMessagesDidUpdate();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NetworkManager.java",
"diff": "@@ -73,7 +73,8 @@ public class NetworkManager extends BaseNetworkManager {\nPostAsyncSafelyHandler postAsyncSafelyHandler,\nfinal CallbackManager callbackManager,\nCTLockManager ctLockManager,\n- Validator validator) {\n+ Validator validator,\n+ LocalDataStore localDataStore) {\nmContext = context;\nmConfig = config;\nmDeviceInfo = deviceInfo;\n@@ -104,7 +105,7 @@ public class NetworkManager extends BaseNetworkManager {\ncleverTapResponse = new MetadataResponse(cleverTapResponse, config, deviceInfo, this);\ncleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager, postAsyncSafelyHandler,controllerManager);\n- cleverTapResponse = new BaseResponse(cleverTapResponse);\n+ cleverTapResponse = new BaseResponse(context,config,deviceInfo,this,localDataStore,cleverTapResponse);\nsetCleverTapResponse(cleverTapResponse);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ProductConfigResponse.java",
"diff": "@@ -8,9 +8,6 @@ import org.json.JSONObject;\nclass ProductConfigResponse extends CleverTapResponseDecorator {\n-\n- private final CTProductConfigController mCTProductConfigController;\n-\nprivate final CleverTapResponse mCleverTapResponse;\nprivate final CleverTapInstanceConfig mConfig;\n@@ -18,6 +15,7 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nprivate final CoreMetaData mCoreMetaData;\nprivate final Logger mLogger;\n+ private final ControllerManager mControllerManager;\nProductConfigResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\n@@ -26,7 +24,7 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nmConfig = config;\nmLogger = mConfig.getLogger();\nmCoreMetaData = coreMetaData;\n- mCTProductConfigController = controllerManager.getCTProductConfigController();\n+ mControllerManager = controllerManager;\n}\n@Override\n@@ -72,8 +70,8 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nprivate void onProductConfigFailed() {\nif (mCoreMetaData.isProductConfigRequested()) {\n- if (mCTProductConfigController != null) {\n- mCTProductConfigController.onFetchFailed();\n+ if (mControllerManager.getCTProductConfigController() != null) {\n+ mControllerManager.getCTProductConfigController().onFetchFailed();\n}\nmCoreMetaData.setProductConfigRequested(false);\n}\n@@ -82,8 +80,8 @@ class ProductConfigResponse extends CleverTapResponseDecorator {\nprivate void parseProductConfigs(JSONObject responseKV) throws JSONException {\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n- if (kvArray != null && mCTProductConfigController != null) {\n- mCTProductConfigController.onFetchSuccess(responseKV);\n+ if (kvArray != null && mControllerManager.getCTProductConfigController() != null) {\n+ mControllerManager.getCTProductConfigController().onFetchSuccess(responseKV);\n} else {\nonProductConfigFailed();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java",
"diff": "@@ -49,8 +49,8 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\nvoid generateListener() {\nif (config != null) {\nCleverTapAPI cleverTapAPI = CleverTapAPI.instanceWithConfig(this.context, config);\n- //TODO\n- setListener(cleverTapAPI.getCoreState().getInAppController());\n+ //TODO Refactoring\n+ //setListener(cleverTapAPI.getCoreState().getInAppController());\n}\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Merged COde with ControllerManager |
116,623 | 26.01.2021 16:11:09 | -19,080 | 6836e025d46393212888b74f4b0f391a8715cfcb | task(SDK-609): InAppController handles InAppActivity callbacks | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -4,6 +4,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -15,6 +16,8 @@ import java.util.ArrayList;\n@RestrictTo(Scope.LIBRARY)\npublic class CallbackManager {\n+ private InAppActivityListener mInAppActivityListener;\n+\nprivate FailureFlushListener mFailureFlushListener;\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n@@ -57,6 +60,10 @@ public class CallbackManager {\nreturn null;\n}\n+ public InAppActivityListener getInAppActivityListener() {\n+ return mInAppActivityListener;\n+ }\n+\npublic void setFailureFlushListener(final FailureFlushListener failureFlushListener) {\nmFailureFlushListener = failureFlushListener;\n}\n@@ -80,6 +87,11 @@ public class CallbackManager {\nreturn null;\n}\n+ public void setInAppActivityListener(\n+ final InAppActivityListener inAppActivityListener) {\n+ mInAppActivityListener = inAppActivityListener;\n+ }\n+\npublic void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener) {\nthis.inAppNotificationButtonListener = new WeakReference<>(inAppNotificationButtonListener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -22,6 +22,7 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\n+import com.clevertap.android.sdk.inapp.InAppController;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n@@ -32,7 +33,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nvoid inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\nHashMap<String, String> keyValuePayload);\n- void inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData);\n+ void inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData, InAppController inAppController);\nvoid inAppNotificationDidShow(CTInAppNotification inAppNotification, Bundle formData);\n}\n@@ -45,6 +46,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate WeakReference<InAppActivityListener> listenerWeakReference;\n+ private InAppController mInAppController;\n+\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\nint orientation = this.getResources().getConfiguration().orientation;\n@@ -61,8 +64,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n}\n- //TODO Refactoring\n- // setListener(CleverTapAPI.instanceWithConfig(getApplicationContext(), config));\n+\n+ mInAppController = (InAppController) notif.getSerializable(\"controller\");\n+ setListener(mInAppController);\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\nfinish();\n@@ -164,7 +168,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nfinish();\nInAppActivityListener listener = getListener();\nif (listener != null && getBaseContext() != null) {\n- listener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data);\n+ listener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data,mInAppController);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -24,6 +24,7 @@ import com.clevertap.android.sdk.ManifestInfo;\nimport com.clevertap.android.sdk.PostAsyncSafelyHandler;\nimport com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.Utils;\n+import java.io.Serializable;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n@@ -34,7 +35,8 @@ import java.util.List;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppActivityListener {\n+public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppActivityListener,\n+ Serializable {\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -109,6 +111,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nmCallbackManager = callbackManager;\nmAnalyticsManager = analyticsManager;\nmCoreMetaData = coreMetaData;\n+ mCallbackManager.setInAppActivityListener(this);\n}\npublic void checkExistingInAppNotifications(Activity activity) {\n@@ -125,6 +128,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", currentlyDisplayingInApp);\nbundle.putParcelable(\"config\", mConfig);\n+ bundle.putSerializable(\"controller\",this);\ninAppFragment.setArguments(bundle);\nfragmentTransaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);\nfragmentTransaction.add(android.R.id.content, inAppFragment, currentlyDisplayingInApp.getType());\n@@ -165,7 +169,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void inAppNotificationDidDismiss(final Context context, final CTInAppNotification inAppNotification,\n- Bundle formData) {\n+ Bundle formData, final InAppController inAppController) {\ninAppNotification.didDismiss();\nif (mInAppFCManager != null) {\nmInAppFCManager.didDismiss(inAppNotification);\n@@ -198,7 +202,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nmPostAsyncSafelyHandler.runOnNotificationQueue(new Runnable() {\n@Override\npublic void run() {\n- inAppDidDismiss(context, mConfig, inAppNotification);\n+ inAppDidDismiss(context, mConfig, inAppNotification,inAppController);\n_showNotificationIfAvailable(context);\n}\n});\n@@ -255,7 +259,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\ncheckPendingNotifications(context,\n- mConfig); // see if we have any pending notifications\n+ mConfig,this); // see if we have any pending notifications\nJSONArray inapps = new JSONArray(\nStorageHelper.getStringFromPrefs(context, mConfig, Constants.INAPP_KEY, \"[]\"));\n@@ -351,7 +355,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nshowInAppNotificationIfAny();\nreturn;\n}\n- showInApp(mContext, inAppNotification, mConfig);\n+ showInApp(mContext, inAppNotification, mConfig,this);\n}\n@@ -391,7 +395,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n- private static void checkPendingNotifications(final Context context, final CleverTapInstanceConfig config) {\n+ private static void checkPendingNotifications(final Context context, final CleverTapInstanceConfig config, final InAppController inAppController) {\nLogger.v(config.getAccountId(), \"checking Pending Notifications\");\nif (pendingNotifications != null && !pendingNotifications.isEmpty()) {\ntry {\n@@ -401,7 +405,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nmainHandler.post(new Runnable() {\n@Override\npublic void run() {\n- showInApp(context, notification, config);\n+ showInApp(context, notification, config,inAppController);\n}\n});\n} catch (Throwable t) {\n@@ -412,18 +416,18 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n//InApp\nprivate static void inAppDidDismiss(Context context, CleverTapInstanceConfig config,\n- CTInAppNotification inAppNotification) {\n+ CTInAppNotification inAppNotification, InAppController inAppController) {\nLogger.v(config.getAccountId(), \"Running inAppDidDismiss\");\nif (currentlyDisplayingInApp != null && (currentlyDisplayingInApp.getCampaignId()\n.equals(inAppNotification.getCampaignId()))) {\ncurrentlyDisplayingInApp = null;\n- checkPendingNotifications(context, config);\n+ checkPendingNotifications(context, config,inAppController);\n}\n}\n//InApp\nprivate static void showInApp(Context context, final CTInAppNotification inAppNotification,\n- CleverTapInstanceConfig config) {\n+ CleverTapInstanceConfig config, InAppController inAppController) {\nLogger.v(config.getAccountId(), \"Attempting to show next In-App\");\n@@ -464,6 +468,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nintent.putExtra(\"inApp\", inAppNotification);\nBundle configBundle = new Bundle();\nconfigBundle.putParcelable(\"config\", config);\n+ configBundle.putSerializable(\"controller\",inAppController);\nintent.putExtra(\"configBundle\", configBundle);\ntry {\nActivity currentActivity = CoreMetaData.getCurrentActivity();\n@@ -508,6 +513,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", inAppNotification);\nbundle.putParcelable(\"config\", config);\n+ bundle.putSerializable(\"controller\",inAppController);\ninAppFragment.setArguments(bundle);\nfragmentTransaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);\nfragmentTransaction.add(android.R.id.content, inAppFragment, inAppNotification.getType());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609): InAppController handles InAppActivity callbacks |
116,612 | 27.01.2021 16:06:23 | -19,080 | 8ee35b62bc0da2ecb91ae5c5b70f5c93f0d3611a | task(refactor): move handleSendTestForDisplayUnits to AnalyticsManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -7,7 +7,6 @@ import android.content.Context;\nimport android.location.Location;\nimport android.net.Uri;\nimport android.os.Bundle;\n-import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\n@@ -26,14 +25,14 @@ public class AnalyticsManager {\nprivate final BaseEventQueueManager mBaseEventQueueManager;\n- private final CTDisplayUnitController mCTDisplayUnitController;\n-\nprivate final CallbackManager mCallbackManager;\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Context mContext;\n+ private final ControllerManager mControllerManager;\n+\nprivate final CoreMetaData mCoreMetaData;\nprivate final DeviceInfo mDeviceInfo;\n@@ -78,7 +77,7 @@ public class AnalyticsManager {\nmCallbackManager = callbackManager;\n//TODO set display unit using observer pattern once it's created lazily, check for it's usage in\n// pushDisplayUnitClickedEventForID & pushDisplayUnitViewedEventForID\n- mCTDisplayUnitController = controllerManager.getCTDisplayUnitController();\n+ mControllerManager = controllerManager;\n}\npublic void addMultiValuesForKey(final String key, final ArrayList<String> values) {\n@@ -151,8 +150,8 @@ public class AnalyticsManager {\nevent.put(\"evtName\", Constants.NOTIFICATION_CLICKED_EVENT_NAME);\n//wzrk fields\n- if (mCTDisplayUnitController != null) {\n- CleverTapDisplayUnit displayUnit = mCTDisplayUnitController\n+ if (mControllerManager.getCTDisplayUnitController() != null) {\n+ CleverTapDisplayUnit displayUnit = mControllerManager.getCTDisplayUnitController()\n.getDisplayUnitForID(unitID);\nif (displayUnit != null) {\nJSONObject eventExtraData = displayUnit.getWZRKFields();\n@@ -182,8 +181,8 @@ public class AnalyticsManager {\nevent.put(\"evtName\", Constants.NOTIFICATION_VIEWED_EVENT_NAME);\n//wzrk fields\n- if (mCTDisplayUnitController != null) {\n- CleverTapDisplayUnit displayUnit = mCTDisplayUnitController\n+ if (mControllerManager.getCTDisplayUnitController() != null) {\n+ CleverTapDisplayUnit displayUnit = mControllerManager.getCTDisplayUnitController()\n.getDisplayUnitForID(unitID);\nif (displayUnit != null) {\nJSONObject eventExtras = displayUnit.getWZRKFields();\n@@ -485,8 +484,7 @@ public class AnalyticsManager {\n}\nif (extras.containsKey(Constants.DISPLAY_UNIT_PREVIEW_PUSH_PAYLOAD_KEY)) {\n- //TODO Refactoring\n- //handleSendTestForDisplayUnits(extras);\n+ handleSendTestForDisplayUnits(extras);\nreturn;\n}\n@@ -1196,6 +1194,27 @@ public class AnalyticsManager {\n.queueEvent(mContext, eventObject, Constants.FETCH_EVENT);\n}\n+ /**\n+ * This method handles send Test flow for Display Units\n+ *\n+ * @param extras - bundled data of notification payload\n+ */\n+ private void handleSendTestForDisplayUnits(Bundle extras) {\n+ try {\n+ JSONObject r = CTJsonConverter.displayUnitFromExtras(extras);\n+\n+ CleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\n+\n+ cleverTapResponse = new DisplayUnitResponse(cleverTapResponse, mConfig,\n+ mCallbackManager, mControllerManager);\n+\n+ cleverTapResponse.processResponse(r, null, mContext);\n+\n+ } catch (Throwable t) {\n+ Logger.v(\"Failed to process Display Unit from push notification payload\", t);\n+ }\n+ }\n+\n/**\n* Raises the Notification Clicked event, if {@param clicked} is true,\n* otherwise the Notification Viewed event, if {@param clicked} is false.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTJsonConverter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTJsonConverter.java",
"diff": "@@ -171,4 +171,17 @@ public class CTJsonConverter {\nreturn val;\n}\n+ static JSONObject displayUnitFromExtras(Bundle extras) throws JSONException {\n+ JSONObject r = new JSONObject();\n+\n+ String pushJsonPayload = extras.getString(Constants.DISPLAY_UNIT_PREVIEW_PUSH_PAYLOAD_KEY);\n+ Logger.v(\"Received Display Unit via push payload: \" + pushJsonPayload);\n+ JSONArray displayUnits = new JSONArray();\n+ r.put(Constants.DISPLAY_UNIT_JSON_RESPONSE_KEY, displayUnits);\n+ JSONObject testPushObject = new JSONObject(pushJsonPayload);\n+ displayUnits.put(testPushObject);\n+\n+ return r;\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "package com.clevertap.android.sdk;\nimport static android.content.Context.NOTIFICATION_SERVICE;\n-import static com.clevertap.android.sdk.CTJsonConverter.getWzrkFields;\nimport android.app.Activity;\nimport android.app.NotificationChannel;\n@@ -2285,27 +2284,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn getConfig().getLogger();\n}\n- /**\n- * This method handles send Test flow for Display Units\n- *\n- * @param extras - bundled data of notification payload\n- */\n- private void handleSendTestForDisplayUnits(Bundle extras) {\n- try {\n- String pushJsonPayload = extras.getString(Constants.DISPLAY_UNIT_PREVIEW_PUSH_PAYLOAD_KEY);\n- Logger.v(\"Received Display Unit via push payload: \" + pushJsonPayload);\n- JSONObject r = new JSONObject();\n- JSONArray displayUnits = new JSONArray();\n- r.put(Constants.DISPLAY_UNIT_JSON_RESPONSE_KEY, displayUnits);\n- JSONObject testPushObject = new JSONObject(pushJsonPayload);\n- displayUnits.put(testPushObject);\n- //TODO Refactoring\n- //processDisplayUnitsResponse(r);\n- } catch (Throwable t) {\n- Logger.v(\"Failed to process Display Unit from push notification payload\", t);\n- }\n- }\n-\nprivate boolean isErrorDeviceId() {\nreturn mCoreState.getDeviceInfo().isErrorDeviceId();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): move handleSendTestForDisplayUnits to AnalyticsManager SDK-628 |
116,621 | 27.01.2021 17:42:43 | -19,080 | 64bbf2aa06371ea891644d25c2a8f98a9eb9ff00 | Task(SDK-609): InAppController callback issues fixed | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "@@ -115,7 +115,7 @@ public class ControllerManager {\n// always call async\nprivate void _initializeInbox() {\nsynchronized (mCTLockManager.getInboxControllerLock()) {\n- if (getInAppController() != null) {\n+ if (getCTInboxController() != null) {\nmCallbackManager._notifyInboxInitialized();\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -47,6 +47,10 @@ public class CoreState extends CleverTapState {\nprivate CallbackManager mCallbackManager;\n+ public InAppController getInAppController() {\n+ return mInAppController;\n+ }\n+\nprivate InAppController mInAppController;\nprivate LoginController mLoginController;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -65,7 +65,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nconfig = configBundle.getParcelable(\"config\");\n}\n- mInAppController = (InAppController) notif.getSerializable(\"controller\");\n+ mInAppController = CleverTapAPI.instanceWithConfig(this,config).getCoreState().getInAppController();\nsetListener(mInAppController);\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -468,7 +468,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nintent.putExtra(\"inApp\", inAppNotification);\nBundle configBundle = new Bundle();\nconfigBundle.putParcelable(\"config\", config);\n- configBundle.putSerializable(\"controller\",inAppController);\nintent.putExtra(\"configBundle\", configBundle);\ntry {\nActivity currentActivity = CoreMetaData.getCurrentActivity();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-609): InAppController callback issues fixed |
116,612 | 29.01.2021 17:31:22 | -19,080 | 6997d101f9edf206bc4f1255eae83318e796eb97 | task(TDD): add unit tests for CleverTapAPI constructor | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -86,9 +86,15 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate static CleverTapInstanceConfig defaultConfig;\n- private static HashMap<String, CleverTapAPI> instances;\n+ public static HashMap<String, CleverTapAPI> getInstances() {\n+ return instances;\n+ }\n- private static int initialAppEnteredForegroundTime = 0;\n+ public static void setInstances(final HashMap<String, CleverTapAPI> instances) {\n+ CleverTapAPI.instances = instances;\n+ }\n+\n+ private static HashMap<String, CleverTapAPI> instances;\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n@@ -825,8 +831,9 @@ public class CleverTapAPI implements CleverTapAPIListener {\nCoreMetaData.incrementActivityCount();\n}\n- if (initialAppEnteredForegroundTime <= 0) {\n- initialAppEnteredForegroundTime = (int) System.currentTimeMillis() / 1000;\n+ if (CoreMetaData.getInitialAppEnteredForegroundTime() <= 0) {\n+ int initialAppEnteredForegroundTime = (int) System.currentTimeMillis() / 1000;\n+ CoreMetaData.setInitialAppEnteredForegroundTime(initialAppEnteredForegroundTime);\n}\nfor (String accountId : CleverTapAPI.instances.keySet()) {\n@@ -949,7 +956,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n});\nint now = (int) System.currentTimeMillis() / 1000;\n- if (now - initialAppEnteredForegroundTime > 5) {\n+ if (now - CoreMetaData.getInitialAppEnteredForegroundTime() > 5) {\nthis.mCoreState.getConfig().setCreatedPostAppLaunch();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n-import android.content.Context;\nimport android.location.Location;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RestrictTo;\n@@ -63,10 +62,16 @@ public class CoreMetaData extends CleverTapMetaData {\nprivate JSONObject wzrkParams = null;\n+ private static int initialAppEnteredForegroundTime = 0;\n+\npublic static Activity getCurrentActivity() {\nreturn (currentActivity == null) ? null : currentActivity.get();\n}\n+ static int getInitialAppEnteredForegroundTime() {\n+ return initialAppEnteredForegroundTime;\n+ }\n+\npublic static void setCurrentActivity(@Nullable Activity activity) {\nif (activity == null) {\ncurrentActivity = null;\n@@ -90,6 +95,10 @@ public class CoreMetaData extends CleverTapMetaData {\nappForeground = isForeground;\n}\n+ static void setInitialAppEnteredForegroundTime(final int initialAppEnteredForegroundTime) {\n+ CoreMetaData.initialAppEnteredForegroundTime = initialAppEnteredForegroundTime;\n+ }\n+\npublic long getAppInstallTime() {\nreturn appInstallTime;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "package com.clevertap.android.sdk\n-import android.app.Activity\n-import android.os.Bundle\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.junit.*\n+import org.junit.Assert.*\nimport org.junit.runner.*\n-import org.mockito.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n@RunWith(RobolectricTestRunner::class)\nclass CleverTapAPITest : BaseTestCase() {\n+ private lateinit var corestate: MockCoreState\n+\n@Before\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n+ corestate = MockCoreState(application, cleverTapInstanceConfig)\n+ corestate.postAsyncSafelyHandler = MockPostAsyncSafelyHandler(cleverTapInstanceConfig)\n}\n- @Test\n+ /* @Test\nfun testActivity() {\n- val activity = Mockito.mock(Activity::class.java)\n+ val activity = mock(Activity::class.java)\nval bundle = Bundle()\n//create\nactivity.onCreate(bundle, null)\nCleverTapAPI.onActivityCreated(activity, null)\n+ }*/\n+\n+ @Test\n+ fun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_greater_than_5_secs() {\n+\n+ mockStatic(CleverTapFactory::class.java).use {\n+ // Arrange\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+\n+\n+ CoreMetaData.setInitialAppEnteredForegroundTime(0)\n+\n+ // Act\n+ CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ // Assert\n+ assertTrue(\"isCreatedPostAppLaunch must be true\", cleverTapInstanceConfig.isCreatedPostAppLaunch)\n+ verify(corestate.sessionManager).setLastVisitTime()\n+ verify(corestate.deviceInfo).setDeviceNetworkInfoReportingFromStorage()\n+ verify(corestate.deviceInfo).setCurrentUserOptOutStateFromStorage()\n+\n+ val actualConfig =\n+ StorageHelper.getString(application, \"instance:\" + cleverTapInstanceConfig.accountId, \"\")\n+ assertEquals(cleverTapInstanceConfig.toJSONString(), actualConfig)\n+ }\n+ }\n+\n+ @Test\n+ fun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_less_than_5_secs() {\n+\n+ mockStatic(CleverTapFactory::class.java).use {\n+ // Arrange\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+\n+ CoreMetaData.setInitialAppEnteredForegroundTime(Int.MAX_VALUE)\n+\n+ // Act\n+ CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ // Assert\n+ assertFalse(\"isCreatedPostAppLaunch must be false\", cleverTapInstanceConfig.isCreatedPostAppLaunch)\n+ verify(corestate.sessionManager).setLastVisitTime()\n+ verify(corestate.deviceInfo).setDeviceNetworkInfoReportingFromStorage()\n+ verify(corestate.deviceInfo).setCurrentUserOptOutStateFromStorage()\n+\n+ val string = StorageHelper.getString(application, \"instance:\" + cleverTapInstanceConfig.accountId, \"\")\n+ assertEquals(cleverTapInstanceConfig.toJSONString(), string)\n+ }\n+ }\n+\n+ /* @Test\n+ fun testPushDeepLink(){\n+ // Arrange\n+ var cleverTapAPISpy : CleverTapAPI = Mockito.spy(cleverTapAPI)\n+ val uri = Uri.parse(\"https://www.google.com/\")\n+\n+ //Act\n+ cleverTapAPISpy.pushDeepLink(uri)\n+\n+ //Assert\n+ verify(cleverTapAPISpy).pushDeepLink(uri,false)\n+ }\n+\n+ @Test\n+ fun testPushDeviceTokenEvent(){\n+ // Arrange\n+ val ctAPI = CleverTapAPI.instanceWithConfig(application,cleverTapInstanceConfig)\n+ var cleverTapAPISpy = Mockito.spy(ctAPI)\n+\n+ cleverTapAPISpy.pushDeviceTokenEvent(\"12345\",true,FCM)\n+ verify(cleverTapAPISpy).queueEvent(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.anyInt())\n+ }\n+\n+ @Test\n+ fun testPushLink(){\n+ var cleverTapAPISpy : CleverTapAPI = Mockito.spy(cleverTapAPI)\n+ val uri = Uri.parse(\"https://www.google.com/\")\n+\n+ val mockStatic = Mockito.mockStatic(StorageHelper::class.java)\n+ `when`(StorageHelper.getInt(ArgumentMatchers.any(), ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(0)\n+\n+ //Act\n+ cleverTapAPISpy.pushInstallReferrer(\"abc\",\"def\",\"ghi\")\n+\n+ verify(cleverTapAPISpy).pushDeepLink(ArgumentMatchers.any(), ArgumentMatchers.anyBoolean())\n+ }*/\n+\n+ @After\n+ fun tearDown() {\n+ CleverTapAPI.setInstances(null) // clear existing CleverTapAPI instances\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.content.Context\n+import com.clevertap.android.sdk.pushnotification.PushProviders\n+import org.mockito.*\n+\n+class MockCoreState(context: Context, cleverTapInstanceConfig: CleverTapInstanceConfig) : CoreState(context) {\n+\n+ init {\n+ config = cleverTapInstanceConfig\n+ postAsyncSafelyHandler = MockPostAsyncSafelyHandler(cleverTapInstanceConfig)\n+ deviceInfo = Mockito.mock(DeviceInfo::class.java)\n+ pushProviders = Mockito.mock(PushProviders::class.java)\n+ sessionManager = Mockito.mock(SessionManager::class.java)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockPostAsyncSafelyHandler.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import org.mockito.*\n+import java.util.concurrent.Future\n+\n+internal class MockPostAsyncSafelyHandler(config: CleverTapInstanceConfig?) :\n+ PostAsyncSafelyHandler(config) {\n+\n+ var future: Future<*>? = null\n+ override fun postAsyncSafely(\n+ name: String,\n+ runnable: Runnable\n+ ): Future<*>? {\n+ runnable.run()\n+ return future\n+ }\n+\n+ override fun runOnNotificationQueue(runnable: Runnable) {\n+ runnable.run()\n+ }\n+\n+ init {\n+ future = Mockito.mock(Future::class.java)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"diff": "@@ -15,19 +15,19 @@ class FeatureFlagTest : BaseTestCase() {\nsuper.setUp()\n}\n- @Test\n+ /* @Test\nfun testFetch() {\nMockito.`when`(cleverTapAPI!!.featureFlag())\n.thenReturn(CTFeatureFlagsController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI))\ncleverTapAPI!!.featureFlag().fetchFeatureFlags()\nMockito.verify(cleverTapAPI)!!.fetchFeatureFlags()\n}\n-\n+*/\n@Test\nfun testGet() {\nval ctFeatureFlagsController = Mockito.mock(CTFeatureFlagsController::class.java)\n- Mockito.`when`(cleverTapAPI!!.featureFlag()).thenReturn(ctFeatureFlagsController)\n+ Mockito.`when`(cleverTapAPI.featureFlag()).thenReturn(ctFeatureFlagsController)\nMockito.`when`(ctFeatureFlagsController[\"isFeatureA\", true]).thenReturn(false)\n- Assert.assertFalse(cleverTapAPI!!.featureFlag()[\"isFeatureA\", true])\n+ Assert.assertFalse(cleverTapAPI.featureFlag()[\"isFeatureA\", true])\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for CleverTapAPI constructor SDK-628 |
116,621 | 01.02.2021 16:09:23 | -19,080 | fb30a4994030be04ec3680ca4401401c34149359 | task(SDK-646): Added Common Mock Classes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -19,7 +19,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-public class AnalyticsManager {\n+public class AnalyticsManager extends BaseAnalyticsManager {\nprivate final HashMap<String, Integer> installReferrerMap = new HashMap<>(8);\n@@ -80,6 +80,7 @@ public class AnalyticsManager {\nmControllerManager = controllerManager;\n}\n+ @Override\npublic void addMultiValuesForKey(final String key, final ArrayList<String> values) {\nmPostAsyncSafelyHandler.postAsyncSafely(\"addMultiValuesForKey\", new Runnable() {\n@Override\n@@ -95,6 +96,7 @@ public class AnalyticsManager {\n* This method is internal to the CleverTap SDK.\n* Developers should not use this method manually\n*/\n+ @Override\npublic void fetchFeatureFlags() {\nif (mConfig.isAnalyticsOnly()) {\nreturn;\n@@ -112,11 +114,13 @@ public class AnalyticsManager {\n}\n//Event\n+ @Override\npublic void forcePushAppLaunchedEvent() {\nmCoreMetaData.setAppLaunchPushed(false);\npushAppLaunchedEvent();\n}\n+ @Override\npublic void pushAppLaunchedEvent() {\nif (mConfig.isDisableAppLaunchedEvent()) {\nmCoreMetaData.setAppLaunchPushed(true);\n@@ -143,6 +147,7 @@ public class AnalyticsManager {\nmBaseEventQueueManager.queueEvent(mContext, event, Constants.RAISED_EVENT);\n}\n+ @Override\npublic void pushDisplayUnitClickedEventForID(String unitID) {\nJSONObject event = new JSONObject();\n@@ -174,6 +179,7 @@ public class AnalyticsManager {\n}\n}\n+ @Override\npublic void pushDisplayUnitViewedEventForID(String unitID) {\nJSONObject event = new JSONObject();\n@@ -200,6 +206,7 @@ public class AnalyticsManager {\n}\n}\n+ @Override\n@SuppressWarnings({\"unused\"})\npublic void pushError(final String errorMessage, final int errorCode) {\nfinal HashMap<String, Object> props = new HashMap<>();\n@@ -221,6 +228,7 @@ public class AnalyticsManager {\npushEvent(\"Error Occurred\", props);\n}\n+ @Override\npublic void pushEvent(String eventName, Map<String, Object> eventActions) {\nif (eventName == null || eventName.equals(\"\")) {\n@@ -300,6 +308,7 @@ public class AnalyticsManager {\n* @param data The data to be attached as the event data\n* @param customData Additional data such as form input to to be added to the event data\n*/\n+ @Override\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic void pushInAppNotificationStateEvent(boolean clicked, CTInAppNotification data, Bundle customData) {\nJSONObject event = new JSONObject();\n@@ -334,6 +343,7 @@ public class AnalyticsManager {\n}\n}\n+ @Override\npublic void pushInstallReferrer(String url) {\ntry {\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Referrer received: \" + url);\n@@ -361,6 +371,7 @@ public class AnalyticsManager {\n}\n}\n+ @Override\npublic synchronized void pushInstallReferrer(String source, String medium, String campaign) {\nif (source == null && medium == null && campaign == null) {\nreturn;\n@@ -402,6 +413,7 @@ public class AnalyticsManager {\n}\n}\n+ @Override\npublic void pushNotificationClickedEvent(final Bundle extras) {\nif (mConfig.isAnalyticsOnly()) {\n@@ -543,6 +555,7 @@ public class AnalyticsManager {\n* @param extras The {@link Bundle} object that contains the\n* notification details\n*/\n+ @Override\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic void pushNotificationViewedEvent(Bundle extras) {\n@@ -583,6 +596,7 @@ public class AnalyticsManager {\nmBaseEventQueueManager.queueEvent(mContext, event, Constants.NV_EVENT);\n}\n+ @Override\npublic void pushProfile(final Map<String, Object> profile) {\nif (profile == null || profile.isEmpty()) {\nreturn;\n@@ -596,6 +610,7 @@ public class AnalyticsManager {\n});\n}\n+ @Override\npublic void removeMultiValuesForKey(final String key, final ArrayList<String> values) {\nmPostAsyncSafelyHandler.postAsyncSafely(\"removeMultiValuesForKey\", new Runnable() {\n@Override\n@@ -605,6 +620,7 @@ public class AnalyticsManager {\n});\n}\n+ @Override\npublic void removeValueForKey(final String key) {\nmPostAsyncSafelyHandler.postAsyncSafely(\"removeValueForKey\", new Runnable() {\n@Override\n@@ -614,7 +630,8 @@ public class AnalyticsManager {\n});\n}\n- public void senDataEvent(final JSONObject event) {\n+ @Override\n+ public void sendDataEvent(final JSONObject event) {\nmBaseEventQueueManager.queueEvent(mContext, event, Constants.DATA_EVENT);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseAnalyticsManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.os.Bundle;\n+import com.clevertap.android.sdk.inapp.CTInAppNotification;\n+import java.util.ArrayList;\n+import java.util.Map;\n+import org.json.JSONObject;\n+\n+public abstract class BaseAnalyticsManager {\n+\n+ public abstract void addMultiValuesForKey(String key, ArrayList<String> values);\n+\n+ public abstract void fetchFeatureFlags();\n+\n+ //Event\n+ public abstract void forcePushAppLaunchedEvent();\n+\n+ public abstract void pushAppLaunchedEvent();\n+\n+ public abstract void pushDisplayUnitClickedEventForID(String unitID);\n+\n+ public abstract void pushDisplayUnitViewedEventForID(String unitID);\n+\n+ @SuppressWarnings({\"unused\"})\n+ public abstract void pushError(String errorMessage, int errorCode);\n+\n+ public abstract void pushEvent(String eventName, Map<String, Object> eventActions);\n+\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ public abstract void pushInAppNotificationStateEvent(boolean clicked, CTInAppNotification data,\n+ Bundle customData);\n+\n+ public abstract void pushInstallReferrer(String url);\n+\n+ public abstract void pushInstallReferrer(String source, String medium, String campaign);\n+\n+ public abstract void pushNotificationClickedEvent(Bundle extras);\n+\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ public abstract void pushNotificationViewedEvent(Bundle extras);\n+\n+ public abstract void pushProfile(Map<String, Object> profile);\n+\n+ public abstract void removeMultiValuesForKey(String key, ArrayList<String> values);\n+\n+ public abstract void removeValueForKey(String key);\n+\n+ public abstract void sendDataEvent(JSONObject event);\n+\n+ public abstract void sendFetchEvent(final JSONObject eventObject);\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener;\n+import com.clevertap.android.sdk.displayunits.DisplayUnitListener;\n+import com.clevertap.android.sdk.product_config.CTProductConfigListener;\n+import com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n+import com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n+import java.lang.ref.WeakReference;\n+\n+public abstract class BaseCallbackManager {\n+\n+ public abstract void _notifyInboxMessagesDidUpdate();\n+\n+ public abstract FailureFlushListener getFailureFlushListener();\n+\n+ public abstract CTFeatureFlagsListener getFeatureFlagListener();\n+\n+ public abstract GeofenceCallback getGeofenceCallback();\n+\n+ public abstract InAppActivityListener getInAppActivityListener();\n+\n+ public abstract InAppNotificationButtonListener getInAppNotificationButtonListener();\n+\n+ public abstract InAppNotificationListener getInAppNotificationListener();\n+\n+ public abstract CTInboxListener getInboxListener();\n+\n+ public abstract WeakReference<CTProductConfigListener> getProductConfigListener();\n+\n+ public abstract CTPushAmpListener getPushAmpListener();\n+\n+ public abstract CTPushNotificationListener getPushNotificationListener();\n+\n+ public abstract SyncListener getSyncListener();\n+\n+ //Profile\n+ public abstract void notifyUserProfileInitialized(String deviceID);\n+\n+ public abstract void setDisplayUnitListener(DisplayUnitListener listener);\n+\n+ public abstract void setFailureFlushListener(FailureFlushListener failureFlushListener);\n+\n+ public abstract void setFeatureFlagListener(CTFeatureFlagsListener listener);\n+\n+ public abstract void setGeofenceCallback(GeofenceCallback geofenceCallback);\n+\n+ public abstract void setInAppActivityListener(\n+ InAppActivityListener inAppActivityListener);\n+\n+ public abstract void setInAppNotificationButtonListener(\n+ InAppNotificationButtonListener inAppNotificationButtonListener);\n+\n+ public abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n+\n+ public abstract void setInboxListener(CTInboxListener inboxListener);\n+\n+ public abstract void setProductConfigListener(\n+ CTProductConfigListener productConfigListener);\n+\n+ public abstract void setPushAmpListener(CTPushAmpListener pushAmpListener);\n+\n+ public abstract void setPushNotificationListener(\n+ CTPushNotificationListener pushNotificationListener);\n+\n+ public abstract void setSyncListener(SyncListener syncListener);\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -14,7 +14,7 @@ import java.lang.ref.WeakReference;\nimport java.util.ArrayList;\n@RestrictTo(Scope.LIBRARY)\n-public class CallbackManager {\n+public class CallbackManager extends BaseCallbackManager {\nprivate InAppActivityListener mInAppActivityListener;\n@@ -49,10 +49,12 @@ public class CallbackManager {\nmDeviceInfo = deviceInfo;\n}\n+ @Override\npublic FailureFlushListener getFailureFlushListener() {\nreturn mFailureFlushListener;\n}\n+ @Override\npublic CTFeatureFlagsListener getFeatureFlagListener() {\nif (mFeatureFlagListenerWeakReference != null && mFeatureFlagListenerWeakReference.get() != null) {\nreturn mFeatureFlagListenerWeakReference.get();\n@@ -60,26 +62,32 @@ public class CallbackManager {\nreturn null;\n}\n+ @Override\npublic InAppActivityListener getInAppActivityListener() {\nreturn mInAppActivityListener;\n}\n+ @Override\npublic void setFailureFlushListener(final FailureFlushListener failureFlushListener) {\nmFailureFlushListener = failureFlushListener;\n}\n+ @Override\npublic void setFeatureFlagListener(final CTFeatureFlagsListener listener) {\nthis.mFeatureFlagListenerWeakReference = new WeakReference<>(listener);\n}\n+ @Override\npublic GeofenceCallback getGeofenceCallback() {\nreturn geofenceCallback;\n}\n+ @Override\npublic void setGeofenceCallback(final GeofenceCallback geofenceCallback) {\nthis.geofenceCallback = geofenceCallback;\n}\n+ @Override\npublic InAppNotificationButtonListener getInAppNotificationButtonListener() {\nif (inAppNotificationButtonListener != null && inAppNotificationButtonListener.get() != null) {\nreturn inAppNotificationButtonListener.get();\n@@ -87,36 +95,44 @@ public class CallbackManager {\nreturn null;\n}\n+ @Override\npublic void setInAppActivityListener(\nfinal InAppActivityListener inAppActivityListener) {\nmInAppActivityListener = inAppActivityListener;\n}\n+ @Override\npublic void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener) {\nthis.inAppNotificationButtonListener = new WeakReference<>(inAppNotificationButtonListener);\n}\n+ @Override\npublic InAppNotificationListener getInAppNotificationListener() {\nreturn inAppNotificationListener;\n}\n+ @Override\npublic void setInAppNotificationListener(final InAppNotificationListener inAppNotificationListener) {\nthis.inAppNotificationListener = inAppNotificationListener;\n}\n+ @Override\npublic CTInboxListener getInboxListener() {\nreturn inboxListener;\n}\n+ @Override\npublic void setInboxListener(final CTInboxListener inboxListener) {\nthis.inboxListener = inboxListener;\n}\n+ @Override\npublic WeakReference<CTProductConfigListener> getProductConfigListener() {\nreturn productConfigListener;\n}\n+ @Override\npublic void setProductConfigListener(\nfinal CTProductConfigListener productConfigListener) {\nif (productConfigListener != null) {\n@@ -124,32 +140,39 @@ public class CallbackManager {\n}\n}\n+ @Override\npublic CTPushAmpListener getPushAmpListener() {\nreturn pushAmpListener;\n}\n+ @Override\npublic void setPushAmpListener(final CTPushAmpListener pushAmpListener) {\nthis.pushAmpListener = pushAmpListener;\n}\n+ @Override\npublic CTPushNotificationListener getPushNotificationListener() {\nreturn pushNotificationListener;\n}\n+ @Override\npublic void setPushNotificationListener(\nfinal CTPushNotificationListener pushNotificationListener) {\nthis.pushNotificationListener = pushNotificationListener;\n}\n+ @Override\npublic SyncListener getSyncListener() {\nreturn syncListener;\n}\n+ @Override\npublic void setSyncListener(final SyncListener syncListener) {\nthis.syncListener = syncListener;\n}\n//Profile\n+ @Override\npublic void notifyUserProfileInitialized(String deviceID) {\ndeviceID = (deviceID != null) ? deviceID : mDeviceInfo.getDeviceID();\n@@ -168,6 +191,7 @@ public class CallbackManager {\n}\n}\n+ @Override\npublic void setDisplayUnitListener(DisplayUnitListener listener) {\nif (listener != null) {\ndisplayUnitListenerWeakReference = new WeakReference<>(listener);\n@@ -183,6 +207,7 @@ public class CallbackManager {\n}\n}\n+ @Override\npublic void _notifyInboxMessagesDidUpdate() {\nif (this.inboxListener != null) {\nUtils.runOnUiThread(new Runnable() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -315,6 +315,10 @@ public class DeviceInfo {\nthis.config = config;\nthis.library = null;\nmCoreMetaData = coreMetaData;\n+ onInitDeviceInfo(cleverTapID);\n+ }\n+\n+ void onInitDeviceInfo(final String cleverTapID) {\nThread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -9,9 +9,8 @@ import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.\nimport android.content.Context;\nimport android.text.TextUtils;\n-import com.clevertap.android.sdk.AnalyticsManager;\n-import com.clevertap.android.sdk.BaseEventQueueManager;\n-import com.clevertap.android.sdk.CallbackManager;\n+import com.clevertap.android.sdk.BaseAnalyticsManager;\n+import com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.CoreMetaData;\n@@ -49,23 +48,27 @@ public class CTProductConfigController {\nprivate boolean isInitialized = false;\n- private final CallbackManager mCallbackManager;\n+ private final BaseCallbackManager mCallbackManager;\nprivate final CoreMetaData mCoreMetaData;\n+ void setDefaultConfig(final HashMap<String, String> defaultConfig) {\n+ this.defaultConfig = defaultConfig;\n+ }\n+\nprivate final ProductConfigSettings settings;\nprivate final HashMap<String, String> waitingTobeActivatedConfig = new HashMap<>();\n- private final AnalyticsManager mAnalyticsManager;\n+ private final BaseAnalyticsManager mAnalyticsManager;\n// -----------------------------------------------------------------------//\n// ******** Public API *****//\n// -----------------------------------------------------------------------//\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config,\n- final AnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\n- final CallbackManager callbackManager) {\n+ final BaseAnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\n+ final BaseCallbackManager callbackManager) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\n@@ -447,7 +450,7 @@ public class CTProductConfigController {\nsettings.setMinimumFetchIntervalInSeconds(fetchIntervalInSeconds);\n}\n- private boolean canRequest(long minimumFetchIntervalInSeconds) {\n+ boolean canRequest(long minimumFetchIntervalInSeconds) {\nboolean validGuid = !TextUtils.isEmpty(guid);\nif (!validGuid) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -35,7 +35,6 @@ import androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationCompat;\nimport com.clevertap.android.sdk.AnalyticsManager;\nimport com.clevertap.android.sdk.BaseDatabaseManager;\n-import com.clevertap.android.sdk.BaseEventQueueManager;\nimport com.clevertap.android.sdk.CTExecutors;\nimport com.clevertap.android.sdk.CleverTapAPI.DevicePushTokenRefreshListener;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -821,7 +820,7 @@ public class PushProviders {\ndata.put(\"type\", pushType.getType());\nevent.put(\"data\", data);\nmConfig.getLogger().verbose(mConfig.getAccountId(), pushType + action + \" device token \" + token);\n- mAnalyticsManager.senDataEvent(event);\n+ mAnalyticsManager.sendDataEvent(event);\n} catch (Throwable t) {\n// we won't get here\nmConfig.getLogger().verbose(mConfig.getAccountId(), pushType + action + \" device token failed\", t);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockAnalyticsManager.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.os.Bundle\n+import com.clevertap.android.sdk.inapp.CTInAppNotification\n+import org.json.JSONObject\n+import java.util.ArrayList\n+\n+class MockAnalyticsManager : BaseAnalyticsManager() {\n+\n+ override fun addMultiValuesForKey(key: String, values: ArrayList<String>) {}\n+ override fun fetchFeatureFlags() {}\n+ override fun forcePushAppLaunchedEvent() {}\n+ override fun pushAppLaunchedEvent() {}\n+ override fun pushDisplayUnitClickedEventForID(unitID: String) {}\n+ override fun pushDisplayUnitViewedEventForID(unitID: String) {}\n+ override fun pushError(errorMessage: String, errorCode: Int) {}\n+ override fun pushEvent(eventName: String, eventActions: Map<String, Any>) {}\n+ override fun pushInAppNotificationStateEvent(\n+ clicked: Boolean, data: CTInAppNotification,\n+ customData: Bundle\n+ ) {\n+ }\n+\n+ override fun pushInstallReferrer(url: String) {}\n+ override fun pushInstallReferrer(source: String, medium: String, campaign: String) {}\n+ override fun pushNotificationClickedEvent(extras: Bundle) {}\n+ override fun pushNotificationViewedEvent(extras: Bundle) {}\n+ override fun pushProfile(profile: Map<String, Any>) {}\n+ override fun removeMultiValuesForKey(key: String, values: ArrayList<String>) {}\n+ override fun removeValueForKey(key: String) {}\n+ override fun sendDataEvent(event: JSONObject) {}\n+ override fun sendFetchEvent(eventObject: JSONObject?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCallbackManager.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener\n+import com.clevertap.android.sdk.displayunits.DisplayUnitListener\n+import com.clevertap.android.sdk.product_config.CTProductConfigListener\n+import com.clevertap.android.sdk.pushnotification.CTPushNotificationListener\n+import com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener\n+import java.lang.ref.WeakReference\n+\n+class MockCallbackManager :\n+ BaseCallbackManager() {\n+\n+ override fun _notifyInboxMessagesDidUpdate() {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getFailureFlushListener(): FailureFlushListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getFeatureFlagListener(): CTFeatureFlagsListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getGeofenceCallback(): GeofenceCallback {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getInAppActivityListener(): InAppActivityListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getInAppNotificationButtonListener(): InAppNotificationButtonListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getInAppNotificationListener(): InAppNotificationListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getInboxListener(): CTInboxListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getProductConfigListener(): WeakReference<CTProductConfigListener> {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getPushAmpListener(): CTPushAmpListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getPushNotificationListener(): CTPushNotificationListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getSyncListener(): SyncListener {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun notifyUserProfileInitialized(deviceID: String?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setDisplayUnitListener(listener: DisplayUnitListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setFailureFlushListener(failureFlushListener: FailureFlushListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setFeatureFlagListener(listener: CTFeatureFlagsListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setGeofenceCallback(geofenceCallback: GeofenceCallback?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setInAppActivityListener(inAppActivityListener: InAppActivityListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setInAppNotificationButtonListener(inAppNotificationButtonListener: InAppNotificationButtonListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setInAppNotificationListener(inAppNotificationListener: InAppNotificationListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setInboxListener(inboxListener: CTInboxListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setProductConfigListener(productConfigListener: CTProductConfigListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setPushAmpListener(pushAmpListener: CTPushAmpListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setPushNotificationListener(pushNotificationListener: CTPushNotificationListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun setSyncListener(syncListener: SyncListener?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockDeviceInfo.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.content.Context\n+import org.json.JSONObject\n+\n+class MockDeviceInfo(\n+ context: Context?, config: CleverTapInstanceConfig?, cleverTapID: String?,\n+ coreMetaData: CoreMetaData?\n+) : DeviceInfo(\n+ context, config,\n+ cleverTapID, coreMetaData\n+) {\n+\n+ override fun onInitDeviceInfo(cleverTapID: String?) {\n+ }\n+\n+ override fun getAttributionID(): String {\n+ return \"some-att-id\"\n+ }\n+\n+ override fun getBluetoothVersion(): String {\n+ return \"2.0\"\n+ }\n+\n+ override fun getBuild(): Int {\n+ return 1\n+ }\n+\n+ override fun getCarrier(): String {\n+ return \"Android\"\n+ }\n+\n+ override fun getContext(): Context {\n+ return super.getContext()\n+ }\n+\n+ override fun getCountryCode(): String {\n+ return \"us\"\n+ }\n+\n+ override fun getDPI(): Int {\n+ return 420\n+ }\n+\n+ override fun getGoogleAdID(): String {\n+ return \"__48703e3cc2ff468ab3c641edf2770d74\"\n+ }\n+\n+ override fun getHeight(): Double {\n+ return 4.27\n+ }\n+\n+ override fun getHeightPixels(): Int {\n+ return 1920\n+ }\n+\n+ override fun getLibrary(): String {\n+ return \"Android\"\n+ }\n+\n+ override fun getManufacturer(): String {\n+ return super.getManufacturer()\n+ }\n+\n+ override fun getModel(): String {\n+ return \"sdk_gphone_x86\"\n+ }\n+\n+ override fun getNetworkType(): String {\n+ return \"4G\"\n+ }\n+\n+ override fun getNotificationsEnabledForUser(): Boolean {\n+ return true\n+ }\n+\n+ override fun getOsName(): String {\n+ return \"Android\"\n+ }\n+\n+ override fun getOsVersion(): String {\n+ return \"11\"\n+ }\n+\n+ override fun getSdkVersion(): Int {\n+ return 40100\n+ }\n+\n+ override fun getVersionName(): String {\n+ return \"1.0\"\n+ }\n+\n+ override fun getWidth(): Double {\n+ return 2.57\n+ }\n+\n+ override fun getWidthPixels(): Int {\n+ return 1024\n+ }\n+\n+ override fun isBluetoothEnabled(): Boolean {\n+ return true\n+ }\n+\n+ override fun isLimitAdTrackingEnabled(): Boolean {\n+ return false\n+ }\n+\n+ override fun isWifiConnected(): Boolean {\n+ return true\n+ }\n+\n+ override fun getAppLaunchedFields(): JSONObject {\n+ val obj = JSONObject()\n+ obj.put(\"Build\", \"1\")\n+ obj.put(\"Version\", \"1.0\")\n+ obj.put(\"OS Version\", \"11\")\n+ obj.put(\"SDK Version\", 40100)\n+ obj.put(\"Make\", \"Google\")\n+ obj.put(\"Model\", \"sdk_gphone_x86\")\n+ obj.put(\"Carrier\", \"Android\")\n+ obj.put(\"useIP\", false)\n+ obj.put(\"OS\", \"Android\")\n+ obj.put(\"wdt\", 2.57)\n+ obj.put(\"hgt\", 4.27)\n+ obj.put(\"dpi\", 420)\n+ obj.put(\"dt\", 1)\n+ obj.put(\"cc\", \"us\")\n+ return obj\n+ }\n+\n+ override fun optOutKey(): String {\n+ return \"false\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "+package com.clevertap.android.sdk.product_config\n+\n+import com.clevertap.android.sdk.BaseAnalyticsManager\n+import com.clevertap.android.sdk.BaseCallbackManager\n+import com.clevertap.android.sdk.CoreMetaData\n+import com.clevertap.android.sdk.DeviceInfo\n+import com.clevertap.android.sdk.MockCallbackManager\n+import com.clevertap.android.sdk.MockDeviceInfo\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class CTProductConfigControllerTest : BaseTestCase() {\n+\n+ private lateinit var mProductConfigController: CTProductConfigController\n+ private val guid = \"1212121221\"\n+ private lateinit var coreMetaData: CoreMetaData\n+ private lateinit var analyticsManager: BaseAnalyticsManager\n+ private lateinit var callbackManager: BaseCallbackManager\n+ private lateinit var productConfigSettings: ProductConfigSettings\n+ private lateinit var deviceInfo: DeviceInfo\n+\n+ @Throws(Exception::class)\n+ override fun setUp() {\n+ super.setUp()\n+ coreMetaData = CoreMetaData()\n+ analyticsManager = Mockito.mock(BaseAnalyticsManager::class.java)\n+ deviceInfo = MockDeviceInfo(application, cleverTapInstanceConfig, guid, coreMetaData)\n+ callbackManager = MockCallbackManager()\n+ productConfigSettings = Mockito.mock(ProductConfigSettings::class.java)\n+ mProductConfigController = CTProductConfigController(\n+ application,\n+ guid,\n+ cleverTapInstanceConfig,\n+ analyticsManager,\n+ coreMetaData,\n+ callbackManager\n+ )\n+ }\n+\n+ @Throws(Exception::class)\n+ fun tearDown() {\n+ }\n+\n+ @Test\n+ fun testSetDefaultConfig() {}\n+\n+ @Test\n+ fun testActivate() {}\n+ @Test\n+ fun testFetch() {\n+ mProductConfigController.fetch()\n+ Mockito.`when`(productConfigSettings.nextFetchIntervalInSeconds).thenReturn(0)\n+ Mockito.verify(analyticsManager).sendFetchEvent(Mockito.any())\n+ Assert.assertTrue(coreMetaData.isProductConfigRequested)\n+ }\n+\n+ @Test\n+ fun testTestFetch() {}\n+\n+ @Test\n+ fun testFetchAndActivate() {}\n+\n+ @Test\n+ fun testFetchProductConfig() {}\n+\n+ @Test\n+ fun testGetBoolean() {}\n+\n+ @Test\n+ fun testGetDouble() {}\n+\n+ @Test\n+ fun testGetLastFetchTimeStampInMillis() {}\n+\n+ @Test\n+ fun testGetLong() {}\n+\n+ @Test\n+ fun testGetString() {}\n+\n+ @Test\n+ fun testIsInitialized() {}\n+\n+ @Test\n+ fun testOnFetchFailed() {}\n+\n+ @Test\n+ fun testOnFetchSuccess() {}\n+\n+ @Test\n+ fun testReset() {}\n+\n+ @Test\n+ fun testResetSettings() {}\n+\n+ @Test\n+ fun testSetArpValue() {}\n+\n+ @Test\n+ fun testSetDefaults() {}\n+\n+ @Test\n+ fun testTestSetDefaults() {}\n+\n+ @Test\n+ fun testSetGuidAndInit() {}\n+\n+ @Test\n+ fun testSetMinimumFetchIntervalInSeconds() {}\n+\n+ @Test\n+ fun testCanRequest() {}\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/ProductConfigTest.kt",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.product_config\n-\n-import com.clevertap.android.shared.test.BaseTestCase\n-import org.junit.*\n-import org.mockito.*\n-\n-class ProductConfigTest : BaseTestCase() {\n-\n- @Before\n- @Throws(Exception::class)\n- override fun setUp() {\n- super.setUp()\n- }\n-\n- @Test\n- fun testFetch() {\n-// Mockito.`when`(cleverTapAPI!!.productConfig())\n-// .thenReturn(CTProductConfigController(\n-// application,\n-// \"12121\",\n-// cleverTapInstanceConfig,\n-// baseQueueManager,\n-// coreMetaData,\n-// callbackManager\n-// ))\n-// cleverTapAPI!!.productConfig().fetch()\n-// Mockito.verify(cleverTapAPI)!!.fetchProductConfig()\n- }\n-\n- @Test\n- fun testGetBoolean() {\n- val ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\n- Mockito.`when`(ctProductConfigController.getBoolean(\"testBool\")).thenReturn(false)\n- Assert.assertFalse(cleverTapAPI!!.productConfig().getBoolean(\"testBool\"))\n- }\n-\n- @Test\n- fun testGetLong() {\n- val ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\n- Mockito.`when`(ctProductConfigController.getLong(\"testLong\")).thenReturn(122212121L)\n- Assert.assertNotEquals(12, cleverTapAPI!!.productConfig().getLong(\"testLong\"))\n- Assert.assertEquals(122212121, cleverTapAPI!!.productConfig().getLong(\"testLong\"))\n- }\n-\n- @Test\n- fun testGetDouble() {\n- val ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\n- Mockito.`when`(ctProductConfigController.getDouble(\"testDouble\")).thenReturn(122.21)\n- Assert.assertNotEquals(12.0, cleverTapAPI!!.productConfig().getDouble(\"testDouble\"))\n- Assert.assertEquals(122.21, cleverTapAPI!!.productConfig().getDouble(\"testDouble\"), 0.0)\n- }\n-\n- @Test\n- fun testGetString() {\n- val ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\n- Mockito.`when`(ctProductConfigController.getString(\"testString\")).thenReturn(\"Testing String\")\n- Assert.assertNotEquals(\"Wrong Value\", cleverTapAPI!!.productConfig().getString(\"testString\"))\n- Assert.assertEquals(\"Testing String\", cleverTapAPI!!.productConfig().getString(\"testString\"))\n- }\n-\n- @Test\n- fun testActivate() {\n-// CTProductConfigController ctProductConfigController = mock(CTProductConfigController.class);\n-// when(cleverTapAPI.productConfig()).thenReturn(ctProductConfigController);\n-// Assert.assertEquals(\"Testing String\", cleverTapAPI.productConfig().getString(\"testString\"));\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-646): Added Common Mock Classes |
116,621 | 01.02.2021 19:51:56 | -19,080 | a454d5433b120ef308e4dffde1fc0b784b4fde7b | task(SDK-609):Added CTProductConfigFactory.java | [
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTProductConfigFactory.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-public class CTProductConfigFactory {\n-\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n-import android.os.Handler;\n-import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inapp.InAppController;\nimport com.clevertap.android.sdk.inbox.CTInboxController;\nimport com.clevertap.android.sdk.login.LoginController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigFactory;\nimport com.clevertap.android.sdk.pushnotification.PushProviders;\n//TODO move this to builder pattern & add sanity check for dependencies at the time of creation\npublic class CoreState extends CleverTapState {\n- private ControllerManager mControllerManager;\n-\nprivate BaseLocationManager baseLocationManager;\nprivate CleverTapInstanceConfig config;\n@@ -47,9 +44,7 @@ public class CoreState extends CleverTapState {\nprivate BaseCallbackManager mCallbackManager;\n- public InAppController getInAppController() {\n- return mInAppController;\n- }\n+ private ControllerManager mControllerManager;\nprivate InAppController mInAppController;\n@@ -77,10 +72,6 @@ public class CoreState extends CleverTapState {\nreturn mActivityLifeCycleManager;\n}\n- public ControllerManager getControllerManager() {\n- return mControllerManager;\n- }\n-\npublic void setActivityLifeCycleManager(final ActivityLifeCycleManager activityLifeCycleManager) {\nmActivityLifeCycleManager = activityLifeCycleManager;\n}\n@@ -97,10 +88,6 @@ public class CoreState extends CleverTapState {\nreturn mBaseEventQueueManager;\n}\n- public void setControllerManager(final ControllerManager controllerManager) {\n- mControllerManager = controllerManager;\n- }\n-\nvoid setBaseEventQueueManager(final BaseEventQueueManager baseEventQueueManager) {\nthis.mBaseEventQueueManager = baseEventQueueManager;\n}\n@@ -129,6 +116,14 @@ public class CoreState extends CleverTapState {\nthis.config = config;\n}\n+ public ControllerManager getControllerManager() {\n+ return mControllerManager;\n+ }\n+\n+ public void setControllerManager(final ControllerManager controllerManager) {\n+ mControllerManager = controllerManager;\n+ }\n+\npublic CoreMetaData getCoreMetaData() {\nreturn coreMetaData;\n}\n@@ -142,7 +137,6 @@ public class CoreState extends CleverTapState {\nreturn ctProductConfigController;\n}\n-\n@Override\npublic BaseDatabaseManager getDatabaseManager() {\nreturn databaseManager;\n@@ -161,12 +155,12 @@ public class CoreState extends CleverTapState {\nthis.deviceInfo = deviceInfo;\n}\n- public void setInAppController(final InAppController inAppController) {\n- mInAppController = inAppController;\n+ public InAppController getInAppController() {\n+ return mInAppController;\n}\n- public void setInAppFCManager(final InAppFCManager inAppFCManager) {\n- this.inAppFCManager = inAppFCManager;\n+ public void setInAppController(final InAppController inAppController) {\n+ mInAppController = inAppController;\n}\npublic LocalDataStore getLocalDataStore() {\n@@ -185,10 +179,6 @@ public class CoreState extends CleverTapState {\nmLoginController = loginController;\n}\n- void setMainLooperHandler(final MainLooperHandler mainLooperHandler) {\n- this.mainLooperHandler = mainLooperHandler;\n- }\n-\n@Override\npublic BaseNetworkManager getNetworkManager() {\nreturn networkManager;\n@@ -233,12 +223,12 @@ public class CoreState extends CleverTapState {\nthis.mValidationResultStack = validationResultStack;\n}\n- public void setValidator(final Validator validator) {\n- mValidator = validator;\n+ public void setInAppFCManager(final InAppFCManager inAppFCManager) {\n+ this.inAppFCManager = inAppFCManager;\n}\n- void setEventMediator(final EventMediator eventMediator) {\n- this.eventMediator = eventMediator;\n+ public void setValidator(final Validator validator) {\n+ mValidator = validator;\n}\n@Override\n@@ -251,6 +241,14 @@ public class CoreState extends CleverTapState {\nthis.baseLocationManager = baseLocationManager;\n}\n+ void setEventMediator(final EventMediator eventMediator) {\n+ this.eventMediator = eventMediator;\n+ }\n+\n+ void setMainLooperHandler(final MainLooperHandler mainLooperHandler) {\n+ this.mainLooperHandler = mainLooperHandler;\n+ }\n+\nprivate void initProductConfig() {\nLogger.v(\"Initializing Product Config with device Id = \" + getDeviceInfo().getDeviceID());\nif (getConfig().isAnalyticsOnly()) {\n@@ -259,7 +257,8 @@ public class CoreState extends CleverTapState {\nreturn;\n}\nif (ctProductConfigController == null) {\n- CTProductConfigController ctProductConfigController = new CTProductConfigController(context, getDeviceInfo().getDeviceID(),\n+ CTProductConfigController ctProductConfigController = CTProductConfigFactory\n+ .getInstance(context, getDeviceInfo(),\ngetConfig(), mAnalyticsManager, coreMetaData, mCallbackManager);\ngetControllerManager().setCTProductConfigController(ctProductConfigController);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "@@ -21,6 +21,7 @@ import com.clevertap.android.sdk.SessionManager;\nimport com.clevertap.android.sdk.ValidationResult;\nimport com.clevertap.android.sdk.ValidationResultStack;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigFactory;\nimport com.clevertap.android.sdk.pushnotification.PushProviders;\nimport java.util.Map;\n@@ -32,14 +33,20 @@ public class LoginController {\nprivate final BaseEventQueueManager mBaseEventQueueManager;\n+ private final CTLockManager mCTLockManager;\n+\nprivate final BaseCallbackManager mCallbackManager;\nprivate final CleverTapInstanceConfig mConfig;\nprivate final Context mContext;\n+ private final ControllerManager mControllerManager;\n+\nprivate final CoreMetaData mCoreMetaData;\n+ private final BaseDatabaseManager mDBManager;\n+\nprivate final DeviceInfo mDeviceInfo;\nprivate final InAppFCManager mInAppFCManager;\n@@ -54,16 +61,10 @@ public class LoginController {\nprivate final ValidationResultStack mValidationResultStack;\n- private final BaseDatabaseManager mDBManager;\n-\nprivate String processingUserLoginIdentifier = null;\nprivate final Boolean processingUserLoginLock = true;\n- private final ControllerManager mControllerManager;\n-\n- private final CTLockManager mCTLockManager;\n-\npublic LoginController(Context context,\nCleverTapInstanceConfig config,\nDeviceInfo deviceInfo,\n@@ -97,6 +98,63 @@ public class LoginController {\nmCTLockManager = ctLockManager;\n}\n+ public void asyncProfileSwitchUser(final Map<String, Object> profile, final String cacheGuid,\n+ final String cleverTapID) {\n+ mPostAsyncSafelyHandler.postAsyncSafely(\"resetProfile\", new Runnable() {\n+ @Override\n+ public void run() {\n+ try {\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"asyncProfileSwitchUser:[profile \" + profile\n+ + \" with Cached GUID \" + ((cacheGuid != null) ? cachedGUID\n+ : \"NULL\" + \" and cleverTapID \" + cleverTapID));\n+ //set optOut to false on the current user to unregister the device token\n+ mCoreMetaData.setCurrentUserOptedOut(false);\n+ // unregister the device token on the current user\n+ mPushProviders.forcePushDeviceToken(false);\n+\n+ // try and flush and then reset the queues\n+ mBaseEventQueueManager.flushQueueSync(mContext, EventGroup.REGULAR);\n+ mBaseEventQueueManager.flushQueueSync(mContext, EventGroup.PUSH_NOTIFICATION_VIEWED);\n+ mDBManager.clearQueues(mContext);\n+\n+ // clear out the old data\n+ mLocalDataStore.changeUser();\n+ CoreMetaData.setActivityCount(1);\n+ mSessionManager.destroySession();\n+\n+ // either force restore the cached GUID or generate a new one\n+ if (cacheGuid != null) {\n+ mDeviceInfo.forceUpdateDeviceId(cacheGuid);\n+ mCallbackManager.notifyUserProfileInitialized(cacheGuid);\n+ } else if (mConfig.getEnableCustomCleverTapId()) {\n+ mDeviceInfo.forceUpdateCustomCleverTapID(cleverTapID);\n+ } else {\n+ mDeviceInfo.forceNewDeviceID();\n+ }\n+ mCallbackManager.notifyUserProfileInitialized(mDeviceInfo.getDeviceID());\n+ mDeviceInfo\n+ .setCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\n+ mAnalyticsManager.forcePushAppLaunchedEvent();\n+ if (profile != null) {\n+ mAnalyticsManager.pushProfile(profile);\n+ }\n+ mPushProviders.forcePushDeviceToken(true);\n+ synchronized (processingUserLoginLock) {\n+ processingUserLoginIdentifier = null;\n+ }\n+ resetInbox();\n+ resetFeatureFlags();\n+ resetProductConfigs();\n+ recordDeviceIDErrors();\n+ resetDisplayUnits();\n+ mInAppFCManager.changeUser(mDeviceInfo.getDeviceID());\n+ } catch (Throwable t) {\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"Reset Profile error\", t);\n+ }\n+ }\n+ });\n+ }\n+\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic void onUserLogin(final Map<String, Object> profile, final String cleverTapID) {\nif (mConfig.getEnableCustomCleverTapId()) {\n@@ -113,6 +171,12 @@ public class LoginController {\n_onUserLogin(profile, cleverTapID);\n}\n+ public void recordDeviceIDErrors() {\n+ for (ValidationResult validationResult : mDeviceInfo.getValidationResults()) {\n+ mValidationResultStack.pushValidationResult(validationResult);\n+ }\n+ }\n+\nprivate void _onUserLogin(final Map<String, Object> profile, final String cleverTapID) {\nif (profile == null) {\nreturn;\n@@ -200,74 +264,12 @@ public class LoginController {\n}\n}\n- public void asyncProfileSwitchUser(final Map<String, Object> profile, final String cacheGuid,\n- final String cleverTapID) {\n- mPostAsyncSafelyHandler.postAsyncSafely(\"resetProfile\", new Runnable() {\n- @Override\n- public void run() {\n- try {\n- mConfig.getLogger().verbose(mConfig.getAccountId(), \"asyncProfileSwitchUser:[profile \" + profile\n- + \" with Cached GUID \" + ((cacheGuid != null) ? cachedGUID\n- : \"NULL\" + \" and cleverTapID \" + cleverTapID));\n- //set optOut to false on the current user to unregister the device token\n- mCoreMetaData.setCurrentUserOptedOut(false);\n- // unregister the device token on the current user\n- mPushProviders.forcePushDeviceToken(false);\n-\n- // try and flush and then reset the queues\n- mBaseEventQueueManager.flushQueueSync(mContext, EventGroup.REGULAR);\n- mBaseEventQueueManager.flushQueueSync(mContext, EventGroup.PUSH_NOTIFICATION_VIEWED);\n- mDBManager.clearQueues(mContext);\n-\n- // clear out the old data\n- mLocalDataStore.changeUser();\n- CoreMetaData.setActivityCount(1);\n- mSessionManager.destroySession();\n-\n- // either force restore the cached GUID or generate a new one\n- if (cacheGuid != null) {\n- mDeviceInfo.forceUpdateDeviceId(cacheGuid);\n- mCallbackManager.notifyUserProfileInitialized(cacheGuid);\n- } else if (mConfig.getEnableCustomCleverTapId()) {\n- mDeviceInfo.forceUpdateCustomCleverTapID(cleverTapID);\n- } else {\n- mDeviceInfo.forceNewDeviceID();\n- }\n- mCallbackManager.notifyUserProfileInitialized(mDeviceInfo.getDeviceID());\n- mDeviceInfo.setCurrentUserOptOutStateFromStorage(); // be sure to call this after the guid is updated\n- mAnalyticsManager.forcePushAppLaunchedEvent();\n- if (profile != null) {\n- mAnalyticsManager.pushProfile(profile);\n- }\n- mPushProviders.forcePushDeviceToken(true);\n- synchronized (processingUserLoginLock) {\n- processingUserLoginIdentifier = null;\n- }\n- resetInbox();\n- resetFeatureFlags();\n- resetProductConfigs();\n- recordDeviceIDErrors();\n- resetDisplayUnits();\n- mInAppFCManager.changeUser(mDeviceInfo.getDeviceID());\n- } catch (Throwable t) {\n- mConfig.getLogger().verbose(mConfig.getAccountId(), \"Reset Profile error\", t);\n- }\n- }\n- });\n- }\n-\nprivate boolean isProcessUserLoginWithIdentifier(String identifier) {\nsynchronized (processingUserLoginLock) {\nreturn processingUserLoginIdentifier != null && processingUserLoginIdentifier.equals(identifier);\n}\n}\n- public void recordDeviceIDErrors() {\n- for (ValidationResult validationResult : mDeviceInfo.getValidationResults()) {\n- mValidationResultStack.pushValidationResult(validationResult);\n- }\n- }\n-\n/**\n* Resets the Display Units in the cache\n*/\n@@ -281,7 +283,8 @@ public class LoginController {\n}\nprivate void resetFeatureFlags() {\n- if (mControllerManager.getCTFeatureFlagsController() != null && mControllerManager.getCTFeatureFlagsController()\n+ if (mControllerManager.getCTFeatureFlagsController() != null && mControllerManager\n+ .getCTFeatureFlagsController()\n.isInitialized()) {\nmControllerManager.getCTFeatureFlagsController().resetWithGuid(mDeviceInfo.getDeviceID());\nmControllerManager.getCTFeatureFlagsController().fetchFeatureFlags();\n@@ -305,8 +308,8 @@ public class LoginController {\nif (mControllerManager.getCTProductConfigController() != null) {\nmControllerManager.getCTProductConfigController().resetSettings();\n}\n- CTProductConfigController ctProductConfigController = new CTProductConfigController(mContext, mDeviceInfo.getDeviceID(),\n- mConfig, mAnalyticsManager, mCoreMetaData,\n+ CTProductConfigController ctProductConfigController =\n+ CTProductConfigFactory.getInstance(mContext, mDeviceInfo, mConfig, mAnalyticsManager, mCoreMetaData,\nmCallbackManager);\nmControllerManager.setCTProductConfigController(ctProductConfigController);\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Product Config reset\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -68,14 +68,14 @@ public class CTProductConfigController {\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config,\nfinal BaseAnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\n- final BaseCallbackManager callbackManager) {\n+ final BaseCallbackManager callbackManager, ProductConfigSettings productConfigSettings) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\nmCoreMetaData = coreMetaData;\nmCallbackManager = callbackManager;\nmAnalyticsManager = analyticsManager;\n- this.settings = new ProductConfigSettings(context, guid, config);\n+ this.settings = productConfigSettings;\ninitAsync();\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigFactory.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+import android.content.Context;\n+import com.clevertap.android.sdk.BaseAnalyticsManager;\n+import com.clevertap.android.sdk.BaseCallbackManager;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.CoreMetaData;\n+import com.clevertap.android.sdk.DeviceInfo;\n+\n+public class CTProductConfigFactory {\n+\n+ public static CTProductConfigController getInstance(Context context, DeviceInfo deviceInfo,\n+ CleverTapInstanceConfig config, BaseAnalyticsManager baseAnalyticsManager, CoreMetaData coreMetaData,\n+ BaseCallbackManager callbackManager) {\n+ final String guid = deviceInfo.getDeviceID();\n+ ProductConfigSettings configSettings = new ProductConfigSettings(context, guid, config);\n+ return new CTProductConfigController(context, guid,\n+ config, baseAnalyticsManager, coreMetaData,\n+ callbackManager, configSettings);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCallbackManager.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCallbackManager.kt",
"diff": "@@ -2,14 +2,20 @@ package com.clevertap.android.sdk\nimport com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener\n+import com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener\nimport java.lang.ref.WeakReference\n+import java.util.ArrayList\nclass MockCallbackManager :\nBaseCallbackManager() {\n+ override fun _notifyInboxInitialized() {\n+ TODO(\"Not yet implemented\")\n+ }\n+\noverride fun _notifyInboxMessagesDidUpdate() {\nTODO(\"Not yet implemented\")\n}\n@@ -58,10 +64,18 @@ class MockCallbackManager :\nTODO(\"Not yet implemented\")\n}\n+ override fun notifyDisplayUnitsLoaded(displayUnits: ArrayList<CleverTapDisplayUnit>?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\noverride fun notifyUserProfileInitialized(deviceID: String?) {\nTODO(\"Not yet implemented\")\n}\n+ override fun notifyUserProfileInitialized() {\n+ TODO(\"Not yet implemented\")\n+ }\n+\noverride fun setDisplayUnitListener(listener: DisplayUnitListener?) {\nTODO(\"Not yet implemented\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -33,16 +33,11 @@ class CTProductConfigControllerTest : BaseTestCase() {\ncallbackManager = MockCallbackManager()\nproductConfigSettings = mock(ProductConfigSettings::class.java)\nmProductConfigController = CTProductConfigController(\n- application,\n- guid,\n- cleverTapInstanceConfig,\n- analyticsManager,\n- coreMetaData,\n- callbackManager\n+ application, guid, cleverTapInstanceConfig, analyticsManager,\n+ coreMetaData, callbackManager, productConfigSettings\n)\n}\n-\n@Test\nfun testFetch_Valid_Guid_Window_Expired() {\nval windowInSeconds = TimeUnit.MINUTES.toSeconds(12)\n@@ -59,7 +54,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nfun testFetch_Valid_Guid_Window_Not_Expired() {\nval windowInSeconds = TimeUnit.MINUTES.toSeconds(12)\n`when`(productConfigSettings.nextFetchIntervalInSeconds).thenReturn(windowInSeconds)\n- val lastResponseTime = System.currentTimeMillis() - (2 * windowInSeconds * 1000)\n+ val lastResponseTime = System.currentTimeMillis() - (windowInSeconds / 2 * 1000)\n`when`(productConfigSettings.lastFetchTimeStampInMillis).thenReturn(lastResponseTime)\nmProductConfigController.fetch()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Added CTProductConfigFactory.java |
116,621 | 02.02.2021 11:23:53 | -19,080 | 938513a13a8bbd6dc0bbe89683aaf1c292c3339b | Task(SDK-646): 1. Added Junit5 2. Refactored ProductConfig Code | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -42,35 +42,24 @@ public class CTProductConfigController {\nprivate HashMap<String, String> defaultConfig = new HashMap<>();\n- private String guid;\n-\nprivate boolean isFetchAndActivating = false;\nprivate boolean isInitialized = false;\n+ private final BaseAnalyticsManager mAnalyticsManager;\n+\nprivate final BaseCallbackManager mCallbackManager;\nprivate final CoreMetaData mCoreMetaData;\n- void setDefaultConfig(final HashMap<String, String> defaultConfig) {\n- this.defaultConfig = defaultConfig;\n- }\n-\nprivate final ProductConfigSettings settings;\nprivate final HashMap<String, String> waitingTobeActivatedConfig = new HashMap<>();\n- private final BaseAnalyticsManager mAnalyticsManager;\n-\n- // -----------------------------------------------------------------------//\n- // ******** Public API *****//\n- // -----------------------------------------------------------------------//\n-\n- public CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config,\n+ public CTProductConfigController(Context context, CleverTapInstanceConfig config,\nfinal BaseAnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\nfinal BaseCallbackManager callbackManager, ProductConfigSettings productConfigSettings) {\nthis.context = context;\n- this.guid = guid;\nthis.config = config;\nmCoreMetaData = coreMetaData;\nmCallbackManager = callbackManager;\n@@ -79,12 +68,16 @@ public class CTProductConfigController {\ninitAsync();\n}\n+ // -----------------------------------------------------------------------//\n+ // ******** Public API *****//\n+ // -----------------------------------------------------------------------//\n+\n/**\n* Asynchronously activates the most recently fetched configs, so that the fetched key value pairs take effect.\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic void activate() {\n- if (TextUtils.isEmpty(guid)) {\n+ if (TextUtils.isEmpty(settings.getGuid())) {\nreturn;\n}\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@@ -281,7 +274,7 @@ public class CTProductConfigController {\n* Developers should not use this method manually.\n*/\npublic void onFetchSuccess(JSONObject kvResponse) {\n- if (TextUtils.isEmpty(guid)) {\n+ if (TextUtils.isEmpty(settings.getGuid())) {\nreturn;\n}\nsynchronized (this) {\n@@ -314,10 +307,6 @@ public class CTProductConfigController {\n}\n}\n- // -----------------------------------------------------------------------//\n- // ******** Internal API *****//\n- // -----------------------------------------------------------------------//\n-\n/**\n* Deletes all activated, fetched and defaults configs as well as all Product Config settings.\n*/\n@@ -353,6 +342,10 @@ public class CTProductConfigController {\n}\n}\n+ // -----------------------------------------------------------------------//\n+ // ******** Internal API *****//\n+ // -----------------------------------------------------------------------//\n+\npublic void resetSettings() {\nsettings.reset();\n}\n@@ -430,13 +423,10 @@ public class CTProductConfigController {\n* Developers should not use this method manually.\n*/\npublic void setGuidAndInit(String cleverTapID) {\n- if (isInitialized()) {\n- return;\n- }\n- if (TextUtils.isEmpty(guid)) {\n+ if (isInitialized() || TextUtils.isEmpty(cleverTapID) || cleverTapID.equalsIgnoreCase(settings.getGuid())) {\nreturn;\n}\n- this.guid = cleverTapID;\n+ settings.setGuid(cleverTapID);\ninitAsync();\n}\n@@ -451,7 +441,7 @@ public class CTProductConfigController {\n}\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\n- boolean validGuid = !TextUtils.isEmpty(guid);\n+ boolean validGuid = !TextUtils.isEmpty(settings.getGuid());\nif (!validGuid) {\nconfig.getLogger()\n@@ -513,7 +503,7 @@ public class CTProductConfigController {\n}\nprivate String getProductConfigDirName() {\n- return CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n+ return CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + settings.getGuid();\n}\nprivate HashMap<String, String> getStoredValues(String fullFilePath) {\n@@ -562,7 +552,7 @@ public class CTProductConfigController {\n}\nprivate void initAsync() {\n- if (TextUtils.isEmpty(guid)) {\n+ if (TextUtils.isEmpty(settings.getGuid())) {\nreturn;\n}\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigFactory.java",
"diff": "@@ -14,8 +14,6 @@ public class CTProductConfigFactory {\nBaseCallbackManager callbackManager) {\nfinal String guid = deviceInfo.getDeviceID();\nProductConfigSettings configSettings = new ProductConfigSettings(context, guid, config);\n- return new CTProductConfigController(context, guid,\n- config, baseAnalyticsManager, coreMetaData,\n- callbackManager, configSettings);\n+ return new CTProductConfigController(context, config, baseAnalyticsManager, coreMetaData, callbackManager, configSettings);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"diff": "@@ -11,7 +11,7 @@ import java.util.HashMap;\nimport org.xmlpull.v1.XmlPullParser;\nimport org.xmlpull.v1.XmlPullParserException;\n-public class DefaultXmlParser {\n+class DefaultXmlParser {\nprivate static final String XML_TAG_ENTRY = \"entry\";\n@@ -23,7 +23,7 @@ public class DefaultXmlParser {\nprivate static final int XML_TAG_TYPE_VALUE = 1;\n- public DefaultXmlParser() {\n+ DefaultXmlParser() {\n}\nstatic HashMap<String, String> getDefaultsFromXml(Context context, int resourceId) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -25,7 +25,7 @@ class ProductConfigSettings {\nprivate final Context context;\n- private final String guid;\n+ private String guid;\nprivate final HashMap<String, String> settingsMap = new HashMap<>();\n@@ -36,7 +36,7 @@ class ProductConfigSettings {\ninitDefaults();\n}\n- public void reset() {\n+ void reset() {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\npublic Void doInBackground(Void aVoid) {\n@@ -61,6 +61,14 @@ class ProductConfigSettings {\ninitDefaults();\n}\n+ String getGuid() {\n+ return guid;\n+ }\n+\n+ void setGuid(final String guid) {\n+ this.guid = guid;\n+ }\n+\nlong getLastFetchTimeStampInMillis() {\nlong lastFetchedTimeStamp = 0L;\nString value = settingsMap.get(KEY_LAST_FETCHED_TIMESTAMP);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -32,9 +32,14 @@ class CTProductConfigControllerTest : BaseTestCase() {\ndeviceInfo = MockDeviceInfo(application, cleverTapInstanceConfig, guid, coreMetaData)\ncallbackManager = MockCallbackManager()\nproductConfigSettings = mock(ProductConfigSettings::class.java)\n+ `when`(productConfigSettings.guid).thenReturn(guid)\nmProductConfigController = CTProductConfigController(\n- application, guid, cleverTapInstanceConfig, analyticsManager,\n- coreMetaData, callbackManager, productConfigSettings\n+ application,\n+ cleverTapInstanceConfig,\n+ analyticsManager,\n+ coreMetaData,\n+ callbackManager,\n+ productConfigSettings\n)\n}\n@@ -42,7 +47,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nfun testFetch_Valid_Guid_Window_Expired() {\nval windowInSeconds = TimeUnit.MINUTES.toSeconds(12)\n`when`(productConfigSettings.nextFetchIntervalInSeconds).thenReturn(windowInSeconds)\n- val lastResponseTime = System.currentTimeMillis() - (windowInSeconds * 1000 * 2)\n+ val lastResponseTime = System.currentTimeMillis() - 2 * windowInSeconds * TimeUnit.SECONDS.toMillis(1)\n`when`(productConfigSettings.lastFetchTimeStampInMillis).thenReturn(lastResponseTime)\nmProductConfigController.fetch()\n@@ -51,14 +56,26 @@ class CTProductConfigControllerTest : BaseTestCase() {\n}\n@Test\n- fun testFetch_Valid_Guid_Window_Not_Expired() {\n+ fun testFetch_Valid_Guid_Window_Not_Expired_Request_Not_Sent() {\nval windowInSeconds = TimeUnit.MINUTES.toSeconds(12)\n`when`(productConfigSettings.nextFetchIntervalInSeconds).thenReturn(windowInSeconds)\n- val lastResponseTime = System.currentTimeMillis() - (windowInSeconds / 2 * 1000)\n+ val lastResponseTime = System.currentTimeMillis() - windowInSeconds / 2 * TimeUnit.SECONDS.toMillis(1)\n`when`(productConfigSettings.lastFetchTimeStampInMillis).thenReturn(lastResponseTime)\nmProductConfigController.fetch()\nverify(analyticsManager, never()).sendFetchEvent(any())\nAssert.assertFalse(coreMetaData.isProductConfigRequested)\n}\n+\n+ @Test\n+ fun testFetch_InValid_Guid_Request_Not_Sent() {\n+ val windowInSeconds = TimeUnit.MINUTES.toSeconds(12)\n+ `when`(productConfigSettings.nextFetchIntervalInSeconds).thenReturn(windowInSeconds)\n+ val lastResponseTime = System.currentTimeMillis() - (windowInSeconds * 1000 * 2)\n+ `when`(productConfigSettings.lastFetchTimeStampInMillis).thenReturn(lastResponseTime)\n+ `when`(productConfigSettings.guid).thenReturn(\"\")\n+ mProductConfigController.fetch()\n+ verify(analyticsManager, never()).sendFetchEvent(any())\n+ Assert.assertFalse(coreMetaData.isProductConfigRequested)\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/build.gradle",
"new_path": "clevertap-geofence/build.gradle",
"diff": "@@ -21,7 +21,10 @@ dependencies {\ncompileOnly deps.androidXConcurrentFutures\n// Unit testing dependencies\n- testImplementation deps.junit\n+ testImplementation deps.junitPlatform\n+ testImplementation deps.junitApi\n+ testRuntimeOnly deps.junitEngine\n+\ntestImplementation deps.mockitoCore\ntestImplementation deps.robolectric\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/dependencies.gradle",
"new_path": "gradle-scripts/dependencies.gradle",
"diff": "@@ -26,7 +26,11 @@ ext.deps = [\n'androidXConcurrentFutures' : \"androidx.concurrent:concurrent-futures:$concurrentFuturesVersion\",\n'workManagerTesting' : \"androidx.work:work-testing:$workManagerVersion\",\n'robolectric' : \"org.robolectric:robolectric:$robolectricVersion\",\n- 'junit' : \"junit:junit:$junitVersion\",\n+\n+ 'junitPlatform':\"org.junit.platform:junit-platform-runner:$junitPlatformVersion\",\n+ 'junitApi':\"org.junit.jupiter:junit-jupiter-api:$junitApiVersion\",\n+ 'junitEngine':\"org.junit.jupiter:junit-jupiter-engine:$junitEngineVersion\",\n+\n'androidXTestCore' : \"androidx.test:core:$androidxCoreVersion\",\n'mockitoCore' : \"org.mockito:mockito-core:$mockitoVersion\",\n'androidXJunitExt' : \"androidx.test.ext:junit:$junitExtVersion\",\n@@ -34,6 +38,4 @@ ext.deps = [\n'clevertapGeofence' : \"com.clevertap.android:clevertap-geofence-sdk:$geofenceVersion\",\n'clevertapXPS' : \"com.clevertap.android:clevertap-xiaomi-sdk:$xpsVersion\",\n'clevertapHMS' : \"com.clevertap.android:clevertap-hms-sdk:$hmsVersion\"\n-\n-\n]\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -55,7 +55,11 @@ ext {\n// unit tests\njsonVersion = '20200518'\ngsonVersion = '2.8.6'\n- junitVersion = '4.13'\n+\n+ junitPlatformVersion = '1.7.0'\n+ junitApiVersion = '5.7.0'\n+ junitEngineVersion = '5.7.0'\n+\njunitExtVersion = '1.1.2'\nrobolectricVersion = '4.3.1'\ntestRunnerVersion = '1.3.0'\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "@@ -28,7 +28,10 @@ android {\ndependencies {\napi project(':clevertap-core')\n// Unit ing dependencies\n- api deps.junit\n+ api deps.junitPlatform\n+ api deps.junitApi\n+ api deps.junitEngine\n+\ndef mockito_version = '3.5.11'\napi deps.mockitoCore\napi \"org.mockito:mockito-inline:$mockito_version\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-646): 1. Added Junit5 2. Refactored ProductConfig Code |
116,612 | 02.02.2021 13:54:23 | -19,080 | d487c122da0095bdeca30098b551324d5930e515 | task(TDD): add unit tests for geofence apis in CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "package com.clevertap.android.sdk\n+import android.location.Location\nimport com.clevertap.android.shared.test.BaseTestCase\n+import org.json.JSONObject\nimport org.junit.*\nimport org.junit.Assert.*\nimport org.junit.runner.*\n+import org.mockito.*\nimport org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n@@ -79,6 +82,119 @@ class CleverTapAPITest : BaseTestCase() {\n}\n}\n+ @Test\n+ fun test_setLocationForGeofences() {\n+ val location = Location(\"\")\n+ location.apply {\n+ latitude = 17.4444\n+ longitude = 4.444\n+ }\n+\n+ mockStatic(CleverTapFactory::class.java).use {\n+ // Arrange\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+ cleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+ cleverTapAPI.setLocationForGeofences(location, 45)\n+ assertTrue(corestate.coreMetaData.isLocationForGeofence)\n+ assertEquals(corestate.coreMetaData.geofenceSDKVersion, 45)\n+ verify(corestate.locationManager)._setLocation(location)\n+ }\n+ }\n+\n+ @Test\n+ fun test_setGeofenceCallback() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ // Arrange\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+ cleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ val geofenceCallback = object : GeofenceCallback {\n+ override fun handleGeoFences(jsonObject: JSONObject?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun triggerLocation() {\n+ TODO(\"Not yet implemented\")\n+ }\n+ }\n+\n+ cleverTapAPI.geofenceCallback = geofenceCallback\n+\n+ assertEquals(geofenceCallback, cleverTapAPI.geofenceCallback)\n+\n+ }\n+ }\n+\n+ @Test\n+ fun test_pushGeoFenceError() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+ cleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ val expectedErrorCode = 234\n+ val expectedErrorMessage = \"error\"\n+\n+ cleverTapAPI.pushGeoFenceError(expectedErrorCode, expectedErrorMessage)\n+ val argumentCaptor =\n+ ArgumentCaptor.forClass(\n+ ValidationResult::class.java\n+ )\n+\n+ verify(corestate.validationResultStack).pushValidationResult(argumentCaptor.capture())\n+ assertEquals(expectedErrorCode, argumentCaptor.allValues[0].errorCode)\n+ assertEquals(expectedErrorMessage, argumentCaptor.allValues[0].errorDesc)\n+ }\n+ }\n+\n+ @Test\n+ fun test_pushGeoFenceExitedEvent() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+ cleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ val expectedJson = JSONObject(\"{\\\"key\\\":\\\"value\\\"}\")\n+\n+ cleverTapAPI.pushGeoFenceExitedEvent(expectedJson)\n+ val argumentCaptor =\n+ ArgumentCaptor.forClass(\n+ JSONObject::class.java\n+ )\n+\n+ verify(corestate.analyticsManager).raiseEventForGeofences(\n+ ArgumentMatchers.anyString(), argumentCaptor.capture()\n+ )\n+\n+ assertEquals(expectedJson, argumentCaptor.value)\n+ }\n+ }\n+\n+ @Test\n+ fun test_pushGeoFenceEnteredEvent() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n+ .thenReturn(corestate)\n+ cleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ val expectedJson = JSONObject(\"{\\\"key\\\":\\\"value\\\"}\")\n+\n+ cleverTapAPI.pushGeofenceEnteredEvent(expectedJson)\n+ val argumentCaptor =\n+ ArgumentCaptor.forClass(\n+ JSONObject::class.java\n+ )\n+\n+ verify(corestate.analyticsManager).raiseEventForGeofences(\n+ ArgumentMatchers.anyString(), argumentCaptor.capture()\n+ )\n+\n+ assertEquals(expectedJson, argumentCaptor.value)\n+ }\n+ }\n+\n/* @Test\nfun testPushDeepLink(){\n// Arrange\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCallbackManager.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCallbackManager.kt",
"diff": "@@ -12,10 +12,6 @@ import java.util.ArrayList\nclass MockCallbackManager :\nBaseCallbackManager() {\n- override fun _notifyInboxInitialized() {\n- TODO(\"Not yet implemented\")\n- }\n-\noverride fun _notifyInboxMessagesDidUpdate() {\nTODO(\"Not yet implemented\")\n}\n@@ -28,8 +24,8 @@ class MockCallbackManager :\nTODO(\"Not yet implemented\")\n}\n- override fun getGeofenceCallback(): GeofenceCallback {\n- TODO(\"Not yet implemented\")\n+ override fun getGeofenceCallback(): GeofenceCallback? {\n+ return null\n}\noverride fun getInAppActivityListener(): InAppActivityListener {\n@@ -60,6 +56,10 @@ class MockCallbackManager :\nTODO(\"Not yet implemented\")\n}\n+ override fun _notifyInboxInitialized() {\n+ TODO(\"Not yet implemented\")\n+ }\n+\noverride fun getSyncListener(): SyncListener {\nTODO(\"Not yet implemented\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"diff": "@@ -12,5 +12,10 @@ class MockCoreState(context: Context, cleverTapInstanceConfig: CleverTapInstance\ndeviceInfo = Mockito.mock(DeviceInfo::class.java)\npushProviders = Mockito.mock(PushProviders::class.java)\nsessionManager = Mockito.mock(SessionManager::class.java)\n+ locationManager = Mockito.mock(LocationManager::class.java)\n+ coreMetaData = CoreMetaData()\n+ callbackManager = CallbackManager(cleverTapInstanceConfig, deviceInfo)\n+ validationResultStack = Mockito.mock(ValidationResultStack::class.java)\n+ analyticsManager = Mockito.mock(AnalyticsManager::class.java)\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for geofence apis in CleverTapAPI SDK-628 |
116,612 | 02.02.2021 18:27:30 | -19,080 | cac2914ae3ecf9f4c43f0d6e6af6dc9a4a06ec4a | task(TDD): add unit tests for _setLocation() in LocationManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocationManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocationManager.java",
"diff": "@@ -89,14 +89,14 @@ class LocationManager extends BaseLocationManager {\n// Queue the ping event to transmit location update to server\n// min 10 second interval between location pings\n- final int now = (int) (System.currentTimeMillis() / 1000);\n+ final int now = getNow();\nFuture<?> future = null;\nif (mCoreMetaData.isLocationForGeofence() && now > (lastLocationPingTimeForGeofence\n+ Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = mBaseEventQueueManager.queueEvent(mContext, new JSONObject(), Constants.PING_EVENT);\n- lastLocationPingTimeForGeofence = now;\n+ setLastLocationPingTimeForGeofence(now);\nmLogger.verbose(mConfig.getAccountId(),\n\"Queuing location ping event for geofence location (\" + location.getLatitude() + \", \" + location\n.getLongitude() + \")\");\n@@ -105,7 +105,7 @@ class LocationManager extends BaseLocationManager {\n+ Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = mBaseEventQueueManager.queueEvent(mContext, new JSONObject(), Constants.PING_EVENT);\n- lastLocationPingTime = now;\n+ setLastLocationPingTime(now);\nmLogger.verbose(mConfig.getAccountId(),\n\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location\n.getLongitude() + \")\");\n@@ -114,4 +114,24 @@ class LocationManager extends BaseLocationManager {\nreturn future;\n}\n+ int getLastLocationPingTime() {\n+ return lastLocationPingTime;\n+ }\n+\n+ void setLastLocationPingTime(final int lastLocationPingTime) {\n+ this.lastLocationPingTime = lastLocationPingTime;\n+ }\n+\n+ int getLastLocationPingTimeForGeofence() {\n+ return lastLocationPingTimeForGeofence;\n+ }\n+\n+ void setLastLocationPingTimeForGeofence(final int lastLocationPingTimeForGeofence) {\n+ this.lastLocationPingTimeForGeofence = lastLocationPingTimeForGeofence;\n+ }\n+\n+ int getNow() {\n+ return (int) (System.currentTimeMillis() / 1000);\n+ }\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/LocationManagerTest.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.location.Location\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.mockito.Mockito.*\n+import org.robolectric.RobolectricTestRunner\n+import java.util.concurrent.Future\n+import kotlin.test.assertEquals\n+import kotlin.test.assertNotNull\n+import kotlin.test.assertNull\n+\n+@RunWith(RobolectricTestRunner::class)\n+class LocationManagerTest : BaseTestCase() {\n+\n+ private lateinit var coreMetaData: CoreMetaData\n+ private lateinit var locationManager: LocationManager\n+ private lateinit var eventQueueManager: BaseEventQueueManager\n+ private lateinit var location: Location\n+\n+ @Before\n+ @Throws(Exception::class)\n+ override fun setUp() {\n+ super.setUp()\n+ coreMetaData = CoreMetaData()\n+ eventQueueManager = Mockito.mock(EventQueueManager::class.java)\n+ locationManager = spy(LocationManager(application, cleverTapInstanceConfig, coreMetaData, eventQueueManager))\n+ location = Location(\"\")\n+ location.latitude = 17.355\n+ location.longitude = 7.355\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_null_when_Location_is_null() {\n+ val future = locationManager._setLocation(null)\n+\n+ assertNull(future)\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_null_when_app_in_background_and_Location_is_not_for_geofence() {\n+ CoreMetaData.setAppForeground(false)\n+ coreMetaData.isLocationForGeofence = false\n+\n+ val future = locationManager._setLocation(location)\n+\n+ assertNull(future)\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_null_when_Location_is_for_geofence_and_last_location_geofence_ping_is_less_than_10_secs() {\n+ `when`(locationManager.now).thenReturn(100)\n+ CoreMetaData.setAppForeground(true)\n+ coreMetaData.isLocationForGeofence = true\n+ locationManager.lastLocationPingTimeForGeofence = 100\n+\n+ val future = locationManager._setLocation(location)\n+\n+ assertNull(future)\n+ assertEquals(locationManager.lastLocationPingTimeForGeofence, 100)\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_future_when_Location_is_for_geofence_and_last_location_geofence_ping_is_greater_than_10_secs() {\n+ val future = mock(Future::class.java)\n+\n+ `when`(locationManager.now).thenReturn(150)\n+ `when`(eventQueueManager.queueEvent(any(), any(), anyInt()))\n+ .thenReturn(future)\n+\n+ CoreMetaData.setAppForeground(true)\n+ coreMetaData.isLocationForGeofence = true\n+ locationManager.lastLocationPingTimeForGeofence = 100\n+\n+ val futureActual = locationManager._setLocation(location)\n+\n+ verify(eventQueueManager).queueEvent(any(), any(), anyInt())\n+ assertNotNull(futureActual)\n+ assertEquals(locationManager.lastLocationPingTimeForGeofence, 150)\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_null_when_Location_is_not_for_geofence_and_last_location_ping_is_less_than_10_secs() {\n+ `when`(locationManager.now).thenReturn(100)\n+ CoreMetaData.setAppForeground(true)\n+ coreMetaData.isLocationForGeofence = false\n+ locationManager.lastLocationPingTime = 100\n+\n+ val future = locationManager._setLocation(location)\n+\n+ assertNull(future)\n+ assertEquals(locationManager.lastLocationPingTime, 100)\n+ }\n+\n+ @Test\n+ fun test_setLocation_returns_future_when_Location_is_not_for_geofence_and_last_location_ping_is_greater_than_10_secs() {\n+ val future = mock(Future::class.java)\n+\n+ `when`(locationManager.now).thenReturn(150)\n+ `when`(eventQueueManager.queueEvent(any(), any(), anyInt()))\n+ .thenReturn(future)\n+\n+ CoreMetaData.setAppForeground(true)\n+ coreMetaData.isLocationForGeofence = false\n+ locationManager.lastLocationPingTime = 100\n+\n+ val futureActual = locationManager._setLocation(location)\n+\n+ verify(eventQueueManager).queueEvent(any(), any(), anyInt())\n+ assertNotNull(futureActual)\n+ assertEquals(locationManager.lastLocationPingTime, 150)\n+ }\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for _setLocation() in LocationManager SDK-628 |
116,612 | 03.02.2021 16:05:54 | -19,080 | e1b157d07de62900db6163b072c77e24f7183ff6 | task(TDD): add unit tests for _getLocation() in LocationManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/LocationManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/LocationManagerTest.kt",
"diff": "package com.clevertap.android.sdk\n+import android.content.Context\nimport android.location.Location\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.junit.*\nimport org.junit.runner.*\n-import org.mockito.*\nimport org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n+import org.robolectric.Shadows.shadowOf\nimport java.util.concurrent.Future\nimport kotlin.test.assertEquals\nimport kotlin.test.assertNotNull\n@@ -25,11 +26,13 @@ class LocationManagerTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\ncoreMetaData = CoreMetaData()\n- eventQueueManager = Mockito.mock(EventQueueManager::class.java)\n+ eventQueueManager = mock(EventQueueManager::class.java)\nlocationManager = spy(LocationManager(application, cleverTapInstanceConfig, coreMetaData, eventQueueManager))\n- location = Location(\"\")\n- location.latitude = 17.355\n- location.longitude = 7.355\n+ location = Location(\"\").apply {\n+ latitude = 17.355\n+ longitude = 7.355\n+ accuracy = 50f\n+ }\n}\n@Test\n@@ -112,4 +115,54 @@ class LocationManagerTest : BaseTestCase() {\nassertNotNull(futureActual)\nassertEquals(locationManager.lastLocationPingTime, 150)\n}\n+\n+ @Test\n+ fun test_getLocation_returns_null_when_location_manager_dont_have_providers_enabled() {\n+ val actualLocation = locationManager._getLocation()\n+ assertNull(actualLocation)\n+ }\n+\n+ @Test\n+ fun test_getLocation_returns_location_when_location_manager_has_any_providers_enabled() {\n+ val systemService = application.getSystemService(Context.LOCATION_SERVICE) as android.location.LocationManager\n+ val shadowOf = shadowOf(systemService)\n+ shadowOf.setProviderEnabled(android.location.LocationManager.NETWORK_PROVIDER, true)\n+ shadowOf.setLastKnownLocation(android.location.LocationManager.NETWORK_PROVIDER, location)\n+\n+ val actualLocation = locationManager._getLocation()\n+\n+ assertEquals(location, actualLocation)\n+ }\n+\n+ @Test\n+ fun test_getLocation_returns_null_when_location_provider_does_not_have_location() {\n+ val systemService = application.getSystemService(Context.LOCATION_SERVICE) as android.location.LocationManager\n+ val shadowOf = shadowOf(systemService)\n+ shadowOf.setProviderEnabled(android.location.LocationManager.NETWORK_PROVIDER, true)\n+ shadowOf.setLastKnownLocation(android.location.LocationManager.NETWORK_PROVIDER, null)\n+\n+ val actualLocation = locationManager._getLocation()\n+\n+ assertNull(actualLocation)\n+ }\n+\n+ @Test\n+ fun test_getLocation_returns_location_with_best_accuracy() {\n+ val systemService = application.getSystemService(Context.LOCATION_SERVICE) as android.location.LocationManager\n+ val shadowOf = shadowOf(systemService)\n+ shadowOf.setProviderEnabled(android.location.LocationManager.NETWORK_PROVIDER, true)\n+ shadowOf.setProviderEnabled(android.location.LocationManager.GPS_PROVIDER, true)\n+ shadowOf.setLastKnownLocation(android.location.LocationManager.NETWORK_PROVIDER, location)\n+\n+ val gpsLocation = Location(\"\").apply {\n+ latitude = 17.355\n+ longitude = 7.355\n+ accuracy = 10f\n+ }\n+ shadowOf.setLastKnownLocation(android.location.LocationManager.GPS_PROVIDER, gpsLocation)\n+\n+ val actualLocation = locationManager._getLocation()\n+\n+ assertEquals(gpsLocation, actualLocation)\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for _getLocation() in LocationManager SDK-628 |
116,612 | 05.02.2021 15:38:29 | -19,080 | 774d3e5bc93f3767a708a8d65090694cd966e23f | task(TDD): add unit tests for queueEvent() in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -241,11 +241,19 @@ public class CoreState extends CleverTapState {\nthis.baseLocationManager = baseLocationManager;\n}\n- void setEventMediator(final EventMediator eventMediator) {\n+ public EventMediator getEventMediator() {\n+ return eventMediator;\n+ }\n+\n+ public void setEventMediator(final EventMediator eventMediator) {\nthis.eventMediator = eventMediator;\n}\n- void setMainLooperHandler(final MainLooperHandler mainLooperHandler) {\n+ public MainLooperHandler getMainLooperHandler() {\n+ return mainLooperHandler;\n+ }\n+\n+ public void setMainLooperHandler(final MainLooperHandler mainLooperHandler) {\nthis.mainLooperHandler = mainLooperHandler;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.json.JSONObject\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.mockito.Mockito.*\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class EventQueueManagerTest : BaseTestCase() {\n+\n+ private lateinit var corestate: MockCoreState\n+ private lateinit var eventQueueManager: EventQueueManager\n+ private lateinit var json: JSONObject\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+\n+ corestate = MockCoreState(application, cleverTapInstanceConfig)\n+ corestate.postAsyncSafelyHandler = MockPostAsyncSafelyHandler(cleverTapInstanceConfig)\n+\n+ eventQueueManager =\n+ Mockito.spy(\n+ EventQueueManager(\n+ corestate.databaseManager,\n+ application,\n+ cleverTapInstanceConfig,\n+ corestate.eventMediator,\n+ corestate.sessionManager,\n+ corestate.callbackManager,\n+ corestate.mainLooperHandler,\n+ corestate.postAsyncSafelyHandler,\n+ corestate.deviceInfo,\n+ corestate.validationResultStack,\n+ corestate.networkManager as NetworkManager,\n+ corestate.coreMetaData,\n+ corestate.ctLockManager,\n+ corestate.localDataStore\n+ )\n+ )\n+ json = JSONObject()\n+ }\n+\n+ @Test\n+ fun test_queueEvent_will_not_add_to_queue_when_event_should_be_dropped() {\n+\n+ `when`(corestate.eventMediator.shouldDropEvent(json, Constants.PING_EVENT))\n+ .thenReturn(true)\n+ eventQueueManager.queueEvent(application, json, Constants.PING_EVENT)\n+ verify(eventQueueManager, never()).addToQueue(application, json, Constants.PING_EVENT)\n+ }\n+\n+ @Test\n+ fun test_queueEvent_will_add_to_queue_when_event_should_not_be_dropped() {\n+\n+ `when`(corestate.eventMediator.shouldDropEvent(json, Constants.FETCH_EVENT))\n+ .thenReturn(false)\n+ doNothing().`when`(eventQueueManager).addToQueue(application, json, Constants.FETCH_EVENT)\n+ eventQueueManager.queueEvent(application, json, Constants.FETCH_EVENT)\n+ verify(eventQueueManager).addToQueue(application, json, Constants.FETCH_EVENT)\n+ }\n+\n+ @Test\n+ fun test_queueEvent_will_process_further_and_add_to_queue_when_event_should_not_be_dropped() {\n+\n+ `when`(corestate.eventMediator.shouldDropEvent(json, Constants.PROFILE_EVENT))\n+ .thenReturn(false)\n+ doNothing().`when`(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n+ doNothing().`when`(eventQueueManager).pushInitialEventsAsync()\n+ doNothing().`when`(corestate.sessionManager).lazyCreateSession(application)\n+\n+ eventQueueManager.queueEvent(application, json, Constants.PROFILE_EVENT)\n+\n+ verify(corestate.sessionManager).lazyCreateSession(application)\n+ verify(eventQueueManager).pushInitialEventsAsync()\n+ verify(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n+ }\n+\n+ @Test\n+ fun test_queueEvent_will_delay_add_to_queue_when_event_processing_should_be_delayed() {\n+\n+ val captor = ArgumentCaptor.forClass(Runnable::class.java)\n+ `when`(corestate.eventMediator.shouldDropEvent(json, Constants.PROFILE_EVENT))\n+ .thenReturn(false)\n+\n+ `when`(corestate.eventMediator.shouldDeferProcessingEvent(json, Constants.PROFILE_EVENT))\n+ .thenReturn(true)\n+ doNothing().`when`(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n+ doNothing().`when`(eventQueueManager).pushInitialEventsAsync()\n+ doNothing().`when`(corestate.sessionManager).lazyCreateSession(application)\n+\n+ eventQueueManager.queueEvent(application, json, Constants.PROFILE_EVENT)\n+\n+ verify(corestate.mainLooperHandler).postDelayed(captor.capture(), ArgumentMatchers.anyLong())\n+\n+ captor.value.run()\n+\n+ verify(corestate.sessionManager).lazyCreateSession(application)\n+ verify(eventQueueManager).pushInitialEventsAsync()\n+ verify(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"diff": "@@ -17,5 +17,10 @@ class MockCoreState(context: Context, cleverTapInstanceConfig: CleverTapInstance\ncallbackManager = CallbackManager(cleverTapInstanceConfig, deviceInfo)\nvalidationResultStack = Mockito.mock(ValidationResultStack::class.java)\nanalyticsManager = Mockito.mock(AnalyticsManager::class.java)\n+ eventMediator = Mockito.mock(EventMediator::class.java)\n+ databaseManager = Mockito.mock(DBManager::class.java)\n+ validationResultStack = Mockito.mock(ValidationResultStack::class.java)\n+ mainLooperHandler = Mockito.mock(MainLooperHandler::class.java)\n+ networkManager = Mockito.mock(NetworkManager::class.java)\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for queueEvent() in EventQueueManager SDK-628 |
116,612 | 05.02.2021 16:01:43 | -19,080 | 2bbb6326b1ce0b63985d7e658f070524c49f3074 | task(TDD): add unit tests for addToQueue() in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -3,8 +3,6 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.CTJsonConverter.getErrorObject;\nimport android.content.Context;\n-import android.content.SharedPreferences;\n-import android.telecom.Call;\nimport com.clevertap.android.sdk.login.IdentityRepo;\nimport com.clevertap.android.sdk.login.IdentityRepoFactory;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n@@ -26,7 +24,7 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nprivate final Context mContext;\n- private CTLockManager mCtLockManager;\n+ private final CTLockManager mCtLockManager;\nprivate final DeviceInfo mDeviceInfo;\n@@ -299,7 +297,7 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nreturn mDeviceInfo.getDeviceID();\n}\n- private void processEvent(final Context context, final JSONObject event, final int eventType) {\n+ void processEvent(final Context context, final JSONObject event, final int eventType) {\nsynchronized (mCtLockManager.getEventLock()) {\ntry {\nif (CoreMetaData.getActivityCount() == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "@@ -23,7 +23,7 @@ class EventQueueManagerTest : BaseTestCase() {\ncorestate.postAsyncSafelyHandler = MockPostAsyncSafelyHandler(cleverTapInstanceConfig)\neventQueueManager =\n- Mockito.spy(\n+ spy(\nEventQueueManager(\ncorestate.databaseManager,\napplication,\n@@ -102,4 +102,24 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).pushInitialEventsAsync()\nverify(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n}\n+\n+ @Test\n+ fun test_addToQueue_when_event_is_notification_viewed() {\n+ doNothing().`when`(eventQueueManager).processPushNotificationViewedEvent(application, json)\n+\n+ eventQueueManager.addToQueue(application, json, Constants.NV_EVENT)\n+\n+ verify(eventQueueManager).processPushNotificationViewedEvent(application, json)\n+ verify(eventQueueManager, never()).processEvent(application, json, Constants.NV_EVENT)\n+ }\n+\n+ @Test\n+ fun test_addToQueue_when_event_is_not_notification_viewed() {\n+ doNothing().`when`(eventQueueManager).processEvent(application, json, Constants.PROFILE_EVENT)\n+\n+ eventQueueManager.addToQueue(application, json, Constants.PROFILE_EVENT)\n+\n+ verify(eventQueueManager, never()).processPushNotificationViewedEvent(application, json)\n+ verify(eventQueueManager).processEvent(application, json, Constants.PROFILE_EVENT)\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for addToQueue() in EventQueueManager SDK-628 |
116,612 | 05.02.2021 16:58:30 | -19,080 | 718e2a1634cf0d179bdca4071a5b894431ce4dc4 | task(TDD): add unit tests for processPushNotificationViewedEvent() and schedulePushNotificationViewedQueueFlush() in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1556,7 +1556,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*/\n@SuppressWarnings({\"unused\"})\npublic int getTimeElapsed() {\n- int currentSession = mCoreState.getCoreMetaData().getCurrentSession();\n+ int currentSession = mCoreState.getCoreMetaData().getCurrentSessionId();\nif (currentSession == 0) {\nreturn -1;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -153,7 +153,7 @@ public class CoreMetaData extends CleverTapMetaData {\n}\n}\n- int getCurrentSession() {\n+ int getCurrentSessionId() {\nreturn currentSessionId;\n}\n@@ -296,7 +296,7 @@ public class CoreMetaData extends CleverTapMetaData {\noffline = value;\n}\n- void setSessionId(int sessionId) {\n+ void setCurrentSessionId(int sessionId) {\nthis.currentSessionId = sessionId;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -297,6 +297,10 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nreturn mDeviceInfo.getDeviceID();\n}\n+ int getNow() {\n+ return (int) (System.currentTimeMillis() / 1000);\n+ }\n+\nvoid processEvent(final Context context, final JSONObject event, final int eventType) {\nsynchronized (mCtLockManager.getEventLock()) {\ntry {\n@@ -336,7 +340,7 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nevent.put(\"n\", currentActivityName);\n}\n- int session = mCleverTapMetaData.getCurrentSession();\n+ int session = mCleverTapMetaData.getCurrentSessionId();\nevent.put(\"s\", session);\nevent.put(\"pg\", CoreMetaData.getActivityCount());\nevent.put(\"type\", type);\n@@ -361,31 +365,6 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n}\n}\n- void processPushNotificationViewedEvent(final Context context, final JSONObject event) {\n- synchronized (mCtLockManager.getEventLock()) {\n- try {\n- int session = mCleverTapMetaData.getCurrentSession();\n- event.put(\"s\", session);\n- event.put(\"type\", \"event\");\n- event.put(\"ep\", System.currentTimeMillis() / 1000);\n- // Report any pending validation error\n- ValidationResult vr = mValidationResultStack.popValidationResult();\n- if (vr != null) {\n- event.put(Constants.ERROR_KEY, getErrorObject(vr));\n- }\n- mConfig.getLogger().verbose(mConfig.getAccountId(), \"Pushing Notification Viewed event onto DB\");\n- mBaseDatabaseManager.queuePushNotificationViewedEventToDB(context, event);\n- mConfig.getLogger()\n- .verbose(mConfig.getAccountId(), \"Pushing Notification Viewed event onto queue flush\");\n- schedulePushNotificationViewedQueueFlush(context);\n- } catch (Throwable t) {\n- mConfig.getLogger()\n- .verbose(mConfig.getAccountId(),\n- \"Failed to queue notification viewed event: \" + event.toString(), t);\n- }\n- }\n- }\n-\n/**\n* Attaches meta info about the current state of the device to an event.\n* Typically, this meta is added only to the ping event.\n@@ -443,4 +422,29 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n}\n}\n+ void processPushNotificationViewedEvent(final Context context, final JSONObject event) {\n+ synchronized (mCtLockManager.getEventLock()) {\n+ try {\n+ int session = mCleverTapMetaData.getCurrentSessionId();\n+ event.put(\"s\", session);\n+ event.put(\"type\", \"event\");\n+ event.put(\"ep\", getNow());\n+ // Report any pending validation error\n+ ValidationResult vr = mValidationResultStack.popValidationResult();\n+ if (vr != null) {\n+ event.put(Constants.ERROR_KEY, getErrorObject(vr));\n+ }\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"Pushing Notification Viewed event onto DB\");\n+ mBaseDatabaseManager.queuePushNotificationViewedEventToDB(context, event);\n+ mConfig.getLogger()\n+ .verbose(mConfig.getAccountId(), \"Pushing Notification Viewed event onto queue flush\");\n+ schedulePushNotificationViewedQueueFlush(context);\n+ } catch (Throwable t) {\n+ mConfig.getLogger()\n+ .verbose(mConfig.getAccountId(),\n+ \"Failed to queue notification viewed event: \" + event.toString(), t);\n+ }\n+ }\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SessionManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SessionManager.java",
"diff": "@@ -40,7 +40,7 @@ public class SessionManager extends BaseSessionManager {\n@Override\npublic void destroySession() {\n- mCleverTapMetaData.setSessionId(0);\n+ mCleverTapMetaData.setCurrentSessionId(0);\nmCleverTapMetaData.setAppLaunchPushed(false);\nif (mCleverTapMetaData.isFirstSession()) {\nmCleverTapMetaData.setFirstSession(false);\n@@ -87,10 +87,10 @@ public class SessionManager extends BaseSessionManager {\nprivate void createSession(final Context context) {\nint sessionId = (int) (System.currentTimeMillis() / 1000);\n- mCleverTapMetaData.setSessionId(sessionId);\n+ mCleverTapMetaData.setCurrentSessionId(sessionId);\nmConfig.getLogger().verbose(mConfig.getAccountId(),\n- \"Session created with ID: \" + mCleverTapMetaData.getCurrentSession());\n+ \"Session created with ID: \" + mCleverTapMetaData.getCurrentSessionId());\nSharedPreferences prefs = StorageHelper.getPreferences(context);\n@@ -109,7 +109,7 @@ public class SessionManager extends BaseSessionManager {\nfinal SharedPreferences.Editor editor = prefs.edit()\n.putInt(StorageHelper.storageKeyWithSuffix(mConfig, Constants.SESSION_ID_LAST),\n- mCleverTapMetaData.getCurrentSession());\n+ mCleverTapMetaData.getCurrentSessionId());\nStorageHelper.persist(editor);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -134,18 +134,14 @@ class CleverTapAPITest : BaseTestCase() {\n.thenReturn(corestate)\ncleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n- val expectedErrorCode = 234\n- val expectedErrorMessage = \"error\"\n+ val expectedErrorCode = 999\n+ val expectedErrorMessage = \"Fire in the hall\"\ncleverTapAPI.pushGeoFenceError(expectedErrorCode, expectedErrorMessage)\n- val argumentCaptor =\n- ArgumentCaptor.forClass(\n- ValidationResult::class.java\n- )\n- verify(corestate.validationResultStack).pushValidationResult(argumentCaptor.capture())\n- assertEquals(expectedErrorCode, argumentCaptor.allValues[0].errorCode)\n- assertEquals(expectedErrorMessage, argumentCaptor.allValues[0].errorDesc)\n+ val actualValidationResult = corestate.validationResultStack.popValidationResult()\n+ assertEquals(999, actualValidationResult.errorCode)\n+ assertEquals(\"Fire in the hall\", actualValidationResult.errorDesc)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "package com.clevertap.android.sdk\n+import com.clevertap.android.sdk.EventGroup.PUSH_NOTIFICATION_VIEWED\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.*\n@@ -7,6 +8,8 @@ import org.junit.runner.*\nimport org.mockito.*\nimport org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n+import kotlin.test.assertEquals\n+import kotlin.test.assertNull\n@RunWith(RobolectricTestRunner::class)\nclass EventQueueManagerTest : BaseTestCase() {\n@@ -42,6 +45,7 @@ class EventQueueManagerTest : BaseTestCase() {\n)\n)\njson = JSONObject()\n+\n}\n@Test\n@@ -122,4 +126,60 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager, never()).processPushNotificationViewedEvent(application, json)\nverify(eventQueueManager).processEvent(application, json, Constants.PROFILE_EVENT)\n}\n+\n+ @Test\n+ fun test_processPushNotificationViewedEvent_when_there_is_no_validation_error() {\n+ val captor = ArgumentCaptor.forClass(Runnable::class.java)\n+ corestate.coreMetaData.currentSessionId = 1000\n+ `when`(eventQueueManager.now).thenReturn(7000)\n+ doNothing().`when`(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ eventQueueManager.processPushNotificationViewedEvent(application, json)\n+\n+ assertNull(json.optJSONObject(Constants.ERROR_KEY))\n+ assertEquals(\"event\", json.getString(\"type\"))\n+ assertEquals(1000, json.getInt(\"s\"))\n+ assertEquals(7000, json.getInt(\"ep\"))\n+\n+ verify(corestate.databaseManager).queuePushNotificationViewedEventToDB(application, json)\n+ verify(corestate.mainLooperHandler).removeCallbacks(captor.capture())\n+ verify(corestate.mainLooperHandler).post(captor.capture())\n+\n+ captor.value.run()\n+\n+ verify(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n+ }\n+\n+ @Test\n+ fun test_processPushNotificationViewedEvent_when_there_is_validation_error() {\n+ // Arrange\n+ val validationResult = ValidationResult()\n+ validationResult.errorDesc = \"Fire in the hall\"\n+ validationResult.errorCode = 999\n+\n+ corestate.validationResultStack.pushValidationResult(validationResult)\n+\n+ val captor = ArgumentCaptor.forClass(Runnable::class.java)\n+ corestate.coreMetaData.currentSessionId = 1000\n+ `when`(eventQueueManager.now).thenReturn(7000)\n+ doNothing().`when`(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ // Act\n+ eventQueueManager.processPushNotificationViewedEvent(application, json)\n+\n+ // Assert\n+ assertEquals(validationResult.errorCode, json.getJSONObject(Constants.ERROR_KEY)[\"c\"])\n+ assertEquals(validationResult.errorDesc, json.getJSONObject(Constants.ERROR_KEY)[\"d\"])\n+ assertEquals(\"event\", json.getString(\"type\"))\n+ assertEquals(1000, json.getInt(\"s\"))\n+ assertEquals(7000, json.getInt(\"ep\"))\n+\n+ verify(corestate.databaseManager).queuePushNotificationViewedEventToDB(application, json)\n+ verify(corestate.mainLooperHandler).removeCallbacks(captor.capture())\n+ verify(corestate.mainLooperHandler).post(captor.capture())\n+\n+ captor.value.run()\n+\n+ verify(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"diff": "@@ -19,8 +19,9 @@ class MockCoreState(context: Context, cleverTapInstanceConfig: CleverTapInstance\nanalyticsManager = Mockito.mock(AnalyticsManager::class.java)\neventMediator = Mockito.mock(EventMediator::class.java)\ndatabaseManager = Mockito.mock(DBManager::class.java)\n- validationResultStack = Mockito.mock(ValidationResultStack::class.java)\n+ validationResultStack = ValidationResultStack()\nmainLooperHandler = Mockito.mock(MainLooperHandler::class.java)\nnetworkManager = Mockito.mock(NetworkManager::class.java)\n+ ctLockManager = CTLockManager()\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for processPushNotificationViewedEvent() and schedulePushNotificationViewedQueueFlush() in EventQueueManager SDK-628 |
116,612 | 05.02.2021 17:21:28 | -19,080 | 338a2a618b52c1bdf1653123e164abad245d6136 | task(TDD): add unit tests for pushInitialEventsAsync(), scheduleQueueFlush() and flushQueueAsync() in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "package com.clevertap.android.sdk\nimport com.clevertap.android.sdk.EventGroup.PUSH_NOTIFICATION_VIEWED\n+import com.clevertap.android.sdk.EventGroup.REGULAR\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.*\n@@ -182,4 +183,44 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n}\n+\n+ @Test\n+ fun test_pushInitialEventsAsync_does_not_pushBasicProfile_when_inCurrentSession() {\n+ corestate.coreMetaData.currentSessionId = 10000\n+ doNothing().`when`(eventQueueManager).pushBasicProfile(null)\n+\n+ eventQueueManager.pushInitialEventsAsync()\n+\n+ verify(eventQueueManager, never()).pushBasicProfile(null)\n+ }\n+\n+ @Test\n+ fun test_pushInitialEventsAsync_pushesBasicProfile_when_not_inCurrentSession() {\n+ corestate.coreMetaData.currentSessionId = -1\n+ doNothing().`when`(eventQueueManager).pushBasicProfile(null)\n+\n+ eventQueueManager.pushInitialEventsAsync()\n+\n+ verify(eventQueueManager).pushBasicProfile(null)\n+ }\n+\n+ @Test\n+ fun test_scheduleQueueFlush() {\n+ // Arrange\n+\n+ val captor = ArgumentCaptor.forClass(Runnable::class.java)\n+ doNothing().`when`(eventQueueManager).flushQueueSync(ArgumentMatchers.any(), ArgumentMatchers.any())\n+\n+ // Act\n+ eventQueueManager.scheduleQueueFlush(application)\n+\n+ // Assert\n+ verify(corestate.mainLooperHandler).removeCallbacks(captor.capture())\n+ verify(corestate.mainLooperHandler).postDelayed(captor.capture(), ArgumentMatchers.anyLong())\n+\n+ captor.value.run()\n+\n+ verify(eventQueueManager).flushQueueSync(application, REGULAR)\n+ verify(eventQueueManager).flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for pushInitialEventsAsync(), scheduleQueueFlush() and flushQueueAsync() in EventQueueManager SDK-628 |
116,612 | 05.02.2021 18:07:22 | -19,080 | 5a60e9f0c6f55ecd94916508c06e3fb1815c17ed | task(TDD): add unit tests for flush() and flushQueueSync() in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "package com.clevertap.android.sdk\n+import android.content.Context\n+import android.net.ConnectivityManager\n+import android.net.NetworkInfo.DetailedState\nimport com.clevertap.android.sdk.EventGroup.PUSH_NOTIFICATION_VIEWED\nimport com.clevertap.android.sdk.EventGroup.REGULAR\nimport com.clevertap.android.shared.test.BaseTestCase\n@@ -9,6 +12,8 @@ import org.junit.runner.*\nimport org.mockito.*\nimport org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n+import org.robolectric.Shadows.shadowOf\n+import org.robolectric.shadows.ShadowNetworkInfo\nimport kotlin.test.assertEquals\nimport kotlin.test.assertNull\n@@ -223,4 +228,73 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).flushQueueSync(application, REGULAR)\nverify(eventQueueManager).flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n}\n+\n+ @Test\n+ fun test_flush() {\n+ doNothing().`when`(eventQueueManager).flushQueueAsync(application, REGULAR)\n+\n+ eventQueueManager.flush()\n+\n+ verify(eventQueueManager).flushQueueAsync(application, REGULAR)\n+ }\n+\n+ @Test\n+ fun test_flushQueueSync_when_net_is_offline() {\n+ val cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\n+ val shadowOfCM = shadowOf(cm)\n+ shadowOfCM.setActiveNetworkInfo(null) // make offline\n+\n+ eventQueueManager.flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ verify(corestate.networkManager, never()).needsHandshakeForDomain(PUSH_NOTIFICATION_VIEWED)\n+ }\n+\n+ @Test\n+ fun test_flushQueueSync_when_net_is_online_and_metadata_is_offline() {\n+ corestate.coreMetaData.isOffline = true\n+ val cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\n+ val shadowOfCM = shadowOf(cm)\n+ val netInfo =\n+ ShadowNetworkInfo.newInstance(DetailedState.CONNECTED, ConnectivityManager.TYPE_WIFI, 1, true, true)\n+ shadowOfCM.setActiveNetworkInfo(netInfo) // make offline\n+\n+ eventQueueManager.flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ verify(corestate.networkManager, never()).needsHandshakeForDomain(PUSH_NOTIFICATION_VIEWED)\n+ }\n+\n+ @Test\n+ fun test_flushQueueSync_when_HandshakeForDomain_not_needed() {\n+ corestate.coreMetaData.isOffline = false\n+ val cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\n+ val shadowOfCM = shadowOf(cm)\n+ val netInfo =\n+ ShadowNetworkInfo.newInstance(DetailedState.CONNECTED, ConnectivityManager.TYPE_WIFI, 1, true, true)\n+ shadowOfCM.setActiveNetworkInfo(netInfo) // make offline\n+\n+ eventQueueManager.flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ verify(corestate.networkManager, never()).initHandshake(ArgumentMatchers.any(), ArgumentMatchers.any())\n+ verify(corestate.networkManager).flushDBQueue(application, PUSH_NOTIFICATION_VIEWED)\n+ }\n+\n+ @Test\n+ fun test_flushQueueSync_when_HandshakeForDomain_is_needed() {\n+ val captor = ArgumentCaptor.forClass(Runnable::class.java)\n+ corestate.coreMetaData.isOffline = false\n+ val cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\n+ val shadowOfCM = shadowOf(cm)\n+ val netInfo =\n+ ShadowNetworkInfo.newInstance(DetailedState.CONNECTED, ConnectivityManager.TYPE_WIFI, 1, true, true)\n+ shadowOfCM.setActiveNetworkInfo(netInfo) // make offline\n+ `when`(corestate.networkManager.needsHandshakeForDomain(PUSH_NOTIFICATION_VIEWED)).thenReturn(true)\n+\n+ eventQueueManager.flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n+\n+ verify(corestate.networkManager).initHandshake(ArgumentMatchers.any(), captor.capture())\n+\n+ captor.value.run()\n+\n+ verify(corestate.networkManager).flushDBQueue(application, PUSH_NOTIFICATION_VIEWED)\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for flush() and flushQueueSync() in EventQueueManager SDK-628 |
116,612 | 11.02.2021 17:15:16 | -19,080 | 26919b477d9a1f1b0959ba25ccce0265cea8731f | task(TDD): add unit tests for remaining methods in EventQueueManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -305,7 +305,7 @@ public class CoreMetaData extends CleverTapMetaData {\n}\npublic static void setActivityCount(final int count) {\n- activityCount = activityCount;\n+ activityCount = count;\n}\nstatic void incrementActivityCount() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/EventQueueManager.java",
"diff": "@@ -46,6 +46,8 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nprivate Runnable pushNotificationViewedRunnable = null;\n+ private LoginInfoProvider mLoginInfoProvider;\n+\npublic EventQueueManager(final BaseDatabaseManager baseDatabaseManager,\nContext context,\nCleverTapInstanceConfig config,\n@@ -110,6 +112,10 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n}\n}\n+ public LoginInfoProvider getLoginInfoProvider() {\n+ return mLoginInfoProvider;\n+ }\n+\n/**\n* Adds a new event to the queue, to be sent later.\n*\n@@ -154,6 +160,10 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n});\n}\n+ public void setLoginInfoProvider(final LoginInfoProvider loginInfoProvider) {\n+ mLoginInfoProvider = loginInfoProvider;\n+ }\n+\n// only call async\n@Override\n@@ -188,72 +198,67 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\n});\n}\n- //Profile\n- @Override\n- void pushBasicProfile(JSONObject baseProfile) {\n- try {\n- String guid = getCleverTapID();\n-\n- JSONObject profileEvent = new JSONObject();\n-\n- if (baseProfile != null && baseProfile.length() > 0) {\n- Iterator<String> i = baseProfile.keys();\n- IdentityRepo iProfileHandler = IdentityRepoFactory\n- .getRepo(mContext, mConfig, mDeviceInfo, mValidationResultStack);\n- LoginInfoProvider loginInfoProvider = new LoginInfoProvider(mContext, mConfig, mDeviceInfo);\n- while (i.hasNext()) {\n- String next = i.next();\n-\n- // need to handle command-based JSONObject props here now\n- Object value = null;\n- try {\n- value = baseProfile.getJSONObject(next);\n- } catch (Throwable t) {\n+ void processEvent(final Context context, final JSONObject event, final int eventType) {\n+ synchronized (mCtLockManager.getEventLock()) {\ntry {\n- value = baseProfile.get(next);\n- } catch (JSONException e) {\n- //no-op\n+ if (CoreMetaData.getActivityCount() == 0) {\n+ CoreMetaData.setActivityCount(1);\n}\n+ String type;\n+ if (eventType == Constants.PAGE_EVENT) {\n+ type = \"page\";\n+ } else if (eventType == Constants.PING_EVENT) {\n+ type = \"ping\";\n+ attachMeta(event, context);\n+ if (event.has(\"bk\")) {\n+ mCleverTapMetaData.setBgPing(true);\n+ event.remove(\"bk\");\n}\n- if (value != null) {\n- profileEvent.put(next, value);\n-\n- // cache the valid identifier: guid pairs\n- boolean isProfileKey = iProfileHandler.hasIdentity(next);\n- if (isProfileKey) {\n- try {\n- loginInfoProvider.cacheGUIDForIdentifier(guid, next, value.toString());\n- } catch (Throwable t) {\n- // no-op\n- }\n- }\n- }\n+ //Add a flag to denote, PING event is for geofences\n+ if (mCleverTapMetaData.isLocationForGeofence()) {\n+ event.put(\"gf\", true);\n+ mCleverTapMetaData.setLocationForGeofence(false);\n+ event.put(\"gfSDKVersion\", mCleverTapMetaData.getGeofenceSDKVersion());\n+ mCleverTapMetaData.setGeofenceSDKVersion(0);\n}\n+ } else if (eventType == Constants.PROFILE_EVENT) {\n+ type = \"profile\";\n+ } else if (eventType == Constants.DATA_EVENT) {\n+ type = \"data\";\n+ } else {\n+ type = \"event\";\n}\n- try {\n- String carrier = mDeviceInfo.getCarrier();\n- if (carrier != null && !carrier.equals(\"\")) {\n- profileEvent.put(\"Carrier\", carrier);\n- }\n+ // Complete the received event with the other params\n- String cc = mDeviceInfo.getCountryCode();\n- if (cc != null && !cc.equals(\"\")) {\n- profileEvent.put(\"cc\", cc);\n+ String currentActivityName = mCleverTapMetaData.getScreenName();\n+ if (currentActivityName != null) {\n+ event.put(\"n\", currentActivityName);\n}\n- profileEvent.put(\"tz\", TimeZone.getDefault().getID());\n+ int session = mCleverTapMetaData.getCurrentSessionId();\n+ event.put(\"s\", session);\n+ event.put(\"pg\", CoreMetaData.getActivityCount());\n+ event.put(\"type\", type);\n+ event.put(\"ep\", getNow());\n+ event.put(\"f\", mCleverTapMetaData.isFirstSession());\n+ event.put(\"lsl\", mCleverTapMetaData.getLastSessionLength());\n+ attachPackageNameIfRequired(context, event);\n- JSONObject event = new JSONObject();\n- event.put(\"profile\", profileEvent);\n- queueEvent(mContext, event, Constants.PROFILE_EVENT);\n- } catch (JSONException e) {\n- mConfig.getLogger()\n- .verbose(mConfig.getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n+ // Report any pending validation error\n+ ValidationResult vr = mValidationResultStack.popValidationResult();\n+ if (vr != null) {\n+ event.put(Constants.ERROR_KEY, getErrorObject(vr));\n+ }\n+ mLocalDataStore.setDataSyncFlag(event);\n+ mBaseDatabaseManager.queueEventToDB(context, event, eventType);\n+ updateLocalStore(context, event, eventType);\n+ scheduleQueueFlush(context);\n+\n+ } catch (Throwable e) {\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"Failed to queue event: \" + event.toString(), e);\n}\n- } catch (Throwable t) {\n- mConfig.getLogger().verbose(mConfig.getAccountId(), \"Basic profile sync\", t);\n}\n}\n@@ -301,67 +306,77 @@ class EventQueueManager extends BaseEventQueueManager implements FailureFlushLis\nreturn (int) (System.currentTimeMillis() / 1000);\n}\n- void processEvent(final Context context, final JSONObject event, final int eventType) {\n- synchronized (mCtLockManager.getEventLock()) {\n+ //Profile\n+ @Override\n+ void pushBasicProfile(JSONObject baseProfile) {\ntry {\n- if (CoreMetaData.getActivityCount() == 0) {\n- CoreMetaData.setActivityCount(1);\n- }\n- String type;\n- if (eventType == Constants.PAGE_EVENT) {\n- type = \"page\";\n- } else if (eventType == Constants.PING_EVENT) {\n- type = \"ping\";\n- attachMeta(event, context);\n- if (event.has(\"bk\")) {\n- mCleverTapMetaData.setBgPing(true);\n- event.remove(\"bk\");\n- }\n+ String guid = getCleverTapID();\n- //Add a flag to denote, PING event is for geofences\n- if (mCleverTapMetaData.isLocationForGeofence()) {\n- event.put(\"gf\", true);\n- mCleverTapMetaData.setLocationForGeofence(false);\n- event.put(\"gfSDKVersion\", mCleverTapMetaData.getGeofenceSDKVersion());\n- mCleverTapMetaData.setGeofenceSDKVersion(0);\n+ JSONObject profileEvent = new JSONObject();\n+\n+ // TODO: move to CTJSONConverter which will clone input json using below method\n+ if (baseProfile != null && baseProfile.length() > 0) {\n+ Iterator<String> i = baseProfile.keys();\n+ IdentityRepo iProfileHandler = IdentityRepoFactory\n+ .getRepo(mContext, mConfig, mDeviceInfo, mValidationResultStack);\n+ setLoginInfoProvider(new LoginInfoProvider(mContext, mConfig, mDeviceInfo));\n+ while (i.hasNext()) {\n+ String next = i.next();\n+\n+ // need to handle command-based JSONObject props here now\n+ Object value = null;\n+ try {\n+ value = baseProfile.getJSONObject(next);\n+ } catch (Throwable t) {\n+ try {\n+ value = baseProfile.get(next);\n+ } catch (JSONException e) {\n+ //no-op\n}\n- } else if (eventType == Constants.PROFILE_EVENT) {\n- type = \"profile\";\n- } else if (eventType == Constants.DATA_EVENT) {\n- type = \"data\";\n- } else {\n- type = \"event\";\n}\n- // Complete the received event with the other params\n+ if (value != null) {\n+ profileEvent.put(next, value);\n- String currentActivityName = mCleverTapMetaData.getScreenName();\n- if (currentActivityName != null) {\n- event.put(\"n\", currentActivityName);\n+ // TODO abstract out using IdentityIterator and IdentityIterable\n+ // cache the valid identifier: guid pairs\n+ boolean isProfileKey = iProfileHandler.hasIdentity(next);\n+ if (isProfileKey) {\n+ try {\n+ getLoginInfoProvider().cacheGUIDForIdentifier(guid, next, value.toString());\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ }\n+ }\n+ }\n}\n- int session = mCleverTapMetaData.getCurrentSessionId();\n- event.put(\"s\", session);\n- event.put(\"pg\", CoreMetaData.getActivityCount());\n- event.put(\"type\", type);\n- event.put(\"ep\", System.currentTimeMillis() / 1000);\n- event.put(\"f\", mCleverTapMetaData.isFirstSession());\n- event.put(\"lsl\", mCleverTapMetaData.getLastSessionLength());\n- attachPackageNameIfRequired(context, event);\n+ try {\n+ //TODO can be replaced with mDeviceInfo.attachCarrier()\n+ String carrier = mDeviceInfo.getCarrier();\n+ if (carrier != null && !carrier.equals(\"\")) {\n+ profileEvent.put(\"Carrier\", carrier);\n+ }\n- // Report any pending validation error\n- ValidationResult vr = mValidationResultStack.popValidationResult();\n- if (vr != null) {\n- event.put(Constants.ERROR_KEY, getErrorObject(vr));\n+ //TODO can be replaced with mDeviceInfo.attachCC()\n+ String cc = mDeviceInfo.getCountryCode();\n+ if (cc != null && !cc.equals(\"\")) {\n+ profileEvent.put(\"cc\", cc);\n}\n- mLocalDataStore.setDataSyncFlag(event);\n- mBaseDatabaseManager.queueEventToDB(context, event, eventType);\n- updateLocalStore(context, event, eventType);\n- scheduleQueueFlush(context);\n- } catch (Throwable e) {\n- mConfig.getLogger().verbose(mConfig.getAccountId(), \"Failed to queue event: \" + event.toString(), e);\n+ //TODO can be replaced with mDeviceInfo.attachTZ()\n+ profileEvent.put(\"tz\", TimeZone.getDefault().getID());\n+\n+ JSONObject event = new JSONObject();\n+ event.put(\"profile\", profileEvent);\n+ queueEvent(mContext, event, Constants.PROFILE_EVENT);\n+ } catch (JSONException e) {\n+ mConfig.getLogger()\n+ .verbose(mConfig.getAccountId(), \"FATAL: Creating basic profile update event failed!\");\n}\n+ } catch (Throwable t) {\n+ mConfig.getLogger().verbose(mConfig.getAccountId(), \"Basic profile sync\", t);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "@@ -5,6 +5,9 @@ import android.net.ConnectivityManager\nimport android.net.NetworkInfo.DetailedState\nimport com.clevertap.android.sdk.EventGroup.PUSH_NOTIFICATION_VIEWED\nimport com.clevertap.android.sdk.EventGroup.REGULAR\n+import com.clevertap.android.sdk.login.IdentityRepo\n+import com.clevertap.android.sdk.login.IdentityRepoFactory\n+import com.clevertap.android.sdk.login.LoginInfoProvider\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.*\n@@ -14,8 +17,12 @@ import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.Shadows.shadowOf\nimport org.robolectric.shadows.ShadowNetworkInfo\n+import java.util.TimeZone\nimport kotlin.test.assertEquals\n+import kotlin.test.assertFalse\n+import kotlin.test.assertNotNull\nimport kotlin.test.assertNull\n+import kotlin.test.assertTrue\n@RunWith(RobolectricTestRunner::class)\nclass EventQueueManagerTest : BaseTestCase() {\n@@ -51,7 +58,6 @@ class EventQueueManagerTest : BaseTestCase() {\n)\n)\njson = JSONObject()\n-\n}\n@Test\n@@ -297,4 +303,374 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.networkManager).flushDBQueue(application, PUSH_NOTIFICATION_VIEWED)\n}\n+\n+ @Test\n+ fun test_pushBasicProfile_when_input_is_null() {\n+ // Arrange\n+ doReturn(null).`when`(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(), ArgumentMatchers.anyInt()\n+ )\n+\n+ val expectedDeviceId = \"device_12345\"\n+ val expectedDeviceCarrier = \"carrier_12345\"\n+ val expectedDeviceCC = \"CC_12345\"\n+ val expectedDeviceTZ = \"tz_12345\"\n+\n+ val expectedTZ = TimeZone.getDefault()\n+ expectedTZ.id = expectedDeviceTZ\n+ TimeZone.setDefault(expectedTZ)\n+\n+ `when`(corestate.deviceInfo.deviceID).thenReturn(expectedDeviceId)\n+ `when`(corestate.deviceInfo.carrier).thenReturn(expectedDeviceCarrier)\n+ `when`(corestate.deviceInfo.countryCode).thenReturn(expectedDeviceCC)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+ val captorEventType = ArgumentCaptor.forClass(Int::class.java)\n+\n+ // Act\n+ eventQueueManager.pushBasicProfile(null)\n+\n+ // Assert\n+ verify(eventQueueManager).queueEvent(ArgumentMatchers.any(), captor.capture(), captorEventType.capture())\n+ val actualProfile = captor.value[\"profile\"] as JSONObject\n+ assertEquals(expectedDeviceCarrier, actualProfile[\"Carrier\"])\n+ assertEquals(expectedDeviceCC, actualProfile[\"cc\"])\n+ assertEquals(expectedDeviceTZ, actualProfile[\"tz\"])\n+ }\n+\n+ @Test\n+ fun test_pushBasicProfile_when_carrier_or_cc_is_null() {\n+ // Arrange\n+ doReturn(null).`when`(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(), ArgumentMatchers.anyInt()\n+ )\n+\n+ val expectedDeviceId = \"device_12345\"\n+\n+ `when`(corestate.deviceInfo.deviceID).thenReturn(expectedDeviceId)\n+ `when`(corestate.deviceInfo.carrier).thenReturn(null)\n+ `when`(corestate.deviceInfo.countryCode).thenReturn(null)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+ val captorEventType = ArgumentCaptor.forClass(Int::class.java)\n+\n+ // Act\n+ eventQueueManager.pushBasicProfile(null)\n+\n+ // Assert\n+ verify(eventQueueManager).queueEvent(ArgumentMatchers.any(), captor.capture(), captorEventType.capture())\n+ val actualProfile = captor.value[\"profile\"] as JSONObject\n+ assertNull(actualProfile.optString(\"Carrier\", null))\n+ assertNull(actualProfile.optString(\"cc\", null))\n+ }\n+\n+ @Test\n+ fun test_pushBasicProfile_when_carrier_or_cc_is_blank() {\n+ // Arrange\n+ doReturn(null).`when`(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(), ArgumentMatchers.anyInt()\n+ )\n+\n+ val expectedDeviceId = \"device_12345\"\n+\n+ `when`(corestate.deviceInfo.deviceID).thenReturn(expectedDeviceId)\n+ `when`(corestate.deviceInfo.carrier).thenReturn(\"\")\n+ `when`(corestate.deviceInfo.countryCode).thenReturn(\"\")\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+ val captorEventType = ArgumentCaptor.forClass(Int::class.java)\n+\n+ // Act\n+ eventQueueManager.pushBasicProfile(null)\n+\n+ // Assert\n+ verify(eventQueueManager).queueEvent(ArgumentMatchers.any(), captor.capture(), captorEventType.capture())\n+ val actualProfile = captor.value[\"profile\"] as JSONObject\n+ assertNull(actualProfile.optString(\"Carrier\", null))\n+ assertNull(actualProfile.optString(\"cc\", null))\n+ }\n+\n+ @Test\n+ fun test_pushBasicProfile_when_input_is_not_null() {\n+ mockStatic(IdentityRepoFactory::class.java).use {\n+ val mockIdentityRepo = mock(IdentityRepo::class.java)\n+ `when`(\n+ IdentityRepoFactory.getRepo(\n+ application,\n+ corestate.config,\n+ corestate.deviceInfo,\n+ corestate.validationResultStack\n+ )\n+ ).thenReturn(mockIdentityRepo)\n+\n+ // Arrange\n+ doReturn(null).`when`(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(), ArgumentMatchers.anyInt()\n+ )\n+\n+ val expectedDeviceId = \"device_12345\"\n+\n+ `when`(corestate.deviceInfo.deviceID).thenReturn(expectedDeviceId)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+ val captorEventType = ArgumentCaptor.forClass(Int::class.java)\n+\n+ val inputJson = JSONObject()\n+ val subInputJson = JSONObject()\n+ subInputJson.put(\"age\", 70)\n+ inputJson.put(\"name\", \"abc\")\n+ inputJson.put(\"details\", subInputJson)\n+\n+ // Act\n+ eventQueueManager.pushBasicProfile(inputJson)\n+\n+ // Assert\n+ verify(eventQueueManager).queueEvent(ArgumentMatchers.any(), captor.capture(), captorEventType.capture())\n+ val actualProfile = captor.value[\"profile\"] as JSONObject\n+ val actualDetails = actualProfile[\"details\"] as JSONObject\n+\n+ assertEquals(\"abc\", actualProfile[\"name\"])\n+ assertEquals(70, actualDetails[\"age\"])\n+ }\n+ }\n+\n+ @Test\n+ fun test_pushBasicProfile_when_key_is_profile_identifier() {\n+ mockStatic(IdentityRepoFactory::class.java).use {\n+ val mockIdentityRepo = mock(IdentityRepo::class.java)\n+ val mockLoginInfoProvider = mock(LoginInfoProvider::class.java)\n+ `when`(\n+ IdentityRepoFactory.getRepo(\n+ application,\n+ corestate.config,\n+ corestate.deviceInfo,\n+ corestate.validationResultStack\n+ )\n+ ).thenReturn(mockIdentityRepo)\n+\n+ // Arrange\n+ doReturn(null).`when`(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(), ArgumentMatchers.anyInt()\n+ )\n+\n+ val expectedDeviceId = \"device_12345\"\n+\n+ `when`(corestate.deviceInfo.deviceID).thenReturn(expectedDeviceId)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+ val captorEventType = ArgumentCaptor.forClass(Int::class.java)\n+\n+ val inputJson = JSONObject()\n+ val subInputJson = JSONObject()\n+ subInputJson.put(\"age\", 70)\n+ inputJson.put(\"name\", \"abc\")\n+ inputJson.put(\"details\", subInputJson)\n+\n+ `when`(eventQueueManager.loginInfoProvider).thenReturn(mockLoginInfoProvider)\n+ `when`(mockIdentityRepo.hasIdentity(\"name\")).thenReturn(true)\n+\n+ // Act\n+ eventQueueManager.pushBasicProfile(inputJson)\n+\n+ // Assert\n+ verify(mockLoginInfoProvider).cacheGUIDForIdentifier(expectedDeviceId, \"name\", \"abc\")\n+ verify(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ captor.capture(),\n+ captorEventType.capture()\n+ )\n+ val actualProfile = captor.value[\"profile\"] as JSONObject\n+ val actualDetails = actualProfile[\"details\"] as JSONObject\n+\n+ assertEquals(\"abc\", actualProfile[\"name\"])\n+ assertEquals(70, actualDetails[\"age\"])\n+ }\n+ }\n+\n+ @Test\n+ fun test_processEvent_when_type_is_page_event() {\n+ // Arrange\n+ val expectedScreenName = \"Home Page\"\n+ val expectedSessionId = 9898\n+ val expectedEpoch = 5000\n+ val expectedIsFirstSession = true\n+ val expectedLastSessionLength = 3600\n+ val expectedGeofenceSDKVersion = 10\n+\n+ corestate.coreMetaData.setCurrentScreenName(expectedScreenName)\n+ corestate.coreMetaData.currentSessionId = expectedSessionId\n+ corestate.coreMetaData.isFirstSession = expectedIsFirstSession\n+ corestate.coreMetaData.lastSessionLength = expectedLastSessionLength\n+ corestate.coreMetaData.geofenceSDKVersion = expectedGeofenceSDKVersion\n+ corestate.coreMetaData.isLocationForGeofence = true\n+ CoreMetaData.setActivityCount(0)\n+ val actualEvent = JSONObject()\n+\n+ `when`(eventQueueManager.now).thenReturn(expectedEpoch)\n+ doNothing().`when`(eventQueueManager).scheduleQueueFlush(application)\n+\n+ // Act\n+ eventQueueManager.processEvent(application, actualEvent, Constants.PAGE_EVENT)\n+\n+ // Assert\n+\n+ // assert following mappings are present in json\n+ assertEquals(1, CoreMetaData.getActivityCount())\n+ assertEquals(expectedScreenName, actualEvent[\"n\"])\n+ assertEquals(expectedSessionId, actualEvent[\"s\"])\n+ assertEquals(1, actualEvent[\"pg\"])\n+ assertEquals(\"page\", actualEvent[\"type\"])\n+ assertEquals(expectedEpoch, actualEvent[\"ep\"])\n+ assertEquals(expectedIsFirstSession, actualEvent[\"f\"])\n+ assertEquals(expectedLastSessionLength, actualEvent[\"lsl\"])\n+\n+ // assert following values are not modified\n+ assertEquals(expectedGeofenceSDKVersion, corestate.coreMetaData.geofenceSDKVersion)\n+ assertFalse(corestate.coreMetaData.isBgPing)\n+ assertTrue(corestate.coreMetaData.isLocationForGeofence)\n+\n+ // assert following keys are absent in json\n+ assertNull(actualEvent.opt(Constants.ERROR_KEY))\n+ assertNull(actualEvent.opt(\"pai\"))\n+ assertNull(actualEvent.opt(\"mc\"))\n+ assertNull(actualEvent.opt(\"nt\"))\n+ assertNull(actualEvent.opt(\"gf\"))\n+ assertNull(actualEvent.opt(\"gfSDKVersion\"))\n+\n+ // assert following methods called\n+ verify(corestate.localDataStore).setDataSyncFlag(actualEvent)\n+ verify(corestate.databaseManager).queueEventToDB(application, actualEvent, Constants.PAGE_EVENT)\n+ verify(corestate.localDataStore, never()).persistEvent(application, actualEvent, Constants.PAGE_EVENT)\n+ verify(eventQueueManager).scheduleQueueFlush(application)\n+ }\n+\n+ @Test\n+ fun test_processEvent_when_type_is_ping_event() {\n+\n+ mockStatic(Utils::class.java).use {\n+\n+ // Arrange\n+ val validationResult = ValidationResult()\n+ validationResult.errorDesc = \"Fire in the hall\"\n+ validationResult.errorCode = 999\n+\n+ corestate.validationResultStack.pushValidationResult(validationResult)\n+\n+ val expectedSessionId = 9898\n+ val expectedEpoch = 5000\n+ val expectedIsFirstSession = true\n+ val expectedLastSessionLength = 3600\n+ val expectedGeofenceSDKVersion = 0\n+ val expectedMemoryConsumption = 100000L\n+ val expectedNetworkType = \"4G\"\n+ val expectedActivityCount = 10\n+\n+ corestate.coreMetaData.currentSessionId = expectedSessionId\n+ corestate.coreMetaData.isFirstSession = expectedIsFirstSession\n+ corestate.coreMetaData.lastSessionLength = expectedLastSessionLength\n+ corestate.coreMetaData.geofenceSDKVersion = expectedGeofenceSDKVersion\n+ corestate.coreMetaData.isLocationForGeofence = true\n+ CoreMetaData.setActivityCount(expectedActivityCount)\n+\n+ `when`(Utils.getMemoryConsumption()).thenReturn(expectedMemoryConsumption)\n+ `when`(Utils.getCurrentNetworkType(application)).thenReturn(expectedNetworkType)\n+ `when`(eventQueueManager.now).thenReturn(expectedEpoch)\n+ doNothing().`when`(eventQueueManager).scheduleQueueFlush(application)\n+\n+ val actualEvent = JSONObject()\n+ actualEvent.put(\"bk\", 1)\n+\n+ `when`(eventQueueManager.now).thenReturn(expectedEpoch)\n+ doNothing().`when`(eventQueueManager).scheduleQueueFlush(application)\n+\n+ // Act\n+ eventQueueManager.processEvent(application, actualEvent, Constants.PING_EVENT)\n+\n+ // Assert\n+\n+ // assert mapping are as expected\n+ assertEquals(expectedMemoryConsumption, actualEvent[\"mc\"])\n+ assertEquals(expectedNetworkType, actualEvent[\"nt\"])\n+ assertTrue(corestate.coreMetaData.isBgPing)\n+\n+ // assert below mapping is removed\n+ assertNull(actualEvent.opt(\"bk\"))\n+\n+ // assert following keys are absent in json\n+ assertNull(actualEvent.opt(\"n\"))\n+\n+ // assert validation error present\n+ assertEquals(validationResult.errorCode, actualEvent.getJSONObject(Constants.ERROR_KEY)[\"c\"])\n+ assertEquals(validationResult.errorDesc, actualEvent.getJSONObject(Constants.ERROR_KEY)[\"d\"])\n+\n+ // ---------\n+\n+ // assert following mappings are present in json\n+ assertEquals(expectedActivityCount, CoreMetaData.getActivityCount())\n+ assertEquals(expectedSessionId, actualEvent[\"s\"])\n+ assertEquals(expectedActivityCount, actualEvent[\"pg\"])\n+ assertEquals(\"ping\", actualEvent[\"type\"])\n+ assertEquals(expectedEpoch, actualEvent[\"ep\"])\n+ assertEquals(expectedIsFirstSession, actualEvent[\"f\"])\n+ assertEquals(expectedLastSessionLength, actualEvent[\"lsl\"])\n+ assertEquals(true, actualEvent[\"gf\"])\n+ assertEquals(expectedGeofenceSDKVersion, actualEvent[\"gfSDKVersion\"])\n+\n+ // assert following values are modified\n+ assertEquals(expectedGeofenceSDKVersion, corestate.coreMetaData.geofenceSDKVersion)\n+\n+ assertFalse(corestate.coreMetaData.isLocationForGeofence)\n+\n+ // assert following keys are absent in json\n+ assertNull(actualEvent.opt(\"pai\"))\n+\n+ // assert following methods called\n+ verify(corestate.localDataStore).setDataSyncFlag(actualEvent)\n+ verify(corestate.databaseManager).queueEventToDB(application, actualEvent, Constants.PING_EVENT)\n+ verify(corestate.localDataStore, never()).persistEvent(application, actualEvent, Constants.PING_EVENT)\n+ verify(eventQueueManager).scheduleQueueFlush(application)\n+ }\n+ }\n+\n+ @Test\n+ fun test_processEvent_when_type_is_profile_event() {\n+\n+ val actualEvent = JSONObject()\n+\n+ eventQueueManager.processEvent(application, actualEvent, Constants.PROFILE_EVENT)\n+\n+ assertEquals(\"profile\", actualEvent[\"type\"])\n+ // assert following keys are absent in json\n+ assertNull(actualEvent.opt(\"pai\"))\n+ }\n+\n+ @Test\n+ fun test_processEvent_when_type_is_data_event() {\n+\n+ val actualEvent = JSONObject()\n+\n+ eventQueueManager.processEvent(application, actualEvent, Constants.DATA_EVENT)\n+\n+ assertEquals(\"data\", actualEvent[\"type\"])\n+ // assert following keys are absent in json\n+ assertNull(actualEvent.opt(\"pai\"))\n+ }\n+\n+ @Test\n+ fun test_processEvent_when_type_is_normal_event() {\n+\n+ val actualEvent = JSONObject()\n+ actualEvent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT)\n+\n+ eventQueueManager.processEvent(application, actualEvent, Constants.RAISED_EVENT)\n+\n+ // assert following keys are present in json\n+ assertEquals(\"event\", actualEvent[\"type\"])\n+ assertNotNull(actualEvent.opt(\"pai\"))\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockCoreState.kt",
"diff": "@@ -23,5 +23,6 @@ class MockCoreState(context: Context, cleverTapInstanceConfig: CleverTapInstance\nmainLooperHandler = Mockito.mock(MainLooperHandler::class.java)\nnetworkManager = Mockito.mock(NetworkManager::class.java)\nctLockManager = CTLockManager()\n+ localDataStore = Mockito.mock(LocalDataStore::class.java)\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for remaining methods in EventQueueManager SDK-660 |
116,621 | 15.02.2021 20:26:01 | -19,080 | d73ff1f86a391f2c9c84a63d37e6f7353f54cbb5 | Task(SDK-609):
1. merge conflicts resolved | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsFactory.java",
"diff": "@@ -4,7 +4,7 @@ import android.content.Context;\nimport com.clevertap.android.sdk.BaseAnalyticsManager;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n-import com.clevertap.android.sdk.FileUtils;\n+import com.clevertap.android.sdk.utils.FileUtils;\n/**\n* Factory class to get {@link CTFeatureFlagsController} instance for a particular configuration\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"diff": "@@ -58,6 +58,7 @@ public final class Utils {\nfinal HashMap<String, Object> map = new HashMap<>();\nfor (String s : b.keySet()) {\nfinal Object o = b.get(s);\n+\nif (o instanceof Bundle) {\nmap.putAll(convertBundleObjectToHashMap((Bundle) o));\n} else {\n@@ -193,20 +194,6 @@ public final class Utils {\n}\n}\n- /**\n- * Checks whether a particular permission is available or not.\n- *\n- * @param context The Android {@link Context}\n- * @param permission The fully qualified Android permission name\n- */\n- public static boolean hasPermission(final Context context, String permission) {\n- try {\n- return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(context, permission);\n- } catch (Throwable t) {\n- return false;\n- }\n- }\n-\npublic static boolean isActivityDead(Activity activity) {\nif (activity == null) {\nreturn true;\n@@ -281,19 +268,6 @@ public final class Utils {\nreturn bundle;\n}\n- public static HashMap<String, Object> convertBundleObjectToHashMap(Bundle b) {\n- final HashMap<String, Object> map = new HashMap<>();\n- for (String s : b.keySet()) {\n- final Object o = b.get(s);\n- if (o instanceof Bundle) {\n- map.putAll(convertBundleObjectToHashMap((Bundle) o));\n- } else {\n- map.put(s, b.get(s));\n- }\n- }\n- return map;\n- }\n-\npublic static ArrayList<String> convertJSONArrayToArrayList(JSONArray array) {\nArrayList<String> listdata = new ArrayList<>();\nif (array != null) {\n@@ -401,28 +375,6 @@ public final class Utils {\nreturn total - free;\n}\n- public static Bitmap getNotificationBitmap(String icoPath, boolean fallbackToAppIcon, final Context context)\n- throws NullPointerException {\n- // If the icon path is not specified\n- if (icoPath == null || icoPath.equals(\"\")) {\n- return fallbackToAppIcon ? getAppIcon(context) : null;\n- }\n- // Simply stream the bitmap\n- if (!icoPath.startsWith(\"http\")) {\n- icoPath = Constants.ICON_BASE_URL + \"/\" + icoPath;\n- }\n- Bitmap ic = getBitmapFromURL(icoPath);\n- return (ic != null) ? ic : ((fallbackToAppIcon) ? getAppIcon(context) : null);\n- }\n-\n- public static int getThumbnailImage(Context context, String image) {\n- if (context != null) {\n- return context.getResources().getIdentifier(image, \"drawable\", context.getPackageName());\n- } else {\n- return -1;\n- }\n- }\n-\n/**\n* Checks whether a particular permission is available or not.\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-609):
1. merge conflicts resolved |
116,621 | 15.02.2021 20:50:56 | -19,080 | 5c9a4c3dfe898108b8bdefde768d41c148474473 | Task(SDK-609):
1. Thread safety verification for FF | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -11,9 +11,7 @@ import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.Task;\n-import java.util.Collections;\nimport com.clevertap.android.sdk.utils.FileUtils;\n-import com.clevertap.android.sdk.utils.Utils;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\n@@ -25,17 +23,17 @@ public class CTFeatureFlagsController {\nfinal CleverTapInstanceConfig config;\n- private String guid;\n-\n- private boolean isInitialized = false;\n-\nfinal BaseAnalyticsManager mAnalyticsManager;\nfinal BaseCallbackManager mCallbackManager;\nfinal FileUtils mFileUtils;\n- private final Map<String, Boolean> store = Collections.synchronizedMap(new HashMap<String, Boolean>());\n+ private String guid;\n+\n+ private boolean isInitialized = false;\n+\n+ private final Map<String, Boolean> store = new HashMap<>();\nCTFeatureFlagsController(String guid, CleverTapInstanceConfig config,\nBaseCallbackManager callbackManager, BaseAnalyticsManager analyticsManager, FileUtils fileUtils) {\n@@ -77,7 +75,7 @@ public class CTFeatureFlagsController {\n* @param defaultValue - default value of the Key, in case we don't find any Feature Flag with the Key.\n* @return boolean- Value of the Feature flag.\n*/\n- public Boolean get(String key, boolean defaultValue) {\n+ public synchronized Boolean get(String key, boolean defaultValue) {\nif (!isInitialized) {\ngetConfigLogger()\n.verbose(getLogTag(), \"Controller not initialized, returning default value - \" + defaultValue);\n@@ -85,9 +83,10 @@ public class CTFeatureFlagsController {\n}\ngetConfigLogger().verbose(getLogTag(),\n\"Getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\n- Boolean value = store.get(key);\n+ Boolean value;\n+ value = store.get(key);\nif (value != null) {\n- return store.get(key);\n+ return value;\n} else {\ngetConfigLogger()\n.verbose(getLogTag(), \"Feature flag not found, returning default value - \" + defaultValue);\n@@ -104,7 +103,7 @@ public class CTFeatureFlagsController {\n*\n* @return boolean- true if initialized, else false.\n*/\n- public boolean isInitialized() {\n+ public synchronized boolean isInitialized() {\nreturn isInitialized;\n}\n@@ -133,7 +132,7 @@ public class CTFeatureFlagsController {\n* This method is internal to the CleverTap SDK.\n* Developers should not use this method\n*/\n- public void updateFeatureFlags(JSONObject jsonObject) throws JSONException {\n+ public synchronized void updateFeatureFlags(JSONObject jsonObject) throws JSONException {\nJSONArray featureFlagList = jsonObject.getJSONArray(Constants.KEY_KV);\ntry {\n@@ -192,6 +191,7 @@ public class CTFeatureFlagsController {\ntask.call(new Callable<Boolean>() {\n@Override\npublic Boolean call() {\n+ synchronized (this) {\ngetConfigLogger().verbose(getLogTag(), \"Feature flags init is called\");\nString fileName = getCachedFullPath();\ntry {\n@@ -229,6 +229,7 @@ public class CTFeatureFlagsController {\n}\nreturn true;\n}\n+ }\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -17,9 +17,7 @@ import com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.OnSuccessListener;\nimport com.clevertap.android.sdk.task.Task;\n-import java.util.Collections;\nimport com.clevertap.android.sdk.utils.FileUtils;\n-import com.clevertap.android.sdk.utils.Utils;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Iterator;\n@@ -40,15 +38,17 @@ public class CTProductConfigController {\n}\n//use lock for synchronization for read write\n- final Map<String, String> activatedConfig = Collections.synchronizedMap(new HashMap<String, String>());\n+ final Map<String, String> activatedConfig = new HashMap<>();\n+\n+ //use lock for synchronization for read write\n+ final Map<String, String> defaultConfig = new HashMap<>();\n+\n+ final FileUtils mFileUtils;\nprivate final CleverTapInstanceConfig config;\nprivate final Context context;\n- //use lock for synchronization for read write\n- final Map<String, String> defaultConfig = Collections.synchronizedMap(new HashMap<String, String>());\n-\nprivate final AtomicBoolean isFetchAndActivating = new AtomicBoolean(false);\nprivate boolean isInitialized = false;\n@@ -59,13 +59,10 @@ public class CTProductConfigController {\nprivate final CoreMetaData mCoreMetaData;\n- final FileUtils mFileUtils;\n-\nprivate final ProductConfigSettings settings;\n//use lock for synchronization for read write\n- private final Map<String, String> waitingTobeActivatedConfig = Collections\n- .synchronizedMap(new HashMap<String, String>());\n+ private final Map<String, String> waitingTobeActivatedConfig = new HashMap<>();\nCTProductConfigController(Context context, CleverTapInstanceConfig config,\nfinal BaseAnalyticsManager analyticsManager, final CoreMetaData coreMetaData,\n@@ -105,6 +102,7 @@ public class CTProductConfigController {\nsynchronized (this) {\ntry {\n//read fetched info\n+\nHashMap<String, String> toWriteValues = new HashMap<>();\nif (!waitingTobeActivatedConfig.isEmpty()) {\ntoWriteValues.putAll(waitingTobeActivatedConfig);\n@@ -119,6 +117,7 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\nactivatedConfig.putAll(toWriteValues);\n+\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n@@ -186,12 +185,10 @@ public class CTProductConfigController {\n* @return Boolean - value of the product config,if key is not present return {@link\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_BOOLEAN}\n*/\n- public Boolean getBoolean(String Key) {\n+ public synchronized Boolean getBoolean(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\nString value;\n- synchronized (this) {\nvalue = activatedConfig.get(Key);\n- }\nif (!TextUtils.isEmpty(value)) {\nreturn Boolean.parseBoolean(value);\n}\n@@ -206,13 +203,11 @@ public class CTProductConfigController {\n* @return Double - value of the product config,if key is not present return {@link\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_DOUBLE}\n*/\n- public Double getDouble(String Key) {\n+ public synchronized Double getDouble(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\n- synchronized (this) {\nvalue = activatedConfig.get(Key);\n- }\nif (!TextUtils.isEmpty(value)) {\nreturn Double.parseDouble(value);\n}\n@@ -230,7 +225,7 @@ public class CTProductConfigController {\n*\n* @return - long value of timestamp in millis.\n*/\n- public long getLastFetchTimeStampInMillis() {\n+ public synchronized long getLastFetchTimeStampInMillis() {\nreturn settings.getLastFetchTimeStampInMillis();\n}\n@@ -241,13 +236,11 @@ public class CTProductConfigController {\n* @return Long - value of the product config,if key is not present return {@link\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_LONG}\n*/\n- public Long getLong(String Key) {\n+ public synchronized Long getLong(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\n- synchronized (this) {\nvalue = activatedConfig.get(Key);\n- }\nif (!TextUtils.isEmpty(value)) {\nreturn Long.parseLong(value);\n}\n@@ -271,12 +264,10 @@ public class CTProductConfigController {\n* @return String - value of the product config,if key is not present return {@link\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_STRING}\n*/\n- public String getString(String Key) {\n+ public synchronized String getString(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\nString value;\n- synchronized (this) {\nvalue = activatedConfig.get(Key);\n- }\nif (!TextUtils.isEmpty(value)) {\nreturn value;\n}\n@@ -284,7 +275,7 @@ public class CTProductConfigController {\nreturn DEFAULT_VALUE_FOR_STRING;\n}\n- public boolean isInitialized() {\n+ public synchronized boolean isInitialized() {\nreturn isInitialized;\n}\n@@ -295,10 +286,6 @@ public class CTProductConfigController {\npublic void onFetchFailed() {\nif (isFetchAndActivating.get()) {\nisFetchAndActivating.set(false);\n- // apply last loaded config if response fails.\n- if (activatedConfig.isEmpty()) {\n- activate();\n- }\n}\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Fetch Failed\");\n}\n@@ -384,17 +371,17 @@ public class CTProductConfigController {\nsynchronized (this) {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n\"Product Config: setDefaults Completed with: \" + defaultConfig);\n- }\ninitAsync();\n}\n+ }\n}).call(new Callable<Void>() {\n@Override\npublic Void call() {\nsynchronized (this) {\ndefaultConfig.putAll(new DefaultXmlParser().getDefaultsFromXml(context, resourceID));\n- }\nreturn null;\n}\n+ }\n});\n}\n@@ -411,23 +398,23 @@ public class CTProductConfigController {\nsynchronized (this) {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n\"Product Config: setDefaults Completed with: \" + defaultConfig);\n- }\ninitAsync();\n}\n+ }\n}).call(new Callable<Void>() {\n@Override\npublic Void call() {\n+ synchronized (this) {\nif (map != null && !map.isEmpty()) {\n+\nfor (Map.Entry<String, Object> entry : map.entrySet()) {\nif (entry != null) {\nString key = entry.getKey();\nObject value = entry.getValue();\ntry {\nif (!TextUtils.isEmpty(key) && ProductConfigUtil.isSupportedDataType(value)) {\n- synchronized (this) {\ndefaultConfig.put(key, String.valueOf(value));\n}\n- }\n} catch (Exception e) {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n\"Product Config: setDefaults Failed for Key: \" + key + \" with Error: \" + e\n@@ -438,6 +425,7 @@ public class CTProductConfigController {\n}\nreturn null;\n}\n+ }\n});\n}\n@@ -649,6 +637,7 @@ public class CTProductConfigController {\n\"Loaded configs ready to be applied: \" + waitingTobeActivatedConfig);\nsettings.loadSettings(mFileUtils);\nisInitialized = true;\n+\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n@@ -682,12 +671,10 @@ public class CTProductConfigController {\n}\n}\n- private void parseFetchedResponse(JSONObject jsonObject) {\n+ private synchronized void parseFetchedResponse(JSONObject jsonObject) {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\n- synchronized (this) {\nwaitingTobeActivatedConfig.clear();\nwaitingTobeActivatedConfig.putAll(map);\n- }\nconfig.getLogger()\n.verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Fetched response:\" + jsonObject);\nInteger timestamp = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"diff": "@@ -5,10 +5,10 @@ import com.clevertap.android.sdk.BaseCallbackManager\nimport com.clevertap.android.sdk.CallbackManager\nimport com.clevertap.android.sdk.CoreMetaData\nimport com.clevertap.android.sdk.DeviceInfo\n-import com.clevertap.android.sdk.FileUtils\nimport com.clevertap.android.sdk.MockDeviceInfo\nimport com.clevertap.android.sdk.task.CTExecutorFactory\nimport com.clevertap.android.sdk.task.MockCTExecutors\n+import com.clevertap.android.sdk.utils.FileUtils\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.junit.*\nimport org.junit.runner.*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-609):
1. Thread safety verification for FF |
116,621 | 16.02.2021 12:31:45 | -19,080 | 39c4aa2494041c79b623ddeb87ab2f7e2f6a937e | task(SDK-609):Added FeatureFlagTest.kt | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -10,6 +10,7 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n+import com.clevertap.android.sdk.task.OnSuccessListener;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.FileUtils;\nimport java.util.HashMap;\n@@ -27,9 +28,9 @@ public class CTFeatureFlagsController {\nfinal BaseCallbackManager mCallbackManager;\n- final FileUtils mFileUtils;\n+ FileUtils mFileUtils;\n- private String guid;\n+ String guid;\nprivate boolean isInitialized = false;\n@@ -163,15 +164,15 @@ public class CTFeatureFlagsController {\n}\n}\n- private String getCachedDirName() {\n+ String getCachedDirName() {\nreturn CTFeatureFlagConstants.DIR_FEATURE_FLAG + \"_\" + config.getAccountId() + \"_\" + guid;\n}\n- private String getCachedFileName() {\n+ String getCachedFileName() {\nreturn CTFeatureFlagConstants.CACHED_FILE_NAME;\n}\n- private String getCachedFullPath() {\n+ String getCachedFullPath() {\nreturn getCachedDirName() + \"/\" + getCachedFileName();\n}\n@@ -183,11 +184,17 @@ public class CTFeatureFlagsController {\nreturn config.getAccountId() + \"[Feature Flag]\";\n}\n- private synchronized void init() {\n+ synchronized void init() {\nif (TextUtils.isEmpty(guid)) {\nreturn;\n}\nTask<Boolean> task = CTExecutorFactory.getInstance(config).ioTask();\n+ task.addOnSuccessListener(new OnSuccessListener<Boolean>() {\n+ @Override\n+ public void onSuccess(final Boolean init) {\n+ isInitialized = init;\n+ }\n+ });\ntask.call(new Callable<Boolean>() {\n@Override\npublic Boolean call() {\n@@ -217,7 +224,6 @@ public class CTFeatureFlagsController {\n}\ngetConfigLogger().verbose(getLogTag(), \"Feature flags initialized from file \" + fileName +\n\" with configs \" + store);\n- isInitialized = true;\n} else {\ngetConfigLogger().verbose(getLogTag(), \"Feature flags file is empty-\" + fileName);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.utils;\nimport android.content.Context;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -16,11 +17,11 @@ import org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY_GROUP)\npublic class FileUtils {\n- private CleverTapInstanceConfig mConfig;\n+ private final CleverTapInstanceConfig mConfig;\n- private Context mContext;\n+ private final Context mContext;\n- public FileUtils(final Context context, final CleverTapInstanceConfig config) {\n+ public FileUtils(@NonNull final Context context, @NonNull final CleverTapInstanceConfig config) {\nmContext = context;\nmConfig = config;\n}\n@@ -103,14 +104,6 @@ public class FileUtils {\nreturn content;\n}\n- public void setConfig(final CleverTapInstanceConfig config) {\n- mConfig = config;\n- }\n-\n- public void setContext(final Context context) {\n- mContext = context;\n- }\n-\npublic void writeJsonToFile(String dirName,\nString fileName, JSONObject jsonObject) {\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.featureFlags\nimport com.clevertap.android.sdk.BaseAnalyticsManager\nimport com.clevertap.android.sdk.BaseCallbackManager\n+import com.clevertap.android.sdk.CTFeatureFlagsListener\nimport com.clevertap.android.sdk.CallbackManager\nimport com.clevertap.android.sdk.CoreMetaData\nimport com.clevertap.android.sdk.DeviceInfo\n@@ -24,6 +25,7 @@ class FeatureFlagTest : BaseTestCase() {\nprivate lateinit var callbackManager: BaseCallbackManager\nprivate lateinit var deviceInfo: DeviceInfo\nprivate lateinit var fileUtils: FileUtils\n+ private lateinit var featureFlagsListener: CTFeatureFlagsListener\nprivate val guid = \"1212121212\"\n@Before\n@@ -36,9 +38,9 @@ class FeatureFlagTest : BaseTestCase() {\nanalyticsManager = Mockito.mock(BaseAnalyticsManager::class.java)\ndeviceInfo = MockDeviceInfo(application, cleverTapInstanceConfig, guid, coreMetaData)\ncallbackManager = CallbackManager(cleverTapInstanceConfig, deviceInfo)\n- fileUtils = Mockito.mock(FileUtils::class.java)\n- fileUtils.setConfig(cleverTapInstanceConfig)\n- fileUtils.setContext(application)\n+ fileUtils = Mockito.spy(FileUtils(application, cleverTapInstanceConfig))\n+ featureFlagsListener = Mockito.mock(CTFeatureFlagsListener::class.java)\n+ callbackManager.featureFlagListener = featureFlagsListener\nmCTFeatureFlagsController = CTFeatureFlagsController(\nguid,\ncleverTapInstanceConfig,\n@@ -48,6 +50,73 @@ class FeatureFlagTest : BaseTestCase() {\n}\n}\n+ @Test\n+ fun when_Empty_Feature_Flag_Config_Then_Init_Return_True() {\n+ Mockito.mockStatic(CTExecutorFactory::class.java).use {\n+ Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = Mockito.spy(mCTFeatureFlagsController)\n+ Assert.assertTrue(controller.isInitialized)\n+ }\n+ }\n+\n+ @Test\n+ fun when_Non_Empty_Feature_Flag_Config_Then_Init_Return_True() {\n+ Mockito.mockStatic(CTExecutorFactory::class.java).use {\n+ Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ .thenReturn(MockFFResponse().getResponseJSON().toString())\n+ val controller = CTFeatureFlagsController(\n+ guid,\n+ cleverTapInstanceConfig,\n+ callbackManager,\n+ analyticsManager, fileUtils\n+ )\n+ Assert.assertTrue(controller.isInitialized)\n+ }\n+ }\n+\n+ @Test\n+ fun when_Non_Empty_Feature_Flag_Config_Read_Exception_Then_Init_Return_True() {\n+ Mockito.mockStatic(CTExecutorFactory::class.java).use {\n+ Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ .thenThrow(RuntimeException(\"Something Went Wrong\"))\n+ val controller = CTFeatureFlagsController(\n+ guid,\n+ cleverTapInstanceConfig,\n+ callbackManager,\n+ analyticsManager, fileUtils\n+ )\n+ Assert.assertFalse(controller.isInitialized)\n+ }\n+ }\n+\n+ @Test\n+ fun when_Feature_Flag_Response() {\n+ Mockito.mockStatic(CTExecutorFactory::class.java).use {\n+ Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ .thenThrow(RuntimeException(\"Something Went Wrong\"))\n+ val jsonObject = MockFFResponse().getResponseJSON()\n+ mCTFeatureFlagsController.updateFeatureFlags(jsonObject)\n+ Mockito.verify(featureFlagsListener).featureFlagsUpdated()\n+ Mockito.verify(\n+ fileUtils\n+ ).writeJsonToFile(\n+ mCTFeatureFlagsController.cachedDirName,\n+ mCTFeatureFlagsController.cachedFileName,\n+ jsonObject\n+ )\n+\n+ Assert.assertTrue(mCTFeatureFlagsController.get(\"feature_A\", false))\n+ Assert.assertFalse(mCTFeatureFlagsController.get(\"feature_B\", true))\n+ Assert.assertFalse(mCTFeatureFlagsController.get(\"feature_C\", true))\n+ Assert.assertTrue(mCTFeatureFlagsController.get(\"feature_D\", false))\n+ Assert.assertTrue(mCTFeatureFlagsController.get(\"feature_E\", true))\n+ Assert.assertFalse(mCTFeatureFlagsController.get(\"feature_F\", false))\n+ }\n+ }\n+\n@Test\nfun test_Fetch_Ff() {\nMockito.mockStatic(CTExecutorFactory::class.java).use {\n@@ -56,4 +125,16 @@ class FeatureFlagTest : BaseTestCase() {\nMockito.verify(analyticsManager).fetchFeatureFlags()\n}\n}\n+\n+ @Test\n+ fun test_resetWithGuid() {\n+ Mockito.mockStatic(CTExecutorFactory::class.java).use {\n+ Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val guid = \"121u3203u129\"\n+ val controller = Mockito.spy(mCTFeatureFlagsController)\n+ controller.resetWithGuid(guid)\n+ Assert.assertEquals(guid, controller.guid)\n+ Mockito.verify(controller).init()\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/MockFFResponse.kt",
"diff": "+package com.clevertap.android.sdk.featureFlags\n+\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_KEY\n+import com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_VALUE\n+import org.json.JSONArray\n+import org.json.JSONObject\n+\n+class MockFFResponse {\n+\n+ fun getFetchedFFConfig(): HashMap<String, Any> {\n+ val fetchedConfig: HashMap<String, Any> = HashMap()\n+ fetchedConfig.put(\"feature_A\", true)\n+ fetchedConfig.put(\"feature_B\", false)\n+ fetchedConfig.put(\"feature_C\", false)\n+ fetchedConfig.put(\"feature_D\", true)\n+ return fetchedConfig\n+ }\n+\n+ fun getResponseJSON(): JSONObject {\n+ val response = JSONObject()\n+ val array = JSONArray()\n+ for (entry in getFetchedFFConfig()) {\n+ val jsonObject = JSONObject()\n+ jsonObject.put(PRODUCT_CONFIG_JSON_KEY_FOR_KEY, entry.key)\n+ jsonObject.put(PRODUCT_CONFIG_JSON_KEY_FOR_VALUE, entry.value)\n+ array.put(jsonObject)\n+ }\n+ response.put(Constants.KEY_KV, array)\n+ return response\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -10,7 +10,6 @@ import com.clevertap.android.sdk.MockDeviceInfo\nimport com.clevertap.android.sdk.task.CTExecutorFactory\nimport com.clevertap.android.sdk.task.MockCTExecutors\nimport com.clevertap.android.sdk.utils.FileUtils\n-import com.clevertap.android.sdk.utils.Utils\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.*\n@@ -52,9 +51,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\ncallbackManager.productConfigListener = listener\nproductConfigSettings = mock(ProductConfigSettings::class.java)\n`when`(productConfigSettings.guid).thenReturn(guid)\n- fileUtils = mock(FileUtils::class.java)\n- fileUtils.setConfig(cleverTapInstanceConfig)\n- fileUtils.setContext(application)\n+ fileUtils = spy(FileUtils(application,cleverTapInstanceConfig))\nmProductConfigController = CTProductConfigController(\napplication,\ncleverTapInstanceConfig,\n@@ -70,7 +67,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\n@Test\nfun testInit() {\n- Assert.assertEquals(mProductConfigController.isInitialized, true)\n+ Assert.assertTrue(mProductConfigController.isInitialized)\n}\n@Test\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Added FeatureFlagTest.kt |
116,621 | 16.02.2021 13:10:25 | -19,080 | b1e34f928b239d04829a04435fa0651d1d7591b2 | task(SDK-609):test case naming added | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"diff": "@@ -51,7 +51,7 @@ class FeatureFlagTest : BaseTestCase() {\n}\n@Test\n- fun when_Empty_Feature_Flag_Config_Then_Init_Return_True() {\n+ fun test_constructor_whenNoSavedFF_returnInitTrue() {\nMockito.mockStatic(CTExecutorFactory::class.java).use {\nMockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nval controller = Mockito.spy(mCTFeatureFlagsController)\n@@ -92,7 +92,7 @@ class FeatureFlagTest : BaseTestCase() {\n}\n@Test\n- fun when_Feature_Flag_Response() {\n+ fun when_Feature_Flag_Response_Success() {\nMockito.mockStatic(CTExecutorFactory::class.java).use {\nMockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nMockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n@@ -118,7 +118,7 @@ class FeatureFlagTest : BaseTestCase() {\n}\n@Test\n- fun test_Fetch_Ff() {\n+ fun test_Fetch_FF_Success() {\nMockito.mockStatic(CTExecutorFactory::class.java).use {\nMockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nmCTFeatureFlagsController.fetchFeatureFlags()\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"diff": "@@ -14,6 +14,13 @@ import org.robolectric.annotation.Config\n@RunWith(\nAndroidJUnit4::class\n)\n+/**\n+ * Naming Convention for Testing\n+ * 1. Classes : <Name of Class to be Test> + Test.kt\n+ * e.g CTProductConfigControllerTest.kt for CTProductConfigController.java\n+ * 2. Methods : test_<methodName>_<inputCondition>_<expectedBehavior>\n+ * e.g test_constructor_whenFeatureFlagIsNotSave_InitShouldReturnTrue\n+ */\nabstract class BaseTestCase {\nprotected lateinit var application: TestApplication\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):test case naming added |
116,612 | 16.02.2021 16:17:53 | -19,080 | 53f2d2392a4a583c38f5a3831da6f6184f01464c | task(TDD): refactor fetching current system time logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -837,7 +837,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\nif (CoreMetaData.getInitialAppEnteredForegroundTime() <= 0) {\n- int initialAppEnteredForegroundTime = (int) System.currentTimeMillis() / 1000;\n+ int initialAppEnteredForegroundTime = Utils.getNow();\nCoreMetaData.setInitialAppEnteredForegroundTime(initialAppEnteredForegroundTime);\n}\n@@ -960,7 +960,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n});\n- int now = (int) System.currentTimeMillis() / 1000;\n+ int now = Utils.getNow();\nif (now - CoreMetaData.getInitialAppEnteredForegroundTime() > 5) {\nthis.mCoreState.getConfig().setCreatedPostAppLaunch();\n}\n@@ -1566,7 +1566,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn -1;\n}\n- int now = (int) (System.currentTimeMillis() / 1000);\n+ int now = Utils.getNow();\nreturn now - currentSession;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"diff": "@@ -411,6 +411,10 @@ public final class Utils {\nreturn true;\n}\n+ public static int getNow() {\n+ return (int) (System.currentTimeMillis() / 1000);\n+ }\n+\n/**\n* Method to check whether app has ExoPlayer dependencies\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "package com.clevertap.android.sdk\nimport android.location.Location\n+import com.clevertap.android.sdk.utils.Utils\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.*\n@@ -19,9 +20,11 @@ class CleverTapAPITest : BaseTestCase() {\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n+ mockStatic(CleverTapFactory::class.java).use {\ncorestate = MockCoreState(application, cleverTapInstanceConfig)\ncorestate.postAsyncSafelyHandler = MockPostAsyncSafelyHandler(cleverTapInstanceConfig)\n}\n+ }\n/* @Test\nfun testActivity() {\n@@ -36,10 +39,11 @@ class CleverTapAPITest : BaseTestCase() {\nfun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_greater_than_5_secs() {\nmockStatic(CleverTapFactory::class.java).use {\n+ mockStatic(Utils::class.java).use {\n// Arrange\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\n-\n+ `when`(Utils.getNow()).thenReturn(Int.MAX_VALUE)\nCoreMetaData.setInitialAppEnteredForegroundTime(0)\n@@ -57,14 +61,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(cleverTapInstanceConfig.toJSONString(), actualConfig)\n}\n}\n+ }\n@Test\nfun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_less_than_5_secs() {\n-\n+ mockStatic(Utils::class.java).use {\nmockStatic(CleverTapFactory::class.java).use {\n// Arrange\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\n+ `when`(Utils.getNow()).thenReturn(0)\nCoreMetaData.setInitialAppEnteredForegroundTime(Int.MAX_VALUE)\n@@ -81,6 +87,7 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(cleverTapInstanceConfig.toJSONString(), string)\n}\n}\n+ }\n@Test\nfun test_setLocationForGeofences() {\n@@ -148,6 +155,11 @@ class CleverTapAPITest : BaseTestCase() {\n@Test\nfun test_pushGeoFenceExitedEvent() {\nmockStatic(CleverTapFactory::class.java).use {\n+ val argumentCaptor =\n+ ArgumentCaptor.forClass(\n+ JSONObject::class.java\n+ )\n+\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\ncleverTapAPI = CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n@@ -155,10 +167,6 @@ class CleverTapAPITest : BaseTestCase() {\nval expectedJson = JSONObject(\"{\\\"key\\\":\\\"value\\\"}\")\ncleverTapAPI.pushGeoFenceExitedEvent(expectedJson)\n- val argumentCaptor =\n- ArgumentCaptor.forClass(\n- JSONObject::class.java\n- )\nverify(corestate.analyticsManager).raiseEventForGeofences(\nArgumentMatchers.anyString(), argumentCaptor.capture()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): refactor fetching current system time logic SDK-660 |
116,612 | 18.02.2021 14:59:53 | -19,080 | a8c69e8ccba52066e7b6f3cd56d10c5cc43d70ea | task(TDD): add unit tests for changeCredentials() in CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -89,7 +89,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate static int debugLevel = CleverTapAPI.LogLevel.INFO.intValue();\n- private static CleverTapInstanceConfig defaultConfig;\n+ static CleverTapInstanceConfig defaultConfig;\npublic static HashMap<String, CleverTapAPI> getInstances() {\nreturn instances;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -199,6 +199,36 @@ class CleverTapAPITest : BaseTestCase() {\n}\n}\n+ @Test\n+ fun test_changeCredentials_whenDefaultConfigNotNull_credentialsMustNotChange() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ CleverTapAPI.getDefaultInstance(application)\n+ CleverTapAPI.changeCredentials(\"acct123\", \"token123\", \"eu\")\n+ val instance = ManifestInfo.getInstance(application)\n+ assertNotEquals(\"acct123\", instance.accountId)\n+ assertNotEquals(\"token123\", instance.acountToken)\n+ assertNotEquals(\"eu\", instance.accountRegion)\n+ }\n+ }\n+\n+ @Test\n+ fun test_changeCredentials_whenDefaultConfigNull_credentialsMustChange() {\n+ CleverTapAPI.defaultConfig = null\n+ CleverTapAPI.changeCredentials(\"acct123\", \"token123\", \"eu\")\n+ val instance = ManifestInfo.getInstance(application)\n+ assertEquals(\"acct123\", instance.accountId)\n+ assertEquals(\"token123\", instance.acountToken)\n+ assertEquals(\"eu\", instance.accountRegion)\n+ }\n+\n/* @Test\nfun testPushDeepLink(){\n// Arrange\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for changeCredentials() in CleverTapAPI SDK-660 |
116,621 | 18.02.2021 16:25:09 | -19,080 | 89e37177f9dc3bc52ab815d55a5490929156b49e | task(SDK-670):
1. Added crash fix for Product Config concurrency issue. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -38,10 +38,10 @@ public class CTProductConfigController {\n}\n//use lock for synchronization for read write\n- final Map<String, String> activatedConfig = new HashMap<>();\n+ final Map<String, String> activatedConfigs = new HashMap<>();\n//use lock for synchronization for read write\n- final Map<String, String> defaultConfig = new HashMap<>();\n+ final Map<String, String> defaultConfigs = new HashMap<>();\nfinal FileUtils mFileUtils;\n@@ -90,12 +90,8 @@ public class CTProductConfigController {\ntask.addOnSuccessListener(new OnSuccessListener<Void>() {\n@Override\npublic void onSuccess(final Void result) {\n- synchronized (this) {\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Activated successfully with configs: \" + activatedConfig);\nsendCallback(PROCESSING_STATE.ACTIVATED);\n}\n- }\n}).call(new Callable<Void>() {\n@Override\npublic Void call() {\n@@ -111,13 +107,14 @@ public class CTProductConfigController {\ntoWriteValues = getStoredValues(getActivatedFullPath());\n}\n- activatedConfig.clear();\n+ activatedConfigs.clear();\n//apply default config first\n- if (defaultConfig != null && !defaultConfig.isEmpty()) {\n- activatedConfig.putAll(defaultConfig);\n+ if (!defaultConfigs.isEmpty()) {\n+ activatedConfigs.putAll(defaultConfigs);\n}\n- activatedConfig.putAll(toWriteValues);\n-\n+ activatedConfigs.putAll(toWriteValues);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Activated successfully with configs: \" + activatedConfigs);\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n@@ -188,7 +185,7 @@ public class CTProductConfigController {\npublic synchronized Boolean getBoolean(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\nString value;\n- value = activatedConfig.get(Key);\n+ value = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\nreturn Boolean.parseBoolean(value);\n}\n@@ -207,7 +204,7 @@ public class CTProductConfigController {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\n- value = activatedConfig.get(Key);\n+ value = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\nreturn Double.parseDouble(value);\n}\n@@ -240,7 +237,7 @@ public class CTProductConfigController {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\n- value = activatedConfig.get(Key);\n+ value = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\nreturn Long.parseLong(value);\n}\n@@ -267,7 +264,7 @@ public class CTProductConfigController {\npublic synchronized String getString(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\nString value;\n- value = activatedConfig.get(Key);\n+ value = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\nreturn value;\n}\n@@ -339,8 +336,8 @@ public class CTProductConfigController {\n*/\npublic void reset() {\nsynchronized (this) {\n- defaultConfig.clear();\n- activatedConfig.clear();\n+ defaultConfigs.clear();\n+ activatedConfigs.clear();\neraseStoredConfigFiles();\nsettings.initDefaults();\n}\n@@ -368,17 +365,15 @@ public class CTProductConfigController {\ntask.addOnSuccessListener(new OnSuccessListener<Void>() {\n@Override\npublic void onSuccess(final Void aVoid) {\n- synchronized (this) {\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n- }\n}).call(new Callable<Void>() {\n@Override\npublic Void call() {\nsynchronized (this) {\n- defaultConfig.putAll(new DefaultXmlParser().getDefaultsFromXml(context, resourceID));\n+ defaultConfigs.putAll(new DefaultXmlParser().getDefaultsFromXml(context, resourceID));\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Product Config: setDefaults Completed with: \" + defaultConfigs);\nreturn null;\n}\n}\n@@ -395,12 +390,8 @@ public class CTProductConfigController {\ntask.addOnSuccessListener(new OnSuccessListener<Void>() {\n@Override\npublic void onSuccess(final Void aVoid) {\n- synchronized (this) {\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n- }\n}).call(new Callable<Void>() {\n@Override\npublic Void call() {\n@@ -413,7 +404,7 @@ public class CTProductConfigController {\nObject value = entry.getValue();\ntry {\nif (!TextUtils.isEmpty(key) && ProductConfigUtil.isSupportedDataType(value)) {\n- defaultConfig.put(key, String.valueOf(value));\n+ defaultConfigs.put(key, String.valueOf(value));\n}\n} catch (Exception e) {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n@@ -423,6 +414,8 @@ public class CTProductConfigController {\n}\n}\n}\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Product Config: setDefaults Completed with: \" + defaultConfigs);\nreturn null;\n}\n}\n@@ -626,8 +619,8 @@ public class CTProductConfigController {\nsynchronized (this) {\ntry {\n//apply defaults\n- if (!defaultConfig.isEmpty()) {\n- activatedConfig.putAll(defaultConfig);\n+ if (!defaultConfigs.isEmpty()) {\n+ activatedConfigs.putAll(defaultConfigs);\n}\nHashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\nif (!storedConfig.isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -118,8 +118,8 @@ class CTProductConfigControllerTest : BaseTestCase() {\nmockStatic(CTExecutorFactory::class.java).use {\n`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nmProductConfigController.reset()\n- Assert.assertEquals(mProductConfigController.defaultConfig.size, 0)\n- Assert.assertEquals(mProductConfigController.activatedConfig.size, 0)\n+ Assert.assertEquals(mProductConfigController.defaultConfigs.size, 0)\n+ Assert.assertEquals(mProductConfigController.activatedConfigs.size, 0)\nverify(productConfigSettings).initDefaults()\nverify(fileUtils).deleteDirectory(mProductConfigController.productConfigDirName)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "@@ -11,7 +11,7 @@ android {\nversionCode 1\nversionName \"1.0\"\n-// instrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n+// testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\nconsumerProguardFiles \"consumer-rules.pro\"\n}\n@@ -32,7 +32,6 @@ dependencies {\napi deps.kotlinStdlib\napi deps.jsonAssert\napi deps.gson\n- api deps.json\ndef mockito_version = '3.5.11'\napi deps.mockitoCore\napi \"org.mockito:mockito-inline:$mockito_version\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-670):
1. Added crash fix for Product Config concurrency issue. |
116,621 | 18.02.2021 16:43:06 | -19,080 | 63c843030644fa91e66772d0a90dd42ac65751cd | task(SDK-609):product config instance was not properly set | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -4,7 +4,6 @@ import android.content.Context;\nimport com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\nimport com.clevertap.android.sdk.events.EventMediator;\n-import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inapp.InAppController;\nimport com.clevertap.android.sdk.inbox.CTInboxController;\nimport com.clevertap.android.sdk.login.LoginController;\n@@ -26,12 +25,8 @@ public class CoreState extends CleverTapState {\nprivate CoreMetaData coreMetaData;\n- private CTFeatureFlagsController ctFeatureFlagsController;\n-\nprivate CTInboxController ctInboxController;\n- private CTProductConfigController ctProductConfigController;\n-\nprivate BaseDatabaseManager databaseManager;\nprivate DeviceInfo deviceInfo;\n@@ -142,7 +137,7 @@ public class CoreState extends CleverTapState {\npublic CTProductConfigController getCtProductConfigController() {\ninitProductConfig();\n- return ctProductConfigController;\n+ return getControllerManager().getCTProductConfigController();\n}\n@Override\n@@ -272,7 +267,7 @@ public class CoreState extends CleverTapState {\n.debug(getConfig().getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\n- if (ctProductConfigController == null) {\n+ if (getControllerManager().getCTProductConfigController() == null) {\nCTProductConfigController ctProductConfigController = CTProductConfigFactory\n.getInstance(context, getDeviceInfo(),\ngetConfig(), mAnalyticsManager, coreMetaData, mCallbackManager);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):product config instance was not properly set |
116,612 | 19.02.2021 11:43:13 | -19,080 | 5f4d63b5ac2729584784dcb50345825407789052 | task(TDD): add unit tests for createNotification() in CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "package com.clevertap.android.sdk\nimport android.location.Location\n+import android.os.Bundle\nimport com.clevertap.android.sdk.utils.Utils\nimport com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.Constant\nimport org.json.JSONObject\nimport org.junit.*\nimport org.junit.Assert.*\n@@ -229,6 +231,63 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(\"eu\", instance.accountRegion)\n}\n+ @Test\n+ fun test_createNotification_whenInstancesNull__createNotificationMustBeCalled() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ val bundle = Bundle()\n+ //CleverTapAPI.getDefaultInstance(application)\n+ //CleverTapAPI.setInstances(null)\n+ CleverTapAPI.createNotification(application, bundle, 12345)\n+ verify(corestate.pushProviders)._createNotification(application, bundle, 12345)\n+ }\n+ }\n+\n+ @Test\n+ fun test_createNotification_whenInstanceNotNullAndAcctIDMatches__createNotificationMustBeCalled() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ val bundle = Bundle()\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, Constant.ACC_ID)\n+ CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+ CleverTapAPI.createNotification(application, bundle, 12345)\n+ verify(corestate.pushProviders)._createNotification(application, bundle, 12345)\n+ }\n+ }\n+\n+ @Test\n+ fun test_createNotification_whenInstanceNotNullAndAcctIdDontMatch_createNotificationMustNotBeCalled() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ val bundle = Bundle()\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, \"acct123\")\n+ CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+ CleverTapAPI.createNotification(application, bundle, 12345)\n+ verify(corestate.pushProviders, never())._createNotification(application, bundle, 12345)\n+ }\n+ }\n+\n/* @Test\nfun testPushDeepLink(){\n// Arrange\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for createNotification() in CleverTapAPI SDK-660 |
116,623 | 19.02.2021 15:16:43 | -19,080 | 77c865d2ae02faead6c2964eaad79d500c695bc3 | task(SDK-612): Added sonarcloud settings to gradle files | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -18,6 +18,7 @@ buildscript {\nclasspath \"com.huawei.agconnect:agcp:$huaweiPluginVersion\"// Huawei Push Plugin\nclasspath \"org.jacoco:org.jacoco.core:$jacocoVersion\"\nclasspath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"\n+ classpath \"org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1\"\n}\n}\n@@ -26,6 +27,9 @@ allprojects {\njcenter()\ngoogle()\nmaven { url 'http://developer.huawei.com/repo/' }\n+ maven {\n+ url \"https://plugins.gradle.org/m2/\"\n+ }\nflatDir {\ndirs 'libs'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/build.gradle",
"new_path": "clevertap-core/build.gradle",
"diff": "@@ -35,3 +35,12 @@ dependencies {\ntestImplementation deps.kotlinStdlib\ntestImplementation deps.firebaseMessaging\n}\n+\n+sonarqube {\n+ properties {\n+ property \"sonar.projectKey\", \"CleverTap_clevertap-android-sdk\"\n+ property \"sonar.organization\", \"clevertap\"\n+ property \"sonar.host.url\", \"https://sonarcloud.io\"\n+ }\n+}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'\napply plugin: 'com.github.dcendents.android-maven'\napply plugin: 'com.jfrog.bintray'\napply plugin: 'jacoco'\n+apply plugin: 'org.sonarqube'\n+\next {\nbintrayRepo = 'Maven'\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -17,7 +17,7 @@ ext {\nmavenPluginVersion = '2.1'\nhuaweiPluginVersion = '1.3.1.300'\nkotlin_version = '1.3.72'\n- jacocoVersion = '0.8.4'\n+ jacocoVersion = '0.8.6'\n// Firebase\nfirebaseFcmVersion = '20.2.4'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-612): Added sonarcloud settings to gradle files |
116,623 | 19.02.2021 15:40:53 | -19,080 | 83967774cc0b90c0de10d69dfe50e0830f7dce11 | task(SDK-670): Adds fix for Device Network Type Security Exception | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -315,7 +315,11 @@ public final class Utils {\nLogger.d(\"READ_PHONE_STATE permission not asked by the app or not granted by the user\");\n}\n} else {\n+ try {\nnetworkType = teleMan.getNetworkType();\n+ } catch (SecurityException se) {\n+ Logger.d(\"Security Exception caught while fetch network type\" + se.getMessage());\n+ }\n}\nswitch (networkType) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-670): Adds fix for #147 Device Network Type Security Exception |
116,621 | 19.02.2021 15:42:20 | -19,080 | e4639ef022d8077b1b2e5de494ba091e53fc813a | task(SDK-609):Added test cases for Display Units | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/displayunits/CTDisplayUnitType.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/displayunits/CTDisplayUnitType.java",
"diff": "@@ -27,7 +27,7 @@ public enum CTDisplayUnitType {\n* @return CTDisplayUnitType\n*/\n@Nullable\n- public static CTDisplayUnitType type(String type) {\n+ public static CTDisplayUnitType type(@NonNull String type) {\nif (!TextUtils.isEmpty(type)) {\nswitch (type) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/displayunits/model/CleverTapDisplayUnitContent.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/displayunits/model/CleverTapDisplayUnitContent.java",
"diff": "@@ -44,7 +44,6 @@ public class CleverTapDisplayUnitContent implements Parcelable {\nprivate String titleColor;\n-\nprivate CleverTapDisplayUnitContent(String title, String titleColor, String message, String messageColor,\nString icon, String media, String contentType, String posterUrl,\nString actionUrl, String error) {\n@@ -60,6 +59,7 @@ public class CleverTapDisplayUnitContent implements Parcelable {\nthis.error = error;\n}\n+\nprivate CleverTapDisplayUnitContent(Parcel in) {\ntitle = in.readString();\ntitleColor = in.readString();\n@@ -101,6 +101,10 @@ public class CleverTapDisplayUnitContent implements Parcelable {\nreturn contentType;\n}\n+ void setContentType(final String contentType) {\n+ this.contentType = contentType;\n+ }\n+\npublic String getError() {\nreturn error;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/displayunits/CTDisplayUnitTypeTest.kt",
"diff": "+package com.clevertap.android.sdk.displayunits\n+\n+import org.junit.*\n+\n+internal class CTDisplayUnitTypeTest {\n+\n+ @Test\n+ fun test_type_valid() {\n+ Assert.assertEquals(CTDisplayUnitType.SIMPLE, CTDisplayUnitType.type(\"simple\"))\n+ Assert.assertEquals(CTDisplayUnitType.SIMPLE_WITH_IMAGE, CTDisplayUnitType.type(\"simple-image\"))\n+ Assert.assertEquals(CTDisplayUnitType.CAROUSEL, CTDisplayUnitType.type(\"carousel\"))\n+ Assert.assertEquals(CTDisplayUnitType.CAROUSEL_WITH_IMAGE, CTDisplayUnitType.type(\"carousel-image\"))\n+ Assert.assertEquals(CTDisplayUnitType.MESSAGE_WITH_ICON, CTDisplayUnitType.type(\"message-icon\"))\n+ Assert.assertEquals(CTDisplayUnitType.CUSTOM_KEY_VALUE, CTDisplayUnitType.type(\"custom-key-value\"))\n+ }\n+\n+ @Test\n+ fun test_type_inValid() {\n+ Assert.assertNull(CTDisplayUnitType.type(\"random\"))\n+ Assert.assertNull(CTDisplayUnitType.type(\"\"))\n+ }\n+\n+ @Test\n+ fun test_toString() {\n+ var type = \"simple\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+\n+ type = \"simple-image\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+\n+ type = \"carousel\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+\n+ type = \"carousel-image\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+\n+ type = \"message-icon\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+\n+ type = \"custom-key-value\"\n+ Assert.assertEquals(type, CTDisplayUnitType.type(type).toString())\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/displayunits/model/CleverTapDisplayUnitContentTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/displayunits/model/CleverTapDisplayUnitContentTest.kt",
"diff": "@@ -42,7 +42,8 @@ class CleverTapDisplayUnitContentTest:BaseTestCase() {\n@Test\nfun test_toString() {\n- val displayUnitContentString = CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent()).toString()\n+ val displayUnitContentString =\n+ CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent()).toString()\nAssert.assertTrue(displayUnitContentString.contains(\"title:\"))\nAssert.assertTrue(displayUnitContentString.contains(\"titleColor:\"))\nAssert.assertTrue(displayUnitContentString.contains(\"message:\"))\n@@ -72,4 +73,56 @@ class CleverTapDisplayUnitContentTest:BaseTestCase() {\nAssert.assertEquals(displayUnitContent.titleColor, createdFromParcel.titleColor)\nAssert.assertEquals(displayUnitContent.error, createdFromParcel.error)\n}\n+\n+ @Test\n+ fun test_mediaIsVideo() {\n+ val displayUnitContent = CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent())\n+ displayUnitContent.contentType = null\n+ Assert.assertFalse(displayUnitContent.mediaIsVideo())\n+\n+ displayUnitContent.contentType = \"audio\"\n+ Assert.assertFalse(displayUnitContent.mediaIsVideo())\n+\n+ displayUnitContent.contentType = \"videoabc\"\n+ Assert.assertTrue(displayUnitContent.mediaIsVideo())\n+ }\n+\n+ @Test\n+ fun test_mediaIsAudio() {\n+ val displayUnitContent = CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent())\n+ displayUnitContent.contentType = null\n+ Assert.assertFalse(displayUnitContent.mediaIsAudio())\n+\n+ displayUnitContent.contentType = \"video\"\n+ Assert.assertFalse(displayUnitContent.mediaIsAudio())\n+\n+ displayUnitContent.contentType = \"audioabc\"\n+ Assert.assertTrue(displayUnitContent.mediaIsAudio())\n+ }\n+\n+ @Test\n+ fun test_mediaIsGIF() {\n+ val displayUnitContent = CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent())\n+ displayUnitContent.contentType = null\n+ Assert.assertFalse(displayUnitContent.mediaIsGIF())\n+\n+ displayUnitContent.contentType = \"image\"\n+ Assert.assertFalse(displayUnitContent.mediaIsGIF())\n+\n+ displayUnitContent.contentType = \"image/gif\"\n+ Assert.assertTrue(displayUnitContent.mediaIsGIF())\n+ }\n+\n+ @Test\n+ fun test_mediaIsImage() {\n+ val displayUnitContent = CleverTapDisplayUnitContent.toContent(MockDisplayUnitContent().getContent())\n+ displayUnitContent.contentType = null\n+ Assert.assertFalse(displayUnitContent.mediaIsImage())\n+\n+ displayUnitContent.contentType = \"image/gif\"\n+ Assert.assertFalse(displayUnitContent.mediaIsImage())\n+\n+ displayUnitContent.contentType = \"image\"\n+ Assert.assertTrue(displayUnitContent.mediaIsImage())\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -152,7 +152,6 @@ class CTProductConfigControllerTest : BaseTestCase() {\nfun test_activate() {\nmockStatic(CTExecutorFactory::class.java).use {\n- shadowOf(getMainLooper()).idle()\n`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n`when`(fileUtils.readFromFile(mProductConfigController.activatedFullPath)).thenReturn(\nJSONObject(\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-609):Added test cases for Display Units |
116,612 | 19.02.2021 16:26:23 | -19,080 | 5af061b7d3ba36940316f1cfa1b2eb46b36e5aae | task(TDD): add unit tests for getNotificationInfo() in CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/NotificationInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/NotificationInfo.java",
"diff": "@@ -22,7 +22,7 @@ public final class NotificationInfo {\n* <p/>\n* True if and only if this notification is from CleverTap, and it should be parsed for information.\n*/\n- private final boolean shouldRender;\n+ public final boolean shouldRender;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic NotificationInfo(boolean fromCleverTap, boolean shouldRender) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -245,8 +245,8 @@ class CleverTapAPITest : BaseTestCase() {\nval bundle = Bundle()\n//CleverTapAPI.getDefaultInstance(application)\n//CleverTapAPI.setInstances(null)\n- CleverTapAPI.createNotification(application, bundle, 12345)\n- verify(corestate.pushProviders)._createNotification(application, bundle, 12345)\n+ CleverTapAPI.createNotification(application, bundle)\n+ verify(corestate.pushProviders)._createNotification(application, bundle, Constants.EMPTY_NOTIFICATION_ID)\n}\n}\n@@ -264,8 +264,8 @@ class CleverTapAPITest : BaseTestCase() {\nval bundle = Bundle()\nbundle.putString(Constants.WZRK_ACCT_ID_KEY, Constant.ACC_ID)\nCleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n- CleverTapAPI.createNotification(application, bundle, 12345)\n- verify(corestate.pushProviders)._createNotification(application, bundle, 12345)\n+ CleverTapAPI.createNotification(application, bundle)\n+ verify(corestate.pushProviders)._createNotification(application, bundle, Constants.EMPTY_NOTIFICATION_ID)\n}\n}\n@@ -283,9 +283,51 @@ class CleverTapAPITest : BaseTestCase() {\nval bundle = Bundle()\nbundle.putString(Constants.WZRK_ACCT_ID_KEY, \"acct123\")\nCleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n- CleverTapAPI.createNotification(application, bundle, 12345)\n- verify(corestate.pushProviders, never())._createNotification(application, bundle, 12345)\n+ CleverTapAPI.createNotification(application, bundle)\n+ verify(corestate.pushProviders, never())._createNotification(\n+ application,\n+ bundle,\n+ Constants.EMPTY_NOTIFICATION_ID\n+ )\n+ }\n+ }\n+\n+ @Test\n+ fun test_getNotificationInfoWhenExtrasNull_fromCleverTapMustBeFalse() {\n+\n+ val notificationInfo = CleverTapAPI.getNotificationInfo(null)\n+ assertFalse(notificationInfo.fromCleverTap)\n+ }\n+\n+ @Test\n+ fun test_getNotificationInfoWhenNotificationTagMissing_fromCleverTapAndShouldRenderMustBeFalse() {\n+\n+ val extras = Bundle()\n+ //extras.putString(Constants.NOTIFICATION_TAG,\"tag\")\n+ val notificationInfo = CleverTapAPI.getNotificationInfo(extras)\n+ assertFalse(notificationInfo.fromCleverTap)\n+ assertFalse(notificationInfo.shouldRender)\n+ }\n+\n+ @Test\n+ fun test_getNotificationInfoWhenNMTagMissing_fromCleverTapMustBeTrueAndShouldRenderMustBeFalse() {\n+\n+ val extras = Bundle()\n+ extras.putString(Constants.NOTIFICATION_TAG, \"tag\")\n+ val notificationInfo = CleverTapAPI.getNotificationInfo(extras)\n+ assertTrue(notificationInfo.fromCleverTap)\n+ assertFalse(notificationInfo.shouldRender)\n}\n+\n+ @Test\n+ fun test_getNotificationInfoWhenNotificationTagAndNMTagPresent_fromCleverTapAndshouldRenderMustBeTrue() {\n+\n+ val extras = Bundle()\n+ extras.putString(Constants.NOTIFICATION_TAG, \"tag\")\n+ extras.putString(\"nm\", \"nmTag\")\n+ val notificationInfo = CleverTapAPI.getNotificationInfo(extras)\n+ assertTrue(notificationInfo.fromCleverTap)\n+ assertTrue(notificationInfo.shouldRender)\n}\n/* @Test\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for getNotificationInfo() in CleverTapAPI SDK-660 |
116,612 | 19.02.2021 16:48:02 | -19,080 | e822940530c117e9ff869a834d0e8fb735bad405 | task(TDD): add unit tests for processPushNotification() in CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -330,6 +330,44 @@ class CleverTapAPITest : BaseTestCase() {\nassertTrue(notificationInfo.shouldRender)\n}\n+ @Test\n+ fun test_processPushNotification_whenInstancesNull__processCustomPushNotificationMustBeCalled() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ val bundle = Bundle()\n+ //CleverTapAPI.getDefaultInstance(application)\n+ //CleverTapAPI.setInstances(null)\n+ CleverTapAPI.processPushNotification(application, bundle)\n+ verify(corestate.pushProviders).processCustomPushNotification(bundle)\n+ }\n+ }\n+\n+ @Test\n+ fun test_processPushNotification_whenInstancesNotNull__processCustomPushNotificationMustBeCalled() {\n+ mockStatic(CleverTapFactory::class.java).use {\n+ `when`(\n+ CleverTapFactory.getCoreState(\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any(),\n+ ArgumentMatchers.any()\n+ )\n+ )\n+ .thenReturn(corestate)\n+ val bundle = Bundle()\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, Constant.ACC_ID)\n+ CleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+ CleverTapAPI.processPushNotification(application, bundle)\n+ verify(corestate.pushProviders).processCustomPushNotification(bundle)\n+ }\n+ }\n+\n/* @Test\nfun testPushDeepLink(){\n// Arrange\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add unit tests for processPushNotification() in CleverTapAPI SDK-660 |
116,621 | 25.02.2021 18:15:44 | -19,080 | 4413907ff0e714fd52368b0794693bb14b9215a5 | code-review(SDK-609):Added testcases for PC | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -33,7 +33,7 @@ public class CTFeatureFlagsController {\nString guid;\n- private boolean isInitialized = false;\n+ boolean isInitialized = false;\nprivate final Map<String, Boolean> store = Collections.synchronizedMap(new HashMap<String, Boolean>());\n@@ -85,8 +85,7 @@ public class CTFeatureFlagsController {\n}\ngetConfigLogger().verbose(getLogTag(),\n\"Getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\n- Boolean value;\n- value = store.get(key);\n+ Boolean value = store.get(key);\nif (value != null) {\nreturn value;\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -9,6 +9,7 @@ import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.\nimport android.content.Context;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.BaseAnalyticsManager;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -44,6 +45,8 @@ public class CTProductConfigController {\n//use lock for synchronization for read write\nfinal Map<String, String> defaultConfigs = Collections.synchronizedMap(new HashMap<String, String>());\n+ AtomicBoolean isInitialized = new AtomicBoolean(false);\n+\nfinal FileUtils mFileUtils;\nprivate final CleverTapInstanceConfig config;\n@@ -52,8 +55,6 @@ public class CTProductConfigController {\nprivate final AtomicBoolean isFetchAndActivating = new AtomicBoolean(false);\n- private boolean isInitialized = false;\n-\nprivate final BaseAnalyticsManager mAnalyticsManager;\nprivate final BaseCallbackManager mCallbackManager;\n@@ -185,7 +186,7 @@ public class CTProductConfigController {\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_BOOLEAN}\n*/\npublic Boolean getBoolean(String Key) {\n- if (isInitialized && !TextUtils.isEmpty(Key)) {\n+ if (isInitialized.get() && !TextUtils.isEmpty(Key)) {\nString value;\nvalue = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\n@@ -203,7 +204,7 @@ public class CTProductConfigController {\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_DOUBLE}\n*/\npublic Double getDouble(String Key) {\n- if (isInitialized && !TextUtils.isEmpty(Key)) {\n+ if (isInitialized.get() && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\nvalue = activatedConfigs.get(Key);\n@@ -236,7 +237,7 @@ public class CTProductConfigController {\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_LONG}\n*/\npublic Long getLong(String Key) {\n- if (isInitialized && !TextUtils.isEmpty(Key)) {\n+ if (isInitialized.get() && !TextUtils.isEmpty(Key)) {\ntry {\nString value;\nvalue = activatedConfigs.get(Key);\n@@ -264,7 +265,7 @@ public class CTProductConfigController {\n* CTProductConfigConstants#DEFAULT_VALUE_FOR_STRING}\n*/\npublic String getString(String Key) {\n- if (isInitialized && !TextUtils.isEmpty(Key)) {\n+ if (isInitialized.get() && !TextUtils.isEmpty(Key)) {\nString value;\nvalue = activatedConfigs.get(Key);\nif (!TextUtils.isEmpty(value)) {\n@@ -275,7 +276,7 @@ public class CTProductConfigController {\n}\npublic boolean isInitialized() {\n- return isInitialized;\n+ return isInitialized.get();\n}\n/**\n@@ -283,9 +284,7 @@ public class CTProductConfigController {\n* Developers should not use this method manually.\n*/\npublic void onFetchFailed() {\n- if (isFetchAndActivating.get()) {\n- isFetchAndActivating.set(false);\n- }\n+ isFetchAndActivating.compareAndSet(true, false);\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Fetch Failed\");\n}\n@@ -317,17 +316,15 @@ public class CTProductConfigController {\nreturn null;\n}\n});\n- if (isFetchAndActivating.get()) {\n- isFetchAndActivating.set(false);\n+ if (isFetchAndActivating.getAndSet(false)) {\nactivate();\n}\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Failed\");\nsendCallback(PROCESSING_STATE.FETCHED);\n- if (isFetchAndActivating.get()) {\n- isFetchAndActivating.set(false);// set fetchAndActivating flag to false if fetch fails.\n- }\n+ // set fetchAndActivating flag to false if fetch fails.\n+ isFetchAndActivating.compareAndSet(true, false);\n}\n}\n}\n@@ -361,23 +358,7 @@ public class CTProductConfigController {\n* @param resourceID - resource Id of the XML.\n*/\npublic void setDefaults(final int resourceID) {\n- Task<Void> task = CTExecutorFactory.getInstance(config).ioTask();\n- task.addOnSuccessListener(new OnSuccessListener<Void>() {\n- @Override\n- public void onSuccess(final Void aVoid) {\n- initAsync();\n- }\n- }).call(new Callable<Void>() {\n- @Override\n- public Void call() {\n- synchronized (this) {\n- defaultConfigs.putAll(new DefaultXmlParser().getDefaultsFromXml(context, resourceID));\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Product Config: setDefaults Completed with: \" + defaultConfigs);\n- return null;\n- }\n- }\n- });\n+ setDefaultsWithXmlParser(resourceID, new DefaultXmlParser());\n}\n/**\n@@ -427,7 +408,7 @@ public class CTProductConfigController {\n* Developers should not use this method manually.\n*/\npublic void setGuidAndInit(String cleverTapID) {\n- if (isInitialized() || TextUtils.isEmpty(cleverTapID) || cleverTapID.equalsIgnoreCase(settings.getGuid())) {\n+ if (isInitialized() || TextUtils.isEmpty(cleverTapID)) {\nreturn;\n}\nsettings.setGuid(cleverTapID);\n@@ -475,14 +456,14 @@ public class CTProductConfigController {\nreturn mAnalyticsManager;\n}\n- // -----------------------------------------------------------------------//\n- // ******** Internal API *****//\n- // -----------------------------------------------------------------------//\n-\nBaseCallbackManager getCallbackManager() {\nreturn mCallbackManager;\n}\n+ // -----------------------------------------------------------------------//\n+ // ******** Internal API *****//\n+ // -----------------------------------------------------------------------//\n+\nCleverTapInstanceConfig getConfig() {\nreturn config;\n}\n@@ -499,10 +480,70 @@ public class CTProductConfigController {\nreturn settings;\n}\n+ void initAsync() {\n+ if (TextUtils.isEmpty(settings.getGuid())) {\n+ return;\n+ }\n+ Task<Boolean> task = CTExecutorFactory.getInstance(config).ioTask();\n+ task.addOnSuccessListener(new OnSuccessListener<Boolean>() {\n+ @Override\n+ public void onSuccess(final Boolean aVoid) {\n+ sendCallback(PROCESSING_STATE.INIT);\n+ }\n+ }).call(new Callable<Boolean>() {\n+ @Override\n+ public Boolean call() {\n+ synchronized (this) {\n+ try {\n+ //apply defaults\n+ if (!defaultConfigs.isEmpty()) {\n+ activatedConfigs.putAll(defaultConfigs);\n+ }\n+ HashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\n+ if (!storedConfig.isEmpty()) {\n+ waitingTobeActivatedConfig.putAll(storedConfig);\n+ }\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Loaded configs ready to be applied: \" + waitingTobeActivatedConfig);\n+ settings.loadSettings(mFileUtils);\n+ isInitialized.set(true);\n+\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"InitAsync failed - \" + e.getLocalizedMessage());\n+ return false;\n+ }\n+ return true;\n+ }\n+ }\n+ });\n+ }\n+\nboolean isFetchAndActivating() {\nreturn isFetchAndActivating.get();\n}\n+ void setDefaultsWithXmlParser(final int resourceID, @NonNull final DefaultXmlParser xmlParser) {\n+ Task<Void> task = CTExecutorFactory.getInstance(config).ioTask();\n+ task.addOnSuccessListener(new OnSuccessListener<Void>() {\n+ @Override\n+ public void onSuccess(final Void aVoid) {\n+ initAsync();\n+ }\n+ }).call(new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ synchronized (this) {\n+ defaultConfigs.putAll(xmlParser.getDefaultsFromXml(context, resourceID));\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Product Config: setDefaults Completed with: \" + defaultConfigs);\n+ return null;\n+ }\n+ }\n+ });\n+ }\n+\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\nboolean validGuid = !TextUtils.isEmpty(settings.getGuid());\n@@ -606,46 +647,6 @@ public class CTProductConfigController {\nreturn map;\n}\n- private void initAsync() {\n- if (TextUtils.isEmpty(settings.getGuid())) {\n- return;\n- }\n- Task<Boolean> task = CTExecutorFactory.getInstance(config).ioTask();\n- task.addOnSuccessListener(new OnSuccessListener<Boolean>() {\n- @Override\n- public void onSuccess(final Boolean aVoid) {\n- sendCallback(PROCESSING_STATE.INIT);\n- }\n- }).call(new Callable<Boolean>() {\n- @Override\n- public Boolean call() {\n- synchronized (this) {\n- try {\n- //apply defaults\n- if (!defaultConfigs.isEmpty()) {\n- activatedConfigs.putAll(defaultConfigs);\n- }\n- HashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\n- if (!storedConfig.isEmpty()) {\n- waitingTobeActivatedConfig.putAll(storedConfig);\n- }\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Loaded configs ready to be applied: \" + waitingTobeActivatedConfig);\n- settings.loadSettings(mFileUtils);\n- isInitialized = true;\n-\n- } catch (Exception e) {\n- e.printStackTrace();\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"InitAsync failed - \" + e.getLocalizedMessage());\n- return false;\n- }\n- return true;\n- }\n- }\n- });\n- }\n-\nprivate void onActivated() {\nif (mCallbackManager.getProductConfigListener() != null) {\nmCallbackManager.getProductConfigListener().onActivated();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"diff": "@@ -41,11 +41,11 @@ class DefaultXmlParser {\n\"Could not find the resources of the current context while trying to set defaults from an XML.\");\nreturn;\n}\n- XmlResourceParser xmlParser = resources.getXml(resourceId);\ntry {\n+ XmlResourceParser xmlParser = resources.getXml(resourceId);\ngetDefaultsFromXmlParser(xmlParser, hashMap);\n- } catch (IOException | XmlPullParserException var11) {\n- Log.e(\"ProductConfig\", \"Encountered an error while parsing the defaults XML file.\", var11);\n+ } catch (Exception e) {\n+ Log.e(\"ProductConfig\", \"Encountered an error while parsing the defaults XML file.\", e);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -40,6 +40,31 @@ class ProductConfigSettings {\ninitDefaults();\n}\n+ void eraseStoredSettingsFile(final FileUtils fileUtils) {\n+ if (fileUtils == null) {\n+ throw new IllegalArgumentException(\"FileUtils can't be null\");\n+ }\n+ Task<Void> task = CTExecutorFactory.getInstance(config).ioTask();\n+ task.call(new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ synchronized (this) {\n+ try {\n+ String fileName = getFullPath();\n+ fileUtils.deleteFile(fileName);\n+ config.getLogger()\n+ .verbose(ProductConfigUtil.getLogTag(config), \"Deleted settings file\" + fileName);\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n+ \"Error while resetting settings\" + e.getLocalizedMessage());\n+ }\n+ return null;\n+ }\n+ }\n+ });\n+ }\n+\nString getDirName() {\nreturn CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n}\n@@ -104,8 +129,19 @@ class ProductConfigSettings {\nsettingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(DEFAULT_WINDOW_LENGTH_MINS));\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(0));\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(DEFAULT_MIN_FETCH_INTERVAL_SECONDS));\n+\n+ Task<Void> task = CTExecutorFactory.getInstance(config).ioTask();\n+ task.call(new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ synchronized (this){\nconfig.getLogger()\n- .verbose(ProductConfigUtil.getLogTag(config), \"Settings loaded with default values: \" + settingsMap);\n+ .verbose(ProductConfigUtil.getLogTag(config),\n+ \"Settings loaded with default values: \" + settingsMap);\n+ }\n+ return null;\n+ }\n+ });\n}\n/**\n@@ -127,7 +163,7 @@ class ProductConfigSettings {\n}\n}\n- void populateMapWithJson(final JSONObject jsonObject) {\n+ synchronized void populateMapWithJson(final JSONObject jsonObject) {\nif (jsonObject == null) {\nreturn;\n}\n@@ -159,31 +195,6 @@ class ProductConfigSettings {\neraseStoredSettingsFile(fileUtils);\n}\n- void eraseStoredSettingsFile(final FileUtils fileUtils) {\n- if (fileUtils == null) {\n- throw new IllegalArgumentException(\"FileUtils can't be null\");\n- }\n- Task<Void> task = CTExecutorFactory.getInstance(config).ioTask();\n- task.call(new Callable<Void>() {\n- @Override\n- public Void call() {\n- synchronized (this){\n- try {\n- String fileName = getFullPath();\n- fileUtils.deleteFile(fileName);\n- config.getLogger()\n- .verbose(ProductConfigUtil.getLogTag(config), \"Deleted settings file\" + fileName);\n- } catch (Exception e) {\n- e.printStackTrace();\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config),\n- \"Error while resetting settings\" + e.getLocalizedMessage());\n- }\n- return null;\n- }\n- }\n- });\n- }\n-\nvoid setARPValue(JSONObject arp) {\nif (arp != null) {\nfinal Iterator<String> keys = arp.keys();\n@@ -291,7 +302,6 @@ class ProductConfigSettings {\n}\nprivate synchronized void updateConfigToFile() {\n-\nTask<Boolean> task = CTExecutorFactory.getInstance(config).ioTask();\ntask.addOnSuccessListener(new OnSuccessListener<Boolean>() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"diff": "@@ -19,8 +19,7 @@ public class CTExecutors {\npublic final MainThreadExecutor DEFAULT_CALLBACK_EXECUTOR = MAIN_EXECUTOR;\n// single executor acts like {@link PostAsyncSafelyHandler }\n- private final PostAsyncSafelyExecutor POST_ASYNC_SAFELY_EXECUTOR = new PostAsyncSafelyExecutor();\n-\n+ public final PostAsyncSafelyExecutor POST_ASYNC_SAFELY_EXECUTOR = new PostAsyncSafelyExecutor();\nCTExecutors() {\n}\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsControllerTest.kt",
"diff": "@@ -13,11 +13,11 @@ import com.clevertap.android.sdk.utils.FileUtils\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.junit.*\nimport org.junit.runner.*\n-import org.mockito.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n@RunWith(RobolectricTestRunner::class)\n-class FeatureFlagTest : BaseTestCase() {\n+class CTFeatureFlagsControllerTest : BaseTestCase() {\nprivate lateinit var mCTFeatureFlagsController: CTFeatureFlagsController\nprivate lateinit var coreMetaData: CoreMetaData\n@@ -32,14 +32,14 @@ class FeatureFlagTest : BaseTestCase() {\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\ncoreMetaData = CoreMetaData()\n- analyticsManager = Mockito.mock(BaseAnalyticsManager::class.java)\n+ analyticsManager = mock(BaseAnalyticsManager::class.java)\ndeviceInfo = MockDeviceInfo(application, cleverTapInstanceConfig, guid, coreMetaData)\ncallbackManager = CallbackManager(cleverTapInstanceConfig, deviceInfo)\n- fileUtils = Mockito.spy(FileUtils(application, cleverTapInstanceConfig))\n- featureFlagsListener = Mockito.mock(CTFeatureFlagsListener::class.java)\n+ fileUtils = spy(FileUtils(application, cleverTapInstanceConfig))\n+ featureFlagsListener = mock(CTFeatureFlagsListener::class.java)\ncallbackManager.featureFlagListener = featureFlagsListener\nmCTFeatureFlagsController = CTFeatureFlagsController(\nguid,\n@@ -52,18 +52,18 @@ class FeatureFlagTest : BaseTestCase() {\n@Test\nfun test_constructor_whenFeatureFlagIsNotSave_InitShouldReturnTrue() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n- val controller = Mockito.spy(mCTFeatureFlagsController)\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mCTFeatureFlagsController)\nAssert.assertTrue(controller.isInitialized)\n}\n}\n@Test\nfun when_Non_Empty_Feature_Flag_Config_Then_Init_Return_True() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n- Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ `when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n.thenReturn(MockFFResponse().getResponseJSON().toString())\nval controller = CTFeatureFlagsController(\nguid,\n@@ -77,9 +77,9 @@ class FeatureFlagTest : BaseTestCase() {\n@Test\nfun when_Non_Empty_Feature_Flag_Config_Read_Exception_Then_Init_Return_True() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n- Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ `when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n.thenThrow(RuntimeException(\"Something Went Wrong\"))\nval controller = CTFeatureFlagsController(\nguid,\n@@ -93,14 +93,14 @@ class FeatureFlagTest : BaseTestCase() {\n@Test\nfun when_Feature_Flag_Response_Success() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n- Mockito.`when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ `when`(fileUtils.readFromFile(mCTFeatureFlagsController.getCachedFullPath()))\n.thenThrow(RuntimeException(\"Something Went Wrong\"))\nval jsonObject = MockFFResponse().getResponseJSON()\nmCTFeatureFlagsController.updateFeatureFlags(jsonObject)\n- Mockito.verify(featureFlagsListener).featureFlagsUpdated()\n- Mockito.verify(\n+ verify(featureFlagsListener).featureFlagsUpdated()\n+ verify(\nfileUtils\n).writeJsonToFile(\nmCTFeatureFlagsController.cachedDirName,\n@@ -117,24 +117,60 @@ class FeatureFlagTest : BaseTestCase() {\n}\n}\n+ @Test\n+ fun test_get_whenNotInitialized_shouldReturnDefaultValue() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val jsonObject = MockFFResponse().getResponseJSON()\n+ mCTFeatureFlagsController.updateFeatureFlags(jsonObject)\n+ mCTFeatureFlagsController.isInitialized = false\n+ Assert.assertFalse(mCTFeatureFlagsController.get(\"feature_A\", false))\n+ }\n+ }\n+\n@Test\nfun test_Fetch_FF_Success() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nmCTFeatureFlagsController.fetchFeatureFlags()\n- Mockito.verify(analyticsManager).fetchFeatureFlags()\n+ verify(analyticsManager).fetchFeatureFlags()\n}\n}\n@Test\nfun test_resetWithGuid() {\n- Mockito.mockStatic(CTExecutorFactory::class.java).use {\n- Mockito.`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\nval guid = \"121u3203u129\"\n- val controller = Mockito.spy(mCTFeatureFlagsController)\n+ val controller = spy(mCTFeatureFlagsController)\ncontroller.resetWithGuid(guid)\nAssert.assertEquals(guid, controller.guid)\n- Mockito.verify(controller).init()\n+ verify(controller).init()\n+ }\n+ }\n+\n+ @Test\n+ fun test_setGuidAndInit_whenInitialised_initMethodShouldNotGetCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mCTFeatureFlagsController)\n+ val newGuid = \"131\"\n+ controller.setGuidAndInit(newGuid)\n+ Assert.assertNotEquals(controller.guid, newGuid)\n+ verify(controller, never()).init()\n+ }\n+ }\n+\n+ @Test\n+ fun test_setGuidAndInit_whenNotInitialised_initMethodShouldGetCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mCTFeatureFlagsController)\n+ val newGuid = \"131\"\n+ controller.isInitialized = false\n+ controller.setGuidAndInit(newGuid)\n+ Assert.assertEquals(controller.guid, newGuid)\n+ verify(controller).init()\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -21,6 +21,7 @@ import org.mockito.*\nimport org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.Shadows.shadowOf\n+import java.util.HashMap\nimport java.util.concurrent.TimeUnit\n@RunWith(RobolectricTestRunner::class)\n@@ -35,6 +36,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nprivate lateinit var deviceInfo: DeviceInfo\nprivate lateinit var fileUtils: FileUtils\nprivate lateinit var listener: CTProductConfigListener\n+ private lateinit var guid: String\n@Throws(Exception::class)\n@BeforeEach\n@@ -42,7 +44,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nsuper.setUp()\nmockStatic(CTExecutorFactory::class.java).use {\n`when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n- val guid = \"1212121221\"\n+ guid = \"1212121221\"\ncoreMetaData = CoreMetaData()\nanalyticsManager = mock(BaseAnalyticsManager::class.java)\ndeviceInfo = MockDeviceInfo(application, cleverTapInstanceConfig, guid, coreMetaData)\n@@ -239,4 +241,84 @@ class CTProductConfigControllerTest : BaseTestCase() {\nmProductConfigController.onFetchFailed()\nAssert.assertEquals(mProductConfigController.isFetchAndActivating, false)\n}\n+\n+ @Test\n+ fun test_setGuidAndInit_whenCleverTapIDNull_GuidNotSet() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mProductConfigController)\n+ val newGuid = \"\"\n+ controller.setGuidAndInit(newGuid)\n+ Assert.assertEquals(controller.settings.guid, guid)\n+ verify(productConfigSettings, never()).setGuid(newGuid)\n+ verify(controller, never()).initAsync()\n+ }\n+ }\n+\n+ @Test\n+ fun test_setGuidAndInit_tryingToSetGuidWhenAlreadyInitialised_ShouldNotUpdateGuid() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mProductConfigController)\n+ controller.isInitialized = true\n+ val newGuid = \"333333333\"\n+ controller.setGuidAndInit(newGuid)\n+ Assert.assertEquals(controller.settings.guid, guid)\n+ verify(productConfigSettings, never()).setGuid(newGuid)\n+ verify(controller, never()).initAsync()\n+ }\n+ }\n+\n+ @Test\n+ fun test_setGuidAndInit_tryingToSetGuidWhenNotInitialised_GuidIsUpdatedWithInitialisation() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val settings = ProductConfigSettings(guid, cleverTapInstanceConfig, fileUtils)\n+ val controller = spy(\n+ CTProductConfigController(\n+ application,\n+ cleverTapInstanceConfig,\n+ analyticsManager,\n+ coreMetaData,\n+ callbackManager,\n+ settings, fileUtils\n+ )\n+ )\n+ controller.isInitialized = false\n+ val newGuid = \"333333333\"\n+ controller.setGuidAndInit(newGuid)\n+ Assert.assertEquals(controller.settings.guid, newGuid)\n+ verify(controller).initAsync()\n+ Assert.assertTrue(controller.isInitialized)\n+ }\n+ }\n+\n+ @Test\n+ fun test_setDefaultsWithXmlParser() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val resId = 12212\n+ val xmlParser = mock(DefaultXmlParser::class.java)\n+ val mockPCResponse = MockPCResponse()\n+ `when`(xmlParser.getDefaultsFromXml(application, resId)).thenReturn(mockPCResponse.getDefaultConfig() as HashMap<String, String>)\n+ val controller = spy(mProductConfigController)\n+ controller.setDefaultsWithXmlParser(resId, xmlParser)\n+ verify(controller).initAsync()\n+ Assert.assertEquals(controller.getString(\"def_str\"),\"This is def_string\" )\n+ Assert.assertEquals(controller.getString(\"def_long\"),\"11111\" )\n+ Assert.assertEquals(controller.getString(\"def_double\"),\"2222.2222\" )\n+ Assert.assertEquals(controller.getString(\"def_bool\"),\"false\" )\n+ }\n+ }\n+\n+ @Test\n+ fun test_setDefaultUsingXML() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.getInstance(cleverTapInstanceConfig)).thenReturn(MockCTExecutors())\n+ val controller = spy(mProductConfigController)\n+ val resId = 12212\n+ controller.setDefaults(resId)\n+ verify(controller).setDefaultsWithXmlParser(eq(resId), any(DefaultXmlParser::class.java))\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/DefaultXmlParserTest.kt",
"diff": "+package com.clevertap.android.sdk.product_config\n+\n+import android.content.res.Resources\n+import android.content.res.XmlResourceParser\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.mockito.Mockito.*\n+import java.util.HashMap\n+\n+internal class DefaultXmlParserTest : BaseTestCase() {\n+\n+ private lateinit var defaultXmlParser: DefaultXmlParser\n+ private lateinit var resources: Resources\n+ private lateinit var xmlResourceParser: XmlResourceParser\n+\n+\n+ override fun setUp() {\n+ super.setUp()\n+ defaultXmlParser = DefaultXmlParser()\n+ resources = mock(Resources::class.java)\n+ xmlResourceParser = mock(XmlResourceParser::class.java)\n+ }\n+\n+ @Test\n+ fun test_getDefaultsFromXml() {\n+ val defaultXmlParser = spy(defaultXmlParser)\n+ val context = spy(application)\n+ `when`(context.resources).thenReturn(resources)\n+ val resourceID = 1212121\n+ defaultXmlParser.getDefaultsFromXml(context, resourceID)\n+ val map = HashMap<String, String>()\n+ verify(defaultXmlParser).getDefaultsFromXml(resources, resourceID, map)\n+ }\n+\n+ @Test\n+ fun test_getDefaultsFromXml_whenContextResourcesAreNull_ParserMethodShouldNotGetCalled() {\n+ val defaultXmlParser = spy(defaultXmlParser)\n+ val context = spy(application)\n+ `when`(context.resources).thenReturn(null)\n+ val resourceID = 1212121\n+ defaultXmlParser.getDefaultsFromXml(context, resourceID)\n+ val map = HashMap<String, String>()\n+ verify(defaultXmlParser,never()).getDefaultsFromXml(resources, resourceID, map)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/MockPCResponse.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/MockPCResponse.kt",
"diff": "@@ -18,9 +18,9 @@ class MockPCResponse {\nfun getDefaultConfig(): HashMap<String, Any> {\nval defaultConfig: HashMap<String, Any> = HashMap()\ndefaultConfig.put(\"def_str\", \"This is def_string\")\n- defaultConfig.put(\"def_long\", 11111L)\n- defaultConfig.put(\"def_double\", 2222.2222)\n- defaultConfig.put(\"def_bool\", false)\n+ defaultConfig.put(\"def_long\", \"11111\")\n+ defaultConfig.put(\"def_double\", \"2222.2222\")\n+ defaultConfig.put(\"def_bool\", \"false\")\nreturn defaultConfig\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(SDK-609):Added testcases for PC |
116,621 | 01.03.2021 22:27:39 | -19,080 | 4e483ce74f6ec3e6271830dafaeba87e63c640a7 | SDK(609):Added test cases changes | [
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTExperimentsListener.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-public interface CTExperimentsListener {\n-\n- void CTExperimentsUpdated();\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"diff": "@@ -17,7 +17,6 @@ import org.json.JSONObject;\n* Public facing model class for type of InboxMessage\n*/\n@SuppressWarnings({\"WeakerAccess\", \"unused\"})\n-@RestrictTo(Scope.LIBRARY)\npublic class CTInboxMessage implements Parcelable {\n@SuppressWarnings(\"unused\")\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -24,15 +24,16 @@ class CleverTapAPITest : BaseTestCase() {\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n- mockStatic(CleverTapFactory::class.java).use {\n- corestate = MockCoreState(application, cleverTapInstanceConfig)\n- }\n+\nmockStatic(CTExecutorFactory::class.java).use {\n`when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\nMockCTExecutors(\ncleverTapInstanceConfig\n)\n)\n+ mockStatic(CleverTapFactory::class.java).use {\n+ corestate = MockCoreState(application, cleverTapInstanceConfig)\n+ }\n}\n}\n@@ -47,9 +48,15 @@ class CleverTapAPITest : BaseTestCase() {\n@Test\nfun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_greater_than_5_secs() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\nmockStatic(Utils::class.java).use {\n+\n// Arrange\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\n@@ -71,9 +78,16 @@ class CleverTapAPITest : BaseTestCase() {\n}\n}\n}\n+ }\n@Test\nfun testCleverTapAPI_constructor_when_InitialAppEnteredForegroundTime_less_than_5_secs() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(Utils::class.java).use {\nmockStatic(CleverTapFactory::class.java).use {\n// Arrange\n@@ -87,16 +101,21 @@ class CleverTapAPITest : BaseTestCase() {\nCleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n// Assert\n- assertFalse(\"isCreatedPostAppLaunch must be false\", cleverTapInstanceConfig.isCreatedPostAppLaunch)\n+ assertFalse(\n+ \"isCreatedPostAppLaunch must be false\",\n+ cleverTapInstanceConfig.isCreatedPostAppLaunch\n+ )\nverify(corestate.sessionManager).setLastVisitTime()\nverify(corestate.deviceInfo).setDeviceNetworkInfoReportingFromStorage()\nverify(corestate.deviceInfo).setCurrentUserOptOutStateFromStorage()\n- val string = StorageHelper.getString(application, \"instance:\" + cleverTapInstanceConfig.accountId, \"\")\n+ val string =\n+ StorageHelper.getString(application, \"instance:\" + cleverTapInstanceConfig.accountId, \"\")\nassertEquals(cleverTapInstanceConfig.toJSONString(), string)\n}\n}\n}\n+ }\n@Test\nfun test_setLocationForGeofences() {\n@@ -105,6 +124,12 @@ class CleverTapAPITest : BaseTestCase() {\nlatitude = 17.4444\nlongitude = 4.444\n}\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n// Arrange\n@@ -117,9 +142,16 @@ class CleverTapAPITest : BaseTestCase() {\nverify(corestate.locationManager)._setLocation(location)\n}\n}\n+ }\n@Test\nfun test_setGeofenceCallback() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n// Arrange\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n@@ -139,12 +171,18 @@ class CleverTapAPITest : BaseTestCase() {\ncleverTapAPI.geofenceCallback = geofenceCallback\nassertEquals(geofenceCallback, cleverTapAPI.geofenceCallback)\n-\n+ }\n}\n}\n@Test\nfun test_pushGeoFenceError() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\n@@ -160,9 +198,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(\"Fire in the hall\", actualValidationResult.errorDesc)\n}\n}\n+ }\n@Test\nfun test_pushGeoFenceExitedEvent() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\nval argumentCaptor =\nArgumentCaptor.forClass(\n@@ -184,9 +229,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(expectedJson, argumentCaptor.value)\n}\n}\n+ }\n@Test\nfun test_pushGeoFenceEnteredEvent() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(CleverTapFactory.getCoreState(application, cleverTapInstanceConfig, null))\n.thenReturn(corestate)\n@@ -207,9 +259,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(expectedJson, argumentCaptor.value)\n}\n}\n+ }\n@Test\nfun test_changeCredentials_whenDefaultConfigNotNull_credentialsMustNotChange() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -227,9 +286,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertNotEquals(\"eu\", instance.accountRegion)\n}\n}\n+ }\n@Test\nfun test_changeCredentials_whenDefaultConfigNull_credentialsMustChange() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nCleverTapAPI.defaultConfig = null\nCleverTapAPI.changeCredentials(\"acct123\", \"token123\", \"eu\")\nval instance = ManifestInfo.getInstance(application)\n@@ -237,9 +303,16 @@ class CleverTapAPITest : BaseTestCase() {\nassertEquals(\"token123\", instance.acountToken)\nassertEquals(\"eu\", instance.accountRegion)\n}\n+ }\n@Test\nfun test_createNotification_whenInstancesNull__createNotificationMustBeCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -253,12 +326,23 @@ class CleverTapAPITest : BaseTestCase() {\n//CleverTapAPI.getDefaultInstance(application)\n//CleverTapAPI.setInstances(null)\nCleverTapAPI.createNotification(application, bundle)\n- verify(corestate.pushProviders)._createNotification(application, bundle, Constants.EMPTY_NOTIFICATION_ID)\n+ verify(corestate.pushProviders)._createNotification(\n+ application,\n+ bundle,\n+ Constants.EMPTY_NOTIFICATION_ID\n+ )\n+ }\n}\n}\n@Test\nfun test_createNotification_whenInstanceNotNullAndAcctIDMatches__createNotificationMustBeCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -272,12 +356,23 @@ class CleverTapAPITest : BaseTestCase() {\nbundle.putString(Constants.WZRK_ACCT_ID_KEY, Constant.ACC_ID)\nCleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\nCleverTapAPI.createNotification(application, bundle)\n- verify(corestate.pushProviders)._createNotification(application, bundle, Constants.EMPTY_NOTIFICATION_ID)\n+ verify(corestate.pushProviders)._createNotification(\n+ application,\n+ bundle,\n+ Constants.EMPTY_NOTIFICATION_ID\n+ )\n+ }\n}\n}\n@Test\nfun test_createNotification_whenInstanceNotNullAndAcctIdDontMatch_createNotificationMustNotBeCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -298,6 +393,7 @@ class CleverTapAPITest : BaseTestCase() {\n)\n}\n}\n+ }\n@Test\nfun test_getNotificationInfoWhenExtrasNull_fromCleverTapMustBeFalse() {\n@@ -339,6 +435,12 @@ class CleverTapAPITest : BaseTestCase() {\n@Test\nfun test_processPushNotification_whenInstancesNull__processCustomPushNotificationMustBeCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -355,9 +457,16 @@ class CleverTapAPITest : BaseTestCase() {\nverify(corestate.pushProviders).processCustomPushNotification(bundle)\n}\n}\n+ }\n@Test\nfun test_processPushNotification_whenInstancesNotNull__processCustomPushNotificationMustBeCalled() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(CleverTapFactory::class.java).use {\n`when`(\nCleverTapFactory.getCoreState(\n@@ -374,6 +483,7 @@ class CleverTapAPITest : BaseTestCase() {\nverify(corestate.pushProviders).processCustomPushNotification(bundle)\n}\n}\n+ }\n/* @Test\nfun testPushDeepLink(){\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/EventQueueManagerTest.kt",
"diff": "@@ -10,6 +10,8 @@ import com.clevertap.android.sdk.login.IdentityRepo\nimport com.clevertap.android.sdk.login.IdentityRepoFactory\nimport com.clevertap.android.sdk.login.LoginInfoProvider\nimport com.clevertap.android.sdk.network.NetworkManager\n+import com.clevertap.android.sdk.task.CTExecutorFactory\n+import com.clevertap.android.sdk.task.MockCTExecutors\nimport com.clevertap.android.sdk.utils.Utils\nimport com.clevertap.android.sdk.validation.ValidationResult\nimport com.clevertap.android.shared.test.BaseTestCase\n@@ -38,7 +40,12 @@ class EventQueueManagerTest : BaseTestCase() {\n@Before\noverride fun setUp() {\nsuper.setUp()\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ncorestate = MockCoreState(application, cleverTapInstanceConfig)\neventQueueManager =\nspy(\n@@ -60,29 +67,47 @@ class EventQueueManagerTest : BaseTestCase() {\n)\njson = JSONObject()\n}\n+ }\n@Test\nfun test_queueEvent_will_not_add_to_queue_when_event_should_be_dropped() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n`when`(corestate.eventMediator.shouldDropEvent(json, Constants.PING_EVENT))\n.thenReturn(true)\neventQueueManager.queueEvent(application, json, Constants.PING_EVENT)\nverify(eventQueueManager, never()).addToQueue(application, json, Constants.PING_EVENT)\n}\n+ }\n@Test\nfun test_queueEvent_will_add_to_queue_when_event_should_not_be_dropped() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n`when`(corestate.eventMediator.shouldDropEvent(json, Constants.FETCH_EVENT))\n.thenReturn(false)\ndoNothing().`when`(eventQueueManager).addToQueue(application, json, Constants.FETCH_EVENT)\neventQueueManager.queueEvent(application, json, Constants.FETCH_EVENT)\nverify(eventQueueManager).addToQueue(application, json, Constants.FETCH_EVENT)\n}\n+ }\n@Test\nfun test_queueEvent_will_process_further_and_add_to_queue_when_event_should_not_be_dropped() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n`when`(corestate.eventMediator.shouldDropEvent(json, Constants.PROFILE_EVENT))\n.thenReturn(false)\ndoNothing().`when`(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n@@ -95,10 +120,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).pushInitialEventsAsync()\nverify(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n}\n+ }\n@Test\nfun test_queueEvent_will_delay_add_to_queue_when_event_processing_should_be_delayed() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval captor = ArgumentCaptor.forClass(Runnable::class.java)\n`when`(corestate.eventMediator.shouldDropEvent(json, Constants.PROFILE_EVENT))\n.thenReturn(false)\n@@ -119,9 +150,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).pushInitialEventsAsync()\nverify(eventQueueManager).addToQueue(application, json, Constants.PROFILE_EVENT)\n}\n+ }\n@Test\nfun test_addToQueue_when_event_is_notification_viewed() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ndoNothing().`when`(eventQueueManager).processPushNotificationViewedEvent(application, json)\neventQueueManager.addToQueue(application, json, Constants.NV_EVENT)\n@@ -129,9 +167,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).processPushNotificationViewedEvent(application, json)\nverify(eventQueueManager, never()).processEvent(application, json, Constants.NV_EVENT)\n}\n+ }\n@Test\nfun test_addToQueue_when_event_is_not_notification_viewed() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ndoNothing().`when`(eventQueueManager).processEvent(application, json, Constants.PROFILE_EVENT)\neventQueueManager.addToQueue(application, json, Constants.PROFILE_EVENT)\n@@ -139,9 +184,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager, never()).processPushNotificationViewedEvent(application, json)\nverify(eventQueueManager).processEvent(application, json, Constants.PROFILE_EVENT)\n}\n+ }\n@Test\nfun test_processPushNotificationViewedEvent_when_there_is_no_validation_error() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval captor = ArgumentCaptor.forClass(Runnable::class.java)\ncorestate.coreMetaData.currentSessionId = 1000\n`when`(eventQueueManager.now).thenReturn(7000)\n@@ -162,9 +214,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_processPushNotificationViewedEvent_when_there_is_validation_error() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\nval validationResult = ValidationResult()\nvalidationResult.errorDesc = \"Fire in the hall\"\n@@ -195,9 +254,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).flushQueueAsync(application, PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_pushInitialEventsAsync_does_not_pushBasicProfile_when_inCurrentSession() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ncorestate.coreMetaData.currentSessionId = 10000\ndoNothing().`when`(eventQueueManager).pushBasicProfile(null)\n@@ -205,9 +271,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager, never()).pushBasicProfile(null)\n}\n+ }\n@Test\nfun test_pushInitialEventsAsync_pushesBasicProfile_when_not_inCurrentSession() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ncorestate.coreMetaData.currentSessionId = -1\ndoNothing().`when`(eventQueueManager).pushBasicProfile(null)\n@@ -215,9 +288,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).pushBasicProfile(null)\n}\n+ }\n@Test\nfun test_scheduleQueueFlush() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\nval captor = ArgumentCaptor.forClass(Runnable::class.java)\n@@ -235,18 +315,32 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).flushQueueSync(application, REGULAR)\nverify(eventQueueManager).flushQueueSync(application, PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_flush() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ndoNothing().`when`(eventQueueManager).flushQueueAsync(application, REGULAR)\neventQueueManager.flush()\nverify(eventQueueManager).flushQueueAsync(application, REGULAR)\n}\n+ }\n@Test\nfun test_flushQueueSync_when_net_is_offline() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\nval shadowOfCM = shadowOf(cm)\nshadowOfCM.setActiveNetworkInfo(null) // make offline\n@@ -255,9 +349,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.networkManager, never()).needsHandshakeForDomain(PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_flushQueueSync_when_net_is_online_and_metadata_is_offline() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ncorestate.coreMetaData.isOffline = true\nval cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\nval shadowOfCM = shadowOf(cm)\n@@ -269,9 +370,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.networkManager, never()).needsHandshakeForDomain(PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_flushQueueSync_when_HandshakeForDomain_not_needed() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\ncorestate.coreMetaData.isOffline = false\nval cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\nval shadowOfCM = shadowOf(cm)\n@@ -284,9 +392,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.networkManager, never()).initHandshake(ArgumentMatchers.any(), ArgumentMatchers.any())\nverify(corestate.networkManager).flushDBQueue(application, PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_flushQueueSync_when_HandshakeForDomain_is_needed() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval captor = ArgumentCaptor.forClass(Runnable::class.java)\ncorestate.coreMetaData.isOffline = false\nval cm = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\n@@ -304,9 +419,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.networkManager).flushDBQueue(application, PUSH_NOTIFICATION_VIEWED)\n}\n+ }\n@Test\nfun test_pushBasicProfile_when_input_is_null() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\ndoReturn(null).`when`(eventQueueManager).queueEvent(\nArgumentMatchers.any(),\n@@ -339,9 +461,16 @@ class EventQueueManagerTest : BaseTestCase() {\nassertEquals(expectedDeviceCC, actualProfile[\"cc\"])\nassertEquals(expectedDeviceTZ, actualProfile[\"tz\"])\n}\n+ }\n@Test\nfun test_pushBasicProfile_when_carrier_or_cc_is_null() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\ndoReturn(null).`when`(eventQueueManager).queueEvent(\nArgumentMatchers.any(),\n@@ -366,9 +495,16 @@ class EventQueueManagerTest : BaseTestCase() {\nassertNull(actualProfile.optString(\"Carrier\", null))\nassertNull(actualProfile.optString(\"cc\", null))\n}\n+ }\n@Test\nfun test_pushBasicProfile_when_carrier_or_cc_is_blank() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\ndoReturn(null).`when`(eventQueueManager).queueEvent(\nArgumentMatchers.any(),\n@@ -393,9 +529,16 @@ class EventQueueManagerTest : BaseTestCase() {\nassertNull(actualProfile.optString(\"Carrier\", null))\nassertNull(actualProfile.optString(\"cc\", null))\n}\n+ }\n@Test\nfun test_pushBasicProfile_when_input_is_not_null() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(IdentityRepoFactory::class.java).use {\nval mockIdentityRepo = mock(IdentityRepo::class.java)\n`when`(\n@@ -430,7 +573,11 @@ class EventQueueManagerTest : BaseTestCase() {\neventQueueManager.pushBasicProfile(inputJson)\n// Assert\n- verify(eventQueueManager).queueEvent(ArgumentMatchers.any(), captor.capture(), captorEventType.capture())\n+ verify(eventQueueManager).queueEvent(\n+ ArgumentMatchers.any(),\n+ captor.capture(),\n+ captorEventType.capture()\n+ )\nval actualProfile = captor.value[\"profile\"] as JSONObject\nval actualDetails = actualProfile[\"details\"] as JSONObject\n@@ -438,9 +585,16 @@ class EventQueueManagerTest : BaseTestCase() {\nassertEquals(70, actualDetails[\"age\"])\n}\n}\n+ }\n@Test\nfun test_pushBasicProfile_when_key_is_profile_identifier() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(IdentityRepoFactory::class.java).use {\nval mockIdentityRepo = mock(IdentityRepo::class.java)\nval mockLoginInfoProvider = mock(LoginInfoProvider::class.java)\n@@ -492,9 +646,16 @@ class EventQueueManagerTest : BaseTestCase() {\nassertEquals(70, actualDetails[\"age\"])\n}\n}\n+ }\n@Test\nfun test_processEvent_when_type_is_page_event() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\n// Arrange\nval expectedScreenName = \"Home Page\"\nval expectedSessionId = 9898\n@@ -549,10 +710,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(corestate.localDataStore, never()).persistEvent(application, actualEvent, Constants.PAGE_EVENT)\nverify(eventQueueManager).scheduleQueueFlush(application)\n}\n+ }\n@Test\nfun test_processEvent_when_type_is_ping_event() {\n-\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nmockStatic(Utils::class.java).use {\n// Arrange\n@@ -637,9 +804,16 @@ class EventQueueManagerTest : BaseTestCase() {\nverify(eventQueueManager).scheduleQueueFlush(application)\n}\n}\n+ }\n@Test\nfun test_processEvent_when_type_is_profile_event() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval actualEvent = JSONObject()\n@@ -649,9 +823,16 @@ class EventQueueManagerTest : BaseTestCase() {\n// assert following keys are absent in json\nassertNull(actualEvent.opt(\"pai\"))\n}\n+ }\n@Test\nfun test_processEvent_when_type_is_data_event() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval actualEvent = JSONObject()\n@@ -661,9 +842,16 @@ class EventQueueManagerTest : BaseTestCase() {\n// assert following keys are absent in json\nassertNull(actualEvent.opt(\"pai\"))\n}\n+ }\n@Test\nfun test_processEvent_when_type_is_normal_event() {\n+ mockStatic(CTExecutorFactory::class.java).use {\n+ `when`(CTExecutorFactory.executors(cleverTapInstanceConfig)).thenReturn(\n+ MockCTExecutors(\n+ cleverTapInstanceConfig\n+ )\n+ )\nval actualEvent = JSONObject()\nactualEvent.put(\"evtName\", Constants.APP_LAUNCHED_EVENT)\n@@ -675,3 +863,4 @@ class EventQueueManagerTest : BaseTestCase() {\nassertNotNull(actualEvent.opt(\"pai\"))\n}\n}\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/MockCTExecutors.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/MockCTExecutors.kt",
"diff": "@@ -5,7 +5,7 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig\nclass MockCTExecutors(config: CleverTapInstanceConfig) : CTExecutors(config) {\noverride fun <TResult : Any?> ioTask(): Task<TResult> {\n- val executor = MockExecutor()\n+ val executor = MockExecutorService()\nreturn Task(mConfig, executor, executor, \"ioTask\")\n}\n@@ -15,12 +15,12 @@ class MockCTExecutors(config: CleverTapInstanceConfig) : CTExecutors(config) {\n}\noverride fun <TResult : Any?> postAsyncSafelyTask(): Task<TResult> {\n- val executor = MockExecutor()\n+ val executor = MockExecutorService()\nreturn Task(mConfig, executor, executor, \"postAsyncSafelyTask\")\n}\noverride fun <TResult : Any?> postAsyncSafelyTask(featureTask: String): Task<TResult> {\n- val executor = MockExecutor()\n+ val executor = MockExecutorService()\nreturn Task(mConfig, executor, executor, \"postAsyncSafelyTask\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/MockExecutorService.kt",
"diff": "+package com.clevertap.android.sdk.task\n+\n+import java.util.concurrent.Callable\n+import java.util.concurrent.ExecutorService\n+import java.util.concurrent.Future\n+import java.util.concurrent.FutureTask\n+import java.util.concurrent.TimeUnit\n+\n+class MockExecutorService:ExecutorService {\n+\n+ override fun execute(command: Runnable?) {\n+ command?.run()\n+ }\n+\n+ override fun shutdown() {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun shutdownNow(): MutableList<Runnable> {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun isShutdown(): Boolean {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun isTerminated(): Boolean {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun awaitTermination(timeout: Long, unit: TimeUnit?): Boolean {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun <T : Any?> submit(task: Callable<T>?): Future<T> {\n+ val futureTask = FutureTask<T>(task)\n+ futureTask.run()\n+ return futureTask\n+ }\n+\n+ override fun <T : Any?> submit(task: Runnable?, result: T): Future<T> {\n+ val futureTask = FutureTask<T>(task, result)\n+ futureTask.run()\n+ return futureTask\n+ }\n+\n+ override fun submit(task: Runnable?): Future<*> {\n+ val futureTask = FutureTask<Void>(task, null)\n+ futureTask.run()\n+ return futureTask\n+ }\n+\n+ override fun <T : Any?> invokeAll(tasks: MutableCollection<out Callable<T>>?): MutableList<Future<T>> {\n+ throw UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun <T : Any?> invokeAll(\n+ tasks: MutableCollection<out Callable<T>>?,\n+ timeout: Long,\n+ unit: TimeUnit?\n+ ): MutableList<Future<T>> {\n+ throw java.lang.UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun <T : Any?> invokeAny(tasks: MutableCollection<out Callable<T>>?): T {\n+ throw java.lang.UnsupportedOperationException(\"Not Supported\")\n+ }\n+\n+ override fun <T : Any?> invokeAny(tasks: MutableCollection<out Callable<T>>?, timeout: Long, unit: TimeUnit?): T {\n+ throw java.lang.UnsupportedOperationException(\"Not Supported\")\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | SDK(609):Added test cases changes |
116,621 | 02.03.2021 16:28:45 | -19,080 | 4128171ffd925aea9d86f8b2926a4c49d88d5dc9 | Task(609): Added Test cases for FCM | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/amp/CTBackgroundIntentServiceTest.kt",
"diff": "+package com.clevertap.android.sdk.pushnotification.amp\n+\n+import android.content.Intent\n+import com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.TestApplication\n+import org.junit.*\n+import org.junit.Assert.*\n+import org.junit.runner.*\n+import org.mockito.Mockito.*\n+import org.robolectric.Robolectric\n+import org.robolectric.RobolectricTestRunner\n+import org.robolectric.annotation.Config\n+\n+@RunWith(RobolectricTestRunner::class)\n+@Config(sdk = [28], application = TestApplication::class)\n+class CTBackgroundIntentServiceTest : BaseTestCase() {\n+\n+ override fun setUp() {\n+ super.setUp()\n+ }\n+\n+ @Test\n+ fun test_handleIntent() {\n+ mockStatic(CleverTapAPI::class.java).use {\n+ val exceptionMessage = \"CleverTapAPI#runBackgroundIntentService called\"\n+ `when`(CleverTapAPI.runBackgroundIntentService(any())).thenThrow(RuntimeException(exceptionMessage))\n+\n+ val exception = assertThrows(RuntimeException::class.java) {\n+ val serviceController = Robolectric.buildIntentService(CTBackgroundIntentService::class.java, Intent())\n+ serviceController.create().handleIntent()\n+ }\n+\n+ assertTrue(exceptionMessage.equals(exception.message))\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/amp/CTBackgroundJobServiceTest.kt",
"diff": "+package com.clevertap.android.sdk.pushnotification.amp\n+\n+import android.app.job.JobParameters\n+import com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.TestApplication\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.Mockito.*\n+import org.robolectric.Robolectric\n+import org.robolectric.RobolectricTestRunner\n+import org.robolectric.annotation.Config\n+\n+@RunWith(RobolectricTestRunner::class)\n+@Config(sdk = [28], application = TestApplication::class)\n+class CTBackgroundJobServiceTest : BaseTestCase() {\n+\n+ private lateinit var service: CTBackgroundJobService\n+ private lateinit var mockParams: JobParameters\n+ override fun setUp() {\n+ super.setUp()\n+ service = spy(Robolectric.setupService(CTBackgroundJobService::class.java))\n+ mockParams = mock(JobParameters::class.java)\n+ }\n+\n+ @Test\n+ fun test_onStartJob() {\n+\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerServiceTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerServiceTest.kt",
"diff": "package com.clevertap.android.sdk.pushnotification.fcm\nimport android.content.Context\n+import android.content.Intent\nimport android.os.Bundle\nimport com.clevertap.android.sdk.pushnotification.fcm.TestFcmConstants.Companion.FCM_TOKEN\nimport com.clevertap.android.shared.test.BaseTestCase\n@@ -9,6 +10,7 @@ import com.google.firebase.messaging.RemoteMessage\nimport org.junit.*\nimport org.junit.runner.*\nimport org.mockito.*\n+import org.robolectric.Robolectric\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n@@ -22,12 +24,10 @@ class FcmMessageListenerServiceTest : BaseTestCase() {\n@Before\noverride fun setUp() {\nsuper.setUp()\n- service = Mockito.spy(\n- FcmMessageListenerService\n- ::class.java\n- )\n+ val serviceController = Robolectric.buildService(FcmMessageListenerService::class.java, Intent())\n+ serviceController.create().startCommand(0, 1)\n+ service = serviceController.get()\nmockedMessageHandler = Mockito.mock(FcmMessageHandlerImpl::class.java)\n- Mockito.doReturn(application).`when`(service).applicationContext\n}\n@Test\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609): Added Test cases for FCM |
116,621 | 02.03.2021 17:28:53 | -19,080 | 602d89379c5f2526f76da3925d8a6a9c6e613dec | Bug(SDK-680)- Handled FCM token refresh for multiple Firebase Projects integrated in the Application | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -847,6 +847,25 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Push\n+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+ public static void fcmTokenRefresh(Context context, String token) {\n+\n+ for (CleverTapAPI instance : getAvailableInstances(context)) {\n+ if (instance == null || instance.getConfig().isAnalyticsOnly()) {\n+ Logger.d(instance.getAccountId(),\n+ \"Instance is Analytics Only not processing device token\");\n+ continue;\n+ }\n+ //get token from Manifest\n+ String tokenUsingManifestMetaEntry = Utils.getFcmTokenUsingManifestMetaEntry(context, instance.config);\n+ if (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n+ token = tokenUsingManifestMetaEntry;\n+ }\n+ instance.doTokenRefresh(token, PushType.FCM);\n+ }\n+ }\n+\n/**\n* Returns the log level set for CleverTapAPI\n*\n@@ -1188,31 +1207,14 @@ public class CleverTapAPI implements CleverTapAPIListener {\nisUIEditorEnabled = enabled;\n}\n- //Push\n- @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n- public static void tokenRefresh(Context context) {\n- if (instances == null) {\n- CleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\n- if (instance != null) {\n- instance.onTokenRefresh();\n- }\n- return;\n- }\n- for (String accountId : CleverTapAPI.instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- if (instance != null && instance.getConfig().isAnalyticsOnly()) {\n- Logger.d(accountId, \"Instance is Analytics Only not processing device token\");\n- continue;\n- }\n- if (instance != null) {\n- instance.onTokenRefresh();\n- }\n- }\n- }\n-\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic static void tokenRefresh(Context context, String token, PushType pushType) {\nfor (CleverTapAPI instance : getAvailableInstances(context)) {\n+ if (instance == null || instance.getConfig().isAnalyticsOnly()) {\n+ Logger.d(instance.getAccountId(),\n+ \"Instance is Analytics Only not processing device token\");\n+ continue;\n+ }\ninstance.doTokenRefresh(token, pushType);\n}\n}\n@@ -1434,8 +1436,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n.verbose(getAccountId(), \"Device Network Information reporting set to \" + enableNetworkInfoReporting);\n}\n- //Push\n-\n/**\n* Enables the Profile/Events Read and Synchronization API\n* Personalization is enabled by default\n@@ -1445,6 +1445,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.config.enablePersonalization(true);\n}\n+ //Push\n+\n/**\n* @return object of {@link CTFeatureFlagsController}\n* Handler to get the feature flag values\n@@ -1523,8 +1525,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn config.getAccountId();\n}\n- //Push\n-\n/**\n* Getter for retrieving all the Display Units.\n*\n@@ -1541,6 +1541,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Push\n+\n/**\n* Returns an ArrayList of all {@link CTInboxMessage} objects\n*\n@@ -1605,8 +1607,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.experimentsListener = experimentsListener;\n}\n- //Debug\n-\n/**\n* Returns the CTInboxListener object\n*\n@@ -1617,6 +1617,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn inboxListener;\n}\n+ //Debug\n+\n/**\n* This method sets the CTInboxListener\n*\n@@ -1667,8 +1669,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.pushNotificationListener = pushNotificationListener;\n}\n- //Network Info handling\n-\n/**\n* Returns a unique CleverTap identifier suitable for use with install attribution providers.\n*\n@@ -1679,6 +1679,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn this.deviceInfo.getAttributionID();\n}\n+ //Network Info handling\n+\n/**\n* Returns a unique identifier by which CleverTap identifies this user.\n*\n@@ -1705,8 +1707,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn -1;\n}\n- // OptOut handling\n-\n/**\n* Returns an EventDetail object for the particular event passed. EventDetail consists of event name, count, first\n* time\n@@ -1720,6 +1720,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn getLocalDataStore().getEventDetail(event);\n}\n+ // OptOut handling\n+\npublic Map<String, String> getDeviceInfo() {\nfinal Map<String, String> deviceInfo = new HashMap<>();\ndeviceInfo.put(\"build\", String.valueOf(this.deviceInfo.getBuild()));\n@@ -1811,8 +1813,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn ctABTestController.getDoubleVariable(name, defaultValue);\n}\n- //Util\n-\n/**\n* Returns the timestamp of the first time the given event was raised\n*\n@@ -1829,6 +1829,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn -1;\n}\n+ //Util\n+\n/**\n* Returns the GeofenceCallback object\n*\n@@ -1852,8 +1854,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.geofenceCallback = geofenceCallback;\n}\n- //Util\n-\n/**\n* Returns a Map of event names and corresponding event details of all the events raised\n*\n@@ -1876,7 +1876,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn inAppNotificationListener;\n}\n- //DeepLink\n+ //Util\n/**\n* This method sets the InAppNotificationListener\n@@ -1888,6 +1888,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.inAppNotificationListener = inAppNotificationListener;\n}\n+ //DeepLink\n+\n/**\n* Returns the count of all inbox messages for the user\n*\n@@ -2482,8 +2484,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\ndisplayNotification(inAppNotification);\n}\n- //Session\n-\n/**\n* This method is internal to CleverTap SDK.\n* Developers should not use this method manually.\n@@ -2495,6 +2495,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Session\n+\n/**\n* This method is internal to CleverTap SDK.\n* Developer should not use this method manually.\n@@ -3643,13 +3645,13 @@ public class CleverTapAPI implements CleverTapAPIListener {\nctABTestController.registerStringVariable(name);\n}\n- //Session\n-\n@Override\npublic ValidationResultStack remoteErrorLogger() {\nreturn validationResultStack;\n}\n+ //Session\n+\n/**\n* Remove a unique value from a multi-value user profile property\n* <p/>\n@@ -3752,8 +3754,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nthis.inboxMessageButtonListener = new WeakReference<>(listener);\n}\n- //Listener\n-\n/**\n* Not to be used by developers. This is used internally to help CleverTap know which library is wrapping the\n* native SDK\n@@ -3766,6 +3766,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Listener\n+\n/**\n* Sets the location in CleverTap to get updated GeoFences\n*\n@@ -4468,8 +4470,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- //Session\n-\n@SuppressWarnings(\"ConstantConditions\")\nprivate void _pushFacebookUser(JSONObject graphUser) {\ntry {\n@@ -4597,6 +4597,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Session\n+\nprivate void _removeValueForKey(String key) {\ntry {\nkey = (key == null) ? \"\" : key; // so we will generate a validation error later on\n@@ -4729,8 +4731,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nreturn val;\n}\n- //Profile\n-\nprivate void _validateAndPushMultiValue(JSONArray currentValues, JSONArray newValues,\nArrayList<String> originalValues, String key, String command) {\n@@ -4782,6 +4782,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Profile\n+\n//Lifecycle\nprivate void activityPaused() {\nsetAppForeground(false);\n@@ -5027,8 +5029,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- // private multi-value handlers and helpers\n-\nprivate void checkPendingInAppNotifications(Activity activity) {\nfinal boolean canShow = canShowInAppOnActivity();\nif (canShow) {\n@@ -5045,6 +5045,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ // private multi-value handlers and helpers\n+\n// SessionManager/session management\nprivate void checkTimeoutSession() {\nif (appLastSeen <= 0) {\n@@ -5243,10 +5245,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\nclearWzrkParams();\n}\n- //util\n-\n- //Session\n-\n//Push\n@SuppressWarnings(\"SameParameterValue\")\nprivate void deviceTokenDidRefresh(String token, PushType type) {\n@@ -5256,6 +5254,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //util\n+\n+ //Session\n+\n//InApp\nprivate void displayNotification(final CTInAppNotification inAppNotification) {\n@@ -5412,8 +5414,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\npushAppLaunchedEvent();\n}\n- //Event\n-\n/**\n* push the device token outside of the normal course\n*/\n@@ -5424,7 +5424,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- //Profile\n+ //Event\n/**\n* The ARP is additional request parameters, which must be sent once\n@@ -5472,6 +5472,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ //Profile\n+\nprivate long getAppInstallTime() {\nreturn appInstallTime;\n}\n@@ -5502,12 +5504,12 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n- //Push\n-\nprivate CleverTapInstanceConfig getConfig() {\nreturn config;\n}\n+ //Push\n+\nprivate Logger getConfigLogger() {\nreturn getConfig().getLogger();\n}\n@@ -6450,6 +6452,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\n//Push\nprivate void onTokenRefresh() {\n+ if (getConfig().isAnalyticsOnly()) {\n+ Logger.d(getAccountId(), \"Instance is Analytics Only not processing device token\");\n+ return;\n+ }\npushProviders.refreshAllTokens();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -21,7 +21,10 @@ import android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\nimport androidx.annotation.RestrictTo;\n+import androidx.annotation.RestrictTo.Scope;\nimport androidx.core.content.ContextCompat;\n+import com.google.firebase.iid.FirebaseInstanceId;\n+import com.google.firebase.messaging.FirebaseMessaging;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.InputStream;\n@@ -426,4 +429,21 @@ public final class Utils {\nreturn drawableToBitmap(context.getPackageManager().getApplicationIcon(context.getApplicationInfo()));\n}\n}\n+\n+ @RestrictTo(Scope.LIBRARY)\n+ public static String getFcmTokenUsingManifestMetaEntry(Context context, CleverTapInstanceConfig config) {\n+ String token = null;\n+ try {\n+ String senderID = ManifestInfo.getInstance(context).getFCMSenderId();\n+ if (senderID != null) {\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"FcmManager: Requesting a FCM token with Sender Id - \" + senderID);\n+ token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ }\n+ config.getLogger().info(config.getAccountId(), \"FCM token: \" + token);\n+ } catch (Throwable t) {\n+ config.getLogger().verbose(config.getAccountId(), \"FcmManager: Error requesting FCM token\", t);\n+ }\n+ return token;\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImpl.java",
"diff": "@@ -9,7 +9,6 @@ import android.os.Bundle;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.pushnotification.NotificationInfo;\n-import com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.google.firebase.messaging.RemoteMessage;\nimport java.util.Map;\n@@ -52,7 +51,7 @@ public class FcmMessageHandlerImpl implements IFcmMessageHandler {\npublic boolean onNewToken(final Context applicationContext, final String token) {\nboolean isSuccess = false;\ntry {\n- CleverTapAPI.tokenRefresh(applicationContext, token, PushConstants.PushType.FCM);\n+ CleverTapAPI.fcmTokenRefresh(applicationContext, token);\nLogger.d(LOG_TAG, FCM_LOG_TAG + \"New token received from FCM - \" + token);\nisSuccess = true;\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -9,6 +9,7 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.ManifestInfo;\n+import com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.google.android.gms.tasks.OnCompleteListener;\n@@ -64,6 +65,12 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic void requestToken() {\ntry {\n+ String tokenUsingManifestMetaEntry = Utils\n+ .getFcmTokenUsingManifestMetaEntry(listener.context(), listener.config());\n+ if (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n+ listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + tokenUsingManifestMetaEntry);\n+ listener.onNewToken(tokenUsingManifestMetaEntry, getPushType());\n+ } else {\nFirebaseInstanceId.getInstance().getInstanceId()\n.addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {\n@Override\n@@ -81,7 +88,7 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\nlistener.onNewToken(token, getPushType());\n}\n});\n-\n+ }\n} catch (Throwable t) {\nlistener.config().log(LOG_TAG, FCM_LOG_TAG + \"Error requesting FCM token\", t);\nlistener.onNewToken(null, getPushType());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug(SDK-680)- Handled FCM token refresh for multiple Firebase Projects integrated in the Application |
116,621 | 02.03.2021 17:50:59 | -19,080 | fbb1800ae7a387b4a56a73c53b109ece0acc9017 | bug(SDK-680)- Modified test cases for FCM token refresh | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"diff": "@@ -66,7 +66,7 @@ class FcmMessageHandlerImplTest : BaseTestCase() {\n@Test\nfun testOnNewToken_Failure() {\nMockito.mockStatic(CleverTapAPI::class.java).use {\n- Mockito.`when`(CleverTapAPI.tokenRefresh(any(Context::class.java), eq(FCM_TOKEN), eq(FCM)))\n+ Mockito.`when`(CleverTapAPI.fcmTokenRefresh(any(Context::class.java), eq(FCM_TOKEN)))\n.thenThrow(RuntimeException(\"Something Went Wrong\"))\nAssert.assertFalse(handler.onNewToken(application, FCM_TOKEN))\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | bug(SDK-680)- Modified test cases for FCM token refresh |
116,621 | 02.03.2021 19:27:21 | -19,080 | 5595b2f78e759a812363d9963c408d9f3033c239 | Bug(SDK-680): Added logs, versions & changelog | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -37,7 +37,7 @@ We publish the SDK to `jcenter` and `mavenCentral` as an `AAR` file. Just declar\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.0.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.0.4\"\n}\n```\n@@ -45,7 +45,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.0.3\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.0.4\", ext: 'aar')\n}\n```\n@@ -57,7 +57,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.0.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.0.4\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:20.2.4\"\nimplementation \"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).\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -437,12 +437,12 @@ public final class Utils {\nString senderID = ManifestInfo.getInstance(context).getFCMSenderId();\nif (senderID != null) {\nconfig.getLogger().verbose(config.getAccountId(),\n- \"FcmManager: Requesting a FCM token with Sender Id - \" + senderID);\n+ \"Requesting an FCM token with Manifest SenderId - \" + senderID);\ntoken = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n}\n- config.getLogger().info(config.getAccountId(), \"FCM token: \" + token);\n+ config.getLogger().info(config.getAccountId(), \"FCM token using Manifest SenderId: \" + token);\n} catch (Throwable t) {\n- config.getLogger().verbose(config.getAccountId(), \"FcmManager: Error requesting FCM token\", t);\n+ config.getLogger().verbose(config.getAccountId(), \"Error requesting FCM token with Manifest SenderId\", t);\n}\nreturn token;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -71,20 +71,22 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\nlistener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + tokenUsingManifestMetaEntry);\nlistener.onNewToken(tokenUsingManifestMetaEntry, getPushType());\n} else {\n+ listener.config()\n+ .log(LOG_TAG, FCM_LOG_TAG + \"Requesting FCM token using googleservices.json\");\nFirebaseInstanceId.getInstance().getInstanceId()\n.addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {\n@Override\npublic void onComplete(@NonNull Task<InstanceIdResult> task) {\nif (!task.isSuccessful()) {\nlistener.config()\n- .log(LOG_TAG, FCM_LOG_TAG + \"getInstanceId failed\", task.getException());\n+ .log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json failed\", task.getException());\nlistener.onNewToken(null, getPushType());\nreturn;\n}\n// Get new Instance ID token\nString token = task.getResult() != null ? task.getResult().getToken() : null;\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + token);\n+ listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json - \" + token);\nlistener.onNewToken(token, getPushType());\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.0.4 (Mar 2, 2021)\n+* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application\n+\n### Version 4.0.3 (Feb 22, 2021)\n* Fixed product config & other crashes ([#127](https://github.com/CleverTap/clevertap-android-sdk/issues/127) , [#132](https://github.com/CleverTap/clevertap-android-sdk/issues/132) , [#147](https://github.com/CleverTap/clevertap-android-sdk/issues/147))\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -32,7 +32,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.1\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.0.3\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.0.4\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:17.0.0\"\nimplementation \"androidx.work:work-runtime:2.3.4\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.0.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -5,7 +5,7 @@ ext {\nbuildToolsVersionVal = \"29.0.3\"\n// CleverTap modules\n- coreVersion = \"4.0.3\"\n+ coreVersion = \"4.0.4\"\ngeofenceVersion = \"1.0.1\"\nhmsVersion = \"1.0.0\"\nxpsVersion = \"1.0.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.0.4 (Mar 2, 2021)\n+* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application\n+\n### Version 4.0.3 (Feb 22, 2021)\n* Fixed product config & other crashes ([#127](https://github.com/CleverTap/clevertap-android-sdk/issues/127) , [#132](https://github.com/CleverTap/clevertap-android-sdk/issues/132) , [#147](https://github.com/CleverTap/clevertap-android-sdk/issues/147))\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug(SDK-680): Added logs, versions & changelog |
116,621 | 03.03.2021 11:56:18 | -19,080 | 71dbb2f25d64d26b8e48b09d7e1802bc30709349 | Bug(SDK-680)- Updated change log | [
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.0.4 (Mar 2, 2021)\n-* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application\n+* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application.\n+If you're using multiple Firebase projects in your app, use this version instead of v4.0.0 ~ v4.0.3\n### Version 4.0.3 (Feb 22, 2021)\n* Fixed product config & other crashes ([#127](https://github.com/CleverTap/clevertap-android-sdk/issues/127) , [#132](https://github.com/CleverTap/clevertap-android-sdk/issues/132) , [#147](https://github.com/CleverTap/clevertap-android-sdk/issues/147))\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.0.4 (Mar 2, 2021)\n-* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application\n+* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application.\n+If you're using multiple Firebase projects in your app, use this version instead of v4.0.0 ~ v4.0.3\n### Version 4.0.3 (Feb 22, 2021)\n* Fixed product config & other crashes ([#127](https://github.com/CleverTap/clevertap-android-sdk/issues/127) , [#132](https://github.com/CleverTap/clevertap-android-sdk/issues/132) , [#147](https://github.com/CleverTap/clevertap-android-sdk/issues/147))\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug(SDK-680)- Updated change log |
116,621 | 03.03.2021 18:43:54 | -19,080 | 37a2ea493dcba163279c2722d256798cd311ac81 | Task(680)-Merged v4.0.4 with 609. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -15,6 +15,7 @@ import android.media.AudioAttributes;\nimport android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\n+import android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -2457,6 +2458,24 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+ public static void fcmTokenRefresh(Context context, String token) {\n+\n+ for (CleverTapAPI instance : getAvailableInstances(context)) {\n+ if (instance == null || instance.getCoreState().getConfig().isAnalyticsOnly()) {\n+ Logger.d(instance.getAccountId(),\n+ \"Instance is Analytics Only not processing device token\");\n+ continue;\n+ }\n+ //get token from Manifest\n+ String tokenUsingManifestMetaEntry = Utils.getFcmTokenUsingManifestMetaEntry(context, instance.getCoreState().getConfig());\n+ if (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n+ token = tokenUsingManifestMetaEntry;\n+ }\n+ instance.getCoreState().getPushProviders().doTokenRefresh(token, PushType.FCM);\n+ }\n+ }\n+\nprivate static ArrayList<CleverTapAPI> getAvailableInstances(Context context) {\nArrayList<CleverTapAPI> apiArrayList = new ArrayList<>();\nif (instances == null || instances.isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -9,9 +9,9 @@ import static com.clevertap.android.sdk.utils.PackageUtils.isGooglePlayStoreAvai\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.ManifestInfo;\n-import com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+import com.clevertap.android.sdk.utils.Utils;\nimport com.google.android.gms.tasks.OnCompleteListener;\nimport com.google.android.gms.tasks.Task;\nimport com.google.firebase.FirebaseApp;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/Utils.java",
"diff": "@@ -20,9 +20,15 @@ import android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\n+import androidx.annotation.RestrictTo;\n+import androidx.annotation.RestrictTo.Scope;\nimport androidx.core.content.ContextCompat;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.ManifestInfo;\n+import com.google.firebase.iid.FirebaseInstanceId;\n+import com.google.firebase.messaging.FirebaseMessaging;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.InputStream;\n@@ -460,4 +466,21 @@ public final class Utils {\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n+\n+ @RestrictTo(Scope.LIBRARY)\n+ public static String getFcmTokenUsingManifestMetaEntry(Context context, CleverTapInstanceConfig config) {\n+ String token = null;\n+ try {\n+ String senderID = ManifestInfo.getInstance(context).getFCMSenderId();\n+ if (senderID != null) {\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Requesting an FCM token with Manifest SenderId - \" + senderID);\n+ token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ }\n+ config.getLogger().info(config.getAccountId(), \"FCM token using Manifest SenderId: \" + token);\n+ } catch (Throwable t) {\n+ config.getLogger().verbose(config.getAccountId(), \"Error requesting FCM token with Manifest SenderId\", t);\n+ }\n+ return token;\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(680)-Merged v4.0.4 with 609. |
116,612 | 03.03.2021 19:03:18 | -19,080 | d5130c5ed2190c7149e606e5746cd614f085a80d | task(TDD): remove A/B test from CleverTapInstanceConfig | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -56,12 +56,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean disableAppLaunchedEvent;\n- private boolean enableABTesting;\n-\nprivate boolean enableCustomCleverTapId;\n- private boolean enableUIEditor;\n-\nprivate String fcmSenderId;\nprivate boolean isDefaultInstance;\n@@ -117,8 +113,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.backgroundSync = config.backgroundSync;\nthis.enableCustomCleverTapId = config.enableCustomCleverTapId;\nthis.fcmSenderId = config.fcmSenderId;\n- this.enableABTesting = config.enableABTesting;\n- this.enableUIEditor = config.enableUIEditor;\nthis.packageName = config.packageName;\nthis.beta = config.beta;\nthis.allowedPushTypes = config.allowedPushTypes;\n@@ -136,8 +130,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.debugLevel = CleverTapAPI.LogLevel.INFO.intValue();\nthis.logger = new Logger(this.debugLevel);\nthis.createdPostAppLaunch = false;\n- this.enableABTesting = this.isDefaultInstance;\n- this.enableUIEditor = this.enableABTesting;\nManifestInfo manifest = ManifestInfo.getInstance(context);\nthis.useGoogleAdId = manifest.useGoogleAdId();\n@@ -189,12 +181,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.debugLevel = configJsonObject.getInt(Constants.KEY_DEBUG_LEVEL);\n}\nthis.logger = new Logger(this.debugLevel);\n- if (configJsonObject.has(Constants.KEY_ENABLE_ABTEST)) {\n- this.enableABTesting = configJsonObject.getBoolean(Constants.KEY_ENABLE_ABTEST);\n- }\n- if (configJsonObject.has(Constants.KEY_ENABLE_UIEDITOR)) {\n- this.enableUIEditor = configJsonObject.getBoolean(Constants.KEY_ENABLE_UIEDITOR);\n- }\n+\nif (configJsonObject.has(Constants.KEY_PACKAGE_NAME)) {\nthis.packageName = configJsonObject.getString(Constants.KEY_PACKAGE_NAME);\n}\n@@ -244,8 +231,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nbackgroundSync = in.readByte() != 0x00;\nenableCustomCleverTapId = in.readByte() != 0x00;\nfcmSenderId = in.readString();\n- enableABTesting = in.readByte() != 0x00;\n- enableUIEditor = in.readByte() != 0x00;\npackageName = in.readString();\nlogger = new Logger(debugLevel);\nbeta = in.readByte() != 0x00;\n@@ -318,11 +303,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn identityKeys;\n}\n- @SuppressWarnings({\"BooleanMethodIsAlwaysInverted\", \"WeakerAccess\"})\n- public boolean isABTestingEnabled() {\n- return enableABTesting;\n- }\n-\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic boolean isAnalyticsOnly() {\nreturn analyticsOnly;\n@@ -341,11 +321,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn isDefaultInstance;\n}\n- @SuppressWarnings({\"unused\"})\n- public boolean isUIEditorEnabled() {\n- return enableUIEditor;\n- }\n-\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic void log(@NonNull String tag, @NonNull String message) {\nlogger.verbose(getDefaultSuffix(tag), message);\n@@ -356,18 +331,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nlogger.verbose(getDefaultSuffix(tag), message, throwable);\n}\n- @SuppressWarnings(\"SameParameterValue\")\n- @RestrictTo(RestrictTo.Scope.LIBRARY)\n- public void setEnableABTesting(boolean enableABTesting) {\n- this.enableABTesting = enableABTesting;\n- }\n-\n- @SuppressWarnings({\"unused\"})\n- @RestrictTo(RestrictTo.Scope.LIBRARY)\n- public void setEnableUIEditor(boolean enableUIEditor) {\n- this.enableUIEditor = enableUIEditor;\n- }\n-\npublic void setIdentityKeys(@IdentityType String... identityKeys) {\nif (!isDefaultInstance) {\nthis.identityKeys = identityKeys;\n@@ -397,8 +360,6 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeByte((byte) (backgroundSync ? 0x01 : 0x00));\ndest.writeByte((byte) (enableCustomCleverTapId ? 0x01 : 0x00));\ndest.writeString(fcmSenderId);\n- dest.writeByte((byte) (enableABTesting ? 0x01 : 0x00));\n- dest.writeByte((byte) (enableUIEditor ? 0x01 : 0x00));\ndest.writeString(packageName);\ndest.writeByte((byte) (beta ? 0x01 : 0x00));\ndest.writeList(allowedPushTypes);\n@@ -472,8 +433,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_ENABLE_CUSTOM_CT_ID, getEnableCustomCleverTapId());\nconfigJsonObject.put(Constants.KEY_PACKAGE_NAME, getPackageName());\nconfigJsonObject.put(Constants.KEY_BETA, isBeta());\n- configJsonObject.put(Constants.KEY_ENABLE_UIEDITOR, isUIEditorEnabled());\n- configJsonObject.put(Constants.KEY_ENABLE_ABTEST, isABTestingEnabled());\nconfigJsonObject.put(Constants.KEY_ALLOWED_PUSH_TYPES, toJsonArray(allowedPushTypes));\nreturn configJsonObject.toString();\n} catch (Throwable e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -187,8 +187,6 @@ public interface Constants {\nString KEY_ENABLE_CUSTOM_CT_ID = \"getEnableCustomCleverTapId\";\nString KEY_BETA = \"beta\";\nString KEY_PACKAGE_NAME = \"packageName\";\n- String KEY_ENABLE_UIEDITOR = \"enableUIEditor\";\n- String KEY_ENABLE_ABTEST = \"enableABTesting\";\nString KEY_ALLOWED_PUSH_TYPES = \"allowedPushTypes\";\nString KEY_IDENTITY_TYPES = \"identityTypes\";\nString WZRK_PUSH_ID = \"wzrk_pid\";\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): remove A/B test from CleverTapInstanceConfig SDK-660 |
116,621 | 03.03.2021 21:54:27 | -19,080 | e827819f69227f449c1e958d358ed68f63493685 | Task(680)-Added test cases for Task Package | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"diff": "@@ -15,7 +15,11 @@ class IOExecutor implements ExecutorService {\nprivate final int numCores = Runtime.getRuntime().availableProcessors();\n- private final ExecutorService mExecutorService = new ThreadPoolExecutor(numCores * 2, numCores * 2,\n+ public void setExecutorService(final ExecutorService executorService) {\n+ mExecutorService = executorService;\n+ }\n+\n+ ExecutorService mExecutorService = new ThreadPoolExecutor(numCores * 2, numCores * 2,\n60L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainThreadExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainThreadExecutor.java",
"diff": "@@ -7,7 +7,11 @@ import java.util.concurrent.Executor;\npublic class MainThreadExecutor implements Executor {\n- private final Handler mainThreadHandler = new Handler(Looper.getMainLooper());\n+ void setMainThreadHandler(final Handler mainThreadHandler) {\n+ this.mainThreadHandler = mainThreadHandler;\n+ }\n+\n+ Handler mainThreadHandler = new Handler(Looper.getMainLooper());\n@Override\npublic void execute(@NonNull Runnable command) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutor.java",
"diff": "@@ -17,7 +17,11 @@ class PostAsyncSafelyExecutor implements ExecutorService {\nprivate long EXECUTOR_THREAD_ID = 0;\n- private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();\n+ void setExecutor(final ExecutorService executor) {\n+ mExecutor = executor;\n+ }\n+\n+ ExecutorService mExecutor = Executors.newSingleThreadExecutor();\n@Override\npublic boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/CTExecutorFactoryTest.kt",
"diff": "+package com.clevertap.android.sdk.task\n+\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class CTExecutorFactoryTest : BaseTestCase() {\n+\n+ override fun setUp() {\n+ super.setUp()\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun test_executors_whenConfigNull_ShouldThrowException() {\n+ CTExecutorFactory.executors(null)\n+ }\n+\n+ @Test\n+ fun test_executors_whenConfigNotNull_ShouldReturnValidObject() {\n+ val executor = CTExecutorFactory.executors(cleverTapInstanceConfig)\n+ Assert.assertTrue(executor is CTExecutors)\n+ }\n+\n+ @Test\n+ fun test_executors_whenTwoDiffrentConfigs_ShouldReturnDifferentObjects() {\n+ val executor = CTExecutorFactory.executors(cleverTapInstanceConfig)\n+ val newConfig = Mockito.spy(cleverTapInstanceConfig)\n+ Mockito.`when`(newConfig.accountId).thenReturn(\"312312312312\")\n+ val executorNew = CTExecutorFactory.executors(newConfig)\n+ Assert.assertNotEquals(executor, executorNew)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/IOExecutorTest.kt",
"diff": "+package com.clevertap.android.sdk.task\n+\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.RobolectricTestRunner\n+import java.util.concurrent.Callable\n+import java.util.concurrent.ExecutorService\n+import java.util.concurrent.ThreadPoolExecutor\n+import java.util.concurrent.TimeUnit\n+import java.util.concurrent.TimeUnit.SECONDS\n+\n+@RunWith(RobolectricTestRunner::class)\n+class IOExecutorTest : BaseTestCase() {\n+\n+ private lateinit var mExecutorService: ExecutorService\n+ private lateinit var executor: IOExecutor\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ mExecutorService = Mockito.mock(ExecutorService::class.java)\n+ executor = IOExecutor()\n+ executor.setExecutorService(mExecutorService)\n+ }\n+\n+ @Test\n+ fun test_executorServiceConfigs() {\n+ val executor = IOExecutor()\n+ Assert.assertTrue(executor.mExecutorService is ThreadPoolExecutor)\n+ val executorService = executor.mExecutorService as ThreadPoolExecutor\n+ val noProcessors = Runtime.getRuntime().availableProcessors()\n+ Assert.assertEquals(executorService.corePoolSize, 2 * noProcessors)\n+ Assert.assertEquals(executorService.maximumPoolSize, 2 * noProcessors)\n+ Assert.assertEquals(executorService.getKeepAliveTime(SECONDS), 60L)\n+ }\n+\n+ @Test\n+ fun test_awaitTermination() {\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.awaitTermination(timeout, unit)\n+ Mockito.verify(mExecutorService).awaitTermination(timeout, unit)\n+ }\n+\n+ @Test\n+ fun test_execute() {\n+ val runnable = Runnable { }\n+ executor.execute(runnable)\n+ Mockito.verify(mExecutorService).execute(runnable)\n+ }\n+\n+ @Test\n+ fun test_invokeAll() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ executor.invokeAll(taskCollection)\n+ Mockito.verify(mExecutorService).invokeAll(taskCollection)\n+ }\n+\n+ @Test\n+ fun test_invokeAllWithTimeOut() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.invokeAll(taskCollection, timeout, unit)\n+ Mockito.verify(mExecutorService).invokeAll(taskCollection, timeout, unit)\n+ }\n+\n+ @Test\n+ fun test_invokeAny() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ executor.invokeAny(taskCollection)\n+ Mockito.verify(mExecutorService).invokeAny(taskCollection)\n+ }\n+\n+ @Test\n+ fun test_invokeAnyWithTimeOut() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.invokeAny(taskCollection, timeout, unit)\n+ Mockito.verify(mExecutorService).invokeAny(taskCollection, timeout, unit)\n+ }\n+\n+ @Test\n+ fun test_isShutdown() {\n+ executor.isShutdown()\n+ Mockito.verify(mExecutorService).isShutdown()\n+ }\n+\n+ @Test\n+ fun test_isTerminated() {\n+ executor.isTerminated()\n+ Mockito.verify(mExecutorService).isTerminated()\n+ }\n+\n+ @Test\n+ fun test_shutdown() {\n+ executor.shutdown()\n+ Mockito.verify(mExecutorService).shutdown()\n+ }\n+\n+ @Test\n+ fun test_shutdownNow() {\n+ executor.shutdownNow()\n+ Mockito.verify(mExecutorService).shutdownNow()\n+ }\n+\n+ @Test\n+ fun test_submit_Callable() {\n+ val callable = Callable { }\n+ executor.submit(callable)\n+ Mockito.verify(mExecutorService).submit(callable)\n+ }\n+\n+ @Test\n+ fun test_submit_RunnableWithResult() {\n+ val callable = Runnable { }\n+ val result = \"121\"\n+ executor.submit(callable, result)\n+ Mockito.verify(mExecutorService).submit(callable, result)\n+ }\n+\n+ @Test\n+ fun test_submit_RunnableOnly() {\n+ val callable = Runnable { }\n+ executor.submit(callable)\n+ Mockito.verify(mExecutorService).submit(callable)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/MainThreadExecutorTest.kt",
"diff": "+package com.clevertap.android.sdk.task\n+\n+import android.os.Handler\n+import android.os.Looper\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class MainThreadExecutorTest : BaseTestCase() {\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ }\n+\n+ @Test\n+ fun test_execute() {\n+ val handler = Mockito.mock(Handler::class.java)\n+ val executor = MainThreadExecutor()\n+ executor.mainThreadHandler = handler\n+ val runnable = Runnable { }\n+ executor.execute(runnable)\n+ Mockito.verify(handler).post(runnable)\n+ }\n+\n+ @Test\n+ fun test_setMainThreadHandler() {\n+ val handler = Handler()\n+ val executor = MainThreadExecutor()\n+ executor.setMainThreadHandler(handler)\n+ Assert.assertEquals(executor.mainThreadHandler, handler)\n+ }\n+\n+ @Test\n+ fun test_execute_whenRunnableRuns_RunsOnMainThread() {\n+ val executor = MainThreadExecutor()\n+ val runnable = Runnable {\n+ Assert.assertTrue(Looper.myLooper() == Looper.getMainLooper())\n+ }\n+ executor.execute(runnable)\n+\n+ //or\n+ Assert.assertTrue(executor.mainThreadHandler.looper == Looper.getMainLooper())\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutorTest.kt",
"diff": "+package com.clevertap.android.sdk.task\n+\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.RobolectricTestRunner\n+import java.util.concurrent.Callable\n+import java.util.concurrent.ExecutorService\n+import java.util.concurrent.TimeUnit\n+\n+@RunWith(RobolectricTestRunner::class)\n+class PostAsyncSafelyExecutorTest : BaseTestCase() {\n+\n+ private lateinit var mExecutorService: ExecutorService\n+ private lateinit var executor: PostAsyncSafelyExecutor\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ mExecutorService = Mockito.mock(ExecutorService::class.java)\n+ executor = PostAsyncSafelyExecutor()\n+ executor.setExecutor(mExecutorService)\n+ }\n+\n+ @Test\n+ fun test_executorServiceConfigs() {\n+ val executor = PostAsyncSafelyExecutor()\n+ Assert.assertTrue(executor.mExecutor is ExecutorService)\n+ }\n+\n+ @Test\n+ fun test_awaitTermination() {\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.awaitTermination(timeout, unit)\n+ Mockito.verify(mExecutorService).awaitTermination(timeout, unit)\n+ }\n+\n+ @Test\n+ fun test_execute() {\n+ val runnable = Runnable { }\n+ executor.execute(runnable)\n+ Mockito.verify(mExecutorService).execute(runnable)\n+ }\n+\n+ @Test(expected = UnsupportedOperationException::class)\n+ fun test_invokeAll() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ executor.invokeAll(taskCollection)\n+ }\n+\n+ @Test(expected = UnsupportedOperationException::class)\n+ fun test_invokeAllWithTimeOut() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.invokeAll(taskCollection, timeout, unit)\n+ }\n+\n+ @Test(expected = UnsupportedOperationException::class)\n+ fun test_invokeAny() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ executor.invokeAny(taskCollection)\n+ }\n+\n+ @Test(expected = UnsupportedOperationException::class)\n+ fun test_invokeAnyWithTimeOut() {\n+ val taskCollection = ArrayList<Callable<Void>>()\n+ val timeout = 10L\n+ val unit = TimeUnit.MINUTES\n+ executor.invokeAny(taskCollection, timeout, unit)\n+ }\n+\n+ @Test\n+ fun test_isShutdown() {\n+ executor.isShutdown()\n+ Mockito.verify(mExecutorService).isShutdown()\n+ }\n+\n+ @Test\n+ fun test_isTerminated() {\n+ executor.isTerminated()\n+ Mockito.verify(mExecutorService).isTerminated()\n+ }\n+\n+ @Test\n+ fun test_shutdown() {\n+ executor.shutdown()\n+ Mockito.verify(mExecutorService).shutdown()\n+ }\n+\n+ @Test\n+ fun test_shutdownNow() {\n+ executor.shutdownNow()\n+ Mockito.verify(mExecutorService).shutdownNow()\n+ }\n+\n+ @Test\n+ fun test_submit_Callable() {\n+ val callable = Callable { }\n+ executor.submit(callable)\n+ Mockito.verify(mExecutorService).submit(callable)\n+ }\n+\n+ @Test\n+ fun test_submit_RunnableWithResult() {\n+ val callable = Runnable { }\n+ val result = \"121\"\n+ executor.submit(callable, result)\n+ Mockito.verify(mExecutorService).submit(callable, result)\n+ }\n+\n+ @Test\n+ fun test_submit_RunnableOnly() {\n+ val callable = Runnable { }\n+ executor.submit(callable)\n+ Mockito.verify(mExecutorService).submit(callable)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(680)-Added test cases for Task Package |
116,612 | 04.03.2021 13:44:55 | -19,080 | c94bb412564895b68ff7a3b42fdd6f0a0764f70f | task(TDD): reduce call stack operations by removing redundant method _getManifestStringValueForKey() from ManifestInfo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -67,33 +67,33 @@ public class ManifestInfo {\nmetaData = new Bundle();\n}\nif (accountId == null) {\n- accountId = _getManifestStringValueForKey(metaData, Constants.LABEL_ACCOUNT_ID);\n+ accountId = metaData.getString(Constants.LABEL_ACCOUNT_ID);\n}\nif (accountToken == null) {\n- accountToken = _getManifestStringValueForKey(metaData, Constants.LABEL_TOKEN);\n+ accountToken = metaData.getString(Constants.LABEL_TOKEN);\n}\nif (accountRegion == null) {\n- accountRegion = _getManifestStringValueForKey(metaData, Constants.LABEL_REGION);\n- }\n- notificationIcon = _getManifestStringValueForKey(metaData, Constants.LABEL_NOTIFICATION_ICON);\n- useADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));\n- appLaunchedDisabled = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));\n- excludedActivities = _getManifestStringValueForKey(metaData, Constants.LABEL_INAPP_EXCLUDE);\n- sslPinning = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_SSL_PINNING));\n- backgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BACKGROUND_SYNC));\n- useCustomID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_CUSTOM_ID));\n- fcmSenderId = _getManifestStringValueForKey(metaData, Constants.LABEL_FCM_SENDER_ID);\n+ accountRegion = metaData.getString(Constants.LABEL_REGION);\n+ }\n+ notificationIcon = metaData.getString(Constants.LABEL_NOTIFICATION_ICON);\n+ useADID = \"1\".equals(metaData.getString(Constants.LABEL_USE_GOOGLE_AD_ID));\n+ appLaunchedDisabled = \"1\".equals(metaData.getString(Constants.LABEL_DISABLE_APP_LAUNCH));\n+ excludedActivities = metaData.getString(Constants.LABEL_INAPP_EXCLUDE);\n+ sslPinning = \"1\".equals(metaData.getString(Constants.LABEL_SSL_PINNING));\n+ backgroundSync = \"1\".equals(metaData.getString(Constants.LABEL_BACKGROUND_SYNC));\n+ useCustomID = \"1\".equals(metaData.getString(Constants.LABEL_CUSTOM_ID));\n+ fcmSenderId = metaData.getString(Constants.LABEL_FCM_SENDER_ID);\nif (fcmSenderId != null) {\nfcmSenderId = fcmSenderId.replace(\"id:\", \"\");\n}\n- packageName = _getManifestStringValueForKey(metaData, Constants.LABEL_PACKAGE_NAME);\n- beta = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BETA));\n+ packageName = metaData.getString(Constants.LABEL_PACKAGE_NAME);\n+ beta = \"1\".equals(metaData.getString(Constants.LABEL_BETA));\nif (intentServiceName == null) {\n- intentServiceName = _getManifestStringValueForKey(metaData, Constants.LABEL_INTENT_SERVICE);\n+ intentServiceName = metaData.getString(Constants.LABEL_INTENT_SERVICE);\n}\n- xiaomiAppKey = _getManifestStringValueForKey(metaData, Constants.LABEL_XIAOMI_APP_KEY);\n- xiaomiAppID = _getManifestStringValueForKey(metaData, Constants.LABEL_XIAOMI_APP_ID);\n+ xiaomiAppKey = metaData.getString(Constants.LABEL_XIAOMI_APP_KEY);\n+ xiaomiAppID = metaData.getString(Constants.LABEL_XIAOMI_APP_ID);\nprofileKeys = parseProfileKeys(metaData);\n}\n@@ -167,7 +167,7 @@ public class ManifestInfo {\n}\nprivate String[] parseProfileKeys(final Bundle metaData) {\n- String profileKeyString = _getManifestStringValueForKey(metaData, Constants.CLEVERTAP_IDENTIFIER);\n+ String profileKeyString = metaData.getString(Constants.CLEVERTAP_IDENTIFIER);\nreturn !TextUtils.isEmpty(profileKeyString) ? profileKeyString.split(Constants.SEPARATOR_COMMA)\n: NullConstants.NULL_STRING_ARRAY;\n}\n@@ -178,12 +178,4 @@ public class ManifestInfo {\naccountRegion = region;\n}\n- private static String _getManifestStringValueForKey(Bundle manifest, String name) {\n- try {\n- Object o = manifest.get(name);\n- return (o != null) ? o.toString() : null;\n- } catch (Throwable t) {\n- return null;\n- }\n- }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): reduce call stack operations by removing redundant method _getManifestStringValueForKey() from ManifestInfo SDK-660 |
116,621 | 05.03.2021 16:35:04 | -19,080 | ab7b7c7c1d1d12a84a9ad464e831be77dff7a2bd | Task(609):Added test cases for task API's | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -90,7 +90,7 @@ class CleverTapFactory {\ncoreState.setInAppController(inAppController);\ncoreState.getControllerManager().setInAppController(inAppController);\n- initFeatureFlags(context, coreState, config, deviceInfo, callbackManager, analyticsManager);\n+ initFeatureFlags(context, controllerManager, config, deviceInfo, callbackManager, analyticsManager);\nLocationManager locationManager = new LocationManager(context, config, coreMetaData, baseEventQueueManager);\ncoreState.setLocationManager(locationManager);\n@@ -113,13 +113,13 @@ class CleverTapFactory {\nreturn coreState;\n}\n- static void initFeatureFlags(Context context, CoreState coreState, CleverTapInstanceConfig config,\n+ static void initFeatureFlags(Context context, ControllerManager controllerManager, CleverTapInstanceConfig config,\nDeviceInfo deviceInfo, BaseCallbackManager callbackManager, AnalyticsManager analyticsManager) {\nLogger.v(\"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\nif (config.isAnalyticsOnly()) {\nconfig.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n} else {\n- coreState.getControllerManager().setCTFeatureFlagsController(CTFeatureFlagsFactory.getInstance(context,\n+ controllerManager.setCTFeatureFlagsController(CTFeatureFlagsFactory.getInstance(context,\ndeviceInfo.getDeviceID(),\nconfig, callbackManager, analyticsManager));\nconfig.getLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutorTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutorTest.kt",
"diff": "@@ -39,9 +39,30 @@ class PostAsyncSafelyExecutorTest : BaseTestCase() {\n@Test\nfun test_execute() {\n- val runnable = Runnable { }\n- executor.execute(runnable)\n- Mockito.verify(mExecutorService).execute(runnable)\n+ executor.execute({\n+ println(\"Do something\")\n+ })\n+ Mockito.verify(mExecutorService).execute(Mockito.any(Runnable::class.java))\n+ }\n+\n+ @Test\n+ fun test_execute_whenExecuteCalledFromAsyncThread() {\n+ var threadID1 = -1L\n+ var threadID2 = -2L\n+ executor.execute({\n+ threadID1 = Thread.currentThread().id\n+ executor.execute({\n+ threadID2 = Thread.currentThread().id\n+ })\n+ })\n+ Mockito.verify(mExecutorService).execute(Mockito.any(Runnable::class.java))\n+ Thread.sleep(1000)\n+ Assert.assertEquals(threadID1, threadID2)\n+ }\n+\n+ @Test(expected = NullPointerException::class)\n+ fun test_execute_WhenNullRunnable_ThrowsNPE() {\n+ executor.execute(null)\n}\n@Test(expected = UnsupportedOperationException::class)\n@@ -96,11 +117,16 @@ class PostAsyncSafelyExecutorTest : BaseTestCase() {\nMockito.verify(mExecutorService).shutdownNow()\n}\n+ @Test(expected = NullPointerException::class)\n+ fun test_submit_WhenNullCallable_ThrowsNPE() {\n+ executor.submit(null)\n+ }\n+\n@Test\nfun test_submit_Callable() {\nval callable = Callable { }\nexecutor.submit(callable)\n- Mockito.verify(mExecutorService).submit(callable)\n+ Mockito.verify(mExecutorService).submit(Mockito.any(Callable::class.java))\n}\n@Test\n@@ -108,13 +134,24 @@ class PostAsyncSafelyExecutorTest : BaseTestCase() {\nval callable = Runnable { }\nval result = \"121\"\nexecutor.submit(callable, result)\n- Mockito.verify(mExecutorService).submit(callable, result)\n+ Mockito.verify(mExecutorService).execute(Mockito.any(Runnable::class.java))\n+ }\n+\n+ @Test(expected = NullPointerException::class)\n+ fun test_submitWithResult_WhenNullRunnable_ThrowNPE() {\n+ val result = \"121\"\n+ executor.submit(null, result)\n}\n@Test\nfun test_submit_RunnableOnly() {\nval callable = Runnable { }\nexecutor.submit(callable)\n- Mockito.verify(mExecutorService).submit(callable)\n+ Mockito.verify(mExecutorService).execute(Mockito.any(Runnable::class.java))\n+ }\n+\n+ @Test(expected = NullPointerException::class)\n+ fun test_submitRunnableOnly_WhenNullRunnable_ThrowsNPE() {\n+ executor.submit(null)\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):Added test cases for task API's |
116,621 | 05.03.2021 18:20:16 | -19,080 | 21f06c0f5b4051a9836f36c52af03120aa6f9f54 | Task(609):remove BaseCTApiListener.java. Not needed anymore | [
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCTApiListener.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import android.content.Context;\n-import com.clevertap.android.sdk.validation.ValidationResultStack;\n-\n-public interface BaseCTApiListener {\n-\n- CleverTapInstanceConfig config();\n-\n- Context context();\n-\n- DeviceInfo deviceInfo();\n-\n- ValidationResultStack remoteErrorLogger();\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTPushProviderListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTPushProviderListener.java",
"diff": "package com.clevertap.android.sdk.pushnotification;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-public interface CTPushProviderListener extends BaseCTApiListener {\n+public interface CTPushProviderListener {\nvoid onNewToken(String token, PushConstants.PushType pushType);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -70,7 +70,7 @@ import org.json.JSONObject;\n*/\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n-public class PushProviders {\n+public class PushProviders implements CTPushProviderListener {\nprivate final ArrayList<PushConstants.PushType> allEnabledPushTypes = new ArrayList<>();\n@@ -336,6 +336,7 @@ public class PushProviders {\nreturn false;\n}\n+ @Override\npublic void onNewToken(String freshToken, PushConstants.PushType pushType) {\nif (!TextUtils.isEmpty(freshToken)) {\ndoTokenRefresh(freshToken, pushType);\n@@ -600,8 +601,9 @@ public class PushProviders {\nCTPushProvider pushProvider = null;\ntry {\nClass<?> providerClass = Class.forName(className);\n- Constructor<?> constructor = providerClass.getConstructor(CTPushProviderListener.class);\n- pushProvider = (CTPushProvider) constructor.newInstance(this);\n+ Constructor<?> constructor = providerClass\n+ .getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class);\n+ pushProvider = (CTPushProvider) constructor.newInstance(this, mContext, mConfig);\nmConfig.log(PushConstants.LOG_TAG, \"Found provider:\" + className);\n} catch (InstantiationException e) {\nmConfig.log(PushConstants.LOG_TAG, \"Unable to create provider InstantiationException\" + className);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmPushProvider.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmPushProvider.java",
"diff": "@@ -3,8 +3,10 @@ package com.clevertap.android.sdk.pushnotification.fcm;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.ANDROID_PLATFORM;\nimport android.annotation.SuppressLint;\n+import android.content.Context;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n@@ -19,8 +21,8 @@ public class FcmPushProvider implements CTPushProvider {\nprivate IFcmSdkHandler mHandler;\n@SuppressLint(value = \"unused\")\n- public FcmPushProvider(CTPushProviderListener ctPushListener) {\n- mHandler = new FcmSdkHandlerImpl(ctPushListener);\n+ public FcmPushProvider(CTPushProviderListener ctPushListener, Context context, CleverTapInstanceConfig config) {\n+ mHandler = new FcmSdkHandlerImpl(ctPushListener, context, config);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -6,8 +6,10 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.\nimport static com.clevertap.android.sdk.utils.PackageUtils.isGooglePlayServicesAvailable;\nimport static com.clevertap.android.sdk.utils.PackageUtils.isGooglePlayStoreAvailable;\n+import android.content.Context;\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.ManifestInfo;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n@@ -25,11 +27,18 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\nprivate final CTPushProviderListener listener;\n+ private final CleverTapInstanceConfig mConfig;\n+\n+ private final Context mContext;\n+\nprivate ManifestInfo mManifestInfo;\n- public FcmSdkHandlerImpl(final CTPushProviderListener listener) {\n+ public FcmSdkHandlerImpl(final CTPushProviderListener listener, final Context context,\n+ final CleverTapInstanceConfig config) {\n+ mContext = context;\n+ mConfig = config;\nthis.listener = listener;\n- this.mManifestInfo = ManifestInfo.getInstance(listener.context());\n+ this.mManifestInfo = ManifestInfo.getInstance(context);\n}\npublic PushType getPushType() {\n@@ -39,19 +48,19 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic boolean isAvailable() {\ntry {\n- if (!isGooglePlayServicesAvailable(listener.context())) {\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"Google Play services is currently unavailable.\");\n+ if (!isGooglePlayServicesAvailable(mContext)) {\n+ mConfig.log(LOG_TAG, FCM_LOG_TAG + \"Google Play services is currently unavailable.\");\nreturn false;\n}\nString senderId = getSenderId();\nif (TextUtils.isEmpty(senderId)) {\n- listener.config()\n+ mConfig\n.log(LOG_TAG, FCM_LOG_TAG + \"The FCM sender ID is not set. Unable to register for FCM.\");\nreturn false;\n}\n} catch (Throwable t) {\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"Unable to register with FCM.\", t);\n+ mConfig.log(LOG_TAG, FCM_LOG_TAG + \"Unable to register with FCM.\", t);\nreturn false;\n}\nreturn true;\n@@ -59,40 +68,42 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic boolean isSupported() {\n- return isGooglePlayStoreAvailable(listener.context());\n+ return isGooglePlayStoreAvailable(mContext);\n}\n@Override\npublic void requestToken() {\ntry {\nString tokenUsingManifestMetaEntry = Utils\n- .getFcmTokenUsingManifestMetaEntry(listener.context(), listener.config());\n+ .getFcmTokenUsingManifestMetaEntry(mContext, mConfig);\nif (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + tokenUsingManifestMetaEntry);\n+ mConfig.log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + tokenUsingManifestMetaEntry);\nlistener.onNewToken(tokenUsingManifestMetaEntry, getPushType());\n} else {\n- listener.config()\n+ mConfig\n.log(LOG_TAG, FCM_LOG_TAG + \"Requesting FCM token using googleservices.json\");\nFirebaseInstanceId.getInstance().getInstanceId()\n.addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {\n@Override\npublic void onComplete(@NonNull Task<InstanceIdResult> task) {\nif (!task.isSuccessful()) {\n- listener.config()\n- .log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json failed\", task.getException());\n+ mConfig\n+ .log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json failed\",\n+ task.getException());\nlistener.onNewToken(null, getPushType());\nreturn;\n}\n// Get new Instance ID token\nString token = task.getResult() != null ? task.getResult().getToken() : null;\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json - \" + token);\n+ mConfig\n+ .log(LOG_TAG, FCM_LOG_TAG + \"FCM token using googleservices.json - \" + token);\nlistener.onNewToken(token, getPushType());\n}\n});\n}\n} catch (Throwable t) {\n- listener.config().log(LOG_TAG, FCM_LOG_TAG + \"Error requesting FCM token\", t);\n+ mConfig.log(LOG_TAG, FCM_LOG_TAG + \"Error requesting FCM token\", t);\nlistener.onNewToken(null, getPushType());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt",
"diff": "@@ -28,7 +28,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\nlistener = mock(CTPushProviderListener::class.java)\n- handler = FcmSdkHandlerImpl(listener)\n+ handler = FcmSdkHandlerImpl(listener, context, config)\n`when`(listener.context()).thenReturn(application)\n`when`(listener.config()).thenReturn(cleverTapInstanceConfig)\nmanifestInfo = mock(ManifestInfo::class.java)\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsPushProvider.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsPushProvider.java",
"diff": "@@ -5,8 +5,10 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.ANDROID_P\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS;\nimport android.annotation.SuppressLint;\n+import android.content.Context;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n@@ -23,16 +25,11 @@ public class HmsPushProvider implements CTPushProvider {\nprivate @NonNull\nIHmsSdkHandler hmsSdkHandler;\n- @NonNull\n- @Override\n- public PushConstants.PushType getPushType() {\n- return HPS;\n- }\n-\n@SuppressLint(value = \"unused\")\n- public HmsPushProvider(@NonNull CTPushProviderListener ctPushListener) {\n+ public HmsPushProvider(@NonNull CTPushProviderListener ctPushListener, Context context,\n+ CleverTapInstanceConfig config) {\nthis.ctPushListener = ctPushListener;\n- this.hmsSdkHandler = new HmsSdkHandler(ctPushListener);\n+ this.hmsSdkHandler = new HmsSdkHandler(context, config);\n}\n@Override\n@@ -40,6 +37,12 @@ public class HmsPushProvider implements CTPushProvider {\nreturn ANDROID_PLATFORM;\n}\n+ @NonNull\n+ @Override\n+ public PushConstants.PushType getPushType() {\n+ return HPS;\n+ }\n+\n@Override\npublic boolean isAvailable() {\nreturn hmsSdkHandler.isAvailable();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsSdkHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsSdkHandler.java",
"diff": "@@ -5,8 +5,9 @@ import static com.clevertap.android.hms.HmsConstants.HCM_SCOPE;\nimport static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+import android.content.Context;\nimport android.text.TextUtils;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.huawei.agconnect.config.AGConnectServicesConfig;\nimport com.huawei.hms.aaid.HmsInstanceId;\nimport com.huawei.hms.api.HuaweiApiAvailability;\n@@ -16,19 +17,22 @@ import com.huawei.hms.api.HuaweiApiAvailability;\n*/\nclass HmsSdkHandler implements IHmsSdkHandler {\n- private final BaseCTApiListener mListener;\n+ private final Context context;\n- HmsSdkHandler(BaseCTApiListener ctPushListener) {\n- this.mListener = ctPushListener;\n+ private final CleverTapInstanceConfig mConfig;\n+\n+ HmsSdkHandler(final Context context, final CleverTapInstanceConfig config) {\n+ this.context = context.getApplicationContext();\n+ mConfig = config;\n}\n@Override\npublic String appId() {\nString appId = null;\ntry {\n- appId = AGConnectServicesConfig.fromContext(mListener.context()).getString(APP_ID_KEY);\n+ appId = AGConnectServicesConfig.fromContext(context).getString(APP_ID_KEY);\n} catch (Throwable t) {\n- mListener.config().log(LOG_TAG, HMS_LOG_TAG + \"HMS availability check failed.\");\n+ mConfig.log(LOG_TAG, HMS_LOG_TAG + \"HMS availability check failed.\");\n}\nreturn appId;\n}\n@@ -41,9 +45,9 @@ class HmsSdkHandler implements IHmsSdkHandler {\n@Override\npublic boolean isSupported() {\ntry {\n- return HuaweiApiAvailability.getInstance().isHuaweiMobileNoticeAvailable(mListener.context()) == 0;\n+ return HuaweiApiAvailability.getInstance().isHuaweiMobileNoticeAvailable(context) == 0;\n} catch (Throwable e) {\n- mListener.config().log(LOG_TAG, HMS_LOG_TAG + \"HMS is supported check failed.\");\n+ mConfig.log(LOG_TAG, HMS_LOG_TAG + \"HMS is supported check failed.\");\nreturn false;\n}\n}\n@@ -54,10 +58,10 @@ class HmsSdkHandler implements IHmsSdkHandler {\ntry {\nString appId = appId();\nif (!TextUtils.isEmpty(appId)) {\n- token = HmsInstanceId.getInstance(mListener.context()).getToken(appId, HCM_SCOPE);\n+ token = HmsInstanceId.getInstance(context).getToken(appId, HCM_SCOPE);\n}\n} catch (Throwable t) {\n- mListener.config().log(LOG_TAG, HMS_LOG_TAG + \"Error requesting HMS token\", t);\n+ mConfig.log(LOG_TAG, HMS_LOG_TAG + \"Error requesting HMS token\", t);\n}\nreturn token;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsHandlerTest.java",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsHandlerTest.java",
"diff": "@@ -42,7 +42,7 @@ public class HmsHandlerTest extends BaseTestCase {\n.createInstance(TestApplication.Companion.getApplication(), Constant.ACC_ID, Constant.ACC_TOKEN);\nfinal CTPushProviderListener ctPushProviderListener = Mockito.mock(CTPushProviderListener.class);\n- sdkHandler = new HmsSdkHandler(ctPushProviderListener);\n+ sdkHandler = new HmsSdkHandler(context, config);\nMockito.when(ctPushProviderListener.context()).thenReturn(TestApplication.Companion.getApplication());\nMockito.when(ctPushProviderListener.config()).thenReturn(mCleverTapInstanceConfig);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiPushProvider.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiPushProvider.java",
"diff": "@@ -6,8 +6,10 @@ import static com.clevertap.android.xps.XpsConstants.MIN_CT_ANDROID_SDK_VERSION;\nimport static java.lang.Boolean.TRUE;\nimport android.annotation.SuppressLint;\n+import android.content.Context;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n@@ -25,9 +27,10 @@ public class XiaomiPushProvider implements CTPushProvider {\nIMiSdkHandler miSdkHandler;\n@SuppressLint(value = \"unused\")\n- public XiaomiPushProvider(@NonNull CTPushProviderListener ctPushListener) {\n+ public XiaomiPushProvider(@NonNull CTPushProviderListener ctPushListener, Context context,\n+ CleverTapInstanceConfig config) {\nthis.ctPushListener = ctPushListener;\n- this.miSdkHandler = new XiaomiSdkHandler(ctPushListener);\n+ this.miSdkHandler = new XiaomiSdkHandler(context, config);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"diff": "@@ -8,7 +8,7 @@ import android.content.Context;\nimport android.os.Process;\nimport android.text.TextUtils;\nimport androidx.annotation.RestrictTo;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.ManifestInfo;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport java.util.List;\n@@ -18,15 +18,18 @@ import java.util.List;\n*/\nclass XiaomiSdkHandler implements IMiSdkHandler {\n- private final BaseCTApiListener ctApiListener;\n+ private final Context context;\nprivate boolean isRegistered;\n+ private final CleverTapInstanceConfig mConfig;\n+\nprivate ManifestInfo manifestInfo;\n- XiaomiSdkHandler(BaseCTApiListener ctPushListener) {\n- this.ctApiListener = ctPushListener;\n- this.manifestInfo = ManifestInfo.getInstance(ctPushListener.context());\n+ XiaomiSdkHandler(final Context context, final CleverTapInstanceConfig config) {\n+ this.context = context.getApplicationContext();\n+ mConfig = config;\n+ this.manifestInfo = ManifestInfo.getInstance(context);\ninit();\n}\n@@ -56,10 +59,10 @@ class XiaomiSdkHandler implements IMiSdkHandler {\ninit();\n}\ntry {\n- token = MiPushClient.getRegId(ctApiListener.context());\n- ctApiListener.config().log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Token Success- \" + token);\n+ token = MiPushClient.getRegId(context);\n+ mConfig.log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Token Success- \" + token);\n} catch (Throwable t) {\n- ctApiListener.config().log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Token Failed\");\n+ mConfig.log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Token Failed\");\n}\nreturn token;\n@@ -68,14 +71,14 @@ class XiaomiSdkHandler implements IMiSdkHandler {\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic void register(String appId, String appKey) throws RegistrationException {\ntry {\n- MiPushClient.registerPush(ctApiListener.context(), appId, appKey);\n+ MiPushClient.registerPush(context, appId, appKey);\nisRegistered = true;\n- ctApiListener.config()\n+ mConfig\n.log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Registeration success for appId-\" + appId + \" and appKey-\"\n+ appKey);\n} catch (Throwable throwable) {\nisRegistered = false;\n- ctApiListener.config()\n+ mConfig\n.log(LOG_TAG,\nXIAOMI_LOG_TAG + \"Xiaomi Registration failed for appId-\" + appId + \" appKey-\" + appKey);\nthrow new RegistrationException(\"Registration failed for appId \" + appId + \" and appKey \" + appKey);\n@@ -88,7 +91,7 @@ class XiaomiSdkHandler implements IMiSdkHandler {\nboolean shouldInit(String mainProcessName) {\n- ActivityManager am = ((ActivityManager) ctApiListener.context().getSystemService(Context.ACTIVITY_SERVICE));\n+ ActivityManager am = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE));\nList<ActivityManager.RunningAppProcessInfo> processInfos = am.getRunningAppProcesses();\n@@ -103,7 +106,7 @@ class XiaomiSdkHandler implements IMiSdkHandler {\n}\nprivate void init() {\n- String packageName = ctApiListener.context().getPackageName();\n+ String packageName = context.getPackageName();\nif (shouldInit(packageName)) {\nString appId = appId();\nString appKey = appKey();\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.shared.test\nimport android.os.Build.VERSION_CODES\nimport androidx.test.ext.junit.runners.AndroidJUnit4\n-import com.clevertap.android.sdk.BaseCTApiListener\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.CleverTapInstanceConfig\nimport org.junit.*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):remove BaseCTApiListener.java. Not needed anymore |
116,621 | 05.03.2021 18:31:15 | -19,080 | e91862b3a81ff52f50e612561b5b7efcdc64a824 | Task(609):Added correct path for custom view in xml. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_image_layout.xml",
"new_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_image_layout.xml",
"diff": "android:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/imageView\"\nandroid:layout_width=\"510dp\"\nandroid:layout_height=\"300dp\"\nandroid:src=\"@drawable/ct_audio\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.SquareImageView\n+ <com.clevertap.android.sdk.customviews.SquareImageView\nandroid:id=\"@+id/squareImageView\"\nandroid:layout_width=\"300dp\"\nandroid:layout_height=\"300dp\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout-land/inbox_icon_message_layout.xml",
"new_path": "clevertap-core/src/main/res/layout-land/inbox_icon_message_layout.xml",
"diff": "android:layout_height=\"wrap_content\"\nandroid:layout_weight=\"1\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:scaleType=\"fitCenter\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.HorizontalSquareImageView\n+ <com.clevertap.android.sdk.customviews.HorizontalSquareImageView\nandroid:id=\"@+id/square_media_image\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"200dp\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout-land/inbox_simple_message_layout.xml",
"new_path": "clevertap-core/src/main/res/layout-land/inbox_simple_message_layout.xml",
"diff": "android:layout_weight=\"1\"\nandroid:visibility=\"visible\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:scaleType=\"fitCenter\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.HorizontalSquareImageView\n+ <com.clevertap.android.sdk.customviews.HorizontalSquareImageView\nandroid:id=\"@+id/square_media_image\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"200dp\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout/inbox_carousel_image_layout.xml",
"new_path": "clevertap-core/src/main/res/layout/inbox_carousel_image_layout.xml",
"diff": "android:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/imageView\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:src=\"@drawable/ct_audio\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.SquareImageView\n+ <com.clevertap.android.sdk.customviews.SquareImageView\nandroid:id=\"@+id/squareImageView\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout/inbox_icon_message_layout.xml",
"new_path": "clevertap-core/src/main/res/layout/inbox_icon_message_layout.xml",
"diff": "android:layout_height=\"wrap_content\"\nandroid:layout_below=\"@id/body_linear_layout\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.SquareImageView\n+ <com.clevertap.android.sdk.customviews.SquareImageView\nandroid:id=\"@+id/square_media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout/inbox_simple_message_layout.xml",
"new_path": "clevertap-core/src/main/res/layout/inbox_simple_message_layout.xml",
"diff": "android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\">\n- <com.clevertap.android.sdk.RectangleImageView\n+ <com.clevertap.android.sdk.customviews.RectangleImageView\nandroid:id=\"@+id/media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:scaleType=\"centerCrop\"\nandroid:visibility=\"gone\" />\n- <com.clevertap.android.sdk.SquareImageView\n+ <com.clevertap.android.sdk.customviews.SquareImageView\nandroid:id=\"@+id/square_media_image\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):Added correct path for custom view in xml. |
116,621 | 05.03.2021 19:33:23 | -19,080 | cc23353764a3d93b254911f7b2799a9689d0f7f0 | Task(609):Added Null check & FeatureNotSupportedException for analytics configuration. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -24,6 +24,7 @@ import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.EventDetail;\n+import com.clevertap.android.sdk.exceptions.FeatureNotSupportedException;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\n@@ -596,6 +597,25 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+ public static void fcmTokenRefresh(Context context, String token) {\n+\n+ for (CleverTapAPI instance : getAvailableInstances(context)) {\n+ if (instance == null || instance.getCoreState().getConfig().isAnalyticsOnly()) {\n+ Logger.d(instance.getAccountId(),\n+ \"Instance is Analytics Only not processing device token\");\n+ continue;\n+ }\n+ //get token from Manifest\n+ String tokenUsingManifestMetaEntry = Utils\n+ .getFcmTokenUsingManifestMetaEntry(context, instance.getCoreState().getConfig());\n+ if (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n+ token = tokenUsingManifestMetaEntry;\n+ }\n+ instance.getCoreState().getPushProviders().doTokenRefresh(token, PushType.FCM);\n+ }\n+ }\n+\n/**\n* Returns the log level set for CleverTapAPI\n*\n@@ -1119,6 +1139,9 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Handler to get the feature flag values\n*/\npublic CTFeatureFlagsController featureFlag() {\n+ if (mCoreState.getConfig().isAnalyticsOnly()) {\n+ throw new FeatureNotSupportedException(\"Feature flag is not supported with analytics only configuration\");\n+ }\nreturn mCoreState.getControllerManager().getCTFeatureFlagsController();\n}\n@@ -1175,6 +1198,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ //Debug\n+\n/**\n* Returns the CTInboxListener object\n*\n@@ -1185,8 +1210,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn mCoreState.getCallbackManager().getInboxListener();\n}\n- //Debug\n-\n/**\n* This method sets the CTInboxListener\n*\n@@ -1237,6 +1260,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getCallbackManager().setPushNotificationListener(pushNotificationListener);\n}\n+ //Network Info handling\n+\n/**\n* Returns a unique CleverTap identifier suitable for use with install attribution providers.\n*\n@@ -1247,8 +1272,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn mCoreState.getDeviceInfo().getAttributionID();\n}\n- //Network Info handling\n-\n/**\n* Returns a unique identifier by which CleverTap identifies this user.\n*\n@@ -1315,6 +1338,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn mCoreState.getPushProviders().getCachedToken(type);\n}\n+ //Util\n+\n/**\n* Returns the DevicePushTokenRefreshListener\n*\n@@ -1325,8 +1350,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn mCoreState.getPushProviders().getDevicePushTokenRefreshListener();\n}\n- //Util\n-\n/**\n* This method is used to set the DevicePushTokenRefreshListener object\n*\n@@ -1381,6 +1404,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn mCoreState.getCallbackManager().getGeofenceCallback();\n}\n+ //DeepLink\n+\n/**\n* This method is used to set the geofence callback\n* Register to handle geofence responses from CleverTap\n@@ -1394,8 +1419,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getCallbackManager().setGeofenceCallback(geofenceCallback);\n}\n- //DeepLink\n-\n/**\n* Returns a Map of event names and corresponding event details of all the events raised\n*\n@@ -1673,6 +1696,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ //Session\n+\n/**\n* Marks the given messageId of {@link CTInboxMessage} object as read\n*\n@@ -1684,8 +1709,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmarkReadInboxMessage(message);\n}\n- //Session\n-\n@Override\npublic void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data,\nHashMap<String, String> keyValue) {\n@@ -1790,6 +1813,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic CTProductConfigController productConfig() {\n+ if (mCoreState.getConfig().isAnalyticsOnly()) {\n+ throw new FeatureNotSupportedException(\n+ \"Product config is not supported with analytics only configuration\");\n+ }\nreturn mCoreState.getCtProductConfigController();\n}\n@@ -2008,6 +2035,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getAnalyticsManager().pushNotificationClickedEvent(extras);\n}\n+ //Session\n+\n/**\n* Pushes the Notification Viewed event to CleverTap.\n*\n@@ -2019,8 +2048,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getAnalyticsManager().pushNotificationViewedEvent(extras);\n}\n- //Session\n-\n/**\n* Push a profile update.\n*\n@@ -2131,6 +2158,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getCallbackManager().setProductConfigListener(listener);\n}\n+ //Listener\n+\n/**\n* Sets the listener to get the list of currently running Display Campaigns via callback\n*\n@@ -2140,8 +2169,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nmCoreState.getCallbackManager().setDisplayUnitListener(listener);\n}\n- //Listener\n-\n@SuppressWarnings(\"unused\")\npublic void setInAppNotificationButtonListener(InAppNotificationButtonListener listener) {\nmCoreState.getCallbackManager().setInAppNotificationButtonListener(listener);\n@@ -2311,9 +2338,12 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n/*\nReinitialising product config & Feature Flag controllers with google ad id.\n*/\n-\n+ if (mCoreState.getControllerManager().getCTFeatureFlagsController() != null) {\nmCoreState.getControllerManager().getCTFeatureFlagsController().setGuidAndInit(deviceId);\n+ }\n+ if (mCoreState.getControllerManager().getCTProductConfigController() != null) {\nmCoreState.getControllerManager().getCTProductConfigController().setGuidAndInit(deviceId);\n+ }\ngetConfigLogger()\n.verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nmCoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n@@ -2458,24 +2488,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n- public static void fcmTokenRefresh(Context context, String token) {\n-\n- for (CleverTapAPI instance : getAvailableInstances(context)) {\n- if (instance == null || instance.getCoreState().getConfig().isAnalyticsOnly()) {\n- Logger.d(instance.getAccountId(),\n- \"Instance is Analytics Only not processing device token\");\n- continue;\n- }\n- //get token from Manifest\n- String tokenUsingManifestMetaEntry = Utils.getFcmTokenUsingManifestMetaEntry(context, instance.getCoreState().getConfig());\n- if (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\n- token = tokenUsingManifestMetaEntry;\n- }\n- instance.getCoreState().getPushProviders().doTokenRefresh(token, PushType.FCM);\n- }\n- }\n-\nprivate static ArrayList<CleverTapAPI> getAvailableInstances(Context context) {\nArrayList<CleverTapAPI> apiArrayList = new ArrayList<>();\nif (instances == null || instances.isEmpty()) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/exceptions/FeatureNotSupportedException.java",
"diff": "+package com.clevertap.android.sdk.exceptions;\n+\n+public class FeatureNotSupportedException extends RuntimeException {\n+\n+ public FeatureNotSupportedException(final String message) {\n+ super(message);\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):Added Null check & FeatureNotSupportedException for analytics configuration. |
116,621 | 05.03.2021 23:52:23 | -19,080 | a7eb8f9b2820aa968a920a6c1fdf05dcf239943c | Task(609):changed testcases with latest changes in Notification module | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmPushProviderTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmPushProviderTest.kt",
"diff": "package com.clevertap.android.sdk.pushnotification.fcm\n+import com.clevertap.android.sdk.CoreMetaData\n+import com.clevertap.android.sdk.DeviceInfo\n+import com.clevertap.android.sdk.MockDeviceInfo\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener\nimport com.clevertap.android.sdk.pushnotification.PushConstants.ANDROID_PLATFORM\nimport com.clevertap.android.shared.test.BaseTestCase\n@@ -22,7 +25,7 @@ class FcmPushProviderTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\nctPushProviderListener = mock(CTPushProviderListener::class.java)\n- provider = FcmPushProvider(ctPushProviderListener)\n+ provider = FcmPushProvider(ctPushProviderListener, application, cleverTapInstanceConfig)\nsdkHandler = mock(FcmSdkHandlerImpl::class.java)\nprovider.setHandler(sdkHandler)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt",
"diff": "@@ -28,9 +28,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\nlistener = mock(CTPushProviderListener::class.java)\n- handler = FcmSdkHandlerImpl(listener, context, config)\n- `when`(listener.context()).thenReturn(application)\n- `when`(listener.config()).thenReturn(cleverTapInstanceConfig)\n+ handler = FcmSdkHandlerImpl(listener, application, cleverTapInstanceConfig)\nmanifestInfo = mock(ManifestInfo::class.java)\nhandler.setManifestInfo(manifestInfo)\n}\n@@ -38,7 +36,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isAvailable_Unavailable_PlayServices_Returns_False() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenReturn(false)\n+ `when`(PackageUtils.isGooglePlayServicesAvailable(application)).thenReturn(false)\nAssert.assertFalse(handler.isAvailable)\n}\n}\n@@ -46,7 +44,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isAvailable_Valid_Manifest_Returns_True() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenReturn(true)\n+ `when`(PackageUtils.isGooglePlayServicesAvailable(application)).thenReturn(true)\n`when`(manifestInfo.fcmSenderId).thenReturn(FCM_SENDER_ID)\nAssert.assertTrue(handler.isAvailable)\n}\n@@ -55,7 +53,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isAvailable_InValid_Manifest_Valid_Config_Json_Returns_True() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenReturn(true)\n+ `when`(PackageUtils.isGooglePlayServicesAvailable(application)).thenReturn(true)\n`when`(manifestInfo.fcmSenderId).thenReturn(null)\nval app = mock(FirebaseApp::class.java)\n@@ -72,7 +70,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isAvailable_InValid_Manifest_InValid_Config_Json_Returns_False() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenReturn(true)\n+ `when`(PackageUtils.isGooglePlayServicesAvailable(application)).thenReturn(true)\n`when`(manifestInfo.fcmSenderId).thenReturn(null)\nval app = mock(FirebaseApp::class.java)\n@@ -89,7 +87,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isAvailable_Exception_Returns_False() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenThrow(RuntimeException(\"Something Went Wrong\"))\n+ `when`(PackageUtils.isGooglePlayServicesAvailable(application)).thenThrow(RuntimeException(\"Something Went Wrong\"))\nAssert.assertFalse(handler.isAvailable)\n}\n}\n@@ -97,7 +95,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isSupported_Returns_True() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayStoreAvailable(listener.context())).thenReturn(true)\n+ `when`(PackageUtils.isGooglePlayStoreAvailable(application)).thenReturn(true)\nAssert.assertTrue(handler.isSupported)\n}\n}\n@@ -105,7 +103,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun isSupported_Returns_False() {\nmockStatic(PackageUtils::class.java).use {\n- `when`(PackageUtils.isGooglePlayStoreAvailable(listener.context())).thenReturn(false)\n+ `when`(PackageUtils.isGooglePlayStoreAvailable(application)).thenReturn(false)\nAssert.assertFalse(handler.isSupported)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.kt",
"diff": "@@ -24,7 +24,6 @@ import org.robolectric.annotation.Config\nabstract class BaseTestCase {\nprotected lateinit var application: TestApplication\n- protected lateinit var baseCTApiListener: BaseCTApiListener\nprotected lateinit var cleverTapAPI: CleverTapAPI\nprotected lateinit var cleverTapInstanceConfig: CleverTapInstanceConfig\n@@ -34,8 +33,5 @@ abstract class BaseTestCase {\ncleverTapAPI = Mockito.mock(CleverTapAPI::class.java)\ncleverTapInstanceConfig =\nCleverTapInstanceConfig.createInstance(application, Constant.ACC_ID, Constant.ACC_TOKEN)\n- baseCTApiListener = Mockito.mock(BaseCTApiListener::class.java)\n- Mockito.`when`(baseCTApiListener.context()).thenReturn(application)\n- Mockito.`when`(baseCTApiListener.config()).thenReturn(cleverTapInstanceConfig)\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):changed testcases with latest changes in Notification module |
116,612 | 09.03.2021 16:13:30 | -19,080 | 58eb37ff9dd20b0757830f0b7626bfcca4499dd0 | task(TDD): add comments for _getManifestStringValueForKey() | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -178,6 +178,13 @@ public class ManifestInfo {\naccountRegion = region;\n}\n+ /**\n+ * This returns string representation of int,boolean,string,float value of given key\n+ *\n+ * @param manifest bundle to retrieve values from\n+ * @param name key of bundle\n+ * @return string representation of int,boolean,string,float\n+ */\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\nObject o = manifest.get(name);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): add comments for _getManifestStringValueForKey() SDK-660 |
116,621 | 11.03.2021 14:40:27 | -19,080 | 4f4f88ccfddb559a7ada1e5596710504980f7d3e | Task(609):removed tasks | [
{
"change_type": "DELETE",
"old_path": "clevertap-core/TODO.md",
"new_path": null,
"diff": "-// Remove this file once refactoring is done.\n-1. Logger Manager\n-2. Init Controllers in CoreState Lazily\n-3. StorageManager\n-4. typecasting revisit or add instance of check\n-5. All listeners should be passed inside the feature & decoupled from CLEVERTAPAPI\n-6. Create a class for Notification Creation Handling.\n-7. Activity Lifecycle Callback controller.\n-8. Enable/Disable sub-feature via controllers.e.g ( disable xioami push on-demand)\n-9. Revisit Utils class to move internal methods to CleverTapUtils class\n-10. Test In-app/inbox/display-unit - piyush\n-11. Callbackmanage weakreference listeners getters null check\n-12. Add null check for InappFCManager\n-13. InappNotificationActivity :-> Oncreate :-> setListener incompatible types: CleverTapAPI cannot be converted to InAppActivityListener\n-14. CleverTapAPI :-> processDisplayUnitsResponse\n-15.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):removed tasks |
116,621 | 11.03.2021 18:12:38 | -19,080 | bfef4444ea383749e38156fd37911295322ca778 | Task(609):
1. set listener to get click & viewed callbacks on Header/Footer In-Apps
2. Fixed crash for InAppController.java getting passed as a serializable object. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "package com.clevertap.android.sdk;\n-import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -20,8 +19,6 @@ public abstract class BaseCallbackManager {\npublic abstract GeofenceCallback getGeofenceCallback();\n- public abstract InAppActivityListener getInAppActivityListener();\n-\npublic abstract InAppNotificationButtonListener getInAppNotificationButtonListener();\npublic abstract InAppNotificationListener getInAppNotificationListener();\n@@ -51,9 +48,6 @@ public abstract class BaseCallbackManager {\npublic abstract void setGeofenceCallback(GeofenceCallback geofenceCallback);\n- public abstract void setInAppActivityListener(\n- InAppActivityListener inAppActivityListener);\n-\npublic abstract void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -4,7 +4,6 @@ import static com.clevertap.android.sdk.utils.Utils.runOnUiThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n-import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -35,8 +34,6 @@ public class CallbackManager extends BaseCallbackManager {\nprivate WeakReference<CTFeatureFlagsListener> mFeatureFlagListenerWeakReference;\n- private InAppActivityListener mInAppActivityListener;\n-\nprivate WeakReference<CTProductConfigListener> productConfigListener;\nprivate CTPushAmpListener pushAmpListener = null;\n@@ -97,17 +94,6 @@ public class CallbackManager extends BaseCallbackManager {\nthis.geofenceCallback = geofenceCallback;\n}\n- @Override\n- public InAppActivityListener getInAppActivityListener() {\n- return mInAppActivityListener;\n- }\n-\n- @Override\n- public void setInAppActivityListener(\n- final InAppActivityListener inAppActivityListener) {\n- mInAppActivityListener = inAppActivityListener;\n- }\n-\n@Override\npublic InAppNotificationButtonListener getInAppNotificationButtonListener() {\nif (inAppNotificationButtonListener != null && inAppNotificationButtonListener.get() != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -9,7 +9,6 @@ import android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\nimport androidx.fragment.app.FragmentActivity;\n-import com.clevertap.android.sdk.inapp.CTInAppBaseFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppBaseFullFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlCoverFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlHalfInterstitialFragment;\n@@ -22,21 +21,11 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\n-import com.clevertap.android.sdk.inapp.InAppController;\n+import com.clevertap.android.sdk.inapp.InAppListener;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n-public final class InAppNotificationActivity extends FragmentActivity implements CTInAppBaseFragment.InAppListener {\n-\n- public interface InAppActivityListener {\n-\n- void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValuePayload);\n-\n- void inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData, InAppController inAppController);\n-\n- void inAppNotificationDidShow(CTInAppNotification inAppNotification, Bundle formData);\n- }\n+public final class InAppNotificationActivity extends FragmentActivity implements InAppListener {\nprivate static boolean isAlertVisible = false;\n@@ -44,9 +33,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate CTInAppNotification inAppNotification;\n- private WeakReference<InAppActivityListener> listenerWeakReference;\n-\n- private InAppController mInAppController;\n+ private WeakReference<InAppListener> listenerWeakReference;\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n@@ -64,9 +51,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n}\n-\n- mInAppController = CleverTapAPI.instanceWithConfig(this,config).getCoreState().getInAppController();\n- setListener(mInAppController);\n+ setListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\nfinish();\n@@ -155,7 +140,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\nvoid didClick(Bundle data, HashMap<String, String> keyValueMap) {\n- InAppActivityListener listener = getListener();\n+ InAppListener listener = getListener();\nif (listener != null) {\nlistener.inAppNotificationDidClick(inAppNotification, data, keyValueMap);\n}\n@@ -166,14 +151,14 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nisAlertVisible = false;\n}\nfinish();\n- InAppActivityListener listener = getListener();\n+ InAppListener listener = getListener();\nif (listener != null && getBaseContext() != null) {\n- listener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data,mInAppController);\n+ listener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data);\n}\n}\nvoid didShow(Bundle data) {\n- InAppActivityListener listener = getListener();\n+ InAppListener listener = getListener();\nif (listener != null) {\nlistener.inAppNotificationDidShow(inAppNotification, data);\n}\n@@ -189,8 +174,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ndidDismiss(formData);\n}\n- InAppActivityListener getListener() {\n- InAppActivityListener listener = null;\n+ InAppListener getListener() {\n+ InAppListener listener = null;\ntry {\nlistener = listenerWeakReference.get();\n} catch (Throwable t) {\n@@ -203,7 +188,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn listener;\n}\n- void setListener(InAppActivityListener listener) {\n+ void setListener(InAppListener listener) {\nlistenerWeakReference = new WeakReference<>(listener);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -27,17 +27,6 @@ public abstract class CTInAppBaseFragment extends Fragment {\n}\n}\n- public interface InAppListener {\n-\n- void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap);\n-\n- void inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData);\n-\n- void inAppNotificationDidShow(CTInAppNotification inAppNotification, Bundle formData);\n-\n- }\n-\nCloseImageView closeImageView = null;\nCleverTapInstanceConfig config;\n@@ -50,7 +39,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nAtomicBoolean isCleanedUp = new AtomicBoolean();\n- private WeakReference<CTInAppBaseFragment.InAppListener> listenerWeakReference;\n+ private WeakReference<InAppListener> listenerWeakReference;\n@Override\npublic void onAttach(Context context) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFullFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFullFragment.java",
"diff": "@@ -30,7 +30,7 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n@Override\nvoid generateListener() {\nif (context instanceof InAppNotificationActivity) {\n- setListener((CTInAppBaseFragment.InAppListener) context);\n+ setListener((InAppListener) context);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java",
"diff": "@@ -48,9 +48,7 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n@Override\nvoid generateListener() {\nif (config != null) {\n- CleverTapAPI cleverTapAPI = CleverTapAPI.instanceWithConfig(this.context, config);\n- //TODO Refactoring\n- //setListener(cleverTapAPI.getCoreState().getInAppController());\n+ setListener(CleverTapAPI.instanceWithConfig(this.context, config).getCoreState().getInAppController());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -16,7 +16,6 @@ import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.InAppFCManager;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\n-import com.clevertap.android.sdk.InAppNotificationActivity.InAppActivityListener;\nimport com.clevertap.android.sdk.InAppNotificationListener;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.ManifestInfo;\n@@ -37,8 +36,7 @@ import java.util.concurrent.Callable;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppActivityListener,\n- Serializable {\n+public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener {\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -108,7 +106,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nmCallbackManager = callbackManager;\nmAnalyticsManager = analyticsManager;\nmCoreMetaData = coreMetaData;\n- mCallbackManager.setInAppActivityListener(this);\n}\npublic void checkExistingInAppNotifications(Activity activity) {\n@@ -125,7 +122,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", currentlyDisplayingInApp);\nbundle.putParcelable(\"config\", mConfig);\n- bundle.putSerializable(\"controller\", this);\ninAppFragment.setArguments(bundle);\nfragmentTransaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);\nfragmentTransaction.add(android.R.id.content, inAppFragment, currentlyDisplayingInApp.getType());\n@@ -166,7 +162,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void inAppNotificationDidDismiss(final Context context, final CTInAppNotification inAppNotification,\n- Bundle formData, final InAppController inAppController) {\n+ final Bundle formData) {\ninAppNotification.didDismiss();\nif (mInAppFCManager != null) {\nmInAppFCManager.didDismiss(inAppNotification);\n@@ -200,7 +196,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\ntask.execute(\"InappController#inAppNotificationDidDismiss\", new Callable<Void>() {\n@Override\npublic Void call() {\n- inAppDidDismiss(context, mConfig, inAppNotification, inAppController);\n+ inAppDidDismiss(context, mConfig, inAppNotification, InAppController.this);\n_showNotificationIfAvailable(context);\nreturn null;\n}\n@@ -523,7 +519,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", inAppNotification);\nbundle.putParcelable(\"config\", config);\n- bundle.putSerializable(\"controller\", inAppController);\ninAppFragment.setArguments(bundle);\nfragmentTransaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);\nfragmentTransaction.add(android.R.id.content, inAppFragment, inAppNotification.getType());\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppListener.java",
"diff": "+package com.clevertap.android.sdk.inapp;\n+\n+import android.content.Context;\n+import android.os.Bundle;\n+import java.util.HashMap;\n+\n+public interface InAppListener {\n+\n+ void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n+ HashMap<String, String> keyValueMap);\n+\n+ void inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData);\n+\n+ void inAppNotificationDidShow(CTInAppNotification inAppNotification, Bundle formData);\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):
1. set listener to get click & viewed callbacks on Header/Footer In-Apps
2. Fixed crash for InAppController.java getting passed as a serializable object. |
116,621 | 11.03.2021 18:49:03 | -19,080 | e434d1e98edcae53cd83ef2a0ca2c807f40e8968 | Task(609):Added InAppFCmanager dependency for Google Ad Id Case | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2332,7 +2332,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n//To be called from DeviceInfo AdID GUID generation\nvoid deviceIDCreated(String deviceId) {\nLogger.v(\"Initializing InAppFC after Device ID Created = \" + deviceId);\n- mCoreState.setInAppFCManager(new InAppFCManager(context, mCoreState.getConfig(), deviceId));\n+ mCoreState.getControllerManager()\n+ .setInAppFCManager(new InAppFCManager(context, mCoreState.getConfig(), deviceId));\nLogger.v(\"Initializing ABTesting after Device ID Created = \" + deviceId);\n/*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -24,7 +24,6 @@ class CleverTapFactory {\ncoreState.setCoreMetaData(coreMetaData);\nValidator validator = new Validator();\n- coreState.setValidator(validator);\nValidationResultStack validationResultStack = new ValidationResultStack();\ncoreState.setValidationResultStack(validationResultStack);\n@@ -53,14 +52,6 @@ class CleverTapFactory {\nSessionManager sessionManager = new SessionManager(config, coreMetaData, validator, localDataStore);\ncoreState.setSessionManager(sessionManager);\n- InAppFCManager inAppFCManager = null;\n- if (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null) {\n- inAppFCManager = new InAppFCManager(context, config, coreState.getDeviceInfo().getDeviceID());\n- coreState.getConfig().getLogger()\n- .verbose(\"Initializing InAppFC with device Id = \" + coreState.getDeviceInfo().getDeviceID());\n- coreState.setInAppFCManager(inAppFCManager);\n- }\n-\nDBManager baseDatabaseManager = new DBManager(config, ctLockManager);\ncoreState.setDatabaseManager(baseDatabaseManager);\n@@ -68,8 +59,15 @@ class CleverTapFactory {\nctLockManager, callbackManager, deviceInfo, baseDatabaseManager);\ncoreState.setControllerManager(controllerManager);\n+ if (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null) {\n+ coreState.getConfig().getLogger()\n+ .verbose(\"Initializing InAppFC with device Id = \" + coreState.getDeviceInfo().getDeviceID());\n+ controllerManager\n+ .setInAppFCManager(new InAppFCManager(context, config, coreState.getDeviceInfo().getDeviceID()));\n+ }\n+\nNetworkManager networkManager = new NetworkManager(context, config, deviceInfo, coreMetaData,\n- validationResultStack, controllerManager, inAppFCManager, baseDatabaseManager,\n+ validationResultStack, controllerManager,baseDatabaseManager,\ncallbackManager, ctLockManager, validator, localDataStore);\ncoreState.setNetworkManager(networkManager);\n@@ -86,7 +84,7 @@ class CleverTapFactory {\ncoreState.setAnalyticsManager(analyticsManager);\nInAppController inAppController = new InAppController(context, config, mainLooperHandler,\n- inAppFCManager, callbackManager, analyticsManager, coreMetaData);\n+ controllerManager, callbackManager, analyticsManager, coreMetaData);\ncoreState.setInAppController(inAppController);\ncoreState.getControllerManager().setInAppController(inAppController);\n@@ -106,7 +104,7 @@ class CleverTapFactory {\ncoreState.setActivityLifeCycleManager(activityLifeCycleManager);\nLoginController loginController = new LoginController(context, config, deviceInfo,\n- validationResultStack, baseEventQueueManager, analyticsManager, inAppFCManager,\n+ validationResultStack, baseEventQueueManager, analyticsManager,\ncoreMetaData, controllerManager, sessionManager,\nlocalDataStore, callbackManager, baseDatabaseManager, ctLockManager);\ncoreState.setLoginController(loginController);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "@@ -15,6 +15,8 @@ import java.util.concurrent.Callable;\npublic class ControllerManager {\n+ private InAppFCManager inAppFCManager;\n+\nprivate final BaseDatabaseManager mBaseDatabaseManager;\nprivate CTDisplayUnitController mCTDisplayUnitController;\n@@ -89,6 +91,10 @@ public class ControllerManager {\nmCTProductConfigController = CTProductConfigController;\n}\n+ public CleverTapInstanceConfig getConfig() {\n+ return mConfig;\n+ }\n+\npublic InAppController getInAppController() {\nreturn mInAppController;\n}\n@@ -97,6 +103,14 @@ public class ControllerManager {\nmInAppController = inAppController;\n}\n+ public InAppFCManager getInAppFCManager() {\n+ return inAppFCManager;\n+ }\n+\n+ public void setInAppFCManager(final InAppFCManager inAppFCManager) {\n+ this.inAppFCManager = inAppFCManager;\n+ }\n+\npublic PushProviders getPushProviders() {\nreturn mPushProviders;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -5,7 +5,6 @@ import com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\nimport com.clevertap.android.sdk.events.EventMediator;\nimport com.clevertap.android.sdk.inapp.InAppController;\n-import com.clevertap.android.sdk.inbox.CTInboxController;\nimport com.clevertap.android.sdk.login.LoginController;\nimport com.clevertap.android.sdk.network.BaseNetworkManager;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\n@@ -24,16 +23,12 @@ public class CoreState extends CleverTapState {\nprivate CoreMetaData coreMetaData;\n- private CTInboxController ctInboxController;\n-\nprivate BaseDatabaseManager databaseManager;\nprivate DeviceInfo deviceInfo;\nprivate EventMediator eventMediator;\n- private InAppFCManager inAppFCManager;\n-\nprivate LocalDataStore localDataStore;\nprivate ActivityLifeCycleManager mActivityLifeCycleManager;\n@@ -56,8 +51,6 @@ public class CoreState extends CleverTapState {\nprivate ValidationResultStack mValidationResultStack;\n- private Validator mValidator;\n-\nprivate MainLooperHandler mainLooperHandler;\nprivate BaseNetworkManager networkManager;\n@@ -213,14 +206,6 @@ public class CoreState extends CleverTapState {\nthis.mValidationResultStack = validationResultStack;\n}\n- public void setInAppFCManager(final InAppFCManager inAppFCManager) {\n- this.inAppFCManager = inAppFCManager;\n- }\n-\n- public void setValidator(final Validator validator) {\n- mValidator = validator;\n- }\n-\n@Override\nBaseLocationManager getLocationManager() {\nreturn baseLocationManager;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -13,8 +13,8 @@ import com.clevertap.android.sdk.AnalyticsManager;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.CoreMetaData;\n-import com.clevertap.android.sdk.InAppFCManager;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.InAppNotificationListener;\nimport com.clevertap.android.sdk.Logger;\n@@ -24,7 +24,6 @@ import com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.MainLooperHandler;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.Utils;\n-import java.io.Serializable;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n@@ -82,9 +81,9 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final Context mContext;\n- private final CoreMetaData mCoreMetaData;\n+ private final ControllerManager mControllerManager;\n- private final InAppFCManager mInAppFCManager;\n+ private final CoreMetaData mCoreMetaData;\nprivate final Logger mLogger;\n@@ -93,7 +92,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\npublic InAppController(Context context,\nCleverTapInstanceConfig config,\nMainLooperHandler mainLooperHandler,\n- InAppFCManager inAppFCManager,\n+ ControllerManager controllerManager,\nBaseCallbackManager callbackManager,\nAnalyticsManager analyticsManager,\nCoreMetaData coreMetaData) {\n@@ -102,7 +101,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nmConfig = config;\nmLogger = mConfig.getLogger();\nmMainLooperHandler = mainLooperHandler;\n- mInAppFCManager = inAppFCManager;\n+ mControllerManager = controllerManager;\nmCallbackManager = callbackManager;\nmAnalyticsManager = analyticsManager;\nmCoreMetaData = coreMetaData;\n@@ -164,8 +163,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\npublic void inAppNotificationDidDismiss(final Context context, final CTInAppNotification inAppNotification,\nfinal Bundle formData) {\ninAppNotification.didDismiss();\n- if (mInAppFCManager != null) {\n- mInAppFCManager.didDismiss(inAppNotification);\n+ if (mControllerManager.getInAppFCManager() != null) {\n+ mControllerManager.getInAppFCManager().didDismiss(inAppNotification);\nmLogger.verbose(mConfig.getAccountId(), \"InApp Dismissed: \" + inAppNotification.getCampaignId());\n}\ntry {\n@@ -312,15 +311,15 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nreturn;\n}\n- if (mInAppFCManager != null) {\n- if (!mInAppFCManager.canShow(inAppNotification)) {\n+ if (mControllerManager.getInAppFCManager() != null) {\n+ if (!mControllerManager.getInAppFCManager().canShow(inAppNotification)) {\nmLogger.verbose(mConfig.getAccountId(),\n\"InApp has been rejected by FC, not showing \" + inAppNotification.getCampaignId());\nshowInAppNotificationIfAny();\nreturn;\n}\n- mInAppFCManager.didShow(mContext, inAppNotification);\n+ mControllerManager.getInAppFCManager().didShow(mContext, inAppNotification);\n} else {\nmLogger.verbose(mConfig.getAccountId(),\n\"getCoreState().getInAppFCManager() is NULL, not showing \" + inAppNotification.getCampaignId());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "@@ -51,8 +51,6 @@ public class LoginController {\nprivate final DeviceInfo mDeviceInfo;\n- private final InAppFCManager mInAppFCManager;\n-\nprivate final LocalDataStore mLocalDataStore;\nprivate final PushProviders mPushProviders;\n@@ -71,7 +69,6 @@ public class LoginController {\nValidationResultStack validationResultStack,\nBaseEventQueueManager eventQueueManager,\nAnalyticsManager analyticsManager,\n- InAppFCManager inAppFCManager,\nCoreMetaData coreMetaData,\nControllerManager controllerManager,\nSessionManager sessionManager,\n@@ -85,7 +82,6 @@ public class LoginController {\nmValidationResultStack = validationResultStack;\nmBaseEventQueueManager = eventQueueManager;\nmAnalyticsManager = analyticsManager;\n- mInAppFCManager = inAppFCManager;\nmCoreMetaData = coreMetaData;\nmPushProviders = controllerManager.getPushProviders();\nmSessionManager = sessionManager;\n@@ -146,7 +142,7 @@ public class LoginController {\nresetProductConfigs();\nrecordDeviceIDErrors();\nresetDisplayUnits();\n- mInAppFCManager.changeUser(mDeviceInfo.getDeviceID());\n+ mControllerManager.getInAppFCManager().changeUser(mDeviceInfo.getDeviceID());\n} catch (Throwable t) {\nmConfig.getLogger().verbose(mConfig.getAccountId(), \"Reset Profile error\", t);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -59,8 +59,6 @@ import org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY)\npublic class NetworkManager extends BaseNetworkManager {\n- private final ControllerManager mControllerManager;\n-\nprivate static SSLSocketFactory sslSocketFactory;\nprivate static SSLContext sslContext;\n@@ -73,6 +71,8 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final Context mContext;\n+ private final ControllerManager mControllerManager;\n+\nprivate final CoreMetaData mCoreMetaData;\nprivate int mCurrentRequestTimestamp = 0;\n@@ -81,8 +81,6 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final DeviceInfo mDeviceInfo;\n- private final InAppFCManager mInAppFCManager;\n-\nprivate final Logger mLogger;\nprivate int mResponseFailureCount = 0;// TODO encapsulate into NetworkState class\n@@ -115,7 +113,6 @@ public class NetworkManager extends BaseNetworkManager {\nCoreMetaData coreMetaData,\nValidationResultStack validationResultStack,\nControllerManager controllerManager,\n- InAppFCManager inAppFCManager,\nBaseDatabaseManager baseDatabaseManager,\nfinal BaseCallbackManager callbackManager,\nCTLockManager ctLockManager,\n@@ -130,7 +127,6 @@ public class NetworkManager extends BaseNetworkManager {\nmCoreMetaData = coreMetaData;\nmValidationResultStack = validationResultStack;\nmControllerManager = controllerManager;\n- mInAppFCManager = inAppFCManager;\nmDatabaseManager = baseDatabaseManager;\n// maintain order\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\n@@ -148,8 +144,7 @@ public class NetworkManager extends BaseNetworkManager {\ncleverTapResponse = new ConsoleResponse(cleverTapResponse, config);\ncleverTapResponse = new ARPResponse(cleverTapResponse, config, this, validator, controllerManager);\ncleverTapResponse = new MetadataResponse(cleverTapResponse, config, deviceInfo, this);\n- cleverTapResponse = new InAppResponse(cleverTapResponse, config, inAppFCManager,\n- controllerManager);\n+ cleverTapResponse = new InAppResponse(cleverTapResponse, config, controllerManager);\ncleverTapResponse = new BaseResponse(context, config, deviceInfo, this, localDataStore, cleverTapResponse);\n@@ -253,6 +248,57 @@ public class NetworkManager extends BaseNetworkManager {\nreturn domain == null || mResponseFailureCount > 5;\n}\n+ @SuppressLint(\"CommitPrefEdits\")\n+ public void setI(Context context, long i) {\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n+ final SharedPreferences.Editor editor = prefs.edit();\n+ editor.putLong(StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_I), i);\n+ StorageHelper.persist(editor);\n+ }\n+\n+ @SuppressLint(\"CommitPrefEdits\")\n+ public void setJ(Context context, long j) {\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n+ final SharedPreferences.Editor editor = prefs.edit();\n+ editor.putLong(StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_J), j);\n+ StorageHelper.persist(editor);\n+ }\n+\n+ HttpsURLConnection buildHttpsURLConnection(final String endpoint)\n+ throws IOException {\n+ URL url = new URL(endpoint);\n+ HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();\n+ conn.setConnectTimeout(10000);\n+ conn.setReadTimeout(10000);\n+ conn.setRequestProperty(\"Content-Type\", \"application/json; charset=utf-8\");\n+ conn.setRequestProperty(\"X-CleverTap-Account-ID\", mConfig.getAccountId());\n+ conn.setRequestProperty(\"X-CleverTap-Token\", mConfig.getAccountToken());\n+ conn.setInstanceFollowRedirects(false);\n+ if (mConfig.isSslPinningEnabled()) {\n+ SSLContext _sslContext = getSSLContext();\n+ if (_sslContext != null) {\n+ conn.setSSLSocketFactory(getPinnedCertsSslSocketfactory(_sslContext));\n+ }\n+ }\n+ return conn;\n+ }\n+\n+ CleverTapResponse getCleverTapResponse() {\n+ return mCleverTapResponse;\n+ }\n+\n+ void setCleverTapResponse(final CleverTapResponse cleverTapResponse) {\n+ mCleverTapResponse = cleverTapResponse;\n+ }\n+\n+ int getCurrentRequestTimestamp() {\n+ return mCurrentRequestTimestamp;\n+ }\n+\n+ void setCurrentRequestTimestamp(final int currentRequestTimestamp) {\n+ mCurrentRequestTimestamp = currentRequestTimestamp;\n+ }\n+\nString getDomain(boolean defaultToHandshakeURL, final EventGroup eventGroup) {\nString domain = getDomainFromPrefsOrMetadata(eventGroup);\n@@ -335,14 +381,6 @@ public class NetworkManager extends BaseNetworkManager {\nStorageHelper.putInt(mContext, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_LAST_TS), ts);\n}\n- @SuppressLint(\"CommitPrefEdits\")\n- public void setI(Context context, long i) {\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n- final SharedPreferences.Editor editor = prefs.edit();\n- editor.putLong(StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_I), i);\n- StorageHelper.persist(editor);\n- }\n-\n// TODO encapsulate into NetworkState class\nint getResponseFailureCount() {\nreturn mResponseFailureCount;\n@@ -353,38 +391,14 @@ public class NetworkManager extends BaseNetworkManager {\nmResponseFailureCount = responseFailureCount;\n}\n+ //gives delay frequency based on region\n+ //randomly adds delay to 1s delay in case of non-EU regions\n+\nboolean hasDomainChanged(final String newDomain) {\nfinal String oldDomain = StorageHelper.getStringFromPrefs(mContext, mConfig, Constants.KEY_DOMAIN_NAME, null);\nreturn !newDomain.equals(oldDomain);\n}\n- @SuppressLint(\"CommitPrefEdits\")\n- public void setJ(Context context, long j) {\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.NAMESPACE_IJ);\n- final SharedPreferences.Editor editor = prefs.edit();\n- editor.putLong(StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_J), j);\n- StorageHelper.persist(editor);\n- }\n-\n- HttpsURLConnection buildHttpsURLConnection(final String endpoint)\n- throws IOException {\n- URL url = new URL(endpoint);\n- HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();\n- conn.setConnectTimeout(10000);\n- conn.setReadTimeout(10000);\n- conn.setRequestProperty(\"Content-Type\", \"application/json; charset=utf-8\");\n- conn.setRequestProperty(\"X-CleverTap-Account-ID\", mConfig.getAccountId());\n- conn.setRequestProperty(\"X-CleverTap-Token\", mConfig.getAccountToken());\n- conn.setInstanceFollowRedirects(false);\n- if (mConfig.isSslPinningEnabled()) {\n- SSLContext _sslContext = getSSLContext();\n- if (_sslContext != null) {\n- conn.setSSLSocketFactory(getPinnedCertsSslSocketfactory(_sslContext));\n- }\n- }\n- return conn;\n- }\n-\nString insertHeader(Context context, JSONArray arr) {\ntry {\nfinal JSONObject header = new JSONObject();\n@@ -430,7 +444,8 @@ public class NetworkManager extends BaseNetworkManager {\n.getRepo(mContext, mConfig, mDeviceInfo,\nmValidationResultStack).getIdentitySet().toString());\nheader.put(\"ddnd\",\n- !(mDeviceInfo.getNotificationsEnabledForUser() && (mControllerManager.getPushProviders().isNotificationSupported())));\n+ !(mDeviceInfo.getNotificationsEnabledForUser() && (mControllerManager.getPushProviders()\n+ .isNotificationSupported())));\nif (mCoreMetaData.isBgPing()) {\nheader.put(\"bk\", 1);\nmCoreMetaData.setBgPing(false);\n@@ -484,9 +499,9 @@ public class NetworkManager extends BaseNetworkManager {\nheader.put(\"wzrk_ref\", wzrkParams);\n}\n- if (mInAppFCManager != null) {\n+ if (mControllerManager.getInAppFCManager() != null) {\nLogger.v(\"Attaching InAppFC to Header\");\n- mInAppFCManager.attachToHeader(context, header);\n+ mControllerManager.getInAppFCManager().attachToHeader(context, header);\n}\n// Resort to string concat for backward compatibility\n@@ -497,10 +512,6 @@ public class NetworkManager extends BaseNetworkManager {\n}\n}\n- CleverTapResponse getCleverTapResponse() {\n- return mCleverTapResponse;\n- }\n-\nvoid performHandshakeForDomain(final Context context, final EventGroup eventGroup,\nfinal Runnable handshakeSuccessCallback) {\nfinal String endpoint = getEndpoint(true, eventGroup);\n@@ -541,9 +552,6 @@ public class NetworkManager extends BaseNetworkManager {\n}\n}\n- //gives delay frequency based on region\n- //randomly adds delay to 1s delay in case of non-EU regions\n-\n/**\n* Processes the incoming response headers for a change in domain and/or mute.\n*\n@@ -692,14 +700,6 @@ public class NetworkManager extends BaseNetworkManager {\nStorageHelper.putInt(mContext, StorageHelper.storageKeyWithSuffix(mConfig, Constants.KEY_FIRST_TS), ts);\n}\n- void setCleverTapResponse(final CleverTapResponse cleverTapResponse) {\n- mCleverTapResponse = cleverTapResponse;\n- }\n-\n- int getCurrentRequestTimestamp() {\n- return mCurrentRequestTimestamp;\n- }\n-\nvoid setSpikyDomain(final Context context, String spikyDomainName) {\nmLogger.verbose(mConfig.getAccountId(), \"Setting spiky domain to \" + spikyDomainName);\nStorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(mConfig, Constants.SPIKY_KEY_DOMAIN_NAME),\n@@ -824,10 +824,6 @@ public class NetworkManager extends BaseNetworkManager {\n}\n}\n- void setCurrentRequestTimestamp(final int currentRequestTimestamp) {\n- mCurrentRequestTimestamp = currentRequestTimestamp;\n- }\n-\nprivate static SSLSocketFactory getPinnedCertsSslSocketfactory(SSLContext sslContext) {\nif (sslContext == null) {\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"diff": "@@ -23,17 +23,13 @@ public class InAppResponse extends CleverTapResponseDecorator {\nprivate final ControllerManager mControllerManager;\n- private final InAppFCManager mInAppFCManager;\n-\nprivate final Logger mLogger;\n-\npublic InAppResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config,\n- InAppFCManager inAppFCManager, ControllerManager controllerManager) {\n+ ControllerManager controllerManager) {\nmCleverTapResponse = cleverTapResponse;\nmConfig = config;\nmLogger = mConfig.getLogger();\n- mInAppFCManager = inAppFCManager;\nmControllerManager = controllerManager;\n}\n@@ -70,10 +66,10 @@ public class InAppResponse extends CleverTapResponseDecorator {\nperDay = response.getInt(\"imp\");\n}\n- if (mInAppFCManager != null) {\n+ if (mControllerManager.getInAppFCManager() != null) {\nLogger.v(\"Updating InAppFC Limits\");\n- mInAppFCManager.updateLimits(context, perDay, perSession);\n- mInAppFCManager.processResponse(context, response);// Handle stale_inapp\n+ mControllerManager.getInAppFCManager().updateLimits(context, perDay, perSession);\n+ mControllerManager.getInAppFCManager().processResponse(context, response);// Handle stale_inapp\n}\nJSONArray inappNotifs;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):Added InAppFCmanager dependency for Google Ad Id Case |
116,621 | 11.03.2021 18:50:14 | -19,080 | 053817e303ce14af6ba41966a1f852296b1ed09d | Task(609):Removed unwanted TODo's | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/DisplayUnitResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/DisplayUnitResponse.java",
"diff": "@@ -24,10 +24,10 @@ public class DisplayUnitResponse extends CleverTapResponseDecorator {\nprivate final CleverTapInstanceConfig mConfig;\n- private final Logger mLogger;\n-\nprivate final ControllerManager mControllerManager;\n+ private final Logger mLogger;\n+\npublic DisplayUnitResponse(CleverTapResponse cleverTapResponse,\nCleverTapInstanceConfig config,\nBaseCallbackManager callbackManager, ControllerManager controllerManager) {\n@@ -94,12 +94,11 @@ public class DisplayUnitResponse extends CleverTapResponseDecorator {\nsynchronized (displayUnitControllerLock) {// lock to avoid multiple instance creation for controller\nif (mCTDisplayUnitController == null) {\nmCTDisplayUnitController = new CTDisplayUnitController();\n- //TODO add a mechanism to transfer display unit lazily without using corestate instance\n- //getCoreState().setCTDisplayUnitController(mCTDisplayUnitController);//TODO\nmControllerManager.setCTDisplayUnitController(mCTDisplayUnitController);\n}\n}\n- ArrayList<CleverTapDisplayUnit> displayUnits = mControllerManager.getCTDisplayUnitController().updateDisplayUnits(messages);\n+ ArrayList<CleverTapDisplayUnit> displayUnits = mControllerManager.getCTDisplayUnitController()\n+ .updateDisplayUnits(messages);\nmCallbackManager.notifyDisplayUnitsLoaded(displayUnits);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(609):Removed unwanted TODo's |
116,612 | 15.03.2021 14:46:29 | -19,080 | 3e9a8db6935bf7f475659b1bf1779e861b747490 | task(TDD): refactor variable name | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -24,7 +24,6 @@ import com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.MainLooperHandler;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.Utils;\n-import java.io.Serializable;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.Arrays;\n@@ -41,14 +40,14 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n- private final WeakReference<InAppController> cleverTapAPIWeakReference;\n+ private final WeakReference<InAppController> inAppControllerWeakReference;\nprivate final JSONObject jsonObject;\nprivate final boolean videoSupport = Utils.haveVideoPlayerSupport;\n- NotificationPrepareRunnable(InAppController cleverTapAPI, JSONObject jsonObject) {\n- this.cleverTapAPIWeakReference = new WeakReference<>(cleverTapAPI);\n+ NotificationPrepareRunnable(InAppController inAppController, JSONObject jsonObject) {\n+ this.inAppControllerWeakReference = new WeakReference<>(inAppController);\nthis.jsonObject = jsonObject;\n}\n@@ -62,7 +61,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n\"Unable to parse inapp notification \" + inAppNotification.getError());\nreturn;\n}\n- inAppNotification.listener = cleverTapAPIWeakReference.get();\n+ inAppNotification.listener = inAppControllerWeakReference.get();\ninAppNotification.prepareForDisplay();\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): refactor variable name SDK-660 |
116,623 | 16.03.2021 21:34:52 | -19,080 | 110df039d77b5b8facc6f3f98210bae5bf3e4195 | task(SDK-701,SDK-710): Updating core HMS, XPS versions and CT HMS and CT XPS versions | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -6,9 +6,9 @@ buildscript {\nrepositories {\ngoogle()// Google's Maven repository\n- jcenter()\nmaven { url 'http://developer.huawei.com/repo/' }\nmavenCentral()\n+ jcenter()\n}\ndependencies {\nclasspath \"com.android.tools.build:gradle:$gradlePluginVersion\"\n@@ -24,12 +24,12 @@ buildscript {\nallprojects {\nrepositories {\n- jcenter()\ngoogle()\nmaven { url 'http://developer.huawei.com/repo/' }\nmaven {\nurl \"https://plugins.gradle.org/m2/\"\n}\n+ jcenter()\nflatDir {\ndirs 'libs'\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-xps/libs/MiPush_SDK_Client_3_7_9.jar",
"new_path": "clevertap-xps/libs/MiPush_SDK_Client_3_7_9.jar",
"diff": "Binary files a/clevertap-xps/libs/MiPush_SDK_Client_3_7_9.jar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-xps/libs/MiPush_SDK_Client_3_8_9.jar",
"new_path": "clevertap-xps/libs/MiPush_SDK_Client_3_8_9.jar",
"diff": "Binary files /dev/null and b/clevertap-xps/libs/MiPush_SDK_Client_3_8_9.jar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -9,15 +9,15 @@ ext {\n// CleverTap modules\ncoreVersion = \"4.1.0\"\ngeofenceVersion = \"1.0.1\"\n- hmsVersion = \"1.0.0\"\n- xpsVersion = \"1.0.0\"\n+ hmsVersion = \"1.0.1\"\n+ xpsVersion = \"1.0.1\"\n//gradle plugins\ngradlePluginVersion = '4.0.1'\ngoogleServicesPluginVersion = '4.3.3'\nbintrayPluginVersion = '1.8.4'\nmavenPluginVersion = '2.1'\n- huaweiPluginVersion = '1.3.1.300'\n+ huaweiPluginVersion = '1.4.1.300'\nkotlin_version = '1.3.72'\njacocoVersion = '0.8.4'\njsonAssertVersion = '1.5.0'\n@@ -53,7 +53,7 @@ ext {\nconcurrentFuturesVersion = '1.0.0'\n// Huawei push\n- huaweiPushVersion = '5.0.0.300'\n+ huaweiPushVersion = '5.1.1.301'\n// unit tests\njsonVersion = '20200518'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701,SDK-710): Updating core HMS, XPS versions and CT HMS and CT XPS versions |
116,612 | 17.03.2021 15:47:48 | -19,080 | 6d70b348124ca16a403c2c65e191957aca331be1 | task(TDD): comments and todo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -136,7 +136,7 @@ public interface Constants {\nString[] SYSTEM_EVENTS = {NOTIFICATION_CLICKED_EVENT_NAME,\nNOTIFICATION_VIEWED_EVENT_NAME, GEOFENCE_ENTERED_EVENT_NAME,\nGEOFENCE_EXITED_EVENT_NAME};\n- long DEFAULT_PUSH_TTL = 1000 * 60 * 60 * 24 * 4;\n+ long DEFAULT_PUSH_TTL = 1000 * 60 * 60 * 24 * 4;// 4 days\nString PF_JOB_ID = \"pfjobid\";\nint PING_FREQUENCY_VALUE = 240;\nString PING_FREQUENCY = \"pf\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ARPResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ARPResponse.java",
"diff": "@@ -114,6 +114,12 @@ public class ARPResponse extends CleverTapResponseDecorator {\nStorageHelper.persist(editor);\n}\n+ /**\n+ * Dashboard has a feature where marketers can discard event. We get that list in the ARP response,\n+ * SDK then checks if the event is in the discarded list before sending it to LC\n+ *\n+ * @param response response from server\n+ */\nprivate void processDiscardedEventsList(JSONObject response) {\nif (!response.has(Constants.DISCARDED_EVENT_JSON_KEY)) {\nlogger.verbose(config.getAccountId(), \"ARP doesn't contain the Discarded Events key\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ConsoleResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ConsoleResponse.java",
"diff": "@@ -26,6 +26,10 @@ public class ConsoleResponse extends CleverTapResponseDecorator {\npublic void processResponse(final JSONObject response, final String stringBody, final Context context) {\n// Handle \"console\" - print them as info to the console\ntry {\n+ /**\n+ * Console info is no longer used\n+ * But the feature was to enable logs from LCr\n+ */\nif (response.has(\"console\")) {\nfinal JSONArray console = (JSONArray) response.get(\"console\");\nif (console.length() > 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/DisplayUnitResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/DisplayUnitResponse.java",
"diff": "@@ -53,6 +53,7 @@ public class DisplayUnitResponse extends CleverTapResponseDecorator {\nreturn;\n}\n+ // Adding response null check because this will get processed first in case of analytics\nif (response == null) {\nlogger.verbose(config.getAccountId(), Constants.FEATURE_DISPLAY_UNIT\n+ \"Can't parse Display Unit Response, JSON response object is null\");\n@@ -91,6 +92,7 @@ public class DisplayUnitResponse extends CleverTapResponseDecorator {\nreturn;\n}\n+ //TODO : Two instances of this class will create two DUController\nsynchronized (displayUnitControllerLock) {// lock to avoid multiple instance creation for controller\nif (ctDisplayUnitController == null) {\nctDisplayUnitController = new CTDisplayUnitController();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"diff": "@@ -131,6 +131,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nif (callbackManager.getPushAmpListener() != null) {\ncallbackManager.getPushAmpListener().onPushAmpPayloadReceived(pushBundle);\n} else {\n+ //TODO: in pre-refactored code we are calling createNotification() in CTAPI\npushProviders\n._createNotification(context, pushBundle, Constants.EMPTY_NOTIFICATION_ID);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): comments and todo SDK-660 |
116,612 | 17.03.2021 19:30:23 | -19,080 | d2b7614c2b1e34cf88da03932b5eb5c46e5b1ffa | task(TDD): refactor send test logic for inapp and inbox using Response | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -14,6 +14,8 @@ import com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.response.CleverTapResponse;\nimport com.clevertap.android.sdk.response.CleverTapResponseHelper;\nimport com.clevertap.android.sdk.response.DisplayUnitResponse;\n+import com.clevertap.android.sdk.response.InAppResponse;\n+import com.clevertap.android.sdk.response.InboxResponse;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.MainLooperHandler;\nimport com.clevertap.android.sdk.task.Task;\n@@ -35,6 +37,8 @@ import org.json.JSONObject;\npublic class AnalyticsManager extends BaseAnalyticsManager {\n+ private final CTLockManager ctLockManager;\n+\nprivate final HashMap<String, Integer> installReferrerMap = new HashMap<>(8);\nprivate final BaseEventQueueManager baseEventQueueManager;\n@@ -74,7 +78,8 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nLocalDataStore localDataStore,\nDeviceInfo deviceInfo,\nMainLooperHandler mainLooperHandler,\n- BaseCallbackManager callbackManager, ControllerManager controllerManager) {\n+ BaseCallbackManager callbackManager, ControllerManager controllerManager,\n+ final CTLockManager ctLockManager) {\nthis.context = context;\nthis.config = config;\nthis.baseEventQueueManager = baseEventQueueManager;\n@@ -85,6 +90,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nthis.deviceInfo = deviceInfo;\nthis.mainLooperHandler = mainLooperHandler;\nthis.callbackManager = callbackManager;\n+ this.ctLockManager = ctLockManager;\n//TODO set display unit using observer pattern once it's created lazily, check for it's usage in\n// pushDisplayUnitClickedEventForID & pushDisplayUnitViewedEventForID - @atul\nthis.controllerManager = controllerManager;\n@@ -470,7 +476,13 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nJSONArray inappNotifs = new JSONArray();\nr.put(Constants.INAPP_JSON_RESPONSE_KEY, inappNotifs);\ninappNotifs.put(new JSONObject(extras.getString(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY)));\n- //TODO Refactoring @piyush - similar to display units\n+ //TODO Review @Darshan @atul - processInAppResponse logic\n+ CleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\n+\n+ cleverTapResponse = new InAppResponse(cleverTapResponse, config,\n+ controllerManager);\n+\n+ cleverTapResponse.processResponse(r, null, context);\n//processInAppResponse(r, mContext);\n} catch (Throwable t) {\nLogger.v(\"Failed to display inapp notification from push notification payload\", t);\n@@ -490,13 +502,18 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nLogger.v(\"Received inbox via push payload: \" + extras\n.getString(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY));\nJSONObject r = new JSONObject();\n- JSONArray inappNotifs = new JSONArray();\n- r.put(Constants.INBOX_JSON_RESPONSE_KEY, inappNotifs);\n+ JSONArray inboxNotifs = new JSONArray();\n+ r.put(Constants.INBOX_JSON_RESPONSE_KEY, inboxNotifs);\nJSONObject testPushObject = new JSONObject(\nextras.getString(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY));\ntestPushObject.put(\"_id\", String.valueOf(System.currentTimeMillis() / 1000));\n- inappNotifs.put(testPushObject);\n- //TODO Refactoring @piyush - similar to display units\n+ inboxNotifs.put(testPushObject);\n+ //TODO Review @Darshan @atul - processInboxResponse logic\n+ CleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\n+ cleverTapResponse = new InboxResponse(cleverTapResponse, config,\n+ ctLockManager, callbackManager, controllerManager);\n+\n+ cleverTapResponse.processResponse(r, null, context);\n//processInboxResponse(r);\n} catch (Throwable t) {\nLogger.v(\"Failed to process inbox message from push notification payload\", t);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -79,7 +79,7 @@ class CleverTapFactory {\nAnalyticsManager analyticsManager = new AnalyticsManager(context, config, baseEventQueueManager, validator,\nvalidationResultStack, coreMetaData, localDataStore, deviceInfo,\n- mainLooperHandler, callbackManager, controllerManager);\n+ mainLooperHandler, callbackManager, controllerManager, ctLockManager);\ncoreState.setAnalyticsManager(analyticsManager);\nInAppController inAppController = new InAppController(context, config, mainLooperHandler,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/events/EventQueueManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/events/EventQueueManager.java",
"diff": "@@ -271,7 +271,6 @@ public class EventQueueManager extends BaseEventQueueManager implements FailureF\nJSONObject profileEvent = new JSONObject();\n- // TODO: move to CTJSONConverter which will clone input json using below method\nif (baseProfile != null && baseProfile.length() > 0) {\nIterator<String> i = baseProfile.keys();\nIdentityRepo iProfileHandler = IdentityRepoFactory\n@@ -295,7 +294,6 @@ public class EventQueueManager extends BaseEventQueueManager implements FailureF\nif (value != null) {\nprofileEvent.put(next, value);\n- // TODO abstract out using IdentityIterator and IdentityIterable\n// cache the valid identifier: guid pairs\nboolean isProfileKey = iProfileHandler.hasIdentity(next);\nif (isProfileKey) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -82,11 +82,11 @@ public class NetworkManager extends BaseNetworkManager {\nprivate final Logger logger;\n- private int responseFailureCount = 0;// TODO encapsulate into NetworkState class\n+ private int networkRetryCount = 0;\nprivate final ValidationResultStack validationResultStack;\n- private int networkRetryCount = 0;// TODO encapsulate into NetworkState class\n+ private int responseFailureCount = 0;\npublic static boolean isNetworkOnline(Context context) {\n@@ -380,12 +380,10 @@ public class NetworkManager extends BaseNetworkManager {\nStorageHelper.putInt(context, StorageHelper.storageKeyWithSuffix(config, Constants.KEY_LAST_TS), ts);\n}\n- // TODO encapsulate into NetworkState class\nint getResponseFailureCount() {\nreturn responseFailureCount;\n}\n- // TODO encapsulate into NetworkState class\nvoid setResponseFailureCount(final int responseFailureCount) {\nthis.responseFailureCount = responseFailureCount;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponse.java",
"diff": "@@ -4,6 +4,9 @@ import android.content.Context;\nimport android.util.Log;\nimport org.json.JSONObject;\n+/**\n+ * Abstract Response that will be wrapped by {@link CleverTapResponseDecorator} objects\n+ */\npublic abstract class CleverTapResponse {\npublic void processResponse(final JSONObject jsonBody, final String stringBody,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponseDecorator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponseDecorator.java",
"diff": "@@ -3,6 +3,10 @@ package com.clevertap.android.sdk.response;\nimport android.content.Context;\nimport org.json.JSONObject;\n+/**\n+ * Abstract Decorator that will be used to decorate {@link CleverTapResponseHelper}\n+ * <br>Extend this class to create different kind of response\n+ */\nabstract class CleverTapResponseDecorator extends CleverTapResponse {\npublic abstract void processResponse(JSONObject jsonBody, String stringBody,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InboxResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InboxResponse.java",
"diff": "@@ -4,6 +4,7 @@ import android.content.Context;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.Logger;\nimport org.json.JSONArray;\n@@ -50,14 +51,14 @@ public class InboxResponse extends CleverTapResponseDecorator {\nlogger.verbose(config.getAccountId(), \"Inbox: Processing response\");\n- if (!response.has(\"inbox_notifs\")) {\n+ if (!response.has(Constants.INBOX_JSON_RESPONSE_KEY)) {\nlogger.verbose(config.getAccountId(), \"Inbox: Response JSON object doesn't contain the inbox key\");\n// process PushAmp response\ncleverTapResponse.processResponse(response, stringBody, context);\nreturn;\n}\ntry {\n- _processInboxMessages(response.getJSONArray(\"inbox_notifs\"));\n+ _processInboxMessages(response.getJSONArray(Constants.INBOX_JSON_RESPONSE_KEY));\n} catch (Throwable t) {\nlogger.verbose(config.getAccountId(), \"InboxResponse: Failed to parse response\", t);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): refactor send test logic for inapp and inbox using Response SDK-660 |
116,612 | 17.03.2021 19:57:40 | -19,080 | f72d4f8ad5f8363791a63e7d86f85dc5b4927a86 | task(TDD): Ignore stale inapp logic during sendtest inapp Response | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -480,7 +480,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\ncleverTapResponse = new InAppResponse(cleverTapResponse, config,\n- controllerManager);\n+ controllerManager, true);\ncleverTapResponse.processResponse(r, null, context);\n//processInAppResponse(r, mContext);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -143,7 +143,7 @@ public class NetworkManager extends BaseNetworkManager {\ncleverTapResponse = new ConsoleResponse(cleverTapResponse, config);\ncleverTapResponse = new ARPResponse(cleverTapResponse, config, this, validator, controllerManager);\ncleverTapResponse = new MetadataResponse(cleverTapResponse, config, deviceInfo, this);\n- cleverTapResponse = new InAppResponse(cleverTapResponse, config, controllerManager);\n+ cleverTapResponse = new InAppResponse(cleverTapResponse, config, controllerManager, false);\ncleverTapResponse = new BaseResponse(context, config, deviceInfo, this, localDataStore, cleverTapResponse);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"diff": "@@ -22,14 +22,17 @@ public class InAppResponse extends CleverTapResponseDecorator {\nprivate final ControllerManager controllerManager;\n+ private final boolean isSendTest;\n+\nprivate final Logger logger;\npublic InAppResponse(CleverTapResponse cleverTapResponse, CleverTapInstanceConfig config,\n- ControllerManager controllerManager) {\n+ ControllerManager controllerManager, final boolean isSendTest) {\nthis.cleverTapResponse = cleverTapResponse;\nthis.config = config;\nlogger = this.config.getLogger();\nthis.controllerManager = controllerManager;\n+ this.isSendTest = isSendTest;\n}\n@Override\n@@ -65,7 +68,7 @@ public class InAppResponse extends CleverTapResponseDecorator {\nperDay = response.getInt(\"imp\");\n}\n- if (controllerManager.getInAppFCManager() != null) {\n+ if (!isSendTest && controllerManager.getInAppFCManager() != null) {\nLogger.v(\"Updating InAppFC Limits\");\ncontrollerManager.getInAppFCManager().updateLimits(context, perDay, perSession);\ncontrollerManager.getInAppFCManager().processResponse(context, response);// Handle stale_inapp\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): Ignore stale inapp logic during sendtest inapp Response SDK-660 |
116,612 | 18.03.2021 13:54:49 | -19,080 | aebdd75739e0bc1998e0cd41b3db967431214e61 | task(TDD): process geofence response further if product config response processing fails | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ProductConfigResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/ProductConfigResponse.java",
"diff": "@@ -55,6 +55,8 @@ public class ProductConfigResponse extends CleverTapResponseDecorator {\nlogger.verbose(config.getAccountId(),\nConstants.LOG_TAG_PRODUCT_CONFIG + \"JSON object doesn't contain the Product Config key\");\nonProductConfigFailed();\n+ // process geofence response\n+ cleverTapResponse.processResponse(response, stringBody, context);\nreturn;\n}\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(TDD): process geofence response further if product config response processing fails SDK-660 |
116,623 | 18.03.2021 18:21:33 | -19,080 | c34c241a756b19ca216d9fb057edd43447bad65d | task(SDK-701): Removed FeatureNotSupportedException and replaced with logging | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -24,7 +24,6 @@ import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.EventDetail;\n-import com.clevertap.android.sdk.exceptions.FeatureNotSupportedException;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\n@@ -1138,9 +1137,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Handler to get the feature flag values\n*/\npublic CTFeatureFlagsController featureFlag() {\n- if (coreState.getConfig().isAnalyticsOnly()) {\n- //TODO replace with logging - @darshan\n- throw new FeatureNotSupportedException(\"Feature flag is not supported with analytics only configuration\");\n+ if (getConfig().isAnalyticsOnly()) {\n+ getConfig().getLogger().debug(getAccountId(),\"Feature flag is not supported with analytics only configuration\");\n}\nreturn coreState.getControllerManager().getCTFeatureFlagsController();\n}\n@@ -1813,8 +1811,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic CTProductConfigController productConfig() {\n- if (coreState.getConfig().isAnalyticsOnly()) {\n- throw new FeatureNotSupportedException(\n+ if (getConfig().isAnalyticsOnly()) {\n+ getConfig().getLogger().debug(getAccountId(),\n\"Product config is not supported with analytics only configuration\");\n}\nreturn coreState.getCtProductConfigController();\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/exceptions/FeatureNotSupportedException.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.exceptions;\n-\n-public class FeatureNotSupportedException extends RuntimeException {\n-\n- //TODO Remove this - @darshan\n- public FeatureNotSupportedException(final String message) {\n- super(message);\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Removed FeatureNotSupportedException and replaced with logging |
116,623 | 18.03.2021 18:25:08 | -19,080 | 8853c0934b2494e14521e73d25106eccee08a88e | task(SDK-701): Removed NullConstants file and refactored LogConstants to LoginConstants | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -13,8 +13,7 @@ import androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants.IdentityType;\n-import com.clevertap.android.sdk.utils.LogConstants;\n-import com.clevertap.android.sdk.utils.NullConstants;\n+import com.clevertap.android.sdk.login.LoginConstants;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport org.json.JSONObject;\n@@ -68,7 +67,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean personalization;\n- private String[] identityKeys = NullConstants.NULL_STRING_ARRAY;\n+ private String[] identityKeys = Constants.NULL_STRING_ARRAY;\nprivate boolean sslPinning;\n@@ -145,7 +144,7 @@ public class CleverTapInstanceConfig implements Parcelable {\n*/\nif (isDefaultInstance) {\nidentityKeys = manifest.getProfileKeys();\n- log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys from Manifest: \" + Arrays\n+ log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys from Manifest: \" + Arrays\n.toString(identityKeys));\n}\n}\n@@ -334,7 +333,7 @@ public class CleverTapInstanceConfig implements Parcelable {\npublic void setIdentityKeys(@IdentityType String... identityKeys) {\nif (!isDefaultInstance) {\nthis.identityKeys = identityKeys;\n- log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys via setter: \" + Arrays\n+ log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"Setting Profile Keys via setter: \" + Arrays\n.toString(this.identityKeys));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -282,4 +282,6 @@ public interface Constants {\nHashSet<String> ALL_IDENTITY_KEYS = new HashSet<>(Arrays.asList(TYPE_IDENTITY, TYPE_EMAIL, TYPE_PHONE));\nint MAX_DELAY_FREQUENCY = 1000 * 60 * 10;\n+\n+ String[] NULL_STRING_ARRAY = new String[0];\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -6,7 +6,6 @@ import android.content.pm.PackageManager;\nimport android.os.Bundle;\nimport android.text.TextUtils;\nimport androidx.annotation.RestrictTo;\n-import com.clevertap.android.sdk.utils.NullConstants;\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic class ManifestInfo {\n@@ -169,7 +168,7 @@ public class ManifestInfo {\nprivate String[] parseProfileKeys(final Bundle metaData) {\nString profileKeyString = _getManifestStringValueForKey(metaData, Constants.CLEVERTAP_IDENTIFIER);\nreturn !TextUtils.isEmpty(profileKeyString) ? profileKeyString.split(Constants.SEPARATOR_COMMA)\n- : NullConstants.NULL_STRING_ARRAY;\n+ : Constants.NULL_STRING_ARRAY;\n}\nstatic void changeCredentials(String id, String token, String region) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepo.java",
"diff": "package com.clevertap.android.sdk.login;\n-import static com.clevertap.android.sdk.utils.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+import static com.clevertap.android.sdk.login.LoginConstants.LOG_TAG_ON_USER_LOGIN;\nimport android.content.Context;\nimport androidx.annotation.NonNull;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepoFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepoFactory.java",
"diff": "package com.clevertap.android.sdk.login;\n-import static com.clevertap.android.sdk.utils.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+import static com.clevertap.android.sdk.login.LoginConstants.LOG_TAG_ON_USER_LOGIN;\nimport android.content.Context;\nimport androidx.annotation.RestrictTo;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyIdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyIdentityRepo.java",
"diff": "package com.clevertap.android.sdk.login;\n-import static com.clevertap.android.sdk.utils.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+import static com.clevertap.android.sdk.login.LoginConstants.LOG_TAG_ON_USER_LOGIN;\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginConstants.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+public interface LoginConstants {\n+\n+ String LOG_TAG_ON_USER_LOGIN = \"ON_USER_LOGIN\";\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginInfoProvider.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginInfoProvider.java",
"diff": "@@ -9,7 +9,6 @@ import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.utils.CTJsonConverter;\n-import com.clevertap.android.sdk.utils.LogConstants;\nimport org.json.JSONObject;\n/**\n@@ -59,7 +58,7 @@ public class LoginInfoProvider {\npublic boolean deviceIsMultiUser() {\nJSONObject cachedGUIDs = getCachedGUIDs();\nboolean deviceIsMultiUser = cachedGUIDs.length() > 1;\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"deviceIsMultiUser:[\" + deviceIsMultiUser + \"]\");\nreturn deviceIsMultiUser;\n}\n@@ -69,7 +68,7 @@ public class LoginInfoProvider {\n*/\npublic JSONObject getCachedGUIDs() {\nString json = StorageHelper.getStringFromPrefs(context, config, Constants.CACHED_GUIDS_KEY, null);\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"getCachedGUIDs:[\" + json + \"]\");\nreturn CTJsonConverter.toJsonObject(json, config.getLogger(), config.getAccountId());\n}\n@@ -87,7 +86,7 @@ public class LoginInfoProvider {\nString cachedGuid = cachedGUIDs.toString();\nStorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(config, Constants.CACHED_GUIDS_KEY),\ncachedGuid);\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"setCachedGUIDs:[\" + cachedGuid + \"]\");\n} catch (Throwable t) {\nconfig.getLogger().verbose(config.getAccountId(), \"Error persisting guid cache: \" + t.toString());\n@@ -100,7 +99,7 @@ public class LoginInfoProvider {\npublic String getCachedIdentityKeysForAccount() {\nString cachedKeys = StorageHelper\n.getStringFromPrefs(context, config, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"getCachedIdentityKeysForAccount:\" + cachedKeys);\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"getCachedIdentityKeysForAccount:\" + cachedKeys);\nreturn cachedKeys;\n}\n@@ -120,7 +119,7 @@ public class LoginInfoProvider {\nJSONObject cache = getCachedGUIDs();\ntry {\nString cachedGuid = cache.getString(cacheKey);\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"getGUIDForIdentifier:[Key:\" + key + \", value:\" + cachedGuid + \"]\");\nreturn cachedGuid;\n} catch (Throwable t) {\n@@ -132,7 +131,7 @@ public class LoginInfoProvider {\npublic boolean isAnonymousDevice() {\nJSONObject cachedGUIDs = getCachedGUIDs();\nboolean isAnonymousDevice = cachedGUIDs.length() <= 0;\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"isAnonymousDevice:[\" + isAnonymousDevice + \"]\");\nreturn isAnonymousDevice;\n}\n@@ -146,7 +145,7 @@ public class LoginInfoProvider {\nJSONObject jsonObject = getCachedGUIDs();\nboolean isLoggedIn = jsonObject != null && jsonObject.length() > 0 && TextUtils\n.isEmpty(getCachedIdentityKeysForAccount());\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"isLegacyProfileLoggedIn:\" + isLoggedIn);\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"isLegacyProfileLoggedIn:\" + isLoggedIn);\nreturn isLoggedIn;\n}\n@@ -158,12 +157,12 @@ public class LoginInfoProvider {\npublic void saveIdentityKeysForAccount(final String valueCommaSeparated) {\nStorageHelper.putString(context, config, Constants.SP_KEY_PROFILE_IDENTITIES,\nvalueCommaSeparated);\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"saveIdentityKeysForAccount:\" + valueCommaSeparated);\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"saveIdentityKeysForAccount:\" + valueCommaSeparated);\n}\nprivate boolean isErrorDeviceId() {\nboolean isErrorDeviceId = deviceInfo.isErrorDeviceId();\n- config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ config.log(LoginConstants.LOG_TAG_ON_USER_LOGIN,\n\"isErrorDeviceId:[\" + isErrorDeviceId + \"]\");\nreturn isErrorDeviceId;\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/LogConstants.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.utils;\n-\n-//TODO move to Login package and rename - @darshan\n-public interface LogConstants {\n-\n- String LOG_TAG_ON_USER_LOGIN = \"ON_USER_LOGIN\";\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/NullConstants.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.utils;\n-\n-import androidx.annotation.RestrictTo;\n-\n-//TODO move to root Constants - @darshan\n-@RestrictTo(RestrictTo.Scope.LIBRARY)\n-public interface NullConstants {\n-\n- String[] NULL_STRING_ARRAY = new String[0];\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Removed NullConstants file and refactored LogConstants to LoginConstants |
116,623 | 18.03.2021 18:48:41 | -19,080 | 0f2ac74af8a0413f2b6eb33a6e96e22b30cb7639 | task(SDK-701): Added validations for all receivers and push types | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ManifestValidator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ManifestValidator.java",
"diff": "@@ -12,6 +12,7 @@ import com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.pushnotification.CTNotificationIntentService;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationReceiver;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n@@ -61,20 +62,26 @@ public final class ManifestValidator {\nCTBackgroundIntentService.class.getName());\nvalidateActivityInManifest((Application) context.getApplicationContext(),\nInAppNotificationActivity.class);\n+ validateActivityInManifest((Application) context.getApplicationContext(),\n+ CTInboxActivity.class);\n+ validateReceiverInManifest((Application) context.getApplicationContext(),\n+ \"com.clevertap.android.geofence.CTGeofenceReceiver\");\n+ validateReceiverInManifest((Application) context.getApplicationContext(),\n+ \"com.clevertap.android.geofence.CTLocationUpdateReceiver\");\n+ validateReceiverInManifest((Application) context.getApplicationContext(),\n+ \"com.clevertap.android.geofence.CTGeofenceBootReceiver\");\n} catch (Exception e) {\nLogger.v(\"Receiver/Service issue : \" + e.toString());\n-\n}\nArrayList<PushType> enabledPushTypes = pushProviders.getAvailablePushTypes();\nif (enabledPushTypes == null) {\nreturn;\n}\n- //TODO check for other PushTypes - @darshan\n+\nfor (PushType pushType : enabledPushTypes) {\n- //no-op\nif (pushType == PushType.FCM) {\ntry {\n- // use class name string directly here to avoid class not found issues on class import, because we only use FCM\n+ // use class name string directly here to avoid class not found issues on class import\nvalidateServiceInManifest((Application) context.getApplicationContext(),\n\"com.clevertap.android.sdk.pushnotification.fcm.FcmMessageListenerService\");\n} catch (Exception e) {\n@@ -82,7 +89,28 @@ public final class ManifestValidator {\n} catch (Error error) {\nLogger.v(\"FATAL : \" + error.getMessage());\n+ }\n+ }else if(pushType == PushType.HPS){\n+ try {\n+ // use class name string directly here to avoid class not found issues on class import\n+ validateServiceInManifest((Application) context.getApplicationContext(),\n+ \"com.clevertap.android.hms.CTHmsMessageService\");\n+ } catch (Exception e) {\n+ Logger.v(\"Receiver/Service issue : \" + e.toString());\n+ } catch (Error error) {\n+ Logger.v(\"FATAL : \" + error.getMessage());\n+ }\n+ }else if(pushType == PushType.XPS){\n+ try {\n+ // use class name string directly here to avoid class not found issues on class import\n+ validateReceiverInManifest((Application) context.getApplicationContext(),\n+ \"com.clevertap.android.xps.XiaomiMessageReceiver\");\n+ } catch (Exception e) {\n+ Logger.v(\"Receiver/Service issue : \" + e.toString());\n+\n+ } catch (Error error) {\n+ Logger.v(\"FATAL : \" + error.getMessage());\n}\n}\n}\n@@ -121,11 +149,11 @@ public final class ManifestValidator {\nfor (ActivityInfo activityInfo : receivers) {\nif (activityInfo.name.equals(receiverClassName)) {\n- Logger.i(receiverClassName.replaceFirst(\"com.clevertap.android.sdk.\", \"\") + \" is present\");\n+ Logger.i(receiverClassName.replaceFirst(\"com.clevertap.android.\", \"\") + \" is present\");\nreturn;\n}\n}\n- Logger.i(receiverClassName.replaceFirst(\"com.clevertap.android.sdk.\", \"\") + \" not present\");\n+ Logger.i(receiverClassName.replaceFirst(\"com.clevertap.android.\", \"\") + \" not present\");\n}\nprivate static void validateServiceInManifest(Application application, String serviceClassName)\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/AndroidManifest.xml",
"new_path": "clevertap-geofence/src/main/AndroidManifest.xml",
"diff": "<application>\n- <receiver android:name=\".CTGeofenceReceiver\"></receiver>\n+ <receiver android:name=\".CTGeofenceReceiver\" />\n- <receiver android:name=\".CTLocationUpdateReceiver\"></receiver>\n+ <receiver android:name=\".CTLocationUpdateReceiver\" />\n<receiver android:name=\".CTGeofenceBootReceiver\">\n<intent-filter>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/AndroidManifest.xml",
"new_path": "clevertap-xps/src/main/AndroidManifest.xml",
"diff": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />\n<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />\n<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />\n- <uses-permission android:name=\"android.permission.GET_TASKS\" />\n<uses-permission android:name=\"android.permission.VIBRATE\" />\n<permission\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Added validations for all receivers and push types |
116,623 | 22.03.2021 16:23:02 | -19,080 | a8ee2b34a1870dec0eaefec55f9daac5000b3c9d | task(SDK-706): Remove JCenter and update build process to deploy to MavenCentral | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -6,15 +6,15 @@ buildscript {\nrepositories {\ngoogle()// Google's Maven repository\n- maven { url 'http://developer.huawei.com/repo/' }\nmavenCentral()\n- jcenter()\n+ gradlePluginPortal()\n+ maven { url 'http://developer.huawei.com/repo/' }\n+\n}\ndependencies {\nclasspath \"com.android.tools.build:gradle:$gradlePluginVersion\"\nclasspath \"com.google.gms:google-services:$googleServicesPluginVersion\"// Google Services plugin\nclasspath \"com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion\"\n- classpath \"com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayPluginVersion\"\nclasspath \"com.huawei.agconnect:agcp:$huaweiPluginVersion\"// Huawei Push Plugin\nclasspath \"org.jacoco:org.jacoco.core:$jacocoVersion\"\nclasspath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"\n@@ -25,11 +25,9 @@ buildscript {\nallprojects {\nrepositories {\ngoogle()\n+ mavenCentral()\n+ gradlePluginPortal()\nmaven { url 'http://developer.huawei.com/repo/' }\n- maven {\n- url \"https://plugins.gradle.org/m2/\"\n- }\n- jcenter()\nflatDir {\ndirs 'libs'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -32,7 +32,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.1\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.0.4\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.1.0\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:17.0.0\"\nimplementation \"androidx.work:work-runtime:2.3.4\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.0.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "apply plugin: 'com.android.library'\napply plugin: 'kotlin-android'\napply plugin: 'com.github.dcendents.android-maven'\n-apply plugin: 'com.jfrog.bintray'\napply plugin: 'jacoco'\napply plugin: 'org.sonarqube'\n+apply plugin: 'maven-publish'\n+apply plugin: 'signing'\next {\n- bintrayRepo = 'Maven'\n- bintrayName = libraryName\n- org = 'clevertap'\n-\n+ Repo = 'Maven'\npublishedGroupId = 'com.clevertap.android'\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\n@@ -21,6 +19,16 @@ ext {\ndeveloperEmail = '[email protected]'\n}\n+ext[\"signing.keyId\"] = ''\n+ext[\"signing.password\"] = ''\n+ext[\"signing.secretKeyRingFile\"] = ''\n+ext[\"ossrhUsername\"] = ''\n+ext[\"ossrhPassword\"] = ''\n+ext[\"sonatypeStagingProfileId\"] = ''\n+ext[\"developerId\"] = ''\n+ext[\"developerName\"] = ''\n+ext[\"developerEmail\"] = ''\n+\nversion = libraryVersion\ngroup = publishedGroupId\n@@ -113,74 +121,100 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea\nProperties properties = new Properties()\nif (project.rootProject.file('local.properties').exists()) {\nproperties.load(project.rootProject.file('local.properties').newDataInputStream())\n+ properties.each { name, value ->\n+ ext[name] = value\n}\n-\n-bintray {\n- user = properties.getProperty(\"bintray.user\")\n- key = properties.getProperty(\"bintray.apikey\")\n-\n- configurations = ['archives']\n- pkg {\n- repo = bintrayRepo\n- name = bintrayName\n- userOrg = org\n- desc = libraryDescription\n- websiteUrl = siteUrl\n- vcsUrl = gitUrl\n- licenses = allLicenses\n- publish = true\n- publicDownloadNumbers = true\n- version {\n- desc = libraryDescription\n+}else{\n+ ext[\"signing.keyId\"] = System.getenv('SIGNING_KEY_ID')\n+ ext[\"signing.password\"] = System.getenv('SIGNING_PASSWORD')\n+ ext[\"signing.secretKeyRingFile\"] = System.getenv('SIGNING_SECRET_KEY_RING_FILE')\n+ ext[\"ossrhUsername\"] = System.getenv('OSSRH_USERNAME')\n+ ext[\"ossrhPassword\"] = System.getenv('OSSRH_PASSWORD')\n+ ext[\"sonatypeStagingProfileId\"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')\n}\n+\n+task sourcesJar(type: Jar) {\n+ baseName \"$artifact\"\n+ from android.sourceSets.main.java.srcDirs\n+ classifier = 'sources'\n}\n+\n+artifacts {\n+ archives sourcesJar\n}\n-install {\n- repositories.mavenInstaller {\n- // This generates POM.xml with proper parameters\n- pom {\n- project {\n- packaging 'aar'\n+publishing {\n+ publications {\n+ release(MavenPublication) {\n+ // The coordinates of the library, being set from variables that\n+ // we'll set up later\ngroupId publishedGroupId\nartifactId artifact\n+ version version\n- // Add your description here\n- name libraryName\n- description libraryDescription\n- url siteUrl\n+ // Two artifacts, the `aar` (or `jar`) and the sources\n+ if (project.plugins.findPlugin(\"com.android.library\")) {\n+ artifact(\"$buildDir/outputs/aar/${artifact}-${libraryVersion}.aar\")\n+ } else {\n+ artifact(\"$buildDir/libs/${project.getName()}-${version}.jar\")\n+ }\n+ artifact sourcesJar\n- // Set your license\n+ // Mostly self-explanatory metadata\n+ pom {\n+ name = artifact\n+ description = libraryDescription\n+ url = siteUrl\nlicenses {\nlicense {\n- name licenseName\n- url licenseUrl\n+ name = licenseName\n+ url = licenseUrl\n}\n}\ndevelopers {\ndeveloper {\n- id developerId\n- name developerName\n- email developerEmail\n+ id = developerId\n+ name = developerName\n+ email = developerEmail\n}\n+ // Add all other devs here...\n}\n+ // Version control info - if you're using GitHub, follow the format as seen here\nscm {\n- connection gitUrl\n- developerConnection gitUrl\n- url siteUrl\n+ connection = 'scm:git:github.com/CleverTap/clevertap-android-sdk.git'\n+ developerConnection = 'scm:git:ssh:github.com/CleverTap/clevertap-android-sdk.git'\n+ url = 'https://github.com/CleverTap/clevertap-android-sdk/tree/master'\n+ }\n+ // A slightly hacky fix so that your POM will include any transitive dependencies\n+ // that your library builds upon\n+ withXml {\n+ def dependenciesNode = asNode().appendNode('dependencies')\n+ project.configurations.implementation.allDependencies.each {\n+ def dependencyNode = dependenciesNode.appendNode('dependency')\n+ dependencyNode.appendNode('groupId', it.group)\n+ dependencyNode.appendNode('artifactId', it.name)\n+ dependencyNode.appendNode('version', it.version)\n}\n}\n}\n}\n}\n-\n-task sourcesJar(type: Jar) {\n- baseName \"$artifact\"\n- from android.sourceSets.main.java.srcDirs\n- classifier = 'sources'\n+ // The repository to publish to, Sonatype/MavenCentral\n+ repositories {\n+ maven {\n+ // This is an arbitrary name, you may also use \"mavencentral\" or\n+ // any other name that's descriptive for you\n+ name = Repo\n+ url = \"https://oss.sonatype.org/service/local/staging/deploy/maven2/\"\n+ credentials {\n+ username ossrhUsername\n+ password ossrhPassword\n+ }\n+ }\n+ }\n}\n-artifacts {\n- archives sourcesJar\n+signing {\n+ sign publishing.publications\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-706): Remove JCenter and update build process to deploy to MavenCentral |
116,621 | 22.03.2021 16:43:06 | -19,080 | 6ace8ba78715bfebaae54245089475dc14649baf | task(609):Removed todo's | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -91,8 +91,6 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nthis.mainLooperHandler = mainLooperHandler;\nthis.callbackManager = callbackManager;\nthis.ctLockManager = ctLockManager;\n- //TODO set display unit using observer pattern once it's created lazily, check for it's usage in\n- // pushDisplayUnitClickedEventForID & pushDisplayUnitViewedEventForID - @atul\nthis.controllerManager = controllerManager;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1280,9 +1280,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getDeviceInfo().getDeviceID();\n}\n- /**\n- * //TODO Remove this and make related changes - @atul\n- */\n@RestrictTo(Scope.LIBRARY)\npublic CoreState getCoreState() {\nreturn coreState;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainLooperHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainLooperHandler.java",
"diff": "@@ -5,7 +5,6 @@ import android.os.Looper;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n-//ToDO move this a single Task manager\n@RestrictTo(Scope.LIBRARY)\npublic class MainLooperHandler extends Handler {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(609):Removed todo's |
116,621 | 31.03.2021 15:06:13 | -19,080 | ed4aa63b55af86f7f1287191e5d83667fe21bc0c | Task(SDK-609):
1. Added bug fix for ForceDevice Token
2. Added javadoc. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "package com.clevertap.android.sdk.product_config;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_NO_OF_CALLS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS;\n-\nimport android.text.TextUtils;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.OnSuccessListener;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.FileUtils;\n+\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.TimeUnit;\n-import org.json.JSONException;\n-import org.json.JSONObject;\n+\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS;\nclass ProductConfigSettings {\n@@ -129,20 +132,10 @@ class ProductConfigSettings {\nsettingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(DEFAULT_WINDOW_LENGTH_MINS));\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(0));\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(DEFAULT_MIN_FETCH_INTERVAL_SECONDS));\n-\n- Task<Void> task = CTExecutorFactory.executors(config).ioTask();\n- task.execute(\"ProductConfigSettings#initDefaults\", new Callable<Void>() {\n- @Override\n- public Void call() {\n- synchronized (this) {\nconfig.getLogger()\n.verbose(ProductConfigUtil.getLogTag(config),\n\"Settings loaded with default values: \" + settingsMap);\n}\n- return null;\n- }\n- });\n- }\n/**\n* loads settings from file.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -263,7 +263,7 @@ public class PushProviders implements CTPushProviderListener {\n@RestrictTo(Scope.LIBRARY)\npublic void forcePushDeviceToken(final boolean register) {\n- for (PushType pushType : getAvailablePushTypes()) {\n+ for (PushType pushType : allEnabledPushTypes) {\npushDeviceTokenEvent(null, register, pushType);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutorFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutorFactory.java",
"diff": "package com.clevertap.android.sdk.task;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Map;\n+/**\n+ * Factory class to create & cache Executors{@link CTExecutors}\n+ * Every account has it's dedicated Executor\n+ */\npublic class CTExecutorFactory {\nprivate static final Map<String, CTExecutors> executorMap = Collections\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"diff": "@@ -6,7 +6,7 @@ import java.util.HashMap;\nimport java.util.concurrent.Executor;\n/**\n- * Global executor pools for the whole application.\n+ * Global executor pools per account.\n* <p>\n* Grouping tasks like this avoids the effects of task starvation (e.g. disk reads don't wait behind\n* webservice requests).\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Executable.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Executable.java",
"diff": "@@ -2,6 +2,10 @@ package com.clevertap.android.sdk.task;\nimport java.util.concurrent.Executor;\n+/**\n+ * Stuffs which can be executed on an executor with certain input parameter\n+ * @param <TResult>\n+ */\nabstract class Executable<TResult> {\nprotected final Executor executor;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"diff": "@@ -11,6 +11,9 @@ import java.util.concurrent.ThreadPoolExecutor;\nimport java.util.concurrent.TimeUnit;\nimport java.util.concurrent.TimeoutException;\n+/**\n+ * Executor service pool containing more threads to do offload the IO work.\n+ */\nclass IOExecutor implements ExecutorService {\nprivate final int numCores = Runtime.getRuntime().availableProcessors();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Task.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Task.java",
"diff": "@@ -10,6 +10,10 @@ import java.util.concurrent.Executor;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Future;\n+/**\n+ * Definition of task is to execute some work & return success or failure callbacks\n+ * @param <TResult>\n+ */\npublic class Task<TResult> {\nprotected enum STATE {FAILED, SUCCESS, READY_TO_RUN, RUNNING}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-609):
1. Added bug fix for ForceDevice Token
2. Added javadoc. |
116,621 | 31.03.2021 15:28:09 | -19,080 | 331a15f68f453fccd34e4419bb08abf6ec7f84cf | Task(SDK-609):
1. Javadocs for Task | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/CTExecutors.java",
"diff": "@@ -28,14 +28,31 @@ public class CTExecutors {\nthis.config = config;\n}\n+ /**\n+ * Use this task when you want to offload some background task\n+ * @param <TResult>\n+ * @return\n+ */\npublic <TResult> Task<TResult> ioTask() {\nreturn taskOnExecutorWithName(IO_EXECUTOR, DEFAULT_CALLBACK_EXECUTOR, \"ioTask\");\n}\n+ /**\n+ * Use this task to execute a runnable to main thread\n+ * @param <TResult>\n+ * @return\n+ */\n+\npublic <TResult> Task<TResult> mainTask() {\nreturn taskOnExecutorWithName(MAIN_EXECUTOR, DEFAULT_CALLBACK_EXECUTOR, \"Main\");\n}\n+ /**\n+ * Use this task to execute a job in a sequential fashion for a particular feature\n+ * @param featureTag - name of the feature. e.g we have separate single pool executor for InApps & Geofences etc.\n+ * @param <TResult>\n+ * @return\n+ */\npublic <TResult> Task<TResult> postAsyncSafelyTask(String featureTag) {\nif (featureTag == null) {\nthrow new IllegalArgumentException(\"Tag can't be null\");\n@@ -49,14 +66,35 @@ public class CTExecutors {\nreturn taskOnExecutorWithName(postAsyncSafelyExecutor, DEFAULT_CALLBACK_EXECUTOR, \"PostAsyncSafely\");\n}\n+ /**\n+ * Common single thread pool for a particular account.\n+ * Use this for general purpose single pipe-lining of jobs.\n+ * @param <TResult>\n+ * @return\n+ */\npublic <TResult> Task<TResult> postAsyncSafelyTask() {\nreturn postAsyncSafelyTask(config.getAccountId());\n}\n+ /**\n+ * Use this task to use your own custom executor for executing jobs & getting callbacks on default executors\n+ * @param taskExecutor - executor on which the provided task will be executed\n+ * @param taskName - custom name for the task (e.g we have main, iotask , postasycnsafely)\n+ * @param <TResult>\n+ * @return - task\n+ */\npublic <TResult> Task<TResult> taskOnExecutor(Executor taskExecutor, String taskName) {\nreturn taskOnExecutorWithName(taskExecutor, DEFAULT_CALLBACK_EXECUTOR, taskName);\n}\n+ /**\n+ * Use this task to use your own custom executor for executing jobs & getting callbacks on the provided callback executors\n+ * @param taskExecutor - executor on which the provided task will be executed\n+ * @param callbackExecutor - executor on which the callbacks will be executed\n+ * @param taskName - custom name for the task (e.g we have main, iotask , postasycnsafely)\n+ * @param <TResult>\n+ * @return - task\n+ */\npublic <TResult> Task<TResult> taskOnExecutorWithName(Executor taskExecutor,\nExecutor callbackExecutor, String taskName) {\nif (taskExecutor == null || callbackExecutor == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/FailureExecutable.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/FailureExecutable.java",
"diff": "@@ -2,6 +2,12 @@ package com.clevertap.android.sdk.task;\nimport java.util.concurrent.Executor;\n+/**\n+ * Wrapper class to execute runnable after a task is failed.\n+ * Ref{@link OnFailureListener}\n+ *\n+ * @param <TResult>\n+ */\nclass FailureExecutable<TResult> extends Executable<TResult> {\npublic OnFailureListener<TResult> getFailureListener() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/IOExecutor.java",
"diff": "@@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit;\nimport java.util.concurrent.TimeoutException;\n/**\n- * Executor service pool containing more threads to do offload the IO work.\n+ * Executor service pool containing more threads to offload the IO tasks.\n*/\nclass IOExecutor implements ExecutorService {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainThreadExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/MainThreadExecutor.java",
"diff": "@@ -5,6 +5,9 @@ import android.os.Looper;\nimport androidx.annotation.NonNull;\nimport java.util.concurrent.Executor;\n+/**\n+ * Executor service to delegate runnables to Main Thread.\n+ */\npublic class MainThreadExecutor implements Executor {\nvoid setMainThreadHandler(final Handler mainThreadHandler) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/OnFailureListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/OnFailureListener.java",
"diff": "package com.clevertap.android.sdk.task;\n+/**\n+ * Interface to provide failure callbacks\n+ * @param <TResult>\n+ */\npublic interface OnFailureListener<TResult> {\nvoid onFailure(TResult result);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/OnSuccessListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/OnSuccessListener.java",
"diff": "package com.clevertap.android.sdk.task;\n+/**\n+ * Interface to provide success callback\n+ * @param <TResult>\n+ */\npublic interface OnSuccessListener<TResult> {\nvoid onSuccess(TResult result);\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutor.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/PostAsyncSafelyExecutor.java",
"diff": "@@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit;\n/**\n* Post async safely executor is nothing but a single thread pool executor\n+ * It's a single pipeline to execute task sequentially\n*/\nclass PostAsyncSafelyExecutor implements ExecutorService {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/SuccessExecutable.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/SuccessExecutable.java",
"diff": "package com.clevertap.android.sdk.task;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+\nimport java.util.concurrent.Executor;\n+/**\n+ * Wrapper class to execute runnable after a task is successful.\n+ * Ref: {@link OnSuccessListener}\n+ *\n+ * @param <TResult>\n+ */\nclass SuccessExecutable<TResult> extends Executable<TResult> {\nprivate final OnSuccessListener<TResult> successListener;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Task.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/task/Task.java",
"diff": "package com.clevertap.android.sdk.task;\nimport androidx.annotation.NonNull;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+\nimport java.util.ArrayList;\nimport java.util.Iterator;\nimport java.util.List;\n@@ -12,6 +14,7 @@ import java.util.concurrent.Future;\n/**\n* Definition of task is to execute some work & return success or failure callbacks\n+ *\n* @param <TResult>\n*/\npublic class Task<TResult> {\n@@ -41,6 +44,13 @@ public class Task<TResult> {\nthis.taskName = taskName;\n}\n+ /**\n+ * Register listener to get failure callbacks on the provided executor\n+ *\n+ * @param executor - executor on which the failure callback will be called\n+ * @param listener- failure listener\n+ * @return task\n+ */\n@NonNull\npublic synchronized Task<TResult> addOnFailureListener(@NonNull final Executor executor,\nfinal OnFailureListener<Exception> listener) {\n@@ -50,11 +60,24 @@ public class Task<TResult> {\nreturn this;\n}\n+ /**\n+ * Register listener to get failure callbacks on main thread\n+ *\n+ * @param listener- failure listener\n+ * @return task\n+ */\n@NonNull\npublic Task<TResult> addOnFailureListener(@NonNull OnFailureListener<Exception> listener) {\nreturn addOnFailureListener(defaultCallbackExecutor, listener);\n}\n+ /**\n+ * Register listener to get success callbacks on the provided executor\n+ *\n+ * @param executor - executor on which the success callback will be called\n+ * @param listener- success listener\n+ * @return task\n+ */\n@NonNull\npublic Task<TResult> addOnSuccessListener(@NonNull final Executor executor,\nfinal OnSuccessListener<TResult> listener) {\n@@ -64,19 +87,42 @@ public class Task<TResult> {\nreturn this;\n}\n+ /**\n+ * Register listener to get success callbacks on main thread\n+ *\n+ * @param listener- success listener\n+ * @return task\n+ */\n@NonNull\npublic Task<TResult> addOnSuccessListener(@NonNull OnSuccessListener<TResult> listener) {\nreturn addOnSuccessListener(defaultCallbackExecutor, listener);\n}\n+ /**\n+ * Simple method to execute the task\n+ *\n+ * @param logTag - tag name to identify the task state in logs.\n+ * @param callable - piece of code to run\n+ */\npublic void execute(final String logTag, final Callable<TResult> callable) {\nexecutor.execute(newRunnableForTask(logTag, callable));\n}\n+ /**\n+ * Returns the state of task\n+ * Ref{@link STATE}\n+ *\n+ * @return\n+ */\npublic boolean isSuccess() {\nreturn taskState == STATE.SUCCESS;\n}\n+ /***\n+ * Removes the failure listener from the task.\n+ * @param listener - failure listener\n+ * @return task\n+ */\n@SuppressWarnings(\"unused\")\n@NonNull\npublic Task<TResult> removeOnFailureListener(@NonNull OnFailureListener<Exception> listener) {\n@@ -90,6 +136,12 @@ public class Task<TResult> {\nreturn this;\n}\n+ /***\n+ * Removes the Success listener from the task.\n+ * @param listener - success listener\n+ * @return task\n+ */\n+\n@SuppressWarnings(\"unused\")\n@NonNull\npublic Task<TResult> removeOnSuccessListener(@NonNull OnSuccessListener<TResult> listener) {\n@@ -103,6 +155,12 @@ public class Task<TResult> {\nreturn this;\n}\n+ /**\n+ * Use this method in-case we need future task for the execution\n+ *\n+ * @param logTag - tag name to identify the task state in logs.\n+ * @param callable - piece of code to run\n+ */\npublic Future<?> submit(final String logTag, final Callable<TResult> callable) {\nif (!(executor instanceof ExecutorService)) {\nthrow new UnsupportedOperationException(\n@@ -134,6 +192,13 @@ public class Task<TResult> {\nthis.taskState = taskState;\n}\n+ /**\n+ * Wraps the provided piece of code in runnable to execute on executor.\n+ *\n+ * @param logTag - tag with which this task can be identified in the logs.\n+ * @param callable - piece of code to run.\n+ * @return Runnable\n+ */\nprivate Runnable newRunnableForTask(final String logTag, final Callable<TResult> callable) {\nreturn new Runnable() {\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Task(SDK-609):
1. Javadocs for Task |
116,623 | 12.04.2021 12:10:42 | -19,080 | c9ed21d9046e06b1e251931f824b6cd3b73aaf7b | task(SDK-701): fixes push amp response dependency issues | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -136,7 +136,7 @@ public class NetworkManager extends BaseNetworkManager {\ncleverTapResponse = new FeatureFlagResponse(cleverTapResponse, config, controllerManager);\ncleverTapResponse = new DisplayUnitResponse(cleverTapResponse, config,\ncallbackManager, controllerManager);\n- cleverTapResponse = new PushAmpResponse(cleverTapResponse, context, config, ctLockManager,\n+ cleverTapResponse = new PushAmpResponse(cleverTapResponse, context, config,\nbaseDatabaseManager, callbackManager, controllerManager);\ncleverTapResponse = new InboxResponse(cleverTapResponse, config, ctLockManager,\ncallbackManager, controllerManager);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"diff": "@@ -32,22 +32,21 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nprivate final Logger logger;\n- private final PushProviders pushProviders;\n+ private final ControllerManager controllerManager;\npublic PushAmpResponse(CleverTapResponse cleverTapResponse,\nContext context,\nCleverTapInstanceConfig config,\n- CTLockManager ctLockManager,\nBaseDatabaseManager dbManager,\nBaseCallbackManager callbackManager,\nControllerManager controllerManager) {\nthis.cleverTapResponse = cleverTapResponse;\nthis.context = context;\nthis.config = config;\n- pushProviders = controllerManager.getPushProviders();\nlogger = this.config.getLogger();\ndbAdapter = dbManager.loadDBAdapter(context);\nthis.callbackManager = callbackManager;\n+ this.controllerManager = controllerManager;\n}\n@Override\n@@ -74,7 +73,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nif (pushAmpObject.has(\"pf\")) {\ntry {\nint frequency = pushAmpObject.getInt(\"pf\");\n- pushProviders.updatePingFrequencyIfNeeded(context, frequency);\n+ controllerManager.getPushProviders().updatePingFrequencyIfNeeded(context, frequency);\n} catch (Throwable t) {\nlogger\n.verbose(\"Error handling ping frequency in response : \" + t.getMessage());\n@@ -129,7 +128,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\ncallbackManager.getPushAmpListener().onPushAmpPayloadReceived(pushBundle);\n} else {\n//TODO: have to dev test PUSH AMP code.\n- pushProviders\n+ controllerManager.getPushProviders()\n._createNotification(context, pushBundle, Constants.EMPTY_NOTIFICATION_ID);\n}\n} else {\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/CTUtils.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.utils;\n-\n-//TODO: move non public methods from Utils.java to CTUtils - @darshan\n-class CTUtils {\n-\n-}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): fixes push amp response dependency issues |
116,623 | 12.04.2021 12:45:43 | -19,080 | 0a64850ee58864e03392a2f649443d32865cd9b0 | task(SDK-701): Removed TODO for reviewing test inapp and test inbox flow | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -474,20 +474,15 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nJSONArray inappNotifs = new JSONArray();\nr.put(Constants.INAPP_JSON_RESPONSE_KEY, inappNotifs);\ninappNotifs.put(new JSONObject(extras.getString(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY)));\n- //TODO Review @Darshan @atul - processInAppResponse logic\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\n-\ncleverTapResponse = new InAppResponse(cleverTapResponse, config,\ncontrollerManager, true);\n-\ncleverTapResponse.processResponse(r, null, context);\n- //processInAppResponse(r, mContext);\n} catch (Throwable t) {\nLogger.v(\"Failed to display inapp notification from push notification payload\", t);\n}\n}\n};\n-\nmainLooperHandler.setPendingRunnable(pendingInappRunnable);\nreturn;\n}\n@@ -506,13 +501,11 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nextras.getString(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY));\ntestPushObject.put(\"_id\", String.valueOf(System.currentTimeMillis() / 1000));\ninboxNotifs.put(testPushObject);\n- //TODO Review @Darshan @atul - processInboxResponse logic\nCleverTapResponse cleverTapResponse = new CleverTapResponseHelper();\ncleverTapResponse = new InboxResponse(cleverTapResponse, config,\nctLockManager, callbackManager, controllerManager);\ncleverTapResponse.processResponse(r, null, context);\n- //processInboxResponse(r);\n} catch (Throwable t) {\nLogger.v(\"Failed to process inbox message from push notification payload\", t);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Removed TODO for reviewing test inapp and test inbox flow |
116,612 | 12.04.2021 13:02:46 | -19,080 | aecb69a15bf478c324f9f3d8c686c5d427b746d3 | task: add geofence notification responsiveness to CTGeofenceSettings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceConstants.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceConstants.java",
"diff": "@@ -40,6 +40,8 @@ public class CTGeofenceConstants {\nstatic final String KEY_LAST_DISPLACEMENT = \"last_displacement\";\n+ static final String KEY_LAST_GEO_NOTIFICATION_RESPONSIVENESS = \"last_geo_notification_responsiveness\";\n+\nstatic final String TAG_WORK_LOCATION_UPDATES = \"com.clevertap.android.geofence.work.location\";\nstatic final int ERROR_CODE = 515;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceSettings.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceSettings.java",
"diff": "@@ -39,6 +39,9 @@ public class CTGeofenceSettings {\nprivate float smallestDisplacement = GoogleLocationAdapter.SMALLEST_DISPLACEMENT_IN_METERS;\n+ private int geofenceNotificationResponsiveness =\n+ GoogleGeofenceAdapter.GEOFENCE_NOTIFICATION_RESPONSIVENESS_IN_MILLISECONDS;\n+\npublic Builder() {\n}\n@@ -200,6 +203,12 @@ public class CTGeofenceSettings {\nthis.smallestDisplacement = smallestDisplacement;\nreturn this;\n}\n+\n+ public CTGeofenceSettings.Builder setGeofenceNotificationResponsiveness(\n+ int geofenceNotificationResponsiveness) {\n+ this.geofenceNotificationResponsiveness = geofenceNotificationResponsiveness;\n+ return this;\n+ }\n}\n/**\n@@ -255,6 +264,8 @@ public class CTGeofenceSettings {\nprivate final byte locationFetchMode; // WorkManager or BroadcastReceiver\n+ private final int geofenceNotificationResponsiveness;\n+\nprivate final @LogLevel\nint logLevel;\n@@ -270,6 +281,7 @@ public class CTGeofenceSettings {\ninterval = builder.interval;\nfastestInterval = builder.fastestInterval;\nsmallestDisplacement = builder.smallestDisplacement;\n+ geofenceNotificationResponsiveness = builder.geofenceNotificationResponsiveness;\n}\n@Override\n@@ -286,7 +298,8 @@ public class CTGeofenceSettings {\nlocationFetchMode == that.locationFetchMode &&\nlogLevel == that.logLevel && geofenceMonitoringCount == that.geofenceMonitoringCount\n&& id.equals(that.id) && interval == that.interval && fastestInterval == that.fastestInterval\n- && smallestDisplacement == that.smallestDisplacement;\n+ && smallestDisplacement == that.smallestDisplacement && geofenceNotificationResponsiveness\n+ == that.geofenceNotificationResponsiveness;\n}\n@Override\n@@ -330,4 +343,8 @@ public class CTGeofenceSettings {\npublic boolean isBackgroundLocationUpdatesEnabled() {\nreturn backgroundLocationUpdates;\n}\n+\n+ public int getGeofenceNotificationResponsiveness() {\n+ return geofenceNotificationResponsiveness;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleGeofenceAdapter.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleGeofenceAdapter.java",
"diff": "@@ -28,6 +28,8 @@ class GoogleGeofenceAdapter implements CTGeofenceAdapter {\nprivate static final long GEOFENCE_EXPIRATION_IN_MILLISECONDS = Geofence.NEVER_EXPIRE;\n+ static final int GEOFENCE_NOTIFICATION_RESPONSIVENESS_IN_MILLISECONDS = 0;\n+\nprivate final Context context;\nprivate final GeofencingClient geofencingClient;\n@@ -174,11 +176,18 @@ class GoogleGeofenceAdapter implements CTGeofenceAdapter {\nprivate ArrayList<Geofence> getGoogleGeofences(@NonNull List<CTGeofence> fenceList) {\nArrayList<Geofence> googleFenceList = new ArrayList<>();\n+ CTGeofenceSettings geofenceSettings = CTGeofenceAPI.getInstance(context).getGeofenceSettings();\n+ int geofenceNotificationResponsiveness = GEOFENCE_NOTIFICATION_RESPONSIVENESS_IN_MILLISECONDS;\n+ if (geofenceSettings != null) {\n+ geofenceNotificationResponsiveness = geofenceSettings.getGeofenceNotificationResponsiveness();\n+ }\n+\nfor (CTGeofence ctGeofence : fenceList) {\ngoogleFenceList.add(new Geofence.Builder()\n// Set the request ID of the geofence. This is a string to identify this\n// geofence.\n.setRequestId(ctGeofence.getId())\n+ .setNotificationResponsiveness(geofenceNotificationResponsiveness)\n.setCircularRegion(ctGeofence.getLatitude(), ctGeofence.getLongitude(),\nctGeofence.getRadius())\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/Utils.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/Utils.java",
"diff": "@@ -220,6 +220,8 @@ class Utils {\n.setFastestInterval(jsonObject.getLong(CTGeofenceConstants.KEY_LAST_FASTEST_INTERVAL))\n.setSmallestDisplacement(\n(float) jsonObject.getDouble(CTGeofenceConstants.KEY_LAST_DISPLACEMENT))\n+ .setGeofenceNotificationResponsiveness(\n+ jsonObject.getInt(CTGeofenceConstants.KEY_LAST_GEO_NOTIFICATION_RESPONSIVENESS))\n.build();\nCTGeofenceAPI.getLogger().debug(CTGeofenceAPI.GEOFENCE_LOG_TAG,\n@@ -293,6 +295,8 @@ class Utils {\nsettings.put(CTGeofenceConstants.KEY_LAST_INTERVAL, ctGeofenceSettings.getInterval());\nsettings.put(CTGeofenceConstants.KEY_LAST_FASTEST_INTERVAL, ctGeofenceSettings.getFastestInterval());\nsettings.put(CTGeofenceConstants.KEY_LAST_DISPLACEMENT, ctGeofenceSettings.getSmallestDisplacement());\n+ settings.put(CTGeofenceConstants.KEY_LAST_GEO_NOTIFICATION_RESPONSIVENESS,\n+ ctGeofenceSettings.getGeofenceNotificationResponsiveness());\nsettings.put(CTGeofenceConstants.KEY_ID, CTGeofenceAPI.getInstance(context).getAccountId());\nboolean writeJsonToFile = FileUtils.writeJsonToFile(context, FileUtils.getCachedDirName(context),\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task: add geofence notification responsiveness to CTGeofenceSettings SDK-672 |
116,623 | 13.04.2021 00:00:49 | -19,080 | fbdca1b49a612761b4c15dc40aecb4a614ea9ede | task(SDK-701): Updating CT Logo, fixed a space in logs, added null check on ImageCache key before removing from ImageCache to avoid NPE | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "<p align=\"center\">\n- <img src=\"https://github.com/CleverTap/clevertap-android-sdk/blob/master/static/clevertap-logo.png\" width=\"300\"/>\n+ <img src=\"https://github.com/CleverTap/clevertap-ios-sdk/blob/master/docs/images/clevertap-logo.png\" height=\"220\"/>\n</p>\n# CleverTap Android SDKs\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -747,7 +747,7 @@ public class CTInAppNotification implements Parcelable {\nprivate void removeImageOrGif() {\nfor (CTInAppNotificationMedia inAppMedia : this.mediaList) {\n- if (inAppMedia.getMediaUrl() != null) {\n+ if (inAppMedia.getMediaUrl() != null && inAppMedia.getCacheKey() != null) {\nif (!inAppMedia.getContentType().equals(\"image/gif\")) {\nImageCache.removeBitmap(inAppMedia.getCacheKey(), false);\nLogger.v(\"Deleted image - \" + inAppMedia.getCacheKey());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"diff": "@@ -127,7 +127,6 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nif (callbackManager.getPushAmpListener() != null) {\ncallbackManager.getPushAmpListener().onPushAmpPayloadReceived(pushBundle);\n} else {\n- //TODO: have to dev test PUSH AMP code.\ncontrollerManager.getPushProviders()\n._createNotification(context, pushBundle, Constants.EMPTY_NOTIFICATION_ID);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.1.0 (April 13, 2021)\n-* Refactored internal code to follow SOLID principles and Unit Test Cases\n+* Internal code has been refactored to follow SOLID principles and Unit Test Cases have been added\n* Reduces the SDK size and added performance improvements\n* Removes the deprecated Product Experiences (Screen AB/Dynamic Variables) related code\n* Removes support for JCenter\n-* Fixed a bug where Xiaomi, Huawei, Baidu and other push service tokens were not switched using `onUserLogin`\n+* Fixes a bug where Xiaomi, Huawei, Baidu and other push service tokens were not switched to new profiles when using `onUserLogin`\n### Version 4.0.4 (Mar 2, 2021)\n* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application.\n"
},
{
"change_type": "DELETE",
"old_path": "static/clevertap-logo.png",
"new_path": "static/clevertap-logo.png",
"diff": "Binary files a/static/clevertap-logo.png and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.1.0 (April 13, 2021)\n-* Refactored internal code to follow SOLID principles and Unit Test Cases\n+* Internal code has been refactored to follow SOLID principles and Unit Test Cases have been added\n* Reduces the SDK size and added performance improvements\n* Removes the deprecated Product Experiences (Screen AB/Dynamic Variables) related code\n* Removes support for JCenter\n-* Fixed a bug where Xiaomi, Huawei, Baidu and other push service tokens were not switched using `onUserLogin`\n+* Fixes a bug where Xiaomi, Huawei, Baidu and other push service tokens were not switched to new profiles when using `onUserLogin`\n### Version 4.0.4 (Mar 2, 2021)\n* Fixed FCM token refresh issue when multiple Firebase Projects are integrated in the application.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/README.md",
"new_path": "templates/README.md",
"diff": "<p align=\"center\">\n- <img src=\"https://github.com/CleverTap/clevertap-android-sdk/blob/master/static/clevertap-logo.png\" width=\"300\"/>\n+ <img src=\"https://github.com/CleverTap/clevertap-ios-sdk/blob/master/docs/images/clevertap-logo.png\" height=\"220\"/>\n</p>\n# CleverTap Android SDKs\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Updating CT Logo, fixed a space in logs, added null check on ImageCache key before removing from ImageCache to avoid NPE |
116,623 | 13.04.2021 00:07:23 | -19,080 | f95ab90bea989849a7c1165d7998ff2c7139c071 | task(SDK-701): Update CHANGELOG for release | [
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "### Version 4.1.0 (April 13, 2021)\n* Internal code has been refactored to follow SOLID principles and Unit Test Cases have been added\n+* Adds support for Android 11\n* Reduces the SDK size and added performance improvements\n* Removes the deprecated Product Experiences (Screen AB/Dynamic Variables) related code\n* Removes support for JCenter\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "### Version 4.1.0 (April 13, 2021)\n* Internal code has been refactored to follow SOLID principles and Unit Test Cases have been added\n+* Adds support for Android 11\n* Reduces the SDK size and added performance improvements\n* Removes the deprecated Product Experiences (Screen AB/Dynamic Variables) related code\n* Removes support for JCenter\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): Update CHANGELOG for release |
116,612 | 13.04.2021 00:47:17 | -19,080 | fd7d71d279d2206b6572b57d34872f6889169dac | chore(notification responsiveness): update documentation | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceSettings.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/CTGeofenceSettings.java",
"diff": "@@ -204,6 +204,23 @@ public class CTGeofenceSettings {\nreturn this;\n}\n+ /**\n+ * Sets the best-effort notification responsiveness of the geofence. Defaults to 0.<br>\n+ * Setting a big responsiveness value, for example 5 minutes, can save power significantly.<br>\n+ * For example, if you set a responsiveness value of five minutes your app only checks for an entrance or\n+ * exit\n+ * alert once every five minutes.Setting lower values doesn't necessarily mean that users are notified within\n+ * that time period (for example, if you set a value of 5 seconds it may take a bit longer than that to\n+ * receive the alert).\n+ *\n+ * @param geofenceNotificationResponsiveness in (milliseconds) defines the best-effort description of how\n+ * soon should the callback be called when the transition associated\n+ * with the Geofence is triggered.\n+ * For instance, if set to 300000 milliseconds the callback will be\n+ * called 5 minutes within entering or\n+ * exiting the geofence.\n+ * @return {@link CTGeofenceSettings.Builder}\n+ */\npublic CTGeofenceSettings.Builder setGeofenceNotificationResponsiveness(\nint geofenceNotificationResponsiveness) {\nthis.geofenceNotificationResponsiveness = geofenceNotificationResponsiveness;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleGeofenceAdapter.java",
"new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleGeofenceAdapter.java",
"diff": "@@ -28,6 +28,9 @@ class GoogleGeofenceAdapter implements CTGeofenceAdapter {\nprivate static final long GEOFENCE_EXPIRATION_IN_MILLISECONDS = Geofence.NEVER_EXPIRE;\n+ /**\n+ * How soon should the callback be called when the transition associated with the Geofence is triggered.\n+ */\nstatic final int GEOFENCE_NOTIFICATION_RESPONSIVENESS_IN_MILLISECONDS = 0;\nprivate final Context context;\n@@ -182,6 +185,9 @@ class GoogleGeofenceAdapter implements CTGeofenceAdapter {\ngeofenceNotificationResponsiveness = geofenceSettings.getGeofenceNotificationResponsiveness();\n}\n+ CTGeofenceAPI.getLogger().debug(CTGeofenceAPI.GEOFENCE_LOG_TAG,\n+ \"Setting geofenceNotificationResponsiveness to \" + geofenceNotificationResponsiveness);\n+\nfor (CTGeofence ctGeofence : fenceList) {\ngoogleFenceList.add(new Geofence.Builder()\n// Set the request ID of the geofence. This is a string to identify this\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(notification responsiveness): update documentation SDK-672 |
116,612 | 13.04.2021 01:04:24 | -19,080 | 830a540ad08351b92035107bf534bb6b75ea3023 | chore(notification responsiveness): update readme | [
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -61,6 +61,7 @@ CTGeofenceSettings ctGeofenceSettings = new CTGeofenceSettings.Builder()\n.setInterval(interval)//long value for interval in milliseconds\n.setFastestInterval(fastestInterval)//long value for fastest interval in milliseconds\n.setSmallestDisplacement(displacement)//float value for smallest Displacement in meters\n+ .setGeofenceNotificationResponsiveness(geofenceNotificationResponsiveness)// int value for geofence notification responsiveness in milliseconds\n.build();\n```\n**Note** -\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/Settings.md",
"new_path": "docs/Settings.md",
"diff": "@@ -48,3 +48,8 @@ Default is `true`.\n* When **true**, this will allow SDK to register background location updates through any of the above mentioned fetch modes.\n* When **false**, this will inform SDK to fetch location only in foreground when the app is launched or through `triggerLocation()` and not to register background location updates through any of the above mentioned fetch modes.\n+\n+### Geofence Notification Responsiveness in milliseconds:\n+Default is `0`.\n+\n+* This can be used to set the notification responsiveness to a higher value. Doing so improves power consumption by increasing the latency of geofence alerts. For example, if you set a responsiveness value of five minutes your app only checks for an entrance or exit alert once every five minutes. Setting lower values doesn't necessarily mean that users are notified within that time period (for example, if you set a value of 5 seconds it may take a bit longer than that to receive the alert).\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(notification responsiveness): update readme SDK-672 |
116,612 | 13.04.2021 01:15:30 | -19,080 | 8a1cecc48736409bac0ef75005d79e300b012e10 | chore(notification responsiveness): update sample app | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"diff": "@@ -29,9 +29,7 @@ import com.clevertap.demo.HomeScreenActivity\nimport com.clevertap.demo.R\nimport com.clevertap.demo.ViewModelFactory\nimport com.clevertap.demo.WebViewActivity\n-import com.clevertap.demo.action\nimport com.clevertap.demo.databinding.HomeScreenFragmentBinding\n-import com.clevertap.demo.snack\nimport org.json.JSONObject\nprivate const val TAG = \"HomeScreenFragment\"\n@@ -119,6 +117,7 @@ class HomeScreenFragment : Fragment() {\n.setInterval(3600000) // 1 hour\n.setFastestInterval(1800000) // 30 minutes\n.setSmallestDisplacement(1000f) // 1 km\n+ .setGeofenceNotificationResponsiveness(300000) // 5 minute\n.build(), cleverTapInstance\n)\nsetOnGeofenceApiInitializedListener {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(notification responsiveness): update sample app SDK-672 |
116,612 | 13.04.2021 01:24:08 | -19,080 | fa70428586ea0e0b6012f10701471475a683be9b | chore(notification responsiveness): add missing imports in sample app | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"diff": "@@ -29,7 +29,9 @@ import com.clevertap.demo.HomeScreenActivity\nimport com.clevertap.demo.R\nimport com.clevertap.demo.ViewModelFactory\nimport com.clevertap.demo.WebViewActivity\n+import com.clevertap.demo.action\nimport com.clevertap.demo.databinding.HomeScreenFragmentBinding\n+import com.clevertap.demo.snack\nimport org.json.JSONObject\nprivate const val TAG = \"HomeScreenFragment\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(notification responsiveness): add missing imports in sample app SDK-672 |
116,612 | 13.04.2021 01:27:38 | -19,080 | 549cbb45eca37d18ce67e83dce1d85ae05b5d2f4 | chore(notification responsiveness): update changelog | [
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCECHANGELOG.md",
"new_path": "docs/CTGEOFENCECHANGELOG.md",
"diff": "## CleverTap Geofence SDK CHANGE LOG\n### Version 1.0.2 (April 13, 2021)\n-* Added new method in `CTGeofenceSettings`\n+* Added new method in `CTGeofenceSettings` - `setGeofenceNotificationResponsiveness()`\n* Add support for CleverTap Android SDK v4.1.0\n### Version 1.0.1 (October 1, 2020)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(notification responsiveness): update changelog SDK-672 |
116,623 | 13.04.2021 12:49:53 | -19,080 | 9cab811417fcfd1c507cce2e283fba1f39eb0b9c | task(SDK-701): FInal updates to CHANGELOG | [
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -16,7 +16,7 @@ CleverTap Android Geofence SDK provides **Geofencing capabilities** to CleverTap\nAdd the following dependencies to the `build.gradle`\n```Groovy\n-implementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.1\"\n+implementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.2\"\nimplementation \"com.clevertap.android:clevertap-android-sdk:4.1.0\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:17.0.0\"\nimplementation \"androidx.work:work-runtime:2.3.4\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-701): FInal updates to CHANGELOG |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.