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,623 | 23.06.2020 18:52:53 | -19,080 | e5d4652be8ccbb7b7ab9cba4649acafc611f849d | removing gradle folder from gitignore for Bitrise | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -8,4 +8,3 @@ docs\n.idea\nbuild/\n.gradle/\n-gradle/\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/gradle/wrapper/gradle-wrapper.jar",
"new_path": "AndroidStarter/gradle/wrapper/gradle-wrapper.jar",
"diff": "Binary files /dev/null and b/AndroidStarter/gradle/wrapper/gradle-wrapper.jar differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "AndroidStarter/gradle/wrapper/gradle-wrapper.properties",
"diff": "+#Wed Feb 26 13:53:54 IST 2020\n+distributionBase=GRADLE_USER_HOME\n+distributionPath=wrapper/dists\n+zipStoreBase=GRADLE_USER_HOME\n+zipStorePath=wrapper/dists\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-5.4.1-all.zip\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/.gitignore",
"new_path": "clevertap-android-sdk/.gitignore",
"diff": "@@ -8,4 +8,3 @@ docs\n.idea\nbuild/\n.gradle/\n-gradle/\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk/gradle/wrapper/gradle-wrapper.jar",
"new_path": "clevertap-android-sdk/gradle/wrapper/gradle-wrapper.jar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk/gradle/wrapper/gradle-wrapper.jar differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/gradle/wrapper/gradle-wrapper.properties",
"diff": "+#Sat Jun 13 01:02:04 IST 2020\n+distributionBase=GRADLE_USER_HOME\n+distributionPath=wrapper/dists\n+zipStoreBase=GRADLE_USER_HOME\n+zipStorePath=wrapper/dists\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-6.1.1-all.zip\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removing gradle folder from gitignore for Bitrise SDK-165 |
116,623 | 24.06.2020 10:43:49 | -19,080 | 3d62f5b1b34f668a669f9e319efd1a245075915c | Updating build.gradle for Bitrise | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -7,3 +7,4 @@ docs\n*.iml\n.idea\nbuild/\n+.gradle/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/.gitignore",
"new_path": "clevertap-android-sdk/.gitignore",
"diff": "@@ -7,3 +7,4 @@ docs\n*.iml\n.idea\nbuild/\n+.gradle/\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -88,7 +88,10 @@ android {\n}\nProperties properties = new Properties()\n+if (project.rootProject.file('local.properties').exists()){\nproperties.load(project.rootProject.file('local.properties').newDataInputStream())\n+}\n+\nbintray {\nuser = properties.getProperty(\"bintray.user\")\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updating build.gradle for Bitrise SDK-165 |
116,623 | 26.06.2020 15:47:15 | -19,080 | f4e297fd5cc43f80eca1a7781014c3fbb336ed40 | task(geofence): Handle geofence response and add geofence interface | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -317,6 +317,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTFeatureFlagsController ctFeatureFlagsController;\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n+ private GeoFenceInterface geoFenceInterface;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -3584,6 +3585,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ //Handle GeoFences Response\n+ if (!getConfig().isAnalyticsOnly()) {\n+ try {\n+ getConfigLogger().verbose(getAccountId(),\"Processing GeoFences response...\");\n+ processGeoFenceResponse(response);\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(\"Error handling GeoFences response: \" + t.getLocalizedMessage());\n+ }\n+ }\n} catch (Throwable t) {\nmResponseFailureCount++;\ngetConfigLogger().verbose(getAccountId(), \"Problem process send queue response\", t);\n@@ -8483,4 +8493,56 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"Error parsing discarded events list\" + e.getLocalizedMessage());\n}\n}\n+\n+ //GEOFENCE APIs\n+\n+ public void pushGeoFenceEnteredEvent(Map<String,Object> geoFenceProperties){\n+ //TODO\n+ }\n+\n+ public void pushGeoFenceExitedEvent(Map<String,Object> geoFenceProperties){\n+ //TODO\n+ }\n+ /**\n+ * This method is used to set the geofences interface\n+ * Register to handle geofence responses from CleverTap\n+ * This is to be used only by clevertap-geofence-sdk\n+ *\n+ * @param geoFenceInterface The {@link GeoFenceInterface} instance\n+ */\n+ public void setGeoFenceInterface(GeoFenceInterface geoFenceInterface){\n+ this.geoFenceInterface = geoFenceInterface;\n+ }\n+\n+ /**\n+ * Returns the GeoFenceInterface object\n+ *\n+ * @return The {@link GeoFenceInterface} object\n+ */\n+ public GeoFenceInterface getGeoFenceInterface(){\n+ return this.geoFenceInterface;\n+ }\n+\n+ private void processGeoFenceResponse(JSONObject response) throws JSONException {\n+ if (response == null) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Can't parse Geofences Response, JSON response object is null\");\n+ return;\n+ }\n+\n+ if (!response.has(Constants.GEOFENCES_JSON_RESPONSE_KEY)) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"JSON object doesn't contain the Geofences key\");\n+ return;\n+ }\n+ try {\n+ if(this.geoFenceInterface != null){\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n+ this.geoFenceInterface.handleGeoFences(response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n+ }else{\n+ getConfigLogger().debug(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n+ }\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Failed to handle Geofences response\", t);\n+ }\n+\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -40,6 +40,8 @@ public class Constants {\nstatic final String ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nstatic final String NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nstatic final String NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n+ static final String GEOFENCE_ENTERED_EVENT_NAME = \"GeoFence Entered\";\n+ static final String GEOFENCE_EXITED_EVENT_NAME = \"GeoFence Exited\";\nstatic final String APP_LAUNCHED_EVENT = \"App Launched\";\nstatic final String ERROR_KEY = \"wzrk_error\";\nstatic final int PUSH_DELAY_MS = 1000;\n@@ -65,6 +67,7 @@ public class Constants {\nstatic final String DISPLAY_UNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\nstatic final String FEATURE_FLAG_JSON_RESPONSE_KEY = \"ff_notifs\";\nstatic final String REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY = \"pc_notifs\";\n+ static final String GEOFENCES_JSON_RESPONSE_KEY = \"gf_notifs\";\nstatic final String DISCARDED_EVENT_JSON_KEY = \"d_e\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\n@@ -230,4 +233,6 @@ public class Constants {\npublic static final String LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\npublic static final int FETCH_TYPE_PC = 0;\npublic static final int FETCH_TYPE_FF = 1;\n+\n+ public static final String LOG_TAG_GEOFENCES = \"Geofences : \";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GeoFenceInterface.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import org.json.JSONArray;\n+\n+public interface GeoFenceInterface {\n+ void handleGeoFences(JSONArray jsonArray);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"diff": "@@ -19,7 +19,8 @@ final class Validator {\nprivate static final String[] objectValueCharsNotAllowed = {\"'\", \"\\\"\", \"\\\\\"};\nprivate static final String[] restrictedNames = {\"Stayed\", \"Notification Clicked\",\n\"Notification Viewed\", \"UTM Visited\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n- \"App Uninstalled\", \"Notification Bounced\"};\n+ \"App Uninstalled\", \"Notification Bounced\", Constants.GEOFENCE_ENTERED_EVENT_NAME,\n+ Constants.GEOFENCE_EXITED_EVENT_NAME};\nstatic final String ADD_VALUES_OPERATION = \"multiValuePropertyAddValues\";\nstatic final String REMOVE_VALUES_OPERATION = \"multiValuePropertyRemoveValues\";\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Handle geofence response and add geofence interface SDK-254 |
116,621 | 01.07.2020 19:09:03 | -19,080 | 6d2550593f8a3e3bcf88e14f0ae9bd055845b666 | chores(bug fix): Added try catch block | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -373,6 +373,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (alreadyProcessedByCleverTap && deepLink == null) return;\n+ try {\nfor (String accountId : CleverTapAPI.instances.keySet()) {\nCleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n@@ -396,6 +397,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nbreak;\n}\n}\n+ }catch (Throwable t){\n+ Logger.v(\"Throwable - \" + t.getLocalizedMessage());\n+ }\n}\n@SuppressWarnings(\"WeakerAccess\")\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chores(bug fix): Added try catch block |
116,623 | 01.07.2020 19:59:48 | -19,080 | b8e3aa7126663ed4ca8c9c887f81b5ecaf7a22bc | task(geofence): Added public APIs to raise geofence enter/exit events and minor refactoring | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -318,6 +318,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\nprivate GeoFenceInterface geoFenceInterface;\n+ private boolean isLocationForGeofence = false;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -3258,6 +3259,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"frs\", isFirstRequestInSession());\nsetFirstRequestInSession(false);\n+ if(isLocationForGeofence()){\n+ header.put(\"gf\", true);\n+ setLocationForGeofence(false);\n+ }\n+\n// Attach ARP\nif (cachedGUID != null) {\n@@ -8496,12 +8502,37 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//GEOFENCE APIs\n- public void pushGeoFenceEnteredEvent(Map<String,Object> geoFenceProperties){\n- //TODO\n+ /**\n+ * Pushes the GeoFence Cluster Entered event to CleverTap.\n+ *\n+ * @param geoFenceProperties The {@link JSONObject} object that contains the\n+ * event properties regarding GeoFence Cluster Entered event\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushGeoFenceEnteredEvent(JSONObject geoFenceProperties){\n+ raiseEventForGeoFences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geoFenceProperties);\n+ }\n+\n+ /**\n+ * Pushes the GeoFence Cluster Exited event to CleverTap.\n+ *\n+ * @param geoFenceProperties The {@link JSONObject} object that contains the\n+ * event properties regarding GeoFence Cluster Exited event\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\n+ raiseEventForGeoFences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n}\n- public void pushGeoFenceExitedEvent(Map<String,Object> geoFenceProperties){\n- //TODO\n+ /**\n+ * Sets the location in CleverTap to get updated GeoFences\n+ *\n+ * @param location android.location.Location\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setLocationForGeofences(Location location){\n+ setLocationForGeofence(true);\n+ _setLocation(location);\n}\n/**\n* This method is used to set the geofences interface\n@@ -8510,6 +8541,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*\n* @param geoFenceInterface The {@link GeoFenceInterface} instance\n*/\n+ @SuppressWarnings(\"unused\")\npublic void setGeoFenceInterface(GeoFenceInterface geoFenceInterface){\nthis.geoFenceInterface = geoFenceInterface;\n}\n@@ -8519,10 +8551,32 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*\n* @return The {@link GeoFenceInterface} object\n*/\n+ @SuppressWarnings(\"unused\")\npublic GeoFenceInterface getGeoFenceInterface(){\nreturn this.geoFenceInterface;\n}\n+ private boolean isLocationForGeofence() {\n+ return isLocationForGeofence;\n+ }\n+\n+ private void setLocationForGeofence(boolean locationForGeofence) {\n+ isLocationForGeofence = locationForGeofence;\n+ }\n+\n+ private void raiseEventForGeoFences(String eventName, JSONObject geoFenceProperties){\n+ JSONObject event = new JSONObject();\n+ try {\n+ event.put(\"evtName\", eventName);\n+ event.put(\"evtData\", geoFenceProperties);\n+ queueEvent(context, event, Constants.RAISED_EVENT);\n+ } catch (JSONException e) {\n+ getConfigLogger().debug(getAccountId(),Constants.LOG_TAG_GEOFENCES +\n+ \"JSON Exception when raising GeoFence event \"\n+ +eventName +\" - \"+e.getLocalizedMessage());\n+ }\n+ }\n+\nprivate void processGeoFenceResponse(JSONObject response) throws JSONException {\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Can't parse Geofences Response, JSON response object is null\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -40,8 +40,8 @@ public class Constants {\nstatic final String ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nstatic final String NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nstatic final String NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n- static final String GEOFENCE_ENTERED_EVENT_NAME = \"GeoFence Entered\";\n- static final String GEOFENCE_EXITED_EVENT_NAME = \"GeoFence Exited\";\n+ static final String GEOFENCE_ENTERED_EVENT_NAME = \"GeoFence Cluster Entered\";\n+ static final String GEOFENCE_EXITED_EVENT_NAME = \"GeoFence Cluster Exited\";\nstatic final String APP_LAUNCHED_EVENT = \"App Launched\";\nstatic final String ERROR_KEY = \"wzrk_error\";\nstatic final int PUSH_DELAY_MS = 1000;\n@@ -67,7 +67,7 @@ public class Constants {\nstatic final String DISPLAY_UNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\nstatic final String FEATURE_FLAG_JSON_RESPONSE_KEY = \"ff_notifs\";\nstatic final String REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY = \"pc_notifs\";\n- static final String GEOFENCES_JSON_RESPONSE_KEY = \"gf_notifs\";\n+ static final String GEOFENCES_JSON_RESPONSE_KEY = \"geofences\";\nstatic final String DISCARDED_EVENT_JSON_KEY = \"d_e\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Added public APIs to raise geofence enter/exit events and minor refactoring SDK-254 |
116,623 | 02.07.2020 16:57:01 | -19,080 | df91720ad19288ed7b6155dbf5ef9491c96a2276 | task(geofence): Refactoring variables and interfaces | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -317,7 +317,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTFeatureFlagsController ctFeatureFlagsController;\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n- private GeoFenceInterface geoFenceInterface;\n+ private GeofenceInterface geofenceInterface;\nprivate boolean isLocationForGeofence = false;\n// static lifecycle callbacks\n@@ -3595,7 +3595,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!getConfig().isAnalyticsOnly()) {\ntry {\ngetConfigLogger().verbose(getAccountId(),\"Processing GeoFences response...\");\n- processGeoFenceResponse(response);\n+ processGeofenceResponse(response);\n} catch (Throwable t) {\ngetConfigLogger().verbose(\"Error handling GeoFences response: \" + t.getLocalizedMessage());\n}\n@@ -8503,25 +8503,25 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//GEOFENCE APIs\n/**\n- * Pushes the GeoFence Cluster Entered event to CleverTap.\n+ * Pushes the Geofence Cluster Entered event to CleverTap.\n*\n- * @param geoFenceProperties The {@link JSONObject} object that contains the\n+ * @param geofenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Entered event\n*/\n@SuppressWarnings(\"unused\")\n- public void pushGeoFenceEnteredEvent(JSONObject geoFenceProperties){\n- raiseEventForGeoFences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geoFenceProperties);\n+ public void pushGeofenceEnteredEvent(JSONObject geofenceProperties){\n+ raiseEventForGeofences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geofenceProperties);\n}\n/**\n- * Pushes the GeoFence Cluster Exited event to CleverTap.\n+ * Pushes the Geofence Cluster Exited event to CleverTap.\n*\n* @param geoFenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Exited event\n*/\n@SuppressWarnings(\"unused\")\npublic void pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\n- raiseEventForGeoFences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n+ raiseEventForGeofences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n}\n/**\n@@ -8539,21 +8539,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Register to handle geofence responses from CleverTap\n* This is to be used only by clevertap-geofence-sdk\n*\n- * @param geoFenceInterface The {@link GeoFenceInterface} instance\n+ * @param geofenceInterface The {@link GeofenceInterface} instance\n*/\n@SuppressWarnings(\"unused\")\n- public void setGeoFenceInterface(GeoFenceInterface geoFenceInterface){\n- this.geoFenceInterface = geoFenceInterface;\n+ public void setGeofenceInterface(GeofenceInterface geofenceInterface){\n+ this.geofenceInterface = geofenceInterface;\n}\n/**\n- * Returns the GeoFenceInterface object\n+ * Returns the GeofenceInterface object\n*\n- * @return The {@link GeoFenceInterface} object\n+ * @return The {@link GeofenceInterface} object\n*/\n@SuppressWarnings(\"unused\")\n- public GeoFenceInterface getGeoFenceInterface(){\n- return this.geoFenceInterface;\n+ public GeofenceInterface getGeofenceInterface(){\n+ return this.geofenceInterface;\n}\nprivate boolean isLocationForGeofence() {\n@@ -8564,11 +8564,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisLocationForGeofence = locationForGeofence;\n}\n- private void raiseEventForGeoFences(String eventName, JSONObject geoFenceProperties){\n+ private void raiseEventForGeofences(String eventName, JSONObject geofenceProperties){\nJSONObject event = new JSONObject();\ntry {\nevent.put(\"evtName\", eventName);\n- event.put(\"evtData\", geoFenceProperties);\n+ event.put(\"evtData\", geofenceProperties);\nqueueEvent(context, event, Constants.RAISED_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().debug(getAccountId(),Constants.LOG_TAG_GEOFENCES +\n@@ -8577,7 +8577,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- private void processGeoFenceResponse(JSONObject response) throws JSONException {\n+ private void processGeofenceResponse(JSONObject response) throws JSONException {\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Can't parse Geofences Response, JSON response object is null\");\nreturn;\n@@ -8588,9 +8588,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\ntry {\n- if(this.geoFenceInterface != null){\n+ if(this.geofenceInterface != null){\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n- this.geoFenceInterface.handleGeoFences(response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n+ this.geofenceInterface.handleGeoFences(response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n}else{\ngetConfigLogger().debug(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -40,8 +40,8 @@ public class Constants {\nstatic final String ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nstatic final String NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nstatic final String NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n- static final String GEOFENCE_ENTERED_EVENT_NAME = \"GeoFence Cluster Entered\";\n- static final String GEOFENCE_EXITED_EVENT_NAME = \"GeoFence Cluster Exited\";\n+ static final String GEOFENCE_ENTERED_EVENT_NAME = \"Geofence Cluster Entered\";\n+ static final String GEOFENCE_EXITED_EVENT_NAME = \"Geofence Cluster Exited\";\nstatic final String APP_LAUNCHED_EVENT = \"App Launched\";\nstatic final String ERROR_KEY = \"wzrk_error\";\nstatic final int PUSH_DELAY_MS = 1000;\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GeoFenceInterface.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GeofenceInterface.java",
"diff": "@@ -2,6 +2,6 @@ package com.clevertap.android.sdk;\nimport org.json.JSONArray;\n-public interface GeoFenceInterface {\n+public interface GeofenceInterface {\nvoid handleGeoFences(JSONArray jsonArray);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Refactoring variables and interfaces SDK-254 |
116,612 | 08.07.2020 20:43:31 | -19,080 | aa597a7b7bec22d8ff93db19c37c0ac64cdfe4f3 | task(geofence): Added geofence init API and refactored geofence interface for list of fences | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -145,6 +145,7 @@ install {\n}\n}\ndependencies {\n+ compileOnly fileTree(dir: 'libs', include: ['*.aar'])\ncompileOnly 'com.google.android.gms:play-services-plus:16.0.0'\ncompileOnly 'com.google.firebase:firebase-messaging:17.3.0'\ncompileOnly 'com.android.support:support-v4:28.0.0'\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -45,6 +45,10 @@ import android.text.TextUtils;\nimport com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\n+import com.clevertap.android.geofence.CTGeofenceAPI;\n+import com.clevertap.android.geofence.interfaces.CTGeofenceCallback;\n+import com.clevertap.android.geofence.interfaces.CTGeofenceInterface;\n+import com.clevertap.android.geofence.model.CTGeofenceSettings;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -102,7 +106,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigControllerListener, CTProductConfigListener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigControllerListener, CTProductConfigListener, CTGeofenceInterface {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -135,6 +139,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTProductConfigController ctProductConfigController;\nprivate boolean isProductConfigRequested;\n+ private CTGeofenceCallback ctGeofenceCallback;\n+ private CTGeofenceSettings ctGeofenceSettings;\n+ private boolean isGeofenceInitialized;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -8502,12 +8509,36 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//GEOFENCE APIs\n+\n+ public void initGeofenceAPI(CTGeofenceAPI ctGeofenceAPI){\n+ ctGeofenceAPI.setGeofenceInterface(this);\n+ ctGeofenceAPI.activate();\n+ isGeofenceInitialized=true;\n+ }\n+\n+ public void initGeofenceAPI(CTGeofenceSettings ctGeofenceSettings){\n+ CTGeofenceAPI ctGeofenceAPI = CTGeofenceAPI.getInstance(context);\n+ ctGeofenceAPI.setGeofenceInterface(this);\n+ ctGeofenceAPI.setGeofenceSettings(ctGeofenceSettings);\n+ ctGeofenceAPI.activate();\n+ isGeofenceInitialized=true;\n+ }\n+\n+ /**\n+ * unregister geofences, location updates and cleanup all resources used by clevertap-geofence-sdk\n+ */\n+ public void deactivateGeofenceAPI(){\n+ CTGeofenceAPI.getInstance(context).deactivate();\n+ isGeofenceInitialized=false;\n+ }\n+\n/**\n* Pushes the Geofence Cluster Entered event to CleverTap.\n*\n* @param geofenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Entered event\n*/\n+ @Override\n@SuppressWarnings(\"unused\")\npublic void pushGeofenceEnteredEvent(JSONObject geofenceProperties){\nraiseEventForGeofences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geofenceProperties);\n@@ -8519,6 +8550,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param geoFenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Exited event\n*/\n+ @Override\n@SuppressWarnings(\"unused\")\npublic void pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\nraiseEventForGeofences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n@@ -8529,22 +8561,31 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*\n* @param location android.location.Location\n*/\n+ @Override\n@SuppressWarnings(\"unused\")\npublic void setLocationForGeofences(Location location){\nsetLocationForGeofence(true);\n_setLocation(location);\n}\n+\n/**\n- * This method is used to set the geofences interface\n+ * This method is used to set the geofence callback\n* Register to handle geofence responses from CleverTap\n* This is to be used only by clevertap-geofence-sdk\n*\n- * @param geofenceInterface The {@link GeofenceInterface} instance\n+ * @param callback The {@link CTGeofenceCallback} instance\n*/\n- @SuppressWarnings(\"unused\")\n+\n+ @Override\n+ public void setGeoFenceCallback(CTGeofenceCallback callback) {\n+ ctGeofenceCallback=callback;\n+ }\n+\n+\n+ /* @SuppressWarnings(\"unused\")\npublic void setGeofenceInterface(GeofenceInterface geofenceInterface){\nthis.geofenceInterface = geofenceInterface;\n- }\n+ }*/\n/**\n* Returns the GeofenceInterface object\n@@ -8587,7 +8628,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"JSON object doesn't contain the Geofences key\");\nreturn;\n}\n- try {\n+ /* try {\nif(this.geofenceInterface != null){\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\nthis.geofenceInterface.handleGeoFences(response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n@@ -8596,7 +8637,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Failed to handle Geofences response\", t);\n+ }*/\n+\n+ try {\n+ if(ctGeofenceCallback != null){\n+ JSONObject jsonObject=new JSONObject();\n+ jsonObject.put(\"geofences\",response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n+ ctGeofenceCallback.onSuccess(jsonObject);\n+ }else{\n+ getConfigLogger().debug(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n+ }\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Failed to handle Geofences response\", t);\n}\n}\n+\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Added geofence init API and refactored geofence interface for list of fences SDK-254 |
116,612 | 10.07.2020 20:12:31 | -19,080 | d8da36a27a14aacef79d2947a8c4bcbc3caa514d | task(geofence): Added geofence sdk aar and setOnGeofenceApiInitializedListener | [
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-debug.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8448,9 +8448,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nCTGeofenceAPI ctGeofenceAPI = CTGeofenceAPI.getInstance(context);\nctGeofenceAPI.setGeofenceInterface(this);\nctGeofenceAPI.setGeofenceSettings(ctGeofenceSettings);\n- ctGeofenceAPI.activate();\n+ ctGeofenceAPI.setOnGeofenceApiInitializedListener(new CTGeofenceAPI.OnGeofenceApiInitializedListener() {\n+ @Override\n+ public void OnGeofenceApiInitialized() {\nisGeofenceInitialized=true;\n}\n+ });\n+ ctGeofenceAPI.activate();\n+ }\n/**\n* unregister geofences, location updates and cleanup all resources used by clevertap-geofence-sdk\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Added geofence sdk aar and setOnGeofenceApiInitializedListener SDK-254 |
116,612 | 11.07.2020 21:24:15 | -19,080 | 42137aa53eb51372f678c55790e0031f0b33e19f | task(geofence): set account_id, guid and call triggerLocation on ActivityResume | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1905,6 +1905,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\ncheckExistingInAppNotifications(activity);\ncheckPendingInAppNotifications(activity);\n+ CTGeofenceAPI.getInstance(context.getApplicationContext()).triggerLocation();\n}\nprivate void checkPendingInAppNotifications(Activity activity) {\n@@ -8454,6 +8455,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisGeofenceInitialized=true;\n}\n});\n+ ctGeofenceAPI.setAccountId(getAccountId());\n+ ctGeofenceAPI.setGUID(getCleverTapID());\nctGeofenceAPI.activate();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): set account_id, guid and call triggerLocation on ActivityResume SDK-254 |
116,623 | 12.07.2020 18:43:30 | -19,080 | 7971000fd2fa17973826d55e19a7dc0ad9fd7f01 | task(geofence): Trigger location update on App Launched | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1887,6 +1887,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void activityResumed(Activity activity) {\ngetConfigLogger().verbose(getAccountId(), \"App in foreground\");\ncheckTimeoutSession();\n+ //Anything in this If block will run once per App Launch.\n+ //Will not run for Apps which disable App Launched event\nif (!isAppLaunchPushed()) {\npushAppLaunchedEvent();\nfetchFeatureFlags();\n@@ -1899,13 +1901,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n});\n+ CTGeofenceAPI.getInstance(context.getApplicationContext()).triggerLocation();\n}\nif (!inCurrentSession()) {\npushInitialEventsAsync();\n}\ncheckExistingInAppNotifications(activity);\ncheckPendingInAppNotifications(activity);\n- CTGeofenceAPI.getInstance(context.getApplicationContext()).triggerLocation();\n}\nprivate void checkPendingInAppNotifications(Activity activity) {\n@@ -8437,8 +8439,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//GEOFENCE APIs\n-\n-\npublic void initGeofenceAPI(CTGeofenceAPI ctGeofenceAPI){\nctGeofenceAPI.setGeofenceInterface(this);\nctGeofenceAPI.activate();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Trigger location update on App Launched SDK-254 |
116,623 | 12.07.2020 19:01:39 | -19,080 | 3d74f7276dafcbe362847bd305c46d46b012b158 | task(geofence): Bump up version number | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.8.1'\n+ libraryVersion = '3.8.2'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30801\"\n- android:versionName=\"3.8.1\">\n+ android:versionCode=\"30802\"\n+ android:versionName=\"3.8.2\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Bump up version number SDK-254 |
116,612 | 13.07.2020 16:59:13 | -19,080 | 4c7562dfb1f0e78b650c474baaa4eb1679e91297 | task(geofence): update user location to geofence triggered location | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8546,6 +8546,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntry {\nevent.put(\"evtName\", eventName);\nevent.put(\"evtData\", geofenceProperties);\n+\n+ Location location=new Location(\"\");\n+ location.setLatitude(geofenceProperties.getDouble(\"triggered_lat\"));\n+ location.setLongitude(geofenceProperties.getDouble(\"triggered_lng\"));\n+\n+ geofenceProperties.remove(\"triggered_lat\");\n+ geofenceProperties.remove(\"triggered_lng\");\n+\n+ locationFromUser=location;\n+\nqueueEvent(context, event, Constants.RAISED_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().debug(getAccountId(),Constants.LOG_TAG_GEOFENCES +\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): update user location to geofence triggered location SDK-254 |
116,612 | 14.07.2020 16:43:29 | -19,080 | 9a703bebf552bc394734d490e8b04895a057f45e | task(geofence): adding static init method for Geofence | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -46,9 +46,9 @@ import com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\nimport com.clevertap.android.geofence.CTGeofenceAPI;\n+import com.clevertap.android.geofence.CTGeofenceSettings;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceCallback;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceInterface;\n-import com.clevertap.android.geofence.model.CTGeofenceSettings;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -144,7 +144,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTProductConfigController ctProductConfigController;\nprivate boolean isProductConfigRequested;\nprivate CTGeofenceCallback ctGeofenceCallback;\n- private CTGeofenceSettings ctGeofenceSettings;\nprivate boolean isGeofenceInitialized;\n// Initialize\n@@ -8439,10 +8438,30 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//GEOFENCE APIs\n- public void initGeofenceAPI(CTGeofenceAPI ctGeofenceAPI){\n- ctGeofenceAPI.setGeofenceInterface(this);\n+ public static void initGeofenceAPI(Context context,String _accountId,CTGeofenceAPI ctGeofenceAPI){\n+\n+ if (instances == null) {\n+ CleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\n+ if (instance != null) {\n+ ctGeofenceAPI.setGeofenceInterface(instance);\nctGeofenceAPI.activate();\n- isGeofenceInitialized=true;\n+ }\n+ return;\n+ }\n+\n+ for (String accountId : instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ boolean shouldProcess = false;\n+ if (instance != null) {\n+ shouldProcess = (_accountId == null && instance.config.isDefaultInstance()) || instance.getAccountId().equals(_accountId);\n+ }\n+ if (shouldProcess) {\n+ ctGeofenceAPI.setGeofenceInterface(instance);\n+ ctGeofenceAPI.activate();\n+ break;\n+ }\n+ }\n+\n}\npublic void initGeofenceAPI(CTGeofenceSettings ctGeofenceSettings){\n@@ -8460,6 +8479,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nctGeofenceAPI.activate();\n}\n+\n/**\n* unregister geofences, location updates and cleanup all resources used by clevertap-geofence-sdk\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -40,8 +40,8 @@ public class Constants {\nstatic final String ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nstatic final String NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nstatic final String NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n- static final String GEOFENCE_ENTERED_EVENT_NAME = \"Geofence Cluster Entered\";\n- static final String GEOFENCE_EXITED_EVENT_NAME = \"Geofence Cluster Exited\";\n+ static final String GEOFENCE_ENTERED_EVENT_NAME = \"Geocluster Entered\";\n+ static final String GEOFENCE_EXITED_EVENT_NAME = \"Geocluster Exited\";\nstatic final String APP_LAUNCHED_EVENT = \"App Launched\";\nstatic final String ERROR_KEY = \"wzrk_error\";\nstatic final int PUSH_DELAY_MS = 1000;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): adding static init method for Geofence SDK-254 |
116,623 | 14.07.2020 19:02:07 | -19,080 | 6d70506e1e2389182ff173e83d1e36d44898bd6e | task(geofence): Add a flag to denote geofence PING | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -46,9 +46,9 @@ import com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\nimport com.clevertap.android.geofence.CTGeofenceAPI;\n-import com.clevertap.android.geofence.CTGeofenceSettings;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceCallback;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceInterface;\n+import com.clevertap.android.geofence.model.CTGeofenceSettings;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -2564,6 +2564,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"n\", currentActivityName);\n}\n+ //Add a flag to denote, PING event is for geofences\n+ if(isLocationForGeofence()){\n+ event.put(\"gf\", true);\n+ setLocationForGeofence(false);\n+ }\n+\nint session = getCurrentSession();\nevent.put(\"s\", session);\nevent.put(\"pg\", activityCount);\n@@ -3277,12 +3283,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"frs\", isFirstRequestInSession());\nsetFirstRequestInSession(false);\n- if(isLocationForGeofence()){\n- header.put(\"gf\", true);\n- setLocationForGeofence(false);\n- }\n-\n-\n// Attach ARP\nif (cachedGUID != null) {\nif (cachedGUID.equals(getCleverTapID())) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Add a flag to denote geofence PING SDK-254 |
116,612 | 14.07.2020 19:26:44 | -19,080 | eb8bbf172a52b5ce752a4147b9ec29ce2415e4e3 | task(geofence): adding geofence ping logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -46,9 +46,9 @@ import com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\nimport com.clevertap.android.geofence.CTGeofenceAPI;\n+import com.clevertap.android.geofence.CTGeofenceSettings;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceCallback;\nimport com.clevertap.android.geofence.interfaces.CTGeofenceInterface;\n-import com.clevertap.android.geofence.model.CTGeofenceSettings;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -2549,6 +2549,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisBgPing = true;\nevent.remove(\"bk\");\n}\n+\n+ //Add a flag to denote, PING event is for geofences\n+ if(isLocationForGeofence()){\n+ event.put(\"gf\", true);\n+ setLocationForGeofence(false);\n+ }\n} else if (eventType == Constants.PROFILE_EVENT) {\ntype = \"profile\";\n} else if (eventType == Constants.DATA_EVENT) {\n@@ -2564,12 +2570,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"n\", currentActivityName);\n}\n- //Add a flag to denote, PING event is for geofences\n- if(isLocationForGeofence()){\n- event.put(\"gf\", true);\n- setLocationForGeofence(false);\n- }\n-\nint session = getCurrentSession();\nevent.put(\"s\", session);\nevent.put(\"pg\", activityCount);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): adding geofence ping logic SDK-254 |
116,612 | 16.07.2020 00:24:01 | -19,080 | 940987c531be406302005f2b205f375c3c823398 | task(geofence): refactoring geofence ping logic and setting account_id and guid to static init of geofence | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -6811,7 +6811,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Location updated (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n// only queue the location ping if we are in the foreground\n- if (!isAppForeground()) return;\n+ if (!isLocationForGeofence()&&!isAppForeground()) return;\n// Queue the ping event to transmit location update to server\n// min 10 second interval between location pings\n@@ -8444,6 +8444,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nCleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\nif (instance != null) {\nctGeofenceAPI.setGeofenceInterface(instance);\n+ ctGeofenceAPI.setAccountId(instance.getAccountId());\n+ ctGeofenceAPI.setGUID(instance.getCleverTapID());\nctGeofenceAPI.activate();\n}\nreturn;\n@@ -8457,6 +8459,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (shouldProcess) {\nctGeofenceAPI.setGeofenceInterface(instance);\n+ ctGeofenceAPI.setAccountId(instance.getAccountId());\n+ ctGeofenceAPI.setGUID(instance.getCleverTapID());\nctGeofenceAPI.activate();\nbreak;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): refactoring geofence ping logic and setting account_id and guid to static init of geofence SDK-254 |
116,612 | 18.07.2020 20:15:30 | -19,080 | 97340727ebef4dc66f03b997d87688d17e91cbe2 | task(geofence): return Future from queueEvent and postAsyncSafely to allow blocking execution | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -89,6 +89,7 @@ import java.util.Random;\nimport java.util.TimeZone;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n+import java.util.concurrent.Future;\nimport javax.net.ssl.HttpsURLConnection;\nimport javax.net.ssl.SSLContext;\n@@ -2413,8 +2414,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Event\n- private void queueEvent(final Context context, final JSONObject event, final int eventType) {\n- postAsyncSafely(\"queueEvent\", new Runnable() {\n+ private Future<?> queueEvent(final Context context, final JSONObject event, final int eventType) {\n+ return postAsyncSafely(\"queueEvent\", new Runnable() {\n@Override\npublic void run() {\nif (shouldDropEvent(event, eventType)) {\n@@ -5442,14 +5443,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* It adds try/catch blocks around the runnable and the handler itself.\n*/\n@SuppressWarnings(\"UnusedParameters\")\n- private void postAsyncSafely(final String name, final Runnable runnable) {\n+ private Future<?> postAsyncSafely(final String name, final Runnable runnable) {\n+ Future<?> future = null;\ntry {\nfinal boolean executeSync = Thread.currentThread().getId() == EXECUTOR_THREAD_ID;\nif (executeSync) {\nrunnable.run();\n} else {\n- es.submit(new Runnable() {\n+ future = es.submit(new Runnable() {\n@Override\npublic void run() {\nEXECUTOR_THREAD_ID = Thread.currentThread().getId();\n@@ -5464,6 +5466,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Failed to submit task to the executor service\", t);\n}\n+\n+ return future;\n}\n//InApp\n@@ -6804,23 +6808,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n_setLocation(location);\n}\n- private void _setLocation(Location location) {\n- if (location == null) return;\n+ private Future<?> _setLocation(Location location) {\n+ if (location == null) return null;\nlocationFromUser = location;\nLogger.v(\"Location updated (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n// only queue the location ping if we are in the foreground\n- if (!isLocationForGeofence()&&!isAppForeground()) return;\n+ if (!isLocationForGeofence()&&!isAppForeground()) return null;\n// Queue the ping event to transmit location update to server\n// min 10 second interval between location pings\nfinal int now = (int) (System.currentTimeMillis() / 1000);\n+ Future<?> future = null;\nif (now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\n- queueEvent(context, new JSONObject(), Constants.PING_EVENT);\n+ future = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTime = now;\nLogger.v(\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n}\n+\n+ return future;\n}\n@SuppressLint(\"MissingPermission\")\n@@ -8500,8 +8507,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@Override\n@SuppressWarnings(\"unused\")\n- public void pushGeofenceEnteredEvent(JSONObject geofenceProperties){\n- raiseEventForGeofences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geofenceProperties);\n+ public Future<?> pushGeofenceEnteredEvent(JSONObject geofenceProperties){\n+ return raiseEventForGeofences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geofenceProperties);\n}\n/**\n@@ -8512,20 +8519,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@Override\n@SuppressWarnings(\"unused\")\n- public void pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\n- raiseEventForGeofences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n+ public Future<?> pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\n+ return raiseEventForGeofences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n}\n/**\n* Sets the location in CleverTap to get updated GeoFences\n*\n* @param location android.location.Location\n+ * @return\n*/\n@Override\n@SuppressWarnings(\"unused\")\n- public void setLocationForGeofences(Location location){\n+ public Future<?> setLocationForGeofences(Location location){\nsetLocationForGeofence(true);\n- _setLocation(location);\n+ return _setLocation(location);\n}\n/**\n@@ -8565,7 +8573,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisLocationForGeofence = locationForGeofence;\n}\n- private void raiseEventForGeofences(String eventName, JSONObject geofenceProperties){\n+ private Future<?> raiseEventForGeofences(String eventName, JSONObject geofenceProperties){\n+\n+ Future<?> future = null;\n+\nJSONObject event = new JSONObject();\ntry {\nevent.put(\"evtName\", eventName);\n@@ -8580,12 +8591,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nlocationFromUser=location;\n- queueEvent(context, event, Constants.RAISED_EVENT);\n+ future = queueEvent(context, event, Constants.RAISED_EVENT);\n} catch (JSONException e) {\ngetConfigLogger().debug(getAccountId(),Constants.LOG_TAG_GEOFENCES +\n\"JSON Exception when raising GeoFence event \"\n+eventName +\" - \"+e.getLocalizedMessage());\n}\n+\n+ return future;\n}\nprivate void processGeofenceResponse(JSONObject response) throws JSONException {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): return Future from queueEvent and postAsyncSafely to allow blocking execution SDK-254 |
116,623 | 22.07.2020 17:49:15 | -19,080 | d5233f9dc33b6e4b4987389f6a7bc42f02862018 | task(geofence): Added gfSDKVersion to PING event | [
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-release.aar and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -331,6 +331,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<CTProductConfigListener> productConfigListener;\nprivate GeofenceInterface geofenceInterface;\nprivate boolean isLocationForGeofence = false;\n+ private int geofenceSDKVersion = 0;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -2555,6 +2556,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(isLocationForGeofence()){\nevent.put(\"gf\", true);\nsetLocationForGeofence(false);\n+ event.put(\"gfSDKVersion\",getGeofenceSDKVersion());\n+ setGeofenceSDKVersion(0);\n}\n} else if (eventType == Constants.PROFILE_EVENT) {\ntype = \"profile\";\n@@ -5443,7 +5446,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* It adds try/catch blocks around the runnable and the handler itself.\n*/\n@SuppressWarnings(\"UnusedParameters\")\n- private Future<?> postAsyncSafely(final String name, final Runnable runnable) {\n+ private @Nullable Future<?> postAsyncSafely(final String name, final Runnable runnable) {\nFuture<?> future = null;\ntry {\nfinal boolean executeSync = Thread.currentThread().getId() == EXECUTOR_THREAD_ID;\n@@ -8531,8 +8534,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@Override\n@SuppressWarnings(\"unused\")\n- public Future<?> setLocationForGeofences(Location location){\n+ public Future<?> setLocationForGeofences(Location location, int sdkVersion){\nsetLocationForGeofence(true);\n+ setGeofenceSDKVersion(sdkVersion);\nreturn _setLocation(location);\n}\n@@ -8573,6 +8577,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisLocationForGeofence = locationForGeofence;\n}\n+ private int getGeofenceSDKVersion() {\n+ return geofenceSDKVersion;\n+ }\n+\n+ private void setGeofenceSDKVersion(int geofenceSDKVersion) {\n+ this.geofenceSDKVersion = geofenceSDKVersion;\n+ }\n+\nprivate Future<?> raiseEventForGeofences(String eventName, JSONObject geofenceProperties){\nFuture<?> future = null;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Added gfSDKVersion to PING event SDK-254 |
116,612 | 24.07.2020 00:47:29 | -19,080 | df6d8ce352c6aecda2f17f0c0781f6caa618bf1b | task(geofence): moved geofence init APIs to GMOD | [
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar",
"new_path": "clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar",
"diff": "Binary files a/clevertap-android-sdk/libs/clevertap-geofence-sdk-1.0.0.aar and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -45,10 +45,6 @@ import android.text.TextUtils;\nimport com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\n-import com.clevertap.android.geofence.CTGeofenceAPI;\n-import com.clevertap.android.geofence.CTGeofenceSettings;\n-import com.clevertap.android.geofence.interfaces.CTGeofenceCallback;\n-import com.clevertap.android.geofence.interfaces.CTGeofenceInterface;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -110,8 +106,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nCTABTestListener,\nFeatureFlagListener,\nCTProductConfigControllerListener,\n- CTProductConfigListener,\n- CTGeofenceInterface{\n+ CTProductConfigListener{\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -144,8 +139,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTProductConfigController ctProductConfigController;\nprivate boolean isProductConfigRequested;\n- private CTGeofenceCallback ctGeofenceCallback;\n- private boolean isGeofenceInitialized;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -329,7 +322,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTFeatureFlagsController ctFeatureFlagsController;\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n- private GeofenceInterface geofenceInterface;\n+ private GeofenceCallback geofenceCallback;\nprivate boolean isLocationForGeofence = false;\nprivate int geofenceSDKVersion = 0;\n@@ -826,6 +819,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn instance;\n}\n+ public static @Nullable CleverTapAPI getGlobalInstance(Context context, String _accountId){\n+ if (instances == null) {\n+ return createInstanceIfAvailable(context, _accountId);\n+ }\n+\n+ CleverTapAPI instance = null;\n+ for (String accountId : instances.keySet()) {\n+ instance = CleverTapAPI.instances.get(accountId);\n+ boolean shouldProcess = false;\n+ if (instance != null) {\n+ shouldProcess = (_accountId == null && instance.config.isDefaultInstance()) || instance.getAccountId().equals(_accountId);\n+ }\n+ if (shouldProcess) {\n+ break;\n+ }\n+ }\n+\n+ return instance;\n+ }\n+\n/**\n* Launches an asynchronous task to download the notification icon from CleverTap,\n* and create the Android notification.\n@@ -1773,7 +1786,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- private String getAccountId() {\n+ public String getAccountId() {\nreturn config.getAccountId();\n}\n@@ -1902,7 +1915,18 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n});\n- CTGeofenceAPI.getInstance(context.getApplicationContext()).triggerLocation();\n+\n+ try {\n+ if (geofenceCallback!=null) {\n+ geofenceCallback.triggerLocation();\n+ }\n+ } catch (IllegalStateException e)\n+ {\n+ getConfigLogger().verbose(getAccountId(), e.getLocalizedMessage());\n+ } catch (Exception e)\n+ {\n+ getConfigLogger().verbose(getAccountId(),\"Failed to trigger location\");\n+ }\n}\nif (!inCurrentSession()) {\npushInitialEventsAsync();\n@@ -8448,59 +8472,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//GEOFENCE APIs\n- public static void initGeofenceAPI(Context context,String _accountId,CTGeofenceAPI ctGeofenceAPI){\n-\n- if (instances == null) {\n- CleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\n- if (instance != null) {\n- ctGeofenceAPI.setGeofenceInterface(instance);\n- ctGeofenceAPI.setAccountId(instance.getAccountId());\n- ctGeofenceAPI.setGUID(instance.getCleverTapID());\n- ctGeofenceAPI.activate();\n- }\n- return;\n- }\n-\n- for (String accountId : instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- boolean shouldProcess = false;\n- if (instance != null) {\n- shouldProcess = (_accountId == null && instance.config.isDefaultInstance()) || instance.getAccountId().equals(_accountId);\n- }\n- if (shouldProcess) {\n- ctGeofenceAPI.setGeofenceInterface(instance);\n- ctGeofenceAPI.setAccountId(instance.getAccountId());\n- ctGeofenceAPI.setGUID(instance.getCleverTapID());\n- ctGeofenceAPI.activate();\n- break;\n- }\n- }\n-\n- }\n-\n- public void initGeofenceAPI(CTGeofenceSettings ctGeofenceSettings){\n- CTGeofenceAPI ctGeofenceAPI = CTGeofenceAPI.getInstance(context);\n- ctGeofenceAPI.setGeofenceInterface(this);\n- ctGeofenceAPI.setGeofenceSettings(ctGeofenceSettings);\n- ctGeofenceAPI.setOnGeofenceApiInitializedListener(new CTGeofenceAPI.OnGeofenceApiInitializedListener() {\n- @Override\n- public void OnGeofenceApiInitialized() {\n- isGeofenceInitialized=true;\n- }\n- });\n- ctGeofenceAPI.setAccountId(getAccountId());\n- ctGeofenceAPI.setGUID(getCleverTapID());\n- ctGeofenceAPI.activate();\n- }\n-\n-\n- /**\n- * unregister geofences, location updates and cleanup all resources used by clevertap-geofence-sdk\n- */\n- public void deactivateGeofenceAPI(){\n- CTGeofenceAPI.getInstance(context).deactivate();\n- isGeofenceInitialized=false;\n- }\n/**\n* Pushes the Geofence Cluster Entered event to CleverTap.\n@@ -8508,7 +8479,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param geofenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Entered event\n*/\n- @Override\n@SuppressWarnings(\"unused\")\npublic Future<?> pushGeofenceEnteredEvent(JSONObject geofenceProperties){\nreturn raiseEventForGeofences(Constants.GEOFENCE_ENTERED_EVENT_NAME,geofenceProperties);\n@@ -8520,7 +8490,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param geoFenceProperties The {@link JSONObject} object that contains the\n* event properties regarding GeoFence Cluster Exited event\n*/\n- @Override\n@SuppressWarnings(\"unused\")\npublic Future<?> pushGeoFenceExitedEvent(JSONObject geoFenceProperties){\nreturn raiseEventForGeofences(Constants.GEOFENCE_EXITED_EVENT_NAME,geoFenceProperties);\n@@ -8532,7 +8501,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param location android.location.Location\n* @return\n*/\n- @Override\n@SuppressWarnings(\"unused\")\npublic Future<?> setLocationForGeofences(Location location, int sdkVersion){\nsetLocationForGeofence(true);\n@@ -8545,28 +8513,22 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Register to handle geofence responses from CleverTap\n* This is to be used only by clevertap-geofence-sdk\n*\n- * @param callback The {@link CTGeofenceCallback} instance\n+ * @param geofenceCallback The {@link GeofenceCallback} instance\n*/\n- @Override\n- public void setGeoFenceCallback(CTGeofenceCallback callback) {\n- ctGeofenceCallback=callback;\n+ @SuppressWarnings(\"unused\")\n+ public void setGeofenceCallback(GeofenceCallback geofenceCallback){\n+ this.geofenceCallback = geofenceCallback;\n}\n-\n- /* @SuppressWarnings(\"unused\")\n- public void setGeofenceInterface(GeofenceInterface geofenceInterface){\n- this.geofenceInterface = geofenceInterface;\n- }*/\n-\n/**\n- * Returns the GeofenceInterface object\n+ * Returns the GeofenceCallback object\n*\n- * @return The {@link GeofenceInterface} object\n+ * @return The {@link GeofenceCallback} object\n*/\n@SuppressWarnings(\"unused\")\n- public GeofenceInterface getGeofenceInterface(){\n- return this.geofenceInterface;\n+ public GeofenceCallback getGeofenceCallback(){\n+ return this.geofenceCallback;\n}\nprivate boolean isLocationForGeofence() {\n@@ -8613,7 +8575,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn future;\n}\n- private void processGeofenceResponse(JSONObject response) throws JSONException {\n+ private void processGeofenceResponse(JSONObject response) {\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Can't parse Geofences Response, JSON response object is null\");\nreturn;\n@@ -8623,23 +8585,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"JSON object doesn't contain the Geofences key\");\nreturn;\n}\n- /* try {\n- if(this.geofenceInterface != null){\n- getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n- this.geofenceInterface.handleGeoFences(response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n- }else{\n- getConfigLogger().debug(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n- }\n- } catch (Throwable t) {\n- getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Failed to handle Geofences response\", t);\n- }*/\n-\ntry {\n- if(ctGeofenceCallback != null){\n+ if(this.geofenceCallback != null){\nJSONObject jsonObject=new JSONObject();\njsonObject.put(\"geofences\",response.getJSONArray(Constants.GEOFENCES_JSON_RESPONSE_KEY));\n+\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Processing Geofences response\");\n- ctGeofenceCallback.onSuccess(jsonObject);\n+ this.geofenceCallback.handleGeoFences(jsonObject);\n}else{\ngetConfigLogger().debug(getAccountId(), Constants.LOG_TAG_GEOFENCES + \"Geofence SDK has not been initialized to handle the response\");\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GeofenceCallback.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import org.json.JSONObject;\n+\n+public interface GeofenceCallback {\n+ void handleGeoFences(JSONObject jsonObject);\n+ void triggerLocation();\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/GeofenceInterface.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import org.json.JSONArray;\n-\n-public interface GeofenceInterface {\n- void handleGeoFences(JSONArray jsonArray);\n-}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): moved geofence init APIs to GMOD SDK-254 |
116,623 | 24.07.2020 16:52:17 | -19,080 | e6a97072a09a3e0846c9ea11ac3e36fc60761f33 | fix(ARP): Removed buggy if loops not allowing ARP to go with events | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.8.1'\n+ libraryVersion = '3.8.2'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30801\"\n- android:versionName=\"3.8.1\">\n+ android:versionCode=\"30802\"\n+ android:versionName=\"3.8.2\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -3267,8 +3267,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Attach ARP\n- if (cachedGUID != null) {\n- if (cachedGUID.equals(getCleverTapID())) {\ntry {\nfinal JSONObject arp = getARP();\nif (arp != null && arp.length() > 0) {\n@@ -3277,10 +3275,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Failed to attach ARP\", t);\n}\n- }\n- } else {\n- getConfigLogger().verbose(getAccountId(), \"Not attaching ARP because \");\n- }\nJSONObject ref = new JSONObject();\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(ARP): Removed buggy if loops not allowing ARP to go with events SDK-312 |
116,623 | 24.07.2020 20:18:37 | -19,080 | c274171f42359fe2d3220cf34fd95c603d269325 | fix(ARP) : Handing edge case of onUserLogins across sdk versions | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.8.2 (July 25, 2020)\n+* Fixes ARP not being sent to server bug\n+\n### Version 3.8.1 (July 08, 2020)\n+* Use v3.8.2\n* Adds a callback to provide Push Notifications custom key-value pairs\n* Removed `pushGooglePlusPerson` API as Google Plus sign-in is deprecated\n* Other bug fixes\n### Version 3.8.0 (May 06, 2020)\n+* Use v3.8.2\n* Adds support for Product Config and Feature Flag as a part of Product Experiences feature\n* Fixed InApp center alignment issue for tablets\n* Adds support for custom handling payload when using Push Amplification.\n* Other bug fixes\n### Version 3.7.2 (March 27, 2020)\n+* Use v3.8.2\n* Adds fix for a crash caused when InApp with Frequency Caps was shown on first App Launched\n### Version 3.7.1 (March 19, 2020)\n+* Use v3.8.2\n* Adds fix for a crash caused when CleverTap instance was created from background\n### Version 3.7.0 (March 11, 2020)\n+* Use v3.8.2\n* Adds support for Xiaomi & Baidu Push Notification Services\n* Adds public APIs for raising Notification Clicked and Viewed events for App Inbox\n* Adds public APIS for marking inbox message as read and deleting inbox message per message ID\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.8.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.8.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -3361,7 +3361,19 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfinal String nameSpaceKey = getNewNamespaceARPKey();\nif (nameSpaceKey == null) return null;\n- final SharedPreferences prefs = migrateARPToNewNameSpace(nameSpaceKey, getNamespaceARPKey());\n+ SharedPreferences prefs = null;\n+\n+ //checking whether new namespace is empty or not\n+ //if not empty, using prefs of new namespace to send ARP\n+ //if empty, checking for old prefs\n+ if(!StorageHelper.getPreferences(context, nameSpaceKey).getAll().isEmpty()){\n+ getConfigLogger().debug(\"Prefs is new!! - \"+ nameSpaceKey);\n+ prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n+ }else{\n+ getConfigLogger().debug(\"Prefs is old!! - \"+ getNamespaceARPKey());\n+ prefs = migrateARPToNewNameSpace(nameSpaceKey, getNamespaceARPKey());\n+ }\n+\nfinal Map<String, ?> all = prefs.getAll();\nfinal Iterator<? extends Map.Entry<String, ?>> iter = all.entrySet().iterator();\n@@ -3644,7 +3656,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Ignore\n}\n}\n- getConfigLogger().verbose(getAccountId(), \"Completed ARP update for namespace key: \" + nameSpaceKey + \"\");\n+ //getConfigLogger().verbose(getAccountId(), \"Completed ARP update for namespace key: \" + nameSpaceKey + \"\");//TODO remove\n+ getConfigLogger().verbose(getAccountId(), \"Stored ARP for namespace key: \" + nameSpaceKey + \" values: \" + arp.toString());\nStorageHelper.persist(editor);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(ARP) : Handing edge case of onUserLogins across sdk versions SDK-312 |
116,623 | 25.07.2020 19:26:38 | -19,080 | 04dc40e460da1473f04870535e6f8f30bb64cdbb | fix(ARP): Comments & prep for release v3.8.2 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.8.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.8.2', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.1.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.8.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n### Version 3.8.2 (July 25, 2020)\n-* Fixes ARP not being sent to server bug\n+* Fixes a bug where ARP was not being sent back to servers\n### Version 3.8.1 (July 08, 2020)\n* Use v3.8.2\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.8.1.aar",
"new_path": "clevertap-android-sdk-3.8.1.aar",
"diff": "Binary files a/clevertap-android-sdk-3.8.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.8.2.aar",
"new_path": "clevertap-android-sdk-3.8.2.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.8.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2963,6 +2963,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Session\n+ //Old namespace for ARP Shared Prefs\nprivate String getNamespaceARPKey() {\nfinal String accountId = getAccountId();\n@@ -2972,6 +2973,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn \"ARP:\" + accountId;\n}\n+ //New namespace for ARP Shared Prefs\nprivate String getNewNamespaceARPKey() {\nfinal String accountId = getAccountId();\n@@ -3367,10 +3369,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//if not empty, using prefs of new namespace to send ARP\n//if empty, checking for old prefs\nif(!StorageHelper.getPreferences(context, nameSpaceKey).getAll().isEmpty()){\n- getConfigLogger().debug(\"Prefs is new!! - \"+ nameSpaceKey);\n+ //prefs point to new namespace\nprefs = StorageHelper.getPreferences(context, nameSpaceKey);\n}else{\n- getConfigLogger().debug(\"Prefs is old!! - \"+ getNamespaceARPKey());\n+ //prefs point to new namespace\nprefs = migrateARPToNewNameSpace(nameSpaceKey, getNamespaceARPKey());\n}\n@@ -3624,6 +3626,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nStorageHelper.persist(editor);\n}\n+ //Saves ARP directly to new namespace\nprivate void handleARPUpdate(final Context context, final JSONObject arp) {\nif (arp == null || arp.length() == 0) return;\n@@ -3656,7 +3659,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Ignore\n}\n}\n- //getConfigLogger().verbose(getAccountId(), \"Completed ARP update for namespace key: \" + nameSpaceKey + \"\");//TODO remove\ngetConfigLogger().verbose(getAccountId(), \"Stored ARP for namespace key: \" + nameSpaceKey + \" values: \" + arp.toString());\nStorageHelper.persist(editor);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(ARP): Comments & prep for release v3.8.2 SDK-312 |
116,612 | 27.07.2020 19:55:40 | -19,080 | 5554db7d200d109512eab10e99ba10c6a86db3d0 | chore(geofence): update SDK version to 3.8.3 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.8.2'\n+ libraryVersion = '3.8.3'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30802\"\n- android:versionName=\"3.8.2\">\n+ android:versionCode=\"30803\"\n+ android:versionName=\"3.8.3\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(geofence): update SDK version to 3.8.3 SDK-254 |
116,623 | 28.07.2020 00:15:04 | -19,080 | 27cb7a09c3981bde9415344ec1e99fb246ceab89 | task(geofence): Add Geofence events to System events array | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -116,7 +116,9 @@ public class Constants {\nstatic final String KEY_COUNTS_PER_INAPP = \"counts_per_inapp\";\nstatic final String INAPP_ID_IN_PAYLOAD = \"ti\";\nstatic final int LOCATION_PING_INTERVAL_IN_SECONDS = 10;\n- static final String[] SYSTEM_EVENTS = {NOTIFICATION_CLICKED_EVENT_NAME, NOTIFICATION_VIEWED_EVENT_NAME};\n+ static final String[] SYSTEM_EVENTS = {NOTIFICATION_CLICKED_EVENT_NAME,\n+ NOTIFICATION_VIEWED_EVENT_NAME, GEOFENCE_ENTERED_EVENT_NAME,\n+ GEOFENCE_EXITED_EVENT_NAME};\nstatic final long DEFAULT_PUSH_TTL = 1000 * 60 * 60 * 24 * 4;\nstatic final String PF_JOB_ID = \"pfjobid\";\nstatic final int PING_FREQUENCY_VALUE = 240;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Add Geofence events to System events array SDK-254 |
116,612 | 28.07.2020 00:22:48 | -19,080 | 0d7c40335e760b69d875f5b6a49f0c41316ceefa | task(geofence): adding check for min 10 second interval between geofence location pings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -298,6 +298,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate InAppNotificationListener inAppNotificationListener;\nprivate InAppFCManager inAppFCManager;\nprivate int lastLocationPingTime = 0;\n+ private int lastLocationPingTimeForGeofence = 0;\nprivate final Object tokenLock = new Object();\nprivate final Object notificationMapLock = new Object();\nprivate boolean havePushedFCMToken = false;\n@@ -6857,7 +6858,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// min 10 second interval between location pings\nfinal int now = (int) (System.currentTimeMillis() / 1000);\nFuture<?> future = null;\n- if (now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\n+\n+ if (isLocationForGeofence() && now > (lastLocationPingTimeForGeofence + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\n+ future = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\n+ lastLocationPingTimeForGeofence = now;\n+ Logger.v(\"Queuing location ping event for geofence location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n+ } else if (now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTime = now;\nLogger.v(\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): adding check for min 10 second interval between geofence location pings SDK-254 |
116,612 | 02.08.2020 16:36:41 | -19,080 | d43fd2b182864a7349b1f0ad7b854284fdc18656 | task(geofence): adding condition for min 10 second interval between non-geofence location pings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -6863,7 +6863,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfuture = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTimeForGeofence = now;\nLogger.v(\"Queuing location ping event for geofence location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n- } else if (now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\n+ } else if (!isLocationForGeofence() && now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTime = now;\nLogger.v(\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): adding condition for min 10 second interval between non-geofence location pings SDK-254 |
116,621 | 03.08.2020 22:21:51 | -19,080 | 63920adcd0812f20b038cb9b28852175ec2042e1 | integration(testing): Added power mockito support | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -171,6 +171,10 @@ dependencies {\ntestImplementation 'androidx.test:core:1.2.0'\ntestImplementation \"androidx.test.ext:junit:1.1.1\"\n+ testImplementation 'org.powermock:powermock-core:2.0.7'\n+ testImplementation 'org.powermock:powermock-api-mockito2:2.0.7'\n+ testImplementation 'org.powermock:powermock-module-junit4:2.0.7'\n+\n// AndroidJUnitRunner and JUnit Rules\nandroidTestImplementation 'androidx.test:runner:1.2.0'\nandroidTestImplementation 'androidx.test:rules:1.2.0'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/BaseTestCase.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/BaseTestCase.java",
"diff": "@@ -11,7 +11,7 @@ import org.robolectric.annotation.Config;\nimport static com.clevertap.android.sdk.Constant.ACC_ID;\nimport static com.clevertap.android.sdk.Constant.ACC_TOKEN;\n-import static org.mockito.Mockito.mock;\n+import static org.powermock.api.mockito.PowerMockito.mock;\n@Config(sdk = 28,\napplication = TestApplication.class\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.java",
"diff": "@@ -6,10 +6,10 @@ import android.os.Bundle;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.mockito.Mockito;\nimport org.robolectric.RobolectricTestRunner;\n-import static org.mockito.Mockito.mock;\n-import static org.mockito.Mockito.verify;\n+import static org.powermock.api.mockito.PowerMockito.mock;\n@RunWith(RobolectricTestRunner.class)\npublic class CleverTapAPITest extends BaseTestCase {\n@@ -25,7 +25,7 @@ public class CleverTapAPITest extends BaseTestCase {\nBundle bundle = new Bundle();\n//create\nactivity.onCreate(bundle, null);\n- verify(cleverTapAPI).onActivityCreated(activity, null);\n+ Mockito.verify(cleverTapAPI).onActivityCreated(activity, null);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/featureFlags/FeatureFlagTest.java",
"diff": "@@ -6,11 +6,11 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.mockito.Mockito;\nimport org.robolectric.RobolectricTestRunner;\n-import static org.mockito.Mockito.mock;\n-import static org.mockito.Mockito.verify;\n-import static org.mockito.Mockito.when;\n+import static org.powermock.api.mockito.PowerMockito.mock;\n+import static org.powermock.api.mockito.PowerMockito.when;\n@RunWith(RobolectricTestRunner.class)\npublic class FeatureFlagTest extends BaseTestCase {\n@@ -25,7 +25,7 @@ public class FeatureFlagTest extends BaseTestCase {\npublic void testFetch() {\nwhen(cleverTapAPI.featureFlag()).thenReturn(new CTFeatureFlagsController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI));\ncleverTapAPI.featureFlag().fetchFeatureFlags();\n- verify(cleverTapAPI).fetchFeatureFlags();\n+ Mockito.verify(cleverTapAPI).fetchFeatureFlags();\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/product_config/ProductConfigTest.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/product_config/ProductConfigTest.java",
"diff": "@@ -5,10 +5,10 @@ import com.clevertap.android.sdk.BaseTestCase;\nimport org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\n+import org.mockito.Mockito;\n-import static org.mockito.Mockito.mock;\n-import static org.mockito.Mockito.verify;\n-import static org.mockito.Mockito.when;\n+import static org.powermock.api.mockito.PowerMockito.mock;\n+import static org.powermock.api.mockito.PowerMockito.when;\npublic class ProductConfigTest extends BaseTestCase {\n@@ -22,7 +22,7 @@ public class ProductConfigTest extends BaseTestCase {\npublic void testFetch() {\nwhen(cleverTapAPI.productConfig()).thenReturn(new CTProductConfigController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI));\ncleverTapAPI.productConfig().fetch();\n- verify(cleverTapAPI).fetchProductConfig();\n+ Mockito.verify(cleverTapAPI).fetchProductConfig();\n}\n@Test\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | integration(testing): Added power mockito support |
116,623 | 06.08.2020 13:09:08 | -19,080 | 67a981caeed957e41a890c771f19fc7c86ed091a | task(geofence): Add method to raise geofence errors | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -828,13 +828,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nCleverTapAPI instance = null;\nfor (String accountId : instances.keySet()) {\ninstance = CleverTapAPI.instances.get(accountId);\n- boolean shouldProcess = false;\n- if (instance != null) {\n- shouldProcess = (_accountId == null && instance.config.isDefaultInstance()) || instance.getAccountId().equals(_accountId);\n- }\n- if (shouldProcess) {\n- break;\n- }\n}\nreturn instance;\n@@ -8488,6 +8481,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//GEOFENCE APIs\n+ /**\n+ * Used to record errors of the Geofence module\n+ *\n+ * @param errorCode - int - predefined error code for geofences\n+ * @param errorMessage - String - error message\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushGeoFenceError(int errorCode, String errorMessage){\n+ ValidationResult validationResult = new ValidationResult();\n+ validationResult.setErrorCode(errorCode);\n+ validationResult.setErrorDesc(errorMessage);\n+ pushValidationResult(validationResult);\n+ }\n+\n/**\n* Pushes the Geofence Cluster Entered event to CleverTap.\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(geofence): Add method to raise geofence errors SDK-329 |
116,621 | 10.08.2020 15:17:18 | -19,080 | 3369e9e986cb5fee26e7b36b83ec3fcd71a26137 | Bug(fix):
Added check to call didDismiss on fragment onDestroy. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"diff": "@@ -39,4 +39,10 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n}\nisCleanedUp.set(true);\n}\n+\n+ @Override\n+ public void onDestroy() {\n+ super.onDestroy();\n+ didDismiss(null);\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Bug(fix): https://wizrocket.atlassian.net/browse/SDK-334
Added check to call didDismiss on fragment onDestroy. |
116,623 | 20.08.2020 18:49:33 | -19,080 | f802461c1419d65e89c7ec7f94124884b596eb9a | fix(InApp) Fix for 7 inch devices | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "@@ -27,7 +27,7 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\nfloat yInches= dm.heightPixels/dm.ydpi;\nfloat xInches= dm.widthPixels/dm.xdpi;\ndouble diagonalInches = Math.sqrt(xInches*xInches + yInches*yInches);\n- if (diagonalInches>=6.5){\n+ if (diagonalInches>=7){\nLogger.v(\"Screen size is : \"+diagonalInches);\nreturn true;\n}else{\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(InApp) Fix for 7 inch devices SDK-306 |
116,621 | 27.08.2020 19:09:57 | -19,080 | 9c8d83d8474f2aaed6f7b3f87076e59ba25a4e96 | chore(androidx): Merging Androidx with Push module Code | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTExecutors.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTExecutors.java",
"diff": "@@ -2,8 +2,9 @@ package com.clevertap.android.sdk;\nimport android.os.Handler;\nimport android.os.Looper;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.RestrictTo;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\nimport java.util.concurrent.Executor;\nimport java.util.concurrent.Executors;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -41,6 +41,7 @@ import android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n+import androidx.annotation.RestrictTo;\nimport androidx.core.app.NotificationCompat;\nimport com.android.installreferrer.api.InstallReferrerClient;\n@@ -56,8 +57,6 @@ import com.clevertap.android.sdk.featureFlags.FeatureFlagListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigControllerListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n-import com.google.firebase.iid.FirebaseInstanceId;\n-import com.google.firebase.messaging.FirebaseMessaging;\nimport com.clevertap.android.sdk.pushprovider.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushprovider.PushProvider;\nimport com.clevertap.android.sdk.pushprovider.PushProviders;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -4,7 +4,8 @@ import android.content.Context;\nimport android.content.pm.ApplicationInfo;\nimport android.content.pm.PackageManager;\nimport android.os.Bundle;\n-import android.support.annotation.RestrictTo;\n+\n+import androidx.annotation.RestrictTo;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic class ManifestInfo {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/PackageUtils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/PackageUtils.java",
"diff": "@@ -2,7 +2,8 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.pm.PackageManager;\n-import android.support.annotation.NonNull;\n+\n+import androidx.annotation.NonNull;\nimport com.google.android.gms.common.ConnectionResult;\nimport com.google.android.gms.common.GoogleApiAvailability;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -2,8 +2,9 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n-import android.support.annotation.RestrictTo;\n-import android.support.annotation.WorkerThread;\n+\n+import androidx.annotation.RestrictTo;\n+import androidx.annotation.WorkerThread;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic final class StorageHelper {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/FcmPushProvider.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/FcmPushProvider.java",
"diff": "package com.clevertap.android.sdk.pushprovider;\nimport android.content.Context;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.Nullable;\n-import android.support.annotation.RestrictTo;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\n+import androidx.annotation.Nullable;\n+import androidx.annotation.RestrictTo;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.PackageUtils;\nimport com.google.firebase.FirebaseApp;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushConstants.java",
"diff": "package com.clevertap.android.sdk.pushprovider;\n-import android.support.annotation.IntDef;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.Nullable;\n-import android.support.annotation.StringDef;\n+import androidx.annotation.IntDef;\n+import androidx.annotation.NonNull;\n+import androidx.annotation.Nullable;\n+import androidx.annotation.StringDef;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushProvider.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushProvider.java",
"diff": "package com.clevertap.android.sdk.pushprovider;\nimport android.content.Context;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.Nullable;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.Nullable;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushProviders.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushProviders.java",
"diff": "package com.clevertap.android.sdk.pushprovider;\nimport android.content.Context;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.RestrictTo;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.BuildConfig;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushUtils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushprovider/PushUtils.java",
"diff": "@@ -2,9 +2,10 @@ package com.clevertap.android.sdk.pushprovider;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n-import android.support.annotation.RestrictTo;\nimport android.text.TextUtils;\n+import androidx.annotation.RestrictTo;\n+\nimport com.clevertap.android.sdk.CTExecutors;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.ManifestInfo;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(androidx): Merging Androidx with Push module Code |
116,612 | 29.08.2020 14:22:54 | -19,080 | bacd81a87af5c89367e88d147611a7579c6ea0a6 | chore(geofence): update SDK version to 3.9.0 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.8.3'\n+ libraryVersion = '3.9.0'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30803\"\n- android:versionName=\"3.8.3\">\n+ android:versionCode=\"30900\"\n+ android:versionName=\"3.9.0\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/test/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30801\"\n- android:versionName=\"3.8.1\">\n+ android:versionCode=\"30900\"\n+ android:versionName=\"3.9.0\">\n<uses-sdk\nandroid:minSdkVersion=\"16\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(geofence): update SDK version to 3.9.0 SDK-254 |
116,621 | 29.08.2020 22:03:50 | -19,080 | 5a3394ce6743b0bc79b3783b4231a42596bbe04b | fix(crash): Added check to avoid null pointer exception | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"diff": "@@ -28,7 +28,7 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n@Override\nvoid cleanup() {\n- if (!isCleanedUp.get()) {\n+ if (!Utils.isActivityDead(getActivity()) && !isCleanedUp.get()) {\nfinal FragmentManager fragmentManager = parent.getFragmentManager();\nFragmentTransaction transaction = fragmentManager.beginTransaction();\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\n+import android.app.Activity;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.pm.ResolveInfo;\n@@ -11,6 +12,7 @@ import android.graphics.drawable.BitmapDrawable;\nimport android.graphics.drawable.Drawable;\nimport android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\n+import android.os.Build;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\n@@ -318,4 +320,14 @@ public final class Utils {\n}\n}\n+ public static boolean isActivityDead(Activity activity) {\n+ if (activity == null)\n+ return true;\n+ boolean isActivityDead = activity.isFinishing();\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {\n+ isActivityDead = isActivityDead || activity.isDestroyed();\n+ }\n+ return isActivityDead;\n+ }\n+\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(crash): Added check to avoid null pointer exception |
116,623 | 30.08.2020 22:40:49 | -19,080 | 4e25f6e99d0a8c2ba52ecdd59e3aeb784981ae4c | Prep for v3.9.0 release | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.8.2', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.8.2.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+\n+### Version 3.9.0 (August 31, 2020)\n+* Adds support for CleverTap Geofence SDK\n+* Fixed all InApp related bugs and crashes\n+* Fixed the Product Experiences AB Testing crash on few Samsung devices\n+\n### Version 3.8.2 (July 25, 2020)\n* Fixes a bug where ARP was not being sent back to servers\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.8.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.8.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.8.2.aar",
"new_path": "clevertap-android-sdk-3.8.2.aar",
"diff": "Binary files a/clevertap-android-sdk-3.8.2.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.9.0.aar",
"new_path": "clevertap-android-sdk-3.9.0.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.9.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n@@ -163,6 +163,7 @@ dependencies {\ncompileOnly 'com.android.support:design:28.0.0'\ncompileOnly 'com.github.bumptech.glide:glide:4.9.0'\nimplementation 'com.android.installreferrer:installreferrer:1.0'\n+\n// Unit testing dependencies\ntestImplementation 'junit:junit:4.13'\ntestImplementation 'org.mockito:mockito-core:2.25.0'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Prep for v3.9.0 release SDK-340 |
116,623 | 01.09.2020 10:03:56 | -19,080 | 12bcd8847796182e586eda96e7ce328af96acebb | chore(geofence): Fixed logging in _setLocation | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -6842,7 +6842,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (location == null) return null;\nlocationFromUser = location;\n- Logger.v(\"Location updated (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n+ getConfigLogger().verbose(getAccountId(),\"Location updated (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n// only queue the location ping if we are in the foreground\nif (!isLocationForGeofence()&&!isAppForeground()) return null;\n@@ -6855,11 +6855,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (isLocationForGeofence() && now > (lastLocationPingTimeForGeofence + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTimeForGeofence = now;\n- Logger.v(\"Queuing location ping event for geofence location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n+ getConfigLogger().verbose(getAccountId(),\"Queuing location ping event for geofence location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n} else if (!isLocationForGeofence() && now > (lastLocationPingTime + Constants.LOCATION_PING_INTERVAL_IN_SECONDS)) {\nfuture = queueEvent(context, new JSONObject(), Constants.PING_EVENT);\nlastLocationPingTime = now;\n- Logger.v(\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n+ getConfigLogger().verbose(getAccountId(),\"Queuing location ping event for location (\" + location.getLatitude() + \", \" + location.getLongitude() + \")\");\n}\nreturn future;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(geofence): Fixed logging in _setLocation |
116,621 | 07.09.2020 10:18:20 | -19,080 | 9a85f2672cde60d8e5a385c825b5392492af810f | merge(master): Reverse merged master to androidX | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -170,21 +170,21 @@ dependencies {\n// Unit testing dependencies\ntestImplementation 'junit:junit:4.13'\n- testImplementation 'org.mockito:mockito-core:2.25.0'\n+ testImplementation 'org.mockito:mockito-core:2.28.2'\ntestImplementation 'org.robolectric:robolectric:4.3.1'\n- testImplementation 'androidx.test:core:1.2.0'\n- testImplementation \"androidx.test.ext:junit:1.1.1\"\n+ testImplementation 'androidx.test:core:1.3.0'\n+ testImplementation \"androidx.test.ext:junit:1.1.2\"\ntestImplementation 'org.powermock:powermock-core:2.0.7'\ntestImplementation 'org.powermock:powermock-api-mockito2:2.0.7'\ntestImplementation 'org.powermock:powermock-module-junit4:2.0.7'\n// AndroidJUnitRunner and JUnit Rules\n- androidTestImplementation 'androidx.test:runner:1.2.0'\n- androidTestImplementation 'androidx.test:rules:1.2.0'\n+ androidTestImplementation 'androidx.test:runner:1.3.0'\n+ androidTestImplementation 'androidx.test:rules:1.3.0'\n- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'\n+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'\ntestImplementation 'org.powermock:powermock-core:2.0.7'\ntestImplementation 'org.powermock:powermock-module-junit4:2.0.7'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | merge(master): Reverse merged master to androidX |
116,612 | 08.09.2020 13:30:53 | -19,080 | eb39fd907995aa01c586b18c024b163342882b54 | refactor: move validation result stack and json conversion logic to new classes | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTJsonConverter.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.location.Location;\n+import android.os.Bundle;\n+\n+import org.json.JSONArray;\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\n+import java.util.Iterator;\n+\n+class CTJsonConverter {\n+\n+\n+ static String toJsonString(Object value) {\n+ String val = null;\n+\n+ try {\n+ val = value.toString();\n+ } catch (Exception e) {\n+ // no-op\n+ }\n+\n+ return val;\n+ }\n+\n+ static JSONObject toJsonObject(String json, Logger logger, String accountId) {\n+ JSONObject cache = null;\n+ if (json != null) {\n+ try {\n+ cache = new JSONObject(json);\n+ } catch (Throwable t) {\n+ // no-op\n+ logger.verbose(accountId, \"Error reading guid cache: \" + t.toString());\n+ }\n+ }\n+\n+ return (cache != null) ? cache : new JSONObject();\n+ }\n+\n+ static JSONObject getWzrkFields(CTInAppNotification root) throws JSONException {\n+ final JSONObject fields = new JSONObject();\n+ JSONObject jsonObject = root.getJsonDescription();\n+ Iterator<String> iterator = jsonObject.keys();\n+\n+ while (iterator.hasNext()) {\n+ String keyName = iterator.next();\n+ if (keyName.startsWith(Constants.WZRK_PREFIX))\n+ fields.put(keyName, jsonObject.get(keyName));\n+ }\n+\n+ return fields;\n+ }\n+\n+ static JSONObject getWzrkFields(Bundle root) throws JSONException {\n+ final JSONObject fields = new JSONObject();\n+ for (String s : root.keySet()) {\n+ final Object o = root.get(s);\n+ if (o instanceof Bundle) {\n+ final JSONObject wzrkFields = getWzrkFields((Bundle) o);\n+ final Iterator<String> keys = wzrkFields.keys();\n+ while (keys.hasNext()) {\n+ final String k = keys.next();\n+ fields.put(k, wzrkFields.get(k));\n+ }\n+ } else if (s.startsWith(Constants.WZRK_PREFIX)) {\n+ fields.put(s, root.get(s));\n+ }\n+ }\n+\n+ return fields;\n+ }\n+\n+ static JSONObject getWzrkFields(CTInboxMessage root) {\n+ return root.getWzrkParams();\n+ }\n+\n+ //Validation\n+ static JSONObject getErrorObject(ValidationResult vr) {\n+ JSONObject error = new JSONObject();\n+ try {\n+ error.put(\"c\", vr.getErrorCode());\n+ error.put(\"d\", vr.getErrorDesc());\n+ } catch (JSONException e) {\n+ // Won't reach here\n+ }\n+ return error;\n+ }\n+\n+\n+ static JSONArray getRenderedTargetList(DBAdapter dbAdapter) {\n+ String[] pushIds = dbAdapter.fetchPushNotificationIds();\n+ JSONArray renderedTargets = new JSONArray();\n+ for (String pushId : pushIds) {\n+ Logger.v(\"RTL IDs -\" + pushId);\n+ renderedTargets.put(pushId);\n+ }\n+ return renderedTargets;\n+ }\n+\n+ static JSONObject from(DeviceInfo deviceInfo, Location locationFromUser, boolean enableNetworkInfoReporting\n+ , boolean deviceIsMultiUser) throws JSONException {\n+\n+ final JSONObject evtData = new JSONObject();\n+ evtData.put(\"Build\", deviceInfo.getBuild() + \"\");\n+ evtData.put(\"Version\", deviceInfo.getVersionName());\n+ evtData.put(\"OS Version\", deviceInfo.getOsVersion());\n+ evtData.put(\"SDK Version\", deviceInfo.getSdkVersion());\n+\n+ if (locationFromUser != null) {\n+ evtData.put(\"Latitude\", locationFromUser.getLatitude());\n+ evtData.put(\"Longitude\", locationFromUser.getLongitude());\n+ }\n+\n+ // send up googleAdID\n+ if (deviceInfo.getGoogleAdID() != null) {\n+ String baseAdIDKey = \"GoogleAdID\";\n+ String adIDKey = deviceIsMultiUser ? Constants.MULTI_USER_PREFIX + baseAdIDKey : baseAdIDKey;\n+ evtData.put(adIDKey, deviceInfo.getGoogleAdID());\n+ evtData.put(\"GoogleAdIDLimit\", deviceInfo.isLimitAdTrackingEnabled());\n+ }\n+\n+ try {\n+ // Device data\n+ evtData.put(\"Make\", deviceInfo.getManufacturer());\n+ evtData.put(\"Model\", deviceInfo.getModel());\n+ evtData.put(\"Carrier\", deviceInfo.getCarrier());\n+ evtData.put(\"useIP\", enableNetworkInfoReporting);\n+ evtData.put(\"OS\", deviceInfo.getOsName());\n+ evtData.put(\"wdt\", deviceInfo.getWidth());\n+ evtData.put(\"hgt\", deviceInfo.getHeight());\n+ evtData.put(\"dpi\", deviceInfo.getDPI());\n+ if (deviceInfo.getLibrary() != null) {\n+ evtData.put(\"lib\", deviceInfo.getLibrary());\n+ }\n+\n+ String cc = deviceInfo.getCountryCode();\n+ if (cc != null && !cc.equals(\"\"))\n+ evtData.put(\"cc\", cc);\n+\n+ if (enableNetworkInfoReporting) {\n+ final Boolean isWifi = deviceInfo.isWifiConnected();\n+ if (isWifi != null) {\n+ evtData.put(\"wifi\", isWifi);\n+ }\n+\n+ final Boolean isBluetoothEnabled = deviceInfo.isBluetoothEnabled();\n+ if (isBluetoothEnabled != null) {\n+ evtData.put(\"BluetoothEnabled\", isBluetoothEnabled);\n+ }\n+\n+ final String bluetoothVersion = deviceInfo.getBluetoothVersion();\n+ if (bluetoothVersion != null) {\n+ evtData.put(\"BluetoothVersion\", bluetoothVersion);\n+ }\n+\n+ final String radio = deviceInfo.getNetworkType();\n+ if (radio != null) {\n+ evtData.put(\"Radio\", radio);\n+ }\n+ }\n+\n+ } catch (Throwable t) {\n+ // Ignore\n+ }\n+\n+ return evtData;\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -104,6 +104,9 @@ import javax.net.ssl.SSLSocketFactory;\nimport static android.content.Context.JOB_SCHEDULER_SERVICE;\nimport static android.content.Context.NOTIFICATION_SERVICE;\n+import static com.clevertap.android.sdk.CTJsonConverter.getErrorObject;\n+import static com.clevertap.android.sdk.CTJsonConverter.getRenderedTargetList;\n+import static com.clevertap.android.sdk.CTJsonConverter.getWzrkFields;\nimport static com.clevertap.android.sdk.Utils.runOnUiThread;\n/**\n@@ -125,11 +128,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npublic static final String NOTIFICATION_TAG = \"wzrk_pn\";\nprivate static int debugLevel = CleverTapAPI.LogLevel.INFO.intValue();\n- private static final Boolean pendingValidationResultsLock = true;\nprivate static CleverTapInstanceConfig defaultConfig;\nprivate static HashMap<String, CleverTapAPI> instances;\nprivate static boolean appForeground = false;\nprivate static int activityCount = 0;\n+ private final ValidationResultStack validationResultStack;\nprivate String currentScreenName = \"\";\nprivate static ArrayList<CTInAppNotification> pendingNotifications = new ArrayList<>();\nprivate Runnable pendingInappRunnable = null;\n@@ -159,6 +162,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.es = Executors.newFixedThreadPool(1);\nthis.ns = Executors.newFixedThreadPool(1);\nthis.localDataStore = new LocalDataStore(context, config);\n+ validationResultStack = new ValidationResultStack();\nthis.deviceInfo = new DeviceInfo(context, config, cleverTapID);\nif (this.deviceInfo.getDeviceID() != null) {\nLogger.v(\"Initializing InAppFC with device Id = \" + this.deviceInfo.getDeviceID());\n@@ -304,7 +308,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate boolean currentUserOptedOut = false;\nprivate final HashMap<String, Integer> installReferrerMap = new HashMap<>(8);\nprivate boolean enableNetworkInfoReporting = false;\n- private ArrayList<ValidationResult> pendingValidationResults = new ArrayList<>();\nprivate HashSet<String> inappActivityExclude = null;\nprivate InAppNotificationListener inAppNotificationListener;\nprivate InAppFCManager inAppFCManager;\n@@ -1552,28 +1555,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn null;\n}\n- //Validation\n- private void pushValidationResult(ValidationResult vr) {\n- synchronized (pendingValidationResultsLock) {\n- try {\n- int len = pendingValidationResults.size();\n- if (len > 50) {\n- ArrayList<ValidationResult> trimmed = new ArrayList<>();\n- // Trim down the list to 40, so that this loop needn't run for the next 10 events\n- // Hence, skip the first 10 elements\n- for (int i = 10; i < len; i++)\n- trimmed.add(pendingValidationResults.get(i));\n- trimmed.add(vr);\n- pendingValidationResults = trimmed;\n- } else {\n- pendingValidationResults.add(vr);\n- }\n- } catch (Exception e) {\n- // no-op\n- }\n- }\n- }\n-\n/**\n* Returns whether or not the app is in the foreground.\n*\n@@ -1668,7 +1649,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void recordDeviceIDErrors() {\nfor (ValidationResult validationResult : this.deviceInfo.getValidationResults()) {\n- pushValidationResult(validationResult);\n+ validationResultStack.pushValidationResult(validationResult);\n}\n}\n@@ -1940,35 +1921,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //Validation\n- private ValidationResult popValidationResult() {\n- // really a shift\n- ValidationResult vr = null;\n-\n- synchronized (pendingValidationResultsLock) {\n- try {\n- if (!pendingValidationResults.isEmpty()) {\n- vr = pendingValidationResults.remove(0);\n- }\n- } catch (Exception e) {\n- // no-op\n- }\n- }\n- return vr;\n- }\n-\n- //Validation\n- private JSONObject getErrorObject(ValidationResult vr) {\n- JSONObject error = new JSONObject();\n- try {\n- error.put(\"c\", vr.getErrorCode());\n- error.put(\"d\", vr.getErrorDesc());\n- } catch (JSONException e) {\n- // Won't reach here\n- }\n- return error;\n- }\n-\n/**\n* Enables the Profile/Events Read and Synchronization API\n* Personalization is enabled by default\n@@ -2379,7 +2331,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nattachPackageNameIfRequired(context, event);\n// Report any pending validation error\n- ValidationResult vr = popValidationResult();\n+ ValidationResult vr = validationResultStack.popValidationResult();\nif (vr != null) {\nevent.put(Constants.ERROR_KEY, getErrorObject(vr));\n}\n@@ -2412,7 +2364,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"type\", \"event\");\nevent.put(\"ep\", System.currentTimeMillis() / 1000);\n// Report any pending validation error\n- ValidationResult vr = popValidationResult();\n+ ValidationResult vr = validationResultStack.popValidationResult();\nif (vr != null) {\nevent.put(Constants.ERROR_KEY, getErrorObject(vr));\n}\n@@ -3076,7 +3028,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"bk\", 1);\nisBgPing = false;\n}\n- header.put(\"rtl\", getRenderedTargetList());\n+ header.put(\"rtl\", getRenderedTargetList(this.dbAdapter));\nif (!installReferrerDataSent) {\nheader.put(\"rct\", getReferrerClickTime());\nheader.put(\"ait\", getAppInstallTime());\n@@ -3356,7 +3308,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nboolean ack = pushAmpObject.getBoolean(\"ack\");\ngetConfigLogger().verbose(\"Received ACK -\" + ack);\nif (ack) {\n- JSONArray rtlArray = getRenderedTargetList();\n+ JSONArray rtlArray = getRenderedTargetList(this.dbAdapter);\nString[] rtlStringArray = new String[0];\nif (rtlArray != null) {\nrtlStringArray = new String[rtlArray.length()];\n@@ -3498,18 +3450,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Profile\nprivate JSONObject getCachedGUIDs() {\n- JSONObject cache = null;\nString json = StorageHelper.getStringFromPrefs(context, config, Constants.CACHED_GUIDS_KEY, null);\n- if (json != null) {\n- try {\n- cache = new JSONObject(json);\n- } catch (Throwable t) {\n- // no-op\n- getConfigLogger().verbose(getAccountId(), \"Error reading guid cache: \" + t.toString());\n- }\n- }\n-\n- return (cache != null) ? cache : new JSONObject();\n+ return CTJsonConverter.toJsonObject(json,getConfigLogger(),getAccountId());\n}\nprivate int getPingFrequency(Context context) {\n@@ -3520,16 +3462,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nStorageHelper.putInt(context, Constants.PING_FREQUENCY, pingFrequency);\n}\n- private JSONArray getRenderedTargetList() {\n- String[] pushIds = this.dbAdapter.fetchPushNotificationIds();\n- JSONArray renderedTargets = new JSONArray();\n- for (String pushId : pushIds) {\n- Logger.v(\"RTL IDs -\" + pushId);\n- renderedTargets.put(pushId);\n- }\n- return renderedTargets;\n- }\n-\n//InApp\nprivate void processInAppResponse(final JSONObject response, final Context context) {\ntry {\n@@ -4121,7 +4053,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n// reset the key\n@@ -4198,27 +4130,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn (stringified != null) ? new JSONArray().put(stringified) : _default;\n}\n- private String _stringifyScalarProfilePropValue(Object value) {\n- String val = null;\n-\n- try {\n- val = value.toString();\n- } catch (Exception e) {\n- // no-op\n- }\n-\n- return val;\n- }\n-\nprivate String _stringifyAndCleanScalarProfilePropValue(Object value) {\n- String val = _stringifyScalarProfilePropValue(value);\n+ String val = CTJsonConverter.toJsonString(value);\nif (val != null) {\nValidationResult vr = validator.cleanMultiValuePropertyValue(val);\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\nObject _value = vr.getObject();\n@@ -4245,7 +4165,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n// reset the value\n@@ -4286,7 +4206,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n// set the merged local values array\n@@ -4322,7 +4242,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nString msg = \"Invalid multi value for key \" + key + \", profile multi value operation aborted.\";\nerror.setErrorCode(512);\nerror.setErrorDesc(msg);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), msg);\n}\n@@ -4330,7 +4250,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nValidationResult error = new ValidationResult();\nerror.setErrorCode(523);\nerror.setErrorDesc(\"Invalid multi-value property key \" + key);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), \"Invalid multi-value property key \" + key + \" profile multi value operation aborted\");\n}\n@@ -4354,71 +4274,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Event\nprivate JSONObject getAppLaunchedFields() {\n- try {\n- final JSONObject evtData = new JSONObject();\n- evtData.put(\"Build\", this.deviceInfo.getBuild() + \"\");\n- evtData.put(\"Version\", this.deviceInfo.getVersionName());\n- evtData.put(\"OS Version\", this.deviceInfo.getOsVersion());\n- evtData.put(\"SDK Version\", this.deviceInfo.getSdkVersion());\n-\n- if (locationFromUser != null) {\n- evtData.put(\"Latitude\", locationFromUser.getLatitude());\n- evtData.put(\"Longitude\", locationFromUser.getLongitude());\n- }\n-\n- // send up googleAdID\n- if (this.deviceInfo.getGoogleAdID() != null) {\n- String baseAdIDKey = \"GoogleAdID\";\n- String adIDKey = deviceIsMultiUser() ? Constants.MULTI_USER_PREFIX + baseAdIDKey : baseAdIDKey;\n- evtData.put(adIDKey, this.deviceInfo.getGoogleAdID());\n- evtData.put(\"GoogleAdIDLimit\", this.deviceInfo.isLimitAdTrackingEnabled());\n- }\ntry {\n- // Device data\n- evtData.put(\"Make\", this.deviceInfo.getManufacturer());\n- evtData.put(\"Model\", this.deviceInfo.getModel());\n- evtData.put(\"Carrier\", this.deviceInfo.getCarrier());\n- evtData.put(\"useIP\", enableNetworkInfoReporting);\n- evtData.put(\"OS\", this.deviceInfo.getOsName());\n- evtData.put(\"wdt\", this.deviceInfo.getWidth());\n- evtData.put(\"hgt\", this.deviceInfo.getHeight());\n- evtData.put(\"dpi\", this.deviceInfo.getDPI());\n- if (this.deviceInfo.getLibrary() != null) {\n- evtData.put(\"lib\", this.deviceInfo.getLibrary());\n- }\n-\n- String cc = this.deviceInfo.getCountryCode();\n- if (cc != null && !cc.equals(\"\"))\n- evtData.put(\"cc\", cc);\n-\n- if (enableNetworkInfoReporting) {\n- final Boolean isWifi = this.deviceInfo.isWifiConnected();\n- if (isWifi != null) {\n- evtData.put(\"wifi\", isWifi);\n- }\n-\n- final Boolean isBluetoothEnabled = this.deviceInfo.isBluetoothEnabled();\n- if (isBluetoothEnabled != null) {\n- evtData.put(\"BluetoothEnabled\", isBluetoothEnabled);\n- }\n-\n- final String bluetoothVersion = this.deviceInfo.getBluetoothVersion();\n- if (bluetoothVersion != null) {\n- evtData.put(\"BluetoothVersion\", bluetoothVersion);\n- }\n-\n- final String radio = this.deviceInfo.getNetworkType();\n- if (radio != null) {\n- evtData.put(\"Radio\", radio);\n+ boolean deviceIsMultiUser = false;\n+ if (deviceInfo.getGoogleAdID() != null) {\n+ deviceIsMultiUser = deviceIsMultiUser();\n}\n- }\n-\n- } catch (Throwable t) {\n- // Ignore\n- }\n-\n- return evtData;\n+ return CTJsonConverter.from(deviceInfo,locationFromUser,enableNetworkInfoReporting,\n+ deviceIsMultiUser);\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Failed to construct App Launched event\", t);\nreturn new JSONObject();\n@@ -4449,29 +4312,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.syncListener = syncListener;\n}\n- private JSONObject getWzrkFields(Bundle root) throws JSONException {\n- final JSONObject fields = new JSONObject();\n- for (String s : root.keySet()) {\n- final Object o = root.get(s);\n- if (o instanceof Bundle) {\n- final JSONObject wzrkFields = getWzrkFields((Bundle) o);\n- final Iterator<String> keys = wzrkFields.keys();\n- while (keys.hasNext()) {\n- final String k = keys.next();\n- fields.put(k, wzrkFields.get(k));\n- }\n- } else if (s.startsWith(Constants.WZRK_PREFIX)) {\n- fields.put(s, root.get(s));\n- }\n- }\n-\n- return fields;\n- }\n-\n- private JSONObject getWzrkFields(CTInboxMessage root) {\n- return root.getWzrkParams();\n- }\n-\n/**\n* Returns the CTExperimentsListener object\n*\n@@ -4656,7 +4496,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nkey = vr.getObject().toString();\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\nif (key.isEmpty()) {\n@@ -4664,7 +4504,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nkeyError.setErrorCode(512);\nfinal String keyErr = \"Profile push key is empty\";\nkeyError.setErrorDesc(keyErr);\n- pushValidationResult(keyError);\n+ validationResultStack.pushValidationResult(keyError);\ngetConfigLogger().debug(getAccountId(), keyErr);\n// Skip this property\ncontinue;\n@@ -4678,7 +4518,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nerror.setErrorCode(512);\nfinal String err = \"Object value wasn't a primitive (\" + value + \") for profile field \" + key;\nerror.setErrorDesc(err);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), err);\n// Skip this property\ncontinue;\n@@ -4686,7 +4526,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nvalue = vr.getObject();\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n// test Phone: if no device country code, test if phone starts with +, log but always send\n@@ -4701,13 +4541,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nerror.setErrorCode(512);\nfinal String err = \"Device country code not available and profile phone: \" + value + \" does not appear to start with country code\";\nerror.setErrorDesc(err);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), err);\n}\n}\ngetConfigLogger().verbose(getAccountId(), \"Profile phone is: \" + value + \" device country code is: \" + ((countryCode != null) ? countryCode : \"null\"));\n} catch (Exception e) {\n- pushValidationResult(new ValidationResult(512, \"Invalid phone number\"));\n+ validationResultStack.pushValidationResult(new ValidationResult(512, \"Invalid phone number\"));\ngetConfigLogger().debug(getAccountId(), \"Invalid phone number: \" + e.getLocalizedMessage());\ncontinue;\n}\n@@ -4839,14 +4679,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nValidationResult error = new ValidationResult();\nerror.setErrorCode(512);\nerror.setErrorDesc(\"Key is empty, profile removeValueForKey aborted.\");\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), \"Key is empty, profile removeValueForKey aborted\");\n// Abort\nreturn;\n}\n// Check for an error\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n// remove from the local profile\n@@ -4878,7 +4718,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nname = vr.getObject().toString();\nif (vr.getErrorCode() != 0) {\n- pushValidationResult(vr);\n+ validationResultStack.pushValidationResult(vr);\n}\n} catch (IllegalArgumentException e) {\n// Weird name, wasn't a string, or any number\n@@ -5256,20 +5096,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npushInAppNotificationStateEvent(false, inAppNotification, formData);\n}\n- private JSONObject getWzrkFields(CTInAppNotification root) throws JSONException {\n- final JSONObject fields = new JSONObject();\n- JSONObject jsonObject = root.getJsonDescription();\n- Iterator<String> iterator = jsonObject.keys();\n-\n- while (iterator.hasNext()) {\n- String keyName = iterator.next();\n- if (keyName.startsWith(Constants.WZRK_PREFIX))\n- fields.put(keyName, jsonObject.get(keyName));\n- }\n-\n- return fields;\n- }\n-\n/**\n* Push Charged event, which describes a purchase made.\n*\n@@ -5293,7 +5119,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nerror.setErrorCode(522);\nerror.setErrorDesc(\"Charged event contained more than 50 items.\");\ngetConfigLogger().debug(getAccountId(), \"Charged event contained more than 50 items.\");\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\n}\nJSONObject evtData = new JSONObject();\n@@ -5316,7 +5142,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nerror.setErrorCode(511);\nfinal String err = \"For event Charged: Property value for property \" + key + \" wasn't a primitive (\" + value + \")\";\nerror.setErrorDesc(err);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), err);\n// Skip this property\ncontinue;\n@@ -5350,7 +5176,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nerror.setErrorDesc(err);\ngetConfigLogger().debug(getAccountId(), err);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\n// Skip this property\ncontinue;\n}\n@@ -5389,14 +5215,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nValidationResult validationResult = validator.isRestrictedEventName(eventName);\n// Check for a restricted event name\nif (validationResult.getErrorCode() > 0) {\n- pushValidationResult(validationResult);\n+ validationResultStack.pushValidationResult(validationResult);\nreturn;\n}\nValidationResult discardedResult = validator.isEventDiscarded(eventName);\n// Check for a discarded event name\nif (discardedResult.getErrorCode() > 0) {\n- pushValidationResult(discardedResult);\n+ validationResultStack.pushValidationResult(discardedResult);\nreturn;\n}\n@@ -5431,7 +5257,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfinal String err = \"For event \\\"\" + eventName + \"\\\": Property value for property \" + key + \" wasn't a primitive (\" + value + \")\";\nerror.setErrorDesc(err);\ngetConfigLogger().debug(getAccountId(), err);\n- pushValidationResult(error);\n+ validationResultStack.pushValidationResult(error);\n// Skip this record\ncontinue;\n}\n@@ -6047,7 +5873,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (channelIdError != null) {\ngetConfigLogger().debug(getAccountId(), channelIdError);\n- pushValidationResult(new ValidationResult(512, channelIdError));\n+ validationResultStack.pushValidationResult(new ValidationResult(512, channelIdError));\nreturn;\n}\n}\n@@ -6341,7 +6167,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!notificationViewedEnabled) {\nString notificationViewedError = \"Recording of Notification Viewed is disabled in the CleverTap Dashboard for notification payload: \" + extras.toString();\ngetConfigLogger().debug(notificationViewedError);\n- pushValidationResult(new ValidationResult(512, notificationViewedError));\n+ validationResultStack.pushValidationResult(new ValidationResult(512, notificationViewedError));\nreturn;\n}\npushNotificationViewedEvent(extras);\n@@ -8248,7 +8074,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nValidationResult validationResult = new ValidationResult();\nvalidationResult.setErrorCode(errorCode);\nvalidationResult.setErrorDesc(errorMessage);\n- pushValidationResult(validationResult);\n+ validationResultStack.pushValidationResult(validationResult);\n}\n/**\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ValidationResultStack.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import java.util.ArrayList;\n+\n+class ValidationResultStack {\n+\n+ private ArrayList<ValidationResult> pendingValidationResults = new ArrayList<>();\n+ private static final Boolean pendingValidationResultsLock = true;\n+\n+ //Validation\n+ void pushValidationResult(ValidationResult vr) {\n+ synchronized (pendingValidationResultsLock) {\n+ try {\n+ int len = pendingValidationResults.size();\n+ if (len > 50) {\n+ ArrayList<ValidationResult> trimmed = new ArrayList<>();\n+ // Trim down the list to 40, so that this loop needn't run for the next 10 events\n+ // Hence, skip the first 10 elements\n+ for (int i = 10; i < len; i++)\n+ trimmed.add(pendingValidationResults.get(i));\n+ trimmed.add(vr);\n+ pendingValidationResults = trimmed;\n+ } else {\n+ pendingValidationResults.add(vr);\n+ }\n+ } catch (Exception e) {\n+ // no-op\n+ }\n+ }\n+ }\n+\n+ ValidationResult popValidationResult() {\n+ // really a shift\n+ ValidationResult vr = null;\n+\n+ synchronized (pendingValidationResultsLock) {\n+ try {\n+ if (!pendingValidationResults.isEmpty()) {\n+ vr = pendingValidationResults.remove(0);\n+ }\n+ } catch (Exception e) {\n+ // no-op\n+ }\n+ }\n+ return vr;\n+ }\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor: move validation result stack and json conversion logic to new classes |
116,623 | 08.09.2020 14:41:34 | -19,080 | d73c282c32559c6196334b9a1ef27fe735961838 | task(inbox): Add methods to CTInboxStyleConfig to handle NoMessageView | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxActivity.java",
"diff": "@@ -111,6 +111,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nif (cleverTapAPI != null && cleverTapAPI.getInboxMessageCount() == 0) {\nnoMessageView.setBackgroundColor(Color.parseColor(styleConfig.getInboxBackgroundColor()));\nnoMessageView.setVisibility(View.VISIBLE);\n+ noMessageView.setText(styleConfig.getNoMessageViewText());\n+ noMessageView.setTextColor(Color.parseColor(styleConfig.getNoMessageViewTextColor()));\n} else {\nboolean fragmentExists = false;\nnoMessageView.setVisibility(View.GONE);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"diff": "@@ -115,6 +115,8 @@ public class CTInboxListViewFragment extends Fragment {\nif (inboxMessages.size() <= 0) {\nnoMessageView.setVisibility(View.VISIBLE);\n+ noMessageView.setText(styleConfig.getNoMessageViewText());\n+ noMessageView.setTextColor(Color.parseColor(styleConfig.getNoMessageViewTextColor()));\nreturn allView;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"diff": "@@ -26,6 +26,8 @@ public class CTInboxStyleConfig implements Parcelable {\nprivate String unselectedTabColor;\nprivate String selectedTabIndicatorColor;\nprivate String tabBackgroundColor;\n+ private String noMessageViewText;\n+ private String noMessageViewTextColor;\nprivate String[] tabs;\n@@ -40,6 +42,8 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.selectedTabIndicatorColor = \"#1C84FE\";\nthis.tabBackgroundColor = \"#FFFFFF\";\nthis.tabs = new String[0];\n+ this.noMessageViewText = \"No Message(s) to show\";\n+ this.noMessageViewTextColor = \"#000000\";\n}\nCTInboxStyleConfig(CTInboxStyleConfig config){\n@@ -53,6 +57,8 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.selectedTabIndicatorColor = config.selectedTabIndicatorColor;\nthis.tabBackgroundColor = config.tabBackgroundColor;\nthis.tabs = (config.tabs == null) ? new String[0] : Arrays.copyOf(config.tabs, config.tabs.length);\n+ this.noMessageViewText = config.noMessageViewText;\n+ this.noMessageViewTextColor = config.noMessageViewTextColor;\n}\nprotected CTInboxStyleConfig(Parcel in) {\n@@ -66,6 +72,8 @@ public class CTInboxStyleConfig implements Parcelable {\nunselectedTabColor = in.readString();\nselectedTabIndicatorColor = in.readString();\ntabBackgroundColor = in.readString();\n+ noMessageViewText = in.readString();\n+ noMessageViewTextColor = in.readString();\n}\n@Override\n@@ -85,6 +93,8 @@ public class CTInboxStyleConfig implements Parcelable {\ndest.writeString(unselectedTabColor);\ndest.writeString(selectedTabIndicatorColor);\ndest.writeString(tabBackgroundColor);\n+ dest.writeString(noMessageViewText);\n+ dest.writeString(noMessageViewTextColor);\n}\n@SuppressWarnings(\"unused\")\n@@ -233,4 +243,28 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabBackgroundColor(String tabBackgroundColor) {\nthis.tabBackgroundColor = tabBackgroundColor;\n}\n+\n+ public String getNoMessageViewText() {\n+ return noMessageViewText;\n+ }\n+\n+ /**\n+ * Sets the text for when there are no messages in the App Inbox\n+ * @param noMessageViewText String\n+ */\n+ public void setNoMessageViewText(String noMessageViewText) {\n+ this.noMessageViewText = noMessageViewText;\n+ }\n+\n+ public String getNoMessageViewTextColor() {\n+ return noMessageViewTextColor;\n+ }\n+\n+ /**\n+ * Sets the color of the text for when there are no messages in the App Inbox\n+ * @param noMessageViewTextColor String - hexcode of the color\n+ */\n+ public void setNoMessageViewTextColor(String noMessageViewTextColor) {\n+ this.noMessageViewTextColor = noMessageViewTextColor;\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(inbox): Add methods to CTInboxStyleConfig to handle NoMessageView SDK-387 |
116,623 | 08.09.2020 19:37:32 | -19,080 | c14b38708fc523e305239b2e14733d0de9bbf1e2 | chore(androidx): Added try/catch for Android 11 Security Exception in DeviceInfo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -511,6 +511,7 @@ class DeviceInfo {\n}\nprivate String getNetworkType() {\n+ try {\nTelephonyManager mTelephonyManager = (TelephonyManager)\ncontext.getSystemService(Context.TELEPHONY_SERVICE);\nif (mTelephonyManager == null) {\n@@ -539,6 +540,10 @@ class DeviceInfo {\ndefault:\nreturn null;\n}\n+ }catch (SecurityException e){\n+ Logger.d(\"Caught Security Exception, returning Network Type as NULL\");\n+ return null;\n+ }\n}\nprivate String getBluetoothVersion() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(androidx): Added try/catch for Android 11 Security Exception in DeviceInfo SDK-353 |
116,612 | 09.09.2020 00:48:10 | -19,080 | fbbe4f35701d6641a89551ce227660ef9d6d88c3 | refactor: move error codes and messages to factory | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -4238,18 +4238,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void _generateEmptyMultiValueError(String key) {\n- ValidationResult error = new ValidationResult();\n- String msg = \"Invalid multi value for key \" + key + \", profile multi value operation aborted.\";\n- error.setErrorCode(512);\n- error.setErrorDesc(msg);\n+ ValidationResult error = ValidationResultFactory.create(512,Constants.INVALID_MULTI_VALUE,key);\nvalidationResultStack.pushValidationResult(error);\n- getConfigLogger().debug(getAccountId(), msg);\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\n}\nprivate void _generateInvalidMultiValueKeyError(String key) {\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(523);\n- error.setErrorDesc(\"Invalid multi-value property key \" + key);\n+ ValidationResult error = ValidationResultFactory.create(523,Constants.INVALID_MULTI_VALUE_KEY,key);\nvalidationResultStack.pushValidationResult(error);\ngetConfigLogger().debug(getAccountId(), \"Invalid multi-value property key \" + key + \" profile multi value operation aborted\");\n}\n@@ -4500,12 +4495,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (key.isEmpty()) {\n- ValidationResult keyError = new ValidationResult();\n- keyError.setErrorCode(512);\n- final String keyErr = \"Profile push key is empty\";\n- keyError.setErrorDesc(keyErr);\n+ ValidationResult keyError = ValidationResultFactory.create(512,Constants.PUSH_KEY_EMPTY);\nvalidationResultStack.pushValidationResult(keyError);\n- getConfigLogger().debug(getAccountId(), keyErr);\n+ getConfigLogger().debug(getAccountId(), keyError.getErrorDesc());\n// Skip this property\ncontinue;\n}\n@@ -4514,12 +4506,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nvr = validator.cleanObjectValue(value, Validator.ValidationContext.Profile);\n} catch (Throwable e) {\n// The object was neither a String, Boolean, or any number primitives\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(512);\n- final String err = \"Object value wasn't a primitive (\" + value + \") for profile field \" + key;\n- error.setErrorDesc(err);\n+ ValidationResult error = ValidationResultFactory.create(512,\n+ Constants.OBJECT_VALUE_NOT_PRIMITIVE_PROFILE,\n+ value!=null ? value.toString() : \"\",key);\nvalidationResultStack.pushValidationResult(error);\n- getConfigLogger().debug(getAccountId(), err);\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\n// Skip this property\ncontinue;\n}\n@@ -4537,17 +4528,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (countryCode == null || countryCode.isEmpty()) {\nString _value = (String) value;\nif (!_value.startsWith(\"+\")) {\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(512);\n- final String err = \"Device country code not available and profile phone: \" + value + \" does not appear to start with country code\";\n- error.setErrorDesc(err);\n+ ValidationResult error = ValidationResultFactory.create(512,Constants.INVALID_COUNTRY_CODE,_value);\nvalidationResultStack.pushValidationResult(error);\n- getConfigLogger().debug(getAccountId(), err);\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\n}\n}\ngetConfigLogger().verbose(getAccountId(), \"Profile phone is: \" + value + \" device country code is: \" + ((countryCode != null) ? countryCode : \"null\"));\n} catch (Exception e) {\n- validationResultStack.pushValidationResult(new ValidationResult(512, \"Invalid phone number\"));\n+ validationResultStack.pushValidationResult(ValidationResultFactory.create(512,Constants.INVALID_PHONE));\ngetConfigLogger().debug(getAccountId(), \"Invalid phone number: \" + e.getLocalizedMessage());\ncontinue;\n}\n@@ -4676,11 +4664,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nkey = vr.getObject().toString();\nif (key.isEmpty()) {\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(512);\n- error.setErrorDesc(\"Key is empty, profile removeValueForKey aborted.\");\n+ ValidationResult error = ValidationResultFactory.create(512,Constants.KEY_EMPTY);\nvalidationResultStack.pushValidationResult(error);\n- getConfigLogger().debug(getAccountId(), \"Key is empty, profile removeValueForKey aborted\");\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\n// Abort\nreturn;\n}\n@@ -5115,10 +5101,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (items.size() > 50) {\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(522);\n- error.setErrorDesc(\"Charged event contained more than 50 items.\");\n- getConfigLogger().debug(getAccountId(), \"Charged event contained more than 50 items.\");\n+ ValidationResult error = ValidationResultFactory.create(522);\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\nvalidationResultStack.pushValidationResult(error);\n}\n@@ -5138,12 +5122,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nvr = validator.cleanObjectValue(value, Validator.ValidationContext.Event);\n} catch (IllegalArgumentException e) {\n// The object was neither a String, Boolean, or any number primitives\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(511);\n- final String err = \"For event Charged: Property value for property \" + key + \" wasn't a primitive (\" + value + \")\";\n- error.setErrorDesc(err);\n+ ValidationResult error = ValidationResultFactory.create(511,\n+ Constants.PROP_VALUE_NOT_PRIMITIVE,\"Charged\",key,value != null ? value.toString() : \"\");\nvalidationResultStack.pushValidationResult(error);\n- getConfigLogger().debug(getAccountId(), err);\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\n// Skip this property\ncontinue;\n}\n@@ -5170,12 +5152,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nvr = validator.cleanObjectValue(value, Validator.ValidationContext.Event);\n} catch (IllegalArgumentException e) {\n// The object was neither a String, Boolean, or any number primitives\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(511);\n- final String err = \"An item's object value for key \" + key + \" wasn't a primitive (\" + value + \")\";\n- error.setErrorDesc(err);\n- getConfigLogger().debug(getAccountId(), err);\n-\n+ ValidationResult error = ValidationResultFactory.create(511,Constants.OBJECT_VALUE_NOT_PRIMITIVE,key,value != null ? value.toString() : \"\");\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\nvalidationResultStack.pushValidationResult(error);\n// Skip this property\ncontinue;\n@@ -5252,11 +5230,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nvr = validator.cleanObjectValue(value, Validator.ValidationContext.Event);\n} catch (IllegalArgumentException e) {\n// The object was neither a String, Boolean, or any number primitives\n- ValidationResult error = new ValidationResult();\n- error.setErrorCode(512);\n- final String err = \"For event \\\"\" + eventName + \"\\\": Property value for property \" + key + \" wasn't a primitive (\" + value + \")\";\n- error.setErrorDesc(err);\n- getConfigLogger().debug(getAccountId(), err);\n+ ValidationResult error = ValidationResultFactory.create(512,Constants.PROP_VALUE_NOT_PRIMITIVE,eventName,key,value != null ? value.toString() : \"\");\n+ getConfigLogger().debug(getAccountId(), error.getErrorDesc());\nvalidationResultStack.pushValidationResult(error);\n// Skip this record\ncontinue;\n@@ -5865,15 +5840,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nboolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\n- String channelIdError = null;\n+ int messageCode = -1;\n+ String value =\"\";\n+\nif (channelId.isEmpty()) {\n- channelIdError = \"Unable to render notification, channelId is required but not provided in the notification payload: \" + extras.toString();\n+ messageCode = Constants.CHANNEL_ID_MISSING_IN_PAYLOAD;\n+ value = extras.toString();\n} else if (notificationManager.getNotificationChannel(channelId) == null) {\n- channelIdError = \"Unable to render notification, channelId: \" + channelId + \" not registered by the app.\";\n+ messageCode = Constants.CHANNEL_ID_NOT_REGISTERED;\n+ value = channelId;\n}\n- if (channelIdError != null) {\n- getConfigLogger().debug(getAccountId(), channelIdError);\n- validationResultStack.pushValidationResult(new ValidationResult(512, channelIdError));\n+ if (messageCode != -1) {\n+ ValidationResult channelIdError = ValidationResultFactory.create(512, messageCode, value);\n+ getConfigLogger().debug(getAccountId(), channelIdError.getErrorDesc());\n+ validationResultStack.pushValidationResult(channelIdError);\nreturn;\n}\n}\n@@ -6165,9 +6145,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nboolean notificationViewedEnabled = \"true\".equals(extras.getString(Constants.WZRK_RNV, \"\"));\nif (!notificationViewedEnabled) {\n- String notificationViewedError = \"Recording of Notification Viewed is disabled in the CleverTap Dashboard for notification payload: \" + extras.toString();\n- getConfigLogger().debug(notificationViewedError);\n- validationResultStack.pushValidationResult(new ValidationResult(512, notificationViewedError));\n+ ValidationResult notificationViewedError = ValidationResultFactory.create(512, Constants.NOTIFICATION_VIEWED_DISABLED, extras.toString());\n+ getConfigLogger().debug(notificationViewedError.getErrorDesc());\n+ validationResultStack.pushValidationResult(notificationViewedError);\nreturn;\n}\npushNotificationViewedEvent(extras);\n@@ -8071,9 +8051,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@SuppressWarnings(\"unused\")\npublic void pushGeoFenceError(int errorCode, String errorMessage){\n- ValidationResult validationResult = new ValidationResult();\n- validationResult.setErrorCode(errorCode);\n- validationResult.setErrorDesc(errorMessage);\n+ ValidationResult validationResult = new ValidationResult(errorCode,errorMessage);\nvalidationResultStack.pushValidationResult(validationResult);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -238,4 +238,31 @@ public interface Constants {\nint FETCH_TYPE_FF = 1;\nString LOG_TAG_GEOFENCES = \"Geofences : \";\n+\n+ // error message codes\n+ int INVALID_MULTI_VALUE = 1;\n+ int PUSH_KEY_EMPTY = 2;\n+ int OBJECT_VALUE_NOT_PRIMITIVE_PROFILE = 3;\n+ int INVALID_COUNTRY_CODE = 4;\n+ int INVALID_PHONE = 5;\n+ int KEY_EMPTY = 6;\n+ int PROP_VALUE_NOT_PRIMITIVE = 7;\n+ int CHANNEL_ID_MISSING_IN_PAYLOAD = 8;\n+ int CHANNEL_ID_NOT_REGISTERED = 9;\n+ int NOTIFICATION_VIEWED_DISABLED = 10;\n+ int VALUE_CHARS_LIMIT_EXCEEDED = 11;\n+ int MULTI_VALUE_CHARS_LIMIT_EXCEEDED = 12;\n+ int INVALID_PROFILE_PROP_ARRAY_COUNT = 13;\n+ int EVENT_NAME_NULL = 14;\n+ int OBJECT_VALUE_NOT_PRIMITIVE = 15;\n+ int RESTRICTED_EVENT_NAME = 16;\n+ int DISCARDED_EVENT_NAME = 17;\n+ int USE_CUSTOM_ID_FALLBACK = 18;\n+ int USE_CUSTOM_ID_MISSING_IN_MANIFEST = 19;\n+ int UNABLE_TO_SET_CT_CUSTOM_ID = 20;\n+ int INVALID_CT_CUSTOM_ID = 21;\n+ int INVALID_MULTI_VALUE_KEY = 23;\n+ int RESTRICTED_MULTI_VALUE_KEY = 24;\n+\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -93,13 +93,13 @@ class DeviceInfo {\n//Show logging as per Manifest flag\nif(config.getEnableCustomCleverTapId()){\nif(cleverTapID == null){\n- config.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n- recordDeviceError(\"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\");\n+ String error = recordDeviceError(Constants.USE_CUSTOM_ID_FALLBACK);\n+ config.getLogger().info(error);\n}\n}else{\nif(cleverTapID != null){\n- config.getLogger().info(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n- recordDeviceError(\"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\");\n+ String error = recordDeviceError(Constants.USE_CUSTOM_ID_MISSING_IN_MANIFEST);\n+ config.getLogger().info(error);\n}\n}\n@@ -107,8 +107,8 @@ class DeviceInfo {\nif(deviceID != null && deviceID.trim().length() > 2){\ngetConfigLogger().verbose(config.getAccountId(),\"CleverTap ID already present for profile\");\nif(cleverTapID != null) {\n- getConfigLogger().info(config.getAccountId(),\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n- recordDeviceError(\"CleverTap ID - \"+deviceID+\" already exists. Unable to set custom CleverTap ID - \" + cleverTapID);\n+ String error = recordDeviceError(Constants.UNABLE_TO_SET_CT_CUSTOM_ID, deviceID, cleverTapID);\n+ getConfigLogger().info(config.getAccountId(),error);\n}\nreturn;\n}\n@@ -143,16 +143,15 @@ class DeviceInfo {\n}else {\nsetOrGenerateFallbackDeviceID();\nremoveDeviceID();\n- getConfigLogger().info(config.getAccountId(),\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n- recordDeviceError(\"Attempted to set invalid custom CleverTap ID - \"+cleverTapID+\", falling back to default error CleverTap ID - \"+getFallBackDeviceID());\n+ String error = recordDeviceError(Constants.INVALID_CT_CUSTOM_ID, cleverTapID, getFallBackDeviceID());\n+ getConfigLogger().info(config.getAccountId(),error);\n}\n}\n- private void recordDeviceError(String errorDescription){\n- ValidationResult validationResult = new ValidationResult();\n- validationResult.setErrorCode(514);\n- validationResult.setErrorDesc(errorDescription);\n+ private String recordDeviceError(int messageCode,String ...varargs){\n+ ValidationResult validationResult = ValidationResultFactory.create(514,messageCode,varargs);\nvalidationResults.add(validationResult);\n+ return validationResult.getErrorDesc();\n}\nboolean isErrorDeviceId(){\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ValidationResultFactory.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+/**\n+ * Groups all error messages in one place\n+ */\n+class ValidationResultFactory {\n+\n+ /**\n+ * Returns error object containing error code and message based on given parameters\n+ *\n+ * @param errorCode error code\n+ * @param messageCode message code belonging to error code\n+ * @param values values to add in error message\n+ * @return instance of {@link ValidationResult}\n+ */\n+ static ValidationResult create(int errorCode, int messageCode, String... values) {\n+ ValidationResult error = new ValidationResult();\n+ error.setErrorCode(errorCode);\n+ String msg = \"\";\n+\n+ try {\n+ switch (errorCode) {\n+ case 512:\n+ switch (messageCode) {\n+ case Constants.INVALID_MULTI_VALUE:\n+ msg = \"Invalid multi value for key \" + values[0] + \", profile multi value operation aborted.\";\n+ break;\n+ case Constants.PUSH_KEY_EMPTY:\n+ msg = \"Profile push key is empty\";\n+ break;\n+ case Constants.OBJECT_VALUE_NOT_PRIMITIVE_PROFILE:\n+ msg = \"Object value wasn't a primitive (\" + values[0] + \") for profile field \" + values[1];\n+ break;\n+ case Constants.INVALID_COUNTRY_CODE:\n+ msg = \"Device country code not available and profile phone: \" + values[0] + \" does not appear to start with country code\";\n+ break;\n+ case Constants.INVALID_PHONE:\n+ msg = \"Invalid phone number\";\n+ break;\n+ case Constants.KEY_EMPTY:\n+ msg = \"Key is empty, profile removeValueForKey aborted.\";\n+ break;\n+ case Constants.PROP_VALUE_NOT_PRIMITIVE:\n+ msg = \"For event \\\"\" + values[0] + \"\\\": Property value for property \" + values[1] + \" wasn't a primitive (\" + values[2] + \")\";\n+ break;\n+ case Constants.CHANNEL_ID_MISSING_IN_PAYLOAD:\n+ msg = \"Unable to render notification, channelId is required but not provided in the notification payload: \" + values[0];\n+ break;\n+ case Constants.CHANNEL_ID_NOT_REGISTERED:\n+ msg = \"Unable to render notification, channelId: \" + values[0] + \" not registered by the app.\";\n+ break;\n+ case Constants.NOTIFICATION_VIEWED_DISABLED:\n+ msg = \"Recording of Notification Viewed is disabled in the CleverTap Dashboard for notification payload: \" + values[0];\n+ break;\n+ }\n+ break;\n+ case 521:\n+ switch (messageCode) {\n+ case Constants.VALUE_CHARS_LIMIT_EXCEEDED:\n+ msg = values[0] + \"... exceeds the limit of \" + values[1] + \" characters. Trimmed\";\n+ break;\n+ case Constants.MULTI_VALUE_CHARS_LIMIT_EXCEEDED:\n+ msg = \"Multi value property for key \" + values[0] + \" exceeds the limit of \" + values[1] + \" items. Trimmed\";\n+ break;\n+ case Constants.INVALID_PROFILE_PROP_ARRAY_COUNT:\n+ msg = \"Invalid user profile property array count - \" + values[0] + \" max is - \" + values[1];\n+ break;\n+ }\n+ break;\n+ case 520:\n+ case 510:\n+ switch (messageCode) {\n+ case Constants.VALUE_CHARS_LIMIT_EXCEEDED:\n+ msg = values[0] + \"... exceeds the limit of \" + values[1] + \" characters. Trimmed\";\n+ break;\n+ case Constants.EVENT_NAME_NULL:\n+ msg = \"Event Name is null\";\n+ break;\n+ }\n+ break;\n+ case 511:\n+ switch (messageCode) {\n+ case Constants.PROP_VALUE_NOT_PRIMITIVE:\n+ msg = \"For event \" + values[0] + \": Property value for property \" + values[1] + \" wasn't a primitive (\" + values[2] + \")\";\n+ break;\n+ case Constants.OBJECT_VALUE_NOT_PRIMITIVE:\n+ msg = \"An item's object value for key \" + values[0] + \" wasn't a primitive (\" + values[1] + \")\";\n+ break;\n+ }\n+ break;\n+ case 513:\n+ switch (messageCode) {\n+ case Constants.RESTRICTED_EVENT_NAME:\n+ msg = values[0] + \" is a restricted event name. Last event aborted.\";\n+ break;\n+ case Constants.DISCARDED_EVENT_NAME:\n+ msg = values[0] + \" is a discarded event name. Last event aborted.\";\n+ break;\n+ }\n+ break;\n+ case 514:\n+ switch (messageCode) {\n+ case Constants.USE_CUSTOM_ID_FALLBACK:\n+ msg = \"CLEVERTAP_USE_CUSTOM_ID has been specified in the AndroidManifest.xml/Instance Configuration. CleverTap SDK will create a fallback device ID\";\n+ break;\n+ case Constants.USE_CUSTOM_ID_MISSING_IN_MANIFEST:\n+ msg = \"CLEVERTAP_USE_CUSTOM_ID has not been specified in the AndroidManifest.xml. Custom CleverTap ID passed will not be used.\";\n+ break;\n+ case Constants.UNABLE_TO_SET_CT_CUSTOM_ID:\n+ msg = \"CleverTap ID - \" + values[0] + \" already exists. Unable to set custom CleverTap ID - \" + values[1];\n+ break;\n+ case Constants.INVALID_CT_CUSTOM_ID:\n+ msg = \"Attempted to set invalid custom CleverTap ID - \" + values[0] + \", falling back to default error CleverTap ID - \" + values[1];\n+ break;\n+ }\n+ break;\n+ case 522:\n+ msg = \"Charged event contained more than 50 items.\";\n+ break;\n+ case 523:\n+ switch (messageCode) {\n+ case Constants.INVALID_MULTI_VALUE_KEY:\n+ msg = \"Invalid multi-value property key \" + values[0];\n+ break;\n+ case Constants.RESTRICTED_MULTI_VALUE_KEY:\n+ msg = values[0] + \"... is a restricted key for multi-value properties. Operation aborted.\";\n+ break;\n+ }\n+ break;\n+ }\n+ } catch (Exception e) {\n+ msg = \"\";\n+ }\n+\n+ error.setErrorDesc(msg);\n+ return error;\n+ }\n+\n+ @SuppressWarnings(\"SameParameterValue\")\n+ static ValidationResult create(int errorCode) {\n+ return create(errorCode, -1);\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"diff": "@@ -68,8 +68,9 @@ final class Validator {\nif (name.length() > Constants.MAX_VALUE_LENGTH) {\nname = name.substring(0, Constants.MAX_VALUE_LENGTH-1);\n- vr.setErrorDesc(name.trim() + \"... exceeds the limit of \"+ Constants.MAX_VALUE_LENGTH +\" characters. Trimmed\");\n- vr.setErrorCode(510);\n+ ValidationResult error = ValidationResultFactory.create(510, Constants.VALUE_CHARS_LIMIT_EXCEEDED, name.trim(), Constants.MAX_VALUE_LENGTH + \"\");\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\n}\nvr.setObject(name.trim());\n@@ -92,8 +93,9 @@ final class Validator {\nif (name.length() > Constants.MAX_KEY_LENGTH) {\nname = name.substring(0, Constants.MAX_KEY_LENGTH-1);\n- vr.setErrorDesc(name.trim() + \"... exceeds the limit of \"+ Constants.MAX_KEY_LENGTH + \" characters. Trimmed\");\n- vr.setErrorCode(520);\n+ ValidationResult error = ValidationResultFactory.create(520, Constants.VALUE_CHARS_LIMIT_EXCEEDED, name.trim(), Constants.MAX_KEY_LENGTH + \"\");\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\n}\nvr.setObject(name.trim());\n@@ -122,8 +124,9 @@ final class Validator {\nRestrictedMultiValueFields rf = RestrictedMultiValueFields.valueOf(name);\n//noinspection ConstantConditions\nif (rf != null) {\n- vr.setErrorDesc(name + \"... is a restricted key for multi-value properties. Operation aborted.\");\n- vr.setErrorCode(523);\n+ ValidationResult error = ValidationResultFactory.create(523, Constants.RESTRICTED_MULTI_VALUE_KEY, name);\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\nvr.setObject(null);\n}\n} catch (Throwable t) {\n@@ -158,8 +161,9 @@ final class Validator {\ntry {\nif (value.length() > Constants.MAX_MULTI_VALUE_LENGTH) {\nvalue = value.substring(0, Constants.MAX_MULTI_VALUE_LENGTH-1);\n- vr.setErrorDesc(value + \"... exceeds the limit of \" + Constants.MAX_MULTI_VALUE_LENGTH + \" chars. Trimmed\");\n- vr.setErrorCode(521);\n+ ValidationResult error = ValidationResultFactory.create(521, Constants.VALUE_CHARS_LIMIT_EXCEEDED, value, Constants.MAX_MULTI_VALUE_LENGTH + \"\");\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\n}\n} catch (Exception ignore) {\n// We really shouldn't get here\n@@ -228,8 +232,9 @@ final class Validator {\ntry {\nif (value.length() > Constants.MAX_VALUE_LENGTH) {\nvalue = value.substring(0, Constants.MAX_VALUE_LENGTH-1);\n- vr.setErrorDesc(value.trim() + \"... exceeds the limit of \"+ Constants.MAX_VALUE_LENGTH+\" chars. Trimmed\");\n- vr.setErrorCode(521);\n+ ValidationResult error = ValidationResultFactory.create(521, Constants.VALUE_CHARS_LIMIT_EXCEEDED, value.trim(), Constants.MAX_VALUE_LENGTH + \"\");\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\n}\n} catch (Exception ignore) {\n// We really shouldn't get here\n@@ -282,8 +287,9 @@ final class Validator {\n}\nvr.setObject(jsonObject);\n}else{\n- vr.setErrorDesc(\"Invalid user profile property array count - \"+ values.length +\" max is - \"+ Constants.MAX_MULTI_VALUE_ARRAY_LENGTH);\n- vr.setErrorCode(521);\n+ ValidationResult error = ValidationResultFactory.create(521, Constants.INVALID_PROFILE_PROP_ARRAY_COUNT, values.length+\"\", Constants.MAX_MULTI_VALUE_ARRAY_LENGTH + \"\");\n+ vr.setErrorDesc(error.getErrorDesc());\n+ vr.setErrorCode(error.getErrorCode());\n}\nreturn vr;\n} else {\n@@ -301,17 +307,18 @@ final class Validator {\nValidationResult isRestrictedEventName(String name) {\nValidationResult error = new ValidationResult();\nif (name == null) {\n- error.setErrorCode(510);\n- error.setErrorDesc(\"Event Name is null\");\n+ ValidationResult vr = ValidationResultFactory.create(510, Constants.EVENT_NAME_NULL);\n+ error.setErrorCode(vr.getErrorCode());\n+ error.setErrorDesc(vr.getErrorDesc());\nreturn error;\n}\nfor (String x : restrictedNames)\nif (name.equalsIgnoreCase(x)) {\n// The event name is restricted\n-\n- error.setErrorCode(513);\n- error.setErrorDesc(name + \" is a restricted event name. Last event aborted.\");\n- Logger.v(name + \" is a restricted system event name. Last event aborted.\");\n+ ValidationResult vr = ValidationResultFactory.create(513, Constants.RESTRICTED_EVENT_NAME,name);\n+ error.setErrorCode(vr.getErrorCode());\n+ error.setErrorDesc(vr.getErrorDesc());\n+ Logger.v(vr.getErrorDesc());\nreturn error;\n}\nreturn error;\n@@ -327,16 +334,18 @@ final class Validator {\nValidationResult isEventDiscarded(String name) {\nValidationResult error = new ValidationResult();\nif (name == null) {\n- error.setErrorCode(510);\n- error.setErrorDesc(\"Event Name is null\");\n+ ValidationResult vr = ValidationResultFactory.create(510, Constants.EVENT_NAME_NULL);\n+ error.setErrorCode(vr.getErrorCode());\n+ error.setErrorDesc(vr.getErrorDesc());\nreturn error;\n}\nif(getDiscardedEvents() != null) {\nfor (String x : getDiscardedEvents())\nif (name.equalsIgnoreCase(x)) {\n// The event name is discarded\n- error.setErrorCode(513);\n- error.setErrorDesc(name + \" is a discarded event name. Last event aborted.\");\n+ ValidationResult vr = ValidationResultFactory.create(513, Constants.DISCARDED_EVENT_NAME,name);\n+ error.setErrorCode(vr.getErrorCode());\n+ error.setErrorDesc(vr.getErrorDesc());\nLogger.d(name + \" s a discarded event name as per CleverTap. Dropping event at SDK level. Check discarded events in CleverTap Dashboard settings.\");\nreturn error;\n}\n@@ -423,8 +432,9 @@ final class Validator {\n// check to see if the list got trimmed in the merge\nif (ridx > 0 || lidx > 0) {\n- vr.setErrorDesc(\"Multi value property for key \" + key + \" exceeds the limit of \" + maxValNum + \" items. Trimmed\");\n- vr.setErrorCode(521);\n+ ValidationResult error = ValidationResultFactory.create(521, Constants.MULTI_VALUE_CHARS_LIMIT_EXCEEDED,key,maxValNum+\"\");\n+ vr.setErrorCode(error.getErrorCode());\n+ vr.setErrorDesc(error.getErrorDesc());\n}\nvr.setObject(mergedList);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor: move error codes and messages to factory SDK-398 |
116,623 | 14.09.2020 18:57:28 | -19,080 | 25796196036fcfdc161cc4af10a5f1d62cb183da | task(InApp): Added TTL to handle stale InApps | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"diff": "@@ -60,6 +60,7 @@ class CTInAppNotification implements Parcelable {\nprivate boolean isLandscape;\nprivate String landscapeImageUrl;\nprivate String _landscapeImageCacheKey;\n+ private long timeToLive;\nCTInAppNotification(){}\n@@ -100,6 +101,7 @@ class CTInAppNotification implements Parcelable {\nthis.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\nthis.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\nthis.jsEnabled = jsonObject.has(Constants.INAPP_JS_ENABLED) && jsonObject.getBoolean(Constants.INAPP_JS_ENABLED);\n+ this.timeToLive = jsonObject.has(Constants.WZRK_TIME_TO_LIVE) ? jsonObject.getLong(Constants.WZRK_TIME_TO_LIVE) : System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\nJSONObject data = jsonObject.has(Constants.INAPP_DATA_TAG) ? jsonObject.getJSONObject(Constants.INAPP_DATA_TAG) : null;\nif (data != null) {\n@@ -154,6 +156,7 @@ class CTInAppNotification implements Parcelable {\nthis.backgroundColor = jsonObject.has(Constants.KEY_BG) ? jsonObject.getString(Constants.KEY_BG) : Constants.WHITE;\nthis.isPortrait = !jsonObject.has(Constants.KEY_PORTRAIT) || jsonObject.getBoolean(Constants.KEY_PORTRAIT);\nthis.isLandscape = jsonObject.has(Constants.KEY_LANDSCAPE) && jsonObject.getBoolean(Constants.KEY_LANDSCAPE);\n+ this.timeToLive = jsonObject.has(Constants.WZRK_TIME_TO_LIVE) ? jsonObject.getLong(Constants.WZRK_TIME_TO_LIVE) : System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\nJSONObject titleObject = jsonObject.has(Constants.KEY_TITLE) ? jsonObject.getJSONObject(Constants.KEY_TITLE) : null;\nif(titleObject != null) {\nthis.title = titleObject.has(Constants.KEY_TEXT) ? titleObject.getString(Constants.KEY_TEXT) : \"\";\n@@ -491,6 +494,10 @@ class CTInAppNotification implements Parcelable {\nreturn jsEnabled;\n}\n+ public long getTimeToLive() {\n+ return timeToLive;\n+ }\n+\nBitmap getImage(CTInAppNotificationMedia inAppMedia) {\nreturn ImageCache.getBitmap(inAppMedia.getCacheKey());\n}\n@@ -592,6 +599,7 @@ class CTInAppNotification implements Parcelable {\nisLandscape = in.readByte() != 0x00;\nlandscapeImageUrl = in.readString();\n_landscapeImageCacheKey = in.readString();\n+ timeToLive = in.readLong();\n}catch (JSONException e){\n// no-op\n@@ -656,6 +664,7 @@ class CTInAppNotification implements Parcelable {\ndest.writeByte((byte) (isLandscape ? 0x01 : 0x00));\ndest.writeString(landscapeImageUrl);\ndest.writeString(_landscapeImageCacheKey);\n+ dest.writeLong(timeToLive);\n}\n@SuppressWarnings(\"unused\")\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -713,6 +713,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n+ if(inAppNotification.getTimeToLive() > System.currentTimeMillis()){\n+ Logger.d(\"InApp has elapsed its time to live, not showing the InApp\");\n+ return;\n+ }\n+\ncurrentlyDisplayingInApp = inAppNotification;\nCTInAppBaseFragment inAppFragment = null;\n@@ -1812,7 +1817,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void checkExistingInAppNotifications(Activity activity) {\nfinal boolean canShow = canShowInAppOnActivity();\nif (canShow) {\n- if (currentlyDisplayingInApp != null) {\n+ if (currentlyDisplayingInApp != null && currentlyDisplayingInApp.getTimeToLive() > System.currentTimeMillis()) {\nFragment inAppFragment = activity.getFragmentManager().getFragment(new Bundle(), currentlyDisplayingInApp.getType());\nif (getCurrentActivity() != null && inAppFragment!=null) {\nFragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager().beginTransaction();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -124,6 +124,7 @@ public interface Constants {\nint PING_FREQUENCY_VALUE = 240;\nString PING_FREQUENCY = \"pf\";\nlong ONE_MIN_IN_MILLIS = 60 * 1000L;\n+ long ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L;\nString COPY_TYPE = \"copy\";\nString DND_START = \"22:00\";\nString DND_STOP = \"06:00\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ImageCache.java",
"diff": "@@ -15,7 +15,7 @@ import java.security.MessageDigest;\nimport java.security.NoSuchAlgorithmException;\npublic class ImageCache {\n- private static final int MIN_CACHE_SIZE = 1024 * 10; // 10mb minimum (in KB)\n+ private static final int MIN_CACHE_SIZE = 1024 * 20; // 20mb minimum (in KB)\nprivate final static int maxMemory = (int) (Runtime.getRuntime().maxMemory())/1024;\nprivate final static int cacheSize = Math.max((maxMemory / 32), MIN_CACHE_SIZE);\nprivate static final int MAX_BITMAP_SIZE = 10000000; // 10 MB\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(InApp): Added TTL to handle stale InApps SDK-402 |
116,623 | 16.09.2020 15:51:42 | -19,080 | d2620a5f41b5808ca38bc744cfb8e351a464998f | fix: Handle Security Exception in getNetworkType for Android 11 devices | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.9.1', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.9.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.9.1.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.9.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.9.1 (September 17, 2020)\n+* Handled Security Exception on `getNetworkType` for Android 11 devices\n+\n### Version 3.9.0 (August 31, 2020)\n* Adds support for CleverTap Geofence SDK\n* Fixed all InApp related bugs and crashes\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.9.1'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.9.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.9.1', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.9.1'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.9.0'\n+ libraryVersion = '3.9.1'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.1.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.9.1.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30900\"\n- android:versionName=\"3.9.0\">\n+ android:versionCode=\"30901\"\n+ android:versionName=\"3.9.1\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -610,11 +610,13 @@ class DeviceInfo {\n}\nprivate String getNetworkType() {\n+ try{\nTelephonyManager mTelephonyManager = (TelephonyManager)\ncontext.getSystemService(Context.TELEPHONY_SERVICE);\nif (mTelephonyManager == null) {\nreturn null;\n}\n+\nint networkType = mTelephonyManager.getNetworkType();\nswitch (networkType) {\ncase TelephonyManager.NETWORK_TYPE_GPRS:\n@@ -638,6 +640,10 @@ class DeviceInfo {\ndefault:\nreturn null;\n}\n+ }catch (SecurityException se){\n+ Logger.d(\"Caught Security Exception, returning Network Type as NULL\");\n+ return null;\n+ }\n}\nprivate String getBluetoothVersion() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Handle Security Exception in getNetworkType for Android 11 devices SDK-411 |
116,623 | 16.09.2020 16:24:19 | -19,080 | 1d25c36ddefb5969f77b8cc4f3f3131c0ab977a0 | fix: Fixes and final solution for handling network type in DeviceInfo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "@@ -17,7 +17,10 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n}\nboolean isTablet(){\n- WindowManager wm = (WindowManager) getActivity().getBaseContext().getSystemService(Context.WINDOW_SERVICE);\n+ if(Utils.isActivityDead(getActivity())){\n+ return false;\n+ }\n+ WindowManager wm = (WindowManager) parent.getBaseContext().getSystemService(Context.WINDOW_SERVICE);\nif (wm == null) {\nLogger.v(\"Screen size is null \");\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -122,7 +122,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\nprivate static int activityCount = 0;\nprivate final ValidationResultStack validationResultStack;\nprivate String currentScreenName = \"\";\n- private static ArrayList<CTInAppNotification> pendingNotifications = new ArrayList<>();\n+ private static List<CTInAppNotification> pendingNotifications = Collections.synchronizedList(new ArrayList<CTInAppNotification>());\nprivate Runnable pendingInappRunnable = null;\nprivate static CTInAppNotification currentlyDisplayingInApp = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -509,14 +509,30 @@ class DeviceInfo {\nreturn 0;\n}\n+ @SuppressLint(\"MissingPermission\")\nprivate String getNetworkType() {\n- try {\nTelephonyManager mTelephonyManager = (TelephonyManager)\ncontext.getSystemService(Context.TELEPHONY_SERVICE);\nif (mTelephonyManager == null) {\nreturn null;\n}\n- int networkType = mTelephonyManager.getNetworkType();\n+\n+ int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n+\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n+ if(testPermission(context,\"android.permission.READ_PHONE_STATE\")){\n+ try {\n+ networkType = mTelephonyManager.getDataNetworkType();\n+ }catch (SecurityException se){\n+ Logger.d(\"Security Exception caught while fetch network type\" + se.getMessage());\n+ }\n+ }else{\n+ Logger.d(\"READ_PHONE_STATE permission not asked by the app or not granted by the user\");\n+ }\n+ }else{\n+ networkType = mTelephonyManager.getNetworkType();\n+ }\n+\nswitch (networkType) {\ncase TelephonyManager.NETWORK_TYPE_GPRS:\ncase TelephonyManager.NETWORK_TYPE_EDGE:\n@@ -539,10 +555,6 @@ class DeviceInfo {\ndefault:\nreturn null;\n}\n- }catch (SecurityException e){\n- Logger.d(\"Caught Security Exception, returning Network Type as NULL\");\n- return null;\n- }\n}\nprivate String getBluetoothVersion() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Fixes #93, #94 and final solution for handling network type in DeviceInfo SDK-353 SDK-354 |
116,621 | 16.09.2020 22:01:51 | -19,080 | 4333fa84ad88596bbf80ecce91be15c9d62af446 | feat(notification): Added custom support for Push providers | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -32,16 +32,28 @@ public interface PushConstants {\n@NonNull\nString ADM_DELIVERY_TYPE = \"adm\";\n- @StringDef({FIREBASE_CLASS_NAME, XIAOMI_CLASS_NAME, BAIDU_CLASS_NAME, HUAWEI_CLASS_NAME, ADM_CLASS_NAME})\n+ @StringDef({CT_FIREBASE_PROVIDER_CLASS, CT_XIAOMI_PROVIDER_CLASS, CT_BAIDU_PROVIDER_CLASS, CT_HUAWEI_PROVIDER_CLASS, CT_ADM_PROVIDER_CLASS})\n@Retention(RetentionPolicy.SOURCE)\n- @interface DeliveryClassName {\n+ @interface CTPushProviderClass {\n}\n- String FIREBASE_CLASS_NAME = \"com.clevertap.android.sdk.pushnotification.fcm.FcmPushProvider\";\n- String XIAOMI_CLASS_NAME = \"com.clevertap.android.xps.XiaomiPushProvider\";\n- String BAIDU_CLASS_NAME = \"com.clevertap.android.bps.BaiduPushProvider\";\n- String HUAWEI_CLASS_NAME = \"com.clevertap.android.hms.HmsPushProvider\";\n- String ADM_CLASS_NAME = \"com.clevertap.android.adm.AmazonPushProvider\";\n+ String CT_FIREBASE_PROVIDER_CLASS = \"com.clevertap.android.sdk.pushnotification.fcm.FcmPushProvider\";\n+ String CT_XIAOMI_PROVIDER_CLASS = \"com.clevertap.android.xps.XiaomiPushProvider\";\n+ String CT_BAIDU_PROVIDER_CLASS = \"com.clevertap.android.bps.BaiduPushProvider\";\n+ String CT_HUAWEI_PROVIDER_CLASS = \"com.clevertap.android.hms.HmsPushProvider\";\n+ String CT_ADM_PROVIDER_CLASS = \"com.clevertap.android.adm.AmazonPushProvider\";\n+\n+ @StringDef({FIREBASE_SDK_CLASS, XIAOMI_SDK_CLASS, BAIDU_SDK_CLASS, HUAWEI_SDK_CLASS, ADM_SDK_CLASS})\n+ @Retention(RetentionPolicy.SOURCE)\n+ @interface PushMessagingClass {\n+ }\n+\n+\n+ String FIREBASE_SDK_CLASS = \"com.google.firebase.messaging.FirebaseMessagingService\";\n+ String XIAOMI_SDK_CLASS = \"com.xiaomi.mipush.sdk.MiPushClient\";\n+ String BAIDU_SDK_CLASS = \"com.baidu.android.pushservice.PushMessageReceiver\";\n+ String HUAWEI_SDK_CLASS = \"com.huawei.hms.push.HmsMessageService\";\n+ String ADM_SDK_CLASS = \"com.amazon.device.messaging.ADM\";\nString FCM_PROPERTY_REG_ID = \"fcm_token\";\nString XPS_PROPERTY_REG_ID = \"xps_token\";\n@@ -55,11 +67,11 @@ public interface PushConstants {\n}\nenum PushType {\n- FCM(FCM_DELIVERY_TYPE, FCM_PROPERTY_REG_ID, FIREBASE_CLASS_NAME),\n- XPS(XIAOMI_DELIVERY_TYPE, XPS_PROPERTY_REG_ID, XIAOMI_CLASS_NAME),\n- HPS(HMS_DELIVERY_TYPE, HPS_PROPERTY_REG_ID, HUAWEI_CLASS_NAME),\n- BPS(BAIDU_DELIVERY_TYPE, BPS_PROPERTY_REG_ID, BAIDU_CLASS_NAME),\n- ADM(ADM_DELIVERY_TYPE, ADM_PROPERTY_REG_ID, ADM_CLASS_NAME);\n+ FCM(FCM_DELIVERY_TYPE, FCM_PROPERTY_REG_ID, CT_FIREBASE_PROVIDER_CLASS, FIREBASE_SDK_CLASS),\n+ XPS(XIAOMI_DELIVERY_TYPE, XPS_PROPERTY_REG_ID, CT_XIAOMI_PROVIDER_CLASS, XIAOMI_SDK_CLASS),\n+ HPS(HMS_DELIVERY_TYPE, HPS_PROPERTY_REG_ID, CT_HUAWEI_PROVIDER_CLASS, HUAWEI_SDK_CLASS),\n+ BPS(BAIDU_DELIVERY_TYPE, BPS_PROPERTY_REG_ID, CT_BAIDU_PROVIDER_CLASS, BAIDU_SDK_CLASS),\n+ ADM(ADM_DELIVERY_TYPE, ADM_PROPERTY_REG_ID, CT_ADM_PROVIDER_CLASS, ADM_SDK_CLASS);\nprivate static final ArrayList<String> ALL;\n@@ -69,11 +81,17 @@ public interface PushConstants {\nprivate final String type;\n- public String getClassName() {\n- return className;\n+ public String getCtProviderClassName() {\n+ return ctProviderClassName;\n+ }\n+\n+ private final String ctProviderClassName;\n+\n+ public String getMessagingSDKClassName() {\n+ return messagingSDKClassName;\n}\n- private final String className;\n+ private final String messagingSDKClassName;\npublic @RegKeyType\nString getTokenPrefKey() {\n@@ -82,10 +100,11 @@ public interface PushConstants {\nprivate final String tokenPrefKey;\n- PushType(@DeliveryType String type, @RegKeyType String prefKey, @DeliveryClassName String className) {\n+ PushType(@DeliveryType String type, @RegKeyType String prefKey, @CTPushProviderClass String className, @PushMessagingClass String messagingSDKClassName) {\nthis.type = type;\nthis.tokenPrefKey = prefKey;\n- this.className = className;\n+ this.ctProviderClassName = className;\n+ this.messagingSDKClassName = messagingSDKClassName;\n}\nstatic {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -21,8 +21,9 @@ import static com.clevertap.android.sdk.BuildConfig.VERSION_CODE;\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic class PushProviders implements CTPushProviderListener {\n-\n- private final ArrayList<CTPushProvider> availableProviders = new ArrayList<>();\n+ private final ArrayList<PushConstants.PushType> allEnabledPushTypes = new ArrayList<>();\n+ private final ArrayList<PushConstants.PushType> customEnabledPushTypes = new ArrayList<>();\n+ private final ArrayList<CTPushProvider> availableCTPushProviders = new ArrayList<>();\nprivate final CTApiPushListener ctApiPushListener;\nprivate PushProviders(CTApiPushListener ctApiPushListener) {\n@@ -45,8 +46,17 @@ public class PushProviders implements CTPushProviderListener {\n* Loads all the plugins that are currently supported by the device.\n*/\nprivate void init() {\n+\n+ findEnabledPushTypes();\n+\nList<CTPushProvider> providers = createProviders();\n+ findCTPushProviders(providers);\n+\n+ findCustomEnabledPushTypes();\n+ }\n+\n+ private void findCTPushProviders(List<CTPushProvider> providers) {\nif (providers.isEmpty()) {\nlog(\"No push providers found!. Make sure to install at least one push provider\");\nreturn;\n@@ -65,13 +75,33 @@ public class PushProviders implements CTPushProviderListener {\nif (provider.isAvailable()) {\nlog(\"Available Provider: \" + provider.getClass());\n- availableProviders.add(provider);\n+ availableCTPushProviders.add(provider);\n} else {\nlog(\"Unavailable Provider: \" + provider.getClass());\n}\n}\n}\n+ private void findCustomEnabledPushTypes() {\n+ customEnabledPushTypes.addAll(allEnabledPushTypes);\n+ for (final CTPushProvider pushProvider : availableCTPushProviders) {\n+ customEnabledPushTypes.remove(pushProvider.getPushType());\n+ }\n+ }\n+\n+ private void findEnabledPushTypes() {\n+ for (PushConstants.PushType pushType : config().getAllowedPushTypes()) {\n+ String className = pushType.getMessagingSDKClassName();\n+ try {\n+ Class.forName(className);\n+ allEnabledPushTypes.add(pushType);\n+ log(\"SDK Class Available :\" + className);\n+ } catch (Exception e) {\n+ log(\"SDK class Not available \" + className + \" Exception:\" + e.getClass().getName());\n+ }\n+ }\n+ }\n+\nprivate boolean isValid(CTPushProvider provider) {\nif (VERSION_CODE < provider.minSDKSupportVersionCode()) {\n@@ -111,21 +141,22 @@ public class PushProviders implements CTPushProviderListener {\nprivate List<CTPushProvider> createProviders() {\nList<CTPushProvider> providers = new ArrayList<>();\n- for (PushConstants.PushType pushType : config().getAllowedPushTypes()) {\n+ for (PushConstants.PushType pushType : allEnabledPushTypes) {\n+ String className = pushType.getCtProviderClassName();\nCTPushProvider pushProvider = null;\ntry {\n- Class<?> providerClass = Class.forName(pushType.getClassName());\n+ Class<?> providerClass = Class.forName(className);\npushProvider = (CTPushProvider) providerClass.newInstance();\npushProvider.setCTPushListener(this);\n- log(\"Found provider:\" + providerClass);\n+ log(\"Found provider:\" + className);\n} catch (InstantiationException e) {\n- log(\"Unable to create provider InstantiationException\" + pushType.getClassName());\n+ log(\"Unable to create provider InstantiationException\" + className);\n} catch (IllegalAccessException e) {\n- log(\"Unable to create provider IllegalAccessException\" + pushType.getClassName());\n+ log(\"Unable to create provider IllegalAccessException\" + className);\n} catch (ClassNotFoundException e) {\n- log(\"Unable to create provider ClassNotFoundException\" + pushType.getClassName());\n+ log(\"Unable to create provider ClassNotFoundException\" + className);\n} catch (Exception e) {\n- log(\"Unable to create provider Exception\" + pushType.getClassName(), e);\n+ log(\"Unable to create provider \" + className + \" Exception:\" + e.getClass().getName());\n}\nif (pushProvider == null) {\n@@ -141,16 +172,12 @@ public class PushProviders implements CTPushProviderListener {\n@NonNull\npublic ArrayList<PushConstants.PushType> getAvailablePushTypes() {\nArrayList<PushConstants.PushType> pushTypes = new ArrayList<>();\n- for (CTPushProvider pushProvider : availableProviders) {\n+ for (CTPushProvider pushProvider : availableCTPushProviders) {\npushTypes.add(pushProvider.getPushType());\n}\nreturn pushTypes;\n}\n- public ArrayList<CTPushProvider> availableProviders() {\n- return availableProviders;\n- }\n-\npublic boolean isNotificationSupported() {\nfor (PushConstants.PushType pushType : getAvailablePushTypes()) {\nif (getCachedToken(pushType) != null)\n@@ -259,7 +286,27 @@ public class PushProviders implements CTPushProviderListener {\nCTExecutors.getInstance().diskIO().execute(new Runnable() {\n@Override\npublic void run() {\n- for (final CTPushProvider pushProvider : availableProviders()) {\n+ // refresh tokens of Push Providers\n+ refreshCTProviderTokens();\n+\n+ // refresh tokens of custom Providers\n+ refreshCustomProviderTokens();\n+ }\n+ });\n+ }\n+\n+ private void refreshCustomProviderTokens() {\n+ for (PushConstants.PushType pushType : customEnabledPushTypes) {\n+ try {\n+ ctApiPushListener.pushDeviceTokenEvent(getCachedToken(pushType), true, pushType);\n+ } catch (Throwable t) {\n+ log(\"Token Refresh error \" + pushType, t);\n+ }\n+ }\n+ }\n+\n+ private void refreshCTProviderTokens() {\n+ for (final CTPushProvider pushProvider : availableCTPushProviders) {\ntry {\npushProvider.requestToken();\n} catch (Throwable t) {\n@@ -268,6 +315,4 @@ public class PushProviders implements CTPushProviderListener {\n}\n}\n}\n- });\n- }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(notification): Added custom support for Push providers
https://wizrocket.atlassian.net/browse/SDK-348 |
116,621 | 17.09.2020 20:35:56 | -19,080 | c6928f9dbf54562c7439b412ce2e756adb0abea5 | task(monorepo): Included Xiaomi & Huawei Module in monorep: | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/src/main/AndroidManifest.xml",
"new_path": "AndroidStarter/src/main/AndroidManifest.xml",
"diff": "</intent-filter>\n</activity>\n+ <meta-data\n+ android:name=\"com.google.android.gms.ads.APPLICATION_ID\"\n+ android:value=\"ca-app-pub-3940256099942544~3347511713\"/>\n+\n<!-- Add meta data for CleverTap Account Id and Account Token-->\n<meta-data\nandroid:name=\"CLEVERTAP_ACCOUNT_ID\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/build.gradle",
"new_path": "clevertap-core/build.gradle",
"diff": "@@ -4,7 +4,7 @@ buildscript {\njcenter()\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:4.0.0'\n+ classpath 'com.android.tools.build:gradle:4.0.1'\nclasspath 'com.github.dcendents:android-maven-gradle-plugin:2.1'\nclasspath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'\nclasspath 'com.google.gms:google-services:4.3.3'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/AndroidManifest.xml",
"new_path": "clevertap-core/src/main/AndroidManifest.xml",
"diff": "android:versionName=\"4.0.0\">\n<application>\n- <meta-data\n- android:name=\"com.google.android.gms.ads.APPLICATION_ID\"\n- android:value=\"ca-app-pub-3940256099942544~3347511713\"/>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(monorepo): Included Xiaomi & Huawei Module in monorep: SDK-355 |
116,623 | 21.09.2020 12:09:30 | -19,080 | 9007e413aaa9f725af505ffa3f15e5fb59ee1678 | Fix(InApp): Fixed TTL bug of comparing with millis rather than epoch | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"diff": "@@ -101,7 +101,7 @@ class CTInAppNotification implements Parcelable {\nthis.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\nthis.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\nthis.jsEnabled = jsonObject.has(Constants.INAPP_JS_ENABLED) && jsonObject.getBoolean(Constants.INAPP_JS_ENABLED);\n- this.timeToLive = jsonObject.has(Constants.WZRK_TIME_TO_LIVE) ? jsonObject.getLong(Constants.WZRK_TIME_TO_LIVE) : System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\n+ this.timeToLive = jsonObject.has(Constants.WZRK_TIME_TO_LIVE) ? jsonObject.getLong(Constants.WZRK_TIME_TO_LIVE) : (System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS)/1000;\nJSONObject data = jsonObject.has(Constants.INAPP_DATA_TAG) ? jsonObject.getJSONObject(Constants.INAPP_DATA_TAG) : null;\nif (data != null) {\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": "@@ -700,7 +700,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\nreturn;\n}\n- if(inAppNotification.getTimeToLive() > System.currentTimeMillis()){\n+ if((System.currentTimeMillis()/1000) > inAppNotification.getTimeToLive()){\nLogger.d(\"InApp has elapsed its time to live, not showing the InApp\");\nreturn;\n}\n@@ -1204,7 +1204,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\n//Push\nprivate void onTokenRefresh() {\n- pushProviders.refreshAllTokens();\n+ pushProviders.refreshAllTokens();//TODO can this be null here? null check + logs\n}\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n@@ -1800,7 +1800,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\nprivate void checkExistingInAppNotifications(Activity activity) {\nfinal boolean canShow = canShowInAppOnActivity();\nif (canShow) {\n- if (currentlyDisplayingInApp != null && currentlyDisplayingInApp.getTimeToLive() > System.currentTimeMillis()) {\n+ if (currentlyDisplayingInApp != null && (System.currentTimeMillis()/1000) > currentlyDisplayingInApp.getTimeToLive()) {\nFragment inAppFragment = activity.getFragmentManager().getFragment(new Bundle(), currentlyDisplayingInApp.getType());\nif (getCurrentActivity() != null && inAppFragment!=null) {\nFragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager().beginTransaction();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fix(InApp): Fixed TTL bug of comparing with millis rather than epoch SDK-402 |
116,621 | 21.09.2020 14:37:52 | -19,080 | 15d51ae03129351ff98ddb092111d362e161a837 | task(monorepo): renamed xiaomi & huawei artifact | [
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -7,7 +7,7 @@ android {\next{\nlibraryVersion = \"1.0.0\"\n- artifact = 'clevertap-hms'\n+ artifact = 'clevertap-huawei-sdk'\n}\ndefaultConfig {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -6,7 +6,7 @@ android {\next {\nlibraryVersion = \"1.0.0\"\n- artifact = 'clevertap-xps'\n+ artifact = 'clevertap-xiaomi-sdk'\n}\ndefaultConfig {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(monorepo): renamed xiaomi & huawei artifact |
116,623 | 21.09.2020 14:54:51 | -19,080 | 90dede4412354b8dce569af7f004aa3701eae932 | Fix(InApp): Fixed TTL logic on reshowing fragment | [
{
"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": "@@ -1800,7 +1800,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\nprivate void checkExistingInAppNotifications(Activity activity) {\nfinal boolean canShow = canShowInAppOnActivity();\nif (canShow) {\n- if (currentlyDisplayingInApp != null && (System.currentTimeMillis()/1000) > currentlyDisplayingInApp.getTimeToLive()) {\n+ if (currentlyDisplayingInApp != null && ((System.currentTimeMillis()/1000) < currentlyDisplayingInApp.getTimeToLive())) {\nFragment inAppFragment = activity.getFragmentManager().getFragment(new Bundle(), currentlyDisplayingInApp.getType());\nif (getCurrentActivity() != null && inAppFragment!=null) {\nFragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager().beginTransaction();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fix(InApp): Fixed TTL logic on reshowing fragment SDK-402 |
116,621 | 21.09.2020 15:38:22 | -19,080 | 9ba4fca0c62aef74870a4d613e52d861682c1612 | chore(monorepo): Removed TODO's | [
{
"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": "@@ -1204,7 +1204,7 @@ public class CleverTapAPI implements CleverTapAPIListener{\n//Push\nprivate void onTokenRefresh() {\n- pushProviders.refreshAllTokens();//TODO can this be null here? null check + logs\n+ pushProviders.refreshAllTokens();\n}\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\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": "@@ -79,7 +79,6 @@ public class HmsPushProvider implements CTPushProvider {\n@Override\npublic int minSDKSupportVersionCode() {\n- //TODO -discuss about the use case of this.\nreturn 30800;\n}\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": "@@ -83,7 +83,6 @@ public class XiaomiPushProvider implements CTPushProvider {\n@Override\npublic int minSDKSupportVersionCode() {\n- //TODO -discuss about the use case of this.\nreturn 30800;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(monorepo): Removed TODO's |
116,621 | 22.09.2020 19:45:40 | -19,080 | d0d259b11550f043fc0a5104bb7a9048779c66d1 | chore(test):added test cases | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-geofence/gradlew",
"diff": "+#!/usr/bin/env sh\n+\n+##############################################################################\n+##\n+## Gradle start up script for UN*X\n+##\n+##############################################################################\n+\n+# Attempt to set APP_HOME\n+# Resolve links: $0 may be a link\n+PRG=\"$0\"\n+# Need this for relative symlinks.\n+while [ -h \"$PRG\" ] ; do\n+ ls=`ls -ld \"$PRG\"`\n+ link=`expr \"$ls\" : '.*-> \\(.*\\)$'`\n+ if expr \"$link\" : '/.*' > /dev/null; then\n+ PRG=\"$link\"\n+ else\n+ PRG=`dirname \"$PRG\"`\"/$link\"\n+ fi\n+done\n+SAVED=\"`pwd`\"\n+cd \"`dirname \\\"$PRG\\\"`/\" >/dev/null\n+APP_HOME=\"`pwd -P`\"\n+cd \"$SAVED\" >/dev/null\n+\n+APP_NAME=\"Gradle\"\n+APP_BASE_NAME=`basename \"$0\"`\n+\n+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+DEFAULT_JVM_OPTS=\"\"\n+\n+# Use the maximum available, or set MAX_FD != -1 to use that value.\n+MAX_FD=\"maximum\"\n+\n+warn () {\n+ echo \"$*\"\n+}\n+\n+die () {\n+ echo\n+ echo \"$*\"\n+ echo\n+ exit 1\n+}\n+\n+# OS specific support (must be 'true' or 'false').\n+cygwin=false\n+msys=false\n+darwin=false\n+nonstop=false\n+case \"`uname`\" in\n+ CYGWIN* )\n+ cygwin=true\n+ ;;\n+ Darwin* )\n+ darwin=true\n+ ;;\n+ MINGW* )\n+ msys=true\n+ ;;\n+ NONSTOP* )\n+ nonstop=true\n+ ;;\n+esac\n+\n+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar\n+\n+# Determine the Java command to use to start the JVM.\n+if [ -n \"$JAVA_HOME\" ] ; then\n+ if [ -x \"$JAVA_HOME/jre/sh/java\" ] ; then\n+ # IBM's JDK on AIX uses strange locations for the executables\n+ JAVACMD=\"$JAVA_HOME/jre/sh/java\"\n+ else\n+ JAVACMD=\"$JAVA_HOME/bin/java\"\n+ fi\n+ if [ ! -x \"$JAVACMD\" ] ; then\n+ die \"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+ fi\n+else\n+ JAVACMD=\"java\"\n+ which java >/dev/null 2>&1 || die \"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+fi\n+\n+# Increase the maximum file descriptors if we can.\n+if [ \"$cygwin\" = \"false\" -a \"$darwin\" = \"false\" -a \"$nonstop\" = \"false\" ] ; then\n+ MAX_FD_LIMIT=`ulimit -H -n`\n+ if [ $? -eq 0 ] ; then\n+ if [ \"$MAX_FD\" = \"maximum\" -o \"$MAX_FD\" = \"max\" ] ; then\n+ MAX_FD=\"$MAX_FD_LIMIT\"\n+ fi\n+ ulimit -n $MAX_FD\n+ if [ $? -ne 0 ] ; then\n+ warn \"Could not set maximum file descriptor limit: $MAX_FD\"\n+ fi\n+ else\n+ warn \"Could not query maximum file descriptor limit: $MAX_FD_LIMIT\"\n+ fi\n+fi\n+\n+# For Darwin, add options to specify how the application appears in the dock\n+if $darwin; then\n+ GRADLE_OPTS=\"$GRADLE_OPTS \\\"-Xdock:name=$APP_NAME\\\" \\\"-Xdock:icon=$APP_HOME/media/gradle.icns\\\"\"\n+fi\n+\n+# For Cygwin, switch paths to Windows format before running java\n+if $cygwin ; then\n+ APP_HOME=`cygpath --path --mixed \"$APP_HOME\"`\n+ CLASSPATH=`cygpath --path --mixed \"$CLASSPATH\"`\n+ JAVACMD=`cygpath --unix \"$JAVACMD\"`\n+\n+ # We build the pattern for arguments to be converted via cygpath\n+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`\n+ SEP=\"\"\n+ for dir in $ROOTDIRSRAW ; do\n+ ROOTDIRS=\"$ROOTDIRS$SEP$dir\"\n+ SEP=\"|\"\n+ done\n+ OURCYGPATTERN=\"(^($ROOTDIRS))\"\n+ # Add a user-defined pattern to the cygpath arguments\n+ if [ \"$GRADLE_CYGPATTERN\" != \"\" ] ; then\n+ OURCYGPATTERN=\"$OURCYGPATTERN|($GRADLE_CYGPATTERN)\"\n+ fi\n+ # Now convert the arguments - kludge to limit ourselves to /bin/sh\n+ i=0\n+ for arg in \"$@\" ; do\n+ CHECK=`echo \"$arg\"|egrep -c \"$OURCYGPATTERN\" -`\n+ CHECK2=`echo \"$arg\"|egrep -c \"^-\"` ### Determine if an option\n+\n+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition\n+ eval `echo args$i`=`cygpath --path --ignore --mixed \"$arg\"`\n+ else\n+ eval `echo args$i`=\"\\\"$arg\\\"\"\n+ fi\n+ i=$((i+1))\n+ done\n+ case $i in\n+ (0) set -- ;;\n+ (1) set -- \"$args0\" ;;\n+ (2) set -- \"$args0\" \"$args1\" ;;\n+ (3) set -- \"$args0\" \"$args1\" \"$args2\" ;;\n+ (4) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" ;;\n+ (5) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" ;;\n+ (6) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" ;;\n+ (7) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" ;;\n+ (8) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" ;;\n+ (9) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" \"$args8\" ;;\n+ esac\n+fi\n+\n+# Escape application args\n+save () {\n+ for i do printf %s\\\\n \"$i\" | sed \"s/'/'\\\\\\\\''/g;1s/^/'/;\\$s/\\$/' \\\\\\\\/\" ; done\n+ echo \" \"\n+}\n+APP_ARGS=$(save \"$@\")\n+\n+# Collect all arguments for the java command, following the shell quoting and substitution rules\n+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS \"\\\"-Dorg.gradle.appname=$APP_BASE_NAME\\\"\" -classpath \"\\\"$CLASSPATH\\\"\" org.gradle.wrapper.GradleWrapperMain \"$APP_ARGS\"\n+\n+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong\n+if [ \"$(uname)\" = \"Darwin\" ] && [ \"$HOME\" = \"$PWD\" ]; then\n+ cd \"$(dirname \"$0\")\"\n+fi\n+\n+exec \"$JAVACMD\" \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-geofence/gradlew.bat",
"diff": "+@if \"%DEBUG%\" == \"\" @echo off\n+@rem ##########################################################################\n+@rem\n+@rem Gradle startup script for Windows\n+@rem\n+@rem ##########################################################################\n+\n+@rem Set local scope for the variables with windows NT shell\n+if \"%OS%\"==\"Windows_NT\" setlocal\n+\n+set DIRNAME=%~dp0\n+if \"%DIRNAME%\" == \"\" set DIRNAME=.\n+set APP_BASE_NAME=%~n0\n+set APP_HOME=%DIRNAME%\n+\n+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+set DEFAULT_JVM_OPTS=\n+\n+@rem Find java.exe\n+if defined JAVA_HOME goto findJavaFromJavaHome\n+\n+set JAVA_EXE=java.exe\n+%JAVA_EXE% -version >NUL 2>&1\n+if \"%ERRORLEVEL%\" == \"0\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:findJavaFromJavaHome\n+set JAVA_HOME=%JAVA_HOME:\"=%\n+set JAVA_EXE=%JAVA_HOME%/bin/java.exe\n+\n+if exist \"%JAVA_EXE%\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:init\n+@rem Get command-line arguments, handling Windows variants\n+\n+if not \"%OS%\" == \"Windows_NT\" goto win9xME_args\n+\n+:win9xME_args\n+@rem Slurp the command line arguments.\n+set CMD_LINE_ARGS=\n+set _SKIP=2\n+\n+:win9xME_args_slurp\n+if \"x%~1\" == \"x\" goto execute\n+\n+set CMD_LINE_ARGS=%*\n+\n+:execute\n+@rem Setup the command line\n+\n+set CLASSPATH=%APP_HOME%\\gradle\\wrapper\\gradle-wrapper.jar\n+\n+@rem Execute Gradle\n+\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \"-Dorg.gradle.appname=%APP_BASE_NAME%\" -classpath \"%CLASSPATH%\" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%\n+\n+:end\n+@rem End local scope for the variables with windows NT shell\n+if \"%ERRORLEVEL%\"==\"0\" goto mainEnd\n+\n+:fail\n+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\n+rem the _cmd.exe /c_ return code!\n+if not \"\" == \"%GRADLE_EXIT_CONSOLE%\" exit 1\n+exit /b 1\n+\n+:mainEnd\n+if \"%OS%\"==\"Windows_NT\" endlocal\n+\n+:omega\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "gradlew",
"diff": "+#!/usr/bin/env sh\n+\n+##############################################################################\n+##\n+## Gradle start up script for UN*X\n+##\n+##############################################################################\n+\n+# Attempt to set APP_HOME\n+# Resolve links: $0 may be a link\n+PRG=\"$0\"\n+# Need this for relative symlinks.\n+while [ -h \"$PRG\" ] ; do\n+ ls=`ls -ld \"$PRG\"`\n+ link=`expr \"$ls\" : '.*-> \\(.*\\)$'`\n+ if expr \"$link\" : '/.*' > /dev/null; then\n+ PRG=\"$link\"\n+ else\n+ PRG=`dirname \"$PRG\"`\"/$link\"\n+ fi\n+done\n+SAVED=\"`pwd`\"\n+cd \"`dirname \\\"$PRG\\\"`/\" >/dev/null\n+APP_HOME=\"`pwd -P`\"\n+cd \"$SAVED\" >/dev/null\n+\n+APP_NAME=\"Gradle\"\n+APP_BASE_NAME=`basename \"$0\"`\n+\n+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+DEFAULT_JVM_OPTS=\"\"\n+\n+# Use the maximum available, or set MAX_FD != -1 to use that value.\n+MAX_FD=\"maximum\"\n+\n+warn () {\n+ echo \"$*\"\n+}\n+\n+die () {\n+ echo\n+ echo \"$*\"\n+ echo\n+ exit 1\n+}\n+\n+# OS specific support (must be 'true' or 'false').\n+cygwin=false\n+msys=false\n+darwin=false\n+nonstop=false\n+case \"`uname`\" in\n+ CYGWIN* )\n+ cygwin=true\n+ ;;\n+ Darwin* )\n+ darwin=true\n+ ;;\n+ MINGW* )\n+ msys=true\n+ ;;\n+ NONSTOP* )\n+ nonstop=true\n+ ;;\n+esac\n+\n+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar\n+\n+# Determine the Java command to use to start the JVM.\n+if [ -n \"$JAVA_HOME\" ] ; then\n+ if [ -x \"$JAVA_HOME/jre/sh/java\" ] ; then\n+ # IBM's JDK on AIX uses strange locations for the executables\n+ JAVACMD=\"$JAVA_HOME/jre/sh/java\"\n+ else\n+ JAVACMD=\"$JAVA_HOME/bin/java\"\n+ fi\n+ if [ ! -x \"$JAVACMD\" ] ; then\n+ die \"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+ fi\n+else\n+ JAVACMD=\"java\"\n+ which java >/dev/null 2>&1 || die \"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+fi\n+\n+# Increase the maximum file descriptors if we can.\n+if [ \"$cygwin\" = \"false\" -a \"$darwin\" = \"false\" -a \"$nonstop\" = \"false\" ] ; then\n+ MAX_FD_LIMIT=`ulimit -H -n`\n+ if [ $? -eq 0 ] ; then\n+ if [ \"$MAX_FD\" = \"maximum\" -o \"$MAX_FD\" = \"max\" ] ; then\n+ MAX_FD=\"$MAX_FD_LIMIT\"\n+ fi\n+ ulimit -n $MAX_FD\n+ if [ $? -ne 0 ] ; then\n+ warn \"Could not set maximum file descriptor limit: $MAX_FD\"\n+ fi\n+ else\n+ warn \"Could not query maximum file descriptor limit: $MAX_FD_LIMIT\"\n+ fi\n+fi\n+\n+# For Darwin, add options to specify how the application appears in the dock\n+if $darwin; then\n+ GRADLE_OPTS=\"$GRADLE_OPTS \\\"-Xdock:name=$APP_NAME\\\" \\\"-Xdock:icon=$APP_HOME/media/gradle.icns\\\"\"\n+fi\n+\n+# For Cygwin, switch paths to Windows format before running java\n+if $cygwin ; then\n+ APP_HOME=`cygpath --path --mixed \"$APP_HOME\"`\n+ CLASSPATH=`cygpath --path --mixed \"$CLASSPATH\"`\n+ JAVACMD=`cygpath --unix \"$JAVACMD\"`\n+\n+ # We build the pattern for arguments to be converted via cygpath\n+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`\n+ SEP=\"\"\n+ for dir in $ROOTDIRSRAW ; do\n+ ROOTDIRS=\"$ROOTDIRS$SEP$dir\"\n+ SEP=\"|\"\n+ done\n+ OURCYGPATTERN=\"(^($ROOTDIRS))\"\n+ # Add a user-defined pattern to the cygpath arguments\n+ if [ \"$GRADLE_CYGPATTERN\" != \"\" ] ; then\n+ OURCYGPATTERN=\"$OURCYGPATTERN|($GRADLE_CYGPATTERN)\"\n+ fi\n+ # Now convert the arguments - kludge to limit ourselves to /bin/sh\n+ i=0\n+ for arg in \"$@\" ; do\n+ CHECK=`echo \"$arg\"|egrep -c \"$OURCYGPATTERN\" -`\n+ CHECK2=`echo \"$arg\"|egrep -c \"^-\"` ### Determine if an option\n+\n+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition\n+ eval `echo args$i`=`cygpath --path --ignore --mixed \"$arg\"`\n+ else\n+ eval `echo args$i`=\"\\\"$arg\\\"\"\n+ fi\n+ i=$((i+1))\n+ done\n+ case $i in\n+ (0) set -- ;;\n+ (1) set -- \"$args0\" ;;\n+ (2) set -- \"$args0\" \"$args1\" ;;\n+ (3) set -- \"$args0\" \"$args1\" \"$args2\" ;;\n+ (4) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" ;;\n+ (5) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" ;;\n+ (6) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" ;;\n+ (7) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" ;;\n+ (8) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" ;;\n+ (9) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" \"$args8\" ;;\n+ esac\n+fi\n+\n+# Escape application args\n+save () {\n+ for i do printf %s\\\\n \"$i\" | sed \"s/'/'\\\\\\\\''/g;1s/^/'/;\\$s/\\$/' \\\\\\\\/\" ; done\n+ echo \" \"\n+}\n+APP_ARGS=$(save \"$@\")\n+\n+# Collect all arguments for the java command, following the shell quoting and substitution rules\n+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS \"\\\"-Dorg.gradle.appname=$APP_BASE_NAME\\\"\" -classpath \"\\\"$CLASSPATH\\\"\" org.gradle.wrapper.GradleWrapperMain \"$APP_ARGS\"\n+\n+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong\n+if [ \"$(uname)\" = \"Darwin\" ] && [ \"$HOME\" = \"$PWD\" ]; then\n+ cd \"$(dirname \"$0\")\"\n+fi\n+\n+exec \"$JAVACMD\" \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "gradlew.bat",
"diff": "+@if \"%DEBUG%\" == \"\" @echo off\n+@rem ##########################################################################\n+@rem\n+@rem Gradle startup script for Windows\n+@rem\n+@rem ##########################################################################\n+\n+@rem Set local scope for the variables with windows NT shell\n+if \"%OS%\"==\"Windows_NT\" setlocal\n+\n+set DIRNAME=%~dp0\n+if \"%DIRNAME%\" == \"\" set DIRNAME=.\n+set APP_BASE_NAME=%~n0\n+set APP_HOME=%DIRNAME%\n+\n+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+set DEFAULT_JVM_OPTS=\n+\n+@rem Find java.exe\n+if defined JAVA_HOME goto findJavaFromJavaHome\n+\n+set JAVA_EXE=java.exe\n+%JAVA_EXE% -version >NUL 2>&1\n+if \"%ERRORLEVEL%\" == \"0\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:findJavaFromJavaHome\n+set JAVA_HOME=%JAVA_HOME:\"=%\n+set JAVA_EXE=%JAVA_HOME%/bin/java.exe\n+\n+if exist \"%JAVA_EXE%\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:init\n+@rem Get command-line arguments, handling Windows variants\n+\n+if not \"%OS%\" == \"Windows_NT\" goto win9xME_args\n+\n+:win9xME_args\n+@rem Slurp the command line arguments.\n+set CMD_LINE_ARGS=\n+set _SKIP=2\n+\n+:win9xME_args_slurp\n+if \"x%~1\" == \"x\" goto execute\n+\n+set CMD_LINE_ARGS=%*\n+\n+:execute\n+@rem Setup the command line\n+\n+set CLASSPATH=%APP_HOME%\\gradle\\wrapper\\gradle-wrapper.jar\n+\n+@rem Execute Gradle\n+\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \"-Dorg.gradle.appname=%APP_BASE_NAME%\" -classpath \"%CLASSPATH%\" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%\n+\n+:end\n+@rem End local scope for the variables with windows NT shell\n+if \"%ERRORLEVEL%\"==\"0\" goto mainEnd\n+\n+:fail\n+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\n+rem the _cmd.exe /c_ return code!\n+if not \"\" == \"%GRADLE_EXIT_CONSOLE%\" exit 1\n+exit /b 1\n+\n+:mainEnd\n+if \"%OS%\"==\"Windows_NT\" endlocal\n+\n+:omega\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "@@ -4,6 +4,7 @@ apply plugin: 'com.android.library'\nandroid {\ncompileSdkVersion 29\nbuildToolsVersion \"30.0.2\"\n+ testOptions.unitTests.includeAndroidResources = true\ndefaultConfig {\nminSdkVersion 16\n@@ -31,6 +32,7 @@ dependencies {\napi 'junit:junit:4.13'\napi 'org.mockito:mockito-core:2.28.2'\napi 'org.robolectric:robolectric:4.3.1'\n+ api 'org.opentest4j:opentest4j:1.2.0'\napi 'androidx.test:core:1.3.0'\napi \"androidx.test.ext:junit:1.1.2\"\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.java",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.java",
"diff": "package com.clevertap.android.shared.test;\nimport android.app.Application;\n-import android.content.Context;\n-import android.content.Intent;\nimport android.os.Build;\nimport android.os.Bundle;\n@@ -14,32 +12,27 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.runner.RunWith;\n-import org.powermock.core.classloader.annotations.PrepareForTest;\n-import org.robolectric.Shadows;\n+import org.mockito.Mockito;\nimport org.robolectric.annotation.Config;\n-import org.robolectric.shadows.ShadowApplication;\nimport static com.clevertap.android.shared.test.Constant.ACC_ID;\nimport static com.clevertap.android.shared.test.Constant.ACC_TOKEN;\n-import static org.powermock.api.mockito.PowerMockito.mock;\n-@Config(sdk = {Build.VERSION_CODES.P},\n+@Config(manifest = Config.NONE, sdk = {Build.VERSION_CODES.P},\napplication = TestApplication.class\n)\n@RunWith(AndroidJUnit4.class)\n-@PrepareForTest({CleverTapAPI.class, CleverTapInstanceConfig.class, Context.class, Intent.class})\n+//@PrepareForTest({CleverTapAPI.class, CleverTapInstanceConfig.class, Context.class, Intent.class})\npublic abstract class BaseTestCase {\nprotected CleverTapAPI cleverTapAPI;\n- protected Application application;\n- protected ShadowApplication shadowApplication;\n+ protected TestApplication application;\nprotected CleverTapInstanceConfig cleverTapInstanceConfig;\n@Before\npublic void setUp() throws Exception {\napplication = TestApplication.getApplication();\n- shadowApplication = Shadows.shadowOf(application);\n- cleverTapAPI = mock(CleverTapAPI.class);\n+ cleverTapAPI = Mockito.mock(CleverTapAPI.class);\ncleverTapInstanceConfig = CleverTapInstanceConfig.createInstance(application, ACC_ID, ACC_TOKEN);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/TestApplication.java",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/TestApplication.java",
"diff": "@@ -16,7 +16,7 @@ public class TestApplication extends Application {\nsuper.onCreate();\n}\n- public static android.app.Application getApplication() {\n- return ApplicationProvider.getApplicationContext();\n+ public static TestApplication getApplication() {\n+ return (TestApplication) ApplicationProvider.getApplicationContext();\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test):added test cases |
116,621 | 22.09.2020 20:17:52 | -19,080 | 2fc79a56be237a240f72154d2bb2f954d0bacf35 | chore(test):added androidx dependencies for annotation. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/build.gradle",
"new_path": "clevertap-geofence/build.gradle",
"diff": "@@ -143,7 +143,7 @@ bintray {\n}\ndependencies {\n- compileOnly 'com.clevertap.android:clevertap-android-sdk:3.9.0'\n+ compileOnly project(':clevertap-core')\ncompileOnly 'com.google.android.gms:play-services-location:17.0.0'\ncompileOnly 'androidx.work:work-runtime:2.3.4'\ncompileOnly 'androidx.concurrent:concurrent-futures:1.0.0'\n@@ -173,7 +173,7 @@ dependencies {\ntestImplementation 'org.powermock:powermock-api-mockito2:2.0.7'\ntestImplementation 'org.powermock:powermock-classloading-xstream:1.6.6'\ntestImplementation 'eu.codearte.catch-exception:catch-exception:2.0'\n- testImplementation 'com.clevertap.android:clevertap-android-sdk:3.9.0'\n+ testImplementation project(':clevertap-core')\ntestImplementation 'com.android.installreferrer:installreferrer:1.0'\ntestImplementation 'com.google.android.gms:play-services-location:17.0.0'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -45,5 +45,5 @@ android {\ndependencies {\ncompileOnly project(':clevertap-core')\nimplementation 'com.huawei.hms:push:5.0.0.300'\n- compileOnly('com.android.support:support-annotations:28.0.0')\n+ compileOnly('androidx.annotation:annotation:1.1.0')\n}\n\\ No newline at end of file\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": "package com.clevertap.android.hms;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.RestrictTo;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\n+\nimport com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -41,5 +41,5 @@ dependencies {\nimplementation fileTree('libs')\ncompileOnly project(':clevertap-core')\n- compileOnly('com.android.support:support-annotations:28.0.0')\n+ compileOnly('androidx.annotation:annotation:1.1.0')\n}\n\\ No newline at end of file\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": "@@ -3,10 +3,11 @@ package com.clevertap.android.xps;\nimport android.app.ActivityManager;\nimport android.content.Context;\nimport android.os.Process;\n-import android.support.annotation.NonNull;\n-import android.support.annotation.RestrictTo;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\n+\nimport com.clevertap.android.sdk.ManifestInfo;\nimport com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "gradlew",
"diff": "+#!/usr/bin/env sh\n+\n+##############################################################################\n+##\n+## Gradle start up script for UN*X\n+##\n+##############################################################################\n+\n+# Attempt to set APP_HOME\n+# Resolve links: $0 may be a link\n+PRG=\"$0\"\n+# Need this for relative symlinks.\n+while [ -h \"$PRG\" ] ; do\n+ ls=`ls -ld \"$PRG\"`\n+ link=`expr \"$ls\" : '.*-> \\(.*\\)$'`\n+ if expr \"$link\" : '/.*' > /dev/null; then\n+ PRG=\"$link\"\n+ else\n+ PRG=`dirname \"$PRG\"`\"/$link\"\n+ fi\n+done\n+SAVED=\"`pwd`\"\n+cd \"`dirname \\\"$PRG\\\"`/\" >/dev/null\n+APP_HOME=\"`pwd -P`\"\n+cd \"$SAVED\" >/dev/null\n+\n+APP_NAME=\"Gradle\"\n+APP_BASE_NAME=`basename \"$0\"`\n+\n+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+DEFAULT_JVM_OPTS=\"\"\n+\n+# Use the maximum available, or set MAX_FD != -1 to use that value.\n+MAX_FD=\"maximum\"\n+\n+warn () {\n+ echo \"$*\"\n+}\n+\n+die () {\n+ echo\n+ echo \"$*\"\n+ echo\n+ exit 1\n+}\n+\n+# OS specific support (must be 'true' or 'false').\n+cygwin=false\n+msys=false\n+darwin=false\n+nonstop=false\n+case \"`uname`\" in\n+ CYGWIN* )\n+ cygwin=true\n+ ;;\n+ Darwin* )\n+ darwin=true\n+ ;;\n+ MINGW* )\n+ msys=true\n+ ;;\n+ NONSTOP* )\n+ nonstop=true\n+ ;;\n+esac\n+\n+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar\n+\n+# Determine the Java command to use to start the JVM.\n+if [ -n \"$JAVA_HOME\" ] ; then\n+ if [ -x \"$JAVA_HOME/jre/sh/java\" ] ; then\n+ # IBM's JDK on AIX uses strange locations for the executables\n+ JAVACMD=\"$JAVA_HOME/jre/sh/java\"\n+ else\n+ JAVACMD=\"$JAVA_HOME/bin/java\"\n+ fi\n+ if [ ! -x \"$JAVACMD\" ] ; then\n+ die \"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+ fi\n+else\n+ JAVACMD=\"java\"\n+ which java >/dev/null 2>&1 || die \"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+\n+Please set the JAVA_HOME variable in your environment to match the\n+location of your Java installation.\"\n+fi\n+\n+# Increase the maximum file descriptors if we can.\n+if [ \"$cygwin\" = \"false\" -a \"$darwin\" = \"false\" -a \"$nonstop\" = \"false\" ] ; then\n+ MAX_FD_LIMIT=`ulimit -H -n`\n+ if [ $? -eq 0 ] ; then\n+ if [ \"$MAX_FD\" = \"maximum\" -o \"$MAX_FD\" = \"max\" ] ; then\n+ MAX_FD=\"$MAX_FD_LIMIT\"\n+ fi\n+ ulimit -n $MAX_FD\n+ if [ $? -ne 0 ] ; then\n+ warn \"Could not set maximum file descriptor limit: $MAX_FD\"\n+ fi\n+ else\n+ warn \"Could not query maximum file descriptor limit: $MAX_FD_LIMIT\"\n+ fi\n+fi\n+\n+# For Darwin, add options to specify how the application appears in the dock\n+if $darwin; then\n+ GRADLE_OPTS=\"$GRADLE_OPTS \\\"-Xdock:name=$APP_NAME\\\" \\\"-Xdock:icon=$APP_HOME/media/gradle.icns\\\"\"\n+fi\n+\n+# For Cygwin, switch paths to Windows format before running java\n+if $cygwin ; then\n+ APP_HOME=`cygpath --path --mixed \"$APP_HOME\"`\n+ CLASSPATH=`cygpath --path --mixed \"$CLASSPATH\"`\n+ JAVACMD=`cygpath --unix \"$JAVACMD\"`\n+\n+ # We build the pattern for arguments to be converted via cygpath\n+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`\n+ SEP=\"\"\n+ for dir in $ROOTDIRSRAW ; do\n+ ROOTDIRS=\"$ROOTDIRS$SEP$dir\"\n+ SEP=\"|\"\n+ done\n+ OURCYGPATTERN=\"(^($ROOTDIRS))\"\n+ # Add a user-defined pattern to the cygpath arguments\n+ if [ \"$GRADLE_CYGPATTERN\" != \"\" ] ; then\n+ OURCYGPATTERN=\"$OURCYGPATTERN|($GRADLE_CYGPATTERN)\"\n+ fi\n+ # Now convert the arguments - kludge to limit ourselves to /bin/sh\n+ i=0\n+ for arg in \"$@\" ; do\n+ CHECK=`echo \"$arg\"|egrep -c \"$OURCYGPATTERN\" -`\n+ CHECK2=`echo \"$arg\"|egrep -c \"^-\"` ### Determine if an option\n+\n+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition\n+ eval `echo args$i`=`cygpath --path --ignore --mixed \"$arg\"`\n+ else\n+ eval `echo args$i`=\"\\\"$arg\\\"\"\n+ fi\n+ i=$((i+1))\n+ done\n+ case $i in\n+ (0) set -- ;;\n+ (1) set -- \"$args0\" ;;\n+ (2) set -- \"$args0\" \"$args1\" ;;\n+ (3) set -- \"$args0\" \"$args1\" \"$args2\" ;;\n+ (4) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" ;;\n+ (5) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" ;;\n+ (6) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" ;;\n+ (7) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" ;;\n+ (8) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" ;;\n+ (9) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" \"$args8\" ;;\n+ esac\n+fi\n+\n+# Escape application args\n+save () {\n+ for i do printf %s\\\\n \"$i\" | sed \"s/'/'\\\\\\\\''/g;1s/^/'/;\\$s/\\$/' \\\\\\\\/\" ; done\n+ echo \" \"\n+}\n+APP_ARGS=$(save \"$@\")\n+\n+# Collect all arguments for the java command, following the shell quoting and substitution rules\n+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS \"\\\"-Dorg.gradle.appname=$APP_BASE_NAME\\\"\" -classpath \"\\\"$CLASSPATH\\\"\" org.gradle.wrapper.GradleWrapperMain \"$APP_ARGS\"\n+\n+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong\n+if [ \"$(uname)\" = \"Darwin\" ] && [ \"$HOME\" = \"$PWD\" ]; then\n+ cd \"$(dirname \"$0\")\"\n+fi\n+\n+exec \"$JAVACMD\" \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "gradlew.bat",
"diff": "+@if \"%DEBUG%\" == \"\" @echo off\n+@rem ##########################################################################\n+@rem\n+@rem Gradle startup script for Windows\n+@rem\n+@rem ##########################################################################\n+\n+@rem Set local scope for the variables with windows NT shell\n+if \"%OS%\"==\"Windows_NT\" setlocal\n+\n+set DIRNAME=%~dp0\n+if \"%DIRNAME%\" == \"\" set DIRNAME=.\n+set APP_BASE_NAME=%~n0\n+set APP_HOME=%DIRNAME%\n+\n+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n+set DEFAULT_JVM_OPTS=\n+\n+@rem Find java.exe\n+if defined JAVA_HOME goto findJavaFromJavaHome\n+\n+set JAVA_EXE=java.exe\n+%JAVA_EXE% -version >NUL 2>&1\n+if \"%ERRORLEVEL%\" == \"0\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:findJavaFromJavaHome\n+set JAVA_HOME=%JAVA_HOME:\"=%\n+set JAVA_EXE=%JAVA_HOME%/bin/java.exe\n+\n+if exist \"%JAVA_EXE%\" goto init\n+\n+echo.\n+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\n+echo.\n+echo Please set the JAVA_HOME variable in your environment to match the\n+echo location of your Java installation.\n+\n+goto fail\n+\n+:init\n+@rem Get command-line arguments, handling Windows variants\n+\n+if not \"%OS%\" == \"Windows_NT\" goto win9xME_args\n+\n+:win9xME_args\n+@rem Slurp the command line arguments.\n+set CMD_LINE_ARGS=\n+set _SKIP=2\n+\n+:win9xME_args_slurp\n+if \"x%~1\" == \"x\" goto execute\n+\n+set CMD_LINE_ARGS=%*\n+\n+:execute\n+@rem Setup the command line\n+\n+set CLASSPATH=%APP_HOME%\\gradle\\wrapper\\gradle-wrapper.jar\n+\n+@rem Execute Gradle\n+\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \"-Dorg.gradle.appname=%APP_BASE_NAME%\" -classpath \"%CLASSPATH%\" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%\n+\n+:end\n+@rem End local scope for the variables with windows NT shell\n+if \"%ERRORLEVEL%\"==\"0\" goto mainEnd\n+\n+:fail\n+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\n+rem the _cmd.exe /c_ return code!\n+if not \"\" == \"%GRADLE_EXIT_CONSOLE%\" exit 1\n+exit /b 1\n+\n+:mainEnd\n+if \"%OS%\"==\"Windows_NT\" endlocal\n+\n+:omega\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test):added androidx dependencies for annotation. |
116,621 | 23.09.2020 01:14:48 | -19,080 | 54fcdc2f53a2739f974b40a52e1df64b8a20de05 | chore(bitrise):added lint config to avoid bitrise failures | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/src/main/res/layout/activity_main.xml",
"new_path": "AndroidStarter/src/main/res/layout/activity_main.xml",
"diff": "android:layout_height=\"wrap_content\" />\n<TextView\n- android:text=\"developer.clevertap.com\"\n+ android:text=\"@string/developer_clevertap_com\"\nandroid:textColorLink=\"@color/colorPrimary\"\nandroid:id=\"@+id/TextView1\"\n- android:textSize=\"30dp\"\n+ android:textSize=\"30sp\"\nandroid:textAlignment=\"center\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_width=\"match_parent\"\n- android:autoLink=\"web\">\n+ android:autoLink=\"web\"\n+ android:gravity=\"center_horizontal\">\n</TextView>\n<Button\nandroid:layout_width=\"wrap_content\"\nandroid:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\n- android:text=\"Event With Properties\" />\n+ android:text=\"@string/event_with_properties\" />\n<Button\nandroid:id=\"@+id/charged_event\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\n- android:text=\"Charged Event\" />\n+ android:text=\"@string/charged_event\" />\n<Button\nandroid:id=\"@+id/profile_event\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\n- android:text=\"Profile Event\" />\n+ android:text=\"@string/profile_event\" />\n<Button\nandroid:id=\"@+id/inbox\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\n- android:text=\"Inbox\" />\n+ android:text=\"@string/inbox\" />\n<Button\nandroid:id=\"@+id/web\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_marginTop=\"10dp\"\nandroid:visibility=\"visible\"\n- android:text=\"WebView\" />\n+ android:text=\"@string/webview\" />\n</LinearLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/src/main/res/values/strings.xml",
"new_path": "AndroidStarter/src/main/res/values/strings.xml",
"diff": "<resources>\n<string name=\"app_name\">AndroidStarter</string>\n+ <string name=\"developer_clevertap_com\">developer.clevertap.com</string>\n+ <string name=\"event_with_properties\">Event With Properties</string>\n+ <string name=\"charged_event\">Charged Event</string>\n+ <string name=\"profile_event\">Profile Event</string>\n+ <string name=\"inbox\">Inbox</string>\n+ <string name=\"webview\">WebView</string>\n</resources>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "apply plugin: 'com.android.library'\napply plugin: 'com.huawei.agconnect'\n+apply plugin: 'com.github.dcendents.android-maven'\n+apply plugin: 'com.jfrog.bintray'\n+\n+ext {\n+ bintrayRepo = 'Maven'\n+ bintrayName = 'HuaweiPushSDK'\n+ org = 'clevertap'\n+\n+ publishedGroupId = 'com.clevertap.android'\n+ libraryName = 'HuaweiPushSDK'\n+ artifact = 'clevertap-huawei-sdk'\n+ libraryDescription = 'The CleverTap Android Huawei Push SDK'\n+\n+ siteUrl = 'https://github.com/CleverTap/clevertap-android-sdk/clevertap-hms'\n+ gitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n+\n+ libraryVersion = '1.0.0'\n+\n+ developerId = 'clevertap'\n+ developerName = 'CleverTap'\n+ developerEmail = '[email protected]'\n+\n+ licenseName = 'MIT License'\n+ licenseUrl = 'https://opensource.org/licenses/MIT'\n+ allLicenses = [\"MIT\"]\n+}\n+\n+android {\n+ compileSdkVersion 29\n+ buildToolsVersion \"29.0.3\"\n+\n+ defaultConfig {\n+ minSdkVersion 16\n+ targetSdkVersion 29\n+ versionCode 10000\n+ versionName \"1.0.0\"\n+\n+ testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n+ consumerProguardFiles 'consumer-rules.pro'\n+ }\n+\n+ buildTypes {\n+ debug {\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-huawei-sdk:1.0.0.0\"'\n+ }\n+ release {\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-huawei-sdk:1.0.0.0\"'\n+ minifyEnabled false\n+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'\n+ }\n+ }\n+\n+ libraryVariants.all { variant ->\n+ variant.outputs.all {\n+ if (variant.getName().toLowerCase().contains('release')) {\n+ outputFileName = \"${artifact}-${libraryVersion}.aar\"\n+ } else if (variant.getName().toLowerCase().contains('debug')) {\n+ outputFileName = \"${artifact}-${variant.name}-${libraryVersion}.aar\"\n+ }\n+ }\n+ }\n+\n+ testOptions {\n+ unitTests {\n+ includeAndroidResources = true\n+ }\n+ }\n+\n+}\n+\n+version = libraryVersion\n+group = publishedGroupId\n+\n+install {\n+ repositories.mavenInstaller {\n+ pom.project {\n+ packaging 'aar'\n+ groupId publishedGroupId\n+ artifactId artifact\n+\n+ name libraryName\n+ description libraryDescription\n+ url siteUrl\n+\n+ licenses {\n+ license {\n+ name licenseName\n+ url licenseUrl\n+ }\n+ }\n+ developers {\n+ developer {\n+ id developerId\n+ name developerName\n+ email developerEmail\n+ }\n+ }\n+ scm {\n+ connection gitUrl\n+ developerConnection gitUrl\n+ url siteUrl\n+ }\n+ }\n+ }\n+}\n+\n+task sourcesJar(type: Jar) {\n+ classifier = 'sources'\n+ from android.sourceSets.main.java.srcDirs\n+}\n+\n+artifacts {\n+ archives sourcesJar\n+}\n+\n+Properties properties = new Properties()\n+if (project.rootProject.file('local.properties').exists()){\n+ properties.load(project.rootProject.file('local.properties').newDataInputStream())\n+}\n+\n+\n+bintray {\n+ user = properties.getProperty(\"bintray.user\")\n+ key = properties.getProperty(\"bintray.apikey\")\n+\n+ dryRun = false\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+ }\n+ }\n+}\n+\n+ext {\n+ bintrayRepo = 'Maven'\n+ bintrayName = 'HuaweiSDK'\n+ org = 'clevertap'\n+\n+ publishedGroupId = 'com.clevertap.android'\n+ libraryName = 'HuaweiSDK'\n+ artifact = 'clevertap-huawei-sdk'\n+ libraryDescription = 'The CleverTap Android Huawei Push SDK'\n+\n+ libraryVersion = '1.0.0'\n+\n+ developerId = 'clevertap'\n+ developerName = 'CleverTap'\n+ developerEmail = '[email protected]'\n+\n+ licenseName = 'MIT License'\n+ licenseUrl = 'https://opensource.org/licenses/MIT'\n+ allLicenses = [\"MIT\"]\n+}\nandroid {\ncompileSdkVersion 29\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "apply plugin: 'com.android.library'\n-\n-android {\n- compileSdkVersion 29\n- buildToolsVersion \"29.0.3\"\n+apply plugin: 'com.github.dcendents.android-maven'\n+apply plugin: 'com.jfrog.bintray'\next {\n- libraryVersion = \"1.0.0\"\n+ bintrayRepo = 'Maven'\n+ bintrayName = 'XiaomiPushSDK'\n+ org = 'clevertap'\n+\n+ publishedGroupId = 'com.clevertap.android'\n+ libraryName = 'XiaomiPushSDK'\nartifact = 'clevertap-xiaomi-sdk'\n+ libraryDescription = 'The CleverTap Android Xiaomi Push SDK'\n+\n+ siteUrl = 'https://github.com/CleverTap/clevertap-android-sdk/clevertap-xps'\n+ gitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n+\n+ libraryVersion = '1.0.0'\n+\n+ developerId = 'clevertap'\n+ developerName = 'CleverTap'\n+ developerEmail = '[email protected]'\n+\n+ licenseName = 'MIT License'\n+ licenseUrl = 'https://opensource.org/licenses/MIT'\n+ allLicenses = [\"MIT\"]\n}\n+android {\n+ compileSdkVersion 29\n+ buildToolsVersion \"29.0.3\"\n+\ndefaultConfig {\nminSdkVersion 16\ntargetSdkVersion 29\n@@ -16,10 +37,15 @@ android {\nversionName \"1.0.0\"\ntestInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n+ consumerProguardFiles 'consumer-rules.pro'\n}\nbuildTypes {\n+ debug {\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-xiaomi-sdk:1.0.0.0\"'\n+ }\nrelease {\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-xiaomi-sdk:1.0.0.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'\n}\n@@ -35,6 +61,85 @@ android {\n}\n}\n+ testOptions {\n+ unitTests {\n+ includeAndroidResources = true\n+ }\n+ }\n+\n+}\n+\n+version = libraryVersion\n+group = publishedGroupId\n+\n+install {\n+ repositories.mavenInstaller {\n+ pom.project {\n+ packaging 'aar'\n+ groupId publishedGroupId\n+ artifactId artifact\n+\n+ name libraryName\n+ description libraryDescription\n+ url siteUrl\n+\n+ licenses {\n+ license {\n+ name licenseName\n+ url licenseUrl\n+ }\n+ }\n+ developers {\n+ developer {\n+ id developerId\n+ name developerName\n+ email developerEmail\n+ }\n+ }\n+ scm {\n+ connection gitUrl\n+ developerConnection gitUrl\n+ url siteUrl\n+ }\n+ }\n+ }\n+}\n+\n+task sourcesJar(type: Jar) {\n+ classifier = 'sources'\n+ from android.sourceSets.main.java.srcDirs\n+}\n+\n+artifacts {\n+ archives sourcesJar\n+}\n+\n+Properties properties = new Properties()\n+if (project.rootProject.file('local.properties').exists()){\n+ properties.load(project.rootProject.file('local.properties').newDataInputStream())\n+}\n+\n+\n+bintray {\n+ user = properties.getProperty(\"bintray.user\")\n+ key = properties.getProperty(\"bintray.apikey\")\n+\n+ dryRun = false\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+ }\n+ }\n}\ndependencies {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(bitrise):added lint config to avoid bitrise failures |
116,621 | 23.09.2020 15:27:26 | -19,080 | 6fb83f1957ba91e6020fe5f9464cb84a0196d4f1 | chore(test): added shared test module with xiaomi & Huawei modules
SDK- | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/build.gradle",
"new_path": "clevertap-core/build.gradle",
"diff": "@@ -84,6 +84,9 @@ android {\nunitTests {\nincludeAndroidResources = true\n}\n+ unitTests.all {\n+ jvmArgs '-noverify'\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -66,6 +66,9 @@ android {\nunitTests {\nincludeAndroidResources = true\n}\n+ unitTests.all {\n+ jvmArgs '-noverify'\n+ }\n}\n}\n@@ -169,24 +172,6 @@ dependencies {\nimplementation 'com.huawei.hms:push:5.0.0.300'\ncompileOnly('androidx.annotation:annotation:1.1.0')\n- // Unit testing dependencies\n- testImplementation 'junit:junit:4.13'\n- testImplementation 'org.mockito:mockito-core:2.28.2'\n- testImplementation 'org.robolectric:robolectric:4.3.1'\n-\n- testImplementation 'androidx.test:core:1.3.0'\n- testImplementation \"androidx.test.ext:junit:1.1.2\"\n- testImplementation \"androidx.appcompat:appcompat:1.2.0\"\n-\n- testImplementation 'org.opentest4j:opentest4j:1.2.0'\n-\n- // AndroidJUnitRunner and JUnit Rules\n- androidTestImplementation 'androidx.test:runner:1.3.0'\n- androidTestImplementation 'androidx.test:rules:1.3.0'\n-\n- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'\n-\n- testImplementation 'eu.codearte.catch-exception:catch-exception:2.0'\n- testImplementation project(':clevertap-core')\n+ testImplementation project(':test_shared')\ntestImplementation 'com.huawei.hms:push:5.0.0.300'\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -150,25 +150,9 @@ dependencies {\ncompileOnly project(':clevertap-core')\ncompileOnly('androidx.annotation:annotation:1.1.0')\n- // Unit testing dependencies\n- testImplementation 'junit:junit:4.13'\n- testImplementation 'org.mockito:mockito-core:2.28.2'\n- testImplementation 'org.robolectric:robolectric:4.3.1'\n-\n- testImplementation 'androidx.test:core:1.3.0'\n- testImplementation \"androidx.test.ext:junit:1.1.2\"\n- testImplementation \"androidx.appcompat:appcompat:1.2.0\"\n-\n- testImplementation 'org.opentest4j:opentest4j:1.2.0'\n-\n- // AndroidJUnitRunner and JUnit Rules\n- androidTestImplementation 'androidx.test:runner:1.3.0'\n- androidTestImplementation 'androidx.test:rules:1.3.0'\n-\n- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'\n-\ntestImplementation 'eu.codearte.catch-exception:catch-exception:2.0'\ntestImplementation project(':clevertap-core')\n+ testImplementation project(':test_shared')\ntestImplementation fileTree('libs')\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.java",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.java",
"diff": "@@ -2,6 +2,8 @@ package com.clevertap.android.xps;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n+import com.clevertap.android.shared.test.BaseTestCase;\n+import com.clevertap.android.shared.test.TestApplication;\nimport org.junit.Assert;\nimport org.junit.Before;\n@@ -10,9 +12,9 @@ import org.junit.runner.RunWith;\nimport org.robolectric.RobolectricTestRunner;\nimport org.robolectric.annotation.Config;\n-import static org.mockito.Mockito.mock;\nimport static org.mockito.Mockito.verify;\n-import static org.mockito.Mockito.when;\n+import static org.powermock.api.mockito.PowerMockito.mock;\n+import static org.powermock.api.mockito.PowerMockito.when;\n@RunWith(RobolectricTestRunner.class)\n@Config(sdk = 28, application = TestApplication.class)\n"
},
{
"change_type": "DELETE",
"old_path": "gradle-scripts/test_dependencies.gradle",
"new_path": null,
"diff": "-dependencies {\n- testImplementation project(':clevertap-core')\n- // Unit testing dependencies\n- testImplementation 'junit:junit:4.13'\n- testImplementation 'org.mockito:mockito-core:2.25.0'\n- testImplementation 'org.robolectric:robolectric:4.3.1'\n-\n- testImplementation 'androidx.test:core:1.2.0'\n- testImplementation \"androidx.test.ext:junit:1.1.1\"\n- testImplementation \"androidx.appcompat:appcompat:1.1.0\"\n-\n- testImplementation 'org.powermock:powermock-core:2.0.7'\n- testImplementation 'org.powermock:powermock-api-mockito2:2.0.7'\n- testImplementation 'org.powermock:powermock-module-junit4:2.0.7'\n-\n- // AndroidJUnitRunner and JUnit Rules\n- androidTestImplementation 'androidx.test:runner:1.2.0'\n- androidTestImplementation 'androidx.test:rules:1.2.0'\n-\n- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'\n-\n- testImplementation 'org.powermock:powermock-core:2.0.7'\n- testImplementation 'org.powermock:powermock-module-junit4:2.0.7'\n- testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.6'\n- testImplementation 'org.powermock:powermock-api-mockito2:2.0.7'\n- testImplementation 'org.powermock:powermock-classloading-xstream:1.6.6'\n- testImplementation 'eu.codearte.catch-exception:catch-exception:2.0'\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "apply plugin: 'com.android.library'\n-//apply from: '../gradle-scripts/test_dependencies.gradle'\nandroid {\ncompileSdkVersion 29\n@@ -26,7 +25,6 @@ android {\n}\ndependencies {\n-\napi project(':clevertap-core')\n// Unit ing dependencies\napi 'junit:junit:4.13'\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.java",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/BaseTestCase.java",
"diff": "package com.clevertap.android.shared.test;\n-import android.app.Application;\nimport android.os.Build;\nimport android.os.Bundle;\n@@ -13,6 +12,7 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.runner.RunWith;\nimport org.mockito.Mockito;\n+import org.powermock.core.classloader.annotations.PrepareForTest;\nimport org.robolectric.annotation.Config;\nimport static com.clevertap.android.shared.test.Constant.ACC_ID;\n@@ -22,7 +22,7 @@ import static com.clevertap.android.shared.test.Constant.ACC_TOKEN;\napplication = TestApplication.class\n)\n@RunWith(AndroidJUnit4.class)\n-//@PrepareForTest({CleverTapAPI.class, CleverTapInstanceConfig.class, Context.class, Intent.class})\n+@PrepareForTest({CleverTapAPI.class, CleverTapInstanceConfig.class})\npublic abstract class BaseTestCase {\nprotected CleverTapAPI cleverTapAPI;\n@@ -36,7 +36,7 @@ public abstract class BaseTestCase {\ncleverTapInstanceConfig = CleverTapInstanceConfig.createInstance(application, ACC_ID, ACC_TOKEN);\n}\n- public Application getApplication() {\n+ public TestApplication getApplication() {\nreturn TestApplication.getApplication();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): added shared test module with xiaomi & Huawei modules
SDK- |
116,621 | 24.09.2020 00:21:23 | -19,080 | 88c4a848babf97029edef56c4af956dcec93d1e8 | chore(test): added JaCoCo plugin | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -8,3 +8,4 @@ docs\n.idea\nbuild/\n.gradle/\n+*.exec\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "// Top-level build file where you can add configuration options common to all sub-projects/modules.\n-//apply from:'./gradle-scripts/test_dependencies.gradle'\nbuildscript {\n+ ext.jacocoVersion = '0.8.4'\nrepositories {\ngoogle()// Google's Maven repository\njcenter()\n@@ -12,6 +12,7 @@ buildscript {\nclasspath 'com.github.dcendents:android-maven-gradle-plugin:2.1'\nclasspath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'\nclasspath 'com.huawei.agconnect:agcp:1.3.1.300'// Huawei Push Plugin\n+ classpath \"org.jacoco:org.jacoco.core:$jacocoVersion\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/build.gradle",
"new_path": "clevertap-core/build.gradle",
"diff": "+apply plugin: 'com.android.library'\n+apply plugin: 'com.github.dcendents.android-maven'\n+apply plugin: 'com.jfrog.bintray'\n+apply plugin: 'jacoco'\n+\n+jacoco {\n+ toolVersion = \"$jacocoVersion\"\n+}\n+\n+tasks.withType(Test) {\n+ jacoco.includeNoLocationClasses = true\n+}\n+\n+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {\n+\n+ reports {\n+ xml.enabled = true\n+ html.enabled = true\n+ }\n+\n+ def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']\n+ def debugTree = fileTree(dir: \"$project.buildDir/intermediates/javac/debug\", excludes: fileFilter)\n+ def mainSrc = \"$project.projectDir/src/main/java\"\n+\n+ sourceDirectories.from = files([mainSrc])\n+ classDirectories.from = files([debugTree])\n+ executionData.from = fileTree(dir: project.buildDir, includes: [\n+ 'jacoco/testDebugUnitTest.exec', 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'\n+ ])\n+}\n+\nbuildscript {\nrepositories {\ngoogle()\n@@ -43,10 +74,6 @@ ext {\nversion = libraryVersion\ngroup = publishedGroupId\n-apply plugin: 'com.android.library'\n-apply plugin: 'com.github.dcendents.android-maven'\n-apply plugin: 'com.jfrog.bintray'\n-\nandroid {\ncompileSdkVersion 29\nbuildToolsVersion '29.0.3'\n@@ -57,6 +84,7 @@ android {\nbuildTypes {\ndebug {\n+ testCoverageEnabled true //To get coverage reports for instrumentation tests\nbuildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:4.0.0.0\"'\n}\n@@ -81,6 +109,7 @@ android {\n}\n}\ntestOptions {\n+ animationsDisabled true\nunitTests {\nincludeAndroidResources = true\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/build.gradle",
"new_path": "clevertap-geofence/build.gradle",
"diff": "apply plugin: 'com.android.library'\napply plugin: 'com.github.dcendents.android-maven'\napply plugin: 'com.jfrog.bintray'\n+apply plugin: 'jacoco'\n+\n+jacoco {\n+ toolVersion = \"$jacocoVersion\"\n+}\n+\n+tasks.withType(Test) {\n+ jacoco.includeNoLocationClasses = true\n+}\n+\n+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {\n+\n+ reports {\n+ xml.enabled = true\n+ html.enabled = true\n+ }\n+\n+ def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']\n+ def debugTree = fileTree(dir: \"$project.buildDir/intermediates/javac/debug\", excludes: fileFilter)\n+ def mainSrc = \"$project.projectDir/src/main/java\"\n+\n+ sourceDirectories.from = files([mainSrc])\n+ classDirectories.from = files([debugTree])\n+ executionData.from = fileTree(dir: project.buildDir, includes: [\n+ 'jacoco/testDebugUnitTest.exec', 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'\n+ ])\n+}\next {\nbintrayRepo = 'Maven'\n@@ -42,6 +69,7 @@ android {\nbuildTypes {\ndebug {\n+ testCoverageEnabled true //To get coverage reports for instrumentation tests\nbuildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-geofence-sdk:1.0.0.0\"'\n}\nrelease {\n@@ -62,9 +90,13 @@ android {\n}\ntestOptions {\n+ animationsDisabled true\nunitTests {\nincludeAndroidResources = true\n}\n+ unitTests.all {\n+ jvmArgs '-noverify'\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -2,6 +2,33 @@ apply plugin: 'com.android.library'\napply plugin: 'com.huawei.agconnect'\napply plugin: 'com.github.dcendents.android-maven'\napply plugin: 'com.jfrog.bintray'\n+apply plugin: 'jacoco'\n+\n+jacoco {\n+ toolVersion = \"$jacocoVersion\"\n+}\n+\n+tasks.withType(Test) {\n+ jacoco.includeNoLocationClasses = true\n+}\n+\n+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {\n+\n+ reports {\n+ xml.enabled = true\n+ html.enabled = true\n+ }\n+\n+ def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']\n+ def debugTree = fileTree(dir: \"$project.buildDir/intermediates/javac/debug\", excludes: fileFilter)\n+ def mainSrc = \"$project.projectDir/src/main/java\"\n+\n+ sourceDirectories.from = files([mainSrc])\n+ classDirectories.from = files([debugTree])\n+ executionData.from = fileTree(dir: project.buildDir, includes: [\n+ 'jacoco/testDebugUnitTest.exec', 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'\n+ ])\n+}\next {\nbintrayRepo = 'Maven'\n@@ -43,6 +70,7 @@ android {\nbuildTypes {\ndebug {\n+ testCoverageEnabled true //To get coverage reports for instrumentation tests\nbuildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-huawei-sdk:1.0.0.0\"'\n}\nrelease {\n@@ -63,6 +91,7 @@ android {\n}\ntestOptions {\n+ animationsDisabled true\nunitTests {\nincludeAndroidResources = true\n}\n@@ -70,7 +99,6 @@ android {\njvmArgs '-noverify'\n}\n}\n-\n}\nversion = libraryVersion\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "apply plugin: 'com.android.library'\napply plugin: 'com.github.dcendents.android-maven'\napply plugin: 'com.jfrog.bintray'\n+apply plugin: 'jacoco'\n+\n+jacoco {\n+ toolVersion = \"$jacocoVersion\"\n+}\n+\n+tasks.withType(Test) {\n+ jacoco.includeNoLocationClasses = true\n+}\n+\n+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {\n+\n+ reports {\n+ xml.enabled = true\n+ html.enabled = true\n+ }\n+\n+ def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']\n+ def debugTree = fileTree(dir: \"$project.buildDir/intermediates/javac/debug\", excludes: fileFilter)\n+ def mainSrc = \"$project.projectDir/src/main/java\"\n+\n+ sourceDirectories.from = files([mainSrc])\n+ classDirectories.from = files([debugTree])\n+ executionData.from = fileTree(dir: project.buildDir, includes: [\n+ 'jacoco/testDebugUnitTest.exec', 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'\n+ ])\n+}\next {\nbintrayRepo = 'Maven'\n@@ -42,6 +69,7 @@ android {\nbuildTypes {\ndebug {\n+ testCoverageEnabled true //To get coverage reports for instrumentation tests\nbuildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-xiaomi-sdk:1.0.0.0\"'\n}\nrelease {\n@@ -62,6 +90,7 @@ android {\n}\ntestOptions {\n+ animationsDisabled true\nunitTests {\nincludeAndroidResources = true\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): added JaCoCo plugin |
116,621 | 25.09.2020 15:21:00 | -19,080 | 3f84c752b3876ac5afddfc12c0dbcf3558d145f8 | chore(test): bitrise failure resolution | [
{
"change_type": "DELETE",
"old_path": "AndroidStarter/src/androidTest/java/com/clevertap/demo/ExampleInstrumentedTest.java",
"new_path": null,
"diff": "-package com.clevertap.demo;\n-\n-import static org.junit.Assert.*;\n-\n-import android.content.Context;\n-import android.support.test.InstrumentationRegistry;\n-import android.support.test.runner.AndroidJUnit4;\n-\n-/**\n- * Instrumented test, which will execute on an Android device.\n- *\n- * @see <a href=\"http://d.android.com/tools/testing\">Testing documentation</a>\n- */\n-@RunWith(AndroidJUnit4.class)\n-public class ExampleInstrumentedTest {\n-\n- @Test\n- public void useAppContext() {\n- // Context of the app under test.\n- Context appContext = InstrumentationRegistry.getTargetContext();\n-\n- assertEquals(\"com.clevertap.demo\", appContext.getPackageName());\n- }\n-}\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": "@@ -17,22 +17,17 @@ class FeatureFlagTest : BaseTestCase() {\n@Test\nfun testFetch() {\n- Mockito.`when`(cleverTapAPI.featureFlag())\n+ Mockito.`when`(cleverTapAPI!!.featureFlag())\n.thenReturn(CTFeatureFlagsController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI))\n- cleverTapAPI.featureFlag().fetchFeatureFlags()\n- Mockito.verify(cleverTapAPI).fetchFeatureFlags()\n+ cleverTapAPI!!.featureFlag().fetchFeatureFlags()\n+ Mockito.verify(cleverTapAPI)!!.fetchFeatureFlags()\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- }\n-\n- companion object {\n-\n- private const val TAG = \"FeatureFlagTest\"\n+ Assert.assertFalse(cleverTapAPI!!.featureFlag()[\"isFeatureA\", true])\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/ProductConfigTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/ProductConfigTest.kt",
"diff": "@@ -14,45 +14,45 @@ class ProductConfigTest : BaseTestCase() {\n@Test\nfun testFetch() {\n- Mockito.`when`(cleverTapAPI.productConfig())\n+ Mockito.`when`(cleverTapAPI!!.productConfig())\n.thenReturn(CTProductConfigController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI))\n- cleverTapAPI.productConfig().fetch()\n- Mockito.verify(cleverTapAPI).fetchProductConfig()\n+ cleverTapAPI!!.productConfig().fetch()\n+ Mockito.verify(cleverTapAPI)!!.fetchProductConfig()\n}\n@Test\nfun testGetBoolean() {\nval ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI.productConfig()).thenReturn(ctProductConfigController)\n+ Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\nMockito.`when`(ctProductConfigController.getBoolean(\"testBool\")).thenReturn(false)\n- Assert.assertFalse(cleverTapAPI.productConfig().getBoolean(\"testBool\"))\n+ Assert.assertFalse(cleverTapAPI!!.productConfig().getBoolean(\"testBool\"))\n}\n@Test\nfun testGetLong() {\nval ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI.productConfig()).thenReturn(ctProductConfigController)\n+ Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\nMockito.`when`(ctProductConfigController.getLong(\"testLong\")).thenReturn(122212121L)\n- Assert.assertNotEquals(12, cleverTapAPI.productConfig().getLong(\"testLong\"))\n- Assert.assertEquals(122212121, cleverTapAPI.productConfig().getLong(\"testLong\"))\n+ Assert.assertNotEquals(12, cleverTapAPI!!.productConfig().getLong(\"testLong\"))\n+ Assert.assertEquals(122212121, cleverTapAPI!!.productConfig().getLong(\"testLong\"))\n}\n@Test\nfun testGetDouble() {\nval ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI.productConfig()).thenReturn(ctProductConfigController)\n+ Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\nMockito.`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+ Assert.assertNotEquals(12.0, cleverTapAPI!!.productConfig().getDouble(\"testDouble\"))\n+ Assert.assertEquals(122.21, cleverTapAPI!!.productConfig().getDouble(\"testDouble\"), 0.0)\n}\n@Test\nfun testGetString() {\nval ctProductConfigController = Mockito.mock(CTProductConfigController::class.java)\n- Mockito.`when`(cleverTapAPI.productConfig()).thenReturn(ctProductConfigController)\n+ Mockito.`when`(cleverTapAPI!!.productConfig()).thenReturn(ctProductConfigController)\nMockito.`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+ Assert.assertNotEquals(\"Wrong Value\", cleverTapAPI!!.productConfig().getString(\"testString\"))\n+ Assert.assertEquals(\"Testing String\", cleverTapAPI!!.productConfig().getString(\"testString\"))\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -181,11 +181,7 @@ dependencies {\ncompileOnly project(':clevertap-core')\ncompileOnly('androidx.annotation:annotation:1.1.0')\n-\n- testImplementation 'eu.codearte.catch-exception:catch-exception:2.0'\n-\ntestImplementation project(':test_shared')\n-\ntestImplementation fileTree('libs')\ntestImplementation \"androidx.core:core-ktx:1.3.1\"\ntestImplementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"diff": "@@ -101,7 +101,7 @@ class XiaomiSdkHandlerTest : BaseTestCase() {\n@Test\nfun testShouldInit_Returns_True() {\n- Assert.assertTrue(handler!!.shouldInit(application.packageName))\n+ Assert.assertTrue(handler!!.shouldInit(application!!.packageName))\n}\n@Test\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "@@ -38,6 +38,7 @@ dependencies {\napi 'androidx.test:core:1.3.0'\napi \"androidx.test.ext:junit:1.1.2\"\n+ api 'androidx.fragment:fragment:1.1.0'\n// AndroidJUnitRunner and JUnit Rules\napi 'androidx.test:runner:1.3.0'\napi 'androidx.test:rules:1.3.0'\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": "-package com.clevertap.android.shared.test;\n-\n-import static com.clevertap.android.shared.test.Constant.ACC_ID;\n-import static com.clevertap.android.shared.test.Constant.ACC_TOKEN;\n-import static org.mockito.Mockito.*;\n-\n-import android.os.Build;\n-import android.os.Bundle;\n-import androidx.test.ext.junit.runners.AndroidJUnit4;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-import com.clevertap.android.sdk.CleverTapAPI;\n-import com.clevertap.android.sdk.CleverTapInstanceConfig;\n-import org.junit.*;\n-import org.junit.runner.*;\n-import org.mockito.*;\n-import org.robolectric.annotation.Config;\n-\n-@Config(manifest = Config.NONE, sdk = {Build.VERSION_CODES.P},\n- application = TestApplication.class\n+package com.clevertap.android.shared.test\n+\n+import android.os.Build.VERSION_CODES\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+import com.clevertap.android.sdk.BaseCTApiListener\n+import com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.CleverTapInstanceConfig\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.robolectric.annotation.Config\n+\n+@Config(manifest = Config.NONE, sdk = [VERSION_CODES.P], application = TestApplication::class)\n+@RunWith(\n+ AndroidJUnit4::class\n)\n-@RunWith(AndroidJUnit4.class)\n-public abstract class BaseTestCase {\n-\n- protected TestApplication application;\n-\n- protected BaseCTApiListener baseCTApiListener;\n-\n- protected CleverTapAPI cleverTapAPI;\n-\n- protected CleverTapInstanceConfig cleverTapInstanceConfig;\n-\n- public static boolean areEqual(Bundle expected, Bundle actual) {\n- if (expected == null) {\n- return actual == null;\n- }\n-\n- if (expected.size() != actual.size()) {\n- return false;\n- }\n-\n- for (String key : expected.keySet()) {\n- if (!actual.containsKey(key)) {\n- return false;\n- }\n-\n- Object expectedValue = expected.get(key);\n- Object actualValue = actual.get(key);\n-\n- if (expectedValue == null) {\n- if (actualValue != null) {\n- return false;\n- }\n-\n- continue;\n- }\n+abstract class BaseTestCase {\n- if (expectedValue instanceof Bundle && actualValue instanceof Bundle) {\n- if (!areEqual((Bundle) expectedValue, (Bundle) actualValue)) {\n- return false;\n- }\n-\n- continue;\n- }\n-\n- if (!expectedValue.equals(actualValue)) {\n- return false;\n- }\n- }\n-\n- return true;\n- }\n-\n- public static void assertBundlesEquals(String message, Bundle expected, Bundle actual) {\n- if (!areEqual(expected, actual)) {\n- Assert.fail(message + \" <\" + expected.toString() + \"> is not equal to <\" + actual.toString() + \">\");\n- }\n- }\n-\n- public static void assertBundlesEquals(Bundle expected, Bundle actual) {\n- assertBundlesEquals(null, expected, actual);\n- }\n-\n- public TestApplication getApplication() {\n- return TestApplication.getApplication();\n- }\n+ protected var application: TestApplication? = null\n+ protected lateinit var baseCTApiListener: BaseCTApiListener\n+ protected var cleverTapAPI: CleverTapAPI? = null\n+ protected var cleverTapInstanceConfig: CleverTapInstanceConfig? = null\n@Before\n- public void setUp() {\n- application = TestApplication.getApplication();\n- cleverTapAPI = Mockito.mock(CleverTapAPI.class);\n-\n- cleverTapInstanceConfig = CleverTapInstanceConfig.createInstance(application, ACC_ID, ACC_TOKEN);\n-\n- baseCTApiListener = Mockito.mock(BaseCTApiListener.class);\n- when(baseCTApiListener.context()).thenReturn(application);\n- when(baseCTApiListener.config()).thenReturn(cleverTapInstanceConfig);\n+ open fun setUp() {\n+ application = TestApplication.application\n+ cleverTapAPI = Mockito.mock(CleverTapAPI::class.java)\n+ cleverTapInstanceConfig =\n+ CleverTapInstanceConfig.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}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/src/main/java/com/clevertap/android/shared/test/Constant.kt",
"new_path": "test_shared/src/main/java/com/clevertap/android/shared/test/Constant.kt",
"diff": "-package com.clevertap.android.shared.test;\n+package com.clevertap.android.shared.test\n-public interface Constant {\n+interface Constant {\n+ companion object {\n- String ACC_ID = \"R65-RR9-9R5Z\";\n- String ACC_TOKEN = \"c22-562\";\n+ const val ACC_ID = \"R65-RR9-9R5Z\"\n+ const val ACC_TOKEN = \"c22-562\"\n+ }\n}\n\\ No newline at end of file\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": "-package com.clevertap.android.shared.test;\n+package com.clevertap.android.shared.test\n-import androidx.test.core.app.ApplicationProvider;\n-import com.clevertap.android.sdk.ActivityLifecycleCallback;\n-import com.clevertap.android.sdk.Application;\n-import com.clevertap.android.sdk.CleverTapAPI;\n+import android.content.Context\n+import androidx.test.core.app.ApplicationProvider\n+import com.clevertap.android.sdk.ActivityLifecycleCallback\n+import com.clevertap.android.sdk.Application\n+import com.clevertap.android.sdk.CleverTapAPI\n-public class TestApplication extends Application {\n+class TestApplication : Application() {\n- public static TestApplication getApplication() {\n- return (TestApplication) ApplicationProvider.getApplicationContext();\n+ override fun onCreate() {\n+ CleverTapAPI.setUIEditorConnectionEnabled(true)\n+ CleverTapAPI.setDebugLevel(3)\n+ ActivityLifecycleCallback.register(this)\n+ super.onCreate()\n}\n- @Override\n- public void onCreate() {\n- CleverTapAPI.setUIEditorConnectionEnabled(true);\n- CleverTapAPI.setDebugLevel(3);\n- ActivityLifecycleCallback.register(this);\n- super.onCreate();\n+ companion object {\n+\n+ val application: TestApplication\n+ get() = ApplicationProvider.getApplicationContext<Context>() as TestApplication\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): bitrise failure resolution |
116,621 | 27.09.2020 16:01:49 | -19,080 | f152259fe70282b968bde2c505d504472631b572 | chore(test): added test case for Huawei module | [
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"diff": "package com.clevertap.android.hms;\n+import static com.clevertap.android.hms.HmsConstants.LOG_TAG;\n+\n+import android.util.Log;\nimport com.huawei.hms.push.HmsMessageService;\nimport com.huawei.hms.push.RemoteMessage;\n@@ -7,17 +10,18 @@ public class CTHmsMessageService extends HmsMessageService {\nprivate IHmsMessageHandler mHandler = new HmsMessageHandler();\n- private static final String TAG = \"CTHmsMessageService\";\n@Override\npublic void onMessageReceived(RemoteMessage remoteMessage) {\nsuper.onMessageReceived(remoteMessage);\n+ Log.d(LOG_TAG, \"onMessageReceived: \");\nmHandler.createNotification(getApplicationContext(), remoteMessage);\n}\n@Override\npublic void onNewToken(String token) {\nsuper.onNewToken(token);\n+ Log.d(LOG_TAG, \"onNewToken: \" + token);\nmHandler.onNewToken(getApplicationContext(), token);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageServiceTest.kt",
"diff": "+package com.clevertap.android.hms\n+\n+import android.content.Context\n+import android.os.Bundle\n+import com.clevertap.android.hms.HmsTestConstants.Companion.HMS_TOKEN\n+import com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.TestApplication\n+import com.huawei.hms.push.RemoteMessage\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.Mockito.*\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 HmsMessageServiceTest : BaseTestCase() {\n+\n+ private lateinit var service: CTHmsMessageService\n+ private lateinit var mockedMessageHandler: HmsMessageHandler\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ service = spy(\n+ CTHmsMessageService\n+ ::class.java\n+ )\n+ mockedMessageHandler = mock(HmsMessageHandler::class.java)\n+ doReturn(application).`when`(service).applicationContext\n+ }\n+\n+ @Test\n+ fun testOnNewToken() {\n+ try {\n+ service.onNewToken(HMS_TOKEN)\n+ verify(\n+ mockedMessageHandler.onNewToken(\n+ any(Context::class.java),\n+ eq(HMS_TOKEN)\n+ ), times(1)\n+ )\n+ } catch (e: Exception) {\n+\n+ }\n+ }\n+\n+ @Test\n+ fun testOnMessageReceived() {\n+ try {\n+ service.onMessageReceived(RemoteMessage(Bundle()))\n+ verify(\n+ mockedMessageHandler.createNotification(\n+ any(Context::class.java),\n+ any(RemoteMessage::class.java)\n+ ), times(1)\n+ )\n+ } catch (e: Exception) {\n+\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): added test case for Huawei module |
116,623 | 27.09.2020 16:34:03 | -19,080 | bf748ca1f33f2b9e308fb8fd2e535e4b2a6b7604 | chore(NetworkInfo,Interstitial InApp): refactor code to remove duplicate | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import android.os.Handler;\nimport android.util.DisplayMetrics;\n+import android.view.Gravity;\nimport android.view.WindowManager;\n+import android.widget.FrameLayout;\n+import android.widget.FrameLayout.LayoutParams;\n+import android.widget.RelativeLayout;\npublic abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n+ void addCloseImageView(final RelativeLayout relativeLayout, final CloseImageView closeImageView) {\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout.getRight() - margin);\n+ closeImageView.setY(relativeLayout.getTop() - margin);\n+ }\n+ });\n+ }\n+\n@Override\nvoid cleanup() {/* no-op */}\n@@ -38,4 +54,100 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\nreturn false;\n}\n}\n+\n+ void redrawInterstitialInApp(final RelativeLayout relativeLayout, LayoutParams layoutParams,\n+ CloseImageView closeImageView) {\n+ layoutParams.height = (int) (relativeLayout.getMeasuredWidth()\n+ * 1.78f);\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n+ void redrawInterstitialMobileInAppOnTablet(final RelativeLayout relativeLayout,\n+ LayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n+ int aspectHeight = (int) (\n+ (relativeLayout.getMeasuredWidth() - getScaledPixels(200)) * 1.78f);\n+ int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(280);\n+\n+ if (aspectHeight > requiredHeight) {\n+ layoutParams.height = requiredHeight;\n+ layoutParams.width = (int) (requiredHeight / 1.78f);\n+ } else {\n+ layoutParams.height = aspectHeight;\n+ layoutParams.width = relativeLayout.getMeasuredWidth() - getScaledPixels(\n+ 200);\n+ }\n+\n+ layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n+ getScaledPixels(140), getScaledPixels(140));\n+\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n+ void redrawInterstitialTabletInApp(final RelativeLayout relativeLayout,\n+ LayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n+ int aspectHeight = (int) (relativeLayout.getMeasuredWidth() * 1.78f);\n+ int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(80);\n+\n+ if (aspectHeight > requiredHeight) {\n+ layoutParams.height = requiredHeight;\n+ layoutParams.width = (int) (requiredHeight / 1.78f);\n+ } else {\n+ layoutParams.height = aspectHeight;\n+ }\n+\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n+ void redrawLandscapeInterstitialInApp(final RelativeLayout relativeLayout, LayoutParams layoutParams,\n+ CloseImageView closeImageView) {\n+ layoutParams.width = (int) (relativeLayout.getMeasuredHeight()\n+ * 1.78f);\n+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n+ void redrawLandscapeInterstitialMobileInAppOnTablet(final RelativeLayout relativeLayout,\n+ LayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n+ int aspectWidth = (int) (relativeLayout.getMeasuredHeight() * 1.78f);\n+ int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(80);\n+\n+ if (aspectWidth > requiredWidth) {\n+ layoutParams.width = requiredWidth;\n+ layoutParams.height = (int) (requiredWidth / 1.78f);\n+ } else {\n+ layoutParams.width = aspectWidth;\n+ }\n+\n+ layoutParams.gravity = Gravity.CENTER;\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n+ void redrawLandscapeInterstitialTabletInApp(final RelativeLayout relativeLayout,\n+ LayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n+ int aspectWidth = (int) (\n+ (relativeLayout.getMeasuredHeight() - getScaledPixels(120)) * 1.78f);\n+ int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(280);\n+\n+ if (aspectWidth > requiredWidth) {\n+ layoutParams.width = requiredWidth;\n+ layoutParams.height = (int) (requiredWidth / 1.78f);\n+ } else {\n+ layoutParams.width = aspectWidth;\n+ layoutParams.height = relativeLayout.getMeasuredHeight()\n+ - getScaledPixels(120);\n+ }\n+\n+ layoutParams.setMargins(getScaledPixels(140), getScaledPixels(100),\n+ getScaledPixels(140), getScaledPixels(100));\n+ layoutParams.gravity = Gravity.CENTER;\n+ relativeLayout.setLayoutParams(layoutParams);\n+\n+ addCloseImageView(relativeLayout, closeImageView);\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -12,7 +12,6 @@ import android.graphics.drawable.Drawable;\nimport android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\n-import android.os.Handler;\nimport android.util.TypedValue;\nimport android.view.Gravity;\nimport android.view.LayoutInflater;\n@@ -102,68 +101,13 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n- int aspectHeight = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n- int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(80);\n-\n- if (aspectHeight > requiredHeight) {\n- layoutParams.height = requiredHeight;\n- layoutParams.width = (int) (requiredHeight / 1.78f);\n- } else {\n- layoutParams.height = aspectHeight;\n- }\n-\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawInterstitialTabletInApp(relativeLayout, layoutParams, fl, closeImageView);\n} else {\nif (isTablet()) {\n- int aspectHeight = (int) (\n- (relativeLayout1.getMeasuredWidth() - getScaledPixels(200)) * 1.78f);\n- int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(280);\n-\n- if (aspectHeight > requiredHeight) {\n- layoutParams.height = requiredHeight;\n- layoutParams.width = (int) (requiredHeight / 1.78f);\n- } else {\n- layoutParams.height = aspectHeight;\n- layoutParams.width = relativeLayout1.getMeasuredWidth() - getScaledPixels(\n- 200);\n- }\n-\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n- layoutHeight = layoutParams.height;\n-\n- relativeLayout1.setLayoutParams(layoutParams);\n-\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawInterstitialMobileInAppOnTablet(relativeLayout, layoutParams, fl,\n+ closeImageView);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.78f);\n- Logger.d(\"Layout height = \" + layoutHeight);\n- Logger.d(\"Layout width = \" + relativeLayout1.getMeasuredWidth());\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout1.getRight() - margin);\n- closeImageView.setY(relativeLayout1.getTop() - margin);\n- }\n- });\n+ redrawInterstitialInApp(relativeLayout1, layoutParams, closeImageView);\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -206,74 +150,19 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- final RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.interstitial_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\n- if (!inAppNotification.isTablet() || !isTablet()) {\n- if (isTablet()) {\n- int aspectWidth = (int) (\n- (relativeLayout1.getMeasuredHeight() - getScaledPixels(120)) * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(280);\n-\n- if (aspectWidth > requiredWidth) {\n- layoutParams.width = requiredWidth;\n- layoutParams.height = (int) (requiredWidth / 1.78f);\n- } else {\n- layoutParams.width = aspectWidth;\n- layoutParams.height = relativeLayout1.getMeasuredHeight()\n- - getScaledPixels(120);\n- }\n-\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(100),\n- getScaledPixels(140), getScaledPixels(100));\n- layoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n-\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n- } else {\n- layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight()\n- * 1.78f);\n- layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout1.getRight() - margin);\n- closeImageView.setY(relativeLayout1.getTop() - margin);\n- }\n- });\n- }\n+ if (inAppNotification.isTablet() && isTablet()) {\n+ redrawLandscapeInterstitialTabletInApp(relativeLayout, layoutParams, fl,\n+ closeImageView);\n} else {\n-\n- int aspectWidth = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(80);\n-\n- if (aspectWidth > requiredWidth) {\n- layoutParams.width = requiredWidth;\n- layoutParams.height = (int) (requiredWidth / 1.78f);\n+ if (isTablet()) {\n+ redrawLandscapeInterstitialMobileInAppOnTablet(relativeLayout, layoutParams,\n+ fl, closeImageView);\n} else {\n- layoutParams.width = aspectWidth;\n+ redrawLandscapeInterstitialInApp(relativeLayout, layoutParams,\n+ closeImageView);\n}\n-\n- layoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialImageFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialImageFragment.java",
"diff": "@@ -6,8 +6,6 @@ import android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\nimport android.os.Build;\nimport android.os.Bundle;\n-import android.os.Handler;\n-import android.view.Gravity;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -51,71 +49,16 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- final RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.interstitial_image_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n- int aspectHeight = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n- int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(80);\n-\n- if (aspectHeight > requiredHeight) {\n- layoutParams.height = requiredHeight;\n- layoutParams.width = (int) (requiredHeight / 1.78f);\n- } else {\n- layoutParams.height = aspectHeight;\n- }\n-\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawInterstitialTabletInApp(relativeLayout, layoutParams, fl, closeImageView);\n} else {\nif (isTablet()) {\n-\n- int aspectHeight = (int) (\n- (relativeLayout1.getMeasuredWidth() - getScaledPixels(200)) * 1.78f);\n- int requiredHeight = fl.getMeasuredHeight() - getScaledPixels(280);\n-\n- if (aspectHeight > requiredHeight) {\n- layoutParams.height = requiredHeight;\n- layoutParams.width = (int) (requiredHeight / 1.78f);\n+ redrawInterstitialMobileInAppOnTablet(relativeLayout, layoutParams, fl,\n+ closeImageView);\n} else {\n- layoutParams.height = aspectHeight;\n- layoutParams.width = relativeLayout1.getMeasuredWidth() - getScaledPixels(\n- 200);\n- }\n-\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n- layoutHeight = layoutParams.height;\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n-\n- } else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.78f);\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout1.getRight() - margin);\n- closeImageView.setY(relativeLayout1.getTop() - margin);\n- }\n- });\n+ redrawInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -131,76 +74,21 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- final RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.interstitial_image_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\n- if (!inAppNotification.isTablet() || !isTablet()) {\n- if (isTablet()) {\n-\n- int aspectWidth = (int) (\n- (relativeLayout1.getMeasuredHeight() - getScaledPixels(200)) * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(280);\n-\n- if (aspectWidth > requiredWidth) {\n- layoutParams.width = requiredWidth;\n- layoutParams.height = (int) (requiredWidth / 1.78f);\n+ if (inAppNotification.isTablet() && isTablet()) {\n+ redrawLandscapeInterstitialTabletInApp(relativeLayout, layoutParams, fl,\n+ closeImageView);\n} else {\n- layoutParams.width = aspectWidth;\n- layoutParams.height = relativeLayout1.getMeasuredHeight()\n- - getScaledPixels(200);\n- }\n-\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n- layoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n-\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ if (isTablet()) {\n+ redrawLandscapeInterstitialMobileInAppOnTablet(relativeLayout, layoutParams,\n+ fl, closeImageView);\n} else {\n- layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight()\n- * 1.78f);\n- layoutParams.gravity = Gravity.CENTER_HORIZONTAL;\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout1.getRight() - margin);\n- closeImageView.setY(relativeLayout1.getTop() - margin);\n+ redrawLandscapeInterstitialInApp(relativeLayout, layoutParams,\n+ closeImageView);\n}\n- });\n- }\n- } else {\n-\n- int aspectWidth = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(80);\n-\n- if (aspectWidth > requiredWidth) {\n- layoutParams.width = requiredWidth;\n- layoutParams.height = (int) (requiredWidth / 1.78f);\n- } else {\n- layoutParams.width = aspectWidth;\n}\n- layoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n- }\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\nrelativeLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);\n} else {\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": "@@ -5063,7 +5063,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nbuilder.setPeriodic(pingFrequency * Constants.ONE_MIN_IN_MILLIS, 5 * Constants.ONE_MIN_IN_MILLIS);\nbuilder.setRequiresBatteryNotLow(true);\n- if (this.deviceInfo.testPermission(context, \"android.permission.RECEIVE_BOOT_COMPLETED\")) {\n+ if (Utils.hasPermission(context, \"android.permission.RECEIVE_BOOT_COMPLETED\")) {\nbuilder.setPersisted(true);\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": "@@ -14,7 +14,6 @@ import android.telephony.TelephonyManager;\nimport android.util.DisplayMetrics;\nimport android.view.WindowManager;\nimport androidx.core.app.NotificationManagerCompat;\n-import androidx.core.content.ContextCompat;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n@@ -170,50 +169,7 @@ class DeviceInfo {\n@SuppressLint(\"MissingPermission\")\nprivate String getNetworkType() {\n- TelephonyManager mTelephonyManager = (TelephonyManager)\n- context.getSystemService(Context.TELEPHONY_SERVICE);\n- if (mTelephonyManager == null) {\n- return null;\n- }\n-\n- int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n-\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n- if (testPermission(context, \"android.permission.READ_PHONE_STATE\")) {\n- try {\n- networkType = mTelephonyManager.getDataNetworkType();\n- } catch (SecurityException se) {\n- Logger.d(\"Security Exception caught while fetch network type\" + se.getMessage());\n- }\n- } else {\n- Logger.d(\"READ_PHONE_STATE permission not asked by the app or not granted by the user\");\n- }\n- } else {\n- networkType = mTelephonyManager.getNetworkType();\n- }\n-\n- switch (networkType) {\n- case TelephonyManager.NETWORK_TYPE_GPRS:\n- case TelephonyManager.NETWORK_TYPE_EDGE:\n- case TelephonyManager.NETWORK_TYPE_CDMA:\n- case TelephonyManager.NETWORK_TYPE_1xRTT:\n- case TelephonyManager.NETWORK_TYPE_IDEN:\n- return \"2G\";\n- case TelephonyManager.NETWORK_TYPE_UMTS:\n- case TelephonyManager.NETWORK_TYPE_EVDO_0:\n- case TelephonyManager.NETWORK_TYPE_EVDO_A:\n- case TelephonyManager.NETWORK_TYPE_HSDPA:\n- case TelephonyManager.NETWORK_TYPE_HSUPA:\n- case TelephonyManager.NETWORK_TYPE_HSPA:\n- case TelephonyManager.NETWORK_TYPE_EVDO_B:\n- case TelephonyManager.NETWORK_TYPE_EHRPD:\n- case TelephonyManager.NETWORK_TYPE_HSPAP:\n- return \"3G\";\n- case TelephonyManager.NETWORK_TYPE_LTE:\n- return \"4G\";\n- default:\n- return null;\n- }\n+ return Utils.getDeviceNetworkType(context);\n}\nprivate boolean getNotificationEnabledForUser() {\n@@ -490,18 +446,6 @@ class DeviceInfo {\nreturn ret;\n}\n- /**\n- * Tests 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- @SuppressWarnings(\"SameParameterValue\")\n- boolean testPermission(final Context context, String permission) {\n- this.context = context;\n- return hasPermission(context, permission);\n- }\n-\nprivate String _getDeviceID() {\nsynchronized (deviceIDLock) {\nif (this.config.isDefaultInstance()) {\n@@ -676,13 +620,4 @@ class DeviceInfo {\nApplicationInfo ai = context.getApplicationInfo();\nreturn ai.icon;\n}\n-\n- @SuppressWarnings(\"WeakerAccess\")\n- 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}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"diff": "@@ -20,7 +20,7 @@ final class ManifestValidator {\nprivate final static String ourApplicationClassName = \"com.clevertap.android.sdk.Application\";\nstatic void validate(final Context context, DeviceInfo deviceInfo, PushProviders pushProviders) {\n- if (!deviceInfo.testPermission(context, \"android.permission.INTERNET\")) {\n+ if (!Utils.hasPermission(context, \"android.permission.INTERNET\")) {\nLogger.d(\"Missing Permission: android.permission.INTERNET\");\n}\ncheckSDKVersion(deviceInfo);\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": "@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.PackageManager;\nimport android.content.pm.ResolveInfo;\nimport android.graphics.Bitmap;\nimport android.graphics.BitmapFactory;\n@@ -18,6 +19,7 @@ import android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport androidx.annotation.RestrictTo;\n+import androidx.core.content.ContextCompat;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.InputStream;\n@@ -227,6 +229,7 @@ public final class Utils {\n}\n}\n+ @SuppressLint(\"MissingPermission\")\nstatic String getCurrentNetworkType(final Context context) {\ntry {\n// First attempt to check for WiFi connectivity\n@@ -235,19 +238,43 @@ public final class Utils {\nif (connManager == null) {\nreturn \"Unavailable\";\n}\n- @SuppressLint(\"MissingPermission\") NetworkInfo mWifi = connManager\n+ NetworkInfo mWifi = connManager\n.getNetworkInfo(ConnectivityManager.TYPE_WIFI);\nif (mWifi.isConnected()) {\nreturn \"WiFi\";\n}\n+ return getDeviceNetworkType(context);\n+\n+ } catch (Throwable t) {\n+ return \"Unavailable\";\n+ }\n+ }\n+\n+ @SuppressLint(\"MissingPermission\")\n+ static String getDeviceNetworkType(final Context context) {\n// Fall back to network type\nTelephonyManager teleMan = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);\nif (teleMan == null) {\nreturn \"Unavailable\";\n}\n- int networkType = teleMan.getNetworkType();\n+\n+ int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n+ if (hasPermission(context, \"android.permission.READ_PHONE_STATE\")) {\n+ try {\n+ networkType = teleMan.getDataNetworkType();\n+ } catch (SecurityException se) {\n+ Logger.d(\"Security Exception caught while fetch network type\" + se.getMessage());\n+ }\n+ } else {\n+ Logger.d(\"READ_PHONE_STATE permission not asked by the app or not granted by the user\");\n+ }\n+ } else {\n+ networkType = teleMan.getNetworkType();\n+ }\n+\nswitch (networkType) {\ncase TelephonyManager.NETWORK_TYPE_CDMA:\nreturn \"CDMA\";\n@@ -263,12 +290,11 @@ public final class Utils {\nreturn \"3G\";\ncase TelephonyManager.NETWORK_TYPE_LTE:\nreturn \"LTE\";\n+ case TelephonyManager.NETWORK_TYPE_NR:\n+ return \"5G\";\ndefault:\nreturn \"Unknown\";\n}\n- } catch (Throwable t) {\n- return \"Unavailable\";\n- }\n}\nstatic long getMemoryConsumption() {\n@@ -299,6 +325,20 @@ 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+ 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+\nstatic boolean validateCTID(String cleverTapID) {\nif (cleverTapID == null) {\nLogger.i(\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(NetworkInfo,Interstitial InApp): refactor code to remove duplicate SDK-353 |
116,623 | 27.09.2020 18:36:52 | -19,080 | a9b1ab7d2bafea6b115fa535db3fbbe1a4adefa3 | chore(refactor): Remove duplicate code and extended CTInAppBaseFragment from androidx Fragment | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselImageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselImageViewHolder.java",
"diff": "@@ -4,13 +4,13 @@ import android.app.Activity;\nimport android.content.Context;\nimport android.graphics.Color;\nimport android.os.Handler;\n-import android.view.Gravity;\nimport android.view.View;\nimport android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport androidx.annotation.NonNull;\n+import androidx.core.content.res.ResourcesCompat;\nimport androidx.viewpager.widget.ViewPager;\nclass CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\n@@ -18,6 +18,7 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\n/**\n* Custom PageChangeListener for Carousel\n*/\n+ @SuppressWarnings(\"InnerClassMayBeStatic\")\nclass CarouselPageChangeListener implements ViewPager.OnPageChangeListener {\nprivate Context context;\n@@ -34,7 +35,8 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.viewHolder = viewHolder;\nthis.dots = dots;\nthis.inboxMessage = inboxMessage;\n- this.dots[0].setImageDrawable(context.getResources().getDrawable(R.drawable.ct_selected_dot));\n+ this.dots[0].setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_selected_dot, null));\n}\n@Override\n@@ -49,9 +51,11 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\n@Override\npublic void onPageSelected(int position) {\nfor (ImageView dot : this.dots) {\n- dot.setImageDrawable(context.getResources().getDrawable(R.drawable.ct_unselected_dot));\n+ dot.setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_unselected_dot, null));\n}\n- dots[position].setImageDrawable(context.getResources().getDrawable(R.drawable.ct_selected_dot));\n+ dots[position].setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_selected_dot, null));\n}\n}\n@@ -105,20 +109,9 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.sliderDots.removeAllViews();\n}\nImageView[] dots = new ImageView[dotsCount];\n- for (int k = 0; k < dotsCount; k++) {\n- dots[k] = new ImageView(parent.getActivity());\n- dots[k].setVisibility(View.VISIBLE);\n- dots[k].setImageDrawable(appContext.getResources().getDrawable(R.drawable.ct_unselected_dot));\n- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,\n- LinearLayout.LayoutParams.WRAP_CONTENT);\n- params.setMargins(8, 6, 4, 6);\n- params.gravity = Gravity.CENTER;\n- if (this.sliderDots.getChildCount() < dotsCount) {\n- this.sliderDots.addView(dots[k], params);\n- }\n- }\n+ setDots(dots, dotsCount, appContext, this.sliderDots);\ndots[0].setImageDrawable(\n- parent.getActivity().getApplicationContext().getResources().getDrawable(R.drawable.ct_selected_dot));\n+ ResourcesCompat.getDrawable(appContext.getResources(), R.drawable.ct_selected_dot, null));\nCTCarouselImageViewHolder.CarouselPageChangeListener carouselPageChangeListener\n= new CTCarouselImageViewHolder.CarouselPageChangeListener(\nparent.getActivity().getApplicationContext(), this, dots, inboxMessage);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselMessageViewHolder.java",
"diff": "@@ -4,13 +4,13 @@ import android.app.Activity;\nimport android.content.Context;\nimport android.graphics.Color;\nimport android.os.Handler;\n-import android.view.Gravity;\nimport android.view.View;\nimport android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport androidx.annotation.NonNull;\n+import androidx.core.content.res.ResourcesCompat;\nimport androidx.viewpager.widget.ViewPager;\n/**\n@@ -37,7 +37,8 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.viewHolder = viewHolder;\nthis.dots = dots;\nthis.inboxMessage = inboxMessage;\n- this.dots[0].setImageDrawable(context.getResources().getDrawable(R.drawable.ct_selected_dot));\n+ this.dots[0].setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_selected_dot, null));\n}\n@Override\n@@ -52,9 +53,11 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\n@Override\npublic void onPageSelected(int position) {\nfor (ImageView dot : this.dots) {\n- dot.setImageDrawable(context.getResources().getDrawable(R.drawable.ct_unselected_dot));\n+ dot.setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_unselected_dot, null));\n}\n- dots[position].setImageDrawable(context.getResources().getDrawable(R.drawable.ct_selected_dot));\n+ dots[position].setImageDrawable(\n+ ResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_selected_dot, null));\nviewHolder.title.setText(inboxMessage.getInboxMessageContents().get(position).getTitle());\nviewHolder.title.setTextColor(\nColor.parseColor(inboxMessage.getInboxMessageContents().get(position).getTitleColor()));\n@@ -121,20 +124,9 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.sliderDots.removeAllViews();\n}\nImageView[] dots = new ImageView[dotsCount];\n- for (int k = 0; k < dotsCount; k++) {\n- dots[k] = new ImageView(parent.getActivity());\n- dots[k].setVisibility(View.VISIBLE);\n- dots[k].setImageDrawable(appContext.getResources().getDrawable(R.drawable.ct_unselected_dot));\n- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,\n- LinearLayout.LayoutParams.WRAP_CONTENT);\n- params.setMargins(8, 6, 4, 6);\n- params.gravity = Gravity.CENTER;\n- if (this.sliderDots.getChildCount() < dotsCount) {\n- this.sliderDots.addView(dots[k], params);\n- }\n- }\n+ setDots(dots, dotsCount, appContext, this.sliderDots);\ndots[0].setImageDrawable(\n- parent.getActivity().getApplicationContext().getResources().getDrawable(R.drawable.ct_selected_dot));\n+ ResourcesCompat.getDrawable(appContext.getResources(), R.drawable.ct_selected_dot, null));\nCTCarouselMessageViewHolder.CarouselPageChangeListener carouselPageChangeListener\n= new CTCarouselMessageViewHolder.CarouselPageChangeListener(\nparent.getActivity().getApplicationContext(), this, dots, inboxMessage);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTCarouselViewPagerAdapter.java",
"diff": "@@ -65,34 +65,23 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\ntry {\nif (inboxMessage.getOrientation().equalsIgnoreCase(\"l\")) {\nImageView imageView = view.findViewById(R.id.imageView);\n- imageView.setVisibility(View.VISIBLE);\n- try {\n- Glide.with(imageView.getContext())\n- .load(carouselImages.get(position))\n- .apply(new RequestOptions()\n- .placeholder(Utils.getThumbnailImage(context, Constants.IMAGE_PLACEHOLDER))\n- .error(Utils.getThumbnailImage(context, Constants.IMAGE_PLACEHOLDER)))\n- .into(imageView);\n- } catch (NoSuchMethodError error) {\n- Logger.d(\n- \"CleverTap SDK requires Glide v4.9.0 or above. Please refer CleverTap Documentation for more info\");\n- Glide.with(imageView.getContext())\n- .load(carouselImages.get(position))\n- .into(imageView);\n+ addImageAndSetClick(imageView, view, position, container);\n+ } else if (inboxMessage.getOrientation().equalsIgnoreCase(\"p\")) {\n+ ImageView imageView = view.findViewById(R.id.squareImageView);\n+ addImageAndSetClick(imageView, view, position, container);\n+ }\n+ } catch (NoClassDefFoundError error) {\n+ Logger.d(\"CleverTap SDK requires Glide dependency. Please refer CleverTap Documentation for more info\");\n+ }\n+ return view;\n}\n- container.addView(view, layoutParams);\n- view.setOnClickListener(new View.OnClickListener() {\n@Override\n- public void onClick(View v) {\n- CTInboxListViewFragment parent = getParent();\n- if (parent != null) {\n- parent.handleViewPagerClick(row, position);\n- }\n+ public boolean isViewFromObject(@NonNull View view, @NonNull Object o) {\n+ return view == o;\n}\n- });\n- } else if (inboxMessage.getOrientation().equalsIgnoreCase(\"p\")) {\n- ImageView imageView = view.findViewById(R.id.squareImageView);\n+\n+ void addImageAndSetClick(ImageView imageView, View view, final int position, ViewGroup container) {\nimageView.setVisibility(View.VISIBLE);\ntry {\nGlide.with(imageView.getContext())\n@@ -119,17 +108,6 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\n}\n}\n});\n-\n- }\n- } catch (NoClassDefFoundError error) {\n- Logger.d(\"CleverTap SDK requires Glide dependency. Please refer CleverTap Documentation for more info\");\n- }\n- return view;\n- }\n-\n- @Override\n- public boolean isViewFromObject(@NonNull View view, @NonNull Object o) {\n- return view == o;\n}\nCTInboxListViewFragment getParent() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"diff": "package com.clevertap.android.sdk;\nimport android.app.Activity;\n-import android.app.Fragment;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.net.Uri;\n@@ -9,6 +8,7 @@ import android.os.Bundle;\nimport android.util.TypedValue;\nimport android.view.View;\nimport androidx.annotation.Nullable;\n+import androidx.fragment.app.Fragment;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\nimport java.util.Set;\n@@ -44,14 +44,14 @@ public abstract class CTInAppBaseFragment extends Fragment {\nAtomicBoolean isCleanedUp = new AtomicBoolean();\n- Activity parent;\n-\nprivate WeakReference<CTInAppBaseFragment.InAppListener> listenerWeakReference;\n+ Context context;\n+\n@Override\n- public void onAttach(Activity activity) {\n- super.onAttach(activity);\n- parent = activity;\n+ public void onAttach(Context context) {\n+ super.onAttach(context);\n+ this.context = context;\nBundle bundle = getArguments();\ninAppNotification = bundle.getParcelable(Constants.INAPP_KEY);\nconfig = bundle.getParcelable(Constants.KEY_CONFIG);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "@@ -8,6 +8,7 @@ import android.view.WindowManager;\nimport android.widget.FrameLayout;\nimport android.widget.FrameLayout.LayoutParams;\nimport android.widget.RelativeLayout;\n+import androidx.fragment.app.FragmentActivity;\npublic abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n@@ -27,8 +28,8 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n@Override\nvoid generateListener() {\n- if (parent instanceof InAppNotificationActivity) {\n- setListener((CTInAppBaseFragment.InAppListener) parent);\n+ if ( (FragmentActivity) context instanceof InAppNotificationActivity) {\n+ setListener((CTInAppBaseFragment.InAppListener) context);\n}\n}\n@@ -36,7 +37,7 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\nif (Utils.isActivityDead(getActivity())) {\nreturn false;\n}\n- WindowManager wm = (WindowManager) parent.getBaseContext().getSystemService(Context.WINDOW_SERVICE);\n+ WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);\nif (wm == null) {\nLogger.v(\"Screen size is null \");\nreturn false;\n@@ -101,6 +102,24 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\naddCloseImageView(relativeLayout, closeImageView);\n}\n+ void redrawHalfInterstitialInApp(\n+ final RelativeLayout relativeLayout, LayoutParams layoutParams, CloseImageView closeImageView){\n+ layoutParams.height = (int) (relativeLayout.getMeasuredWidth()\n+ * 1.3f);\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout,closeImageView);\n+ }\n+\n+ void redrawHalfInterstitialMobileInAppOnTablet(RelativeLayout relativeLayout, LayoutParams layoutParams, CloseImageView closeImageView){\n+ layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n+ getScaledPixels(140), getScaledPixels(140));\n+ layoutParams.width = relativeLayout.getMeasuredWidth() - getScaledPixels(\n+ 210);\n+ layoutParams.height = (int) (layoutParams.width * 1.3f);\n+ relativeLayout.setLayoutParams(layoutParams);\n+ addCloseImageView(relativeLayout,closeImageView);\n+ }\n+\nvoid redrawLandscapeInterstitialInApp(final RelativeLayout relativeLayout, LayoutParams layoutParams,\nCloseImageView closeImageView) {\nlayoutParams.width = (int) (relativeLayout.getMeasuredHeight()\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\nimport android.app.Activity;\n+import android.content.Context;\nimport android.content.res.Configuration;\nimport android.graphics.drawable.ColorDrawable;\nimport android.os.Build;\n@@ -12,6 +13,8 @@ import android.view.ViewGroup;\nimport android.webkit.WebView;\nimport android.webkit.WebViewClient;\nimport android.widget.RelativeLayout;\n+import android.widget.RelativeLayout.LayoutParams;\n+import androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport java.net.URLDecoder;\n@@ -29,7 +32,7 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\ntry {\nformData = UriHelper.getAllKeyValuePairs(url, false);\n- if (formData != null && formData.containsKey(Constants.KEY_C2A)) {\n+ if (formData.containsKey(Constants.KEY_C2A)) {\nfinal String c2a = formData.getString(Constants.KEY_C2A);\nif (c2a != null) {\nfinal String[] parts = c2a.split(\"__dl__\");\n@@ -54,8 +57,8 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nprotected CTInAppWebView webView;\n@Override\n- public void onAttach(Activity activity) {\n- super.onAttach(activity);\n+ public void onAttach(Context context) {\n+ super.onAttach(context);\n}\n@Override\n@@ -76,15 +79,15 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\n}\n@Override\n- public void onConfigurationChanged(Configuration newConfig) {\n+ public void onConfigurationChanged(@NonNull Configuration newConfig) {\nsuper.onConfigurationChanged(newConfig);\nreDrawInApp();\n}\nprotected RelativeLayout.LayoutParams getLayoutParamsForCloseButton() {\nRelativeLayout.LayoutParams closeIvLp = new RelativeLayout\n- .LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,\n- RelativeLayout.LayoutParams.FILL_PARENT);\n+ .LayoutParams(LayoutParams.MATCH_PARENT,\n+ LayoutParams.MATCH_PARENT);\n// Position it at the top right corner\ncloseIvLp.addRule(RelativeLayout.ABOVE, webView.getId());\ncloseIvLp.addRule(RelativeLayout.RIGHT_OF, webView.getId());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullNativeFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullNativeFragment.java",
"diff": "@@ -38,38 +38,20 @@ public abstract class CTInAppBaseFullNativeFragment extends CTInAppBaseFullFragm\nShapeDrawable shapeDrawable = null;\nif (!inAppNotificationButton.getBorderRadius().isEmpty()) {\n+ float value = Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2;\nshapeDrawable = new ShapeDrawable(new RoundRectShape(new float[]{\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2}, null,\n+ value, value, value, value,\n+ value, value, value, value\n+ }, null,\nnew float[]{0, 0, 0, 0, 0, 0, 0, 0}));\nshapeDrawable.getPaint().setColor(Color.parseColor(inAppNotificationButton.getBackgroundColor()));\nshapeDrawable.getPaint().setStyle(Paint.Style.FILL);\nshapeDrawable.getPaint().setAntiAlias(true);\nborderDrawable = new ShapeDrawable(new RoundRectShape(new float[]{\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2}, null,\n- new float[]{\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI()) * 2,\n- Float.parseFloat(inAppNotificationButton.getBorderRadius()) * (480.0f / getDPI())\n- * 2}));\n+ value, value, value, value,\n+ value, value, value, value}, null,\n+ new float[]{value, value, value, value,\n+ value, value, value, value}));\n}\nif (!inAppNotificationButton.getBorderColor().isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialFragment.java",
"diff": "package com.clevertap.android.sdk;\n-import android.app.FragmentManager;\n-import android.app.FragmentTransaction;\n+import androidx.fragment.app.FragmentManager;\n+import androidx.fragment.app.FragmentTransaction;\npublic abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n@@ -28,7 +28,7 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n@Override\nvoid cleanup() {\nif (!Utils.isActivityDead(getActivity()) && !isCleanedUp.get()) {\n- final FragmentManager fragmentManager = parent.getFragmentManager();\n+ final FragmentManager fragmentManager = getFragmentManager();\nFragmentTransaction transaction = fragmentManager.beginTransaction();\ntry {\ntransaction.remove(this).commit();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialHtmlFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBasePartialHtmlFragment.java",
"diff": "@@ -14,6 +14,7 @@ import android.view.animation.AnimationSet;\nimport android.view.animation.TranslateAnimation;\nimport android.webkit.WebView;\nimport android.webkit.WebViewClient;\n+import androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport java.net.URLDecoder;\n@@ -32,7 +33,7 @@ public abstract class CTInAppBasePartialHtmlFragment extends CTInAppBasePartialF\ntry {\nformData = UriHelper.getAllKeyValuePairs(url, false);\n- if (formData != null && formData.containsKey(Constants.KEY_C2A)) {\n+ if (formData.containsKey(Constants.KEY_C2A)) {\nfinal String c2a = formData.getString(Constants.KEY_C2A);\nif (c2a != null) {\nfinal String[] parts = c2a.split(\"__dl__\");\n@@ -111,7 +112,7 @@ public abstract class CTInAppBasePartialHtmlFragment extends CTInAppBasePartialF\n@Nullable\n@Override\n- public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {\n+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {\nreturn displayHTMLView(inflater, container);\n}\n@@ -122,7 +123,7 @@ public abstract class CTInAppBasePartialHtmlFragment extends CTInAppBasePartialF\n}\n@Override\n- public void onConfigurationChanged(Configuration newConfig) {\n+ public void onConfigurationChanged(@NonNull Configuration newConfig) {\nsuper.onConfigurationChanged(newConfig);\nreDrawInApp();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialFragment.java",
"diff": "@@ -57,52 +57,16 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.half_interstitial_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawHalfInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n} else {\nif (isTablet()) {\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n- layoutParams.width = relativeLayout1.getMeasuredWidth() - getScaledPixels(\n- 210);\n- layoutHeight = layoutParams.height = (int) (layoutParams.width * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n-\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawHalfInterstitialMobileInAppOnTablet(relativeLayout, layoutParams,\n+ closeImageView);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n-\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawHalfInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"diff": "@@ -51,51 +51,16 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.half_interstitial_image_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawHalfInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n} else {\nif (isTablet()) {\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n- layoutParams.width = relativeLayout1.getMeasuredWidth() - getScaledPixels(\n- 210);\n- layoutHeight = layoutParams.height = (int) (layoutParams.width * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n-\n+ redrawHalfInterstitialMobileInAppOnTablet(relativeLayout, layoutParams,\n+ closeImageView);\n} else {\n- layoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth()\n- * 1.3f);\n- relativeLayout1.setLayoutParams(layoutParams);\n- new Handler().post(new Runnable() {\n- @Override\n- public void run() {\n- int margin = closeImageView.getMeasuredWidth() / 2;\n- closeImageView.setX(relativeLayout.getRight() - margin);\n- closeImageView.setY(relativeLayout.getTop() - margin);\n- }\n- });\n+ redrawHalfInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -111,19 +76,17 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl\n- .findViewById(R.id.half_interstitial_image_relative_layout);\n- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\nif (!inAppNotification.isTablet() || !isTablet()) {\nif (isTablet()) {\nlayoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\ngetScaledPixels(140), getScaledPixels(140));\n- layoutParams.height = relativeLayout1.getMeasuredHeight() - getScaledPixels(\n+ layoutParams.height = relativeLayout.getMeasuredHeight() - getScaledPixels(\n210);\nlayoutParams.width = (int) (layoutParams.height * 1.3f);\nlayoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n+ relativeLayout.setLayoutParams(layoutParams);\nnew Handler().post(new Runnable() {\n@Override\n@@ -134,10 +97,10 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n}\n});\n} else {\n- layoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight()\n+ layoutWidth = layoutParams.width = (int) (relativeLayout.getMeasuredHeight()\n* 1.3f);\nlayoutParams.gravity = Gravity.CENTER_HORIZONTAL;\n- relativeLayout1.setLayoutParams(layoutParams);\n+ relativeLayout.setLayoutParams(layoutParams);\nnew Handler().post(new Runnable() {\n@Override\npublic void run() {\n@@ -148,9 +111,9 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n});\n}\n} else {\n- layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.3f);\n+ layoutParams.width = (int) (relativeLayout.getMeasuredHeight() * 1.3f);\nlayoutParams.gravity = Gravity.CENTER;\n- relativeLayout1.setLayoutParams(layoutParams);\n+ relativeLayout.setLayoutParams(layoutParams);\nnew Handler().post(new Runnable() {\n@Override\npublic void run() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -117,33 +117,6 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n- if (!inAppNotification.getMediaList().isEmpty()) {\n- if (inAppNotification.getMediaList().get(0).isImage()) {\n- Bitmap image = inAppNotification.getImage(inAppNotification.getMediaList().get(0));\n- if (image != null) {\n- ImageView imageView = relativeLayout.findViewById(R.id.backgroundImage);\n- imageView.setVisibility(View.VISIBLE);\n- imageView.setImageBitmap(\n- inAppNotification.getImage(inAppNotification.getMediaList().get(0)));\n- }\n- } else if (inAppNotification.getMediaList().get(0).isGIF()) {\n- if (inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)) != null) {\n- gifImageView = relativeLayout.findViewById(R.id.gifImage);\n- gifImageView.setVisibility(View.VISIBLE);\n- gifImageView.setBytes(\n- inAppNotification.getGifByteArray(inAppNotification.getMediaList().get(0)));\n- gifImageView.startAnimation();\n- }\n- } else if (inAppNotification.getMediaList().get(0).isVideo()) {\n- initFullScreenDialog();\n- prepareMedia();\n- playMedia();\n- } else if (inAppNotification.getMediaList().get(0).isAudio()) {\n- prepareMedia();\n- playMedia();\n- disableFullScreenButton();\n- }\n- }\nbreak;\ncase Configuration.ORIENTATION_LANDSCAPE:\nrelativeLayout.getViewTreeObserver()\n@@ -172,6 +145,9 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n}\n}\n});\n+ break;\n+ }\n+\nif (!inAppNotification.getMediaList().isEmpty()) {\nif (inAppNotification.getMediaList().get(0).isImage()) {\nBitmap image = inAppNotification.getImage(inAppNotification.getMediaList().get(0));\n@@ -199,8 +175,6 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\ndisableFullScreenButton();\n}\n}\n- break;\n- }\nLinearLayout linearLayout = relativeLayout.findViewById(R.id.interstitial_linear_layout);\nButton mainButton = linearLayout.findViewById(R.id.interstitial_button1);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxBaseMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxBaseMessageViewHolder.java",
"diff": "@@ -19,6 +19,7 @@ import android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\nimport androidx.annotation.NonNull;\n+import androidx.core.content.res.ResourcesCompat;\nimport androidx.recyclerview.widget.RecyclerView;\nimport com.google.android.exoplayer2.SimpleExoPlayer;\nimport com.google.android.exoplayer2.source.hls.HlsMediaSource;\n@@ -261,6 +262,22 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n}\n}\n+ void setDots(ImageView[] dots, int dotsCount, Context appContext, LinearLayout sliderDots) {\n+ for (int k = 0; k < dotsCount; k++) {\n+ dots[k] = new ImageView(appContext);\n+ dots[k].setVisibility(View.VISIBLE);\n+ dots[k].setImageDrawable(\n+ ResourcesCompat.getDrawable(appContext.getResources(), R.drawable.ct_unselected_dot, null));\n+ LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,\n+ LinearLayout.LayoutParams.WRAP_CONTENT);\n+ params.setMargins(8, 6, 4, 6);\n+ params.gravity = Gravity.CENTER;\n+ if (sliderDots.getChildCount() < dotsCount) {\n+ sliderDots.addView(dots[k], params);\n+ }\n+ }\n+ }\n+\nboolean shouldAutoPlay() {\nreturn firstContentItem.mediaIsVideo();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"diff": "@@ -56,7 +56,7 @@ public class CTInboxListViewFragment extends Fragment {\nprivate int tabPosition;\n@Override\n- public void onAttach(Context context) {\n+ public void onAttach(@NonNull Context context) {\nsuper.onAttach(context);\nBundle bundle = getArguments();\nif (bundle != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(refactor): Remove duplicate code and extended CTInAppBaseFragment from androidx Fragment SDK-84 |
116,623 | 27.09.2020 19:25:20 | -19,080 | 0b087b3b7a121c629c7e200b6ccb01a841aa3e8a | task(androidx): refactor for androidx fragment class | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullHtmlFragment.java",
"diff": "package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\n-import android.app.Activity;\nimport android.content.Context;\nimport android.content.res.Configuration;\nimport android.graphics.drawable.ColorDrawable;\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": "@@ -10,8 +10,6 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\nimport android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.app.AlarmManager;\n-import android.app.Fragment;\n-import android.app.FragmentTransaction;\nimport android.app.Notification;\nimport android.app.NotificationChannel;\nimport android.app.NotificationChannelGroup;\n@@ -49,6 +47,9 @@ import androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\nimport androidx.core.app.NotificationCompat;\n+import androidx.fragment.app.Fragment;\n+import androidx.fragment.app.FragmentActivity;\n+import androidx.fragment.app.FragmentTransaction;\nimport com.android.installreferrer.api.InstallReferrerClient;\nimport com.android.installreferrer.api.InstallReferrerStateListener;\nimport com.android.installreferrer.api.ReferrerDetails;\n@@ -99,6 +100,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n+\n/**\n* <h1>CleverTapAPI</h1>\n* This is the main CleverTapAPI class that manages the SDK instances\n@@ -4886,10 +4888,11 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (canShow) {\nif (currentlyDisplayingInApp != null && ((System.currentTimeMillis() / 1000) < currentlyDisplayingInApp\n.getTimeToLive())) {\n- Fragment inAppFragment = activity.getFragmentManager()\n+ Fragment inAppFragment = ((FragmentActivity) activity).getSupportFragmentManager()\n.getFragment(new Bundle(), currentlyDisplayingInApp.getType());\nif (getCurrentActivity() != null && inAppFragment != null) {\n- FragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager()\n+ FragmentTransaction fragmentTransaction = ((FragmentActivity) activity)\n+ .getSupportFragmentManager()\n.beginTransaction();\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", currentlyDisplayingInApp);\n@@ -8697,7 +8700,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nLogger.d(\"Displaying In-App: \" + inAppNotification.getJsonDescription());\ntry {\n//noinspection ConstantConditions\n- FragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager()\n+ FragmentTransaction fragmentTransaction = ((FragmentActivity) getCurrentActivity())\n+ .getSupportFragmentManager()\n.beginTransaction();\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", inAppNotification);\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": "@@ -90,7 +90,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nbundle.putParcelable(\"inApp\", inAppNotification);\nbundle.putParcelable(\"config\", config);\ncontentFragment.setArguments(bundle);\n- getFragmentManager().beginTransaction()\n+ getSupportFragmentManager().beginTransaction()\n.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out)\n.add(android.R.id.content, contentFragment, getFragmentTag())\n.commit();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(androidx): refactor for androidx fragment class SDK-84 |
116,612 | 28.09.2020 17:50:33 | -19,080 | df375095f94ce629f0f4c9ff85331f380804518c | task: configure gradle for core-sdk versioning | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.9.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:4.0.0'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.9.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-4.0.0', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.9.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:4.0.0'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "buildscript {\next.kotlin_version = '1.3.72'\next.jacocoVersion = '0.8.4'\n+ ext.coreVersion = \"4.0.0\"\nrepositories {\ngoogle()// Google's Maven repository\njcenter()\n@@ -34,3 +35,10 @@ allprojects {\ntask clean(type: Delete) {\ndelete rootProject.buildDir\n}\n+\n+task copyTemplates(type: Copy) {\n+ outputs.upToDateWhen { false }\n+ from 'templates/README.md'\n+ into \".\"\n+ expand('ctCoreVersion': \"$coreVersion\")\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/build.gradle",
"new_path": "clevertap-core/build.gradle",
"diff": "@@ -61,7 +61,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '4.0.0'\n+ libraryVersion = \"$coreVersion\"\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -71,7 +71,7 @@ ext {\nlicenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'\nallLicenses = [\"Apache-2.0\"]\n}\n-\n+def (major,minor,patch) = libraryVersion.split(\"\\\\.\")\nversion = libraryVersion\ngroup = publishedGroupId\n@@ -81,18 +81,20 @@ android {\ndefaultConfig {\nminSdkVersion 16\ntargetSdkVersion 29\n+ versionCode \"${major}0${minor}0${patch}\".toInteger()\n+ versionName libraryVersion\n}\nbuildTypes {\ndebug {\ntestCoverageEnabled true //To get coverage reports for instrumentation tests\nbuildConfigField \"String\", \"SDK_VERSION_STRING\",\n- '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:4.0.0.0\"'\n+ \"\\\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:$major.$minor.$patch.0\\\"\"\n}\nrelease {\nbuildConfigField \"String\", \"SDK_VERSION_STRING\",\n- '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:4.0.0.0\"'\n+ \"\\\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:$major.$minor.$patch.0\\\"\"\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/AndroidManifest.xml",
"new_path": "clevertap-core/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest package=\"com.clevertap.android.sdk\"\n- xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- android:versionCode=\"40000\"\n- android:versionName=\"4.0.0\">\n+ xmlns:android=\"http://schemas.android.com/apk/res/android\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.pushnotification.CTPushNotificationReceiver\"\nandroid:enabled=\"true\"\n- android:exported=\"false\"></receiver>\n+ android:exported=\"false\" />\n<service\nandroid:name=\"com.clevertap.android.sdk.pushnotification.amp.CTBackgroundIntentService\"\n<service\nandroid:name=\"com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService\"\nandroid:exported=\"false\"\n- android:permission=\"android.permission.BIND_JOB_SERVICE\"></service>\n+ android:permission=\"android.permission.BIND_JOB_SERVICE\" />\n</application>\n</manifest>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task: configure gradle for core-sdk versioning SDK-421 |
116,621 | 28.09.2020 22:16:27 | -19,080 | 1c627b44cc97319850e06baa2855a8e0f6152788 | chore(test): handled crash during testing & added logs | [
{
"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": "@@ -5807,7 +5807,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\ngetConfigLogger().verbose(getAccountId(),\n\"Google Play Install Referrer's InstallReferrerClient Class not found - \" + t\n.getLocalizedMessage()\n- + \" \\n Please add implementation 'com.android.installreferrer:installreferrer:1.0' to your build.gradle\");\n+ + \" \\n Please add implementation 'com.android.installreferrer:installreferrer:2.1' to your build.gradle\");\n}\n}\n"
},
{
"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": "package com.clevertap.android.sdk;\n+import static com.clevertap.android.sdk.JsonUtil.toJsonArray;\n+import static com.clevertap.android.sdk.JsonUtil.toList;\n+import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAll;\n+\nimport android.content.Context;\nimport android.os.Parcel;\nimport android.os.Parcelable;\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\n-import com.clevertap.android.sdk.pushnotification.PushConstants;\nimport java.util.ArrayList;\n-import org.json.JSONArray;\nimport org.json.JSONObject;\npublic class CleverTapInstanceConfig implements Parcelable {\n@@ -34,7 +36,30 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate String accountToken;\n@NonNull\n- private final ArrayList<String> allowedPushTypes = PushConstants.PushType.getAll();\n+ private ArrayList<String> allowedPushTypes = getAll();\n+\n+ CleverTapInstanceConfig(CleverTapInstanceConfig config) {\n+ this.accountId = config.accountId;\n+ this.accountToken = config.accountToken;\n+ this.accountRegion = config.accountRegion;\n+ this.isDefaultInstance = config.isDefaultInstance;\n+ this.analyticsOnly = config.analyticsOnly;\n+ this.personalization = config.personalization;\n+ this.debugLevel = config.debugLevel;\n+ this.logger = config.logger;\n+ this.useGoogleAdId = config.useGoogleAdId;\n+ this.disableAppLaunchedEvent = config.disableAppLaunchedEvent;\n+ this.createdPostAppLaunch = config.createdPostAppLaunch;\n+ this.sslPinning = config.sslPinning;\n+ this.backgroundSync = config.backgroundSync;\n+ this.enableCustomCleverTapId = config.enableCustomCleverTapId;\n+ this.fcmSenderId = config.fcmSenderId;\n+ this.enableABTesting = config.enableABTesting;\n+ this.enableUIEditor = config.enableUIEditor;\n+ this.packageName = config.packageName;\n+ this.beta = config.beta;\n+ this.allowedPushTypes = config.allowedPushTypes;\n+ }\nprivate boolean analyticsOnly;\n@@ -115,29 +140,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.beta = manifest.enableBeta();\n}\n- CleverTapInstanceConfig(CleverTapInstanceConfig config) {\n- this.accountId = config.accountId;\n- this.accountToken = config.accountToken;\n- this.accountRegion = config.accountRegion;\n- this.isDefaultInstance = config.isDefaultInstance;\n- this.analyticsOnly = config.analyticsOnly;\n- this.personalization = config.personalization;\n- this.debugLevel = config.debugLevel;\n- this.logger = config.logger;\n- this.useGoogleAdId = config.useGoogleAdId;\n- this.disableAppLaunchedEvent = config.disableAppLaunchedEvent;\n- this.createdPostAppLaunch = config.createdPostAppLaunch;\n- this.sslPinning = config.sslPinning;\n- this.backgroundSync = config.backgroundSync;\n- this.enableCustomCleverTapId = config.enableCustomCleverTapId;\n- this.fcmSenderId = config.fcmSenderId;\n- this.enableABTesting = config.enableABTesting;\n- this.enableUIEditor = config.enableUIEditor;\n- this.packageName = config.packageName;\n- this.beta = config.beta;\n- setAllowedPushTypes(PushConstants.PushType.getPushTypes(config.allowedPushTypes));\n- }\n-\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\ntry {\nJSONObject configJsonObject = new JSONObject(jsonString);\n@@ -196,16 +198,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nif (configJsonObject.has(Constants.KEY_BETA)) {\nthis.beta = configJsonObject.getBoolean(Constants.KEY_BETA);\n}\n- if (configJsonObject.has(Constants.KEY_ALLOWED_TRANSPORT)) {\n- JSONArray array = configJsonObject.getJSONArray(Constants.KEY_ALLOWED_TRANSPORT);\n- if (array != null) {\n- ArrayList<String> list = new ArrayList<>();\n- for (int i = 0; i < array.length(); i++) {\n- list.add(array.getString(i));\n- }\n-\n- setAllowedPushTypes(PushConstants.PushType.getPushTypes(list));\n- }\n+ if (configJsonObject.has(Constants.KEY_ALLOWED_PUSH_TYPES)) {\n+ this.allowedPushTypes = (ArrayList<String>) toList(\n+ configJsonObject.getJSONArray(Constants.KEY_ALLOWED_PUSH_TYPES));\n}\n} catch (Throwable t) {\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString + \": \", t.getCause());\n@@ -233,10 +228,15 @@ public class CleverTapInstanceConfig implements Parcelable {\npackageName = in.readString();\nlogger = new Logger(debugLevel);\nbeta = in.readByte() != 0x00;\n- allowedPushTypes.clear();\n+ allowedPushTypes = new ArrayList<>();\nin.readList(allowedPushTypes, String.class.getClassLoader());\n}\n+ @NonNull\n+ public ArrayList<String> getAllowedPushTypes() {\n+ return allowedPushTypes;\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n@@ -261,20 +261,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn accountToken;\n}\n- @NonNull\n- public PushConstants.PushType[] getAllowedPushTypes() {\n- return PushConstants.PushType.getPushTypes(allowedPushTypes);\n- }\n-\n- public void setAllowedPushTypes(PushConstants.PushType... allowedTransports) {\n- if (allowedTransports != null && allowedTransports.length > 0) {\n- this.allowedPushTypes.clear();\n- for (PushConstants.PushType allowedTransport : allowedTransports) {\n- this.allowedPushTypes.add(allowedTransport.name());\n- }\n- }\n- }\n-\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic int getDebugLevel() {\nreturn debugLevel;\n@@ -450,7 +436,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nconfigJsonObject.put(Constants.KEY_BETA, isBeta());\nconfigJsonObject.put(Constants.KEY_ENABLE_UIEDITOR, isUIEditorEnabled());\nconfigJsonObject.put(Constants.KEY_ENABLE_ABTEST, isABTestingEnabled());\n- configJsonObject.put(Constants.KEY_ALLOWED_TRANSPORT, jsonArrayOfAllowedPushTypes());\n+ configJsonObject.put(Constants.KEY_ALLOWED_PUSH_TYPES, toJsonArray(allowedPushTypes));\nreturn configJsonObject.toString();\n} catch (Throwable e) {\nLogger.v(\"Unable to convert config to JSON : \", e.getCause());\n@@ -462,14 +448,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn \"[\" + ((!TextUtils.isEmpty(tag) ? \": \" + tag : \"\") + \":\" + accountId + \"]\");\n}\n- private JSONArray jsonArrayOfAllowedPushTypes() {\n- JSONArray jsonArray = new JSONArray();\n- for (String allowedPushType : allowedPushTypes) {\n- jsonArray.put(allowedPushType);\n- }\n- return jsonArray;\n- }\n-\n// convenience to construct the internal only default config\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\nprotected static CleverTapInstanceConfig createDefaultInstance(Context context, @NonNull String accountId,\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": "@@ -173,7 +173,7 @@ public interface Constants {\nString KEY_PACKAGE_NAME = \"packageName\";\nString KEY_ENABLE_UIEDITOR = \"enableUIEditor\";\nString KEY_ENABLE_ABTEST = \"enableABTesting\";\n- String KEY_ALLOWED_TRANSPORT = \"allowedTransport\";\n+ String KEY_ALLOWED_PUSH_TYPES = \"allowedPushTypes\";\nString WZRK_PUSH_ID = \"wzrk_pid\";\nString NOTIF_MSG = \"nm\";\nString NOTIF_TITLE = \"nt\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/JsonUtil.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import androidx.annotation.NonNull;\n+import java.util.ArrayList;\n+import java.util.List;\n+import org.json.JSONArray;\n+import org.json.JSONException;\n+\n+public class JsonUtil {\n+\n+ public static JSONArray toJsonArray(@NonNull List<?> list) {\n+ JSONArray array = new JSONArray();\n+ for (Object item : list) {\n+ if (item != null) {\n+ array.put(item);\n+ }\n+ }\n+ return array;\n+ }\n+\n+ public static ArrayList<?> toList(@NonNull JSONArray array) {\n+ ArrayList<Object> list = new ArrayList<>();\n+ for (int i = 0; i < array.length(); i++) {\n+ try {\n+ list.add(array.get(i));\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ }\n+ return list;\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/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -5,7 +5,6 @@ import androidx.annotation.NonNull;\nimport androidx.annotation.StringDef;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\n-import java.util.ArrayList;\npublic interface PushConstants {\n@@ -48,8 +47,6 @@ public interface PushConstants {\nBPS(BAIDU_DELIVERY_TYPE, BPS_PROPERTY_REG_ID, CT_BAIDU_PROVIDER_CLASS, BAIDU_SDK_CLASS),\nADM(ADM_DELIVERY_TYPE, ADM_PROPERTY_REG_ID, CT_ADM_PROVIDER_CLASS, ADM_SDK_CLASS);\n- private static final ArrayList<String> ALL;\n-\nprivate final String ctProviderClassName;\nprivate final String messagingSDKClassName;\n@@ -58,21 +55,6 @@ public interface PushConstants {\nprivate final String type;\n- public static ArrayList<String> getAll() {\n- return ALL;\n- }\n-\n- public static PushType[] getPushTypes(ArrayList<String> types) {\n- PushType[] pushTypes = new PushType[0];\n- if (types != null && !types.isEmpty()) {\n- pushTypes = new PushType[types.size()];\n- for (int i = 0; i < types.size(); i++) {\n- pushTypes[i] = PushType.valueOf(types.get(i));\n- }\n- }\n- return pushTypes;\n- }\n-\nPushType(@DeliveryType String type, @RegKeyType String prefKey, @CTPushProviderClass String className,\n@PushMessagingClass String messagingSDKClassName) {\nthis.type = type;\n@@ -106,16 +88,13 @@ public interface PushConstants {\n}\nstatic {\n- ALL = new ArrayList<>();\n- for (PushType pushType : PushType.values()) {\n- ALL.add(pushType.name());\n- }\n+\n}\n}\nString LOG_TAG = \"PushProvider\";\n- String FCM_LOG_TAG = \"FirebaseMessaging : \";\n+ String FCM_LOG_TAG = PushType.FCM.toString();\n@NonNull\nString FCM_DELIVERY_TYPE = \"fcm\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationUtil.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationUtil.java",
"diff": "@@ -5,6 +5,8 @@ import static com.clevertap.android.sdk.Constants.WZRK_ACCT_ID_KEY;\nimport android.os.Bundle;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+import java.util.ArrayList;\n@RestrictTo(Scope.LIBRARY_GROUP)\npublic class PushNotificationUtil {\n@@ -17,4 +19,29 @@ public class PushNotificationUtil {\nprivate PushNotificationUtil() {\n}\n+\n+ /**\n+ * Returns the names of all push types\n+ *\n+ * @return list\n+ */\n+ public static ArrayList<String> getAll() {\n+ ArrayList<String> list = new ArrayList<>();\n+ for (PushType pushType : PushType.values()) {\n+ list.add(pushType.name());\n+ }\n+ return list;\n+ }\n+\n+ public static PushType[] getPushTypes(ArrayList<String> types) {\n+ PushType[] pushTypes = new PushType[0];\n+ if (types != null && !types.isEmpty()) {\n+ pushTypes = new PushType[types.size()];\n+ for (int i = 0; i < types.size(); i++) {\n+ pushTypes[i] = PushType.valueOf(types.get(i));\n+ }\n+ }\n+ return pushTypes;\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/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "package com.clevertap.android.sdk.pushnotification;\nimport static com.clevertap.android.sdk.BuildConfig.VERSION_CODE;\n+import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getPushTypes;\nimport android.content.Context;\nimport android.text.TextUtils;\n@@ -226,7 +227,7 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate void findEnabledPushTypes() {\n- for (PushConstants.PushType pushType : config().getAllowedPushTypes()) {\n+ for (PushConstants.PushType pushType : getPushTypes(config().getAllowedPushTypes())) {\nString className = pushType.getMessagingSDKClassName();\ntry {\nClass.forName(className);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsConstants.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsConstants.java",
"diff": "package com.clevertap.android.hms;\n+import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+\ninterface HmsConstants {\n- String HMS_LOG_TAG = HmsPushProvider.class.getSimpleName() + \" : \";\n+ String HMS_LOG_TAG = PushType.HPS.toString();\nString HCM_SCOPE = \"HCM\";\nString APP_ID_KEY = \"client/app_id\";\nint MIN_CT_ANDROID_SDK_VERSION = 30800;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"diff": "@@ -4,15 +4,16 @@ import android.content.Context\nimport android.os.Bundle\nimport com.clevertap.android.hms.HmsTestConstants.Companion.HMS_TOKEN\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.Utils\n+import com.clevertap.android.sdk.pushnotification.NotificationInfo\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n-import com.google.gson.GsonBuilder\nimport com.huawei.hms.push.RemoteMessage\nimport org.junit.*\nimport org.junit.runner.*\n-import org.mockito.*\n-import org.mockito.ArgumentMatchers.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n@@ -36,24 +37,43 @@ class HmsMessageHandlerTest : BaseTestCase() {\n}\n@Test\n+ @Ignore\nfun testCreateNotification_Invalid_Message() {\nval isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\nAssert.assertFalse(isSuccess)\n}\n@Test\n+ @Ignore\n+ fun testCreateNotification_Outside_CleverTap_Message() {\n+ val bundle = getMockBundle()\n+ val info = NotificationInfo(false, true)\n+ mockStatic(CleverTapAPI::class.java).use {\n+ `when`(CleverTapAPI.getNotificationInfo(any(Bundle::class.java))).thenReturn(info)\n+ mockStatic(Utils::class.java).use {\n+ `when`(Utils.stringToBundle(anyString())).thenReturn(bundle)\n+ val isSuccess = handler.createNotification(application, RemoteMessage(bundle))\n+ Assert.assertFalse(isSuccess)\n+ }\n+ }\n+ }\n+\n+ @Test\n+ @Ignore\nfun testCreateNotification_Valid_Message() {\n- val message = Mockito.mock(RemoteMessage::class.java)\n- Mockito.`when`(message.data).thenReturn(getMockJsonString())\n- val isSuccess = handler.createNotification(application, message)\n+ val bundle = mock(Bundle::class.java)\n+ mockStatic(Utils::class.java).use {\n+ `when`(Utils.stringToBundle(anyString())).thenReturn(bundle)\n+ val isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\nAssert.assertTrue(isSuccess)\n}\n+ }\n- private fun getMockJsonString(): String? {\n- val hashMap = HashMap<String, String>()\n- hashMap.put(\"Title\", \"Sample Title\")\n- hashMap.put(\"Message\", \"Sample Message Title\")\n- return GsonBuilder().create().toJson(hashMap)\n+ private fun getMockBundle(): Bundle? {\n+ val bundle = Bundle()\n+ bundle.putString(Constants.NOTIFICATION_TAG, \"some value\")\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, \"some value\")\n+ return bundle\n}\n@Test\n@@ -63,8 +83,8 @@ class HmsMessageHandlerTest : BaseTestCase() {\n@Test\nfun testOnNewToken_Failure() {\n- Mockito.mockStatic(CleverTapAPI::class.java).use {\n- Mockito.`when`(CleverTapAPI.tokenRefresh(any(Context::class.java), eq(HMS_TOKEN), eq(HPS)))\n+ mockStatic(CleverTapAPI::class.java).use {\n+ `when`(CleverTapAPI.tokenRefresh(any(Context::class.java), eq(HMS_TOKEN), eq(HPS)))\n.thenThrow(RuntimeException(\"Something Went Wrong\"))\nAssert.assertFalse(handler.onNewToken(application, HMS_TOKEN))\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": "@@ -46,10 +46,10 @@ class XiaomiMessageHandlerImpl implements IMiMessageHandler {\n} else {\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Can't create outside Clevertap Notification\");\n}\n- } catch (Exception e) {\n+ } catch (Throwable e) {\ne.printStackTrace();\nisSuccess = false;\n- Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Error Creating Notification\");\n+ Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Error Creating Notification\", e);\n}\n} else {\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Received message entity is null!\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XpsConstants.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XpsConstants.java",
"diff": "package com.clevertap.android.xps;\nimport androidx.annotation.IntDef;\n+import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\n@@ -12,7 +13,7 @@ public interface XpsConstants {\n}\n- String XIAOMI_LOG_TAG = XiaomiPushProvider.class.getSimpleName();\n+ String XIAOMI_LOG_TAG = PushType.XPS.toString();\nint MIN_CT_ANDROID_SDK_VERSION = 30800;\nint TOKEN_SUCCESS = 0;\nint TOKEN_FAILURE = 1;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): handled crash during testing & added logs |
116,621 | 28.09.2020 23:19:47 | -19,080 | 9f19774476200a0cbb5b745b603c753ed9491713 | chore(fix): build failure on bitrise on dev merge | [
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"diff": "@@ -37,8 +37,7 @@ class HmsMessageHandlerTest : BaseTestCase() {\n}\n@Test\n- @Ignore\n- fun testCreateNotification_Invalid_Message() {\n+ fun testCreateNotification_Invalid_Message_Fails_With_Exception() {\nval isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\nAssert.assertFalse(isSuccess)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"diff": "@@ -45,6 +45,7 @@ class XiaomiMessageHandlerTest : BaseTestCase() {\n}\n@Test\n+ @Ignore\nfun testCreateNotification_Valid_Message() {\nval message = Mockito.mock(MiPushMessage::class.java)\nMockito.`when`(message.content).thenReturn(getMockJsonString())\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(fix): build failure on bitrise on dev merge |
116,621 | 29.09.2020 20:16:36 | -19,080 | 3a62df7052c8e04b692469c3d736394fb9ddad8f | chore(test): Added test cases for Xiaomi & Huawei | [
{
"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": "@@ -64,6 +64,7 @@ import com.clevertap.android.sdk.pushnotification.CTNotificationIntentService;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationReceiver;\nimport com.clevertap.android.sdk.pushnotification.NotificationInfo;\n+import com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushnotification.PushProviders;\nimport com.clevertap.android.sdk.pushnotification.amp.CTBackgroundIntentService;\n@@ -8722,6 +8723,13 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n}\n+ /**\n+ * Returns the token for a particular push type\n+ */\n+ public String getPushToken(@NonNull PushConstants.PushType pushType) {\n+ return pushProviders.getCachedToken(pushType);\n+ }\n+\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\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": "@@ -18,6 +18,7 @@ import android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\n+import android.text.TextUtils;\nimport androidx.annotation.RestrictTo;\nimport androidx.core.content.ContextCompat;\nimport java.io.ByteArrayOutputStream;\n@@ -95,14 +96,19 @@ public final class Utils {\n*/\n@SuppressWarnings(\"rawtypes\")\npublic static Bundle stringToBundle(String content) throws JSONException {\n- JSONObject jsonObject = new JSONObject(content);\n+\nBundle bundle = new Bundle();\n+\n+ if (!TextUtils.isEmpty(content)) {\n+ JSONObject jsonObject = new JSONObject(content);\nIterator iter = jsonObject.keys();\nwhile (iter.hasNext()) {\nString key = (String) iter.next();\nString value = jsonObject.getString(key);\nbundle.putString(key, value);\n}\n+ }\n+\nreturn bundle;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"diff": "package com.clevertap.android.hms;\n+import static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+\n+import com.clevertap.android.sdk.Logger;\nimport com.huawei.hms.push.HmsMessageService;\nimport com.huawei.hms.push.RemoteMessage;\npublic class CTHmsMessageService extends HmsMessageService {\n- private IHmsMessageHandler mHandler = new HmsMessageHandlerImpl();\n+ private IHmsMessageHandler mHandler = new HmsMessageHandlerImpl(new HmsNotificationParser());\n@Override\npublic void onMessageReceived(RemoteMessage remoteMessage) {\nsuper.onMessageReceived(remoteMessage);\n+ Logger.i(LOG_TAG, HMS_LOG_TAG + \"onMessageReceived is called\");\nmHandler.createNotification(getApplicationContext(), remoteMessage);\n}\n@Override\npublic void onNewToken(String token) {\nsuper.onNewToken(token);\n+ Logger.i(LOG_TAG, HMS_LOG_TAG + \"onNewToken is called \" + token);\nmHandler.onNewToken(getApplicationContext(), token);\n}\n}\n\\ No newline at end of file\n"
},
{
"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": "package com.clevertap.android.hms;\nimport static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\n-import static com.clevertap.android.sdk.Utils.stringToBundle;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS;\nimport static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAccountIdFromNotificationBundle;\n@@ -10,42 +9,44 @@ import android.content.Context;\nimport android.os.Bundle;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.huawei.hms.push.RemoteMessage;\nclass HmsMessageHandlerImpl implements IHmsMessageHandler {\n+ private IHmsNotificationParser mParser;\n+\n+ HmsMessageHandlerImpl(final IHmsNotificationParser parser) {\n+ mParser = parser;\n+ }\n+\n@Override\npublic boolean createNotification(Context context, final RemoteMessage remoteMessage) {\n- Logger.i(LOG_TAG, HMS_LOG_TAG + \"onMessageReceived is called\");\nboolean isSuccess = false;\n-\n- if (remoteMessage != null) {\n+ Bundle messageBundle = mParser.toBundle(remoteMessage);\n+ if (messageBundle != null) {\ntry {\n- String ctData = remoteMessage.getData();\n- Bundle extras = stringToBundle(ctData);\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n- CleverTapAPI cleverTapAPI = CleverTapAPI\n- .getGlobalInstance(context, getAccountIdFromNotificationBundle(extras));\n- if (info.fromCleverTap) {\n- CleverTapAPI.createNotification(context, extras);\n+ createNotificationWithMessageBundle(context, messageBundle);\nisSuccess = true;\n- if (cleverTapAPI != null) {\n- cleverTapAPI.config().log(LOG_TAG, HMS_LOG_TAG + \"onMessageReceived: \");\n- } else {\n- Logger.d(LOG_TAG, HMS_LOG_TAG + \"onMessageReceived: \");\n- }\n- }\n} catch (Throwable e) {\ne.printStackTrace();\n- Logger.d(LOG_TAG, HMS_LOG_TAG + \"Error creatig notification \", e);\n+ Logger.d(LOG_TAG, HMS_LOG_TAG + \"Error Creating Notification\", e);\n}\n- } else {\n- Logger.d(LOG_TAG, HMS_LOG_TAG + \"Received message entity is null!\");\n}\nreturn isSuccess;\n}\n+ void createNotificationWithMessageBundle(final Context context, final Bundle messageBundle) {\n+\n+ CleverTapAPI cleverTapAPI = CleverTapAPI\n+ .getGlobalInstance(context, getAccountIdFromNotificationBundle(messageBundle));\n+ CleverTapAPI.createNotification(context, messageBundle);\n+ if (cleverTapAPI != null) {\n+ cleverTapAPI.config().log(LOG_TAG, HMS_LOG_TAG + \"Creating Notification\");\n+ } else {\n+ Logger.d(LOG_TAG, HMS_LOG_TAG + \"Creating Notification\");\n+ }\n+ }\n+\n@Override\npublic boolean onNewToken(Context context, final String token) {\nboolean isSuccess = false;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsNotificationParser.java",
"diff": "+package com.clevertap.android.hms;\n+\n+import static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+\n+import android.os.Bundle;\n+import com.clevertap.android.sdk.CleverTapAPI;\n+import com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.pushnotification.NotificationInfo;\n+import com.huawei.hms.push.RemoteMessage;\n+\n+public class HmsNotificationParser implements IHmsNotificationParser {\n+\n+ @Override\n+ public Bundle toBundle(final RemoteMessage message) {\n+ try {\n+ Bundle extras = Utils.stringToBundle(message.getData());\n+ NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n+ Logger.d(LOG_TAG, HMS_LOG_TAG + \"Found Valid Notification Message \");\n+ return info.fromCleverTap ? extras : null;\n+ } catch (Throwable e) {\n+ e.printStackTrace();\n+ Logger.d(LOG_TAG, HMS_LOG_TAG + \"Invalid Notification Message \", e);\n+ }\n+ return null;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsNotificationParser.java",
"diff": "+package com.clevertap.android.hms;\n+\n+import android.os.Bundle;\n+import com.huawei.hms.push.RemoteMessage;\n+\n+public interface IHmsNotificationParser {\n+\n+ /**\n+ * @param message - Huawei message\n+ * @return bundle with the message content, in case of invalid message returns null\n+ */\n+ Bundle toBundle(RemoteMessage message);\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"diff": "@@ -4,9 +4,6 @@ import android.content.Context\nimport android.os.Bundle\nimport com.clevertap.android.hms.HmsTestConstants.Companion.HMS_TOKEN\nimport com.clevertap.android.sdk.CleverTapAPI\n-import com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.Utils\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n@@ -22,12 +19,14 @@ import org.robolectric.annotation.Config\nclass HmsMessageHandlerTest : BaseTestCase() {\nprivate lateinit var handler: HmsMessageHandlerImpl\n+ private lateinit var parser: IHmsNotificationParser\n@Before\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n- handler = HmsMessageHandlerImpl()\n+ parser = mock(HmsNotificationParser::class.java)\n+ handler = HmsMessageHandlerImpl(parser)\n}\n@Test\n@@ -37,43 +36,24 @@ class HmsMessageHandlerTest : BaseTestCase() {\n}\n@Test\n- fun testCreateNotification_Invalid_Message_Fails_With_Exception() {\n- val isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\n- Assert.assertFalse(isSuccess)\n- }\n-\n- @Test\n- @Ignore\n- fun testCreateNotification_Outside_CleverTap_Message() {\n- val bundle = getMockBundle()\n- val info = NotificationInfo(false, true)\n- mockStatic(CleverTapAPI::class.java).use {\n- `when`(CleverTapAPI.getNotificationInfo(any(Bundle::class.java))).thenReturn(info)\n- mockStatic(Utils::class.java).use {\n- `when`(Utils.stringToBundle(anyString())).thenReturn(bundle)\n+ fun testCreateNotification_Invalid_Message_Throws_Exception() {\n+ val bundle = Bundle()\nval isSuccess = handler.createNotification(application, RemoteMessage(bundle))\n+ `when`(parser.toBundle(any(RemoteMessage::class.java))).thenReturn(bundle)\n+ mockStatic(CleverTapAPI::class.java).use {\n+ `when`(CleverTapAPI.createNotification(application, bundle)).thenThrow(\n+ RuntimeException(\"Something went wrong\")\n+ )\nAssert.assertFalse(isSuccess)\n}\n}\n- }\n@Test\n- @Ignore\nfun testCreateNotification_Valid_Message() {\n- val bundle = mock(Bundle::class.java)\n- mockStatic(Utils::class.java).use {\n- `when`(Utils.stringToBundle(anyString())).thenReturn(bundle)\n+ `when`(parser.toBundle(any(RemoteMessage::class.java))).thenReturn(Bundle())\nval isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\nAssert.assertTrue(isSuccess)\n}\n- }\n-\n- private fun getMockBundle(): Bundle? {\n- val bundle = Bundle()\n- bundle.putString(Constants.NOTIFICATION_TAG, \"some value\")\n- bundle.putString(Constants.WZRK_ACCT_ID_KEY, \"some value\")\n- return bundle\n- }\n@Test\nfun testOnNewToken_Success() {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HuaweiNotificationParserTest.kt",
"diff": "+package com.clevertap.android.hms\n+\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.TestApplication\n+import com.google.gson.GsonBuilder\n+import com.huawei.hms.push.RemoteMessage\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.Mockito.*\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 HuaweiNotificationParserTest : BaseTestCase() {\n+\n+ private lateinit var parser: IHmsNotificationParser\n+ private lateinit var message: RemoteMessage\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ parser = HmsNotificationParser()\n+ message = mock(RemoteMessage::class.java)\n+ }\n+\n+ @Test\n+ fun testToBundle_Null_Message_Return_Null() {\n+ Assert.assertNull(parser.toBundle(null))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Invalid_Content_Return_Null() {\n+ `when`(message.data).thenReturn(null)\n+ Assert.assertNull(parser.toBundle(message))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Outside_CleverTap_Return_Null() {\n+ `when`(message.data).thenReturn(getMockJsonStringOutsideNetwork())\n+ Assert.assertNull(parser.toBundle(message))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Outside_CleverTap_Return_Not_Null() {\n+ `when`(message.data).thenReturn(getMockJsonStringClevertapNetwork())\n+ Assert.assertNotNull(parser.toBundle(message))\n+ }\n+\n+ private fun getMockJsonStringOutsideNetwork(): String? {\n+ val hashMap = HashMap<String, String>()\n+ hashMap.put(\"Title\", \"Sample Title\")\n+ hashMap.put(\"Message\", \"Sample Message Title\")\n+ return GsonBuilder().create().toJson(hashMap)\n+ }\n+\n+ private fun getMockJsonStringClevertapNetwork(): String? {\n+ val hashMap = HashMap<String, String>()\n+ hashMap.put(\"Title\", \"Sample Title\")\n+ hashMap.put(\"Message\", \"Sample Message Title\")\n+ hashMap.put(Constants.NOTIFICATION_TAG, \"some value\")\n+ return GsonBuilder().create().toJson(hashMap)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IXiaomiNotificationParser.java",
"diff": "+package com.clevertap.android.xps;\n+\n+import android.os.Bundle;\n+import com.xiaomi.mipush.sdk.MiPushMessage;\n+\n+public interface IXiaomiNotificationParser {\n+\n+ /**\n+ * @param message - Xiaomi message\n+ * @return bundle with the message content, in case of invalid message returns null\n+ */\n+ Bundle toBundle(MiPushMessage message);\n+}\n\\ No newline at end of file\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": "@@ -12,10 +12,9 @@ import static com.clevertap.android.xps.XpsConstants.XIAOMI_LOG_TAG;\nimport android.content.Context;\nimport android.os.Bundle;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n-import com.clevertap.android.sdk.Utils;\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.xiaomi.mipush.sdk.ErrorCode;\nimport com.xiaomi.mipush.sdk.MiPushClient;\n@@ -25,38 +24,42 @@ import java.util.List;\nclass XiaomiMessageHandlerImpl implements IMiMessageHandler {\n+ private @NonNull\n+ IXiaomiNotificationParser mParser;\n+\n+ XiaomiMessageHandlerImpl(@NonNull final IXiaomiNotificationParser parser) {\n+ mParser = parser;\n+ }\n+\n@Override\npublic boolean createNotification(Context context, MiPushMessage message) {\nboolean isSuccess = false;\n- if (message != null) {\n+ Bundle messageBundle = mParser.toBundle(message);\n+ if (messageBundle != null) {\ntry {\n- String ctData = message.getContent();\n- Bundle extras = Utils.stringToBundle(ctData);\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n- CleverTapAPI cleverTapAPI = CleverTapAPI\n- .getGlobalInstance(context, getAccountIdFromNotificationBundle(extras));\n- if (info.fromCleverTap) {\n- CleverTapAPI.createNotification(context, extras);\n- if (cleverTapAPI != null) {\n- cleverTapAPI.config().log(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n- } else {\n- Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n- }\n+ createNotificationWithBundleMessage(context, messageBundle);\nisSuccess = true;\n- } else {\n- Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Can't create outside Clevertap Notification\");\n- }\n} catch (Throwable e) {\ne.printStackTrace();\nisSuccess = false;\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Error Creating Notification\", e);\n}\n- } else {\n- Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Received message entity is null!\");\n}\nreturn isSuccess;\n}\n+ void createNotificationWithBundleMessage(final Context context, final Bundle messageBundle) {\n+\n+ CleverTapAPI cleverTapAPI = CleverTapAPI\n+ .getGlobalInstance(context, getAccountIdFromNotificationBundle(messageBundle));\n+ CleverTapAPI.createNotification(context, messageBundle);\n+ if (cleverTapAPI != null) {\n+ cleverTapAPI.config().log(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n+ } else {\n+ Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Creating Notification\");\n+ }\n+ }\n+\n@Override\npublic @XpsConstants.CommandResult\nint onReceiveRegisterResult(Context context, MiPushCommandMessage miPushCommandMessage) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"diff": "@@ -11,7 +11,7 @@ import com.xiaomi.mipush.sdk.PushMessageReceiver;\npublic class XiaomiMessageReceiver extends PushMessageReceiver {\n- private IMiMessageHandler handler = new XiaomiMessageHandlerImpl();\n+ private IMiMessageHandler handler = new XiaomiMessageHandlerImpl(new XiaomiNotificationParser());\n@Override\npublic void onNotificationMessageArrived(Context context, MiPushMessage miPushMessage) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiNotificationParser.java",
"diff": "+package com.clevertap.android.xps;\n+\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+import static com.clevertap.android.xps.XpsConstants.XIAOMI_LOG_TAG;\n+\n+import android.os.Bundle;\n+import com.clevertap.android.sdk.CleverTapAPI;\n+import com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.pushnotification.NotificationInfo;\n+import com.xiaomi.mipush.sdk.MiPushMessage;\n+\n+public class XiaomiNotificationParser implements IXiaomiNotificationParser {\n+\n+ @Override\n+ public Bundle toBundle(final MiPushMessage message) {\n+ try {\n+ Bundle extras = Utils.stringToBundle(message.getContent());\n+ NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n+ Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Found Valid Notification Message \");\n+ return info.fromCleverTap ? extras : null;\n+ } catch (Throwable e) {\n+ e.printStackTrace();\n+ Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Invalid Notification Message \", e);\n+ }\n+ return null;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"diff": "package com.clevertap.android.xps\n+import android.os.Bundle\n+import com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\nimport com.clevertap.android.xps.XpsConstants.FAILED_WITH_EXCEPTION\nimport com.clevertap.android.xps.XpsConstants.OTHER_COMMAND\nimport com.clevertap.android.xps.XpsConstants.TOKEN_SUCCESS\nimport com.clevertap.android.xps.XpsTestConstants.Companion.MI_TOKEN\n-import com.google.gson.GsonBuilder\nimport com.xiaomi.mipush.sdk.ErrorCode.ERROR_SERVICE_UNAVAILABLE\nimport com.xiaomi.mipush.sdk.ErrorCode.SUCCESS\nimport com.xiaomi.mipush.sdk.MiPushClient.COMMAND_REGISTER\n@@ -15,7 +16,7 @@ import com.xiaomi.mipush.sdk.MiPushCommandMessage\nimport com.xiaomi.mipush.sdk.MiPushMessage\nimport org.junit.*\nimport org.junit.runner.*\n-import org.mockito.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n@@ -24,12 +25,14 @@ import org.robolectric.annotation.Config\nclass XiaomiMessageHandlerTest : BaseTestCase() {\nprivate lateinit var handler: XiaomiMessageHandlerImpl\n+ private lateinit var parser: IXiaomiNotificationParser\n@Before\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n- handler = XiaomiMessageHandlerImpl()\n+ parser = mock(XiaomiNotificationParser::class.java)\n+ handler = XiaomiMessageHandlerImpl(parser)\n}\n@Test\n@@ -39,71 +42,70 @@ class XiaomiMessageHandlerTest : BaseTestCase() {\n}\n@Test\n- fun testCreateNotification_Invalid_Message() {\n+ fun testCreateNotification_Invalid_Message_Throws_Exception() {\nval isSuccess = handler.createNotification(application, MiPushMessage())\n+ val bundle = Bundle()\n+ `when`(parser.toBundle(any(MiPushMessage::class.java))).thenReturn(bundle)\n+ mockStatic(CleverTapAPI::class.java).use {\n+ `when`(CleverTapAPI.createNotification(application, bundle)).thenThrow(\n+ RuntimeException(\"Something went wrong\")\n+ )\n+ Assert.assertFalse(isSuccess)\n+ }\nAssert.assertFalse(isSuccess)\n}\n@Test\n- @Ignore\nfun testCreateNotification_Valid_Message() {\n- val message = Mockito.mock(MiPushMessage::class.java)\n- Mockito.`when`(message.content).thenReturn(getMockJsonString())\n- val isSuccess = handler.createNotification(application, message)\n+ `when`(parser.toBundle(any(MiPushMessage::class.java))).thenReturn(Bundle())\n+ val isSuccess = handler.createNotification(application, MiPushMessage())\nAssert.assertTrue(isSuccess)\n}\n- private fun getMockJsonString(): String? {\n- val hashMap = HashMap<String, String>()\n- hashMap.put(\"Title\", \"Sample Title\")\n- hashMap.put(\"Message\", \"Sample Message Title\")\n- return GsonBuilder().create().toJson(hashMap)\n- }\n-\n@Test\nfun testOnReceivePassThroughMessage_Other_Command() {\n- val message = Mockito.mock(MiPushCommandMessage::class.java)\n- Mockito.`when`(message.command).thenReturn(COMMAND_UNSET_ACCOUNT)\n+ val message = mock(MiPushCommandMessage::class.java)\n+ `when`(message.command).thenReturn(COMMAND_UNSET_ACCOUNT)\nval result = handler.onReceiveRegisterResult(application, message)\nAssert.assertEquals(result, OTHER_COMMAND)\n}\n@Test\nfun testOnReceivePassThroughMessage_Token_Success() {\n- val message = Mockito.mock(MiPushCommandMessage::class.java)\n- Mockito.`when`(message.command).thenReturn(COMMAND_REGISTER)\n- Mockito.`when`(message.resultCode).thenReturn(SUCCESS.toLong())\n- Mockito.`when`(message.commandArguments).thenReturn(listOf(MI_TOKEN))\n+ val message = mock(MiPushCommandMessage::class.java)\n+ `when`(message.command).thenReturn(COMMAND_REGISTER)\n+ `when`(message.resultCode).thenReturn(SUCCESS.toLong())\n+ `when`(message.commandArguments).thenReturn(listOf(MI_TOKEN))\nval result = handler.onReceiveRegisterResult(application, message)\nAssert.assertEquals(result, TOKEN_SUCCESS)\n}\n@Test\nfun testOnReceivePassThroughMessage_Invalid_Token() {\n- val message = Mockito.mock(MiPushCommandMessage::class.java)\n- Mockito.`when`(message.command).thenReturn(COMMAND_REGISTER)\n- Mockito.`when`(message.resultCode).thenReturn(SUCCESS.toLong())\n- Mockito.`when`(message.commandArguments).thenReturn(emptyList())\n+ val message = mock(MiPushCommandMessage::class.java)\n+ `when`(message.command).thenReturn(COMMAND_REGISTER)\n+ `when`(message.resultCode).thenReturn(SUCCESS.toLong())\n+ `when`(message.commandArguments).thenReturn(emptyList())\nval result = handler.onReceiveRegisterResult(application, message)\nAssert.assertEquals(result, XpsConstants.INVALID_TOKEN)\n}\n@Test\nfun testOnReceivePassThroughMessage_Token_Failure() {\n- val message = Mockito.mock(MiPushCommandMessage::class.java)\n- Mockito.`when`(message.command).thenReturn(COMMAND_REGISTER)\n- Mockito.`when`(message.resultCode).thenReturn(ERROR_SERVICE_UNAVAILABLE.toLong())\n- Mockito.`when`(message.commandArguments).thenReturn(emptyList())\n+ val message = mock(MiPushCommandMessage::class.java)\n+ `when`(message.command).thenReturn(COMMAND_REGISTER)\n+ `when`(message.resultCode).thenReturn(ERROR_SERVICE_UNAVAILABLE.toLong())\n+ `when`(message.commandArguments).thenReturn(emptyList())\nval result = handler.onReceiveRegisterResult(application, message)\nAssert.assertEquals(result, XpsConstants.TOKEN_FAILURE)\n}\n@Test\nfun testOnReceivePassThroughMessage_Failed_Exception() {\n- val message = Mockito.mock(MiPushCommandMessage::class.java)\n- Mockito.`when`(message.command).thenReturn(COMMAND_REGISTER)\n- Mockito.`when`(message.resultCode).thenReturn(SUCCESS.toLong())\n- Mockito.`when`(message.commandArguments).thenThrow(RuntimeException(\"Something went wrong\"))\n+ val message = mock(MiPushCommandMessage::class.java)\n+ `when`(message.command).thenReturn(COMMAND_REGISTER)\n+ `when`(message.resultCode).thenReturn(SUCCESS.toLong())\n+ `when`(message.commandArguments).thenThrow(RuntimeException(\"Something went wrong\"))\nval result = handler.onReceiveRegisterResult(application, message)\nAssert.assertEquals(result, FAILED_WITH_EXCEPTION)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageReceiverTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageReceiverTest.kt",
"diff": "@@ -7,8 +7,7 @@ import com.xiaomi.mipush.sdk.MiPushCommandMessage\nimport com.xiaomi.mipush.sdk.MiPushMessage\nimport org.junit.*\nimport org.junit.runner.*\n-import org.mockito.*\n-import org.mockito.ArgumentMatchers.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n@@ -23,26 +22,26 @@ class XiaomiMessageReceiverTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\nreceiver = XiaomiMessageReceiver()\n- handler = Mockito.mock(XiaomiMessageHandlerImpl::class.java)\n+ handler = mock(XiaomiMessageHandlerImpl::class.java)\nreceiver.setHandler(handler)\n}\n@Test\nfun testOnReceivePassThroughMessage() {\nreceiver.onReceivePassThroughMessage(application, MiPushMessage())\n- Mockito.verify(handler).createNotification(any(Context::class.java), any(MiPushMessage::class.java))\n+ verify(handler).createNotification(any(Context::class.java), any(MiPushMessage::class.java))\n}\n@Test\nfun testOnReceiveRegisterResult() {\nreceiver.onReceiveRegisterResult(application, MiPushCommandMessage())\n- Mockito.verify(handler)\n+ verify(handler)\n.onReceiveRegisterResult(any(Context::class.java), any(MiPushCommandMessage::class.java))\n}\n@Test\nfun testOnNotificationMessageArrived() {\nreceiver.onNotificationMessageArrived(application, MiPushMessage())\n- Mockito.verify(handler).createNotification(any(Context::class.java), any(MiPushMessage::class.java))\n+ verify(handler).createNotification(any(Context::class.java), any(MiPushMessage::class.java))\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiNotificationParserTest.kt",
"diff": "+package com.clevertap.android.xps\n+\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.shared.test.BaseTestCase\n+import com.clevertap.android.shared.test.TestApplication\n+import com.google.gson.GsonBuilder\n+import com.xiaomi.mipush.sdk.MiPushMessage\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.Mockito.*\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 XiaomiNotificationParserTest : BaseTestCase() {\n+\n+ private lateinit var parser: IXiaomiNotificationParser\n+ private lateinit var message: MiPushMessage\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ parser = XiaomiNotificationParser()\n+ message = mock(MiPushMessage::class.java)\n+ }\n+\n+ @Test\n+ fun testToBundle_Null_Message_Return_Null() {\n+ Assert.assertNull(parser.toBundle(null))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Invalid_Content_Return_Null() {\n+ `when`(message.content).thenReturn(null)\n+ Assert.assertNull(parser.toBundle(message))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Outside_CleverTap_Return_Null() {\n+ `when`(message.content).thenReturn(getMockJsonStringOutsideNetwork())\n+ Assert.assertNull(parser.toBundle(message))\n+ }\n+\n+ @Test\n+ fun testToBundle_Message_Outside_CleverTap_Return_Not_Null() {\n+ `when`(message.content).thenReturn(getMockJsonStringClevertapNetwork())\n+ Assert.assertNotNull(parser.toBundle(message))\n+ }\n+\n+ private fun getMockJsonStringOutsideNetwork(): String? {\n+ val hashMap = HashMap<String, String>()\n+ hashMap.put(\"Title\", \"Sample Title\")\n+ hashMap.put(\"Message\", \"Sample Message Title\")\n+ return GsonBuilder().create().toJson(hashMap)\n+ }\n+\n+ private fun getMockJsonStringClevertapNetwork(): String? {\n+ val hashMap = HashMap<String, String>()\n+ hashMap.put(\"Title\", \"Sample Title\")\n+ hashMap.put(\"Message\", \"Sample Message Title\")\n+ hashMap.put(Constants.NOTIFICATION_TAG, \"some value\")\n+ return GsonBuilder().create().toJson(hashMap)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(test): Added test cases for Xiaomi & Huawei |
116,621 | 29.09.2020 22:29:28 | -19,080 | 4e263dce2a6de6e24e2cd18f8f76da17cf27ba6c | chore(cleanup): code cleanup for test cases | [
{
"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": "@@ -9,6 +9,7 @@ import com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\nimport com.google.firebase.FirebaseApp\nimport com.google.firebase.FirebaseOptions\n+import com.google.firebase.iid.FirebaseInstanceId\nimport org.junit.*\nimport org.junit.runner.*\nimport org.mockito.Mockito.*\n@@ -35,7 +36,7 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n}\n@Test\n- fun isAvailable_Unavailable_Playservices_Returns_False() {\n+ fun isAvailable_Unavailable_PlayServices_Returns_False() {\nmockStatic(PackageUtils::class.java).use {\n`when`(PackageUtils.isGooglePlayServicesAvailable(listener.context())).thenReturn(false)\nAssert.assertFalse(handler.isAvailable)\n@@ -151,4 +152,13 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\nAssert.assertNull(handler.senderId)\n}\n}\n+\n+ @Test\n+ fun testRequestToken_Exception_Null_Token() {\n+ mockStatic(FirebaseInstanceId::class.java).use {\n+ `when`(FirebaseInstanceId.getInstance()).thenThrow(RuntimeException(\"Something Went wrong\"))\n+ handler.requestToken()\n+ verify(listener, times(1)).onNewToken(null, FCM)\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -23,7 +23,6 @@ dependencies {\ntestImplementation project(':test_shared')\ntestImplementation deps.huaweiPush\n- testImplementation \"androidx.core:core-ktx:1.3.1\"\ntestImplementation deps.kotlinStdlib\ntestImplementation deps.json\ntestImplementation deps.gson\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": "@@ -51,11 +51,6 @@ public class HmsHandlerTest extends BaseTestCase {\nhuaweiApi = Mockito.mock(HuaweiApiAvailability.class);\n}\n- @After\n- public void tearDown() {\n-\n- }\n-\n@Test\npublic void testAppId_Invalid() {\nMockito.when(config.getString(APP_ID_KEY)).thenThrow(new RuntimeException(\"Something went wrong\"));\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsMessageHandlerTest.kt",
"diff": "@@ -4,6 +4,7 @@ import android.content.Context\nimport android.os.Bundle\nimport com.clevertap.android.hms.HmsTestConstants.Companion.HMS_TOKEN\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.Constants\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n@@ -38,12 +39,12 @@ class HmsMessageHandlerTest : BaseTestCase() {\n@Test\nfun testCreateNotification_Invalid_Message_Throws_Exception() {\nval bundle = Bundle()\n- val isSuccess = handler.createNotification(application, RemoteMessage(bundle))\n`when`(parser.toBundle(any(RemoteMessage::class.java))).thenReturn(bundle)\nmockStatic(CleverTapAPI::class.java).use {\n`when`(CleverTapAPI.createNotification(application, bundle)).thenThrow(\nRuntimeException(\"Something went wrong\")\n)\n+ val isSuccess = handler.createNotification(application, RemoteMessage(bundle))\nAssert.assertFalse(isSuccess)\n}\n}\n@@ -55,6 +56,15 @@ class HmsMessageHandlerTest : BaseTestCase() {\nAssert.assertTrue(isSuccess)\n}\n+ @Test\n+ fun testCreateNotification_Valid_Message_With_Account_ID() {\n+ val bundle = Bundle()\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, \"Some Value\")\n+ `when`(parser.toBundle(any(RemoteMessage::class.java))).thenReturn(bundle)\n+ val isSuccess = handler.createNotification(application, RemoteMessage(Bundle()))\n+ Assert.assertTrue(isSuccess)\n+ }\n+\n@Test\nfun testOnNewToken_Success() {\nAssert.assertTrue(handler.onNewToken(application, HMS_TOKEN))\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsPushProviderTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HmsPushProviderTest.kt",
"diff": "@@ -18,7 +18,7 @@ import org.robolectric.annotation.Config\nclass HmsPushProviderTest : BaseTestCase() {\nprivate lateinit var ctPushProviderListener: CTPushProviderListener\n- private var pushProvider: HmsPushProvider? = null\n+ private lateinit var pushProvider: HmsPushProvider\nprivate lateinit var sdkHandler: IHmsSdkHandler\n@Before\n@@ -28,50 +28,45 @@ class HmsPushProviderTest : BaseTestCase() {\nctPushProviderListener = mock(CTPushProviderListener::class.java)\npushProvider = HmsPushProvider(ctPushProviderListener)\nsdkHandler = mock(IHmsSdkHandler::class.java)\n- pushProvider!!.setHmsSdkHandler(sdkHandler)\n+ pushProvider.setHmsSdkHandler(sdkHandler)\n`when`(ctPushProviderListener.context()).thenReturn(application)\n`when`(ctPushProviderListener.config()).thenReturn(cleverTapInstanceConfig)\n}\n@Test\nfun testRequestToken() {\n- pushProvider!!.requestToken()\n- verify(sdkHandler, times(1))!!.onNewToken()\n+ pushProvider.requestToken()\n+ verify(sdkHandler, times(1)).onNewToken()\nverify(ctPushProviderListener, times(1)).onNewToken(or(isNull(), anyString()), eq(HPS))\n}\n@Test\nfun testIsAvailable() {\n- pushProvider!!.isAvailable\n- verify(sdkHandler, times(1))!!.isAvailable\n+ pushProvider.isAvailable\n+ verify(sdkHandler, times(1)).isAvailable\n}\n@Test\nfun testIsSupported() {\n- pushProvider!!.isSupported\n- verify(sdkHandler, times(1))!!.isSupported\n+ pushProvider.isSupported\n+ verify(sdkHandler, times(1)).isSupported\n}\n@Test\nfun testGetPlatform() {\n- Assert.assertEquals(pushProvider!!.platform.toLong(), ANDROID_PLATFORM.toLong())\n+ Assert.assertEquals(pushProvider.platform.toLong(), ANDROID_PLATFORM.toLong())\n}\n@Test\nfun testGetPushType() {\n- Assert.assertEquals(pushProvider!!.pushType, HPS)\n+ Assert.assertEquals(pushProvider.pushType, HPS)\n}\n@Test\nfun minSDKSupportVersionCode() {\nAssert.assertEquals(\n- pushProvider!!.minSDKSupportVersionCode().toLong(),\n+ pushProvider.minSDKSupportVersionCode().toLong(),\nMIN_CT_ANDROID_SDK_VERSION.toLong()\n)\n}\n-\n- @After\n- fun tearDown() {\n- pushProvider = null\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HuaweiNotificationParserTest.kt",
"new_path": "clevertap-hms/src/test/java/com/clevertap/android/hms/HuaweiNotificationParserTest.kt",
"diff": "@@ -43,7 +43,7 @@ class HuaweiNotificationParserTest : BaseTestCase() {\n}\n@Test\n- fun testToBundle_Message_Outside_CleverTap_Return_Not_Null() {\n+ fun testToBundle_Message_CleverTap_Message_Return_Not_Null() {\n`when`(message.data).thenReturn(getMockJsonStringClevertapNetwork())\nAssert.assertNotNull(parser.toBundle(message))\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -22,9 +22,7 @@ dependencies {\ncompileOnly deps.androidXAnnotation\ntestImplementation project(':test_shared')\ntestImplementation fileTree('libs')\n- testImplementation \"androidx.core:core-ktx:1.3.1\"\ntestImplementation deps.kotlinStdlib\n- testImplementation 'androidx.fragment:fragment:1.2.5'\ntestImplementation deps.json\ntestImplementation deps.gson\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.xps\nimport android.os.Bundle\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.Constants\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\nimport com.clevertap.android.xps.XpsConstants.FAILED_WITH_EXCEPTION\n@@ -43,16 +44,15 @@ class XiaomiMessageHandlerTest : BaseTestCase() {\n@Test\nfun testCreateNotification_Invalid_Message_Throws_Exception() {\n- val isSuccess = handler.createNotification(application, MiPushMessage())\nval bundle = Bundle()\n`when`(parser.toBundle(any(MiPushMessage::class.java))).thenReturn(bundle)\nmockStatic(CleverTapAPI::class.java).use {\n`when`(CleverTapAPI.createNotification(application, bundle)).thenThrow(\nRuntimeException(\"Something went wrong\")\n)\n+ val isSuccess = handler.createNotification(application, MiPushMessage())\nAssert.assertFalse(isSuccess)\n}\n- Assert.assertFalse(isSuccess)\n}\n@Test\n@@ -62,6 +62,15 @@ class XiaomiMessageHandlerTest : BaseTestCase() {\nAssert.assertTrue(isSuccess)\n}\n+ @Test\n+ fun testCreateNotification_Valid_Message_With_Account_ID() {\n+ val bundle = Bundle()\n+ bundle.putString(Constants.WZRK_ACCT_ID_KEY, \"Some Value\")\n+ `when`(parser.toBundle(any(MiPushMessage::class.java))).thenReturn(bundle)\n+ val isSuccess = handler.createNotification(application, MiPushMessage())\n+ Assert.assertTrue(isSuccess)\n+ }\n+\n@Test\nfun testOnReceivePassThroughMessage_Other_Command() {\nval message = mock(MiPushCommandMessage::class.java)\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiNotificationParserTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiNotificationParserTest.kt",
"diff": "@@ -43,7 +43,7 @@ class XiaomiNotificationParserTest : BaseTestCase() {\n}\n@Test\n- fun testToBundle_Message_Outside_CleverTap_Return_Not_Null() {\n+ fun testToBundle_Message_CleverTap_Message_Return_Not_Null() {\n`when`(message.content).thenReturn(getMockJsonStringClevertapNetwork())\nAssert.assertNotNull(parser.toBundle(message))\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.kt",
"diff": "@@ -23,91 +23,85 @@ import kotlin.test.assertFailsWith\nclass XiaomiPushProviderTest : BaseTestCase() {\nprivate lateinit var ctPushProviderListener: CTPushProviderListener\n- private var xiaomiPushProvider: XiaomiPushProvider? = null\n- private var sdkHandler: XiaomiSdkHandler? = null\n- private var manifestInfo: ManifestInfo? = null\n+ private lateinit var xiaomiPushProvider: XiaomiPushProvider\n+ private lateinit var sdkHandler: XiaomiSdkHandler\n+ private lateinit var manifestInfo: ManifestInfo\n@Before\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\nmanifestInfo = Mockito.mock(ManifestInfo::class.java)\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(MI_APP_KEY)\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(MI_APP_ID)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(MI_APP_KEY)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(MI_APP_ID)\n//init provider listener\nctPushProviderListener = Mockito.mock(CTPushProviderListener::class.java)\nMockito.`when`(ctPushProviderListener.context()).thenReturn(application)\nMockito.`when`(ctPushProviderListener.config()).thenReturn(cleverTapInstanceConfig)\nsdkHandler = XiaomiSdkHandler(ctPushProviderListener)\n- sdkHandler!!.setManifestInfo(manifestInfo)\n+ sdkHandler.setManifestInfo(manifestInfo)\n//init push provider\nxiaomiPushProvider = XiaomiPushProvider(ctPushProviderListener)\n- xiaomiPushProvider!!.setMiSdkHandler(sdkHandler!!)\n+ xiaomiPushProvider.setMiSdkHandler(sdkHandler)\n}\n@Test\nfun testRequestToken() {\nMockito.mockStatic(MiPushClient::class.java).use {\nMockito.`when`(MiPushClient.getRegId(application)).thenReturn(MI_TOKEN)\n- xiaomiPushProvider!!.requestToken()\n+ xiaomiPushProvider.requestToken()\nMockito.verify(ctPushProviderListener).onNewToken(MI_TOKEN, XPS)\n}\n}\n@Test\nfun testIsAvailable_ReturnsFalse() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(null)\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(null)\n- Assert.assertFalse(xiaomiPushProvider!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(null)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(null)\n+ Assert.assertFalse(xiaomiPushProvider.isAvailable)\n}\n@Test\nfun testIsAvailable_ReturnsTrue() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(MI_APP_KEY)\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(MI_APP_ID)\n- Assert.assertTrue(xiaomiPushProvider!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(MI_APP_KEY)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(MI_APP_ID)\n+ Assert.assertTrue(xiaomiPushProvider.isAvailable)\n}\n@Test\nfun testIsSupported() {\n- Assert.assertTrue(xiaomiPushProvider!!.isSupported)\n+ Assert.assertTrue(xiaomiPushProvider.isSupported)\n}\n@Test\nfun testGetPlatform() {\n- Assert.assertEquals(xiaomiPushProvider!!.platform.toLong(), ANDROID_PLATFORM.toLong())\n+ Assert.assertEquals(xiaomiPushProvider.platform.toLong(), ANDROID_PLATFORM.toLong())\n}\n@Test\nfun testGetPushType() {\n- Assert.assertEquals(xiaomiPushProvider!!.pushType, XPS)\n+ Assert.assertEquals(xiaomiPushProvider.pushType, XPS)\n}\n@Test\nfun minSDKSupportVersionCode() {\nAssert.assertEquals(\n- xiaomiPushProvider!!.minSDKSupportVersionCode().toLong(),\n+ xiaomiPushProvider.minSDKSupportVersionCode().toLong(),\nMIN_CT_ANDROID_SDK_VERSION.toLong()\n)\n}\n@Test\nfun testRegister_ValidConfigs() {\n- sdkHandler!!.register(sdkHandler!!.appId(), sdkHandler!!.appKey())\n- Assert.assertTrue(sdkHandler!!.isRegistered)\n+ sdkHandler.register(sdkHandler.appId(), sdkHandler.appKey())\n+ Assert.assertTrue(sdkHandler.isRegistered)\n}\n@Test\nfun testRegister_InValidConfigs() {\nassertFailsWith<RegistrationException> {\n- sdkHandler!!.register(null, null)\n+ sdkHandler.register(null, null)\n}\n}\n-\n- @After\n- fun tearDown() {\n- xiaomiPushProvider = null\n- sdkHandler = null\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"diff": "@@ -14,34 +14,34 @@ import org.robolectric.annotation.Config\n@Config(sdk = [28], application = TestApplication::class)\nclass XiaomiSdkHandlerTest : BaseTestCase() {\n- private var handler: XiaomiSdkHandler? = null\n- private var manifestInfo: ManifestInfo? = null\n+ private lateinit var handler: XiaomiSdkHandler\n+ private lateinit var manifestInfo: ManifestInfo\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\nmanifestInfo = Mockito.mock(ManifestInfo::class.java)\nhandler = XiaomiSdkHandler(baseCTApiListener)\n- handler!!.setManifestInfo(manifestInfo)\n+ handler.setManifestInfo(manifestInfo)\n}\n@Test\nfun testOnNewToken_Without_Registration() {\nMockito.mockStatic(MiPushClient::class.java).use {\nMockito.`when`(MiPushClient.getRegId(application)).thenReturn(null)\n- val token = handler!!.onNewToken()\n+ val token = handler.onNewToken()\nAssert.assertNull(token)\n}\n}\n@Test\nfun testOnNewToken_After_Registration() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(XpsTestConstants.MI_APP_ID)\n- handler!!.register(manifestInfo!!.xiaomiAppID, manifestInfo!!.xiaomiAppKey)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(XpsTestConstants.MI_APP_ID)\n+ handler.register(manifestInfo.xiaomiAppID, manifestInfo.xiaomiAppKey)\nMockito.mockStatic(MiPushClient::class.java).use {\nMockito.`when`(MiPushClient.getRegId(application)).thenReturn(\"abc\")\n- val token = handler!!.onNewToken()\n+ val token = handler.onNewToken()\nAssert.assertNotNull(token)\n}\n}\n@@ -50,62 +50,62 @@ class XiaomiSdkHandlerTest : BaseTestCase() {\nfun testOnNewTokenException() {\nMockito.mockStatic(MiPushClient::class.java).use {\nMockito.`when`(MiPushClient.getRegId(application)).thenThrow(RuntimeException(\"Checking\"))\n- val token = handler!!.onNewToken()\n+ val token = handler.onNewToken()\nAssert.assertNull(token)\n}\n}\n@Test\nfun testAppKey() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n- Assert.assertEquals(handler!!.appKey(), XpsTestConstants.MI_APP_KEY)\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(null)\n- Assert.assertNull(handler!!.appKey())\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n+ Assert.assertEquals(handler.appKey(), XpsTestConstants.MI_APP_KEY)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(null)\n+ Assert.assertNull(handler.appKey())\n}\n@Test\nfun testAppId() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(\"abc\")\n- Assert.assertNotNull(handler!!.appId())\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(null)\n- Assert.assertNull(handler!!.appId())\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(\"abc\")\n+ Assert.assertNotNull(handler.appId())\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(null)\n+ Assert.assertNull(handler.appId())\n}\n@Test\nfun testIsAvailable_validAppId_validAppKey() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(\"abc\")\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(\"xyz\")\n- Assert.assertTrue(handler!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(\"abc\")\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(\"xyz\")\n+ Assert.assertTrue(handler.isAvailable)\n}\n@Test\nfun testIsAvailable_validAppId_inValidAppKey() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(\"abc\")\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(\"\")\n- Assert.assertFalse(handler!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(\"abc\")\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(\"\")\n+ Assert.assertFalse(handler.isAvailable)\n}\n@Test\nfun testIsAvailable_inValidAppId_ValidAppKey() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(null)\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(\"xyz\")\n- Assert.assertFalse(handler!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(null)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(\"xyz\")\n+ Assert.assertFalse(handler.isAvailable)\n}\n@Test\nfun testIsAvailable_inValidAppId_inValidAppKey() {\n- Mockito.`when`(manifestInfo!!.xiaomiAppID).thenReturn(\"\")\n- Mockito.`when`(manifestInfo!!.xiaomiAppKey).thenReturn(null)\n- Assert.assertFalse(handler!!.isAvailable)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(\"\")\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(null)\n+ Assert.assertFalse(handler.isAvailable)\n}\n@Test\nfun testShouldInit_Returns_True() {\n- Assert.assertTrue(handler!!.shouldInit(application!!.packageName))\n+ Assert.assertTrue(handler.shouldInit(application.packageName))\n}\n@Test\nfun testShouldInit_Returns_False() {\n- Assert.assertFalse(handler!!.shouldInit(\"XYZ\"))\n+ Assert.assertFalse(handler.shouldInit(\"XYZ\"))\n}\n}\n\\ No newline at end of file\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": "@@ -16,10 +16,10 @@ import org.robolectric.annotation.Config\n)\nabstract class BaseTestCase {\n- protected var application: TestApplication? = null\n+ protected lateinit var application: TestApplication\nprotected lateinit var baseCTApiListener: BaseCTApiListener\n- protected var cleverTapAPI: CleverTapAPI? = null\n- protected var cleverTapInstanceConfig: CleverTapInstanceConfig? = null\n+ protected lateinit var cleverTapAPI: CleverTapAPI\n+ protected lateinit var cleverTapInstanceConfig: CleverTapInstanceConfig\n@Before\nopen fun setUp() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(cleanup): code cleanup for test cases |
116,623 | 30.09.2020 00:54:45 | -19,080 | ec270dc4d7b89250b21a9b4b240487adff5f095a | chore(docs): Modified trigger location docs | [
{
"change_type": "MODIFY",
"old_path": "docs/TriggerLocation.md",
"new_path": "docs/TriggerLocation.md",
"diff": "@@ -10,6 +10,6 @@ Below are two main use cases where this method can be used:\n* Apps can use it to maintain a tradeoff between location update interval and geofence synchronisation, For example.\nIf an app sets a location update interval of 6 hours and displacement of 2 km due to some reasons like battery optimisations but before the next location update also wants to sync geofences dynamically based on some smart logic then this can be handy. Note that throttling limit of 30 minutes and displacement of 200 meters between two syncs will be applied here.\n-\n+\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(docs): Modified trigger location docs SDK-84 |
116,621 | 30.09.2020 11:57:23 | -19,080 | 156cdd5fc88610d550c940759ff85eca44268b1d | chore(release-prep): more logs | [
{
"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": "@@ -74,7 +74,7 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\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 for Sender Id - \" + token);\n+ listener.config().log(LOG_TAG, FCM_LOG_TAG + \"FCM token - \" + token);\nlistener.onNewToken(token, getPushType());\n}\n});\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(release-prep): more logs |
116,621 | 30.09.2020 21:12:39 | -19,080 | e29884e601fafb5e846b808f306c221d9ca53daa | chore(fix): disabled A/B testing for API 18 | [
{
"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": "@@ -36,6 +36,7 @@ import android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport android.net.Uri;\nimport android.os.Build;\n+import android.os.Build.VERSION_CODES;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\n@@ -1556,6 +1557,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Boolean} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Boolean getBooleanVariable(String name, Boolean defaultValue) {\nif (ctABTestController == null) {\n@@ -1780,6 +1782,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Double} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Double getDoubleVariable(String name, Double defaultValue) {\nif (ctABTestController == null) {\n@@ -1925,6 +1928,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Integer} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Integer getIntegerVariable(String name, Integer defaultValue) {\nif (ctABTestController == null) {\n@@ -1958,6 +1962,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link List} of {@link Boolean} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic List<Boolean> getListOfBooleanVariable(String name, List<Boolean> defaultValue) {\nif (ctABTestController == null) {\n@@ -1978,6 +1983,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link List} of {@link Double} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic List<Double> getListOfDoubleVariable(String name, List<Double> defaultValue) {\nif (ctABTestController == null) {\n@@ -1998,6 +2004,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link List} of {@link Integer} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic List<Integer> getListOfIntegerVariable(String name, List<Integer> defaultValue) {\nif (ctABTestController == null) {\n@@ -2015,6 +2022,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link List} of {@link String} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic List<String> getListOfStringVariable(String name, List<String> defaultValue) {\nif (ctABTestController == null) {\n@@ -2058,6 +2066,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Map} of {@link Boolean} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Map<String, Boolean> getMapOfBooleanVariable(String name, Map<String, Boolean> defaultValue) {\nif (ctABTestController == null) {\n@@ -2075,6 +2084,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Map} of {@link Double} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Map<String, Double> getMapOfDoubleVariable(String name, Map<String, Double> defaultValue) {\nif (ctABTestController == null) {\n@@ -2092,6 +2102,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Map} of {@link Integer} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Map<String, Integer> getMapOfIntegerVariable(String name, Map<String, Integer> defaultValue) {\nif (ctABTestController == null) {\n@@ -2109,6 +2120,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link Map} of {@link String} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic Map<String, String> getMapOfStringVariable(String name, Map<String, String> defaultValue) {\nif (ctABTestController == null) {\n@@ -2160,6 +2172,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n* @param defaultValue - the default value to return if the value has not been set via an AB Testing Experiment\n* @return {@link String} the value set by the Experiment or the default value if unset\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic String getStringVariable(String name, String defaultValue) {\nif (ctABTestController == null) {\n@@ -3356,6 +3369,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerBooleanVariable(String name) {\nif (ctABTestController == null) {\n@@ -3370,6 +3384,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerDoubleVariable(String name) {\nif (ctABTestController == null) {\n@@ -3384,6 +3399,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerIntegerVariable(String name) {\nif (ctABTestController == null) {\n@@ -3399,6 +3415,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerListOfBooleanVariable(String name) {\nif (ctABTestController == null) {\n@@ -3414,6 +3431,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerListOfDoubleVariable(String name) {\nif (ctABTestController == null) {\n@@ -3429,6 +3447,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerListOfIntegerVariable(String name) {\nif (ctABTestController == null) {\n@@ -3444,6 +3463,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerListOfStringVariable(String name) {\nif (ctABTestController == null) {\n@@ -3459,6 +3479,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerMapOfBooleanVariable(String name) {\nif (ctABTestController == null) {\n@@ -3474,6 +3495,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerMapOfDoubleVariable(String name) {\nif (ctABTestController == null) {\n@@ -3489,6 +3511,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerMapOfIntegerVariable(String name) {\nif (ctABTestController == null) {\n@@ -3504,6 +3527,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerMapOfStringVariable(String name) {\nif (ctABTestController == null) {\n@@ -3518,6 +3542,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n*\n* @param name {@link String} the name of the variable\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@SuppressWarnings({\"unused\"})\npublic void registerStringVariable(String name) {\nif (ctABTestController == null) {\n@@ -5929,6 +5954,9 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nprivate void initABTesting() {\n+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {\n+ return;\n+ }\nif (!config.isAnalyticsOnly()) {\nif (!config.isABTestingEnabled()) {\ngetConfigLogger().debug(config.getAccountId(), \"AB Testing is not enabled for this instance\");\n@@ -6806,6 +6834,9 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nprivate void processIncomingExperiments(JSONObject response) {\n+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {\n+ return;\n+ }\ntry {\nJSONArray experimentsArray = response.getJSONArray(\"ab_exps\");\nif (this.ctABTestController != null) {\n@@ -7378,6 +7409,9 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nprivate void resetABTesting() {\n+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {\n+ return;\n+ }\nif (!this.config.isAnalyticsOnly()) {\nif (!config.isABTestingEnabled()) {\ngetConfigLogger().debug(config.getAccountId(), \"AB Testing is not enabled for this instance\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ab_testing/CTABTestController.java",
"diff": "@@ -7,6 +7,7 @@ import android.content.SharedPreferences;\nimport android.hardware.Sensor;\nimport android.hardware.SensorManager;\nimport android.os.Build;\n+import android.os.Build.VERSION_CODES;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.HandlerThread;\n@@ -14,6 +15,7 @@ import android.os.Looper;\nimport android.os.Message;\nimport android.os.Process;\nimport androidx.annotation.NonNull;\n+import androidx.annotation.RequiresApi;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Logger;\n@@ -47,6 +49,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n+@RequiresApi(api = VERSION_CODES.KITKAT)\npublic class CTABTestController {\n@SuppressWarnings(\"unused\")\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/WebSocketImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/WebSocketImpl.java",
"diff": "package com.clevertap.android.sdk.java_websocket;\n+import android.os.Build.VERSION_CODES;\n+import androidx.annotation.RequiresApi;\nimport com.clevertap.android.sdk.java_websocket.drafts.Draft;\nimport com.clevertap.android.sdk.java_websocket.drafts.Draft_6455;\nimport com.clevertap.android.sdk.java_websocket.enums.CloseHandshakeType;\n@@ -342,6 +344,7 @@ public class WebSocketImpl implements WebSocket {\n*\n* @param socketBuffer the ByteBuffer to decode\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic void decode(ByteBuffer socketBuffer) {\nassert (socketBuffer.hasRemaining());\n@@ -548,6 +551,7 @@ public class WebSocketImpl implements WebSocket {\nsendFrame(pingFrame);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic void startHandshake(ClientHandshakeBuilder handshakedata) throws InvalidHandshakeException {\n// Store the Handshake Request we are about to send\nthis.handshakerequest = draft.postProcessHandshakeRequestAsClient(handshakedata);\n@@ -600,6 +604,7 @@ public class WebSocketImpl implements WebSocket {\n*\n* @param exception the RuntimeException causing this problem\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\nprivate void closeConnectionDueToInternalServerError(RuntimeException exception) {\nwrite(generateHttpResponseDueToError(500));\nflushAndClose(CloseFrame.NEVER_CONNECTED, exception.getMessage(), false);\n@@ -610,6 +615,7 @@ public class WebSocketImpl implements WebSocket {\n*\n* @param exception the InvalidDataException causing this problem\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\nprivate void closeConnectionDueToWrongHandshake(InvalidDataException exception) {\nwrite(generateHttpResponseDueToError(404));\nflushAndClose(exception.getCloseCode(), exception.getMessage(), false);\n@@ -637,6 +643,7 @@ public class WebSocketImpl implements WebSocket {\n* Returns whether the handshake phase has is completed.\n* In case of a broken handshake this will be never the case.\n**/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\nprivate boolean decodeHandshake(ByteBuffer socketBufferNew) {\nByteBuffer socketBuffer;\nif (tmpHandshakeBytes.capacity() == 0) {\n@@ -775,6 +782,7 @@ public class WebSocketImpl implements WebSocket {\n* @param errorCode the http error code\n* @return the complete response as ByteBuffer\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\nprivate ByteBuffer generateHttpResponseDueToError(int errorCode) {\nString errorCodeDescription;\nswitch (errorCode) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/client/WebSocketClient.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/client/WebSocketClient.java",
"diff": "package com.clevertap.android.sdk.java_websocket.client;\n+import android.os.Build.VERSION_CODES;\n+import androidx.annotation.RequiresApi;\nimport com.clevertap.android.sdk.java_websocket.AbstractWebSocket;\nimport com.clevertap.android.sdk.java_websocket.WebSocket;\nimport com.clevertap.android.sdk.java_websocket.WebSocketImpl;\n@@ -608,6 +610,7 @@ public abstract class WebSocketClient extends AbstractWebSocket implements Runna\nreturn connectBlocking();\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic void run() {\nInputStream istream;\ntry {\n@@ -813,6 +816,7 @@ public abstract class WebSocketClient extends AbstractWebSocket implements Runna\n*\n* @throws InvalidHandshakeException a invalid handshake was created\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\nprivate void sendHandshake() throws InvalidHandshakeException {\nString path;\nString part1 = uri.getRawPath();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/drafts/Draft.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/drafts/Draft.java",
"diff": "package com.clevertap.android.sdk.java_websocket.drafts;\n+import android.os.Build.VERSION_CODES;\n+import androidx.annotation.RequiresApi;\nimport com.clevertap.android.sdk.java_websocket.WebSocketImpl;\nimport com.clevertap.android.sdk.java_websocket.enums.CloseHandshakeType;\nimport com.clevertap.android.sdk.java_websocket.enums.HandshakeState;\n@@ -87,11 +89,13 @@ public abstract class Draft {\nreturn null;\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static String readStringLine(ByteBuffer buf) {\nByteBuffer b = readLine(buf);\nreturn b == null ? null : Charsetfunctions.stringAscii(b.array(), 0, b.limit());\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static HandshakeBuilder translateHandshakeHttp(ByteBuffer buf, Role role)\nthrows InvalidHandshakeException {\nHandshakeBuilder handshake;\n@@ -191,11 +195,13 @@ public abstract class Draft {\n/**\n* @deprecated use createHandshake without the role\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@Deprecated\npublic List<ByteBuffer> createHandshake(Handshakedata handshakedata, Role ownrole) {\nreturn createHandshake(handshakedata);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic List<ByteBuffer> createHandshake(Handshakedata handshakedata) {\nreturn createHandshake(handshakedata, true);\n}\n@@ -203,11 +209,13 @@ public abstract class Draft {\n/**\n* @deprecated use createHandshake without the role since it does not have any effect\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\n@Deprecated\npublic List<ByteBuffer> createHandshake(Handshakedata handshakedata, Role ownrole, boolean withcontent) {\nreturn createHandshake(handshakedata, withcontent);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic List<ByteBuffer> createHandshake(Handshakedata handshakedata, boolean withcontent) {\nStringBuilder bui = new StringBuilder(100);\nif (handshakedata instanceof ClientHandshake) {\n@@ -273,6 +281,7 @@ public abstract class Draft {\npublic abstract List<Framedata> translateFrame(ByteBuffer buffer) throws InvalidDataException;\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic Handshakedata translateHandshake(ByteBuffer buf) throws InvalidHandshakeException {\nreturn translateHandshakeHttp(buf, role);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/util/Charsetfunctions.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/java_websocket/util/Charsetfunctions.java",
"diff": "package com.clevertap.android.sdk.java_websocket.util;\n-import android.os.Build;\n+import android.os.Build.VERSION_CODES;\n+import androidx.annotation.RequiresApi;\nimport com.clevertap.android.sdk.java_websocket.exceptions.InvalidDataException;\nimport com.clevertap.android.sdk.java_websocket.framing.CloseFrame;\nimport java.nio.ByteBuffer;\nimport java.nio.charset.CharacterCodingException;\n-import java.nio.charset.Charset;\nimport java.nio.charset.CharsetDecoder;\nimport java.nio.charset.CodingErrorAction;\nimport java.nio.charset.StandardCharsets;\n@@ -63,12 +63,9 @@ public class Charsetfunctions {\n/*\n* @return ASCII encoding in bytes\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static byte[] asciiBytes(String s) {\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {\nreturn s.getBytes(StandardCharsets.US_ASCII);\n- } else {\n- return s.getBytes(Charset.forName(\"UTF-8\"));\n- }\n}\n/**\n@@ -106,18 +103,22 @@ public class Charsetfunctions {\nreturn isValidUTF8(data, 0);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static String stringAscii(byte[] bytes) {\nreturn stringAscii(bytes, 0, bytes.length);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static String stringAscii(byte[] bytes, int offset, int length) {\nreturn new String(bytes, offset, length, StandardCharsets.US_ASCII);\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static String stringUtf8(byte[] bytes) throws InvalidDataException {\nreturn stringUtf8(ByteBuffer.wrap(bytes));\n}\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static String stringUtf8(ByteBuffer bytes) throws InvalidDataException {\nCharsetDecoder decode = StandardCharsets.UTF_8.newDecoder();\ndecode.onMalformedInput(codingErrorAction);\n@@ -136,6 +137,7 @@ public class Charsetfunctions {\n/*\n* @return UTF-8 encoding in bytes\n*/\n+ @RequiresApi(api = VERSION_CODES.KITKAT)\npublic static byte[] utf8Bytes(String s) {\nreturn s.getBytes(StandardCharsets.UTF_8);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(fix): disabled A/B testing for API 18 |
116,612 | 30.09.2020 22:49:39 | -19,080 | d3a6363f1126b59bc0382b1c20625dde52241d16 | task: add gradle task and templates to automate github docs versioning | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -36,9 +36,19 @@ task clean(type: Delete) {\ndelete rootProject.buildDir\n}\n-task copyTemplates(type: Copy) {\n+task copyTemplates {\noutputs.upToDateWhen { false }\n+ doLast{\n+ copy {\nfrom 'templates/README.md'\ninto \".\"\n- expand('ctCoreVersion': \"$coreVersion\")\n+ expand('ext': project.ext.properties)\n+ }\n+ copy {\n+ from 'templates'\n+ exclude \"README.md\"\n+ into \"docs/\"\n+ expand('ext': project.ext.properties)\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/EXAMPLES.md",
"new_path": "docs/EXAMPLES.md",
"diff": "@@ -150,16 +150,16 @@ Use `onUserLogin` to maintain multiple distinct user profiles on the same device\nAdd the following dependencies in your app's `build.gradle`\n```groovy\n-implementation 'androidx.appcompat:appcompat:1.2.0'//MANDATORY for App Inbox\n-implementation 'androidx.recyclerview:recyclerview:1.1.0'//MANDATORY for App Inbox\n-implementation 'androidx.viewpager:viewpager:1.0.0'//MANDATORY for App Inbox\n-implementation 'com.google.android.material:material:1.2.1'//MANDATORY for App Inbox\n-implementation 'com.github.bumptech.glide:glide:4.11.0'//MANDATORY for App Inbox\n+implementation \"androidx.appcompat:appcompat:1.2.0\"//MANDATORY for App Inbox\n+implementation \"androidx.recyclerview:recyclerview:1.1.0\"//MANDATORY for App Inbox\n+implementation \"androidx.viewpager:viewpager:1.0.0\"//MANDATORY for App Inbox\n+implementation \"com.google.android.material:material:1.2.1\"//MANDATORY for App Inbox\n+implementation \"com.github.bumptech.glide:glide:4.11.0\"//MANDATORY for App Inbox\n//Optional ExoPlayer Libraries for Audio/Video Inbox Messages. Audio/Video messages will be dropped without these dependencies\n-implementation 'com.google.android.exoplayer:exoplayer:2.11.5'\n-implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.5'\n-implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.5'\n+implementation \"com.google.android.exoplayer:exoplayer:2.11.5\"\n+implementation \"com.google.android.exoplayer:exoplayer-hls:2.11.5\"\n+implementation \"com.google.android.exoplayer:exoplayer-ui:2.11.5\"\n```\n#### Initializing the Inbox\n@@ -336,5 +336,5 @@ To support in-app notifications, register the following activity in your Android\nFrom CleverTap SDK v3.6.4 onwards, just remove the above the Broadcast Receiver if you are using it and add the following gradle dependency to capture UTM details, app install time, referrer click time and other metrics provided by the Google Install Referrer Library.\n```groovy\n- implementation 'com.android.installreferrer:installreferrer:2.1'\n+ implementation \"com.android.installreferrer:installreferrer:2.1\"\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/dependencies.gradle",
"new_path": "gradle-scripts/dependencies.gradle",
"diff": "@@ -29,5 +29,11 @@ ext.deps = [\n'junit' : \"junit:junit:$junitVersion\",\n'androidXTestCore' : \"androidx.test:core:$androidxCoreVersion\",\n'mockitoCore' : \"org.mockito:mockito-core:$mockitoVersion\",\n- 'androidXJunitExt' : \"androidx.test.ext:junit:$junitExtVersion\"\n+ 'androidXJunitExt' : \"androidx.test.ext:junit:$junitExtVersion\",\n+ 'clevertapCore' : \"com.clevertap.android:clevertap-android-sdk:$coreVersion\",\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": "templates/EXAMPLES.md",
"new_path": "templates/EXAMPLES.md",
"diff": "@@ -150,16 +150,16 @@ Use `onUserLogin` to maintain multiple distinct user profiles on the same device\nAdd the following dependencies in your app's `build.gradle`\n```groovy\n-implementation 'androidx.appcompat:appcompat:1.2.0'//MANDATORY for App Inbox\n-implementation 'androidx.recyclerview:recyclerview:1.1.0'//MANDATORY for App Inbox\n-implementation 'androidx.viewpager:viewpager:1.0.0'//MANDATORY for App Inbox\n-implementation 'com.google.android.material:material:1.2.1'//MANDATORY for App Inbox\n-implementation 'com.github.bumptech.glide:glide:4.11.0'//MANDATORY for App Inbox\n+implementation \"${ext.deps.appcompat}\"//MANDATORY for App Inbox\n+implementation \"${ext.deps.recyclerview}\"//MANDATORY for App Inbox\n+implementation \"${ext.deps.viewPager}\"//MANDATORY for App Inbox\n+implementation \"${ext.deps.materialDesign}\"//MANDATORY for App Inbox\n+implementation \"${ext.deps.glide}\"//MANDATORY for App Inbox\n//Optional ExoPlayer Libraries for Audio/Video Inbox Messages. Audio/Video messages will be dropped without these dependencies\n-implementation 'com.google.android.exoplayer:exoplayer:2.11.5'\n-implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.5'\n-implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.5'\n+implementation \"${ext.deps.exoPlayer}\"\n+implementation \"${ext.deps.exoPlayerHls}\"\n+implementation \"${ext.deps.exoPlayerUi}\"\n```\n#### Initializing the Inbox\n@@ -336,5 +336,5 @@ To support in-app notifications, register the following activity in your Android\nFrom CleverTap SDK v3.6.4 onwards, just remove the above the Broadcast Receiver if you are using it and add the following gradle dependency to capture UTM details, app install time, referrer click time and other metrics provided by the Google Install Referrer Library.\n```groovy\n- implementation 'com.android.installreferrer:installreferrer:2.1'\n+ implementation \"${ext.deps.installreferrer}\"\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/README.md",
"new_path": "templates/README.md",
"diff": "@@ -36,7 +36,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:$ctCoreVersion'\n+ implementation \"${ext.deps.clevertapCore}\"\n}\n```\n@@ -44,7 +44,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-$ctCoreVersion', ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-${ext.coreVersion}\", ext: 'aar')\n}\n```\n@@ -56,11 +56,11 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:$ctCoreVersion'\n- implementation 'androidx.core:core:1.3.0'\n- implementation 'com.google.firebase:firebase-messaging:20.2.4'\n- implementation 'com.google.android.gms:play-services-ads:19.4.0' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n- implementation 'com.android.installreferrer:installreferrer:2.1' // Mandatory for v3.6.4 and above\n+ implementation \"${ext.deps.clevertapCore}\"\n+ implementation \"${ext.deps.androidXCore}\"\n+ implementation \"${ext.deps.firebaseMessaging}\"\n+ implementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n+ implementation \"${ext.deps.installreferrer}\" // Mandatory for v3.6.4 and above\n}\n```\n@@ -81,8 +81,8 @@ Also be sure to include the `google-services.json` classpath in your Project lev\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:4.0.1'\n- classpath 'com.google.gms:google-services:4.3.3'\n+ classpath \"com.android.tools.build:gradle:${ext.gradlePluginVersion}\"\n+ classpath \"com.google.gms:google-services:${ext.googleServicesPluginVersion}\"\n// NOTE: Do not place your application dependencies here; they belong\n// in the individual module build.gradle files\n@@ -98,9 +98,9 @@ apply plugin: 'com.google.gms.google-services'\nInterstitial InApp Notification templates support Audio and Video with the help of ExoPlayer. To enable Audio/Video in your Interstitial InApp Notifications, add the following dependencies in your `build.gradle` file :\n```groovy\n- implementation 'com.google.android.exoplayer:exoplayer:2.11.5'\n- implementation 'com.google.android.exoplayer:exoplayer-hls:2.11.5'\n- implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.5'\n+ implementation \"${ext.deps.exoPlayer}\"\n+ implementation \"${ext.deps.exoPlayerHls}\"\n+ implementation \"${ext.deps.exoPlayerUi}\"\n```\nOnce you've updated your module `build.gradle` file, make sure you have specified `jcenter()` and `google()` as a repositories in your project `build.gradle` and then sync your project in File -> Sync Project with Gradle Files.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task: add gradle task and templates to automate github docs versioning SDK-421 |
116,623 | 30.09.2020 23:26:43 | -19,080 | c74a97f052bd35c4d125e2e284d69c8f32c46fc7 | chore(refactor): Renamed getters & setters for CTPushAmpListener | [
{
"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": "@@ -340,7 +340,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n- private CTPushAmpListener pushListener = null;\n+ private CTPushAmpListener pushAmpListener = null;\nprivate CTPushNotificationListener pushNotificationListener = null;\n@@ -1608,23 +1608,23 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n/**\n- * Returns the CTPushListener object\n+ * Returns the CTPushAmpListener object\n*\n* @return The {@link CTPushAmpListener} object\n*/\n@SuppressWarnings(\"WeakerAccess\")\n- public CTPushAmpListener getCTPushListener() {\n- return pushListener;\n+ public CTPushAmpListener getCTPushAmpListener() {\n+ return pushAmpListener;\n}\n/**\n- * This method is used to set the CTPushListener\n+ * This method is used to set the CTPushAmpListener\n*\n- * @param pushListener - The{@link CTPushAmpListener} object\n+ * @param pushAmpListener - The{@link CTPushAmpListener} object\n*/\n@SuppressWarnings(\"unused\")\n- public void setCTPushListener(CTPushAmpListener pushListener) {\n- this.pushListener = pushListener;\n+ public void setCTPushAmpListener(CTPushAmpListener pushAmpListener) {\n+ this.pushAmpListener = pushAmpListener;\n}\n/**\n@@ -5883,8 +5883,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (!pushBundle.isEmpty() && !dbAdapter\n.doesPushNotificationIdExist(pushObject.getString(\"wzrk_pid\"))) {\ngetConfigLogger().verbose(\"Creating Push Notification locally\");\n- if (pushListener != null) {\n- pushListener.onPushAmpPayloadReceived(pushBundle);\n+ if (pushAmpListener != null) {\n+ pushAmpListener.onPushAmpPayloadReceived(pushBundle);\n} else {\ncreateNotification(context, pushBundle);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(refactor): Renamed getters & setters for CTPushAmpListener SDK-84 |
116,621 | 30.09.2020 23:35:15 | -19,080 | 264026a7dba01ab63337335880950abd8eb61acc | chore(fix):
1. Crash on API 16
2. Callback on main thread | [
{
"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": "@@ -4174,7 +4174,12 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate void _notifyInboxMessagesDidUpdate() {\nif (this.inboxListener != null) {\n- this.inboxListener.inboxMessagesDidUpdate();\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ CleverTapAPI.this.inboxListener.inboxMessagesDidUpdate();\n+ }\n+ });\n}\n}\n@@ -7913,7 +7918,6 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// Take all the properties from the notif and add it to the intent\nlaunchIntent.putExtras(extras);\nlaunchIntent.removeExtra(Constants.WZRK_ACTIONS);\n- launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);\npIntent = PendingIntent.getBroadcast(context, (int) System.currentTimeMillis(),\nlaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(fix):
1. Crash on API 16
2. Callback on main thread |
116,621 | 01.10.2020 10:40:13 | -19,080 | aa155a9c2f04295062c4bf48e907d135285d86db | chore(javadoc): XIAOMI SDK | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"diff": "@@ -5,6 +5,9 @@ import androidx.annotation.RestrictTo;\nimport com.xiaomi.mipush.sdk.MiPushCommandMessage;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\n+/**\n+ * interface to handle the xiaomi notification message receiver callbacks\n+ */\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IMiMessageHandler {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiSdkHandler.java",
"diff": "@@ -2,14 +2,29 @@ package com.clevertap.android.xps;\nimport androidx.annotation.RestrictTo;\n+/**\n+ * bridge interface to communicate with the Xiaomi SDK to check for availability, tokens etc.\n+ */\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IMiSdkHandler {\n+ /**\n+ * @return App ID of Xiaomi Project\n+ */\nString appId();\n+ /**\n+ * @return App key of Xiaomi Project\n+ */\nString appKey();\n+ /*\n+ * Tells whether Xiaomi Credentials are valid\n+ */\nboolean isAvailable();\n+ /**\n+ * @return Xiaomi Message token\n+ */\nString onNewToken();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IXiaomiNotificationParser.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IXiaomiNotificationParser.java",
"diff": "@@ -3,6 +3,9 @@ package com.clevertap.android.xps;\nimport android.os.Bundle;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\n+/**\n+ * Impl converts the MiMessage to bundle\n+ */\npublic interface IXiaomiNotificationParser {\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/RegistrationException.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/RegistrationException.java",
"diff": "package com.clevertap.android.xps;\n+/**\n+ * Throw this exception when registration fails due to invalid configurations\n+ */\npublic class RegistrationException extends RuntimeException {\npublic RegistrationException(String message) {\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": "@@ -22,6 +22,9 @@ import com.xiaomi.mipush.sdk.MiPushCommandMessage;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\nimport java.util.List;\n+/**\n+ * Implementation of {@link IMiMessageHandler}\n+ */\nclass XiaomiMessageHandlerImpl implements IMiMessageHandler {\nprivate @NonNull\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"diff": "@@ -9,6 +9,9 @@ import com.xiaomi.mipush.sdk.MiPushCommandMessage;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\nimport com.xiaomi.mipush.sdk.PushMessageReceiver;\n+/**\n+ * Clevertap's Implementation for Xiaomi Message Receiver\n+ */\npublic class XiaomiMessageReceiver extends PushMessageReceiver {\nprivate IMiMessageHandler handler = new XiaomiMessageHandlerImpl(new XiaomiNotificationParser());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiNotificationParser.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiNotificationParser.java",
"diff": "@@ -10,6 +10,9 @@ import com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\n+/**\n+ * Implementation of {@link IXiaomiNotificationParser}\n+ */\npublic class XiaomiNotificationParser implements IXiaomiNotificationParser {\n@Override\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": "@@ -12,6 +12,9 @@ import com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n+/**\n+ * Clevertap's Xiaomi Plugin Ref: {@link CTPushProvider}\n+ */\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic class XiaomiPushProvider implements CTPushProvider {\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": "@@ -13,6 +13,9 @@ import com.clevertap.android.sdk.ManifestInfo;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport java.util.List;\n+/**\n+ * Implementation of {@link IMiSdkHandler}\n+ */\nclass XiaomiSdkHandler implements IMiSdkHandler {\nprivate final BaseCTApiListener ctApiListener;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(javadoc): XIAOMI SDK |
116,623 | 01.10.2020 10:41:29 | -19,080 | 621cb095658a14d6fa4e01b97a2c80d28deaafb6 | chore(release): Modifying CHANGELOG docs and gradle tasks for release | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -170,6 +170,7 @@ install {\n}\ntask sourcesJar(type: Jar) {\n+ baseName \"$artifact\"\nfrom android.sourceSets.main.java.srcDirs\nclassifier = 'sources'\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(release): Modifying CHANGELOG docs and gradle tasks for release SDK-84 |
116,623 | 01.10.2020 10:50:42 | -19,080 | ecca8fc7f0550a0932beb949a54d84626c454f56 | chore(release): Update geofence sdk version for release | [
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -31,7 +31,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.0\"\n+implementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.1\"\nimplementation \"com.clevertap.android:clevertap-android-sdk:4.0.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"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -6,7 +6,7 @@ ext {\n// CleverTap modules\ncoreVersion = \"4.0.0\"\n- geofenceVersion = \"1.0.0\"\n+ geofenceVersion = \"1.0.1\"\nhmsVersion = \"1.0.0\"\nxpsVersion = \"1.0.0\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(release): Update geofence sdk version for release SDK-84 |
116,621 | 01.10.2020 10:55:23 | -19,080 | 2a52165707ee6fa297e971de114fb45dfadff2bb | chore(javadoc): Huawei SDK | [
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"diff": "@@ -7,6 +7,9 @@ import com.clevertap.android.sdk.Logger;\nimport com.huawei.hms.push.HmsMessageService;\nimport com.huawei.hms.push.RemoteMessage;\n+/**\n+ * Clevertap's Implementation for Huawei Message Receiver\n+ */\npublic class CTHmsMessageService extends HmsMessageService {\nprivate IHmsMessageHandler mHandler = new HmsMessageHandlerImpl(new HmsNotificationParser());\n"
},
{
"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": "@@ -11,6 +11,9 @@ import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\nimport com.huawei.hms.push.RemoteMessage;\n+/**\n+ * Implementation of {@link IHmsMessageHandler}\n+ */\nclass HmsMessageHandlerImpl implements IHmsMessageHandler {\nprivate IHmsNotificationParser mParser;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsNotificationParser.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/HmsNotificationParser.java",
"diff": "@@ -10,6 +10,9 @@ import com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.huawei.hms.push.RemoteMessage;\n+/**\n+ * Implementation of {@link IHmsNotificationParser}\n+ */\npublic class HmsNotificationParser implements IHmsNotificationParser {\n@Override\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": "@@ -11,6 +11,9 @@ import com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n+/**\n+ * Clevertap's Huawei Plugin Ref: {@link CTPushProvider}\n+ */\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic class HmsPushProvider implements CTPushProvider {\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": "@@ -11,6 +11,9 @@ import com.huawei.agconnect.config.AGConnectServicesConfig;\nimport com.huawei.hms.aaid.HmsInstanceId;\nimport com.huawei.hms.api.HuaweiApiAvailability;\n+/**\n+ * Implementation of {@link IHmsSdkHandler}\n+ */\nclass HmsSdkHandler implements IHmsSdkHandler {\nprivate final BaseCTApiListener mListener;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsMessageHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsMessageHandler.java",
"diff": "@@ -3,6 +3,9 @@ package com.clevertap.android.hms;\nimport android.content.Context;\nimport com.huawei.hms.push.RemoteMessage;\n+/**\n+ * interface to handle the xiaomi notification message receiver callbacks\n+ */\npublic interface IHmsMessageHandler {\nboolean createNotification(Context context, RemoteMessage remoteMessage);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsNotificationParser.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsNotificationParser.java",
"diff": "@@ -3,6 +3,9 @@ package com.clevertap.android.hms;\nimport android.os.Bundle;\nimport com.huawei.hms.push.RemoteMessage;\n+/**\n+ * Impl converts the RemoteMessage to bundle\n+ */\npublic interface IHmsNotificationParser {\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsSdkHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsSdkHandler.java",
"diff": "@@ -2,12 +2,24 @@ package com.clevertap.android.hms;\npublic interface IHmsSdkHandler {\n+ /**\n+ * @return App ID of Huawei Project\n+ */\nString appId();\n+ /*\n+ * Tells whether Huawei Credentials are valid\n+ */\n+ boolean isAvailable();\n+\n+ /*\n+ * Tells whether Huawei push is supported\n+ */\nboolean isSupported();\n+ /**\n+ * @return Xiaomi Message token\n+ */\nString onNewToken();\n- boolean isAvailable();\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"diff": "@@ -11,8 +11,18 @@ import com.xiaomi.mipush.sdk.MiPushMessage;\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IMiMessageHandler {\n+ /**\n+ * @param context - application context\n+ * @param message - MiMessage\n+ * @return true if everything is fine & notification is rendered successfully\n+ */\nboolean createNotification(Context context, MiPushMessage message);\n+ /**\n+ * @param context - application context\n+ * @param miPushCommandMessage - miCommand Message\n+ * @return message processed result code after processing, Ref {@link XpsConstants.CommandResult}\n+ */\nint onReceiveRegisterResult(Context context, MiPushCommandMessage miPushCommandMessage);\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(javadoc): Huawei SDK |
116,623 | 01.10.2020 11:12:36 | -19,080 | 2991761a2831ff03def3bc2f12171969561aa625 | chore(release): Added modular CHANGELOGs | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n-### Version 4.0.0 (October 1, 2020)\n-* Adds support for Android 10 and AndroidX support libraries.\n-* Adds support for Huawei Push and Xiaomi Push modules.\n-* This is a major release, please find the list of all [changes here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTV4CHANGES.md)\n+### October 1, 2020\n+\n+* [CleverTap Android SDK v4.0.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Geofence SDK v1.0.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTGEOFENCECHANGELOG.md)\n+* [CleverTap Xiaomi Push SDK v1.0.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n+* [CleverTap Huawei Push SDK v1.0.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTHUAWEIPUSHCHANGELOG.md)\n+\n### Version 3.9.1 (September 17, 2020)\n* Handled Security Exception on `getNetworkType` for Android 11 devices\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "+## CleverTap Android SDK CHANGE LOG\n+\n+### Version 4.0.0 (October 1, 2020)\n+\n+* Adds support for Android 10 and AndroidX support libraries.\n+* This is a major release, please find the list of all [changes here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTV4CHANGES.md)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"diff": "+## CleverTap Huawei Push SDK CHANGE LOG\n+\n+### Version 1.0.0 (October 1, 2020)\n+\n+* Initial release!\n+* Supports CleverTap Android SDK v4.0.0\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "+## CleverTap Xiaomi Push SDK CHANGE LOG\n+\n+### Version 1.0.0 (October 1, 2020)\n+\n+* Initial release!\n+* Supports CleverTap Android SDK v4.0.0\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "+## CleverTap Android SDK CHANGE LOG\n+\n+### Version 4.0.0 (October 1, 2020)\n+\n+* Adds support for Android 10 and AndroidX support libraries.\n+* This is a major release, please find the list of all [changes here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTV4CHANGES.md)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"diff": "+## CleverTap Huawei Push SDK CHANGE LOG\n+\n+### Version 1.0.0 (October 1, 2020)\n+\n+* Initial release!\n+* Supports CleverTap Android SDK v4.0.0\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "+## CleverTap Xiaomi Push SDK CHANGE LOG\n+\n+### Version 1.0.0 (October 1, 2020)\n+\n+* Initial release!\n+* Supports CleverTap Android SDK v4.0.0\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(release): Added modular CHANGELOGs SDK-84 |
116,621 | 01.10.2020 11:23:26 | -19,080 | aba490f75c9f8230f5ae1af3c12885ebc7ae5979 | chore(javadoc): Huawei+ FCM + others | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTApiPushListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTApiPushListener.java",
"diff": "@@ -3,6 +3,9 @@ package com.clevertap.android.sdk.pushnotification;\nimport androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.BaseCTApiListener;\n+/**\n+ * Interface to call notification related methods of ClevertapAPI\n+ */\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic interface CTApiPushListener extends BaseCTApiListener {\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": "@@ -15,7 +15,7 @@ import java.util.ArrayList;\nimport java.util.List;\n/**\n- * loads providers\n+ * Single point of contact to load & support all types of Notification messaging services viz. FCM, XPS, HMS etc.\n*/\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n@@ -45,6 +45,12 @@ public class PushProviders implements CTPushProviderListener {\nthis.ctApiPushListener = ctApiPushListener;\n}\n+ /**\n+ * Saves token for a push type into shared pref\n+ *\n+ * @param token - Messaging token\n+ * @param pushType - Pushtype, Ref{@link PushConstants.PushType}\n+ */\npublic void cacheToken(final String token, final PushConstants.PushType pushType) {\nif (TextUtils.isEmpty(token) || pushType == null) {\nreturn;\n@@ -82,6 +88,9 @@ public class PushProviders implements CTPushProviderListener {\nreturn ctApiPushListener.context();\n}\n+ /**\n+ * @return list of all available push types, contains ( Clevertap's plugin + Custom supported Push Types)\n+ */\n@NonNull\npublic ArrayList<PushConstants.PushType> getAvailablePushTypes() {\nArrayList<PushConstants.PushType> pushTypes = new ArrayList<>();\n@@ -91,6 +100,10 @@ public class PushProviders implements CTPushProviderListener {\nreturn pushTypes;\n}\n+ /**\n+ * @param pushType - Pushtype {@link PushConstants.PushType}\n+ * @return Messaging token for a particular push type\n+ */\npublic String getCachedToken(PushConstants.PushType pushType) {\nif (pushType != null) {\[email protected] String key = pushType.getTokenPrefKey();\n@@ -106,6 +119,15 @@ public class PushProviders implements CTPushProviderListener {\nreturn null;\n}\n+ /**\n+ * Direct Method to send tokens to Clevertap's server\n+ * Call this method when Clients are handling the Messaging services on their own\n+ *\n+ * @param token - Messaging token\n+ * @param pushType - Pushtype, Ref:{@link PushConstants.PushType}\n+ * @param register - true if we want to register the token to CT server\n+ * false if we want to unregister the token from CT server\n+ */\npublic void handleToken(String token, PushConstants.PushType pushType, boolean register) {\nif (register) {\nregisterToken(token, pushType);\n@@ -114,6 +136,9 @@ public class PushProviders implements CTPushProviderListener {\n}\n}\n+ /**\n+ * @return true if we are able to reach the device via any of the messaging service\n+ */\npublic boolean isNotificationSupported() {\nfor (PushConstants.PushType pushType : getAvailablePushTypes()) {\nif (getCachedToken(pushType) != null) {\n@@ -128,6 +153,9 @@ public class PushProviders implements CTPushProviderListener {\nctApiPushListener.onNewToken(token, pushType);\n}\n+ /**\n+ * Fetches latest tokens from various providers and send to Clevertap's server\n+ */\npublic void refreshAllTokens() {\nCTExecutors.getInstance().diskIO().execute(new Runnable() {\n@Override\n@@ -141,6 +169,13 @@ public class PushProviders implements CTPushProviderListener {\n});\n}\n+ /**\n+ * Unregister the token for a push type from Clevertap's server.\n+ * Devices with unregistered token wont be reachable.\n+ *\n+ * @param token - Messaging token\n+ * @param pushType - pushtype Ref:{@link PushConstants.PushType}\n+ */\npublic void unregisterToken(String token, PushConstants.PushType pushType) {\nctApiPushListener.pushDeviceTokenEvent(token, false, pushType);\n}\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": "@@ -13,6 +13,9 @@ import com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.google.firebase.messaging.RemoteMessage;\nimport java.util.Map;\n+/**\n+ * implementation of {@link IFcmMessageHandler}\n+ */\npublic class FcmMessageHandlerImpl implements IFcmMessageHandler {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerService.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerService.java",
"diff": "@@ -4,6 +4,9 @@ import androidx.annotation.NonNull;\nimport com.google.firebase.messaging.FirebaseMessagingService;\nimport com.google.firebase.messaging.RemoteMessage;\n+/**\n+ * Clevertap's Implementation for Firebase Message service\n+ */\npublic class FcmMessageListenerService extends FirebaseMessagingService {\nprivate IFcmMessageHandler mHandler = new FcmMessageHandlerImpl();\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": "@@ -9,6 +9,9 @@ import com.clevertap.android.sdk.pushnotification.CTPushProvider;\nimport com.clevertap.android.sdk.pushnotification.CTPushProviderListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\n+/**\n+ * Clevertap's Firebase Plugin Ref: {@link CTPushProvider}\n+ */\n@RestrictTo(RestrictTo.Scope.LIBRARY)\n@SuppressLint(value = \"unused\")\npublic class FcmPushProvider implements CTPushProvider {\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": "@@ -17,6 +17,9 @@ import com.google.firebase.FirebaseApp;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.iid.InstanceIdResult;\n+/**\n+ * implementation of {@link IFcmMessageHandler}\n+ */\npublic class FcmSdkHandlerImpl implements IFcmSdkHandler {\nprivate final CTPushProviderListener listener;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/IFcmMessageHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/IFcmMessageHandler.java",
"diff": "@@ -4,11 +4,25 @@ import android.content.Context;\nimport androidx.annotation.RestrictTo;\nimport com.google.firebase.messaging.RemoteMessage;\n+/**\n+ * interface to handle the Firebase notification service receiver callbacks\n+ */\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IFcmMessageHandler {\n+ /**\n+ * @param applicationContext - application context\n+ * @param message - Firebase Remote message\n+ * @return true if everything is fine & notification is rendered successfully\n+ */\nboolean onMessageReceived(final Context applicationContext, RemoteMessage message);\n+ /**\n+ * @param applicationContext - application context\n+ * @param token - fcm token received from Firebase SDK\n+ * @return true if the token is sent to Clevertap's server\n+ */\n+\nboolean onNewToken(Context applicationContext, String token);\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/IFcmSdkHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/IFcmSdkHandler.java",
"diff": "@@ -3,15 +3,30 @@ package com.clevertap.android.sdk.pushnotification.fcm;\nimport androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+/**\n+ * Bridge interface to communicate with Firebase SDK\n+ */\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IFcmSdkHandler {\n+ /**\n+ * @return pushType of FCM\n+ */\nPushType getPushType();\n+ /**\n+ * @return true if FCM credentials are properly available\n+ */\nboolean isAvailable();\n+ /**\n+ * @return true if Firebase messaging is supported\n+ */\nboolean isSupported();\n+ /**\n+ * Call this method to request token from Firebase SDK\n+ */\nvoid requestToken();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageService.java",
"diff": "@@ -8,7 +8,7 @@ import com.huawei.hms.push.HmsMessageService;\nimport com.huawei.hms.push.RemoteMessage;\n/**\n- * Clevertap's Implementation for Huawei Message Receiver\n+ * Clevertap's Implementation for Huawei Message service\n*/\npublic class CTHmsMessageService extends HmsMessageService {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsMessageHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsMessageHandler.java",
"diff": "@@ -4,11 +4,22 @@ import android.content.Context;\nimport com.huawei.hms.push.RemoteMessage;\n/**\n- * interface to handle the xiaomi notification message receiver callbacks\n+ * interface to handle the huawei notification message service callbacks\n*/\npublic interface IHmsMessageHandler {\n+ /**\n+ * @param context - application context\n+ * @param remoteMessage - Huawei Remote Message\n+ * @return true if everything is fine & notification is rendered successfully\n+ */\nboolean createNotification(Context context, RemoteMessage remoteMessage);\n+ /**\n+ * @param context - application context\n+ * @param token - fcm token received from Huawei SDK\n+ * @return true if the token is sent to Clevertap's server\n+ */\n+\nboolean onNewToken(Context context, String token);\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsSdkHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsSdkHandler.java",
"diff": "package com.clevertap.android.hms;\n+/**\n+ * Bridge interface to communicate with Huawei SDK\n+ */\npublic interface IHmsSdkHandler {\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiMessageHandler.java",
"diff": "@@ -13,7 +13,7 @@ public interface IMiMessageHandler {\n/**\n* @param context - application context\n- * @param message - MiMessage\n+ * @param message - Xiaomi MiPushMessage\n* @return true if everything is fine & notification is rendered successfully\n*/\nboolean createNotification(Context context, MiPushMessage message);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IMiSdkHandler.java",
"diff": "@@ -3,7 +3,7 @@ package com.clevertap.android.xps;\nimport androidx.annotation.RestrictTo;\n/**\n- * bridge interface to communicate with the Xiaomi SDK to check for availability, tokens etc.\n+ * Bridge interface to communicate with the Xiaomi SDK\n*/\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic interface IMiSdkHandler {\n@@ -18,8 +18,8 @@ public interface IMiSdkHandler {\n*/\nString appKey();\n- /*\n- * Tells whether Xiaomi Credentials are valid\n+ /**\n+ * @return true if Xiaomi credentials are properly available\n*/\nboolean isAvailable();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(javadoc): Huawei+ FCM + others |
116,612 | 01.10.2020 11:25:47 | -19,080 | 995e7d0f150012996f2cc37c13ba5e0f7d528d1c | task(sample-app): update sample app google-services.json | [
{
"change_type": "MODIFY",
"old_path": "sample/google-services.json",
"new_path": "sample/google-services.json",
"diff": "{\n\"project_info\": {\n- \"project_number\": \"382723561016\",\n- \"firebase_url\": \"https://fir-app-d57d8.firebaseio.com\",\n- \"project_id\": \"fir-app-d57d8\",\n- \"storage_bucket\": \"fir-app-d57d8.appspot.com\"\n+ \"project_number\": \"your-project_number\",\n+ \"firebase_url\": \"your-firebase_url\",\n+ \"project_id\": \"your-project_id\",\n+ \"storage_bucket\": \"abc.appspot.com\"\n},\n\"client\": [\n{\n\"client_info\": {\n- \"mobilesdk_app_id\": \"1:382723561016:android:568fb024eed33c18\",\n+ \"mobilesdk_app_id\": \"your-mobilesdk_app_id\",\n\"android_client_info\": {\n- \"package_name\": \"com.clevertap.demo\"\n+ \"package_name\": \"com.clevertap.android.geofenceapp\"\n}\n},\n\"oauth_client\": [\n{\n- \"client_id\": \"382723561016-235amsvt3kc3q6qgtl5s8ijatssrdr95.apps.googleusercontent.com\",\n+ \"client_id\": \"your-client_id\",\n\"client_type\": 3\n}\n],\n\"api_key\": [\n{\n- \"current_key\": \"AIzaSyB4sjMUGYXVVjT4PoS7dAdGR3IdL_dXMU8\"\n+ \"current_key\": \"your-api-key\"\n}\n],\n\"services\": {\n- \"analytics_service\": {\n- \"status\": 1\n- },\n\"appinvite_service\": {\n- \"status\": 1,\n- \"other_platform_oauth_client\": []\n- },\n- \"ads_service\": {\n- \"status\": 2\n+ \"other_platform_oauth_client\": [\n+ {\n+ \"client_id\": \"abc.apps.googleusercontent.com\",\n+ \"client_type\": 3\n+ }\n+ ]\n}\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(sample-app): update sample app google-services.json SDK-356 |
116,621 | 01.10.2020 11:39:43 | -19,080 | 69eb6a2c70611d5053d7c058091886744c01d1db | chore(fix): bitrise failure | [
{
"change_type": "MODIFY",
"old_path": "sample/google-services.json",
"new_path": "sample/google-services.json",
"diff": "\"client_info\": {\n\"mobilesdk_app_id\": \"your-mobilesdk_app_id\",\n\"android_client_info\": {\n- \"package_name\": \"com.clevertap.android.geofenceapp\"\n+ \"package_name\": \"com.clevertap.demo\"\n}\n},\n\"oauth_client\": [\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(fix): bitrise failure |
116,612 | 04.11.2020 11:53:39 | -19,080 | 28d0a048d23f9d742170e2f3cf1ef3d23aad3b9d | fix(Reinstall tracking): fix multiple install events during fresh app install | [
{
"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": "@@ -5142,6 +5142,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprivate void destroySession() {\ncurrentSessionId = 0;\nsetAppLaunchPushed(false);\n+ if (isFirstSession()) {\n+ // SDK-415\n+ firstSession = false;\n+ }\ngetConfigLogger().verbose(getAccountId(), \"Session destroyed; Session ID is now 0\");\nclearSource();\nclearMedium();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Reinstall tracking): fix multiple install events during fresh app install SDK-415 |
116,621 | 10.11.2020 21:48:42 | -19,080 | 2c79e2f047f1ef5adacc1b4d266156cb717e100b | feat(App-Setup):SDK-395[Phone Identity Changes]
feat(SDK-395): Phone Identity Changes | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTProfileHandlerImpl.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.Context;\n+import android.text.TextUtils;\n+\n+import java.util.Arrays;\n+import java.util.HashSet;\n+\n+class CTProfileHandlerImpl implements IProfileHandler {\n+ private Context mContext;\n+ private CleverTapInstanceConfig mConfig;\n+\n+ CTProfileHandlerImpl(Context context, CleverTapInstanceConfig config) {\n+ this.mContext = context;\n+ this.mConfig = config;\n+ }\n+\n+ HashSet<String> getProfileIdentitySet(Context context) {\n+ HashSet hashSet = new HashSet();\n+ String identifier = StorageHelper.getString(context, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n+\n+ if (!TextUtils.isEmpty(identifier)) {\n+ hashSet.add(Arrays.asList(identifier.split(Constants.SEPARATOR_COMMA)));\n+ } else {\n+ ManifestInfo manifestInfo = ManifestInfo.getInstance(context);\n+ HashSet<String> clientProfileSet = manifestInfo.getProfileIdentifierKeys();\n+ if (!clientProfileSet.isEmpty()) {\n+ hashSet.add(clientProfileSet);\n+ // store the prefs\n+ storeClientKeysToPref(clientProfileSet);\n+ } else {\n+ hashSet.add(Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS);\n+ }\n+ }\n+ return hashSet;\n+ }\n+\n+ private void storeClientKeysToPref(HashSet<String> clientProfileSet) {\n+\n+ }\n+\n+ @Override\n+ public CleverTapInstanceConfig config() {\n+ return mConfig;\n+ }\n+\n+ @Override\n+ public Context context() {\n+ return mContext;\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": "@@ -4200,7 +4200,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// use the first one we find\nfor (String key : profile.keySet()) {\nObject value = profile.get(key);\n- if (Constants.PROFILE_IDENTIFIER_KEYS.contains(key)) {\n+ if (Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS.contains(key)) {\ntry {\nString identifier = null;\nif (value != null) {\n@@ -7220,7 +7220,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprofileEvent.put(next, value);\n// cache the valid identifier: guid pairs\n- if (Constants.PROFILE_IDENTIFIER_KEYS.contains(next)) {\n+ if (Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS.contains(next)) {\ntry {\ncacheGUIDForIdentifier(guid, next, value.toString());\n} catch (Throwable t) {\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": "package com.clevertap.android.sdk;\n+import androidx.annotation.IntDef;\nimport androidx.annotation.RestrictTo;\n+\n+import java.lang.annotation.Retention;\n+import java.lang.annotation.RetentionPolicy;\nimport java.text.SimpleDateFormat;\nimport java.util.Arrays;\nimport java.util.HashSet;\n@@ -208,8 +212,8 @@ public interface Constants {\nString CUSTOM_CLEVERTAP_ID_PREFIX = \"__h\";\nString ERROR_PROFILE_PREFIX = \"__i\";\n// valid profile identifier keys\n- Set<String> PROFILE_IDENTIFIER_KEYS = new HashSet<>(Arrays.asList(\n- \"Identity\", \"Email\", \"FBID\", \"GPID\"));\n+ Set<String> DEFAULT_PROFILE_IDENTIFIER_KEYS = new HashSet<>(Arrays.asList(\n+ \"Identity\", \"Email\"));\nString KEY_ICON = \"icon\";\nString KEY_POSTER_URL = \"poster\";\n@@ -267,4 +271,18 @@ public interface Constants {\nint RESTRICTED_MULTI_VALUE_KEY = 24;\n+ String CLEVERTAP_IDENTIFIER = \"CLEVERTAP_IDENTIFIER\";\n+\n+ String SEPARATOR_COMMA = \",\";\n+\n+ String SP_KEY_PROFILE_IDENTITIES = \"SP_KEY_PROFILE_IDENTITIES\";\n+\n+ @Retention(RetentionPolicy.SOURCE)\n+ @IntDef({TYPE_IDENTITY, TYPE_EMAIL, TYPE_PHONE})\n+ @interface IdentityType {\n+ }\n+\n+ int TYPE_IDENTITY = 0;\n+ int TYPE_EMAIL = 1;\n+ int TYPE_PHONE = 2;\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/IProfileHandler.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+public interface IProfileHandler extends BaseCTApiListener {\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": "@@ -4,8 +4,14 @@ import android.content.Context;\nimport android.content.pm.ApplicationInfo;\nimport android.content.pm.PackageManager;\nimport android.os.Bundle;\n+import android.text.TextUtils;\n+\n+import androidx.annotation.Nullable;\nimport androidx.annotation.RestrictTo;\n+import java.util.Arrays;\n+import java.util.HashSet;\n+\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic class ManifestInfo {\n@@ -43,6 +49,8 @@ public class ManifestInfo {\nprivate static String xiaomiAppID;\n+ private final HashSet<String> profileIdentifierKeys;\n+\npublic synchronized static ManifestInfo getInstance(Context context) {\nif (instance == null) {\ninstance = new ManifestInfo(context);\n@@ -50,6 +58,10 @@ public class ManifestInfo {\nreturn instance;\n}\n+ public HashSet<String> getProfileIdentifierKeys() {\n+ return profileIdentifierKeys;\n+ }\n+\nprivate ManifestInfo(Context context) {\nBundle metaData = null;\ntry {\n@@ -90,6 +102,18 @@ public class ManifestInfo {\nxiaomiAppKey = _getManifestStringValueForKey(metaData, Constants.LABEL_XIAOMI_APP_KEY);\nxiaomiAppID = _getManifestStringValueForKey(metaData, Constants.LABEL_XIAOMI_APP_ID);\n+\n+ profileIdentifierKeys = getProfileIdentifier(metaData);\n+ }\n+\n+ @Nullable\n+ HashSet<String> getProfileIdentifier(Bundle metaData) {\n+ HashSet<String> hashSet = new HashSet<>(4);\n+ String identifier = _getManifestStringValueForKey(metaData, Constants.CLEVERTAP_IDENTIFIER);\n+ if (!TextUtils.isEmpty(identifier)) {\n+ hashSet.addAll(Arrays.asList(identifier.split(Constants.SEPARATOR_COMMA)));\n+ }\n+ return hashSet;\n}\npublic String getFCMSenderId() {\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": "@@ -20,8 +20,14 @@ import android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\n+\nimport androidx.annotation.RestrictTo;\nimport androidx.core.content.ContextCompat;\n+\n+import org.json.JSONArray;\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.InputStream;\n@@ -31,10 +37,8 @@ import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\n+\nimport javax.net.ssl.HttpsURLConnection;\n-import org.json.JSONArray;\n-import org.json.JSONException;\n-import org.json.JSONObject;\n@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\npublic final class Utils {\n@@ -386,5 +390,4 @@ public final class Utils {\nreturn drawableToBitmap(context.getPackageManager().getApplicationIcon(context.getApplicationInfo()));\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/core/login/IProfileValidator.java",
"diff": "+package com.clevertap.android.sdk.core.login;\n+\n+public interface IProfileValidator {\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(App-Setup):SDK-395[Phone Identity Changes]
feat(SDK-395): Phone Identity Changes |
116,612 | 18.11.2020 10:21:24 | -19,080 | 04f3de91080179c7591cec18c85a6c0eef86397b | task(android 11 support): Update sdk versions to 30 and modify condition for networkType to support API 30 | [
{
"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": "@@ -268,7 +268,7 @@ public final class Utils {\n}\nint networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {\nif (hasPermission(context, Manifest.permission.READ_PHONE_STATE)) {\ntry {\nnetworkType = teleMan.getDataNetworkType();\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "ext {\n// Android SDK\n- compileSdkVersionVal = 29\n- targetSdkVersionVal = 29\n+ compileSdkVersionVal = 30\n+ targetSdkVersionVal = 30\nbuildToolsVersionVal = \"29.0.3\"\n// CleverTap modules\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(android 11 support): Update sdk versions to 30 and modify condition for networkType to support API 30 SDK-502 |
116,623 | 19.11.2020 12:05:53 | -19,080 | b5d8bf57cb225203a7a9385780eb971e453c0bb5 | chore(SDK-505): update consumer-pro rules to include specific classes instead of pkgs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/consumer-rules.pro",
"new_path": "clevertap-core/consumer-rules.pro",
"diff": "# For CleverTap SDK's\n--keep class com.clevertap.android.**{*;}\n--keep class com.google.android.gms.ads.**{*;}\n--keep class **.R$* {\n-<fields>;\n-}\n--keep class com.google.android.gms.common.**{*;}\n-\n--keep class com.google.android.exoplayer2.**{*;}\n+-keep class com.clevertap.android.sdk.pushnotification.fcm.FcmPushProvider{*;}\n+-keep class com.clevertap.android.xps.XiaomiPushProvider{*;}\n+-keep class com.clevertap.android.hms.HmsPushProvider{*;}\n+-keep class com.google.firebase.messaging.FirebaseMessagingService{*;}\n+-keep class com.clevertap.android.sdk.pushnotification.CTNotificationIntentService{*;}\n+-keep class com.google.android.exoplayer2.SimpleExoPlayer{*;}\n+-keep class com.google.android.exoplayer2.source.hls.HlsMediaSource{*;}\n+-keep class com.google.android.exoplayer2.ui.PlayerView{*;}\n+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{*;}\n+-keep class com.google.android.gms.common.GooglePlayServicesUtil{*;}\n-keepattributes Exceptions,InnerClasses,Signature,Deprecated,\nSourceFile,LineNumberTable,*Annotation*,EnclosingMethod\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/consumer-rules.pro",
"new_path": "clevertap-geofence/consumer-rules.pro",
"diff": "--keep class com.google.android.gms.common.**{*;}\n--keep class com.google.android.gms.location.**{*;}\n--keep class androidx.concurrent.futures.**{*;}\n\\ No newline at end of file\n+-keep class com.google.android.gms.common.GooglePlayServicesUtil{*;}\n+-keep class com.google.android.gms.location.FusedLocationProviderClient{*;}\n+-keep class androidx.concurrent.futures.CallbackToFutureAdapter{*;}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-505): update consumer-pro rules to include specific classes instead of pkgs |
116,621 | 23.11.2020 12:45:03 | -19,080 | f0374a04187cd6f7ec701db4ead5d4c329b438d8 | feat(SDK-395): Added code reviews. | [
{
"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": "package com.clevertap.android.sdk;\n+import static com.clevertap.android.sdk.JsonUtil.toArray;\nimport static com.clevertap.android.sdk.JsonUtil.toJsonArray;\nimport static com.clevertap.android.sdk.JsonUtil.toList;\nimport static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAll;\n@@ -12,8 +13,6 @@ import androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.Constants.IdentityType;\nimport java.util.ArrayList;\n-import java.util.Arrays;\n-import java.util.HashSet;\nimport org.json.JSONObject;\npublic class CleverTapInstanceConfig implements Parcelable {\n@@ -61,8 +60,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate String fcmSenderId;\n- private HashSet<Constants.IdentityType> identityTypes = new HashSet<>();\n-\nprivate boolean isDefaultInstance;\nprivate Logger logger;\n@@ -79,11 +76,12 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.profileKeys = profileKeys;\n}\n- private String[] profileKeys;\n+ private String[] profileKeys = NullObjectFactory.dummyObject(String[].class);\n@SuppressWarnings(\"unused\")\npublic static CleverTapInstanceConfig createInstance(Context context, @NonNull String accountId,\n@NonNull String accountToken) {\n+\n//noinspection ConstantConditions\nif (accountId == null || accountToken == null) {\nLogger.i(\"CleverTap accountId and accountToken cannot be null\");\n@@ -213,6 +211,9 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.allowedPushTypes = (ArrayList<String>) toList(\nconfigJsonObject.getJSONArray(Constants.KEY_ALLOWED_PUSH_TYPES));\n}\n+ if (configJsonObject.has(Constants.KEY_IDENTITY_TYPES)) {\n+ this.profileKeys = (String[]) toArray(configJsonObject.getJSONArray(Constants.KEY_IDENTITY_TYPES));\n+ }\n} catch (Throwable t) {\nLogger.v(\"Error constructing CleverTapInstanceConfig from JSON: \" + jsonString + \": \", t.getCause());\nthrow (t);\n@@ -303,8 +304,8 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn packageName;\n}\n- public String[] getProfileKeys() {\n- return profileKeys != null ? profileKeys : NullObjectFactory.dummyObject(String[].class);\n+ public String[] getProfileKeys(Context context) {\n+ return isDefaultInstance ? ManifestInfo.getInstance(context).getProfileKeys() : profileKeys;\n}\n@SuppressWarnings({\"BooleanMethodIsAlwaysInverted\", \"WeakerAccess\"})\n@@ -351,10 +352,6 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.enableUIEditor = enableUIEditor;\n}\n- public void setIdentityTypes(Constants.IdentityType... types) {\n- identityTypes.addAll(Arrays.asList(types));\n- }\n-\n@SuppressWarnings({\"unused\"})\npublic void useGoogleAdId(boolean value) {\nthis.useGoogleAdId = value;\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": "@@ -190,6 +190,7 @@ public interface Constants {\nString KEY_ENABLE_UIEDITOR = \"enableUIEditor\";\nString KEY_ENABLE_ABTEST = \"enableABTesting\";\nString KEY_ALLOWED_PUSH_TYPES = \"allowedPushTypes\";\n+ String KEY_IDENTITY_TYPES = \"identityTypes\";\nString WZRK_PUSH_ID = \"wzrk_pid\";\nString NOTIF_MSG = \"nm\";\nString NOTIF_TITLE = \"nt\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/JsonUtil.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/JsonUtil.java",
"diff": "@@ -30,4 +30,16 @@ public class JsonUtil {\nreturn list;\n}\n+\n+ public static <T> Object[] toArray(@NonNull JSONArray jsonArray) {\n+ Object[] array = new Object[jsonArray.length()];\n+ try {\n+ for (int i = 0; i < jsonArray.length(); i++) {\n+ array[i] = jsonArray.get(i);\n+ }\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ return array;\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ValidationResultStack.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ValidationResultStack.java",
"diff": "package com.clevertap.android.sdk;\n-}import androidx.annotation.RestrictTo;\n+import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport java.util.ArrayList;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/BaseProfilerHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/BaseProfilerHandler.java",
"diff": "@@ -6,7 +6,6 @@ import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.BaseCTApiListener;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n-import com.clevertap.android.sdk.ManifestInfo;\nimport com.clevertap.android.sdk.ValidationResultStack;\nimport java.util.HashSet;\n@@ -47,27 +46,26 @@ public abstract class BaseProfilerHandler {\n// First Read from pref\n// If not present in the pref, set the default\n- String identifier = mInfoProvider.getCachedIdentityKeysForAccount();\n- boolean isSavedInPref = !TextUtils.isEmpty(identifier);\n+ String prefProfileKeys = mInfoProvider.getCachedIdentityKeysForAccount();\n+ boolean isSavedInPref = !TextUtils.isEmpty(prefProfileKeys);\n/* For default instance, use manifest meta\n*/\n- String[] profileIdentifierKeys = isSavedInPref ? identifier.split(Constants.SEPARATOR_COMMA)\n+ String[] profileIdentifierKeys = isSavedInPref ? prefProfileKeys.split(Constants.SEPARATOR_COMMA)\n: fetchConfig();\nHashSet<String> hashSet = iValidator.toIdentityType(profileIdentifierKeys);\nif (isSavedInPref) {\n- iValidator.sendErrorOnIdentityMismatch(identifier.split(Constants.SEPARATOR_COMMA), fetchConfig());\n+ iValidator.sendErrorOnIdentityMismatch(prefProfileKeys.split(Constants.SEPARATOR_COMMA), fetchConfig());\n+ }\n+ if (hashSet.isEmpty()) {\n+ hashSet.addAll(defaultIdentitySet());\n}\n- if (!hashSet.isEmpty()) {\nif (!isSavedInPref) {\n// phone,email,identity,name -> [phone][email][identity]\n// [phone][email][identity] -> phone,email,identity\nmInfoProvider.saveIdentityKeysForAccount(iValidator.toIdentityString(hashSet));\n}\n- } else {\n- hashSet.addAll(defaultIdentitySet());\n- }\nreturn hashSet;\n}\n@@ -76,7 +74,7 @@ public abstract class BaseProfilerHandler {\nreturn Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS;\n}\n- String[] fetchConfig() {\n- return ManifestInfo.getInstance(context).getProfileKeys();\n+ private String[] fetchConfig() {\n+ return mConfig.getProfileKeys(context);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/DefaultProfileHandlerImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-public class DefaultProfileHandlerImpl extends BaseProfilerHandler {\n-\n-\n- public DefaultProfileHandlerImpl(BaseCTApiListener baseCTApiListener) {\n- super(baseCTApiListener);\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/login/LoginInfoProvider.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginInfoProvider.java",
"diff": "@@ -90,7 +90,8 @@ public class LoginInfoProvider {\n}\npublic boolean isLegacyProfileLoggedIn() {\n- return getCachedGUIDs() != null && TextUtils.isEmpty(getCachedIdentityKeysForAccount());\n+ JSONObject jsonObject = getCachedGUIDs();\n+ return jsonObject != null && jsonObject.length() > 0 && TextUtils.isEmpty(getCachedIdentityKeysForAccount());\n}\npublic String getCachedIdentityKeysForAccount() {\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/NonDefaultProfileHandlerImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-public class NonDefaultProfileHandlerImpl extends BaseProfilerHandler {\n-\n- public NonDefaultProfileHandlerImpl(BaseCTApiListener baseCTApiListener) {\n- super(baseCTApiListener);\n- }\n-\n- @Override\n- String[] fetchConfig() {\n- return mConfig.getProfileKeys();\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/login/PhoneIdentityHandlerImpl.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import com.clevertap.android.sdk.BaseCTApiListener;\n+\n+public class PhoneIdentityHandlerImpl extends BaseProfilerHandler {\n+\n+ public PhoneIdentityHandlerImpl(BaseCTApiListener baseCTApiListener) {\n+ super(baseCTApiListener);\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/ProfileHandlerFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileHandlerFactory.java",
"diff": "@@ -20,12 +20,10 @@ public class ProfileHandlerFactory {\nif (cacheHandler.isLegacyProfileLoggedIn()) {\n// case 1: Migration( cached guid but no newly saved profile pref)\nreturn new LegacyProfileHandlerImpl(ctApiListener);\n- } else if (config.isDefaultInstance()) {\n- // case 2: Not logged in but default config\n- return new DefaultProfileHandlerImpl(ctApiListener);\n} else {\n+ // case 2: Not logged in but default config\n// case 3: Not logged in but non-default config\n- return new NonDefaultProfileHandlerImpl(ctApiListener);\n+ return new PhoneIdentityHandlerImpl(ctApiListener);\n}\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): Added code reviews. |
116,621 | 23.11.2020 19:08:14 | -19,080 | a694836cb645ea82b6185b476ae70384bd34031f | feat(SDK-395): Refactored code. | [
{
"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": "@@ -305,6 +305,9 @@ public class CleverTapInstanceConfig implements Parcelable {\n}\npublic String[] getProfileKeys(Context context) {\n+ /*\n+ * For default instance, use manifest meta, otherwise use from setter field\n+ */\nreturn isDefaultInstance ? ManifestInfo.getInstance(context).getProfileKeys() : profileKeys;\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": "@@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;\nimport java.util.Arrays;\nimport java.util.HashSet;\nimport java.util.Locale;\n+import java.util.TreeSet;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic interface Constants {\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": "@@ -20,6 +20,7 @@ import android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\n+import androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.core.content.ContextCompat;\nimport java.io.ByteArrayOutputStream;\n@@ -28,6 +29,7 @@ import java.io.InputStream;\nimport java.net.HttpURLConnection;\nimport java.net.URL;\nimport java.util.ArrayList;\n+import java.util.Collection;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\n@@ -386,4 +388,16 @@ public final class Utils {\nreturn drawableToBitmap(context.getPackageManager().getApplicationIcon(context.getApplicationInfo()));\n}\n}\n+\n+ public static boolean containsIgnoreCase(@NonNull Collection<String> collection, @NonNull String key) {\n+ if (collection == null || key == null) {\n+ return false;\n+ }\n+ for (String entry : collection) {\n+ if (key.equalsIgnoreCase(entry)) {\n+ return true;\n+ }\n+ }\n+ return false;\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/BaseProfilerHandler.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import android.content.Context;\n-import android.text.TextUtils;\n-import androidx.annotation.NonNull;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-import com.clevertap.android.sdk.CleverTapInstanceConfig;\n-import com.clevertap.android.sdk.Constants;\n-import com.clevertap.android.sdk.ValidationResultStack;\n-import java.util.HashSet;\n-\n-public abstract class BaseProfilerHandler {\n-\n- protected final Context context;\n-\n- protected final CleverTapInstanceConfig mConfig;\n-\n- protected final ValidationResultStack mResultStack;\n-\n- private final IValidator iValidator;\n-\n- private final LoginInfoProvider mInfoProvider;\n-\n- private final HashSet<String> profileIdentitySet;\n-\n- BaseProfilerHandler(BaseCTApiListener ctApiListener) {\n- this.context = ctApiListener.context();\n- this.mConfig = ctApiListener.config();\n- this.mResultStack = ctApiListener.remoteErrorLogger();\n- this.iValidator = new ProfileValidatorImpl(ctApiListener.remoteErrorLogger());\n- this.mInfoProvider = new LoginInfoProvider(ctApiListener);\n- this.profileIdentitySet = loadIdentitySet();\n- }\n-\n- public boolean isProfileKey(@NonNull String Key) {\n- for (String profileKeys : profileIdentitySet) {\n- if (profileKeys.equalsIgnoreCase(Key)) {\n- return true;\n- }\n- }\n- return false;\n- }\n-\n- HashSet<String> loadIdentitySet() {\n- // Logic :\n- // First Read from pref\n- // If not present in the pref, set the default\n-\n- String prefProfileKeys = mInfoProvider.getCachedIdentityKeysForAccount();\n- boolean isSavedInPref = !TextUtils.isEmpty(prefProfileKeys);\n-\n- /* For default instance, use manifest meta\n- */\n-\n- String[] profileIdentifierKeys = isSavedInPref ? prefProfileKeys.split(Constants.SEPARATOR_COMMA)\n- : fetchConfig();\n- HashSet<String> hashSet = iValidator.toIdentityType(profileIdentifierKeys);\n- if (isSavedInPref) {\n- iValidator.sendErrorOnIdentityMismatch(prefProfileKeys.split(Constants.SEPARATOR_COMMA), fetchConfig());\n- }\n- if (hashSet.isEmpty()) {\n- hashSet.addAll(defaultIdentitySet());\n- }\n- if (!isSavedInPref) {\n- // phone,email,identity,name -> [phone][email][identity]\n- // [phone][email][identity] -> phone,email,identity\n- mInfoProvider.saveIdentityKeysForAccount(iValidator.toIdentityString(hashSet));\n- }\n-\n- return hashSet;\n- }\n-\n- HashSet<String> defaultIdentitySet() {\n- return Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS;\n- }\n-\n- private String[] fetchConfig() {\n- return mConfig.getProfileKeys(context);\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/login/ConfigurableProfileHandlerImpl.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import android.content.Context;\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.BaseCTApiListener;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.ValidationResult;\n+import com.clevertap.android.sdk.ValidationResultFactory;\n+import com.clevertap.android.sdk.ValidationResultStack;\n+\n+public class ConfigurableProfileHandlerImpl implements IProfileHandler {\n+\n+ protected final Context context;\n+\n+ protected final CleverTapInstanceConfig mConfig;\n+\n+ protected final ValidationResultStack errorLogger;\n+\n+ private final LoginInfoProvider mInfoProvider;\n+\n+ private ProfileKeysSet mProfileKeysSet;\n+\n+ public ConfigurableProfileHandlerImpl(BaseCTApiListener ctApiListener) {\n+ this.context = ctApiListener.context();\n+ this.mConfig = ctApiListener.config();\n+ this.mInfoProvider = new LoginInfoProvider(ctApiListener);\n+ this.errorLogger = ctApiListener.remoteErrorLogger();\n+ loadIdentitySet();\n+ }\n+\n+ @Override\n+ public boolean isProfileKey(@NonNull String Key) {\n+ return mProfileKeysSet.containsKey(Key);\n+ }\n+\n+ void loadIdentitySet() {\n+ // Logic :\n+ // First Read from pref\n+ // If not present in the pref, set the default\n+\n+ ProfileKeysSet prefKeySet = ProfileKeysSet.from(mInfoProvider.getCachedIdentityKeysForAccount());\n+\n+ ProfileKeysSet configKeySet = ProfileKeysSet.from(mConfig.getProfileKeys(context));\n+\n+ handleError(prefKeySet, configKeySet);\n+\n+ if (prefKeySet.isValid()) {\n+ mProfileKeysSet = prefKeySet;\n+ } else if (configKeySet.isValid()) {\n+ mProfileKeysSet = configKeySet;\n+ } else {\n+ mProfileKeysSet = ProfileKeysSet.getDefault();\n+ }\n+ boolean isSavedInPref = prefKeySet.isValid();\n+ if (!isSavedInPref) {\n+ // phone,email,identity,name -> [phone][email][identity]\n+ // [phone][email][identity] -> phone,email,identity\n+ mInfoProvider.saveIdentityKeysForAccount(mProfileKeysSet.toString());\n+ }\n+ }\n+\n+ private void handleError(final ProfileKeysSet prefKeySet, final ProfileKeysSet configKeySet) {\n+ if (prefKeySet.isValid() && configKeySet.isValid() && !prefKeySet.equals(configKeySet)) {\n+ ValidationResult error = ValidationResultFactory.create(531);\n+ errorLogger.pushValidationResult(error);\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/login/IProfileHandler.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import androidx.annotation.NonNull;\n+\n+public interface IProfileHandler {\n+\n+ boolean isProfileKey(@NonNull String Key);\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IValidator.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import java.util.HashSet;\n-\n-public interface IValidator {\n-\n- String toIdentityString(HashSet<String> identityTypes);\n-\n- HashSet<String> toIdentityType(String[] identityKeys);\n-\n- void sendErrorOnIdentityMismatch(String[] first, String[] second);\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/LegacyProfileHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyProfileHandlerImpl.java",
"diff": "package com.clevertap.android.sdk.login;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-import java.util.HashSet;\n+import androidx.annotation.NonNull;\n-public class LegacyProfileHandlerImpl extends BaseProfilerHandler {\n+public class LegacyProfileHandlerImpl implements IProfileHandler {\n- LegacyProfileHandlerImpl(final BaseCTApiListener ctApiListener) {\n- super(ctApiListener);\n+ LegacyProfileHandlerImpl() {\n}\n@Override\n- HashSet<String> loadIdentitySet() {\n- return defaultIdentitySet();\n+ public boolean isProfileKey(@NonNull final String Key) {\n+ return ProfileKeysSet.getDefault().containsKey(Key);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/PhoneIdentityHandlerImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-public class PhoneIdentityHandlerImpl extends BaseProfilerHandler {\n-\n- public PhoneIdentityHandlerImpl(BaseCTApiListener baseCTApiListener) {\n- super(baseCTApiListener);\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/ProfileHandlerFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileHandlerFactory.java",
"diff": "@@ -13,17 +13,16 @@ public class ProfileHandlerFactory {\n}\n- public static BaseProfilerHandler getProfileHandler(@NonNull BaseCTApiListener ctApiListener) {\n- CleverTapInstanceConfig config = ctApiListener.config();\n+ public static IProfileHandler getProfileHandler(@NonNull BaseCTApiListener ctApiListener) {\nLoginInfoProvider cacheHandler = new LoginInfoProvider(ctApiListener);\nif (cacheHandler.isLegacyProfileLoggedIn()) {\n// case 1: Migration( cached guid but no newly saved profile pref)\n- return new LegacyProfileHandlerImpl(ctApiListener);\n+ return new LegacyProfileHandlerImpl();\n} else {\n// case 2: Not logged in but default config\n// case 3: Not logged in but non-default config\n- return new PhoneIdentityHandlerImpl(ctApiListener);\n+ return new ConfigurableProfileHandlerImpl(ctApiListener);\n}\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileKeysSet.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import com.clevertap.android.sdk.Constants;\n+import java.util.HashSet;\n+import java.util.Iterator;\n+\n+class ProfileKeysSet {\n+\n+ private final HashSet<String> profileKeys = new HashSet<>();\n+\n+ ProfileKeysSet(String[] keys) {\n+ init(keys);\n+ }\n+\n+ ProfileKeysSet(HashSet<String> hashSet) {\n+ profileKeys.addAll(hashSet);\n+ }\n+\n+ private void init(final String[] keys) {\n+ if (keys != null && keys.length > 0) {\n+ for (String key : keys) {\n+ if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(key)) {\n+ profileKeys.add(key);\n+ }\n+ }\n+ }\n+ }\n+\n+ @Override\n+ public boolean equals(final Object o) {\n+ if (this == o) {\n+ return true;\n+ }\n+ if (o == null || getClass() != o.getClass()) {\n+ return false;\n+ }\n+ final ProfileKeysSet that = (ProfileKeysSet) o;\n+ return profileKeys.equals(that.profileKeys);\n+ }\n+\n+ @Override\n+ public String toString() {\n+ StringBuilder stringBuilder = new StringBuilder();\n+ Iterator<String> iterator = profileKeys.iterator();\n+ while (iterator.hasNext()) {\n+ String type = iterator.next();\n+ if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(type)) {\n+ stringBuilder.append(type)\n+ .append(iterator.hasNext() ? Constants.SEPARATOR_COMMA : \"\");\n+ }\n+ }\n+ return stringBuilder.toString();\n+ }\n+\n+ boolean isValid() {\n+ return !profileKeys.isEmpty();\n+ }\n+\n+ static ProfileKeysSet from(String keys) {\n+ return new ProfileKeysSet(keys.split(Constants.SEPARATOR_COMMA));\n+ }\n+\n+ static ProfileKeysSet from(String[] keys) {\n+ return new ProfileKeysSet(keys);\n+ }\n+\n+ static ProfileKeysSet getDefault() {\n+ return new ProfileKeysSet(Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS);\n+ }\n+\n+ boolean containsKey(String Key) {\n+ return profileKeys.contains(Key);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileValidatorImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import com.clevertap.android.sdk.Constants;\n-import com.clevertap.android.sdk.ValidationResult;\n-import com.clevertap.android.sdk.ValidationResultFactory;\n-import com.clevertap.android.sdk.ValidationResultStack;\n-import java.util.Arrays;\n-import java.util.HashSet;\n-import java.util.Iterator;\n-\n-public class ProfileValidatorImpl implements IValidator {\n-\n- private final ValidationResultStack remoteLogger;\n-\n- public ProfileValidatorImpl(final ValidationResultStack remoteErrorLogger) {\n- remoteLogger = remoteErrorLogger;\n- }\n-\n- @Override\n- public String toIdentityString(HashSet<String> identityTypes) {\n- StringBuilder stringBuilder = new StringBuilder();\n- if (identityTypes != null && !identityTypes.isEmpty()) {\n- Iterator<String> iterator = identityTypes.iterator();\n- while (iterator.hasNext()) {\n- String type = iterator.next();\n- if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(type)) {\n- stringBuilder.append(type)\n- .append(iterator.hasNext() ? Constants.SEPARATOR_COMMA : \"\");\n- }\n- }\n- }\n- return stringBuilder.toString();\n- }\n-\n- @Override\n- public HashSet<String> toIdentityType(String[] identityKeys) {\n- HashSet<String> hashSet = new HashSet<>();\n- if (identityKeys != null && identityKeys.length > 0) {\n- for (String key : identityKeys) {\n- if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(key)) {\n- hashSet.add(key);\n- }\n- }\n- }\n- return hashSet;\n- }\n-\n- @Override\n- public void sendErrorOnIdentityMismatch(String[] first, String[] second) {\n- if (first != null && second != null) {\n- if (first.length != second.length) {\n- ValidationResult error = ValidationResultFactory.create(531);\n- remoteLogger.pushValidationResult(error);\n- } else {\n- Arrays.sort(first);\n- Arrays.sort(second);\n- for (int i = 0; i < first.length; i++) {\n- if (first[i] != null && !first[i].equalsIgnoreCase(second[i])) {\n- ValidationResult error = ValidationResultFactory.create(531);\n- remoteLogger.pushValidationResult(error);\n- break;\n- }\n- }\n- }\n- }\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): Refactored code. |
116,621 | 23.11.2020 19:15:48 | -19,080 | f950e8a7e53a08f50e84cb299675677b587b6a9a | feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable.
feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable. | [
{
"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": "@@ -73,8 +73,10 @@ public class CleverTapInstanceConfig implements Parcelable {\nprivate boolean useGoogleAdId;\npublic void setProfileKeys(@IdentityType String... profileKeys) {\n+ if (!isDefaultInstance) {\nthis.profileKeys = profileKeys;\n}\n+ }\nprivate String[] profileKeys = NullObjectFactory.dummyObject(String[].class);\n@@ -122,6 +124,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.packageName = config.packageName;\nthis.beta = config.beta;\nthis.allowedPushTypes = config.allowedPushTypes;\n+ this.profileKeys = config.profileKeys;\n}\nprivate CleverTapInstanceConfig(Context context, String accountId, String accountToken, String accountRegion,\n@@ -147,6 +150,12 @@ public class CleverTapInstanceConfig implements Parcelable {\nthis.packageName = manifest.getPackageName();\nthis.enableCustomCleverTapId = manifest.useCustomId();\nthis.beta = manifest.enableBeta();\n+ /*\n+ * For default instance, use manifest meta, otherwise use from setter field\n+ */\n+ if (isDefaultInstance) {\n+ profileKeys = manifest.getProfileKeys();\n+ }\n}\nprivate CleverTapInstanceConfig(String jsonString) throws Throwable {\n@@ -242,6 +251,7 @@ public class CleverTapInstanceConfig implements Parcelable {\nbeta = in.readByte() != 0x00;\nallowedPushTypes = new ArrayList<>();\nin.readList(allowedPushTypes, String.class.getClassLoader());\n+ in.readStringArray(profileKeys);\n}\n@Override\n@@ -305,10 +315,7 @@ public class CleverTapInstanceConfig implements Parcelable {\n}\npublic String[] getProfileKeys(Context context) {\n- /*\n- * For default instance, use manifest meta, otherwise use from setter field\n- */\n- return isDefaultInstance ? ManifestInfo.getInstance(context).getProfileKeys() : profileKeys;\n+ return profileKeys;\n}\n@SuppressWarnings({\"BooleanMethodIsAlwaysInverted\", \"WeakerAccess\"})\n@@ -381,6 +388,7 @@ public class CleverTapInstanceConfig implements Parcelable {\ndest.writeString(packageName);\ndest.writeByte((byte) (beta ? 0x01 : 0x00));\ndest.writeList(allowedPushTypes);\n+ dest.writeStringArray(profileKeys);\n}\nboolean getEnableCustomCleverTapId() {\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": "@@ -9,7 +9,6 @@ import java.text.SimpleDateFormat;\nimport java.util.Arrays;\nimport java.util.HashSet;\nimport java.util.Locale;\n-import java.util.TreeSet;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic interface Constants {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable.
feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable. |
116,612 | 20.11.2020 11:49:19 | -19,080 | 52ebc5dd82c9318990d38ae25b4558917b59f124 | fix(inApp tablet size): use qualifier buckets for checking if device is tablet or handset | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values-land/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">false</bool>\n+</resources>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values-sw600dp-land/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">true</bool>\n+</resources>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values-sw600dp/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">true</bool>\n+</resources>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values-sw720dp-land/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">true</bool>\n+</resources>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values-sw720dp/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">true</bool>\n+</resources>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values/booleans.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <bool name=\"ctIsTablet\">false</bool>\n+</resources>\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet size): use qualifier buckets for checking if device is tablet or handset #116 SDK-492 |
116,612 | 23.11.2020 00:09:30 | -19,080 | eb1b12311ece82f1467beaf95de8e8f2337b9174 | fix(inApp tablet layout): swap method implementation for LandscapeInterstitialMobileInAppOnTablet and LandscapeInterstitialTabletInApp | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "package com.clevertap.android.sdk;\n-import android.content.Context;\nimport android.os.Handler;\n-import android.util.DisplayMetrics;\nimport android.view.Gravity;\n-import android.view.WindowManager;\nimport android.widget.FrameLayout;\nimport android.widget.FrameLayout.LayoutParams;\nimport android.widget.RelativeLayout;\n-import androidx.fragment.app.FragmentActivity;\npublic abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n@@ -28,7 +24,7 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n@Override\nvoid generateListener() {\n- if ((FragmentActivity) context instanceof InAppNotificationActivity) {\n+ if (context instanceof InAppNotificationActivity) {\nsetListener((CTInAppBaseFragment.InAppListener) context);\n}\n}\n@@ -135,41 +131,41 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\nvoid redrawLandscapeInterstitialMobileInAppOnTablet(final RelativeLayout relativeLayout,\nLayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n- int aspectWidth = (int) (relativeLayout.getMeasuredHeight() * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(80);\n+ int aspectWidth = (int) (\n+ (relativeLayout.getMeasuredHeight() - getScaledPixels(120)) * 1.78f);\n+ int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(280);\nif (aspectWidth > requiredWidth) {\nlayoutParams.width = requiredWidth;\nlayoutParams.height = (int) (requiredWidth / 1.78f);\n} else {\nlayoutParams.width = aspectWidth;\n+ layoutParams.height = relativeLayout.getMeasuredHeight()\n+ - getScaledPixels(120);\n}\n+ layoutParams.setMargins(getScaledPixels(140), getScaledPixels(100),\n+ getScaledPixels(140), getScaledPixels(100));\nlayoutParams.gravity = Gravity.CENTER;\nrelativeLayout.setLayoutParams(layoutParams);\n+\naddCloseImageView(relativeLayout, closeImageView);\n}\nvoid redrawLandscapeInterstitialTabletInApp(final RelativeLayout relativeLayout,\nLayoutParams layoutParams, FrameLayout fl, CloseImageView closeImageView) {\n- int aspectWidth = (int) (\n- (relativeLayout.getMeasuredHeight() - getScaledPixels(120)) * 1.78f);\n- int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(280);\n+ int aspectWidth = (int) (relativeLayout.getMeasuredHeight() * 1.78f);\n+ int requiredWidth = fl.getMeasuredWidth() - getScaledPixels(80);\nif (aspectWidth > requiredWidth) {\nlayoutParams.width = requiredWidth;\nlayoutParams.height = (int) (requiredWidth / 1.78f);\n} else {\nlayoutParams.width = aspectWidth;\n- layoutParams.height = relativeLayout.getMeasuredHeight()\n- - getScaledPixels(120);\n}\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(100),\n- getScaledPixels(140), getScaledPixels(100));\nlayoutParams.gravity = Gravity.CENTER;\nrelativeLayout.setLayoutParams(layoutParams);\n-\naddCloseImageView(relativeLayout, closeImageView);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"diff": "@@ -73,10 +73,10 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n.getLayoutParams();\nif (!inAppNotification.isTablet() || !isTablet()) {\nif (isTablet()) {\n- layoutParams.setMargins(getScaledPixels(140), getScaledPixels(140),\n- getScaledPixels(140), getScaledPixels(140));\n+ layoutParams.setMargins(getScaledPixels(140), getScaledPixels(100),\n+ getScaledPixels(140), getScaledPixels(100));\nlayoutParams.height = relativeLayout.getMeasuredHeight() - getScaledPixels(\n- 210);\n+ 130);\nlayoutParams.width = (int) (layoutParams.height * 1.3f);\nlayoutParams.gravity = Gravity.CENTER;\nrelativeLayout.setLayoutParams(layoutParams);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -99,12 +99,16 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n+ // tablet layout on tablet\nredrawInterstitialTabletInApp(relativeLayout, layoutParams, fl, closeImageView);\n} else {\n+ // mobile layout\nif (isTablet()) {\n+ // mobile layout on tablet\nredrawInterstitialMobileInAppOnTablet(relativeLayout, layoutParams, fl,\ncloseImageView);\n} else {\n+ // mobile layout on mobile\nredrawInterstitialInApp(relativeLayout1, layoutParams, closeImageView);\n}\n}\n@@ -121,13 +125,17 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\n+ // tablet layout on tablet\nredrawLandscapeInterstitialTabletInApp(relativeLayout, layoutParams, fl,\ncloseImageView);\n} else {\n+ // mobile layout\nif (isTablet()) {\n+ // mobile layout on tablet\nredrawLandscapeInterstitialMobileInAppOnTablet(relativeLayout, layoutParams,\nfl, closeImageView);\n} else {\n+ // mobile layout on mobile\nredrawLandscapeInterstitialInApp(relativeLayout, layoutParams,\ncloseImageView);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet layout): swap method implementation for LandscapeInterstitialMobileInAppOnTablet and LandscapeInterstitialTabletInApp SDK-527 |
116,621 | 24.11.2020 16:35:09 | -19,080 | 02c1657c2fecc9a5e055cb1f8d806842791769d0 | chore(SDK-395): updated version code | [
{
"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.0\"\n+ coreVersion = \"4.0.1\"\ngeofenceVersion = \"1.0.1\"\nhmsVersion = \"1.0.0\"\nxpsVersion = \"1.0.0\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-395): updated version code |
116,621 | 24.11.2020 16:58:22 | -19,080 | 31689ff85f37acd915182da0362fd73d3f8d7290 | chore(SDK-395): Optimized instance creation | [
{
"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": "@@ -61,6 +61,7 @@ import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n+import com.clevertap.android.sdk.login.IProfileHandler;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\nimport com.clevertap.android.sdk.login.ProfileHandlerFactory;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\n@@ -4289,9 +4290,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nLoginInfoProvider handler = new LoginInfoProvider(this);\n// check for valid identifier keys\n// use the first one we find\n+ IProfileHandler iProfileHandler = ProfileHandlerFactory.getProfileHandler(this);\nfor (String key : profile.keySet()) {\nObject value = profile.get(key);\n- boolean isProfileKey = ProfileHandlerFactory.getProfileHandler(this).isProfileKey(key);\n+ boolean isProfileKey = iProfileHandler.isProfileKey(key);\nif (isProfileKey) {\ntry {\nString identifier = null;\n@@ -7238,6 +7240,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (baseProfile != null && baseProfile.length() > 0) {\nIterator i = baseProfile.keys();\n+ IProfileHandler iProfileHandler = ProfileHandlerFactory.getProfileHandler(this);\n+ LoginInfoProvider handler = new LoginInfoProvider(this);\nwhile (i.hasNext()) {\nString next = i.next().toString();\n@@ -7257,8 +7261,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprofileEvent.put(next, value);\n// cache the valid identifier: guid pairs\n- boolean isProfileKey = ProfileHandlerFactory.getProfileHandler(this).isProfileKey(next);\n- LoginInfoProvider handler = new LoginInfoProvider(this);\n+ boolean isProfileKey = iProfileHandler.isProfileKey(next);\nif (isProfileKey) {\ntry {\nhandler.cacheGUIDForIdentifier(guid, next, value.toString());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-395): Optimized instance creation |
116,621 | 25.11.2020 18:05:32 | -19,080 | f5adbffe10e5f0bb556b9f16108f76c79e039831 | chore(SDK-395): Made keys case-insensitive & Added title case while saving. | [
{
"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": "@@ -389,7 +389,7 @@ public final class Utils {\n}\n}\n- public static boolean containsIgnoreCase(@NonNull Collection<String> collection, @NonNull String key) {\n+ public static boolean containsIgnoreCase(Collection<String> collection, String key) {\nif (collection == null || key == null) {\nreturn false;\n}\n@@ -400,4 +400,27 @@ public final class Utils {\n}\nreturn false;\n}\n+\n+ public static String convertToTitleCase(String text) {\n+ if (text == null || text.isEmpty()) {\n+ return text;\n+ }\n+\n+ StringBuilder converted = new StringBuilder();\n+\n+ boolean convertNext = true;\n+ for (char ch : text.toCharArray()) {\n+ if (Character.isSpaceChar(ch)) {\n+ convertNext = true;\n+ } else if (convertNext) {\n+ ch = Character.toTitleCase(ch);\n+ convertNext = false;\n+ } else {\n+ ch = Character.toLowerCase(ch);\n+ }\n+ converted.append(ch);\n+ }\n+\n+ return converted.toString();\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": "@@ -99,8 +99,8 @@ public class LoginInfoProvider {\n.getStringFromPrefs(context, config, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n}\n- public void saveIdentityKeysForAccount(final String keyCommaSeparated) {\n- StorageHelper.putString(context, config, keyCommaSeparated,\n- Constants.EMPTY_STRING);\n+ public void saveIdentityKeysForAccount(final String valueCommaSeparated) {\n+ StorageHelper.putString(context, config, Constants.SP_KEY_PROFILE_IDENTITIES,\n+ valueCommaSeparated);\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/ProfileKeysSet.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileKeysSet.java",
"diff": "package com.clevertap.android.sdk.login;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.Utils;\nimport java.util.HashSet;\nimport java.util.Iterator;\n@@ -19,8 +20,8 @@ class ProfileKeysSet {\nprivate void init(final String[] keys) {\nif (keys != null && keys.length > 0) {\nfor (String key : keys) {\n- if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(key)) {\n- profileKeys.add(key);\n+ if (Utils.containsIgnoreCase(Constants.ALL_PROFILE_IDENTIFIER_KEYS, key)) {\n+ profileKeys.add(Utils.convertToTitleCase(key));\n}\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-395): Made keys case-insensitive & Added title case while saving. |
116,621 | 27.11.2020 12:58:35 | -19,080 | c6e5e0002da664f67203c3accd236d824cfebd1e | feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable.
fix(SDK-395): Build failure due to test case | [
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/login/ProfileValidatorImplTest.kt",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login\n-\n-import com.clevertap.android.sdk.Constants.IdentityType\n-import com.clevertap.android.sdk.Constants.IdentityType.TYPE_EMAIL\n-import com.clevertap.android.sdk.Constants.IdentityType.TYPE_INVALID\n-import com.clevertap.android.sdk.Constants.IdentityType.TYPE_PHONE\n-import com.clevertap.android.shared.test.BaseTestCase\n-import com.google.common.truth.Truth\n-import org.junit.*\n-import org.junit.runner.*\n-import org.robolectric.RobolectricTestRunner\n-\n-@RunWith(RobolectricTestRunner::class)\n-class ProfileValidatorImplTest : BaseTestCase() {\n-\n- lateinit var profileValidatorImpl: ProfileValidatorImpl\n-\n- @Before\n- @Throws(Exception::class)\n- override fun setUp() {\n- super.setUp()\n- profileValidatorImpl = ProfileValidatorImpl()\n- }\n-\n- @Test\n- fun testToIdentityStringEmptySetReturnsEmpty() {\n- Assert.assertTrue(profileValidatorImpl.toIdentityString(null).isEmpty())\n- Assert.assertTrue(profileValidatorImpl.toIdentityString(HashSet()).isEmpty())\n- }\n-\n- @Test\n- fun testToIdentityStringInValidReturnsValid() {\n- val hashSet = java.util.HashSet<IdentityType>()\n- hashSet.add(TYPE_PHONE)\n- hashSet.add(TYPE_EMAIL)\n- hashSet.add(TYPE_INVALID)\n- Truth.assertThat(profileValidatorImpl.toIdentityString(hashSet)).isIn(listOf(\"Phone,Email\", \"Email,Phone\"))\n- }\n-\n- @Test\n- fun testToIdentityTypeEmptyArrayReturnsEmptySet() {\n- Assert.assertTrue(profileValidatorImpl.toIdentityType(null).isEmpty())\n- Assert.assertTrue(profileValidatorImpl.toIdentityType(arrayOf()).isEmpty())\n- }\n-\n- @Test\n- fun testToIdentityTypeValidArrayReturnsValidSet() {\n- val array = arrayOf(\"Phone\", \"Email\", \"Random\")\n- val hashSet = java.util.HashSet<IdentityType>()\n- hashSet.add(TYPE_PHONE)\n- hashSet.add(TYPE_EMAIL)\n- Assert.assertEquals(hashSet, profileValidatorImpl.toIdentityType(array))\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): 1. Disabled setter for default config 2. Read/Write profile-keys using parcelable.
fix(SDK-395): Build failure due to test case |
116,621 | 27.11.2020 18:18:35 | -19,080 | dc092d146d432017814891ead2d182864035fca6 | feat(SDK-395): 1. Added code reviews comments
fix(SDK-395): Build failure due to test 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": "@@ -1333,6 +1333,12 @@ public class CleverTapAPI implements CleverTapAPIListener {\naddMultiValuesForKey(key, new ArrayList<>(Collections.singletonList(value)));\n}\n+ @Override\n+ @RestrictTo(Scope.LIBRARY)\n+ public CleverTapInstanceConfig config() {\n+ return config;\n+ }\n+\n/**\n* Add a collection of unique values to a multi-value user profile property\n* If the property does not exist it will be created\n@@ -1359,11 +1365,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n@Override\n- public CleverTapInstanceConfig config() {\n- return config;\n- }\n-\n- @Override\n+ @RestrictTo(Scope.LIBRARY)\npublic Context context() {\nreturn context;\n}\n@@ -2965,10 +2967,13 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n/**\n+ * Deprecation Notice - This method has been deprecated by CleverTap, this code will be removed from future\n+ * versions of the CleverTap Android SDK.\n* Pushes everything available in the JSON object returned by the Facebook GraphRequest\n*\n* @param graphUser The object returned from Facebook\n*/\n+ @Deprecated\n@SuppressWarnings({\"unused\"})\npublic void pushFacebookUser(final JSONObject graphUser) {\npostAsyncSafely(\"pushFacebookUser\", new Runnable() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): 1. Added code reviews comments
fix(SDK-395): Build failure due to test case |
116,621 | 29.11.2020 12:32:23 | -19,080 | 7ea4d15e5b20b387f13b872a7cf20757782fa520 | chore(SDK-395) Added null string array for 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": "@@ -78,7 +78,7 @@ public class CleverTapInstanceConfig implements Parcelable {\n}\n}\n- private String[] profileKeys = NullObjectFactory.dummyObject(String[].class);\n+ private String[] profileKeys = NullConstants.NULL_STRING_ARRAY;\n@SuppressWarnings(\"unused\")\npublic static CleverTapInstanceConfig createInstance(Context context, @NonNull String accountId,\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": "@@ -112,7 +112,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- : NullObjectFactory.dummyObject(String[].class);\n+ : NullConstants.NULL_STRING_ARRAY;\n}\npublic String getXiaomiAppID() {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NullConstants.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import androidx.annotation.RestrictTo;\n+\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"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/NullObjectFactory.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import androidx.annotation.RestrictTo;\n-\n-@RestrictTo(RestrictTo.Scope.LIBRARY)\n-public class NullObjectFactory {\n-\n- private NullObjectFactory() {\n- // Util class\n- }\n-\n- public static <T> T dummyObject(Class<T> className) {\n- try {\n- return className.newInstance();\n- } catch (Throwable throwable) {\n- return null;\n- }\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-395) Added null string array for clevertapinstanceconfig |
116,621 | 29.11.2020 17:30:55 | -19,080 | 4a56aed4da774cd18ccf3c82b800d0d082799cff | Chore(SDK-395):Added Comments & Javadoc | [
{
"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": "@@ -61,9 +61,9 @@ import com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n-import com.clevertap.android.sdk.login.IProfileHandler;\n+import com.clevertap.android.sdk.login.IdentityRepo;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n-import com.clevertap.android.sdk.login.ProfileHandlerFactory;\n+import com.clevertap.android.sdk.login.IdentityRepoFactory;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTNotificationIntentService;\n@@ -4295,10 +4295,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nLoginInfoProvider handler = new LoginInfoProvider(this);\n// check for valid identifier keys\n// use the first one we find\n- IProfileHandler iProfileHandler = ProfileHandlerFactory.getProfileHandler(this);\n+ IdentityRepo iProfileHandler = IdentityRepoFactory.repo(this);\nfor (String key : profile.keySet()) {\nObject value = profile.get(key);\n- boolean isProfileKey = iProfileHandler.isProfileKey(key);\n+ boolean isProfileKey = iProfileHandler.isIdentity(key);\nif (isProfileKey) {\ntry {\nString identifier = null;\n@@ -7245,7 +7245,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (baseProfile != null && baseProfile.length() > 0) {\nIterator i = baseProfile.keys();\n- IProfileHandler iProfileHandler = ProfileHandlerFactory.getProfileHandler(this);\n+ IdentityRepo iProfileHandler = IdentityRepoFactory.repo(this);\nLoginInfoProvider handler = new LoginInfoProvider(this);\nwhile (i.hasNext()) {\nString next = i.next().toString();\n@@ -7266,7 +7266,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprofileEvent.put(next, value);\n// cache the valid identifier: guid pairs\n- boolean isProfileKey = iProfileHandler.isProfileKey(next);\n+ boolean isProfileKey = iProfileHandler.isIdentity(next);\nif (isProfileKey) {\ntry {\nhandler.cacheGUIDForIdentifier(guid, next, value.toString());\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": "@@ -280,6 +280,6 @@ public interface Constants {\nString SP_KEY_PROFILE_IDENTITIES = \"SP_KEY_PROFILE_IDENTITIES\";\n// valid profile identifier keys\n- HashSet<String> DEFAULT_PROFILE_IDENTIFIER_KEYS = new HashSet<>(Arrays.asList(TYPE_IDENTITY, TYPE_EMAIL));\n- HashSet<String> ALL_PROFILE_IDENTIFIER_KEYS = new HashSet<>(Arrays.asList(TYPE_IDENTITY, TYPE_EMAIL, TYPE_PHONE));\n+ HashSet<String> LEGACY_IDENTITY_KEYS = new HashSet<>(Arrays.asList(TYPE_IDENTITY, TYPE_EMAIL));\n+ HashSet<String> ALL_IDENTITY_KEYS = new HashSet<>(Arrays.asList(TYPE_IDENTITY, TYPE_EMAIL, TYPE_PHONE));\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/login/ConfigurableIdentityRepo.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.BaseCTApiListener;\n+import com.clevertap.android.sdk.ValidationResult;\n+import com.clevertap.android.sdk.ValidationResultFactory;\n+\n+public class ConfigurableIdentityRepo implements IdentityRepo {\n+\n+ private static final String TAG = \"ConfigurableIdentityRepo\";\n+\n+ private final BaseCTApiListener ctApiListener;\n+\n+ private final LoginInfoProvider infoProvider;\n+\n+ private IdentitySet identitySet;\n+\n+ public ConfigurableIdentityRepo(BaseCTApiListener ctApiListener) {\n+ this.ctApiListener = ctApiListener;\n+ this.infoProvider = new LoginInfoProvider(ctApiListener);\n+ loadIdentitySet();\n+ }\n+\n+ @Override\n+ public boolean isIdentity(@NonNull String Key) {\n+ boolean isProfileKey = identitySet.contains(Key);\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"isIdentity [Key: \" + Key + \" , Value: \" + isProfileKey + \"]\");\n+ return isProfileKey;\n+ }\n+\n+ /**\n+ * Loads the identity set\n+ */\n+ void loadIdentitySet() {\n+\n+ // Read from Pref\n+ IdentitySet prefKeySet = IdentitySet.from(infoProvider.getCachedIdentityKeysForAccount());\n+\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"PrefIdentitySet [\" + prefKeySet + \"]\");\n+\n+ /* ----------------------------------------------------------------\n+ * For Default Instance - Get Identity Set configured via Manifest\n+ * For Multi Instance - Get Identity Set configured via the setter\n+ * ---------------------------------------------------------------- */\n+ IdentitySet configKeySet = IdentitySet\n+ .from(ctApiListener.config().getProfileKeys(ctApiListener.context()));\n+\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"ConfigIdentitySet [\" + configKeySet + \"]\");\n+\n+ /* ---------------------------------------------------\n+ * Push error to LC in-case the data available\n+ * in the config & preferences are not matching\n+ * --------------------------------------------------- */\n+ handleError(prefKeySet, configKeySet);\n+\n+ /* ---------------------------------------------------\n+ * If data is available from Pref, use\n+ * else data is available via from config use\n+ * else use legacy key set\n+ * --------------------------------------------------- */\n+ if (prefKeySet.isValid()) {\n+ identitySet = prefKeySet;\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"Identity Set activated from Pref[\" + identitySet + \"]\");\n+ } else if (configKeySet.isValid()) {\n+ identitySet = configKeySet;\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"Identity Set activated from Config[\" + identitySet + \"]\");\n+ } else {\n+ identitySet = IdentitySet.getDefault();\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"Identity Set activated from Default[\" + identitySet + \"]\");\n+ }\n+ boolean isSavedInPref = prefKeySet.isValid();\n+ if (!isSavedInPref) {\n+ /* -------------------------------------------------------------------------\n+ * If Config data is available, save in the preference if not saved already.\n+ * ------------------------------------------------------------------------ */\n+ String storedValue = identitySet.toString();\n+ infoProvider.saveIdentityKeysForAccount(storedValue);\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"Saving Identity Keys in Pref[\" + storedValue + \"]\");\n+ }\n+ }\n+\n+ /**\n+ * Push error to LC in-case the data available\n+ * in the config & preferences are not matching\n+ *\n+ * @param prefKeySet - key set in the preference\n+ * @param configKeySet - key set in the config\n+ */\n+ private void handleError(final IdentitySet prefKeySet, final IdentitySet configKeySet) {\n+ if (prefKeySet.isValid() && configKeySet.isValid() && !prefKeySet.equals(configKeySet)) {\n+ ValidationResult error = ValidationResultFactory.create(531);\n+ ctApiListener.remoteErrorLogger().pushValidationResult(error);\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"pushing error due to mismatch [Pref:\" + prefKeySet + \"], [Config:\" + configKeySet + \"]\");\n+ } else {\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ TAG + \"No error found while comparing [Pref:\" + prefKeySet + \"], [Config:\" + configKeySet + \"]\");\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ConfigurableProfileHandlerImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n-\n-import androidx.annotation.NonNull;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-import com.clevertap.android.sdk.ValidationResult;\n-import com.clevertap.android.sdk.ValidationResultFactory;\n-\n-public class ConfigurableProfileHandlerImpl implements IProfileHandler {\n-\n- private static final String TAG = \"ConfigurableProfileHandlerImpl: \";\n-\n- private final BaseCTApiListener mCTApiListener;\n-\n- private final LoginInfoProvider mInfoProvider;\n-\n- private ProfileKeysSet mProfileKeysSet;\n-\n- public ConfigurableProfileHandlerImpl(BaseCTApiListener ctApiListener) {\n- this.mCTApiListener = ctApiListener;\n- this.mInfoProvider = new LoginInfoProvider(ctApiListener);\n- loadIdentitySet();\n- }\n-\n- @Override\n- public boolean isProfileKey(@NonNull String Key) {\n- boolean isProfileKey = mProfileKeysSet.containsKey(Key);\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"isProfileKey [Key: \" + Key + \" , Value: \" + isProfileKey + \"]\");\n- return isProfileKey;\n- }\n-\n- void loadIdentitySet() {\n- // Logic :\n- // First Read from pref\n- // If not present in the pref, set the default\n-\n- ProfileKeysSet prefKeySet = ProfileKeysSet.from(mInfoProvider.getCachedIdentityKeysForAccount());\n-\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"PrefKeySet [\" + prefKeySet + \"]\");\n- ProfileKeysSet configKeySet = ProfileKeysSet\n- .from(mCTApiListener.config().getProfileKeys(mCTApiListener.context()));\n-\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"ConfigKeySet [\" + configKeySet + \"]\");\n-\n- handleError(prefKeySet, configKeySet);\n-\n- if (prefKeySet.isValid()) {\n- mProfileKeysSet = prefKeySet;\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Profile Set activated from Pref[\" + mProfileKeysSet + \"]\");\n- } else if (configKeySet.isValid()) {\n- mProfileKeysSet = configKeySet;\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Profile Set activated from Config[\" + mProfileKeysSet + \"]\");\n- } else {\n- mProfileKeysSet = ProfileKeysSet.getDefault();\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Profile Set activated from Default[\" + mProfileKeysSet + \"]\");\n- }\n- boolean isSavedInPref = prefKeySet.isValid();\n- if (!isSavedInPref) {\n- // phone,email,identity,name -> [phone][email][identity]\n- // [phone][email][identity] -> phone,email,identity\n- String storedValue = mProfileKeysSet.toString();\n- mInfoProvider.saveIdentityKeysForAccount(storedValue);\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Saving Profile Keys in Pref[\" + storedValue + \"]\");\n- }\n- }\n-\n- private void handleError(final ProfileKeysSet prefKeySet, final ProfileKeysSet configKeySet) {\n- if (prefKeySet.isValid() && configKeySet.isValid() && !prefKeySet.equals(configKeySet)) {\n- ValidationResult error = ValidationResultFactory.create(531);\n- mCTApiListener.remoteErrorLogger().pushValidationResult(error);\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"pushing error due to mismatch [Pref:\" + prefKeySet + \"], [Config:\" + configKeySet + \"]\");\n- }else {\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"No error found while comparing [Pref:\" + prefKeySet + \"], [Config:\" + configKeySet + \"]\");\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IProfileHandler.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import androidx.annotation.NonNull;\n-\n-public interface IProfileHandler {\n-\n- boolean isProfileKey(@NonNull String Key);\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/login/IdentityRepo.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import androidx.annotation.NonNull;\n+\n+/**\n+ * Handler Interface to provide Identities related functionality\n+ */\n+public interface IdentityRepo {\n+\n+ /**\n+ * checks if a given key is an identity or not\n+ * @param Key - String value of key\n+ * @return - true , if the given key is an identity key else false.\n+ */\n+ boolean isIdentity(@NonNull String Key);\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/login/IdentityRepoFactory.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\n+import androidx.annotation.RestrictTo.Scope;\n+import com.clevertap.android.sdk.BaseCTApiListener;\n+\n+/**\n+ * Provides Repo instance for an account\n+ */\n+@RestrictTo(Scope.LIBRARY)\n+public class IdentityRepoFactory {\n+\n+ private IdentityRepoFactory() {\n+ // private constructor\n+ }\n+\n+ /**\n+ * Creates repo provider based on login state & config details.\n+ * @param ctApiListener - CleverTapAPI instance\n+ * @return - repo provider\n+ */\n+ public static IdentityRepo repo(@NonNull BaseCTApiListener ctApiListener) {\n+ final LoginInfoProvider cacheHandler = new LoginInfoProvider(ctApiListener);\n+ final IdentityRepo repo;\n+ if (cacheHandler.isLegacyProfileLoggedIn()) {\n+ repo = new LegacyIdentityRepo(ctApiListener);// case 1: Migration (cached guid but no newly saved profile pref)\n+ } else {\n+ /* ----------------------------------------------------\n+ * case 2: Not logged in & using default config\n+ * case 3: Not logged in & using multi instance config\n+ * -----------------------------------------------------*/\n+ repo = new ConfigurableIdentityRepo(ctApiListener);\n+ }\n+ ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ \"Repo provider: \" + repo.getClass().getSimpleName());\n+ return repo;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentitySet.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.Utils;\n+import java.util.HashSet;\n+import java.util.Iterator;\n+\n+/**\n+ * Wrapper class of identities & related behaviors\n+ */\n+class IdentitySet {\n+\n+ private final HashSet<String> identities = new HashSet<>();\n+\n+ private IdentitySet(String[] keys) {\n+ init(keys);\n+ }\n+\n+ private IdentitySet(HashSet<String> hashSet) {\n+ identities.addAll(hashSet);\n+ }\n+\n+ /**\n+ * Initialises the identity set using the string array items.\n+ * It also filters out invalid identities during initialisation\n+ * @param keysArrays - String array containing identities.\n+ */\n+ private void init(final String[] keysArrays) {\n+ if (keysArrays != null && keysArrays.length > 0) {\n+ for (String key : keysArrays) {\n+ if (Utils.containsIgnoreCase(Constants.ALL_IDENTITY_KEYS, key)) {\n+ identities.add(Utils.convertToTitleCase(key));\n+ }\n+ }\n+ }\n+ }\n+\n+ /**\n+ * Checks if two identity sets contain same identities\n+ * @param thatObj - the second object to which we are comparing\n+ * @return - true if all entries are same else false\n+ */\n+ @Override\n+ public boolean equals(final Object thatObj) {\n+ if (this == thatObj) {\n+ return true;\n+ }\n+ if (thatObj == null || getClass() != thatObj.getClass()) {\n+ return false;\n+ }\n+ final IdentitySet that = (IdentitySet) thatObj;\n+ return identities.equals(that.identities);\n+ }\n+\n+ /**\n+ * Stringifies the identity set in comma separated string value.\n+ * Set String\n+ * {Email, Phone} => Email,Phone\n+ * e.g\n+ * @return String value of the identity set.\n+ */\n+ @Override\n+ public String toString() {\n+ StringBuilder stringBuilder = new StringBuilder();\n+ Iterator<String> iterator = identities.iterator();\n+ while (iterator.hasNext()) {\n+ String type = iterator.next();\n+ if (Constants.ALL_IDENTITY_KEYS.contains(type)) {\n+ stringBuilder.append(type)\n+ .append(iterator.hasNext() ? Constants.SEPARATOR_COMMA : \"\");\n+ }\n+ }\n+ return stringBuilder.toString();\n+ }\n+\n+ /**\n+ * @return true - if the set contains at least one of the valid identities {@link Constants#ALL_IDENTITY_KEYS}\n+ */\n+ boolean isValid() {\n+ return !identities.isEmpty();\n+ }\n+\n+ /**\n+ * Prepares Identity set from comma separated string\n+ * String Set\n+ * e.g email,phone => {email, phone}\n+ *\n+ * @param keysCommaSeparated - comma separated key string\n+ * @return IdentitySet containing valid identities.\n+ */\n+ static IdentitySet from(String keysCommaSeparated) {\n+ return new IdentitySet(keysCommaSeparated.split(Constants.SEPARATOR_COMMA));\n+ }\n+\n+ /**\n+ * Prepares Identity set from array of string values\n+ * String array Set\n+ * e.g [email,phone] => {email, phone}\n+ *\n+ * @param keysArray - array of string values\n+ * @return IdentitySet containing valid identities.\n+ */\n+ static IdentitySet from(String[] keysArray) {\n+ return new IdentitySet(keysArray);\n+ }\n+\n+ /**\n+ * Returns Default Identity Set which is set to legacy identity set {@link Constants#LEGACY_IDENTITY_KEYS}\n+ */\n+ static IdentitySet getDefault() {\n+ return new IdentitySet(Constants.LEGACY_IDENTITY_KEYS);\n+ }\n+\n+ /**\n+ * checks if a given key is an identity or not\n+ * @param Key - String value of key\n+ * @return - true , if the given key is an identity key else false.\n+ */\n+ boolean contains(String Key) {\n+ return Utils.containsIgnoreCase(identities, Key);\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/login/LegacyIdentityRepo.java",
"diff": "+package com.clevertap.android.sdk.login;\n+\n+import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n+\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.BaseCTApiListener;\n+\n+/**\n+ * Legacy class which handles old static identity logic.\n+ * Here the profile set was fixed as < Email, Identity >\n+ */\n+public class LegacyIdentityRepo implements IdentityRepo {\n+\n+ private final BaseCTApiListener mCTApiListener;\n+\n+ public LegacyIdentityRepo(final BaseCTApiListener ctApiListener) {\n+ this.mCTApiListener = ctApiListener;\n+ }\n+\n+ @Override\n+ public boolean isIdentity(@NonNull final String Key) {\n+ boolean isIdentity = IdentitySet.getDefault().contains(Key);\n+ mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n+ \"isIdentity [Key: \" + Key + \" , Value: \" + isIdentity + \"]\");\n+ return isIdentity;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LegacyProfileHandlerImpl.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n-\n-import androidx.annotation.NonNull;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-public class LegacyProfileHandlerImpl implements IProfileHandler {\n-\n- private final BaseCTApiListener mCTApiListener;\n-\n- public LegacyProfileHandlerImpl(final BaseCTApiListener ctApiListener) {\n- this.mCTApiListener = ctApiListener;\n- }\n-\n- @Override\n- public boolean isProfileKey(@NonNull final String Key) {\n- boolean isProfileKey = ProfileKeysSet.getDefault().containsKey(Key);\n- mCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- \"isProfileKey [Key: \" + Key + \" , Value: \" + isProfileKey + \"]\");\n- return isProfileKey;\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,9 +9,13 @@ import com.clevertap.android.sdk.CTJsonConverter;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.DeviceInfo;\n+import com.clevertap.android.sdk.LogConstants;\nimport com.clevertap.android.sdk.StorageHelper;\nimport org.json.JSONObject;\n+/**\n+ * Handles saving and/or providing login related information.\n+ */\n@RestrictTo(Scope.LIBRARY)\npublic class LoginInfoProvider {\n@@ -28,18 +32,31 @@ public class LoginInfoProvider {\n}\n//Profile\n+\n+ /**\n+ * @return - All pairs of cached <Identity_Value, Guid> for this account in json format.\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+ \"getCachedGUIDs:[\" + json + \"]\");\nreturn CTJsonConverter.toJsonObject(json, config.getLogger(), config.getAccountId());\n}\n+ /**\n+ * Caches the <Identity_Value, Guid> pairs for this account\n+ * @param cachedGUIDs - jsonObject of the Pairs\n+ */\npublic void setCachedGUIDs(JSONObject cachedGUIDs) {\nif (cachedGUIDs == null) {\nreturn;\n}\ntry {\n+ String cachedGuid = cachedGUIDs.toString();\nStorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(config, Constants.CACHED_GUIDS_KEY),\n- cachedGUIDs.toString());\n+ cachedGuid);\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ \"setCachedGUIDs:[\" + cachedGuid + \"]\");\n} catch (Throwable t) {\nconfig.getLogger().verbose(config.getAccountId(), \"Error persisting guid cache: \" + t.toString());\n}\n@@ -47,14 +64,28 @@ public class LoginInfoProvider {\npublic boolean isAnonymousDevice() {\nJSONObject cachedGUIDs = getCachedGUIDs();\n- return cachedGUIDs.length() <= 0;\n+ boolean isAnonymousDevice = cachedGUIDs.length() <= 0;\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ \"isAnonymousDevice:[\" + isAnonymousDevice + \"]\");\n+ return isAnonymousDevice;\n}\npublic boolean deviceIsMultiUser() {\nJSONObject cachedGUIDs = getCachedGUIDs();\n- return cachedGUIDs.length() > 1;\n- }\n-\n+ boolean deviceIsMultiUser = cachedGUIDs.length() > 1;\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ \"deviceIsMultiUser:[\" + deviceIsMultiUser + \"]\");\n+ return deviceIsMultiUser;\n+ }\n+\n+ /**\n+ * Caches a single pair of <Identity_Value, Guid> for this account\n+ * @param guid - guid of the user\n+ * @param key - Identity Key e.g Email\n+ * @param identifier - Value corresponding to the Key e.g [email protected]\n+ * Format in which the entries are saved\n+ * \"[email protected]:Guid\"\n+ */\npublic void cacheGUIDForIdentifier(String guid, String key, String identifier) {\nif (isErrorDeviceId() || guid == null || key == null || identifier == null) {\nreturn;\n@@ -71,9 +102,18 @@ public class LoginInfoProvider {\n}\nprivate boolean isErrorDeviceId() {\n- return mDeviceInfo.isErrorDeviceId();\n- }\n-\n+ boolean isErrorDeviceId = mDeviceInfo.isErrorDeviceId();\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ \"isErrorDeviceId:[\" + isErrorDeviceId + \"]\");\n+ return isErrorDeviceId;\n+ }\n+\n+ /**\n+ * Returns the Guid Value corresponding to the given <Key, Value>\n+ * @param key - Identity Key e.g Email\n+ * @param identifier - Value corresponding to the Key e.g [email protected]\n+ * @return - String value of Guid if any entry is saved with Key_Value\n+ */\npublic String getGUIDForIdentifier(String key, String identifier) {\nif (key == null || identifier == null) {\nreturn null;\n@@ -82,25 +122,47 @@ public class LoginInfoProvider {\nString cacheKey = key + \"_\" + identifier;\nJSONObject cache = getCachedGUIDs();\ntry {\n- return cache.getString(cacheKey);\n+ String cachedGuid = cache.getString(cacheKey);\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN,\n+ \"getGUIDForIdentifier:[Key:\" + key + \", value:\" + cachedGuid + \"]\");\n+ return cachedGuid;\n} catch (Throwable t) {\nconfig.getLogger().verbose(config.getAccountId(), \"Error reading guid cache: \" + t.toString());\nreturn null;\n}\n}\n+ /**\n+ * Checks if any user was previously logged in using the legacy identity set{@link\n+ * Constants#LEGACY_IDENTITY_KEYS}for the\n+ * account.\n+ */\npublic boolean isLegacyProfileLoggedIn() {\nJSONObject jsonObject = getCachedGUIDs();\n- return jsonObject != null && jsonObject.length() > 0 && TextUtils.isEmpty(getCachedIdentityKeysForAccount());\n+ boolean isLoggedIn = jsonObject != null && jsonObject.length() > 0 && TextUtils\n+ .isEmpty(getCachedIdentityKeysForAccount());\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"isLegacyProfileLoggedIn:\" + isLoggedIn);\n+ return isLoggedIn;\n}\n+ /**\n+ * @return - Cached Identity Keys for the account\n+ */\npublic String getCachedIdentityKeysForAccount() {\n- return StorageHelper\n+ String cachedKeys = StorageHelper\n.getStringFromPrefs(context, config, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n+ config.log(LogConstants.LOG_TAG_ON_USER_LOGIN, \"getCachedIdentityKeysForAccount:\" + cachedKeys);\n+ return cachedKeys;\n}\n+ /**\n+ * Saves cached identity keys in the preference\n+ *\n+ * @param valueCommaSeparated - identity keys in comma separated format e.g. (Email,Phone)\n+ */\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}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileHandlerFactory.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import static com.clevertap.android.sdk.LogConstants.LOG_TAG_ON_USER_LOGIN;\n-\n-import androidx.annotation.NonNull;\n-import androidx.annotation.RestrictTo;\n-import androidx.annotation.RestrictTo.Scope;\n-import com.clevertap.android.sdk.BaseCTApiListener;\n-\n-@RestrictTo(Scope.LIBRARY)\n-public class ProfileHandlerFactory {\n-\n- private ProfileHandlerFactory() {\n-\n- }\n-\n- public static IProfileHandler getProfileHandler(@NonNull BaseCTApiListener ctApiListener) {\n- LoginInfoProvider cacheHandler = new LoginInfoProvider(ctApiListener);\n- IProfileHandler profileHandler = null;\n- if (cacheHandler.isLegacyProfileLoggedIn()) {\n-\n- // case 1: Migration( cached guid but no newly saved profile pref)\n- profileHandler = new LegacyProfileHandlerImpl(ctApiListener);\n- } else {\n- // case 2: Not logged in but default config\n- // case 3: Not logged in but non-default config\n- profileHandler = new ConfigurableProfileHandlerImpl(ctApiListener);\n- }\n- ctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- \"getProfileHandler Returns: \" + profileHandler.getClass().getSimpleName());\n- return profileHandler;\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ProfileKeysSet.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.login;\n-\n-import com.clevertap.android.sdk.Constants;\n-import com.clevertap.android.sdk.Utils;\n-import java.util.HashSet;\n-import java.util.Iterator;\n-\n-class ProfileKeysSet {\n-\n- private final HashSet<String> profileKeys = new HashSet<>();\n-\n- ProfileKeysSet(String[] keys) {\n- init(keys);\n- }\n-\n- ProfileKeysSet(HashSet<String> hashSet) {\n- profileKeys.addAll(hashSet);\n- }\n-\n- private void init(final String[] keys) {\n- if (keys != null && keys.length > 0) {\n- for (String key : keys) {\n- if (Utils.containsIgnoreCase(Constants.ALL_PROFILE_IDENTIFIER_KEYS, key)) {\n- profileKeys.add(Utils.convertToTitleCase(key));\n- }\n- }\n- }\n- }\n-\n- @Override\n- public boolean equals(final Object o) {\n- if (this == o) {\n- return true;\n- }\n- if (o == null || getClass() != o.getClass()) {\n- return false;\n- }\n- final ProfileKeysSet that = (ProfileKeysSet) o;\n- return profileKeys.equals(that.profileKeys);\n- }\n-\n- @Override\n- public String toString() {\n- StringBuilder stringBuilder = new StringBuilder();\n- Iterator<String> iterator = profileKeys.iterator();\n- while (iterator.hasNext()) {\n- String type = iterator.next();\n- if (Constants.ALL_PROFILE_IDENTIFIER_KEYS.contains(type)) {\n- stringBuilder.append(type)\n- .append(iterator.hasNext() ? Constants.SEPARATOR_COMMA : \"\");\n- }\n- }\n- return stringBuilder.toString();\n- }\n-\n- boolean isValid() {\n- return !profileKeys.isEmpty();\n- }\n-\n- static ProfileKeysSet from(String keys) {\n- return new ProfileKeysSet(keys.split(Constants.SEPARATOR_COMMA));\n- }\n-\n- static ProfileKeysSet from(String[] keys) {\n- return new ProfileKeysSet(keys);\n- }\n-\n- static ProfileKeysSet getDefault() {\n- return new ProfileKeysSet(Constants.DEFAULT_PROFILE_IDENTIFIER_KEYS);\n- }\n-\n- boolean containsKey(String Key) {\n- return profileKeys.contains(Key);\n- }\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Chore(SDK-395):Added Comments & Javadoc |
116,612 | 27.11.2020 12:38:22 | -19,080 | aeb25bb82e548b513f71db07c4cfff03b15026d0 | fix(inApp tablet size): add device type to app launch fields | [
{
"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": "@@ -42,6 +42,7 @@ class CTJsonConverter {\nevtData.put(\"wdt\", deviceInfo.getWidth());\nevtData.put(\"hgt\", deviceInfo.getHeight());\nevtData.put(\"dpi\", deviceInfo.getDPI());\n+ evtData.put(\"dt\", DeviceInfo.getDeviceType(deviceInfo.getContext()));\nif (deviceInfo.getLibrary() != null) {\nevtData.put(\"lib\", deviceInfo.getLibrary());\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": "@@ -2,18 +2,23 @@ package com.clevertap.android.sdk;\nimport android.Manifest;\nimport android.annotation.SuppressLint;\n+import android.app.UiModeManager;\nimport android.bluetooth.BluetoothAdapter;\nimport android.content.Context;\nimport android.content.pm.ApplicationInfo;\nimport android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\n+import android.content.res.Configuration;\nimport android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport android.os.Build;\nimport android.telephony.TelephonyManager;\nimport android.util.DisplayMetrics;\nimport android.view.WindowManager;\n+import androidx.annotation.IntDef;\nimport androidx.core.app.NotificationManagerCompat;\n+import java.lang.annotation.Retention;\n+import java.lang.annotation.RetentionPolicy;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n@@ -254,6 +259,26 @@ class DeviceInfo {\nprivate ArrayList<ValidationResult> validationResults = new ArrayList<>();\n+ @IntDef({MOBILE, TABLET, TV, UNKNOWN, NULL})\n+ @Retention(RetentionPolicy.SOURCE)\n+ @interface DeviceType {\n+\n+ }\n+\n+ static final int MOBILE = 1;\n+\n+ static final int TABLET = 2;\n+\n+ static final int TV = 3;\n+\n+ static final int UNKNOWN = 0;\n+\n+ static final int NULL = -1;\n+\n+ @DeviceType\n+ static int sDeviceType = NULL;\n+\n+\nDeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\nthis.config = config;\n@@ -610,6 +635,10 @@ class DeviceInfo {\nStorageHelper.putString(context, getFallbackIdStorageKey(), fallbackId);\n}\n+ Context getContext() {\n+ return context;\n+ }\n+\n/**\n* Returns the integer identifier for the default app icon.\n*\n@@ -620,4 +649,31 @@ class DeviceInfo {\nApplicationInfo ai = context.getApplicationInfo();\nreturn ai.icon;\n}\n+\n+ @DeviceType\n+ static int getDeviceType(final Context context) {\n+\n+ if (sDeviceType == NULL) {\n+\n+ try {\n+ UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);\n+ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {\n+ sDeviceType = TV;\n+ }\n+ } catch (Exception e) {\n+ //uiModeManager or context is null\n+ e.printStackTrace();\n+ }\n+\n+ try {\n+ sDeviceType = context.getResources().getBoolean(R.bool.ctIsTablet) ? TABLET : MOBILE;\n+ } catch (Exception e) {\n+ // resource not found or context is null\n+ e.printStackTrace();\n+ sDeviceType = UNKNOWN;\n+ }\n+\n+ }\n+ return sDeviceType;\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet size): add device type to app launch fields #116 SDK-492 |
116,612 | 29.11.2020 20:23:32 | -19,080 | c4d618b9267cd7957dbbc462e4183d5930b56b92 | fix(inApp tablet size): add logging when catching exceptions | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInAppBaseFullFragment.java",
"diff": "@@ -50,6 +50,7 @@ public abstract class CTInAppBaseFullFragment extends CTInAppBaseFragment {\n} catch (Exception e)\n{\n// resource not found\n+ Logger.d(\"Failed to decide whether device is a smart phone or tablet!\");\ne.printStackTrace();\nreturn false;\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": "@@ -662,6 +662,7 @@ class DeviceInfo {\n}\n} catch (Exception e) {\n//uiModeManager or context is null\n+ Logger.d(\"Failed to decide whether device is a TV!\");\ne.printStackTrace();\n}\n@@ -669,6 +670,7 @@ class DeviceInfo {\nsDeviceType = context.getResources().getBoolean(R.bool.ctIsTablet) ? TABLET : MOBILE;\n} catch (Exception e) {\n// resource not found or context is null\n+ Logger.d(\"Failed to decide whether device is a smart phone or tablet!\");\ne.printStackTrace();\nsDeviceType = UNKNOWN;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet size): add logging when catching exceptions #116 SDK-492 |
116,612 | 29.11.2020 20:51:30 | -19,080 | 322594d058549921683c1742a11c0466b62e95f3 | fix(Reinstall tracking): add comments | [
{
"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": "@@ -5137,13 +5137,15 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\n/**\n- * Destroys the current session\n+ * Destroys the current session and resets <i>firstSession</i> flag, if first session lasts more than 20 minutes\n+ * <br><br>For an app like Music Player <li>user installs an app and plays music and then moves to background.\n+ * <li>User then re-launches an App after listening music in background for more than 20 minutes, in this case\n+ * since an app is not yet killed due to background music <i>app installed</i> event must not be raised by SDK\n*/\nprivate void destroySession() {\ncurrentSessionId = 0;\nsetAppLaunchPushed(false);\nif (isFirstSession()) {\n- // SDK-415\nfirstSession = false;\n}\ngetConfigLogger().verbose(getAccountId(), \"Session destroyed; Session ID is now 0\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Reinstall tracking): add comments SDK-415 |
116,612 | 29.11.2020 21:15:53 | -19,080 | 75d772a56c11d1ed4db913f062ab572c9b5c3e2d | fix(inApp tablet size): Add comments and refactor mobile with smart_phone | [
{
"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": "@@ -259,20 +259,43 @@ class DeviceInfo {\nprivate ArrayList<ValidationResult> validationResults = new ArrayList<>();\n- @IntDef({MOBILE, TABLET, TV, UNKNOWN, NULL})\n+ /**\n+ * Type of a device with below possible values<br>\n+ * <li>{@link DeviceInfo#SMART_PHONE}\n+ * <li>{@link DeviceInfo#TABLET}\n+ * <li>{@link DeviceInfo#TV}\n+ * <li>{@link DeviceInfo#UNKNOWN}\n+ * <li>{@link DeviceInfo#NULL}\n+ */\n+ @IntDef({SMART_PHONE, TABLET, TV, UNKNOWN, NULL})\n@Retention(RetentionPolicy.SOURCE)\n@interface DeviceType {\n}\n- static final int MOBILE = 1;\n+ /**\n+ * Device is a smart phone\n+ */\n+ static final int SMART_PHONE = 1;\n+ /**\n+ * Device is a tablet\n+ */\nstatic final int TABLET = 2;\n+ /**\n+ * Device is a television\n+ */\nstatic final int TV = 3;\n+ /**\n+ * Device type is not known\n+ */\nstatic final int UNKNOWN = 0;\n+ /**\n+ * Initial state of device type before determining\n+ */\nstatic final int NULL = -1;\n@DeviceType\n@@ -650,6 +673,12 @@ class DeviceInfo {\nreturn ai.icon;\n}\n+ /**\n+ * Determines if a device is tablet, smart phone or TV\n+ *\n+ * @param context context\n+ * @return one of the possible value of {@link DeviceType}\n+ */\n@DeviceType\nstatic int getDeviceType(final Context context) {\n@@ -667,7 +696,7 @@ class DeviceInfo {\n}\ntry {\n- sDeviceType = context.getResources().getBoolean(R.bool.ctIsTablet) ? TABLET : MOBILE;\n+ sDeviceType = context.getResources().getBoolean(R.bool.ctIsTablet) ? TABLET : SMART_PHONE;\n} catch (Exception e) {\n// resource not found or context is null\nLogger.d(\"Failed to decide whether device is a smart phone or tablet!\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(inApp tablet size): Add comments and refactor mobile with smart_phone #116 SDK-492 |
116,621 | 30.11.2020 12:00:27 | -19,080 | 953a4633ed784389d451a90f4510c3e4b3f2409d | feat(SDK-395)- Sending IdentitySet in the header. | [
{
"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": "@@ -47,7 +47,6 @@ import androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\n-\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationCompat;\nimport androidx.fragment.app.Fragment;\n@@ -62,8 +61,8 @@ import com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.login.IdentityRepo;\n-import com.clevertap.android.sdk.login.LoginInfoProvider;\nimport com.clevertap.android.sdk.login.IdentityRepoFactory;\n+import com.clevertap.android.sdk.login.LoginInfoProvider;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTNotificationIntentService;\n@@ -6105,6 +6104,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nheader.put(\"tk\", token);\nheader.put(\"l_ts\", getLastRequestTimestamp());\nheader.put(\"f_ts\", getFirstRequestTimestamp());\n+ header.put(\"ct_pi\", IdentityRepoFactory.repo(this).identities().toString());\nheader.put(\"ddnd\",\n!(this.deviceInfo.getNotificationsEnabledForUser() && (pushProviders.isNotificationSupported())));\nif (isBgPing) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ValidationResultFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ValidationResultFactory.java",
"diff": "@@ -152,7 +152,7 @@ public class ValidationResultFactory {\n}\nbreak;\ncase 531:\n- msg = \"Profile Identities mismatch with the previously saved ones\";\n+ msg = \"Profile Identifiers mismatch with the previously saved ones\";\nbreak;\n}\n} catch (Exception e) {\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": "@@ -31,6 +31,11 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\nreturn isProfileKey;\n}\n+ @Override\n+ public IdentitySet identities() {\n+ return identitySet;\n+ }\n+\n/**\n* Loads the identity set\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepo.java",
"diff": "@@ -14,4 +14,6 @@ public interface IdentityRepo {\n*/\nboolean isIdentity(@NonNull String Key);\n+ IdentitySet identities();\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/IdentitySet.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentitySet.java",
"diff": "package com.clevertap.android.sdk.login;\n+import androidx.annotation.RestrictTo;\n+import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Utils;\nimport java.util.HashSet;\n@@ -8,7 +10,8 @@ import java.util.Iterator;\n/**\n* Wrapper class of identities & related behaviors\n*/\n-class IdentitySet {\n+@RestrictTo(Scope.LIBRARY)\n+public class IdentitySet {\nprivate final HashSet<String> identities = new HashSet<>();\n@@ -23,6 +26,7 @@ class IdentitySet {\n/**\n* Initialises the identity set using the string array items.\n* It also filters out invalid identities during initialisation\n+ *\n* @param keysArrays - String array containing identities.\n*/\nprivate void init(final String[] keysArrays) {\n@@ -37,6 +41,7 @@ class IdentitySet {\n/**\n* Checks if two identity sets contain same identities\n+ *\n* @param thatObj - the second object to which we are comparing\n* @return - true if all entries are same else false\n*/\n@@ -55,8 +60,8 @@ class IdentitySet {\n/**\n* Stringifies the identity set in comma separated string value.\n* Set String\n- * {Email, Phone} => Email,Phone\n- * e.g\n+ * e.g {Email, Phone} => Email,Phone\n+ *\n* @return String value of the identity set.\n*/\n@Override\n@@ -113,6 +118,7 @@ class IdentitySet {\n/**\n* checks if a given key is an identity or not\n+ *\n* @param Key - String value of key\n* @return - true , if the given key is an identity key else false.\n*/\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": "@@ -13,15 +13,23 @@ public class LegacyIdentityRepo implements IdentityRepo {\nprivate final BaseCTApiListener mCTApiListener;\n+ private final IdentitySet identities;\n+\npublic LegacyIdentityRepo(final BaseCTApiListener ctApiListener) {\nthis.mCTApiListener = ctApiListener;\n+ this.identities = IdentitySet.getDefault();\n}\n@Override\npublic boolean isIdentity(@NonNull final String Key) {\n- boolean isIdentity = IdentitySet.getDefault().contains(Key);\n+ boolean isIdentity = identities.contains(Key);\nmCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n\"isIdentity [Key: \" + Key + \" , Value: \" + isIdentity + \"]\");\nreturn isIdentity;\n}\n+\n+ @Override\n+ public IdentitySet identities() {\n+ return identities;\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395)- Sending IdentitySet in the header. |
116,621 | 30.11.2020 15:40:09 | -19,080 | 341eb7006b416c9ee312371057c3ef507c8cb0bc | feat(SDK-395): 1. Added code reviews comments
fix(SDK-395): Chore(SDK-395):Code Reviews | [
{
"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": "@@ -4291,13 +4291,13 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nboolean haveIdentifier = false;\n- LoginInfoProvider handler = new LoginInfoProvider(this);\n+ LoginInfoProvider loginInfoProvider = new LoginInfoProvider(this);\n// check for valid identifier keys\n// use the first one we find\n- IdentityRepo iProfileHandler = IdentityRepoFactory.repo(this);\n+ IdentityRepo iProfileHandler = IdentityRepoFactory.getRepo(this);\nfor (String key : profile.keySet()) {\nObject value = profile.get(key);\n- boolean isProfileKey = iProfileHandler.isIdentity(key);\n+ boolean isProfileKey = iProfileHandler.hasIdentity(key);\nif (isProfileKey) {\ntry {\nString identifier = null;\n@@ -4306,7 +4306,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n}\nif (identifier != null && identifier.length() > 0) {\nhaveIdentifier = true;\n- cachedGUID = handler.getGUIDForIdentifier(key, identifier);\n+ cachedGUID = loginInfoProvider.getGUIDForIdentifier(key, identifier);\nif (cachedGUID != null) {\nbreak;\n}\n@@ -4319,7 +4319,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\n// if no valid identifier provided or there are no identified users on the device; just push on the current profile\nif (!isErrorDeviceId()) {\n- if (!haveIdentifier || handler.isAnonymousDevice()) {\n+ if (!haveIdentifier || loginInfoProvider.isAnonymousDevice()) {\ngetConfigLogger().debug(getAccountId(),\n\"onUserLogin: no identifier provided or device is anonymous, pushing on current user profile\");\npushProfile(profile);\n@@ -6104,7 +6104,7 @@ public class CleverTapAPI implements CleverTapAPIListener {\nheader.put(\"tk\", token);\nheader.put(\"l_ts\", getLastRequestTimestamp());\nheader.put(\"f_ts\", getFirstRequestTimestamp());\n- header.put(\"ct_pi\", IdentityRepoFactory.repo(this).identities().toString());\n+ header.put(\"ct_pi\", IdentityRepoFactory.getRepo(this).getIdentitySet().toString());\nheader.put(\"ddnd\",\n!(this.deviceInfo.getNotificationsEnabledForUser() && (pushProviders.isNotificationSupported())));\nif (isBgPing) {\n@@ -7245,8 +7245,8 @@ public class CleverTapAPI implements CleverTapAPIListener {\nif (baseProfile != null && baseProfile.length() > 0) {\nIterator i = baseProfile.keys();\n- IdentityRepo iProfileHandler = IdentityRepoFactory.repo(this);\n- LoginInfoProvider handler = new LoginInfoProvider(this);\n+ IdentityRepo iProfileHandler = IdentityRepoFactory.getRepo(this);\n+ LoginInfoProvider loginInfoProvider = new LoginInfoProvider(this);\nwhile (i.hasNext()) {\nString next = i.next().toString();\n@@ -7266,10 +7266,10 @@ public class CleverTapAPI implements CleverTapAPIListener {\nprofileEvent.put(next, value);\n// cache the valid identifier: guid pairs\n- boolean isProfileKey = iProfileHandler.isIdentity(next);\n+ boolean isProfileKey = iProfileHandler.hasIdentity(next);\nif (isProfileKey) {\ntry {\n- handler.cacheGUIDForIdentifier(guid, next, value.toString());\n+ loginInfoProvider.cacheGUIDForIdentifier(guid, next, value.toString());\n} catch (Throwable t) {\n// no-op\n}\n"
},
{
"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": "@@ -347,10 +347,12 @@ public class CleverTapInstanceConfig implements Parcelable {\nreturn enableUIEditor;\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\npublic void log(@NonNull String tag, @NonNull String message) {\nlogger.verbose(getDefaultSuffix(tag), message);\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\npublic void log(@NonNull String tag, @NonNull String message, Throwable throwable) {\nlogger.verbose(getDefaultSuffix(tag), message, throwable);\n}\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": "@@ -24,15 +24,15 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\n}\n@Override\n- public boolean isIdentity(@NonNull String Key) {\n- boolean isProfileKey = identitySet.contains(Key);\n+ public boolean hasIdentity(@NonNull String Key) {\n+ boolean hasIdentity = identitySet.contains(Key);\nctApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"isIdentity [Key: \" + Key + \" , Value: \" + isProfileKey + \"]\");\n- return isProfileKey;\n+ TAG + \"isIdentity [Key: \" + Key + \" , Value: \" + hasIdentity + \"]\");\n+ return hasIdentity;\n}\n@Override\n- public IdentitySet identities() {\n+ public IdentitySet getIdentitySet() {\nreturn identitySet;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentityRepo.java",
"diff": "@@ -3,7 +3,7 @@ package com.clevertap.android.sdk.login;\nimport androidx.annotation.NonNull;\n/**\n- * Handler Interface to provide Identities related functionality\n+ * Interface to provide Identities related functionality\n*/\npublic interface IdentityRepo {\n@@ -12,8 +12,8 @@ public interface IdentityRepo {\n* @param Key - String value of key\n* @return - true , if the given key is an identity key else false.\n*/\n- boolean isIdentity(@NonNull String Key);\n+ boolean hasIdentity(@NonNull String Key);\n- IdentitySet identities();\n+ IdentitySet getIdentitySet();\n}\n\\ No newline at end of file\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": "@@ -22,10 +22,10 @@ public class IdentityRepoFactory {\n* @param ctApiListener - CleverTapAPI instance\n* @return - repo provider\n*/\n- public static IdentityRepo repo(@NonNull BaseCTApiListener ctApiListener) {\n- final LoginInfoProvider cacheHandler = new LoginInfoProvider(ctApiListener);\n+ public static IdentityRepo getRepo(@NonNull BaseCTApiListener ctApiListener) {\n+ final LoginInfoProvider infoProvider = new LoginInfoProvider(ctApiListener);\nfinal IdentityRepo repo;\n- if (cacheHandler.isLegacyProfileLoggedIn()) {\n+ if (infoProvider.isLegacyProfileLoggedIn()) {\nrepo = new LegacyIdentityRepo(ctApiListener);// case 1: Migration (cached guid but no newly saved profile pref)\n} else {\n/* ----------------------------------------------------\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": "@@ -21,15 +21,15 @@ public class LegacyIdentityRepo implements IdentityRepo {\n}\n@Override\n- public boolean isIdentity(@NonNull final String Key) {\n- boolean isIdentity = identities.contains(Key);\n+ public boolean hasIdentity(@NonNull final String Key) {\n+ boolean hasIdentity = identities.contains(Key);\nmCTApiListener.config().log(LOG_TAG_ON_USER_LOGIN,\n- \"isIdentity [Key: \" + Key + \" , Value: \" + isIdentity + \"]\");\n- return isIdentity;\n+ \"isIdentity [Key: \" + Key + \" , Value: \" + hasIdentity + \"]\");\n+ return hasIdentity;\n}\n@Override\n- public IdentitySet identities() {\n+ public IdentitySet getIdentitySet() {\nreturn identities;\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-395): 1. Added code reviews comments
fix(SDK-395): Chore(SDK-395):Code Reviews |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.