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,612 | 13.04.2021 13:55:58 | -19,080 | 1e7bff6584b4975232cb6e1d71c7c973150e1a4e | chore(Unit Test): update settings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/fakes/CTGeofenceSettingsFake.java",
"new_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/fakes/CTGeofenceSettingsFake.java",
"diff": "@@ -49,7 +49,7 @@ public class CTGeofenceSettingsFake {\njsonObject = new JSONObject(\"{\\\"last_accuracy\\\":1,\\\"last_fetch_mode\\\":1,\" +\n\"\\\"last_bg_location_updates\\\":true,\\\"last_log_level\\\":3,\\\"last_geo_count\\\":47,\" +\n\"\\\"last_interval\\\":1800000,\\\"last_fastest_interval\\\":1800000,\\\"last_displacement\\\":200,\" +\n- \"\\\"id\\\":\\\"4RW-Z6Z-485Z\\\"}\").toString();\n+ \"\\\"id\\\":\\\"4RW-Z6Z-485Z\\\",\\\"last_geo_notification_responsiveness\\\":0}\").toString();\n} catch (JSONException e) {\ne.printStackTrace();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(Unit Test): update settings SDK-672 |
116,623 | 15.04.2021 22:13:48 | -19,080 | 5d71ffa5a7f3602ca876529920aa46c659be518e | feat(SDK-601): Adds public method in CTInboxStyleConfig to allow setting the title of the first tab in App Inbox | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"diff": "@@ -31,6 +31,8 @@ public class CTInboxStyleConfig implements Parcelable {\nprivate String backButtonColor;\n+ private String firstTabTitle;\n+\nprivate String inboxBackgroundColor;\nprivate String navBarColor;\n@@ -66,6 +68,7 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.tabs = new String[0];\nthis.noMessageViewText = \"No Message(s) to show\";\nthis.noMessageViewTextColor = \"#000000\";\n+ this.firstTabTitle = \"ALL\";\n}\nCTInboxStyleConfig(CTInboxStyleConfig config) {\n@@ -81,6 +84,7 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.tabs = (config.tabs == null) ? new String[0] : Arrays.copyOf(config.tabs, config.tabs.length);\nthis.noMessageViewText = config.noMessageViewText;\nthis.noMessageViewTextColor = config.noMessageViewTextColor;\n+ this.firstTabTitle = config.firstTabTitle;\n}\nprotected CTInboxStyleConfig(Parcel in) {\n@@ -96,6 +100,7 @@ public class CTInboxStyleConfig implements Parcelable {\ntabBackgroundColor = in.readString();\nnoMessageViewText = in.readString();\nnoMessageViewTextColor = in.readString();\n+ firstTabTitle = in.readString();\n}\n@Override\n@@ -116,6 +121,19 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.backButtonColor = backButtonColor;\n}\n+ public String getFirstTabTitle() {\n+ return firstTabTitle;\n+ }\n+\n+ /**\n+ * Sets the title of the first tab of the App Inbox\n+ *\n+ * @param title String - title of the first tab\n+ */\n+ public void setFirstTabTitle(String title) {\n+ firstTabTitle = title;\n+ }\n+\npublic String getInboxBackgroundColor() {\nreturn inboxBackgroundColor;\n}\n@@ -270,6 +288,10 @@ public class CTInboxStyleConfig implements Parcelable {\nthis.unselectedTabColor = unselectedTabColor;\n}\n+ public boolean isUsingTabs() {\n+ return (tabs != null && tabs.length > 0);\n+ }\n+\n@Override\npublic void writeToParcel(Parcel dest, int flags) {\ndest.writeString(navBarColor);\n@@ -284,9 +306,6 @@ public class CTInboxStyleConfig implements Parcelable {\ndest.writeString(tabBackgroundColor);\ndest.writeString(noMessageViewText);\ndest.writeString(noMessageViewTextColor);\n- }\n-\n- public boolean isUsingTabs() {\n- return (tabs != null && tabs.length > 0);\n+ dest.writeString(firstTabTitle);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -147,7 +147,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n_allBundle.putInt(\"position\", 0);\nCTInboxListViewFragment all = new CTInboxListViewFragment();\nall.setArguments(_allBundle);\n- inboxTabAdapter.addFragment(all, \"ALL\", 0);\n+ inboxTabAdapter.addFragment(all, styleConfig.getFirstTabTitle(), 0);\nfor (int i = 0; i < tabs.size(); i++) {\nString filter = tabs.get(i);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-601): Adds public method in CTInboxStyleConfig to allow setting the title of the first tab in App Inbox |
116,623 | 15.04.2021 23:01:46 | -19,080 | feb806d6f9e6d134b78bbe478f98cf624aa674f9 | feat(SDK-603): Adds pushChargedEvent to CTWebInterface, adds util method to convert JSONArray of JSONObjects to ArrayList of HashMaps for handling charged event items | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -2,6 +2,8 @@ package com.clevertap.android.sdk;\nimport android.webkit.JavascriptInterface;\nimport java.lang.ref.WeakReference;\n+import java.util.ArrayList;\n+import java.util.HashMap;\nimport org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -21,11 +23,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to add profile properties in CleverTap\n*\n- * @param key String value of profile property key\n- * @param value String value of profile property value\n+ * @param key {@link String} value of profile property key\n+ * @param value {@link String} value of profile property value\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void addMultiValueForKey(String key, String value) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -38,11 +39,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to add profile properties in CleverTap\n*\n- * @param key String value of profile property key\n- * @param values Stringified JSON Array of profile property values\n+ * @param key {@link String} value of profile property key\n+ * @param values Stringified {@link JSONArray} of profile property values\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void addMultiValuesForKey(String key, String values) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -66,13 +66,51 @@ public class CTWebInterface {\n}\n+ /**\n+ * Method to be called from WebView Javascript to raise Charged event in CleverTap\n+ *\n+ * @param chargeDetails Stringified {@link JSONObject} of charged event details\n+ * Stringified {@link JSONObject} will be converted to a HashMap<String,Object>\n+ * @param items A {@link JSONArray} which contains up to 15 JSON Object objects,\n+ * where each JSON Object object describes a particular item purchased\n+ * {@link JSONArray} of {@link JSONObject}s will be converted to an {@link ArrayList} of\n+ * {@link HashMap<String,Object>}\n+ */\n+ @JavascriptInterface\n+ @SuppressWarnings({\"JavaDoc\"})\n+ public void pushChargedEvent(String chargeDetails, JSONArray items) {\n+ CleverTapAPI cleverTapAPI = weakReference.get();\n+ if (cleverTapAPI == null) {\n+ Logger.d(\"CleverTap Instance is null.\");\n+ } else {\n+ HashMap<String, Object> chargeDetailsHashMap = new HashMap<>();\n+ if (chargeDetails != null) {\n+ try {\n+ JSONObject chargeDetailsObject = new JSONObject(chargeDetails);\n+ chargeDetailsHashMap = Utils.convertJSONObjectToHashMap(chargeDetailsObject);\n+ } catch (JSONException e) {\n+ Logger.v(\"Unable to parse eventActions from WebView \" + e.getLocalizedMessage());\n+ }\n+ } else {\n+ Logger.v(\"eventActions passed to CTWebInterface is null\");\n+ return;\n+ }\n+ ArrayList<HashMap<String, Object>> itemsArrayList;\n+ if (items != null) {\n+ itemsArrayList = Utils.convertJSONArrayOfJSONObjectsToArrayListOfHashMaps(items);\n+ } else {\n+ return;\n+ }\n+ cleverTapAPI.pushChargedEvent(chargeDetailsHashMap, itemsArrayList);\n+ }\n+ }\n+\n/**\n* Method to be called from WebView Javascript to raise event in CleverTap\n*\n- * @param eventName String value of event name\n+ * @param eventName {@link String} value of event name\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void pushEvent(String eventName) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -85,11 +123,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to raise event with event properties in CleverTap\n*\n- * @param eventName String value of event name\n- * @param eventActions Stringified JSON Object of event properties\n+ * @param eventName {@link String} value of event name\n+ * @param eventActions Stringified {@link JSONObject} of event properties\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void pushEvent(String eventName, String eventActions) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -106,17 +143,14 @@ public class CTWebInterface {\nLogger.v(\"eventActions passed to CTWebInterface is null\");\n}\n}\n-\n-\n}\n/**\n* Method to be called from WebView Javascript to push profile properties in CleverTap\n*\n- * @param profile Stringified JSON Object of profile properties\n+ * @param profile Stringified {@link JSONObject} of profile properties\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void pushProfile(String profile) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -138,11 +172,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to remove profile properties in CleverTap\n*\n- * @param key String value of profile property key\n- * @param value String value of profile property value\n+ * @param key {@link String} value of profile property key\n+ * @param value {@link String} value of profile property value\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void removeMultiValueForKey(String key, String value) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -163,11 +196,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to remove profile properties in CleverTap\n*\n- * @param key String value of profile property key\n- * @param values Stringified JSON Array of profile property values\n+ * @param key {@link String} value of profile property key\n+ * @param values Stringified {@link JSONArray} of profile property values\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void removeMultiValuesForKey(String key, String values) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -193,10 +225,9 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to remove profile properties for given key in CleverTap\n*\n- * @param key String value of profile property key\n+ * @param key {@link String} value of profile property key\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void removeValueForKey(String key) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\n@@ -213,11 +244,10 @@ public class CTWebInterface {\n/**\n* Method to be called from WebView Javascript to set profile properties in CleverTap\n*\n- * @param key String value of profile property key\n- * @param values Stringified JSON Array of profile property values\n+ * @param key {@link String} value of profile property key\n+ * @param values Stringified {@link JSONArray} of profile property values\n*/\n@JavascriptInterface\n- @SuppressWarnings(\"unused\")\npublic void setMultiValueForKey(String key, String values) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\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": "@@ -70,6 +70,36 @@ public final class Utils {\nreturn map;\n}\n+ public static ArrayList<HashMap<String, Object>> convertJSONArrayOfJSONObjectsToArrayListOfHashMaps(\n+ JSONArray jsonArray) {\n+ final ArrayList<HashMap<String, Object>> hashMapArrayList = new ArrayList<>();\n+ if (jsonArray != null) {\n+ for (int i = 0; i < jsonArray.length(); i++) {\n+ try {\n+ hashMapArrayList.add(convertJSONObjectToHashMap(jsonArray.getJSONObject(i)));\n+ } catch (JSONException e) {\n+ Logger.v(\"Could not convert JSONArray of JSONObjects to ArrayList of HashMaps - \" + e\n+ .getMessage());\n+ }\n+ }\n+ }\n+ return hashMapArrayList;\n+ }\n+\n+ public static ArrayList<String> convertJSONArrayToArrayList(JSONArray array) {\n+ ArrayList<String> listdata = new ArrayList<>();\n+ if (array != null) {\n+ for (int i = 0; i < array.length(); i++) {\n+ try {\n+ listdata.add(array.getString(i));\n+ } catch (JSONException e) {\n+ Logger.v(\"Could not convert JSONArray to ArrayList - \" + e.getMessage());\n+ }\n+ }\n+ }\n+ return listdata;\n+ }\n+\npublic static HashMap<String, Object> convertJSONObjectToHashMap(JSONObject b) {\nfinal HashMap<String, Object> map = new HashMap<>();\nfinal Iterator<String> keys = b.keys();\n@@ -174,6 +204,101 @@ public final class Utils {\n}\n}\n+ @SuppressLint(\"MissingPermission\")\n+ public static String getCurrentNetworkType(final Context context) {\n+ try {\n+ // First attempt to check for WiFi connectivity\n+ ConnectivityManager connManager = (ConnectivityManager) context\n+ .getSystemService(Context.CONNECTIVITY_SERVICE);\n+ if (connManager == null) {\n+ return \"Unavailable\";\n+ }\n+ NetworkInfo mWifi = connManager\n+ .getNetworkInfo(ConnectivityManager.TYPE_WIFI);\n+\n+ if (mWifi != null && mWifi.isConnected()) {\n+ return \"WiFi\";\n+ }\n+\n+ return getDeviceNetworkType(context);\n+\n+ } catch (Throwable t) {\n+ return \"Unavailable\";\n+ }\n+ }\n+\n+ @SuppressLint(\"MissingPermission\")\n+ public static String getDeviceNetworkType(final Context context) {\n+ // Fall back to network type\n+ TelephonyManager teleMan = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);\n+ if (teleMan == null) {\n+ return \"Unavailable\";\n+ }\n+\n+ int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {\n+ if (hasPermission(context, Manifest.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+\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+ case TelephonyManager.NETWORK_TYPE_NR:\n+ return \"5G\";\n+ default:\n+ return \"Unknown\";\n+ }\n+ }\n+\n+ @RestrictTo(Scope.LIBRARY)\n+ public static String getFcmTokenUsingManifestMetaEntry(Context context, CleverTapInstanceConfig config) {\n+ String token = null;\n+ try {\n+ String senderID = ManifestInfo.getInstance(context).getFCMSenderId();\n+ if (senderID != null) {\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Requesting an FCM token with Manifest SenderId - \" + senderID);\n+ token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n+ }\n+ config.getLogger().info(config.getAccountId(), \"FCM token using Manifest SenderId: \" + token);\n+ } catch (Throwable t) {\n+ config.getLogger().verbose(config.getAccountId(), \"Error requesting FCM token with Manifest SenderId\", t);\n+ }\n+ return token;\n+ }\n+\n+ public static long getMemoryConsumption() {\n+ long free = Runtime.getRuntime().freeMemory();\n+ long total = Runtime.getRuntime().totalMemory();\n+ return total - free;\n+ }\n+\npublic static Bitmap getNotificationBitmap(String icoPath, boolean fallbackToAppIcon, final Context context)\nthrows NullPointerException {\n// If the icon path is not specified\n@@ -188,6 +313,10 @@ public final class Utils {\nreturn (ic != null) ? ic : ((fallbackToAppIcon) ? getAppIcon(context) : null);\n}\n+ public static int getNow() {\n+ return (int) (System.currentTimeMillis() / 1000);\n+ }\n+\npublic static int getThumbnailImage(Context context, String image) {\nif (context != null) {\nreturn context.getResources().getIdentifier(image, \"drawable\", context.getPackageName());\n@@ -196,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+ public static boolean hasPermission(final Context context, String permission) {\n+ try {\n+ return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(context, permission);\n+ } catch (Throwable t) {\n+ return false;\n+ }\n+ }\n+\npublic static boolean isActivityDead(Activity activity) {\nif (activity == null) {\nreturn true;\n@@ -270,127 +413,6 @@ public final class Utils {\nreturn bundle;\n}\n- public static ArrayList<String> convertJSONArrayToArrayList(JSONArray array) {\n- ArrayList<String> listdata = new ArrayList<>();\n- if (array != null) {\n- for (int i = 0; i < array.length(); i++) {\n- try {\n- listdata.add(array.getString(i));\n- } catch (JSONException e) {\n- Logger.v(\"Could not convert JSONArray to ArrayList - \" + e.getMessage());\n- }\n- }\n- }\n- return listdata;\n- }\n-\n- static Bitmap drawableToBitmap(Drawable drawable)\n- throws NullPointerException {\n- if (drawable instanceof BitmapDrawable) {\n- return ((BitmapDrawable) drawable).getBitmap();\n- }\n-\n- Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),\n- drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);\n- Canvas canvas = new Canvas(bitmap);\n- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());\n- drawable.draw(canvas);\n-\n- return bitmap;\n- }\n-\n- @SuppressLint(\"MissingPermission\")\n- public static String getCurrentNetworkType(final Context context) {\n- try {\n- // First attempt to check for WiFi connectivity\n- ConnectivityManager connManager = (ConnectivityManager) context\n- .getSystemService(Context.CONNECTIVITY_SERVICE);\n- if (connManager == null) {\n- return \"Unavailable\";\n- }\n- NetworkInfo mWifi = connManager\n- .getNetworkInfo(ConnectivityManager.TYPE_WIFI);\n-\n- if (mWifi != null && mWifi.isConnected()) {\n- return \"WiFi\";\n- }\n-\n- return getDeviceNetworkType(context);\n-\n- } catch (Throwable t) {\n- return \"Unavailable\";\n- }\n- }\n-\n- @SuppressLint(\"MissingPermission\")\n- public static String getDeviceNetworkType(final Context context) {\n- // Fall back to network type\n- TelephonyManager teleMan = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);\n- if (teleMan == null) {\n- return \"Unavailable\";\n- }\n-\n- int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {\n- if (hasPermission(context, Manifest.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-\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- case TelephonyManager.NETWORK_TYPE_NR:\n- return \"5G\";\n- default:\n- return \"Unknown\";\n- }\n- }\n-\n- public static long getMemoryConsumption() {\n- long free = Runtime.getRuntime().freeMemory();\n- long total = Runtime.getRuntime().totalMemory();\n- return total - free;\n- }\n-\n- /**\n- * Checks whether a particular permission is available or not.\n- *\n- * @param context The Android {@link Context}\n- * @param permission The fully qualified Android permission name\n- */\n- public static boolean hasPermission(final Context context, String permission) {\n- try {\n- return PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(context, permission);\n- } catch (Throwable t) {\n- return false;\n- }\n- }\n-\npublic static boolean validateCTID(String cleverTapID) {\nif (cleverTapID == null) {\nLogger.i(\n@@ -413,8 +435,19 @@ public final class Utils {\nreturn true;\n}\n- public static int getNow() {\n- return (int) (System.currentTimeMillis() / 1000);\n+ static Bitmap drawableToBitmap(Drawable drawable)\n+ throws NullPointerException {\n+ if (drawable instanceof BitmapDrawable) {\n+ return ((BitmapDrawable) drawable).getBitmap();\n+ }\n+\n+ Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),\n+ drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);\n+ Canvas canvas = new Canvas(bitmap);\n+ drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());\n+ drawable.draw(canvas);\n+\n+ return bitmap;\n}\n/**\n@@ -462,21 +495,4 @@ public final class Utils {\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n-\n- @RestrictTo(Scope.LIBRARY)\n- public static String getFcmTokenUsingManifestMetaEntry(Context context, CleverTapInstanceConfig config) {\n- String token = null;\n- try {\n- String senderID = ManifestInfo.getInstance(context).getFCMSenderId();\n- if (senderID != null) {\n- config.getLogger().verbose(config.getAccountId(),\n- \"Requesting an FCM token with Manifest SenderId - \" + senderID);\n- token = FirebaseInstanceId.getInstance().getToken(senderID, FirebaseMessaging.INSTANCE_ID_SCOPE);\n- }\n- config.getLogger().info(config.getAccountId(), \"FCM token using Manifest SenderId: \" + token);\n- } catch (Throwable t) {\n- config.getLogger().verbose(config.getAccountId(), \"Error requesting FCM token with Manifest SenderId\", t);\n- }\n- return token;\n- }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-603): Adds pushChargedEvent to CTWebInterface, adds util method to convert JSONArray of JSONObjects to ArrayList of HashMaps for handling charged event items |
116,612 | 20.04.2021 12:59:42 | -19,080 | e76fb61aa8c8adb2b72623e4b76e77864b2e1927 | chore(update sample): set SyncListener | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -7,16 +7,18 @@ import androidx.fragment.app.commitNow\nimport com.clevertap.android.sdk.CTFeatureFlagsListener\nimport com.clevertap.android.sdk.CTInboxListener\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.SyncListener\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener\nimport com.clevertap.demo.ui.main.HomeScreenFragment\n+import org.json.JSONObject\nimport java.util.ArrayList\nprivate const val TAG = \"HomeScreenActivity\"\nclass HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitListener, CTProductConfigListener,\n- CTFeatureFlagsListener {\n+ CTFeatureFlagsListener, SyncListener {\nvar cleverTapDefaultInstance: CleverTapAPI? = null\n@@ -41,6 +43,7 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\ncleverTapDefaultInstance = CleverTapAPI.getDefaultInstance(this)\ncleverTapDefaultInstance?.apply {\n+ syncListener = this@HomeScreenActivity\nenableDeviceNetworkInfoReporting(true)\n//Set the Notification Inbox Listener\nctNotificationInboxListener = this@HomeScreenActivity\n@@ -93,4 +96,12 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\noverride fun featureFlagsUpdated() {\nLog.i(TAG, \"featureFlagsUpdated() called\")\n}\n+\n+ override fun profileDataUpdated(updates: JSONObject?) {\n+ Log.i(TAG, \"profileDataUpdated() called\")\n+ }\n+\n+ override fun profileDidInitialize(CleverTapID: String?) {\n+ Log.i(TAG, \"profileDidInitialize() called\")\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -9,7 +9,8 @@ object HomeScreenModel {\n\"Push profile\", \"Update(Replace) Single-Value properties\",\n\"Update(Add) Single-Value properties\", \"Update(Remove) Single-Value properties\",\n\"Update(Replace) Multi-Value property\", \"Update(Add) Multi-Value property\",\n- \"Update(Remove) Multi-Value property\", \"Profile Location\", \"Get User Profile Property\"\n+ \"Update(Remove) Multi-Value property\", \"Profile Location\", \"Get User Profile Property\",\n+ \"onUserLogin\"\n),\n\"INBOX\" to listOf(\n\"Open Inbox\", \"Show Total Counts\", \"Show Unread Counts\", \"Get All Inbox Messages\",\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -123,6 +123,17 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Profile CleverTapId = ${cleverTapAPI?.cleverTapID}\")\nprintln(\"Profile CleverTap AttributionIdentifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n}\n+ \"19\" -> {\n+ // onUserLogin\n+ val newProfile = HashMap<String, Any>()\n+ var n = (0..10_000).random()\n+ var p = (10_000..99_999).random()\n+ newProfile[\"Name\"] = \"Don Joe $n}\" // String\n+ newProfile[\"Email\"] = \"[email protected]\" // Email address of the user\n+ newProfile[\"Phone\"] = \"+141566$p\" // Phone (with the country code, starting with +)\n+ // add any other key value pairs.....\n+ cleverTapAPI?.onUserLogin(newProfile)\n+ }\n\"20\" -> {\n// Open Inbox\nval inboxTabs =\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(update sample): set SyncListener SDK-762 |
116,612 | 27.04.2021 13:09:07 | -19,080 | 21c7adc7062a19e0d19a5c6ffa892d8fa188d522 | fix(gradle): replace withXml() method by from() to automatically add dependencies in pom | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -23,9 +23,6 @@ ext[\"signing.secretKeyRingFile\"] = ''\next[\"ossrhUsername\"] = ''\next[\"ossrhPassword\"] = ''\next[\"sonatypeStagingProfileId\"] = ''\n-ext[\"developerId\"] = ''\n-ext[\"developerName\"] = ''\n-ext[\"developerEmail\"] = ''\nversion = libraryVersion\ngroup = publishedGroupId\n@@ -141,28 +138,26 @@ artifacts {\narchives sourcesJar\n}\n+afterEvaluate {\npublishing {\npublications {\n+ // Creates a Maven publication called \"release\".\nrelease(MavenPublication) {\n- // The coordinates of the library, being set from variables that\n- // we'll set up later\n+ // Applies the component for the release build variant.\n+ from components.release\n+\n+ // You can then customize attributes of the publication as shown below.\ngroupId publishedGroupId\nartifactId artifact\nversion version\n- // Two artifacts, the `aar` (or `jar`) and the sources\n- if (project.plugins.findPlugin(\"com.android.library\")) {\n- artifact(\"$buildDir/outputs/aar/${artifact}-${libraryVersion}.aar\")\n- } else {\n- artifact(\"$buildDir/libs/${project.getName()}-${version}.jar\")\n- }\nartifact sourcesJar\n- // Mostly self-explanatory metadata\npom {\nname = artifact\ndescription = libraryDescription\nurl = siteUrl\n+ packaging = \"aar\"\nlicenses {\nlicense {\nname = licenseName\n@@ -183,18 +178,6 @@ publishing {\ndeveloperConnection = 'scm:git:ssh:github.com/CleverTap/clevertap-android-sdk.git'\nurl = 'https://github.com/CleverTap/clevertap-android-sdk/tree/master'\n}\n- // A slightly hacky fix so that your POM will include any transitive dependencies\n- // that your library builds upon\n- withXml {\n- def dependenciesNode = asNode().appendNode('dependencies')\n-\n- project.configurations.implementation.allDependencies.each {\n- def dependencyNode = dependenciesNode.appendNode('dependency')\n- dependencyNode.appendNode('groupId', it.group)\n- dependencyNode.appendNode('artifactId', it.name)\n- dependencyNode.appendNode('version', it.version)\n- }\n- }\n}\n}\n}\n@@ -212,6 +195,7 @@ publishing {\n}\n}\n}\n+}\nsigning {\nsign publishing.publications\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(gradle): replace withXml() method by from() to automatically add dependencies in pom SDK-773 |
116,612 | 27.04.2021 13:30:31 | -19,080 | 3c3a8fde56f4f2623d1fdfe07795aa27b723ec4c | fix(gradle): remove deprecation warning for classifier | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -131,7 +131,7 @@ if (project.rootProject.file('local.properties').exists()) {\ntask sourcesJar(type: Jar) {\nbaseName \"$artifact\"\nfrom android.sourceSets.main.java.srcDirs\n- classifier = 'sources'\n+ archiveClassifier.set('sources')\n}\nartifacts {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(gradle): remove deprecation warning for classifier SDK-773 |
116,616 | 29.04.2021 17:21:30 | -19,080 | 11ead930b13eb1184448d72ace8f0133abc83309 | fixed CTBackgroundJobService crash on Android 4.4 #SDK-779 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ManifestValidator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ManifestValidator.java",
"diff": "@@ -56,10 +56,6 @@ public final class ManifestValidator {\nCTPushNotificationReceiver.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(),\nCTNotificationIntentService.class.getName());\n- validateServiceInManifest((Application) context.getApplicationContext(),\n- CTBackgroundJobService.class.getName());\n- validateServiceInManifest((Application) context.getApplicationContext(),\n- CTBackgroundIntentService.class.getName());\nvalidateActivityInManifest((Application) context.getApplicationContext(),\nInAppNotificationActivity.class);\nvalidateActivityInManifest((Application) context.getApplicationContext(),\n@@ -70,6 +66,12 @@ public final class ManifestValidator {\n\"com.clevertap.android.geofence.CTLocationUpdateReceiver\");\nvalidateReceiverInManifest((Application) context.getApplicationContext(),\n\"com.clevertap.android.geofence.CTGeofenceBootReceiver\");\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP){\n+ validateServiceInManifest((Application) context.getApplicationContext(),\n+ CTBackgroundJobService.class.getName());\n+ }\n+ validateServiceInManifest((Application) context.getApplicationContext(),\n+ CTBackgroundIntentService.class.getName());\n} catch (Exception e) {\nLogger.v(\"Receiver/Service issue : \" + e.toString());\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fixed CTBackgroundJobService crash on Android 4.4 #SDK-779 |
116,616 | 30.04.2021 12:20:48 | -19,080 | ce5c6b31dd687ad996595a4dd041180400d3ec06 | added multidex support for api 19 | [
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -6,7 +6,7 @@ android {\ncompileSdkVersion 30\ndefaultConfig {\napplicationId \"com.clevertap.demo\"\n- minSdkVersion 21\n+ minSdkVersion 19\ntargetSdkVersion 30\nversionCode 1\nversionName \"1.0\"\n@@ -82,6 +82,8 @@ dependencies {\nimplementation 'com.android.installreferrer:installreferrer:2.1'\n// Mandatory for v3.6.4 and above\n+\n+ implementation 'androidx.multidex:multidex:2.0.1'\n}\napply plugin: 'com.google.gms.google-services'\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "package com.clevertap.demo\n-import android.app.Application\nimport android.app.NotificationManager\n+import androidx.multidex.MultiDexApplication\nimport com.clevertap.android.sdk.ActivityLifecycleCallback\nimport com.clevertap.android.sdk.CleverTapAPI\n-class MyApplication : Application() {\n+class MyApplication : MultiDexApplication() {\noverride fun onCreate() {\nActivityLifecycleCallback.register(this)\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"diff": "@@ -57,7 +57,9 @@ class HomeScreenFragment : Fragment() {\nlistItemBinding = HomeScreenFragmentBinding.inflate(layoutInflater, container, false).apply {\nviewmodel = viewModel\n}\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\nlistItemBinding.expandableListView.isNestedScrollingEnabled = true\n+ }\nreturn listItemBinding.root\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | added multidex support for api 19 |
116,612 | 30.04.2021 13:02:41 | -19,080 | 8ceff6e7224205f8e3c71a76a200b9dfa79ce1ea | chore(update sample): replace FrameLayout with merge tag | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/res/layout/home_screen_activity.xml",
"new_path": "sample/src/main/res/layout/home_screen_activity.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<FrameLayout android:id=\"@+id/container\"\n+<merge android:id=\"@+id/container\"\nxmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\ntools:context=\".HomeScreenActivity\" />\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(update sample): replace FrameLayout with merge tag SDK-762 |
116,623 | 01.05.2021 13:47:12 | -19,080 | b230559dd30186c614923b600dcc986d8e34d5b2 | task(SDK-777): Updates SDK version for next release | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -43,8 +43,8 @@ android {\nversionName libraryVersion\n//AGP 4.1.0 change https://developer.android.com/studio/releases/gradle-plugin#version_properties_removed_from_buildconfig_class_in_library_projects\n-// buildConfigField (\"int\", \"VERSION_CODE\", \"$versionCode\")\n-// buildConfigField (\"String\", \"VERSION_NAME\", \"\\\"$versionName\\\"\")\n+ buildConfigField (\"int\", \"VERSION_CODE\", \"$versionCode\")\n+ buildConfigField (\"String\", \"VERSION_NAME\", \"\\\"$versionName\\\"\")\ntestInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\nconsumerProguardFiles 'consumer-rules.pro'\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/versions.gradle",
"new_path": "gradle-scripts/versions.gradle",
"diff": "@@ -7,13 +7,13 @@ ext {\nminSdkVersionVal = 16\n// CleverTap modules\n- coreVersion = \"4.1.0\"\n+ coreVersion = \"4.1.1\"\ngeofenceVersion = \"1.0.2\"\nhmsVersion = \"1.0.1\"\n- xpsVersion = \"1.0.1\"\n+ xpsVersion = \"1.0.2\"\n//gradle plugins\n- gradlePluginVersion = '4.0.1'\n+ gradlePluginVersion = '4.1.2'\ngoogleServicesPluginVersion = '4.3.3'\nbintrayPluginVersion = '1.8.4'\nmavenPluginVersion = '2.1'\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle/wrapper/gradle-wrapper.properties",
"new_path": "gradle/wrapper/gradle-wrapper.properties",
"diff": "-#Wed Feb 17 20:00:46 IST 2021\n+#Thu Apr 29 17:49:55 IST 2021\ndistributionBase=GRADLE_USER_HOME\ndistributionPath=wrapper/dists\nzipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-6.1.1-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-6.5-bin.zip\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-777): Updates SDK version for next release |
116,623 | 01.05.2021 15:10:27 | -19,080 | 739e6e89e339e8293fb877fc010b69ef7198e98b | task(SDK-603): Updates handling of Charged Event items | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -78,7 +78,7 @@ public class CTWebInterface {\n*/\n@JavascriptInterface\n@SuppressWarnings({\"JavaDoc\"})\n- public void pushChargedEvent(String chargeDetails, JSONArray items) {\n+ public void pushChargedEvent(String chargeDetails, String items) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\nLogger.d(\"CleverTap Instance is null.\");\n@@ -95,9 +95,14 @@ public class CTWebInterface {\nLogger.v(\"eventActions passed to CTWebInterface is null\");\nreturn;\n}\n- ArrayList<HashMap<String, Object>> itemsArrayList;\n+ ArrayList<HashMap<String, Object>> itemsArrayList = null;\nif (items != null) {\n- itemsArrayList = Utils.convertJSONArrayOfJSONObjectsToArrayListOfHashMaps(items);\n+ try {\n+ JSONArray itemsArray = new JSONArray(items);\n+ itemsArrayList = Utils.convertJSONArrayOfJSONObjectsToArrayListOfHashMaps(itemsArray);\n+ } catch (JSONException e) {\n+ Logger.v(\"Unable to parse items from WebView \" + e.getLocalizedMessage());\n+ }\n} else {\nreturn;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-603): Updates handling of Charged Event items |
116,623 | 01.05.2021 15:13:54 | -19,080 | 7f3b468f7f5b3d0863dd91c707a59e04c50649c8 | task(SDK-603): Updates handling of Webview Charged Event items | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -89,10 +89,11 @@ public class CTWebInterface {\nJSONObject chargeDetailsObject = new JSONObject(chargeDetails);\nchargeDetailsHashMap = Utils.convertJSONObjectToHashMap(chargeDetailsObject);\n} catch (JSONException e) {\n- Logger.v(\"Unable to parse eventActions from WebView \" + e.getLocalizedMessage());\n+ Logger.v(\"Unable to parse chargeDetails for Charged Event from WebView \" + e\n+ .getLocalizedMessage());\n}\n} else {\n- Logger.v(\"eventActions passed to CTWebInterface is null\");\n+ Logger.v(\"chargeDetails passed to CTWebInterface is null\");\nreturn;\n}\nArrayList<HashMap<String, Object>> itemsArrayList = null;\n@@ -101,7 +102,7 @@ public class CTWebInterface {\nJSONArray itemsArray = new JSONArray(items);\nitemsArrayList = Utils.convertJSONArrayOfJSONObjectsToArrayListOfHashMaps(itemsArray);\n} catch (JSONException e) {\n- Logger.v(\"Unable to parse items from WebView \" + e.getLocalizedMessage());\n+ Logger.v(\"Unable to parse items for Charged Event from WebView \" + e.getLocalizedMessage());\n}\n} else {\nreturn;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-603): Updates handling of Webview Charged Event items |
116,616 | 03.05.2021 16:36:11 | -19,080 | e44fc7ea5ff39f35ebc22d9d1555310ed3cb6478 | fix for npe on install referrer silent crash.SDK-780 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"diff": "@@ -171,8 +171,13 @@ class ActivityLifeCycleManager {\n.getMessage());\nreferrerClient.endConnection();\ncoreMetaData.setInstallReferrerDataSent(false);\n- }\n+ }catch (NullPointerException npe){\n+ config.getLogger().debug(config.getAccountId(),\n+ \"Install referrer client null pointer exception caused by Google Play Install Referrer library - \" + npe\n+ .getMessage());\nreferrerClient.endConnection();\n+ coreMetaData.setInstallReferrerDataSent(false);\n+ }\nbreak;\ncase InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:\n// API not available on the current Play Store app.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix for npe on install referrer silent crash.SDK-780 |
116,623 | 04.05.2021 12:45:51 | -19,080 | 9edea96f7b54a00b37a15e2bc3272c27e05c9c04 | task(SDK-777): Updates Javadoc for pushChargedEvent in CTWebInterface, adds CHANGELOG and README for release | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### May 4, 2021\n+\n+* [CleverTap Android SDK v4.1.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Xiaomi Push SDK v1.0.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n+\n### April 13, 2021\n* [CleverTap Android SDK v4.1.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -24,7 +24,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.1.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\"\n}\n```\n@@ -32,7 +32,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.1.0\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.1.1\", ext: 'aar')\n}\n```\n@@ -44,7 +44,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.1.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:20.2.4\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n@@ -69,7 +69,7 @@ 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.android.tools.build:gradle:4.1.2\"\nclasspath \"com.google.gms:google-services:4.3.3\"\n// NOTE: Do not place your application dependencies here; they belong\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -71,7 +71,7 @@ public class CTWebInterface {\n*\n* @param chargeDetails Stringified {@link JSONObject} of charged event details\n* Stringified {@link JSONObject} will be converted to a HashMap<String,Object>\n- * @param items A {@link JSONArray} which contains up to 15 JSON Object objects,\n+ * @param items A Stringified {@link JSONArray} which contains up to 15 JSON Object objects,\n* where each JSON Object object describes a particular item purchased\n* {@link JSONArray} of {@link JSONObject}s will be converted to an {@link ArrayList} of\n* {@link HashMap<String,Object>}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.1.1 (May 4, 2021)\n+* Adds `setFirstTabTitle` method to set the name of the first tab in App Inbox\n+* Adds `pushChargedEvent` to `CTWebInterface` class to allow raising Charged Event from JS\n+* Removes a `NoClassDefFoundError` raised in Android Kitkat (v4.4) - #168\n+* Removes a `NullPointerException` raised while handling `InstallReferrerClient` - #166\n+* Other bug fixes\n+\n### Version 4.1.0 (April 13, 2021)\n* Adds support for Android 11\n* Reduces the SDK size and added performance improvements\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.2\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.1.0\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:17.0.0\"\nimplementation \"androidx.work:work-runtime:2.3.4\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.0.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n+### Version 1.0.2 (May 4, 2021)\n+* Fixes the \"unspecified\" error during Gradle build\n+* Please do not use v1.0.1 and use this version instead\n+\n### Version 1.0.1 (April 13, 2021)\n* Updated Xiaomi Push SDK to v3.8.9\n* Supports CleverTap Android SDK v4.1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/EXAMPLES.md",
"new_path": "docs/EXAMPLES.md",
"diff": "@@ -200,6 +200,7 @@ public void inboxDidInitialize(){\ntabs.add(\"Others\");//We support upto 2 tabs only. Additional tabs will be ignored\nCTInboxStyleConfig styleConfig = new CTInboxStyleConfig();\n+ styleConfig.setFirstTabTitle(\"First Tab\");//By default, name of the first tab is \"ALL\"\nstyleConfig.setTabs(tabs);//Do not use this if you don't want to use tabs\nstyleConfig.setTabBackgroundColor(\"#FF0000\");//provide Hex code in string ONLY\nstyleConfig.setSelectedTabIndicatorColor(\"#0000FF\");\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.1.1 (May 4, 2021)\n+* Adds `setFirstTabTitle` method to set the name of the first tab in App Inbox\n+* Adds `pushChargedEvent` to `CTWebInterface` class to allow raising Charged Event from JS\n+* Removes a `NoClassDefFoundError` raised in Android Kitkat (v4.4) - #168\n+* Removes a `NullPointerException` raised while handling `InstallReferrerClient` - #166\n+* Other bug fixes\n+\n### Version 4.1.0 (April 13, 2021)\n* Adds support for Android 11\n* Reduces the SDK size and added performance improvements\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n+### Version 1.0.2 (May 4, 2021)\n+* Fixes the \"unspecified\" error during Gradle build\n+* Please do not use v1.0.1 and use this version instead\n+\n### Version 1.0.1 (April 13, 2021)\n* Updated Xiaomi Push SDK to v3.8.9\n* Supports CleverTap Android SDK v4.1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/EXAMPLES.md",
"new_path": "templates/EXAMPLES.md",
"diff": "@@ -200,6 +200,7 @@ public void inboxDidInitialize(){\ntabs.add(\"Others\");//We support upto 2 tabs only. Additional tabs will be ignored\nCTInboxStyleConfig styleConfig = new CTInboxStyleConfig();\n+ styleConfig.setFirstTabTitle(\"First Tab\");//By default, name of the first tab is \"ALL\"\nstyleConfig.setTabs(tabs);//Do not use this if you don't want to use tabs\nstyleConfig.setTabBackgroundColor(\"#FF0000\");//provide Hex code in string ONLY\nstyleConfig.setSelectedTabIndicatorColor(\"#0000FF\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-777): Updates Javadoc for pushChargedEvent in CTWebInterface, adds CHANGELOG and README for release |
116,623 | 04.05.2021 12:54:07 | -19,080 | 2b0204514e8c67b75f2034c95093d2e94a2bbd3f | task(SDK-777): Update Sample App for Inbox and WebView enhancements | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/assets/sampleHTMLCode.html",
"new_path": "sample/src/main/assets/sampleHTMLCode.html",
"diff": "<br /><br />\n<button onclick='invokeEventWithProps()'>Push Event Props</button>\n<br /><br />\n+<button onclick='invokeChargedEvent()'>Push Charged Event</button>\n+<br /><br />\n<button onclick='invokePushProfile()'>Push Profile</button>\n<br /><br />\n<button onclick='invokeAddProp()'>Add Property</button>\nvar props = {foo: 'xyz', lang: 'French'};\nCleverTap.pushEvent('WebView button clicked',JSON.stringify(props))\n}\n+ function invokeChargedEvent(){\n+ var chargeDetails = {Amount: 300, Payment: 'Card'};\n+ var items = [{Category: 'Books', Name: 'Book name', Quantity: 1},{Category: 'Clothes', Name: 'Cloth name', Quantity: 1},{Category: 'Food', Name: 'Food name', Quantity: 1}]\n+ CleverTap.pushChargedEvent(JSON.stringify(chargeDetails),JSON.stringify(items))\n+ }\nfunction invokePushProfile() {\nvar props = {foo: 'xyz', lang: 'French'};\nCleverTap.pushProfile(JSON.stringify(props))\nvar values = ['xyz123','xyz1234']\nCleverTap.setMultiValueForKey('foo', JSON.stringify(values));\n}\n-\n-\n-\n-\n-\n</script>\n</body>\n</html>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -149,6 +149,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nnavBarTitle = \"MY INBOX\"\nnavBarColor = \"#FFFFFF\"\ninboxBackgroundColor = \"#00FF00\"\n+ firstTabTitle = \"First Tab\"\ncleverTapAPI?.showAppInbox(this) //Opens activity With Tabs\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-777): Update Sample App for Inbox and WebView enhancements |
116,612 | 27.05.2021 16:25:44 | -19,080 | 9cb57358163e2e18bccb5b450d5c77d26665216c | fix(ANR): add threading annotations | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -10,6 +10,7 @@ import android.database.sqlite.SQLiteOpenHelper;\nimport android.database.sqlite.SQLiteStatement;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\n@@ -162,6 +163,7 @@ public class DBAdapter {\n}\n}\n+\n@SuppressLint(\"UsableSpace\")\nboolean belowMemThreshold() {\n//noinspection SimplifiableIfStatement\n@@ -631,43 +633,7 @@ public class DBAdapter {\n}\n}\n- /**\n- * Adds a JSON string to the DB.\n- *\n- * @param obj the JSON to record\n- * @param table the table to insert into\n- * @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n- */\n- synchronized int storeObject(JSONObject obj, Table table) {\n- if (!this.belowMemThreshold()) {\n- Logger.v(\"There is not enough space left on the device to store data, data discarded\");\n- return DB_OUT_OF_MEMORY_ERROR;\n- }\n-\n- final String tableName = table.getName();\n-\n- long count = DB_UPDATE_ERROR;\n-\n- try {\n- final SQLiteDatabase db = dbHelper.getWritableDatabase();\n-\n- final ContentValues cv = new ContentValues();\n- cv.put(KEY_DATA, obj.toString());\n- cv.put(KEY_CREATED_AT, System.currentTimeMillis());\n- db.insert(tableName, null, cv);\n-\n- String sql = \"SELECT COUNT(*) FROM \" + tableName;\n- SQLiteStatement statement = db.compileStatement(sql);\n- count = statement.simpleQueryForLong();\n- } catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\n- dbHelper.deleteDatabase();\n- } finally {\n- dbHelper.close();\n- }\n- return (int) count;\n- }\n-\n+ // TODO: remove comment this is safe\npublic synchronized void storePushNotificationId(String id, long ttl) {\nif (id == null) {\n@@ -701,37 +667,13 @@ public class DBAdapter {\n}\n}\n- /**\n- * Adds a String timestamp representing uninstall flag to the DB.\n- */\n- public synchronized void storeUninstallTimestamp() {\n-\n- if (!this.belowMemThreshold()) {\n- getConfigLogger().verbose(\"There is not enough space left on the device to store data, data discarded\");\n- return;\n- }\n- final String tableName = Table.UNINSTALL_TS.getName();\n-\n- try {\n- final SQLiteDatabase db = dbHelper.getWritableDatabase();\n- final ContentValues cv = new ContentValues();\n- cv.put(KEY_CREATED_AT, System.currentTimeMillis());\n- db.insert(tableName, null, cv);\n- } catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\n- dbHelper.deleteDatabase();\n- } finally {\n- dbHelper.close();\n- }\n-\n- }\n-\n/**\n* Adds a JSON string representing to the DB.\n*\n* @param obj the JSON to record\n* @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n*/\n+ @WorkerThread\npublic synchronized long storeUserProfile(String id, JSONObject obj) {\nif (id == null) {\n@@ -762,6 +704,34 @@ public class DBAdapter {\nreturn ret;\n}\n+ /**\n+ * Adds a String timestamp representing uninstall flag to the DB.\n+ */\n+ public synchronized void storeUninstallTimestamp() {\n+\n+ if (!this.belowMemThreshold()) {\n+ getConfigLogger().verbose(\"There is not enough space left on the device to store data, data discarded\");\n+ return;\n+ }\n+ final String tableName = Table.UNINSTALL_TS.getName();\n+\n+ try {\n+ final SQLiteDatabase db = dbHelper.getWritableDatabase();\n+ final ContentValues cv = new ContentValues();\n+ cv.put(KEY_CREATED_AT, System.currentTimeMillis());\n+ db.insert(tableName, null, cv);\n+ } catch (final SQLiteException e) {\n+ getConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\n+ dbHelper.deleteDatabase();\n+ } finally {\n+ dbHelper.close();\n+ }\n+\n+ }\n+ // TODO: remove comment this is safe\n+\n+ // TODO: remove comment this is safe\n+ @WorkerThread\npublic synchronized void updatePushNotificationIds(String[] ids) {\nif (ids.length == 0) {\nreturn;\n@@ -793,6 +763,45 @@ public class DBAdapter {\n}\n}\n+ /**\n+ * Adds a JSON string to the DB.\n+ *\n+ * @param obj the JSON to record\n+ * @param table the table to insert into\n+ * @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n+ */\n+ // TODO: remove comment this is safe\n+ @WorkerThread\n+ synchronized int storeObject(JSONObject obj, Table table) {\n+ if (!this.belowMemThreshold()) {\n+ Logger.v(\"There is not enough space left on the device to store data, data discarded\");\n+ return DB_OUT_OF_MEMORY_ERROR;\n+ }\n+\n+ final String tableName = table.getName();\n+\n+ long count = DB_UPDATE_ERROR;\n+\n+ try {\n+ final SQLiteDatabase db = dbHelper.getWritableDatabase();\n+\n+ final ContentValues cv = new ContentValues();\n+ cv.put(KEY_DATA, obj.toString());\n+ cv.put(KEY_CREATED_AT, System.currentTimeMillis());\n+ db.insert(tableName, null, cv);\n+\n+ String sql = \"SELECT COUNT(*) FROM \" + tableName;\n+ SQLiteStatement statement = db.compileStatement(sql);\n+ count = statement.simpleQueryForLong();\n+ } catch (final SQLiteException e) {\n+ getConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\n+ dbHelper.deleteDatabase();\n+ } finally {\n+ dbHelper.close();\n+ }\n+ return (int) count;\n+ }\n+\n/**\n* Stores a list of inbox messages\n*\n@@ -826,6 +835,7 @@ public class DBAdapter {\n}\n}\n+ @WorkerThread\n@SuppressWarnings(\"BooleanMethodIsAlwaysInverted\")\nprivate boolean belowMemThreshold() {\nreturn dbHelper.belowMemThreshold();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.db;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n@@ -136,7 +137,9 @@ public class DBManager extends BaseDatabaseManager {\n}\n}\n+ // TODO: remove comment this is safe\n//Event\n+ @WorkerThread\n@Override\npublic void queueEventToDB(final Context context, final JSONObject event, final int type) {\nDBAdapter.Table table = (type == Constants.PROFILE_EVENT) ? DBAdapter.Table.PROFILE_EVENTS\n@@ -144,6 +147,8 @@ public class DBManager extends BaseDatabaseManager {\nqueueEventInternal(context, event, table);\n}\n+ // TODO: remove comment this is safe\n+ @WorkerThread\n@Override\npublic void queuePushNotificationViewedEventToDB(final Context context, final JSONObject event) {\nqueueEventInternal(context, event, DBAdapter.Table.PUSH_NOTIFICATION_VIEWED);\n@@ -170,6 +175,8 @@ public class DBManager extends BaseDatabaseManager {\nreturn cursor;\n}\n+ // TODO: remove comment this is safe\n+ @WorkerThread\nprivate void queueEventInternal(final Context context, final JSONObject event, DBAdapter.Table table) {\nsynchronized (ctLockManager.getEventLock()) {\nDBAdapter adapter = loadDBAdapter(context);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(ANR): add threading annotations SDK-842 |
116,612 | 27.05.2021 17:19:40 | -19,080 | 48b1e4f995ee218f79698f58ba60816e23975e00 | fix(ANR): add TODOs for ANR fix | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -164,6 +164,7 @@ public class DBAdapter {\n}\n+ // TODO: remove comment this is safe\n@SuppressLint(\"UsableSpace\")\nboolean belowMemThreshold() {\n//noinspection SimplifiableIfStatement\n@@ -173,6 +174,7 @@ public class DBAdapter {\nreturn true;\n}\n+ // TODO: remove comment this is safe\nvoid deleteDatabase() {\nclose();\n//noinspection ResultOfMethodCallIgnored\n@@ -321,41 +323,6 @@ public class DBAdapter {\ndbHelper = new DatabaseHelper(context, dbName);\n}\n- synchronized void cleanUpPushNotifications() {\n- //In Push_Notifications, KEY_CREATED_AT is stored as a future epoch, i.e. currentTimeMillis() + ttl,\n- //so comparing to the current time for removal is correct\n- cleanInternal(Table.PUSH_NOTIFICATIONS, 0);\n- }\n-\n- /**\n- * Removes sent events with an _id <= last_id from table\n- *\n- * @param lastId the last id to delete\n- * @param table the table to remove events\n- */\n- synchronized void cleanupEventsFromLastId(String lastId, Table table) {\n- final String tName = table.getName();\n-\n- try {\n- final SQLiteDatabase db = dbHelper.getWritableDatabase();\n- db.delete(tName, \"_id <= \" + lastId, null);\n- } catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Error removing sent data from table \" + tName + \" Recreating DB\");\n- deleteDB();\n- } finally {\n- dbHelper.close();\n- }\n- }\n-\n- /**\n- * Removes stale events.\n- *\n- * @param table the table to remove events\n- */\n- synchronized void cleanupStaleEvents(Table table) {\n- cleanInternal(table, DATA_EXPIRATION);\n- }\n-\n/**\n* Deletes the inbox message for given messageId\n*\n@@ -363,6 +330,7 @@ public class DBAdapter {\n* @return boolean value based on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n+ // TODO: remove comment this is safe\npublic synchronized boolean deleteMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n@@ -382,62 +350,12 @@ public class DBAdapter {\n}\n}\n+ // TODO: remove comment this is safe\npublic synchronized boolean doesPushNotificationIdExist(String id) {\nreturn id.equals(fetchPushNotificationId(id));\n}\n- /**\n- * Returns a JSONObject keyed with the lastId retrieved and a value of a JSONArray of the retrieved JSONObject\n- * events\n- *\n- * @param table the table to read from\n- * @return JSONObject containing the max row ID and a JSONArray of the JSONObject events or null\n- */\n- synchronized JSONObject fetchEvents(Table table, final int limit) {\n- final String tName = table.getName();\n- Cursor cursor = null;\n- String lastId = null;\n-\n- final JSONArray events = new JSONArray();\n-\n- try {\n- final SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.query(tName, null, null, null, null, null, KEY_CREATED_AT + \" ASC\", String.valueOf(limit));\n-\n- while (cursor.moveToNext()) {\n- if (cursor.isLast()) {\n- lastId = cursor.getString(cursor.getColumnIndex(\"_id\"));\n- }\n- try {\n- final JSONObject j = new JSONObject(cursor.getString(cursor.getColumnIndex(KEY_DATA)));\n- events.put(j);\n- } catch (final JSONException e) {\n- // Ignore\n- }\n- }\n- } catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Could not fetch records out of database \" + tName + \".\", e);\n- lastId = null;\n- } finally {\n- dbHelper.close();\n- if (cursor != null) {\n- cursor.close();\n- }\n- }\n-\n- if (lastId != null) {\n- try {\n- final JSONObject ret = new JSONObject();\n- ret.put(lastId, events);\n- return ret;\n- } catch (JSONException e) {\n- // ignore\n- }\n- }\n-\n- return null;\n- }\n-\n+ // TODO: remove comment this is safe\npublic synchronized String[] fetchPushNotificationIds() {\nif (!rtlDirtyFlag) {\nreturn new String[0];\n@@ -468,6 +386,7 @@ public class DBAdapter {\nreturn pushIds.toArray(new String[0]);\n}\n+ // TODO: remove comment this is safe\npublic synchronized JSONObject fetchUserProfileById(final String id) {\nif (id == null) {\n@@ -502,6 +421,7 @@ public class DBAdapter {\nreturn profile;\n}\n+ // TODO: remove comment this is safe\npublic synchronized long getLastUninstallTimestamp() {\nfinal String tName = Table.UNINSTALL_TS.getName();\nCursor cursor = null;\n@@ -530,6 +450,7 @@ public class DBAdapter {\n* @param userId String userid\n* @return ArrayList of {@link CTMessageDAO}\n*/\n+ // TODO: check pushNotificationClickedEvent in Analytics Manager, seems like a danger\npublic synchronized ArrayList<CTMessageDAO> getMessages(String userId) {\nfinal String tName = Table.INBOX_MESSAGES.getName();\nCursor cursor;\n@@ -573,6 +494,7 @@ public class DBAdapter {\n* @return boolean value depending on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n+ // TODO: remove comment this is safe\npublic synchronized boolean markReadMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n@@ -594,28 +516,10 @@ public class DBAdapter {\n}\n}\n- /**\n- * Removes all events from table\n- *\n- * @param table the table to remove events\n- */\n- synchronized void removeEvents(Table table) {\n- final String tName = table.getName();\n-\n- try {\n- final SQLiteDatabase db = dbHelper.getWritableDatabase();\n- db.delete(tName, null, null);\n- } catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Error removing all events from table \" + tName + \" Recreating DB\");\n- deleteDB();\n- } finally {\n- dbHelper.close();\n- }\n- }\n-\n/**\n* remove the user profile with id from the db.\n*/\n+ // TODO: remove comment this is safe\npublic synchronized void removeUserProfile(String id) {\nif (id == null) {\n@@ -633,38 +537,30 @@ public class DBAdapter {\n}\n}\n+ /**\n+ * Adds a String timestamp representing uninstall flag to the DB.\n+ */\n// TODO: remove comment this is safe\n- public synchronized void storePushNotificationId(String id, long ttl) {\n-\n- if (id == null) {\n- return;\n- }\n+ public synchronized void storeUninstallTimestamp() {\nif (!this.belowMemThreshold()) {\ngetConfigLogger().verbose(\"There is not enough space left on the device to store data, data discarded\");\nreturn;\n}\n- final String tableName = Table.PUSH_NOTIFICATIONS.getName();\n-\n- if (ttl <= 0) {\n- ttl = System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL;\n- }\n+ final String tableName = Table.UNINSTALL_TS.getName();\ntry {\nfinal SQLiteDatabase db = dbHelper.getWritableDatabase();\nfinal ContentValues cv = new ContentValues();\n- cv.put(KEY_DATA, id);\n- cv.put(KEY_CREATED_AT, ttl);\n- cv.put(IS_READ, 0);\n+ cv.put(KEY_CREATED_AT, System.currentTimeMillis());\ndb.insert(tableName, null, cv);\n- rtlDirtyFlag = true;\n- Logger.v(\"Stored PN - \" + id + \" with TTL - \" + ttl);\n} catch (final SQLiteException e) {\ngetConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\ndbHelper.deleteDatabase();\n} finally {\ndbHelper.close();\n}\n+\n}\n/**\n@@ -673,6 +569,7 @@ public class DBAdapter {\n* @param obj the JSON to record\n* @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n*/\n+ // TODO: remove comment this is safe\n@WorkerThread\npublic synchronized long storeUserProfile(String id, JSONObject obj) {\n@@ -705,30 +602,165 @@ public class DBAdapter {\n}\n/**\n- * Adds a String timestamp representing uninstall flag to the DB.\n+ * Stores a list of inbox messages\n+ *\n+ * @param inboxMessages ArrayList of type {@link CTMessageDAO}\n*/\n- public synchronized void storeUninstallTimestamp() {\n+ // TODO: check pushNotificationClickedEvent in Analytics Manager, seems like a danger\n+ @WorkerThread\n+ public synchronized void upsertMessages(ArrayList<CTMessageDAO> inboxMessages) {\n+ if (!this.belowMemThreshold()) {\n+ Logger.v(\"There is not enough space left on the device to store data, data discarded\");\n+ return;\n+ }\n+\n+ try {\n+ final SQLiteDatabase db = dbHelper.getWritableDatabase();\n+ for (CTMessageDAO messageDAO : inboxMessages) {\n+ final ContentValues cv = new ContentValues();\n+ cv.put(_ID, messageDAO.getId());\n+ cv.put(KEY_DATA, messageDAO.getJsonData().toString());\n+ cv.put(WZRKPARAMS, messageDAO.getWzrkParams().toString());\n+ cv.put(CAMPAIGN, messageDAO.getCampaignId());\n+ cv.put(TAGS, messageDAO.getTags());\n+ cv.put(IS_READ, messageDAO.isRead());\n+ cv.put(EXPIRES, messageDAO.getExpires());\n+ cv.put(KEY_CREATED_AT, messageDAO.getDate());\n+ cv.put(USER_ID, messageDAO.getUserId());\n+ db.insertWithOnConflict(Table.INBOX_MESSAGES.getName(), null, cv, SQLiteDatabase.CONFLICT_REPLACE);\n+ }\n+ } catch (final SQLiteException e) {\n+ getConfigLogger().verbose(\"Error adding data to table \" + Table.INBOX_MESSAGES.getName());\n+ } finally {\n+ dbHelper.close();\n+ }\n+ }\n+\n+ // TODO: remove comment this is safe\n+ synchronized void cleanUpPushNotifications() {\n+ //In Push_Notifications, KEY_CREATED_AT is stored as a future epoch, i.e. currentTimeMillis() + ttl,\n+ //so comparing to the current time for removal is correct\n+ cleanInternal(Table.PUSH_NOTIFICATIONS, 0);\n+ }\n+\n+ /**\n+ * Removes sent events with an _id <= last_id from table\n+ *\n+ * @param lastId the last id to delete\n+ * @param table the table to remove events\n+ */\n+ // TODO: remove comment this is safe\n+ @WorkerThread\n+ synchronized void cleanupEventsFromLastId(String lastId, Table table) {\n+ final String tName = table.getName();\n+\n+ try {\n+ final SQLiteDatabase db = dbHelper.getWritableDatabase();\n+ db.delete(tName, \"_id <= \" + lastId, null);\n+ } catch (final SQLiteException e) {\n+ getConfigLogger().verbose(\"Error removing sent data from table \" + tName + \" Recreating DB\");\n+ deleteDB();\n+ } finally {\n+ dbHelper.close();\n+ }\n+ }\n+\n+ // TODO: remove comment this is safe\n+ public synchronized void storePushNotificationId(String id, long ttl) {\n+\n+ if (id == null) {\n+ return;\n+ }\nif (!this.belowMemThreshold()) {\ngetConfigLogger().verbose(\"There is not enough space left on the device to store data, data discarded\");\nreturn;\n}\n- final String tableName = Table.UNINSTALL_TS.getName();\n+ final String tableName = Table.PUSH_NOTIFICATIONS.getName();\n+\n+ if (ttl <= 0) {\n+ ttl = System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL;\n+ }\ntry {\nfinal SQLiteDatabase db = dbHelper.getWritableDatabase();\nfinal ContentValues cv = new ContentValues();\n- cv.put(KEY_CREATED_AT, System.currentTimeMillis());\n+ cv.put(KEY_DATA, id);\n+ cv.put(KEY_CREATED_AT, ttl);\n+ cv.put(IS_READ, 0);\ndb.insert(tableName, null, cv);\n+ rtlDirtyFlag = true;\n+ Logger.v(\"Stored PN - \" + id + \" with TTL - \" + ttl);\n} catch (final SQLiteException e) {\ngetConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\ndbHelper.deleteDatabase();\n} finally {\ndbHelper.close();\n}\n+ }\n+ /**\n+ * Removes stale events.\n+ *\n+ * @param table the table to remove events\n+ */\n+ // TODO: remove comment this is safe\n+ synchronized void cleanupStaleEvents(Table table) {\n+ cleanInternal(table, DATA_EXPIRATION);\n}\n+\n+ /**\n+ * Returns a JSONObject keyed with the lastId retrieved and a value of a JSONArray of the retrieved JSONObject\n+ * events\n+ *\n+ * @param table the table to read from\n+ * @return JSONObject containing the max row ID and a JSONArray of the JSONObject events or null\n+ */\n// TODO: remove comment this is safe\n+ synchronized JSONObject fetchEvents(Table table, final int limit) {\n+ final String tName = table.getName();\n+ Cursor cursor = null;\n+ String lastId = null;\n+\n+ final JSONArray events = new JSONArray();\n+\n+ try {\n+ final SQLiteDatabase db = dbHelper.getReadableDatabase();\n+ cursor = db.query(tName, null, null, null, null, null, KEY_CREATED_AT + \" ASC\", String.valueOf(limit));\n+\n+ while (cursor.moveToNext()) {\n+ if (cursor.isLast()) {\n+ lastId = cursor.getString(cursor.getColumnIndex(\"_id\"));\n+ }\n+ try {\n+ final JSONObject j = new JSONObject(cursor.getString(cursor.getColumnIndex(KEY_DATA)));\n+ events.put(j);\n+ } catch (final JSONException e) {\n+ // Ignore\n+ }\n+ }\n+ } catch (final SQLiteException e) {\n+ getConfigLogger().verbose(\"Could not fetch records out of database \" + tName + \".\", e);\n+ lastId = null;\n+ } finally {\n+ dbHelper.close();\n+ if (cursor != null) {\n+ cursor.close();\n+ }\n+ }\n+\n+ if (lastId != null) {\n+ try {\n+ final JSONObject ret = new JSONObject();\n+ ret.put(lastId, events);\n+ return ret;\n+ } catch (JSONException e) {\n+ // ignore\n+ }\n+ }\n+\n+ return null;\n+ }\n// TODO: remove comment this is safe\n@WorkerThread\n@@ -803,44 +835,33 @@ public class DBAdapter {\n}\n/**\n- * Stores a list of inbox messages\n+ * Removes all events from table\n*\n- * @param inboxMessages ArrayList of type {@link CTMessageDAO}\n+ * @param table the table to remove events\n*/\n- public synchronized void upsertMessages(ArrayList<CTMessageDAO> inboxMessages) {\n- if (!this.belowMemThreshold()) {\n- Logger.v(\"There is not enough space left on the device to store data, data discarded\");\n- return;\n- }\n+ // TODO: remove comment this is safe\n+ synchronized void removeEvents(Table table) {\n+ final String tName = table.getName();\ntry {\nfinal SQLiteDatabase db = dbHelper.getWritableDatabase();\n- for (CTMessageDAO messageDAO : inboxMessages) {\n- final ContentValues cv = new ContentValues();\n- cv.put(_ID, messageDAO.getId());\n- cv.put(KEY_DATA, messageDAO.getJsonData().toString());\n- cv.put(WZRKPARAMS, messageDAO.getWzrkParams().toString());\n- cv.put(CAMPAIGN, messageDAO.getCampaignId());\n- cv.put(TAGS, messageDAO.getTags());\n- cv.put(IS_READ, messageDAO.isRead());\n- cv.put(EXPIRES, messageDAO.getExpires());\n- cv.put(KEY_CREATED_AT, messageDAO.getDate());\n- cv.put(USER_ID, messageDAO.getUserId());\n- db.insertWithOnConflict(Table.INBOX_MESSAGES.getName(), null, cv, SQLiteDatabase.CONFLICT_REPLACE);\n- }\n+ db.delete(tName, null, null);\n} catch (final SQLiteException e) {\n- getConfigLogger().verbose(\"Error adding data to table \" + Table.INBOX_MESSAGES.getName());\n+ getConfigLogger().verbose(\"Error removing all events from table \" + tName + \" Recreating DB\");\n+ deleteDB();\n} finally {\ndbHelper.close();\n}\n}\n+ // TODO: remove comment this is safe\n@WorkerThread\n@SuppressWarnings(\"BooleanMethodIsAlwaysInverted\")\nprivate boolean belowMemThreshold() {\nreturn dbHelper.belowMemThreshold();\n}\n+ // TODO: remove comment this is safe\nprivate void cleanInternal(Table table, long expiration) {\nfinal long time = (System.currentTimeMillis() - expiration) / 1000;\n@@ -858,6 +879,7 @@ public class DBAdapter {\n}\n+ // TODO: remove comment this is safe\nprivate void deleteDB() {\ndbHelper.deleteDatabase();\n}\n@@ -889,6 +911,7 @@ public class DBAdapter {\nreturn this.config.getLogger();\n}\n+ // TODO: remove comment this is safe\nprivate static String getDatabaseName(CleverTapInstanceConfig config) {\nreturn config.isDefaultInstance() ? DATABASE_NAME : DATABASE_NAME + \"_\" + config.getAccountId();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"diff": "@@ -27,6 +27,8 @@ public class DBManager extends BaseDatabaseManager {\nthis.ctLockManager = ctLockManager;\n}\n+ // TODO: check PushAmpResponse constructor seems like a danger\n+ @WorkerThread\n@Override\npublic DBAdapter loadDBAdapter(final Context context) {\nif (dbAdapter == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.inbox;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -155,6 +156,7 @@ public class CTInboxController {\n}\n// always call async\n+ @WorkerThread\npublic boolean updateMessages(final JSONArray inboxMessages) {\nboolean haveUpdates = false;\nArrayList<CTMessageDAO> newMessages = new ArrayList<>();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(ANR): add TODOs for ANR fix SDK-842 |
116,616 | 27.05.2021 17:50:50 | -19,080 | f29ffab02bf48ac4ea612bc92e4c49434859c88f | Adds todo for anr in LocalDataStore | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"diff": "@@ -3,8 +3,12 @@ package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n+\n+import androidx.annotation.MainThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\n+\nimport com.clevertap.android.sdk.db.DBAdapter;\nimport com.clevertap.android.sdk.events.EventDetail;\nimport java.util.ArrayList;\n@@ -51,10 +55,12 @@ public class LocalDataStore {\ninflateLocalProfileAsync(context);\n}\n+ // TODO: remove comment this is safe\npublic void changeUser() {\nresetLocalProfileSync();\n}\n+ @MainThread\nEventDetail getEventDetail(String eventName) {\ntry {\nif (!isPersonalisationEnabled()) {\n@@ -103,6 +109,7 @@ public class LocalDataStore {\nreturn _getProfileProperty(key);\n}\n+ // TODO: remove comment this is safe\npublic void persistEvent(Context context, JSONObject event, int type) {\nif (event == null) {\n@@ -118,6 +125,7 @@ public class LocalDataStore {\n}\n}\n+ // TODO: remove comment this is safe\nvoid removeProfileField(String key) {\nremoveProfileField(key, false, true);\n}\n@@ -129,6 +137,7 @@ public class LocalDataStore {\nremoveProfileFields(fields, false);\n}\n+ // TODO: remove comment this is safe\npublic void setDataSyncFlag(JSONObject event) {\ntry {\n// Check the personalisation flag\n@@ -176,14 +185,17 @@ public class LocalDataStore {\n}\n}\n+ // TODO: remove comment this is safe\nvoid setProfileField(String key, Object value) {\nsetProfileField(key, value, false, true);\n}\n+ // TODO: remove comment this is safe\nvoid setProfileFields(JSONObject fields) {\nsetProfileFields(fields, false);\n}\n+ //TODO: Need to check again\n@SuppressWarnings(\"rawtypes\")\npublic void syncWithUpstream(Context context, JSONObject response) {\ntry {\n@@ -270,6 +282,7 @@ public class LocalDataStore {\n}\n}\n+ // TODO: remove comment this is safe\nprivate Object _getProfileProperty(String key) {\nif (key == null) {\n@@ -287,6 +300,7 @@ public class LocalDataStore {\n}\n}\n+ // TODO: remove comment this is safe\nprivate void _removeProfileField(String key) {\nif (key == null) {\n@@ -366,6 +380,7 @@ public class LocalDataStore {\nreturn this.config.getLogger();\n}\n+ // TODO: remove comment this is safe\nprivate int getIntFromPrefs(String rawKey, int defaultValue) {\nif (this.config.isDefaultInstance()) {\nint dummy = -1000;\n@@ -390,6 +405,7 @@ public class LocalDataStore {\n}\n}\n+ @MainThread\nprivate String getStringFromPrefs(String rawKey, String defaultValue, String nameSpace) {\nif (this.config.isDefaultInstance()) {\nString _new = StorageHelper\n@@ -405,7 +421,7 @@ public class LocalDataStore {\n}\n// local cache/profile key expiry handling\n-\n+ // TODO: remove comment this is safe\nprivate void inflateLocalProfileAsync(final Context context) {\nfinal String accountID = this.config.getAccountId();\n@@ -462,6 +478,7 @@ public class LocalDataStore {\n@SuppressWarnings(\"ConstantConditions\")\n@SuppressLint(\"CommitPrefEdits\")\n+ // TODO: remove comment this is safe\nprivate void persistEvent(Context context, JSONObject event) {\ntry {\nString evtName = event.getString(\"evtName\");\n@@ -489,7 +506,7 @@ public class LocalDataStore {\ngetConfigLogger().verbose(getConfigAccountId(), \"Failed to persist event locally\", t);\n}\n}\n-\n+ // TODO: remove comment this is safe\nprivate void persistLocalProfileAsync() {\nfinal String profileID = this.config.getAccountId();\n@@ -507,6 +524,7 @@ public class LocalDataStore {\n});\n}\n+ // TODO: remove comment this is safe\nprivate void postAsyncSafely(final String name, final Runnable runnable) {\ntry {\nfinal boolean executeSync = Thread.currentThread().getId() == EXECUTOR_THREAD_ID;\n@@ -604,7 +622,7 @@ public class LocalDataStore {\n}\npersistLocalProfileAsync();\n}\n-\n+ // TODO: remove comment this is safe\nprivate void resetLocalProfileSync() {\nsynchronized (PROFILE_EXPIRY_MAP) {\n@@ -623,6 +641,7 @@ public class LocalDataStore {\nStorageHelper.putInt(context, storageKeyWithSuffix(\"local_cache_expires_in\"), ttl);\n}\n+ // TODO: remove comment this is safe\nprivate void setProfileField(String key, Object value, Boolean fromUpstream, boolean persist) {\nif (key == null || value == null) {\nreturn;\n@@ -642,6 +661,7 @@ public class LocalDataStore {\n}\n}\n+ // TODO: remove comment this is safe\n@SuppressWarnings(\"rawtypes\")\nprivate void setProfileFields(JSONObject fields, Boolean fromUpstream) {\nif (fields == null) {\n@@ -676,6 +696,7 @@ public class LocalDataStore {\nreturn (value == null) ? \"\" : value.toString();\n}\n+ //TODO: Need to check again\n@SuppressWarnings({\"rawtypes\", \"ConstantConditions\"})\nprivate JSONObject syncEventsFromUpstream(Context context, JSONObject events) {\ntry {\n@@ -758,7 +779,7 @@ public class LocalDataStore {\nreturn null;\n}\n}\n-\n+ //TODO: Need to check again\n@SuppressWarnings(\"rawtypes\")\nprivate JSONObject syncProfile(JSONObject remoteProfile) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adds todo for anr in LocalDataStore |
116,616 | 27.05.2021 17:56:41 | -19,080 | 759d2faa7720391decbf18045f467f2102cc6876 | Adds todo for anr in FileUtils | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"diff": "@@ -27,6 +27,7 @@ public class FileUtils {\nthis.config = config;\n}\n+ //TODO: remove comment this is safe\npublic void deleteDirectory(String dirName) {\nif (TextUtils.isEmpty(dirName)) {\nreturn;\n@@ -50,6 +51,7 @@ public class FileUtils {\n}\n}\n+ //TODO: remove comment this is safe\npublic void deleteFile(String fileName) {\nif (TextUtils.isEmpty(fileName)) {\nreturn;\n@@ -72,6 +74,7 @@ public class FileUtils {\n}\n}\n+ //TODO: remove comment this is safe\npublic String readFromFile(String fileNameWithPath) throws IOException {\nString content = \"\";\n@@ -118,6 +121,7 @@ public class FileUtils {\nreturn content;\n}\n+ //TODO: Need to check again\npublic void writeJsonToFile(String dirName,\nString fileName, JSONObject jsonObject) throws IOException {\nFileWriter writer = null;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adds todo for anr in FileUtils |
116,612 | 28.05.2021 11:50:07 | -19,080 | 785033a72d17fd62fb0b41e69978bd7384b14d79 | fix(app_inbox): add threading annotations | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "package com.clevertap.android.sdk;\nimport android.content.Context;\n+import androidx.annotation.AnyThread;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n@@ -118,6 +120,7 @@ public class ControllerManager {\nthis.pushProviders = pushProviders;\n}\n+ @AnyThread\npublic void initializeInbox() {\nif (config.isAnalyticsOnly()) {\nconfig.getLogger()\n@@ -135,6 +138,7 @@ public class ControllerManager {\n}\n// always call async\n+ @WorkerThread\nprivate void _initializeInbox() {\nsynchronized (ctLockManager.getInboxControllerLock()) {\nif (getCTInboxController() != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -10,6 +10,7 @@ import android.database.sqlite.SQLiteOpenHelper;\nimport android.database.sqlite.SQLiteStatement;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\n@@ -361,6 +362,7 @@ public class DBAdapter {\n* @return boolean value based on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n+ @WorkerThread\npublic synchronized boolean deleteMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n@@ -528,6 +530,7 @@ public class DBAdapter {\n* @param userId String userid\n* @return ArrayList of {@link CTMessageDAO}\n*/\n+ @WorkerThread\npublic synchronized ArrayList<CTMessageDAO> getMessages(String userId) {\nfinal String tName = Table.INBOX_MESSAGES.getName();\nCursor cursor;\n@@ -571,6 +574,7 @@ public class DBAdapter {\n* @return boolean value depending on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n+ @WorkerThread\npublic synchronized boolean markReadMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"diff": "package com.clevertap.android.sdk.inbox;\n+import androidx.annotation.AnyThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -37,6 +39,7 @@ public class CTInboxController {\nprivate final CleverTapInstanceConfig config;\n// always call async\n+ @WorkerThread\npublic CTInboxController(CleverTapInstanceConfig config, String guid, DBAdapter adapter,\nCTLockManager ctLockManager,\nBaseCallbackManager callbackManager,\n@@ -54,6 +57,7 @@ public class CTInboxController {\nreturn getMessages().size();\n}\n+ @AnyThread\npublic void deleteInboxMessage(final CTInboxMessage message) {\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"deleteInboxMessage\", new Callable<Void>() {\n@@ -70,30 +74,12 @@ public class CTInboxController {\n});\n}\n- boolean _deleteMessageWithId(final String messageId) {\n- CTMessageDAO messageDAO = findMessageById(messageId);\n- if (messageDAO == null) {\n- return false;\n- }\n- synchronized (messagesLock) {\n- this.messages.remove(messageDAO);\n- }\n-\n- Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n- task.execute(\"RunDeleteMessage\",new Callable<Void>() {\n- @Override\n- public Void call() {\n- dbAdapter.deleteMessageForId(messageId, userId);\n- return null;\n- }\n- });\n- return true;\n- }\n-\n+ @AnyThread\npublic CTMessageDAO getMessageForId(String messageId) {\nreturn findMessageById(messageId);\n}\n+ @AnyThread\npublic ArrayList<CTMessageDAO> getMessages() {\nsynchronized (messagesLock) {\ntrimMessages();\n@@ -101,6 +87,7 @@ public class CTInboxController {\n}\n}\n+ @AnyThread\npublic ArrayList<CTMessageDAO> getUnreadMessages() {\nArrayList<CTMessageDAO> unread = new ArrayList<>();\nsynchronized (messagesLock) {\n@@ -114,6 +101,7 @@ public class CTInboxController {\nreturn unread;\n}\n+ @AnyThread\npublic void markReadInboxMessage(final CTInboxMessage message) {\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"markReadInboxMessage\", new Callable<Void>() {\n@@ -130,31 +118,13 @@ public class CTInboxController {\n});\n}\n- boolean _markReadForMessageWithId(final String messageId) {\n- CTMessageDAO messageDAO = findMessageById(messageId);\n- if (messageDAO == null) {\n- return false;\n- }\n-\n- synchronized (messagesLock) {\n- messageDAO.setRead(1);\n- }\n- Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n- task.execute(\"RunMarkMessageRead\", new Callable<Void>() {\n- @Override\n- public Void call() {\n- dbAdapter.markReadMessageForId(messageId, userId);\n- return null;\n- }\n- });\n- return true;\n- }\n-\n+ @AnyThread\npublic int unreadCount() {\nreturn getUnreadMessages().size();\n}\n// always call async\n+ @WorkerThread\npublic boolean updateMessages(final JSONArray inboxMessages) {\nboolean haveUpdates = false;\nArrayList<CTMessageDAO> newMessages = new ArrayList<>();\n@@ -193,6 +163,51 @@ public class CTInboxController {\nreturn haveUpdates;\n}\n+ @AnyThread\n+ boolean _deleteMessageWithId(final String messageId) {\n+ CTMessageDAO messageDAO = findMessageById(messageId);\n+ if (messageDAO == null) {\n+ return false;\n+ }\n+ synchronized (messagesLock) {\n+ this.messages.remove(messageDAO);\n+ }\n+\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"RunDeleteMessage\", new Callable<Void>() {\n+ @Override\n+ @WorkerThread\n+ public Void call() {\n+ dbAdapter.deleteMessageForId(messageId, userId);\n+ return null;\n+ }\n+ });\n+ return true;\n+ }\n+\n+ @AnyThread\n+ boolean _markReadForMessageWithId(final String messageId) {\n+ CTMessageDAO messageDAO = findMessageById(messageId);\n+ if (messageDAO == null) {\n+ return false;\n+ }\n+\n+ synchronized (messagesLock) {\n+ messageDAO.setRead(1);\n+ }\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"RunMarkMessageRead\", new Callable<Void>() {\n+ @Override\n+ @WorkerThread\n+ public Void call() {\n+ dbAdapter.markReadMessageForId(messageId, userId);\n+ return null;\n+ }\n+ });\n+ return true;\n+ }\n+\n+ @AnyThread\nprivate CTMessageDAO findMessageById(String id) {\nsynchronized (messagesLock) {\nfor (CTMessageDAO message : messages) {\n@@ -205,6 +220,7 @@ public class CTInboxController {\nreturn null;\n}\n+ @AnyThread\nprivate void trimMessages() {\nArrayList<CTMessageDAO> toDelete = new ArrayList<>();\nsynchronized (messagesLock) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"diff": "@@ -2,8 +2,6 @@ package com.clevertap.android.sdk.inbox;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n-import androidx.annotation.RestrictTo;\n-import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport java.util.ArrayList;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/CleverTapResponse.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.response;\nimport android.content.Context;\nimport android.util.Log;\n+import androidx.annotation.WorkerThread;\nimport org.json.JSONObject;\n/**\n@@ -9,6 +10,7 @@ import org.json.JSONObject;\n*/\npublic abstract class CleverTapResponse {\n+ @WorkerThread\npublic void processResponse(final JSONObject jsonBody, final String stringBody,\nfinal Context context) {\nLog.i(\"CleverTapResponse\", \"Done processing response!\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InboxResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InboxResponse.java",
"diff": "package com.clevertap.android.sdk.response;\nimport android.content.Context;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.BaseCallbackManager;\nimport com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -36,6 +37,7 @@ public class InboxResponse extends CleverTapResponseDecorator {\n}\n//NotificationInbox\n+ @WorkerThread\n@Override\npublic void processResponse(final JSONObject response, final String stringBody, final Context context) {\n@@ -70,6 +72,7 @@ public class InboxResponse extends CleverTapResponseDecorator {\n// always call async\n+ @WorkerThread\nprivate void _processInboxMessages(JSONArray messages) {\nsynchronized (inboxControllerLock) {\nif (controllerManager.getCTInboxController() == null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(app_inbox): add threading annotations SDK-849 |
116,612 | 28.05.2021 12:44:23 | -19,080 | b984601716d424cfb21245ed564d2e5eac024e5f | fix(app_inbox): remove redundant code | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java",
"diff": "@@ -189,10 +189,8 @@ public class CTInboxMessageContent implements Parcelable {\n}\ntry {\nJSONObject keyValues = jsonObject.getJSONObject(Constants.KEY_KV);\n- if (keyValues != null) {\nIterator<String> keys = keyValues.keys();\nHashMap<String, String> keyValuesMap = new HashMap<>();\n- if (keys != null) {\nString key, value;\nwhile (keys.hasNext()) {\nkey = keys.next();\n@@ -201,11 +199,8 @@ public class CTInboxMessageContent implements Parcelable {\nkeyValuesMap.put(key, value);\n}\n}\n- }\nreturn !keyValuesMap.isEmpty() ? keyValuesMap : null;\n- } else {\n- return null;\n- }\n+\n} catch (JSONException e) {\nLogger.v(\"Unable to get Link Key Value with JSON - \" + e.getLocalizedMessage());\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout/inbox_simple_message_layout.xml",
"new_path": "clevertap-core/src/main/res/layout/inbox_simple_message_layout.xml",
"diff": "android:id=\"@+id/simple_message_frame_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:visibility=\"gone\"></FrameLayout>\n+ android:visibility=\"gone\" />\n<FrameLayout\nandroid:id=\"@+id/simple_progress_frame_layout\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(app_inbox): remove redundant code SDK-849 |
116,616 | 31.05.2021 11:27:43 | -19,080 | aeada317765e030f0b804fbd6581a6525aad1f76 | removes thread safe comments, moved session.getlastTime() to 'setStatesAsync' task, updated the FileUtils with | [
{
"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": "@@ -1006,12 +1006,12 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.coreState.getConfig().setCreatedPostAppLaunch();\n}\n- coreState.getSessionManager().setLastVisitTime();\ntask = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"setStatesAsync\", new Callable<Void>() {\n@Override\npublic Void call() {\n+ CleverTapAPI.this.coreState.getSessionManager().setLastVisitTime();\nCleverTapAPI.this.coreState.getDeviceInfo().setDeviceNetworkInfoReportingFromStorage();\nCleverTapAPI.this.coreState.getDeviceInfo().setCurrentUserOptOutStateFromStorage();\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"diff": "@@ -55,12 +55,11 @@ public class LocalDataStore {\ninflateLocalProfileAsync(context);\n}\n- // TODO: remove comment this is safe\n+ @WorkerThread\npublic void changeUser() {\nresetLocalProfileSync();\n}\n- @MainThread\nEventDetail getEventDetail(String eventName) {\ntry {\nif (!isPersonalisationEnabled()) {\n@@ -109,7 +108,7 @@ public class LocalDataStore {\nreturn _getProfileProperty(key);\n}\n- // TODO: remove comment this is safe\n+ @WorkerThread\npublic void persistEvent(Context context, JSONObject event, int type) {\nif (event == null) {\n@@ -125,7 +124,7 @@ public class LocalDataStore {\n}\n}\n- // TODO: remove comment this is safe\n+ @WorkerThread\nvoid removeProfileField(String key) {\nremoveProfileField(key, false, true);\n}\n@@ -137,7 +136,7 @@ public class LocalDataStore {\nremoveProfileFields(fields, false);\n}\n- // TODO: remove comment this is safe\n+ @WorkerThread\npublic void setDataSyncFlag(JSONObject event) {\ntry {\n// Check the personalisation flag\n@@ -185,17 +184,15 @@ public class LocalDataStore {\n}\n}\n- // TODO: remove comment this is safe\nvoid setProfileField(String key, Object value) {\nsetProfileField(key, value, false, true);\n}\n- // TODO: remove comment this is safe\nvoid setProfileFields(JSONObject fields) {\nsetProfileFields(fields, false);\n}\n- //TODO: Need to check again\n+ //TODO: Not used.Remove later\n@SuppressWarnings(\"rawtypes\")\npublic void syncWithUpstream(Context context, JSONObject response) {\ntry {\n@@ -282,7 +279,6 @@ public class LocalDataStore {\n}\n}\n- // TODO: remove comment this is safe\nprivate Object _getProfileProperty(String key) {\nif (key == null) {\n@@ -300,7 +296,6 @@ public class LocalDataStore {\n}\n}\n- // TODO: remove comment this is safe\nprivate void _removeProfileField(String key) {\nif (key == null) {\n@@ -380,7 +375,6 @@ public class LocalDataStore {\nreturn this.config.getLogger();\n}\n- // TODO: remove comment this is safe\nprivate int getIntFromPrefs(String rawKey, int defaultValue) {\nif (this.config.isDefaultInstance()) {\nint dummy = -1000;\n@@ -405,7 +399,6 @@ public class LocalDataStore {\n}\n}\n- @MainThread\nprivate String getStringFromPrefs(String rawKey, String defaultValue, String nameSpace) {\nif (this.config.isDefaultInstance()) {\nString _new = StorageHelper\n@@ -421,7 +414,6 @@ public class LocalDataStore {\n}\n// local cache/profile key expiry handling\n- // TODO: remove comment this is safe\nprivate void inflateLocalProfileAsync(final Context context) {\nfinal String accountID = this.config.getAccountId();\n@@ -622,7 +614,7 @@ public class LocalDataStore {\n}\npersistLocalProfileAsync();\n}\n- // TODO: remove comment this is safe\n+\nprivate void resetLocalProfileSync() {\nsynchronized (PROFILE_EXPIRY_MAP) {\n@@ -641,7 +633,7 @@ public class LocalDataStore {\nStorageHelper.putInt(context, storageKeyWithSuffix(\"local_cache_expires_in\"), ttl);\n}\n- // TODO: remove comment this is safe\n+\nprivate void setProfileField(String key, Object value, Boolean fromUpstream, boolean persist) {\nif (key == null || value == null) {\nreturn;\n@@ -661,7 +653,6 @@ public class LocalDataStore {\n}\n}\n- // TODO: remove comment this is safe\n@SuppressWarnings(\"rawtypes\")\nprivate void setProfileFields(JSONObject fields, Boolean fromUpstream) {\nif (fields == null) {\n@@ -696,7 +687,7 @@ public class LocalDataStore {\nreturn (value == null) ? \"\" : value.toString();\n}\n- //TODO: Need to check again\n+ //TODO: Not used.Remove later\n@SuppressWarnings({\"rawtypes\", \"ConstantConditions\"})\nprivate JSONObject syncEventsFromUpstream(Context context, JSONObject events) {\ntry {\n@@ -779,7 +770,7 @@ public class LocalDataStore {\nreturn null;\n}\n}\n- //TODO: Need to check again\n+ //TODO: Not used.Remove later\n@SuppressWarnings(\"rawtypes\")\nprivate JSONObject syncProfile(JSONObject remoteProfile) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/FileUtils.java",
"diff": "@@ -5,6 +5,8 @@ import android.text.TextUtils;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport java.io.BufferedReader;\nimport java.io.File;\n@@ -15,6 +17,7 @@ import java.io.InputStream;\nimport java.io.InputStreamReader;\nimport org.json.JSONObject;\n+@WorkerThread\n@RestrictTo(Scope.LIBRARY_GROUP)\npublic class FileUtils {\n@@ -27,7 +30,6 @@ public class FileUtils {\nthis.config = config;\n}\n- //TODO: remove comment this is safe\npublic void deleteDirectory(String dirName) {\nif (TextUtils.isEmpty(dirName)) {\nreturn;\n@@ -51,7 +53,6 @@ public class FileUtils {\n}\n}\n- //TODO: remove comment this is safe\npublic void deleteFile(String fileName) {\nif (TextUtils.isEmpty(fileName)) {\nreturn;\n@@ -74,7 +75,6 @@ public class FileUtils {\n}\n}\n- //TODO: remove comment this is safe\npublic String readFromFile(String fileNameWithPath) throws IOException {\nString content = \"\";\n@@ -121,7 +121,6 @@ public class FileUtils {\nreturn content;\n}\n- //TODO: Need to check again\npublic void writeJsonToFile(String dirName,\nString fileName, JSONObject jsonObject) throws IOException {\nFileWriter writer = null;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removes thread safe comments, moved session.getlastTime() to 'setStatesAsync' task, updated the FileUtils with @workerthread. |
116,616 | 31.05.2021 11:40:12 | -19,080 | 349583f90e0ab632ce28e0a8a664acf8c7f46e60 | removes thread safe comments in dbAdapter and DBManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -164,7 +164,6 @@ public class DBAdapter {\n}\n- // TODO: remove comment this is safe\n@SuppressLint(\"UsableSpace\")\nboolean belowMemThreshold() {\n//noinspection SimplifiableIfStatement\n@@ -174,7 +173,6 @@ public class DBAdapter {\nreturn true;\n}\n- // TODO: remove comment this is safe\nvoid deleteDatabase() {\nclose();\n//noinspection ResultOfMethodCallIgnored\n@@ -330,7 +328,6 @@ public class DBAdapter {\n* @return boolean value based on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n- // TODO: remove comment this is safe\npublic synchronized boolean deleteMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n@@ -350,12 +347,10 @@ public class DBAdapter {\n}\n}\n- // TODO: remove comment this is safe\npublic synchronized boolean doesPushNotificationIdExist(String id) {\nreturn id.equals(fetchPushNotificationId(id));\n}\n- // TODO: remove comment this is safe\npublic synchronized String[] fetchPushNotificationIds() {\nif (!rtlDirtyFlag) {\nreturn new String[0];\n@@ -386,7 +381,6 @@ public class DBAdapter {\nreturn pushIds.toArray(new String[0]);\n}\n- // TODO: remove comment this is safe\npublic synchronized JSONObject fetchUserProfileById(final String id) {\nif (id == null) {\n@@ -421,7 +415,6 @@ public class DBAdapter {\nreturn profile;\n}\n- // TODO: remove comment this is safe\npublic synchronized long getLastUninstallTimestamp() {\nfinal String tName = Table.UNINSTALL_TS.getName();\nCursor cursor = null;\n@@ -494,7 +487,6 @@ public class DBAdapter {\n* @return boolean value depending on success of operation\n*/\n@SuppressWarnings(\"UnusedReturnValue\")\n- // TODO: remove comment this is safe\npublic synchronized boolean markReadMessageForId(String messageId, String userId) {\nif (messageId == null || userId == null) {\nreturn false;\n@@ -519,7 +511,6 @@ public class DBAdapter {\n/**\n* remove the user profile with id from the db.\n*/\n- // TODO: remove comment this is safe\npublic synchronized void removeUserProfile(String id) {\nif (id == null) {\n@@ -540,7 +531,6 @@ public class DBAdapter {\n/**\n* Adds a String timestamp representing uninstall flag to the DB.\n*/\n- // TODO: remove comment this is safe\npublic synchronized void storeUninstallTimestamp() {\nif (!this.belowMemThreshold()) {\n@@ -569,7 +559,6 @@ public class DBAdapter {\n* @param obj the JSON to record\n* @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n*/\n- // TODO: remove comment this is safe\n@WorkerThread\npublic synchronized long storeUserProfile(String id, JSONObject obj) {\n@@ -636,7 +625,6 @@ public class DBAdapter {\n}\n}\n- // TODO: remove comment this is safe\nsynchronized void cleanUpPushNotifications() {\n//In Push_Notifications, KEY_CREATED_AT is stored as a future epoch, i.e. currentTimeMillis() + ttl,\n//so comparing to the current time for removal is correct\n@@ -649,7 +637,6 @@ public class DBAdapter {\n* @param lastId the last id to delete\n* @param table the table to remove events\n*/\n- // TODO: remove comment this is safe\n@WorkerThread\nsynchronized void cleanupEventsFromLastId(String lastId, Table table) {\nfinal String tName = table.getName();\n@@ -665,7 +652,6 @@ public class DBAdapter {\n}\n}\n- // TODO: remove comment this is safe\npublic synchronized void storePushNotificationId(String id, long ttl) {\nif (id == null) {\n@@ -704,7 +690,6 @@ public class DBAdapter {\n*\n* @param table the table to remove events\n*/\n- // TODO: remove comment this is safe\nsynchronized void cleanupStaleEvents(Table table) {\ncleanInternal(table, DATA_EXPIRATION);\n}\n@@ -716,7 +701,6 @@ public class DBAdapter {\n* @param table the table to read from\n* @return JSONObject containing the max row ID and a JSONArray of the JSONObject events or null\n*/\n- // TODO: remove comment this is safe\nsynchronized JSONObject fetchEvents(Table table, final int limit) {\nfinal String tName = table.getName();\nCursor cursor = null;\n@@ -762,7 +746,6 @@ public class DBAdapter {\nreturn null;\n}\n- // TODO: remove comment this is safe\n@WorkerThread\npublic synchronized void updatePushNotificationIds(String[] ids) {\nif (ids.length == 0) {\n@@ -802,7 +785,6 @@ public class DBAdapter {\n* @param table the table to insert into\n* @return the number of rows in the table, or DB_OUT_OF_MEMORY_ERROR/DB_UPDATE_ERROR\n*/\n- // TODO: remove comment this is safe\n@WorkerThread\nsynchronized int storeObject(JSONObject obj, Table table) {\nif (!this.belowMemThreshold()) {\n@@ -839,7 +821,6 @@ public class DBAdapter {\n*\n* @param table the table to remove events\n*/\n- // TODO: remove comment this is safe\nsynchronized void removeEvents(Table table) {\nfinal String tName = table.getName();\n@@ -854,14 +835,12 @@ public class DBAdapter {\n}\n}\n- // TODO: remove comment this is safe\n@WorkerThread\n@SuppressWarnings(\"BooleanMethodIsAlwaysInverted\")\nprivate boolean belowMemThreshold() {\nreturn dbHelper.belowMemThreshold();\n}\n- // TODO: remove comment this is safe\nprivate void cleanInternal(Table table, long expiration) {\nfinal long time = (System.currentTimeMillis() - expiration) / 1000;\n@@ -879,7 +858,6 @@ public class DBAdapter {\n}\n- // TODO: remove comment this is safe\nprivate void deleteDB() {\ndbHelper.deleteDatabase();\n}\n@@ -911,7 +889,6 @@ public class DBAdapter {\nreturn this.config.getLogger();\n}\n- // TODO: remove comment this is safe\nprivate static String getDatabaseName(CleverTapInstanceConfig config) {\nreturn config.isDefaultInstance() ? DATABASE_NAME : DATABASE_NAME + \"_\" + config.getAccountId();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"diff": "@@ -139,7 +139,6 @@ public class DBManager extends BaseDatabaseManager {\n}\n}\n- // TODO: remove comment this is safe\n//Event\n@WorkerThread\n@Override\n@@ -149,7 +148,6 @@ public class DBManager extends BaseDatabaseManager {\nqueueEventInternal(context, event, table);\n}\n- // TODO: remove comment this is safe\n@WorkerThread\n@Override\npublic void queuePushNotificationViewedEventToDB(final Context context, final JSONObject event) {\n@@ -177,7 +175,6 @@ public class DBManager extends BaseDatabaseManager {\nreturn cursor;\n}\n- // TODO: remove comment this is safe\n@WorkerThread\nprivate void queueEventInternal(final Context context, final JSONObject event, DBAdapter.Table table) {\nsynchronized (ctLockManager.getEventLock()) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removes thread safe comments in dbAdapter and DBManager |
116,616 | 01.06.2021 12:59:47 | -19,080 | a5c145574872b7fa4c21c43a649c4f7d459f7fe4 | [SDK-846]-Fixes ANR for PushAmpResponse,moves in-app and inbox preview messages inside a async task | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -464,9 +464,10 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\nif (extras.containsKey(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY)) {\n- Runnable pendingInappRunnable = new Runnable() {\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"testInappNotification\",new Callable<Void>() {\n@Override\n- public void run() {\n+ public Void call() {\ntry {\nLogger.v(\"Received in-app via push payload: \" + extras\n.getString(Constants.INAPP_PREVIEW_PUSH_PAYLOAD_KEY));\n@@ -481,16 +482,17 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n} catch (Throwable t) {\nLogger.v(\"Failed to display inapp notification from push notification payload\", t);\n}\n+ return null;\n}\n- };\n- mainLooperHandler.setPendingRunnable(pendingInappRunnable);\n+ });\nreturn;\n}\nif (extras.containsKey(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY)) {\n- Runnable pendingInboxRunnable = new Runnable() {\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"testInboxNotification\",new Callable<Void>() {\n@Override\n- public void run() {\n+ public Void call() {\ntry {\nLogger.v(\"Received inbox via push payload: \" + extras\n.getString(Constants.INBOX_PREVIEW_PUSH_PAYLOAD_KEY));\n@@ -509,9 +511,9 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n} catch (Throwable t) {\nLogger.v(\"Failed to process inbox message from push notification payload\", t);\n}\n+ return null;\n}\n- };\n- mainLooperHandler.setPendingRunnable(pendingInboxRunnable);\n+ });\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"diff": "@@ -28,12 +28,12 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nprivate final Context context;\n- private final DBAdapter dbAdapter;\n-\nprivate final Logger logger;\nprivate final ControllerManager controllerManager;\n+ private final BaseDatabaseManager baseDatabaseManager;\n+\npublic PushAmpResponse(CleverTapResponse cleverTapResponse,\nContext context,\nCleverTapInstanceConfig config,\n@@ -44,7 +44,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nthis.context = context;\nthis.config = config;\nlogger = this.config.getLogger();\n- dbAdapter = dbManager.loadDBAdapter(context);\n+ this.baseDatabaseManager = dbManager;\nthis.callbackManager = callbackManager;\nthis.controllerManager = controllerManager;\n}\n@@ -84,7 +84,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nboolean ack = pushAmpObject.getBoolean(\"ack\");\nlogger.verbose(\"Received ACK -\" + ack);\nif (ack) {\n- JSONArray rtlArray = getRenderedTargetList(dbAdapter);\n+ JSONArray rtlArray = getRenderedTargetList(baseDatabaseManager.loadDBAdapter(context));\nString[] rtlStringArray = new String[0];\nif (rtlArray != null) {\nrtlStringArray = new String[rtlArray.length()];\n@@ -93,7 +93,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nrtlStringArray[i] = rtlArray.getString(i);\n}\nlogger.verbose(\"Updating RTL values...\");\n- dbAdapter.updatePushNotificationIds(rtlStringArray);\n+ baseDatabaseManager.loadDBAdapter(context).updatePushNotificationIds(rtlStringArray);\n}\n}\n}\n@@ -121,7 +121,7 @@ public class PushAmpResponse extends CleverTapResponseDecorator {\nString key = iterator.next().toString();\npushBundle.putString(key, pushObject.getString(key));\n}\n- if (!pushBundle.isEmpty() && !dbAdapter\n+ if (!pushBundle.isEmpty() && !baseDatabaseManager.loadDBAdapter(context)\n.doesPushNotificationIdExist(pushObject.getString(\"wzrk_pid\"))) {\nlogger.verbose(\"Creating Push Notification locally\");\nif (callbackManager.getPushAmpListener() != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-846]-Fixes ANR for PushAmpResponse,moves in-app and inbox preview messages inside a async task |
116,616 | 01.06.2021 13:06:42 | -19,080 | 6bfaca783b62e0c1cf8a8798bb675cfa15e8fb76 | removes unused MainLooperHandler and imports in AnalyticsManager and removes unused imports in PushAmpResponse | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -17,7 +17,6 @@ import com.clevertap.android.sdk.response.DisplayUnitResponse;\nimport com.clevertap.android.sdk.response.InAppResponse;\nimport com.clevertap.android.sdk.response.InboxResponse;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n-import com.clevertap.android.sdk.task.MainLooperHandler;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.CTJsonConverter;\nimport com.clevertap.android.sdk.utils.UriHelper;\n@@ -57,8 +56,6 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nprivate final LocalDataStore localDataStore;\n- private final MainLooperHandler mainLooperHandler;\n-\nprivate final ValidationResultStack validationResultStack;\nprivate final Validator validator;\n@@ -77,7 +74,6 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nCoreMetaData coreMetaData,\nLocalDataStore localDataStore,\nDeviceInfo deviceInfo,\n- MainLooperHandler mainLooperHandler,\nBaseCallbackManager callbackManager, ControllerManager controllerManager,\nfinal CTLockManager ctLockManager) {\nthis.context = context;\n@@ -88,7 +84,6 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nthis.coreMetaData = coreMetaData;\nthis.localDataStore = localDataStore;\nthis.deviceInfo = deviceInfo;\n- this.mainLooperHandler = mainLooperHandler;\nthis.callbackManager = callbackManager;\nthis.ctLockManager = ctLockManager;\nthis.controllerManager = controllerManager;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -79,7 +79,7 @@ class CleverTapFactory {\nAnalyticsManager analyticsManager = new AnalyticsManager(context, config, baseEventQueueManager, validator,\nvalidationResultStack, coreMetaData, localDataStore, deviceInfo,\n- mainLooperHandler, callbackManager, controllerManager, ctLockManager);\n+ callbackManager, controllerManager, ctLockManager);\ncoreState.setAnalyticsManager(analyticsManager);\nInAppController inAppController = new InAppController(context, config, mainLooperHandler,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/PushAmpResponse.java",
"diff": "@@ -5,14 +5,11 @@ import static com.clevertap.android.sdk.utils.CTJsonConverter.getRenderedTargetL\nimport android.content.Context;\nimport android.os.Bundle;\nimport com.clevertap.android.sdk.BaseCallbackManager;\n-import com.clevertap.android.sdk.CTLockManager;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.db.BaseDatabaseManager;\n-import com.clevertap.android.sdk.db.DBAdapter;\n-import com.clevertap.android.sdk.pushnotification.PushProviders;\nimport java.util.Iterator;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removes unused MainLooperHandler and imports in AnalyticsManager and removes unused imports in PushAmpResponse |
116,612 | 03.06.2021 18:51:54 | -19,080 | ac0c4d92530fab8ef604fc4e9446cb50d9153a88 | fix(app_inbox): remove extra space between message and viewpager dots in landscape mode for carousel_text layout | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"new_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_text_layout.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\">\n<RelativeLayout\n<RelativeLayout\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n+ android:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\nandroid:orientation=\"vertical\">\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(app_inbox): remove extra space between message and viewpager dots in landscape mode for carousel_text layout SDK-849 |
116,612 | 04.06.2021 11:44:47 | -19,080 | 6dc529f459b7818a5465d648b8907513734f2bf9 | chore(update sample): revert merge tag replacement to FrameLayout | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/res/layout/home_screen_activity.xml",
"new_path": "sample/src/main/res/layout/home_screen_activity.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<merge android:id=\"@+id/container\"\n+<FrameLayout android:id=\"@+id/container\"\nxmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\ntools:context=\".HomeScreenActivity\" />\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(update sample): revert merge tag replacement to FrameLayout SDK-849 |
116,616 | 07.06.2021 10:30:19 | -19,080 | 80618da73796a31c3e96c579b9c39b587cc7d9d7 | moves InAppFCManager init to task, and updates comments for AnalyticsManager and ActivityLifeCycleManager | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java",
"diff": "@@ -80,7 +80,6 @@ class ActivityLifeCycleManager {\nconfig.getLogger().verbose(config.getAccountId(), \"App in foreground\");\nsessionManager.checkTimeoutSession();\n//Anything in this If block will run once per App Launch.\n- //Will not run for Apps which disable App Launched event\nif (!coreMetaData.isAppLaunchPushed()) {\nanalyticsManager.pushAppLaunchedEvent();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -133,6 +133,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n@Override\npublic void pushAppLaunchedEvent() {\n+ //Will not run for Apps which disable App Launched event\nif (config.isDisableAppLaunchedEvent()) {\ncoreMetaData.setAppLaunchPushed(true);\nconfig.getLogger()\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"diff": "@@ -7,12 +7,17 @@ import android.content.SharedPreferences;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\n+import com.clevertap.android.sdk.task.CTExecutorFactory;\n+import com.clevertap.android.sdk.task.Task;\n+\nimport java.text.SimpleDateFormat;\nimport java.util.ArrayList;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Locale;\nimport java.util.Map;\n+import java.util.concurrent.Callable;\n+\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n@@ -38,7 +43,15 @@ public class InAppFCManager {\nthis.config = config;\nthis.context = context;\nthis.deviceId = deviceId;\n- init(deviceId);\n+\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"initInAppFCManager\",new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ init(InAppFCManager.this.deviceId);\n+ return null;\n+ }\n+ });\n}\npublic boolean canShow(CTInAppNotification inapp) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | moves InAppFCManager init to task, and updates comments for AnalyticsManager and ActivityLifeCycleManager |
116,616 | 07.06.2021 13:12:40 | -19,080 | c069ec399552c76b205f6756b441ac73b839adf1 | moves getDeviceID in onInitDeviceInfo on a separate task | [
{
"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": "@@ -20,6 +20,8 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationManagerCompat;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n+import com.clevertap.android.sdk.task.CTExecutorFactory;\n+import com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.CTJsonConverter;\nimport com.clevertap.android.sdk.validation.ValidationResult;\nimport com.clevertap.android.sdk.validation.ValidationResultFactory;\n@@ -28,6 +30,8 @@ import java.lang.annotation.RetentionPolicy;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n+import java.util.concurrent.Callable;\n+\nimport org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY)\n@@ -320,12 +324,20 @@ public class DeviceInfo {\nprivate final CoreMetaData mCoreMetaData;\n- DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID, CoreMetaData coreMetaData) {\n+ DeviceInfo(Context context, CleverTapInstanceConfig config, final String cleverTapID,\n+ CoreMetaData coreMetaData) {\nthis.context = context;\nthis.config = config;\nthis.library = null;\nmCoreMetaData = coreMetaData;\n+ Task<Void> initDeviceIDTask = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ initDeviceIDTask.execute(\"initDeviceInfo\",new Callable<Void>() {\n+ @Override\n+ public Void call() {\nonInitDeviceInfo(cleverTapID);\n+ return null;\n+ }\n+ });\n}\nvoid onInitDeviceInfo(final String cleverTapID) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | moves getDeviceID in onInitDeviceInfo on a separate task |
116,616 | 07.06.2021 19:15:18 | -19,080 | aa9bd00f99f11f130f9bce146393c4f8b87ff107 | removes unused todos. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/LocalDataStore.java",
"diff": "@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n-import androidx.annotation.MainThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.annotation.WorkerThread;\n@@ -192,7 +191,7 @@ public class LocalDataStore {\nsetProfileFields(fields, false);\n}\n- //TODO: Not used.Remove later\n+ //Not used.Remove later\n@SuppressWarnings(\"rawtypes\")\npublic void syncWithUpstream(Context context, JSONObject response) {\ntry {\n@@ -470,7 +469,6 @@ public class LocalDataStore {\n@SuppressWarnings(\"ConstantConditions\")\n@SuppressLint(\"CommitPrefEdits\")\n- // TODO: remove comment this is safe\nprivate void persistEvent(Context context, JSONObject event) {\ntry {\nString evtName = event.getString(\"evtName\");\n@@ -498,7 +496,7 @@ public class LocalDataStore {\ngetConfigLogger().verbose(getConfigAccountId(), \"Failed to persist event locally\", t);\n}\n}\n- // TODO: remove comment this is safe\n+\nprivate void persistLocalProfileAsync() {\nfinal String profileID = this.config.getAccountId();\n@@ -516,7 +514,6 @@ public class LocalDataStore {\n});\n}\n- // TODO: remove comment this is safe\nprivate void postAsyncSafely(final String name, final Runnable runnable) {\ntry {\nfinal boolean executeSync = Thread.currentThread().getId() == EXECUTOR_THREAD_ID;\n@@ -687,7 +684,7 @@ public class LocalDataStore {\nreturn (value == null) ? \"\" : value.toString();\n}\n- //TODO: Not used.Remove later\n+ //Not used.Remove later\n@SuppressWarnings({\"rawtypes\", \"ConstantConditions\"})\nprivate JSONObject syncEventsFromUpstream(Context context, JSONObject events) {\ntry {\n@@ -770,7 +767,7 @@ public class LocalDataStore {\nreturn null;\n}\n}\n- //TODO: Not used.Remove later\n+ //Not used.Remove later\n@SuppressWarnings(\"rawtypes\")\nprivate JSONObject syncProfile(JSONObject remoteProfile) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -443,7 +443,6 @@ public class DBAdapter {\n* @param userId String userid\n* @return ArrayList of {@link CTMessageDAO}\n*/\n- // TODO: check pushNotificationClickedEvent in Analytics Manager, seems like a danger\npublic synchronized ArrayList<CTMessageDAO> getMessages(String userId) {\nfinal String tName = Table.INBOX_MESSAGES.getName();\nCursor cursor;\n@@ -595,7 +594,6 @@ public class DBAdapter {\n*\n* @param inboxMessages ArrayList of type {@link CTMessageDAO}\n*/\n- // TODO: check pushNotificationClickedEvent in Analytics Manager, seems like a danger\n@WorkerThread\npublic synchronized void upsertMessages(ArrayList<CTMessageDAO> inboxMessages) {\nif (!this.belowMemThreshold()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBManager.java",
"diff": "@@ -27,7 +27,6 @@ public class DBManager extends BaseDatabaseManager {\nthis.ctLockManager = ctLockManager;\n}\n- // TODO: check PushAmpResponse constructor seems like a danger\n@WorkerThread\n@Override\npublic DBAdapter loadDBAdapter(final Context context) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removes unused todos. |
116,612 | 13.05.2021 13:05:12 | -19,080 | 6a5c191790e9c7e116e108f2a4cb63a68cf5bc6f | task(build): introduce buildSrc concept | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/build.gradle.kts",
"diff": "+repositories {\n+ google()\n+ mavenCentral()\n+}\n+plugins {\n+ `kotlin-dsl`\n+ `java-library`\n+}\n+\n+dependencies {\n+\n+ // Logging\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/Deps.kt",
"diff": "+object Deps {\n+ const val futures = \"androidx.concurrent:concurrent-futures:1.0.0\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/test.gradle.kts",
"diff": "+// File: buildSrc/src/main/kotlin/java-project-conventions.gradle.kts\n+plugins {\n+ `java-library`\n+ id(\"com.android.lint\")\n+}\n+\n+repositories {\n+ mavenCentral()\n+}\n+\n+dependencies {\n+\n+ // Logging\n+ implementation(Deps.futures)\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/build.gradle",
"new_path": "clevertap-geofence/build.gradle",
"diff": "@@ -51,4 +51,5 @@ dependencies {\ntestImplementation deps.androidXConcurrentFutures\ntestImplementation deps.androidXCoreKTX\ntestImplementation deps.kotlinStdlib\n+ testImplementation Deps.futures\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lint_rules/.gitignore",
"diff": "+/build\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lint_rules/build.gradle",
"diff": "+apply plugin: 'java-library'\n+apply plugin: 'kotlin'\n+\n+java {\n+ sourceCompatibility = JavaVersion.VERSION_1_7\n+ targetCompatibility = JavaVersion.VERSION_1_7\n+}\n+\n+dependencies {\n+ compileOnly \"com.android.tools.lint:lint-api:27.0.1\"\n+ compileOnly \"com.android.tools.lint:lint-checks:27.0.1\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lint_rules/src/main/java/com/clevertap/lint_rules/IssueRegistry.java",
"diff": "+package com.clevertap.lint_rules;\n+\n+import static com.android.tools.lint.detector.api.ApiKt.CURRENT_API;\n+\n+import com.android.tools.lint.detector.api.Issue;\n+import java.util.ArrayList;\n+import java.util.List;\n+import org.jetbrains.annotations.NotNull;\n+\n+public class IssueRegistry extends com.android.tools.lint.client.api.IssueRegistry {\n+\n+ @Override\n+ public int getApi() {\n+ return CURRENT_API;\n+ }\n+\n+ @NotNull\n+ @Override\n+ public List<Issue> getIssues() {\n+ ArrayList<Issue> issueArrayList = new ArrayList<>();\n+ issueArrayList.add(VersionUpgradeDetector.VERSION_UPGRADE_SUPPORT);\n+\n+ return issueArrayList;\n+ }\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lint_rules/src/main/java/com/clevertap/lint_rules/VersionUpgradeDetector.java",
"diff": "+package com.clevertap.lint_rules;\n+\n+import com.android.tools.lint.detector.api.Category;\n+import com.android.tools.lint.detector.api.Context;\n+import com.android.tools.lint.detector.api.Detector;\n+import com.android.tools.lint.detector.api.Detector.GradleScanner;\n+import com.android.tools.lint.detector.api.GradleContext;\n+import com.android.tools.lint.detector.api.Implementation;\n+import com.android.tools.lint.detector.api.Issue;\n+import com.android.tools.lint.detector.api.Scope;\n+import com.android.tools.lint.detector.api.Severity;\n+import java.io.File;\n+import java.util.ArrayList;\n+import java.util.List;\n+import org.jetbrains.annotations.NotNull;\n+import org.jetbrains.annotations.Nullable;\n+\n+public class VersionUpgradeDetector extends Detector implements GradleScanner {\n+\n+ private static final Implementation IMPLEMENTATION = new Implementation(\n+ VersionUpgradeDetector.class,\n+ Scope.GRADLE_SCOPE);\n+\n+ public static final Issue VERSION_UPGRADE_SUPPORT = Issue.create(\n+ \"GradleDepsError\", //$NON-NLS-1$\n+ \"Gradle Version Upgrade Support Issues\",\n+ \"Gradle is highly flexible, and there are things you can do in Gradle files which \" +\n+ \"can make it hard or impossible for IDEs to properly handle the project. This lint \" +\n+ \"check looks for constructs that potentially break IDE support.\",\n+ Category.CORRECTNESS,\n+ 4,\n+ Severity.ERROR,\n+ IMPLEMENTATION);\n+\n+ @Override\n+ public void beforeCheckFile(@NotNull final Context context) {\n+ super.beforeCheckFile(context);\n+ System.out.println(\"file=\" + context.file.getAbsolutePath());\n+ }\n+\n+ @Override\n+ public void beforeCheckRootProject(@NotNull final Context context) {\n+ super.beforeCheckRootProject(context);\n+ for (File file : context.getMainProject().getDir().listFiles()) {\n+ if (file.getPath().contains(\"dependencies\")) {\n+ GradleContext gradleContext = new GradleContext(context.getClient().getGradleVisitor(),\n+ context.getDriver(), context.getProject(), context.getMainProject(), file);\n+\n+ List<GradleScanner> scanners = new ArrayList<>();\n+ scanners.add(this);\n+ context.getClient().getGradleVisitor().visitBuildScript(gradleContext,\n+ scanners);\n+ System.out.println(\"found\");\n+ }\n+ }\n+ }\n+\n+ @Override\n+ public void checkDslPropertyAssignment(@NotNull final GradleContext context, @NotNull final String property,\n+ @NotNull final String value, @NotNull final String parent, @Nullable final String parentParent,\n+ @NotNull final Object propertyCookie, @NotNull final Object valueCookie,\n+ @NotNull final Object statementCookie) {\n+ super.checkDslPropertyAssignment(context, property, value, parent, parentParent, propertyCookie, valueCookie,\n+ statementCookie);\n+\n+ System.out.println(\"parent=\" + parent);\n+ }\n+\n+ @Override\n+ public void run(@NotNull final Context context) {\n+ super.run(context);\n+ System.out.println(\"RUN\");\n+ }\n+\n+ @Override\n+ public void visitBuildScript(@NotNull final Context context) {\n+ super.visitBuildScript(context);\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lint_rules/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry",
"diff": "+com.clevertap.lint_rules.IssueRegistry\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -62,7 +62,7 @@ dependencies {\nimplementation 'com.google.android.gms:play-services-location:17.0.0'// Needed for geofence\nimplementation 'androidx.work:work-runtime:2.3.4'// Needed for geofence\n- implementation 'androidx.concurrent:concurrent-futures:1.0.0'// Needed for geofence\n+ implementation Deps.futures// Needed for geofence\nimplementation 'com.google.firebase:firebase-messaging:20.2.4' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:19.4.0' //Needed to use Google Ad Ids\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "+include ':lint_rules'\ninclude ':test_shared'\n-include ':gradle-scripts'\ninclude ':clevertap-core'\ninclude ':sample'\ninclude ':clevertap-geofence'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(build): introduce buildSrc concept |
116,612 | 11.06.2021 21:57:54 | -19,080 | a1e8be66447818ae49b431a141f34e4a4ba0f4f3 | task(dependencies management): remove unwanted files from buildSrc | [
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/Deps.kt",
"new_path": null,
"diff": "-object Deps {\n- const val futures = \"androidx.concurrent:concurrent-futures:1.0.0\"\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/test.gradle.kts",
"new_path": null,
"diff": "-// File: buildSrc/src/main/kotlin/java-project-conventions.gradle.kts\n-plugins {\n- `java-library`\n- id(\"com.android.lint\")\n-}\n-\n-repositories {\n- mavenCentral()\n-}\n-\n-dependencies {\n-\n- // Logging\n- implementation(Deps.futures)\n-\n-}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(dependencies management): remove unwanted files from buildSrc SDK-898 |
116,612 | 11.06.2021 22:14:05 | -19,080 | 63809a6f2c466850c00b84cfddb8f0556c7b37b5 | task(dependencies management): remove lint_rules and lint_rules_detekt | [
{
"change_type": "DELETE",
"old_path": "lint_rules/.gitignore",
"new_path": null,
"diff": "-/build\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules/build.gradle",
"new_path": null,
"diff": "-apply plugin: 'java-library'\n-apply plugin: 'kotlin'\n-\n-java {\n- sourceCompatibility = JavaVersion.VERSION_1_7\n- targetCompatibility = JavaVersion.VERSION_1_7\n-}\n-\n-dependencies {\n- compileOnly \"com.android.tools.lint:lint-api:27.0.1\"\n- compileOnly \"com.android.tools.lint:lint-checks:27.0.1\"\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules/src/main/java/com/clevertap/lint_rules/IssueRegistry.java",
"new_path": null,
"diff": "-package com.clevertap.lint_rules;\n-\n-import static com.android.tools.lint.detector.api.ApiKt.CURRENT_API;\n-\n-import com.android.tools.lint.detector.api.Issue;\n-import java.util.ArrayList;\n-import java.util.List;\n-import org.jetbrains.annotations.NotNull;\n-\n-public class IssueRegistry extends com.android.tools.lint.client.api.IssueRegistry {\n-\n- @Override\n- public int getApi() {\n- return CURRENT_API;\n- }\n-\n- @NotNull\n- @Override\n- public List<Issue> getIssues() {\n- ArrayList<Issue> issueArrayList = new ArrayList<>();\n- issueArrayList.add(VersionUpgradeDetector.VERSION_UPGRADE_SUPPORT);\n-\n- return issueArrayList;\n- }\n-\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules/src/main/java/com/clevertap/lint_rules/VersionUpgradeDetector.java",
"new_path": null,
"diff": "-package com.clevertap.lint_rules;\n-\n-import com.android.tools.lint.detector.api.Category;\n-import com.android.tools.lint.detector.api.Context;\n-import com.android.tools.lint.detector.api.Detector;\n-import com.android.tools.lint.detector.api.Detector.GradleScanner;\n-import com.android.tools.lint.detector.api.GradleContext;\n-import com.android.tools.lint.detector.api.Implementation;\n-import com.android.tools.lint.detector.api.Issue;\n-import com.android.tools.lint.detector.api.Scope;\n-import com.android.tools.lint.detector.api.Severity;\n-import java.io.File;\n-import java.util.ArrayList;\n-import java.util.List;\n-import org.jetbrains.annotations.NotNull;\n-import org.jetbrains.annotations.Nullable;\n-\n-public class VersionUpgradeDetector extends Detector implements GradleScanner {\n-\n- private static final Implementation IMPLEMENTATION = new Implementation(\n- VersionUpgradeDetector.class,\n- Scope.GRADLE_SCOPE);\n-\n- public static final Issue VERSION_UPGRADE_SUPPORT = Issue.create(\n- \"GradleDepsError\", //$NON-NLS-1$\n- \"Gradle Version Upgrade Support Issues\",\n- \"Gradle is highly flexible, and there are things you can do in Gradle files which \" +\n- \"can make it hard or impossible for IDEs to properly handle the project. This lint \" +\n- \"check looks for constructs that potentially break IDE support.\",\n- Category.CORRECTNESS,\n- 4,\n- Severity.ERROR,\n- IMPLEMENTATION);\n-\n- @Override\n- public void beforeCheckFile(@NotNull final Context context) {\n- super.beforeCheckFile(context);\n- System.out.println(\"file=\" + context.file.getAbsolutePath());\n- }\n-\n- @Override\n- public void beforeCheckRootProject(@NotNull final Context context) {\n- super.beforeCheckRootProject(context);\n- for (File file : context.getMainProject().getDir().listFiles()) {\n- if (file.getPath().contains(\"dependencies\")) {\n- GradleContext gradleContext = new GradleContext(context.getClient().getGradleVisitor(),\n- context.getDriver(), context.getProject(), context.getMainProject(), file);\n-\n- List<GradleScanner> scanners = new ArrayList<>();\n- scanners.add(this);\n- context.getClient().getGradleVisitor().visitBuildScript(gradleContext,\n- scanners);\n- System.out.println(\"found\");\n- }\n- }\n- }\n-\n- @Override\n- public void checkDslPropertyAssignment(@NotNull final GradleContext context, @NotNull final String property,\n- @NotNull final String value, @NotNull final String parent, @Nullable final String parentParent,\n- @NotNull final Object propertyCookie, @NotNull final Object valueCookie,\n- @NotNull final Object statementCookie) {\n- super.checkDslPropertyAssignment(context, property, value, parent, parentParent, propertyCookie, valueCookie,\n- statementCookie);\n-\n- System.out.println(\"parent=\" + parent);\n- }\n-\n- @Override\n- public void run(@NotNull final Context context) {\n- super.run(context);\n- System.out.println(\"RUN\");\n- }\n-\n- @Override\n- public void visitBuildScript(@NotNull final Context context) {\n- super.visitBuildScript(context);\n- }\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules/src/main/resources/META-INF/services/com.android.tools.lint.client.api.IssueRegistry",
"new_path": null,
"diff": "-com.clevertap.lint_rules.IssueRegistry\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/.gitignore",
"new_path": null,
"diff": "-/build\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/build.gradle.kts",
"new_path": null,
"diff": "-repositories {\n- google()\n- mavenCentral()\n-}\n-plugins {\n- `kotlin-dsl`\n-}\n-\n-dependencies {\n- implementation(\"io.gitlab.arturbosch.detekt:detekt-api:1.17.1\")\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/src/androidTest/java/com/clevertap/lint_rules_detekt/ExampleInstrumentedTest.java",
"new_path": null,
"diff": "-package com.clevertap.lint_rules_detekt;\n-\n-import android.content.Context;\n-import androidx.test.platform.app.InstrumentationRegistry;\n-import androidx.test.ext.junit.runners.AndroidJUnit4;\n-\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-\n-import static org.junit.Assert.*;\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.getInstrumentation().getTargetContext();\n- assertEquals(\"com.clevertap.lint_rules_detekt.test\", appContext.getPackageName());\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/src/main/java/com/clevertap/lint_rules_detekt/DependencyUpdateRulesProvider.kt",
"new_path": null,
"diff": "-package com.clevertap.lint_rules_detekt\n-\n-import com.clevertap.lint_rules_detekt.rules.DependencyUpdateCheckRule\n-import io.gitlab.arturbosch.detekt.api.Config\n-import io.gitlab.arturbosch.detekt.api.RuleSet\n-import io.gitlab.arturbosch.detekt.api.RuleSetProvider\n-\n-class DependencyUpdateRulesProvider : RuleSetProvider {\n-\n- override val ruleSetId: String = \"dependencyupdatecheck\"\n-\n- override fun instance(config: Config): RuleSet = RuleSet(\n- ruleSetId,\n- listOf(\n- DependencyUpdateCheckRule()\n- )\n- )\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/src/main/java/com/clevertap/lint_rules_detekt/rules/DependencyUpdateCheckRule.kt",
"new_path": null,
"diff": "-package com.clevertap.lint_rules_detekt.rules\n-\n-import io.gitlab.arturbosch.detekt.api.Debt\n-import io.gitlab.arturbosch.detekt.api.Entity\n-import io.gitlab.arturbosch.detekt.api.Issue\n-import io.gitlab.arturbosch.detekt.api.Rule\n-import io.gitlab.arturbosch.detekt.api.Severity.CodeSmell\n-import org.jetbrains.kotlin.psi.KtFile\n-import org.jetbrains.kotlin.psi.KtNamedFunction\n-\n-class DependencyUpdateCheckRule : Rule() {\n-\n- override val issue = Issue(\n- javaClass.simpleName,\n- CodeSmell,\n- \"\"\"\n- This rule checks with a central repository to see if there are newer \\\n- versions available for the dependencies used by this project.\"\"\",\n- Debt.TWENTY_MINS\n- )\n-\n- private var amount: Int = 0\n-\n- override fun visitKtFile(file: KtFile) {\n- super.visitKtFile(file)\n- if (amount > THRESHOLD) {\n- report(\n- io.gitlab.arturbosch.detekt.api.CodeSmell(\n- issue,\n- Entity.atPackageOrFirstDecl(file),\n- message = \"The file ${file.name} has $amount function declarations. \" +\n- \"Threshold is specified with $THRESHOLD.\"\n- )\n- )\n- }\n- amount = 0\n- }\n-\n- override fun visitNamedFunction(function: KtNamedFunction) {\n- super.visitNamedFunction(function)\n- amount++\n- }\n-}\n-\n-const val THRESHOLD = 10\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider",
"new_path": null,
"diff": "-com.clevertap.lint_rules_detekt.DependencyUpdateRulesProvider\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "lint_rules_detekt/src/test/java/com/clevertap/lint_rules_detekt/ExampleUnitTest.java",
"new_path": null,
"diff": "-package com.clevertap.lint_rules_detekt;\n-\n-import org.junit.Test;\n-\n-import static org.junit.Assert.*;\n-\n-/**\n- * Example local unit test, which will execute on the development machine (host).\n- *\n- * @see <a href=\"http://d.android.com/tools/testing\">Testing documentation</a>\n- */\n-public class ExampleUnitTest {\n-\n- @Test\n- public void addition_isCorrect() {\n- assertEquals(4, 2 + 2);\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -2,7 +2,6 @@ plugins {\nid 'de.fayard.refreshVersions' version '0.10.0'\nid \"com.gradle.enterprise\" version \"3.6.3\"\n}\n-include ':lint_rules'\ninclude ':test_shared'\ninclude ':clevertap-core'\ninclude ':sample'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(dependencies management): remove lint_rules and lint_rules_detekt SDK-898 |
116,616 | 14.06.2021 10:03:58 | -19,080 | b11d40ab057f2a41921aac4a1c63fe57c253c82a | updates constants for incr/decr and created public methods for the same | [
{
"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": "@@ -2130,6 +2130,16 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().removeValueForKey(key);\n}\n+\n+ public void incrementValueBy(final String key, Number value){\n+\n+ }\n+\n+\n+ public void decrementValueBy(final String key, Number value){\n+\n+ }\n+\n/**\n* This method is used to set the CTFeatureFlagsListener\n* Register to receive feature flag callbacks\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": "@@ -218,6 +218,8 @@ public interface Constants {\nString COMMAND_ADD = \"$add\";\nString COMMAND_REMOVE = \"$remove\";\nString COMMAND_DELETE = \"$delete\";\n+ String COMMAND_INCREMENT = \"$incr\";\n+ String COMMAND_DECREMENT = \"$decr\";\nString GUID_PREFIX_GOOGLE_AD_ID = \"__g\";\nString CUSTOM_CLEVERTAP_ID_PREFIX = \"__h\";\nString ERROR_PROFILE_PREFIX = \"__i\";\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | updates constants for incr/decr and created public methods for the same |
116,612 | 14.06.2021 21:03:39 | -19,080 | 822d1e2a09045862ac652de59c77d36e3a8e303b | task(dependencies management): remove dependencies.gradle and versions.gradle | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -2,9 +2,6 @@ apply plugin: 'org.sonarqube'\n// Top-level build file where you can add configuration options common to all sub-projects/modules.\nbuildscript {\n- // do not change order of apply\n- apply from: 'gradle-scripts/versions.gradle'\n- apply from: 'gradle-scripts/dependencies.gradle'\nrepositories {\ngoogle()// Google's Maven repository\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"diff": "@@ -4,7 +4,6 @@ import android.content.Context\nimport android.os.Bundle\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM\nimport com.clevertap.android.sdk.pushnotification.fcm.TestFcmConstants.Companion.FCM_TOKEN\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n@@ -26,6 +25,7 @@ class FcmMessageHandlerImplTest : BaseTestCase() {\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n+\nhandler = FcmMessageHandlerImpl()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/build.gradle",
"new_path": "clevertap-hms/build.gradle",
"diff": "@@ -20,7 +20,7 @@ apply from: \"../gradle-scripts/commons.gradle\"\ndependencies {\ncompileOnly project(':clevertap-core')\nimplementation Libs.push\n- compileOnly deps.androidXAnnotation\n+ compileOnly Libs.androidx_annotation\ntestImplementation project(':test_shared')\ntestImplementation Libs.push\n"
},
{
"change_type": "DELETE",
"old_path": "gradle-scripts/dependencies.gradle",
"new_path": null,
"diff": "-// Dependency Alias\n-ext.deps = [\n- 'firebaseMessaging' : \"com.google.firebase:firebase-messaging:$firebaseFcmVersion\",\n- 'exoPlayer' : \"com.google.android.exoplayer:exoplayer:$exoplayerVersion\",\n- 'exoPlayerHls' : \"com.google.android.exoplayer:exoplayer-hls:$exoplayerVersion\",\n- 'exoPlayerUi' : \"com.google.android.exoplayer:exoplayer-ui:$exoplayerVersion\",\n- 'glide' : \"com.github.bumptech.glide:glide:$glideVersion\",\n- 'androidXCore' : \"androidx.core:core:$androidxCoreVersion\",\n- 'androidXCoreKTX' : \"androidx.core:core-ktx:$androidxCoreVersion\",\n- 'viewPager' : \"androidx.viewpager:viewpager:$androidxViewpagerVersion\",\n- 'appcompat' : \"androidx.appcompat:appcompat:$androidxAppCompatVersion\",\n- 'recyclerview' : \"androidx.recyclerview:recyclerview:$androidxRecyclerViewVersion\",\n- 'materialDesign' : \"com.google.android.material:material:$materialVersion\",\n- 'fragment' : \"androidx.fragment:fragment:$androidxFragmentVersion\",\n- 'installreferrer' : \"com.android.installreferrer:installreferrer:$installreferrerVersion\",\n- 'playServicesLocation' : \"com.google.android.gms:play-services-location:$locationVersion\",\n- 'androidXAnnotation': \"androidx.annotation:annotation:$androidxAnnotationVersion\",\n- 'kotlinStdlib' : \"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version\",\n- 'json' : \"org.json:json:$jsonVersion\",\n- 'gson' : \"com.google.code.gson:gson:$gsonVersion\",\n- 'huaweiPush' : \"com.huawei.hms:push:$huaweiPushVersion\",\n- 'espressoCore' : \"androidx.test.espresso:espresso-core:$espressoCoreVersion\",\n- 'androidXTestRunner' : \"androidx.test:runner:$testRunnerVersion\",\n- 'androidXTestRules' : \"androidx.test:rules:$testRulesVersion\",\n- 'workManager' : \"androidx.work:work-runtime:$workManagerVersion\",\n- 'androidXConcurrentFutures' : \"androidx.concurrent:concurrent-futures:$concurrentFuturesVersion\",\n- 'workManagerTesting' : \"androidx.work:work-testing:$workManagerVersion\",\n- 'robolectric' : \"org.robolectric:robolectric:$robolectricVersion\",\n-\n- 'junitPlatform':\"org.junit.platform:junit-platform-runner:$junitPlatformVersion\",\n- 'junitApi':\"org.junit.jupiter:junit-jupiter-api:$junitApiVersion\",\n- 'junitEngine':\"org.junit.jupiter:junit-jupiter-engine:$junitEngineVersion\",\n-\n- 'androidXTestCore' : \"androidx.test:core:$androidxCoreVersion\",\n- 'mockitoCore' : \"org.mockito:mockito-core:$mockitoVersion\",\n- 'androidXJunitExt' : \"androidx.test.ext:junit:$junitExtVersion\",\n- '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- 'jsonAssert':\"org.skyscreamer:jsonassert:$jsonAssertVersion\"\n-]\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "gradle-scripts/versions.gradle",
"new_path": null,
"diff": "-ext {\n- // Android SDK\n- compileSdkVersionVal = 30\n- targetSdkVersionVal = 30\n- buildToolsVersionVal = \"30.0.3\"\n-\n- minSdkVersionVal = 16\n-\n- // CleverTap modules\n- coreVersion = \"4.1.1\"\n- geofenceVersion = \"1.0.2\"\n- hmsVersion = \"1.0.1\"\n- xpsVersion = \"1.0.2\"\n-\n- //gradle plugins\n- gradlePluginVersion = '4.2.1'\n- googleServicesPluginVersion = '4.3.3'\n- bintrayPluginVersion = '1.8.4'\n- mavenPluginVersion = '2.1'\n- huaweiPluginVersion = '1.4.1.300'\n- kotlin_version = '1.3.72'\n- jacocoVersion = '0.8.4'\n- jsonAssertVersion = '1.5.0'\n-\n- // Firebase\n- firebaseFcmVersion = '20.2.4'\n-\n- // ExoPlayer\n- exoplayerVersion = '2.11.5'\n-\n- // Glide\n- glideVersion = '4.11.0'\n-\n- // Androidx\n- androidxCoreVersion = '1.3.0'\n- androidxViewpagerVersion = '1.0.0'\n- androidxAppCompatVersion = '1.2.0'\n- androidxRecyclerViewVersion = '1.1.0'\n- androidxFragmentVersion = '1.1.0'\n- androidxAnnotationVersion = '1.1.0'\n-\n- // Material design\n- materialVersion = '1.2.1'\n-\n- // install referrer\n- installreferrerVersion = '2.1'\n-\n- // play services\n- locationVersion = '17.0.0'\n-\n- // work manager\n- workManagerVersion = '2.3.4'\n- concurrentFuturesVersion = '1.0.0'\n-\n- // Huawei push\n- huaweiPushVersion = '5.1.1.301'\n-\n- // unit tests\n- jsonVersion = '20200518'\n- gsonVersion = '2.8.6'\n-\n- junitPlatformVersion = '1.7.0'\n- junitApiVersion = '5.7.0'\n- junitEngineVersion = '5.7.0'\n-\n- junitExtVersion = '1.1.2'\n- robolectricVersion = '4.3.1'\n- testRunnerVersion = '1.3.0'\n- testRulesVersion = '1.3.0'\n- espressoCoreVersion = '3.3.0'\n- mockitoVersion = '3.5.11'\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "test_shared/build.gradle",
"new_path": "test_shared/build.gradle",
"diff": "@@ -35,7 +35,7 @@ dependencies {\ndef mockito_version = '3.5.11'\napi Libs.mockito_core\napi \"org.mockito:mockito-inline:$mockito_version\"\n- api \"org.robolectric:robolectric:$robolectricVersion\"\n+ api Libs.robolectric\napi Libs.opentest4j\napi Libs.androidx_test_core\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(dependencies management): remove dependencies.gradle and versions.gradle SDK-898 |
116,616 | 15.06.2021 11:09:00 | -19,080 | 03041cabce083a15da7ec52bebe0be59958f5505 | adds ignore for FcmMessageHandlerImplTest.kt and FcmMessageListenerServiceTest.kt | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImplTest.kt",
"diff": "@@ -4,7 +4,6 @@ import android.content.Context\nimport android.os.Bundle\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM\nimport com.clevertap.android.sdk.pushnotification.fcm.TestFcmConstants.Companion.FCM_TOKEN\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n@@ -16,6 +15,7 @@ import org.mockito.ArgumentMatchers.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n+@Ignore\n@RunWith(RobolectricTestRunner::class)\n@Config(sdk = [28], application = TestApplication::class)\nclass FcmMessageHandlerImplTest : BaseTestCase() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerServiceTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerServiceTest.kt",
"diff": "@@ -14,6 +14,7 @@ import org.robolectric.Robolectric\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.annotation.Config\n+@Ignore\n@RunWith(RobolectricTestRunner::class)\n@Config(sdk = [28], application = TestApplication::class)\nclass FcmMessageListenerServiceTest : BaseTestCase() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | adds ignore for FcmMessageHandlerImplTest.kt and FcmMessageListenerServiceTest.kt |
116,612 | 15.06.2021 14:15:29 | -19,080 | 1e81335b6e66344f535d2f14cade8fb6d9cc9621 | fix(record screen): handle null pointer exception in recordScreen() | [
{
"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": "@@ -1137,7 +1137,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\npublic CTFeatureFlagsController featureFlag() {\nif (getConfig().isAnalyticsOnly()) {\n- getConfig().getLogger().debug(getAccountId(),\"Feature flag is not supported with analytics only configuration\");\n+ getConfig().getLogger()\n+ .debug(getAccountId(), \"Feature flag is not supported with analytics only configuration\");\n}\nreturn coreState.getControllerManager().getCTFeatureFlagsController();\n}\n@@ -2075,8 +2076,9 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\"})\npublic void recordScreen(String screenName) {\n- if (screenName == null || (!coreState.getCoreMetaData().getScreenName().isEmpty() && coreState\n- .getCoreMetaData().getScreenName().equals(screenName))) {\n+ String currentScreenName = coreState.getCoreMetaData().getScreenName();\n+ if (screenName == null || (currentScreenName != null && !currentScreenName.isEmpty() && currentScreenName\n+ .equals(screenName))) {\nreturn;\n}\ngetConfigLogger().debug(getAccountId(), \"Screen changed to \" + screenName);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -26,7 +26,7 @@ public class CoreMetaData extends CleverTapMetaData {\nprivate final Object appLaunchPushedLock = new Object();\n- private String currentScreenName = \"\";\n+ private String currentScreenName = null;\nprivate int currentSessionId = 0;\n@@ -208,7 +208,7 @@ public class CoreMetaData extends CleverTapMetaData {\n}\npublic String getScreenName() {\n- return currentScreenName.equals(\"\") ? null : currentScreenName;\n+ return currentScreenName;\n}\npublic synchronized void setWzrkParams(JSONObject wzrkParams) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(record screen): handle null pointer exception in recordScreen() SDK-803 |
116,612 | 15.06.2021 14:16:08 | -19,080 | eb8cefa08f3a9c683af5887066ef58c71ae74564 | fix(record screen): add recordScreen() API in sample | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -4,7 +4,12 @@ object HomeScreenModel {\nval listData: Map<String, List<String>> by lazy {\nmapOf(\n- \"EVENTS\" to listOf(\"Record Event\", \"Record event with properties\", \"Record Charged Event\"),\n+ \"EVENTS\" to listOf(\n+ \"Record Event\",\n+ \"Record event with properties\",\n+ \"Record Charged Event\",\n+ \"Record Screen Event\"\n+ ),\n\"USER PROFILE\" to listOf(\n\"Push profile\", \"Update(Replace) Single-Value properties\",\n\"Update(Add) Single-Value properties\", \"Update(Remove) Single-Value properties\",\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -54,6 +54,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.pushChargedEvent(chargeDetails, items)\n}\n+ \"03\" -> cleverTapAPI?.recordScreen(\"Cart Screen Viewed\")\n\"10\" -> {\n//Record a profile\nval profileUpdate = HashMap<String, Any>()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(record screen): add recordScreen() API in sample SDK-803 |
116,616 | 15.06.2021 16:45:47 | -19,080 | 77c2675e03429bbc246d43728fbb72262d690e09 | updates commons.gradle with jacoco excludes | [
{
"change_type": "MODIFY",
"old_path": "gradle-scripts/commons.gradle",
"new_path": "gradle-scripts/commons.gradle",
"diff": "@@ -93,6 +93,7 @@ jacoco {\ntasks.withType(Test) {\njacoco.includeNoLocationClasses = true\n+ jacoco.excludes = ['jdk.internal.*']//https://github.com/gradle/gradle/issues/5184\n}\ntask jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | updates commons.gradle with jacoco excludes |
116,616 | 18.06.2021 11:54:29 | -19,080 | 1f72caec0c3a70135e9684df572e54ca7cb88b75 | initDeviceInfo() moved from task to main thread. | [
{
"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": "@@ -20,8 +20,6 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationManagerCompat;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n-import com.clevertap.android.sdk.task.CTExecutorFactory;\n-import com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.CTJsonConverter;\nimport com.clevertap.android.sdk.validation.ValidationResult;\nimport com.clevertap.android.sdk.validation.ValidationResultFactory;\n@@ -30,7 +28,6 @@ import java.lang.annotation.RetentionPolicy;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n-import java.util.concurrent.Callable;\nimport org.json.JSONObject;\n@@ -324,23 +321,16 @@ public class DeviceInfo {\nprivate final CoreMetaData mCoreMetaData;\n- DeviceInfo(Context context, CleverTapInstanceConfig config, final String cleverTapID,\n+ DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID,\nCoreMetaData coreMetaData) {\nthis.context = context;\nthis.config = config;\nthis.library = null;\nmCoreMetaData = coreMetaData;\n- Task<Void> initDeviceIDTask = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n- initDeviceIDTask.execute(\"initDeviceInfo\",new Callable<Void>() {\n- @Override\n- public Void call() {\nonInitDeviceInfo(cleverTapID);\n- return null;\n- }\n- });\n}\n- void onInitDeviceInfo(final String cleverTapID) {\n+ void onInitDeviceInfo(String cleverTapID) {\nThread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | initDeviceInfo() moved from task to main thread. |
116,623 | 18.06.2021 12:43:01 | -19,080 | 69d36fe5b2d078e1467f8bbbfbe79cbfca5ac3b8 | task(SDK-886): Added code to exclude activity from lifecycle callbacks | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifecycleCallback.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifecycleCallback.java",
"diff": "@@ -2,8 +2,10 @@ package com.clevertap.android.sdk;\nimport android.annotation.TargetApi;\nimport android.app.Activity;\n+import android.content.Context;\nimport android.os.Build;\nimport android.os.Bundle;\n+import java.util.HashSet;\n/**\n* Class for handling activity lifecycle events\n@@ -13,6 +15,8 @@ public final class ActivityLifecycleCallback {\npublic static boolean registered = false;\n+ private static HashSet<String> excludedActivitiesSet = null;\n+\n/**\n* Enables lifecycle callbacks for Android devices\n*\n@@ -31,17 +35,23 @@ public final class ActivityLifecycleCallback {\nreturn;\n}\n+ updateBlacklistedActivitySet(application.getApplicationContext());\n+\nregistered = true;\napplication.registerActivityLifecycleCallbacks(\nnew android.app.Application.ActivityLifecycleCallbacks() {\n@Override\npublic void onActivityCreated(Activity activity, Bundle bundle) {\n+ if (canProcessLifeCycleCallbacksOnActivity(activity)) {\nif (cleverTapID != null) {\nCleverTapAPI.onActivityCreated(activity, cleverTapID);\n} else {\nCleverTapAPI.onActivityCreated(activity);\n}\n+ } else {\n+ Logger.v(\"Not running onActivityCreated for - \" + activity.getLocalClassName());\n+ }\n}\n@Override\n@@ -55,11 +65,15 @@ public final class ActivityLifecycleCallback {\n@Override\npublic void onActivityResumed(Activity activity) {\n+ if (canProcessLifeCycleCallbacksOnActivity(activity)) {\nif (cleverTapID != null) {\nCleverTapAPI.onActivityResumed(activity, cleverTapID);\n} else {\nCleverTapAPI.onActivityResumed(activity);\n}\n+ } else {\n+ Logger.v(\"Not running onActivityResumed for - \" + activity.getLocalClassName());\n+ }\n}\n@Override\n@@ -88,4 +102,31 @@ public final class ActivityLifecycleCallback {\npublic static synchronized void register(android.app.Application application) {\nregister(application, null);\n}\n+\n+ private static boolean canProcessLifeCycleCallbacksOnActivity(Activity activity) {\n+ for (String blacklistedActivity : excludedActivitiesSet) {\n+ if (activity != null && activity.getLocalClassName().contains(blacklistedActivity)) {\n+ return false;\n+ }\n+ }\n+ return true;\n+ }\n+\n+ private static void updateBlacklistedActivitySet(Context context) {\n+ if (excludedActivitiesSet == null) {\n+ excludedActivitiesSet = new HashSet<>();\n+ try {\n+ String activities = ManifestInfo.getInstance(context).getExcludedActivitiesForLifecycleMethods();\n+ if (activities != null) {\n+ String[] split = activities.split(\",\");\n+ for (String a : split) {\n+ excludedActivitiesSet.add(a.trim());\n+ Logger.v(\"Excluding following activity - \" + a.trim());\n+ }\n+ }\n+ } catch (Throwable t) {\n+ // Ignore\n+ }\n+ }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -31,6 +31,7 @@ public interface Constants {\nString LABEL_TOKEN = \"CLEVERTAP_TOKEN\";\nString LABEL_NOTIFICATION_ICON = \"CLEVERTAP_NOTIFICATION_ICON\";\nString LABEL_INAPP_EXCLUDE = \"CLEVERTAP_INAPP_EXCLUDE\";\n+ String LABEL_ACTIVITY_EXCLUDE = \"CLEVERTAP_ACTIVITY_EXCLUDE\";\nString LABEL_REGION = \"CLEVERTAP_REGION\";\nString LABEL_DISABLE_APP_LAUNCH = \"CLEVERTAP_DISABLE_APP_LAUNCHED\";\nString LABEL_SSL_PINNING = \"CLEVERTAP_SSL_PINNING\";\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": "@@ -24,7 +24,9 @@ public class ManifestInfo {\nprivate static ManifestInfo instance;\n- private static String excludedActivities;\n+ private static String excludedActivitiesForLifecycleMethods;\n+\n+ private static String excludedActivitiesForInApps;\nprivate static boolean sslPinning;\n@@ -77,7 +79,9 @@ public class ManifestInfo {\nnotificationIcon = _getManifestStringValueForKey(metaData, Constants.LABEL_NOTIFICATION_ICON);\nuseADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));\nappLaunchedDisabled = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));\n- excludedActivities = _getManifestStringValueForKey(metaData, Constants.LABEL_INAPP_EXCLUDE);\n+ excludedActivitiesForInApps = _getManifestStringValueForKey(metaData, Constants.LABEL_INAPP_EXCLUDE);\n+ excludedActivitiesForLifecycleMethods = _getManifestStringValueForKey(metaData,\n+ Constants.LABEL_ACTIVITY_EXCLUDE);\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BACKGROUND_SYNC));\nuseCustomID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_CUSTOM_ID));\n@@ -101,10 +105,26 @@ public class ManifestInfo {\nreturn accountId;\n}\n+ public String getExcludedActivities() {\n+ return excludedActivitiesForInApps;\n+ }\n+\n+ public String getExcludedActivitiesForLifecycleMethods() {\n+ return excludedActivitiesForLifecycleMethods;\n+ }\n+\npublic String getFCMSenderId() {\nreturn fcmSenderId;\n}\n+ public String getIntentServiceName() {\n+ return intentServiceName;\n+ }\n+\n+ public String getNotificationIcon() {\n+ return notificationIcon;\n+ }\n+\npublic String[] getProfileKeys() {\nreturn profileKeys;\n}\n@@ -129,18 +149,6 @@ public class ManifestInfo {\nreturn accountToken;\n}\n- public String getExcludedActivities() {\n- return excludedActivities;\n- }\n-\n- public String getIntentServiceName() {\n- return intentServiceName;\n- }\n-\n- public String getNotificationIcon() {\n- return notificationIcon;\n- }\n-\nString getPackageName() {\nreturn packageName;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -772,7 +772,7 @@ public class PushProviders implements CTPushProviderListener {\nif (VERSION_CODE < provider.minSDKSupportVersionCode()) {\nconfig.log(PushConstants.LOG_TAG,\n- \"Provider: %s version %s does not match the SDK version %s. Make sure all Airship dependencies are the same version.\");\n+ \"Provider: %s version %s does not match the SDK version %s. Make sure all CleverTap dependencies are the same version.\");\nreturn false;\n}\nswitch (provider.getPushType()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!-- <meta-data\nandroid:name=\"CLEVERTAP_IDENTIFIER\"\nandroid:value=\"Email,Phone\" />-->\n+ <meta-data\n+ android:name=\"CLEVERTAP_ACTIVITY_EXCLUDE\"\n+ android:value=\"HomeScreenActivity\" />\n<service\nandroid:name=\"com.clevertap.android.sdk.pushnotification.fcm.FcmMessageListenerService\"\nandroid:exported=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "@@ -8,6 +8,7 @@ import com.clevertap.android.sdk.CleverTapAPI\nclass MyApplication : MultiDexApplication() {\noverride fun onCreate() {\n+ CleverTapAPI.setDebugLevel(3)\nActivityLifecycleCallback.register(this)\nsuper.onCreate()\nCleverTapAPI.createNotificationChannel(\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-886): Added code to exclude activity from lifecycle callbacks |
116,616 | 18.06.2021 13:00:12 | -19,080 | bc345fa34660e3ba86f0f869cfa76b4f9f7e1b91 | added final keyword back to ctID | [
{
"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": "@@ -330,7 +330,7 @@ public class DeviceInfo {\nonInitDeviceInfo(cleverTapID);\n}\n- void onInitDeviceInfo(String cleverTapID) {\n+ void onInitDeviceInfo(final String cleverTapID) {\nThread deviceInfoCacheThread = new Thread(new Runnable() {\n@Override\npublic void run() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | added final keyword back to ctID |
116,612 | 21.06.2021 14:32:19 | -19,080 | 5cb828c54f09c87125cc25f45a1b042a888ccaa8 | task(verbose_log): add VERBOSE log level to CleverTapAPI | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -73,7 +73,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic enum LogLevel {\nOFF(-1),\nINFO(0),\n- DEBUG(2);\n+ DEBUG(2),\n+ VERBOSE(3);\nprivate final int value;\n@@ -629,7 +630,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*\n* @param level Can be one of the following: -1 (disables all debugging), 0 (default, shows minimal SDK\n* integration related logging),\n- * 1(shows debug output)\n+ * 1(shows debug output), 3(shows verbose output)\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic static void setDebugLevel(int level) {\n@@ -642,7 +643,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*\n* @param level Can be one of the following: LogLevel.OFF (disables all debugging), LogLevel.INFO (default, shows\n* minimal SDK integration related logging),\n- * LogLevel.DEBUG(shows debug output)\n+ * LogLevel.DEBUG(shows debug output),LogLevel.VERBOSE(shows verbose output)\n*/\n@SuppressWarnings({\"unused\"})\npublic static void setDebugLevel(LogLevel level) {\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -7,6 +7,7 @@ import androidx.fragment.app.commitNow\nimport com.clevertap.android.sdk.CTFeatureFlagsListener\nimport com.clevertap.android.sdk.CTInboxListener\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.CleverTapAPI.LogLevel.DEBUG\nimport com.clevertap.android.sdk.SyncListener\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit\n@@ -37,7 +38,7 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\nprivate fun initCleverTap() {\n//Set Debug level for CleverTap\n- CleverTapAPI.setDebugLevel(3)\n+ CleverTapAPI.setDebugLevel(DEBUG)\n//Create CleverTap's default instance\ncleverTapDefaultInstance = CleverTapAPI.getDefaultInstance(this)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(verbose_log): add VERBOSE log level to CleverTapAPI SDK-873 |
116,623 | 21.06.2021 22:58:04 | -19,080 | c4db8ce3ab5644232cabee670ed6070044ac51fe | task(SDK-877): Update Huawei Plugin Dependency in Huawei Integration docs | [
{
"change_type": "MODIFY",
"old_path": "docs/CTHUAWEIPUSH.md",
"new_path": "docs/CTHUAWEIPUSH.md",
"diff": "@@ -29,11 +29,17 @@ Download the `agconnect-services.json` file from the Huawei Console. Move the do\n* Add the following dependency to your Project-level `build.gradle` file\n```groovy\n-dependencies {\n+buildscript {\n+ repositories {\n+ // FOR HUAWEI ADD THIS\n+ maven {url 'http://developer.huawei.com/repo/'}\n+ }\n+ dependencies {\n// FOR HUAWEI ADD THIS\nclasspath \"com.huawei.agconnect:agcp:1.4.1.300\"\n}\n+}\nallprojects {\nrepositories {\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTHUAWEIPUSH.md",
"new_path": "templates/CTHUAWEIPUSH.md",
"diff": "@@ -29,11 +29,17 @@ Download the `agconnect-services.json` file from the Huawei Console. Move the do\n* Add the following dependency to your Project-level `build.gradle` file\n```groovy\n-dependencies {\n+buildscript {\n+ repositories {\n+ // FOR HUAWEI ADD THIS\n+ maven {url 'http://developer.huawei.com/repo/'}\n+ }\n+ dependencies {\n// FOR HUAWEI ADD THIS\nclasspath \"${ext.agcp}${ext['version.com.huawei.agconnect..agcp']}\"\n}\n+}\nallprojects {\nrepositories {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-877): Update Huawei Plugin Dependency in Huawei Integration docs |
116,623 | 22.06.2021 13:03:54 | -19,080 | 7f5ab23e5e6b1066a53c4f3e960f241e69c618a7 | task(SDK-887): Removing lifecycle changes to exclude activities | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifecycleCallback.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifecycleCallback.java",
"diff": "@@ -14,9 +14,6 @@ import java.util.HashSet;\npublic final class ActivityLifecycleCallback {\npublic static boolean registered = false;\n-\n- private static HashSet<String> excludedActivitiesSet = null;\n-\n/**\n* Enables lifecycle callbacks for Android devices\n*\n@@ -35,23 +32,17 @@ public final class ActivityLifecycleCallback {\nreturn;\n}\n- updateBlacklistedActivitySet(application.getApplicationContext());\n-\nregistered = true;\napplication.registerActivityLifecycleCallbacks(\nnew android.app.Application.ActivityLifecycleCallbacks() {\n@Override\npublic void onActivityCreated(Activity activity, Bundle bundle) {\n- if (canProcessLifeCycleCallbacksOnActivity(activity)) {\nif (cleverTapID != null) {\nCleverTapAPI.onActivityCreated(activity, cleverTapID);\n} else {\nCleverTapAPI.onActivityCreated(activity);\n}\n- } else {\n- Logger.v(\"Not running onActivityCreated for - \" + activity.getLocalClassName());\n- }\n}\n@Override\n@@ -65,15 +56,11 @@ public final class ActivityLifecycleCallback {\n@Override\npublic void onActivityResumed(Activity activity) {\n- if (canProcessLifeCycleCallbacksOnActivity(activity)) {\nif (cleverTapID != null) {\nCleverTapAPI.onActivityResumed(activity, cleverTapID);\n} else {\nCleverTapAPI.onActivityResumed(activity);\n}\n- } else {\n- Logger.v(\"Not running onActivityResumed for - \" + activity.getLocalClassName());\n- }\n}\n@Override\n@@ -102,31 +89,4 @@ public final class ActivityLifecycleCallback {\npublic static synchronized void register(android.app.Application application) {\nregister(application, null);\n}\n-\n- private static boolean canProcessLifeCycleCallbacksOnActivity(Activity activity) {\n- for (String blacklistedActivity : excludedActivitiesSet) {\n- if (activity != null && activity.getLocalClassName().contains(blacklistedActivity)) {\n- return false;\n- }\n- }\n- return true;\n- }\n-\n- private static void updateBlacklistedActivitySet(Context context) {\n- if (excludedActivitiesSet == null) {\n- excludedActivitiesSet = new HashSet<>();\n- try {\n- String activities = ManifestInfo.getInstance(context).getExcludedActivitiesForLifecycleMethods();\n- if (activities != null) {\n- String[] split = activities.split(\",\");\n- for (String a : split) {\n- excludedActivitiesSet.add(a.trim());\n- Logger.v(\"Excluding following activity - \" + a.trim());\n- }\n- }\n- } catch (Throwable t) {\n- // Ignore\n- }\n- }\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -31,7 +31,6 @@ public interface Constants {\nString LABEL_TOKEN = \"CLEVERTAP_TOKEN\";\nString LABEL_NOTIFICATION_ICON = \"CLEVERTAP_NOTIFICATION_ICON\";\nString LABEL_INAPP_EXCLUDE = \"CLEVERTAP_INAPP_EXCLUDE\";\n- String LABEL_ACTIVITY_EXCLUDE = \"CLEVERTAP_ACTIVITY_EXCLUDE\";\nString LABEL_REGION = \"CLEVERTAP_REGION\";\nString LABEL_DISABLE_APP_LAUNCH = \"CLEVERTAP_DISABLE_APP_LAUNCHED\";\nString LABEL_SSL_PINNING = \"CLEVERTAP_SSL_PINNING\";\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": "@@ -24,8 +24,6 @@ public class ManifestInfo {\nprivate static ManifestInfo instance;\n- private static String excludedActivitiesForLifecycleMethods;\n-\nprivate static String excludedActivitiesForInApps;\nprivate static boolean sslPinning;\n@@ -80,8 +78,6 @@ public class ManifestInfo {\nuseADID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_USE_GOOGLE_AD_ID));\nappLaunchedDisabled = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_DISABLE_APP_LAUNCH));\nexcludedActivitiesForInApps = _getManifestStringValueForKey(metaData, Constants.LABEL_INAPP_EXCLUDE);\n- excludedActivitiesForLifecycleMethods = _getManifestStringValueForKey(metaData,\n- Constants.LABEL_ACTIVITY_EXCLUDE);\nsslPinning = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_SSL_PINNING));\nbackgroundSync = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BACKGROUND_SYNC));\nuseCustomID = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_CUSTOM_ID));\n@@ -105,14 +101,6 @@ public class ManifestInfo {\nreturn accountId;\n}\n- public String getExcludedActivities() {\n- return excludedActivitiesForInApps;\n- }\n-\n- public String getExcludedActivitiesForLifecycleMethods() {\n- return excludedActivitiesForLifecycleMethods;\n- }\n-\npublic String getFCMSenderId() {\nreturn fcmSenderId;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-887): Removing lifecycle changes to exclude activities |
116,623 | 22.06.2021 14:34:00 | -19,080 | 4605355edc0bf6adbc258bb22af00680cc83d588 | task(SDK-887): Added getExcludedActivities methods in ManifestInfo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -101,6 +101,10 @@ public class ManifestInfo {\nreturn accountId;\n}\n+ public String getExcludedActivities() {\n+ return excludedActivitiesForInApps;\n+ }\n+\npublic String getFCMSenderId() {\nreturn fcmSenderId;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-887): Added getExcludedActivities methods in ManifestInfo |
116,616 | 22.06.2021 15:59:01 | -19,080 | 2397749b1874970cf7f3264c19728428f903bd6b | task(SDK-895)- add public methods for incr/decr, add support only for int values, update MockAnalyticsManager.kt | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -103,6 +103,20 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n});\n}\n+ @Override\n+ public void incrementValue(String key, Number value) {\n+ String command = (localDataStore.getProfileValueForKey(key) != null)\n+ ? Constants.COMMAND_INCREMENT : Constants.COMMAND_SET;\n+ _constructIncrementDecrementValues(value,key,command);\n+ }\n+\n+ @Override\n+ public void decrementValue(String key, Number value) {\n+ String command = (localDataStore.getProfileValueForKey(key) != null)\n+ ? Constants.COMMAND_DECREMENT : Constants.COMMAND_SET;\n+ _constructIncrementDecrementValues(value,key,command);\n+ }\n+\n/**\n* This method is internal to the CleverTap SDK.\n* Developers should not use this method manually\n@@ -1001,6 +1015,51 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\n}\n+ private void _constructIncrementDecrementValues(Number value, String key, String command) {\n+ try {\n+ if (key == null) {\n+ return;\n+ }\n+\n+ // validate the key\n+ ValidationResult vr = validator.cleanObjectKey(key);\n+ key = vr.getObject().toString();\n+\n+ if (key.isEmpty()) {\n+ ValidationResult error = ValidationResultFactory.create(512, Constants.KEY_EMPTY);\n+ validationResultStack.pushValidationResult(error);\n+ config.getLogger().debug(config.getAccountId(), error.getErrorDesc());\n+ // Abort\n+ return;\n+ }\n+\n+ // Check for an error\n+ if (vr.getErrorCode() != 0) {\n+ validationResultStack.pushValidationResult(vr);\n+ }\n+\n+ Number updatedValue;\n+ Object existing = _getProfilePropertyIgnorePersonalizationFlag(key);\n+ if (existing == null) {\n+ updatedValue = value;\n+ } else {\n+ Number cachedValue = (Number) localDataStore.getProfileValueForKey(key);\n+ updatedValue = cachedValue.intValue() + value.intValue();\n+ }\n+\n+ localDataStore.setProfileField(key, updatedValue);\n+ config.getLogger().verbose(config.getAccountId(), \"Value for--->\" + localDataStore.getProfileValueForKey(key));\n+\n+ JSONObject commandObj = new JSONObject().put(command, updatedValue);\n+ JSONObject updateObj = new JSONObject().put(key, commandObj);\n+ baseEventQueueManager.pushBasicProfile(updateObj);\n+ } catch (Throwable t) {\n+ config.getLogger().verbose(config.getAccountId(), \"Failed to update profile value for key \" + key, t);\n+ }\n+\n+ }\n+\n+\nprivate void _push(Map<String, Object> profile) {\nif (profile == null || profile.isEmpty()) {\nreturn;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseAnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseAnalyticsManager.java",
"diff": "@@ -10,6 +10,10 @@ public abstract class BaseAnalyticsManager {\npublic abstract void addMultiValuesForKey(String key, ArrayList<String> values);\n+ public abstract void incrementValue(String key, Number value);\n+\n+ public abstract void decrementValue(String key, Number value);\n+\npublic abstract void fetchFeatureFlags();\n//Event\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": "@@ -2133,14 +2133,30 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().removeValueForKey(key);\n}\n-\n- public void incrementValueBy(final String key, Number value){\n-\n+ /**\n+ * This method is used to increment the given value\n+ *\n+ * Number should be in positive range\n+ *\n+ * @param key String\n+ * @param value Number\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void incrementValue(final String key, final Number value){\n+ coreState.getAnalyticsManager().incrementValue(key,value);\n}\n-\n- public void decrementValueBy(final String key, Number value){\n-\n+ /**\n+ * This method is used to decrement the given value\n+ *\n+ * Number should be in positive range\n+ *\n+ * @param key String\n+ * @param value Number\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void decrementValue(final String key, final Number value){\n+ coreState.getAnalyticsManager().decrementValue(key,value);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockAnalyticsManager.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/MockAnalyticsManager.kt",
"diff": "@@ -8,6 +8,13 @@ import java.util.ArrayList\nclass MockAnalyticsManager : BaseAnalyticsManager() {\noverride fun addMultiValuesForKey(key: String, values: ArrayList<String>) {}\n+ override fun incrementValue(key: String, value: Number) {\n+\n+ }\n+ override fun decrementValue(key: String, value: Number) {\n+\n+ }\n+\noverride fun fetchFeatureFlags() {}\noverride fun forcePushAppLaunchedEvent() {}\noverride fun pushAppLaunchedEvent() {}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-895)- add public methods for incr/decr, add support only for int values, update MockAnalyticsManager.kt |
116,616 | 24.06.2021 11:08:35 | -19,080 | feea5a842331a56ffbf29dfb08a5ef3a67488c8a | task(SDK-895)-Add support for incr/decr for float and double values | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -7,6 +7,7 @@ import android.content.Context;\nimport android.location.Location;\nimport android.net.Uri;\nimport android.os.Bundle;\n+import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\n@@ -1015,12 +1016,14 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\n}\n- private void _constructIncrementDecrementValues(Number value, String key, String command) {\n+ private void _constructIncrementDecrementValues(Number value, String key, String command) {//Change method name\ntry {\nif (key == null) {\nreturn;\n}\n+ //Add value check here.\n+\n// validate the key\nValidationResult vr = validator.cleanObjectKey(key);\nkey = vr.getObject().toString();\n@@ -1038,18 +1041,11 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nvalidationResultStack.pushValidationResult(vr);\n}\n- Number updatedValue;\n- Object existing = _getProfilePropertyIgnorePersonalizationFlag(key);\n- if (existing == null) {\n- updatedValue = value;\n- } else {\n- Number cachedValue = (Number) localDataStore.getProfileValueForKey(key);\n- updatedValue = cachedValue.intValue() + value.intValue();\n- }\n-\n+ Number updatedValue = _handleIncrementDecrementValues(key,value,command);\n+ //Save updated values locally\nlocalDataStore.setProfileField(key, updatedValue);\n- config.getLogger().verbose(config.getAccountId(), \"Value for--->\" + localDataStore.getProfileValueForKey(key));\n+ // push to server\nJSONObject commandObj = new JSONObject().put(command, updatedValue);\nJSONObject updateObj = new JSONObject().put(key, commandObj);\nbaseEventQueueManager.pushBasicProfile(updateObj);\n@@ -1059,6 +1055,33 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\n+ private Number _handleIncrementDecrementValues(@NonNull String key, Number value, String command){\n+ Number updatedValue = null;\n+ Number existingValue = (Number) _getProfilePropertyIgnorePersonalizationFlag(key);\n+ if (existingValue == null) {\n+ updatedValue = value;\n+ return updatedValue;\n+ }\n+\n+ if (existingValue.equals(existingValue.intValue())){\n+ if (command.equals(Constants.COMMAND_INCREMENT))\n+ updatedValue = existingValue.intValue() + value.intValue();\n+ else if (command.equals(Constants.COMMAND_DECREMENT))\n+ updatedValue = existingValue.intValue() - value.intValue();\n+ }else if (existingValue.equals(existingValue.floatValue())){\n+ if (command.equals(Constants.COMMAND_INCREMENT))\n+ updatedValue = existingValue.floatValue() + value.floatValue();\n+ else if (command.equals(Constants.COMMAND_DECREMENT))\n+ updatedValue = existingValue.floatValue() - value.floatValue();\n+ }else if (existingValue.equals(existingValue.doubleValue())){\n+ if (command.equals(Constants.COMMAND_INCREMENT))\n+ updatedValue = existingValue.doubleValue() + value.doubleValue();\n+ else if (command.equals(Constants.COMMAND_DECREMENT))\n+ updatedValue = existingValue.doubleValue() - value.doubleValue();\n+ }\n+ return updatedValue;\n+ }\n+\nprivate void _push(Map<String, Object> profile) {\nif (profile == null || profile.isEmpty()) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-895)-Add support for incr/decr for float and double values |
116,616 | 24.06.2021 11:13:49 | -19,080 | c7ab2456af01ccfeeb72e26c0d99e5738e84876b | task(SDK-908)-Update sample project with incr/decr operators | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -14,7 +14,8 @@ object HomeScreenModel {\n\"Push profile\", \"Update(Replace) Single-Value properties\",\n\"Update(Add) Single-Value properties\", \"Update(Remove) Single-Value properties\",\n\"Update(Replace) Multi-Value property\", \"Update(Add) Multi-Value property\",\n- \"Update(Remove) Multi-Value property\", \"Profile Location\", \"Get User Profile Property\",\n+ \"Update(Remove) Multi-Value property\", \"Update(Add) Increment Value\",\n+ \"Update(Add) Decrement Value\",\"Profile Location\", \"Get User Profile Property\",\n\"onUserLogin\"\n),\n\"INBOX\" to listOf(\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -115,16 +115,24 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.removeMultiValuesForKey(\"MyStuffList\", arrayListOf(\"Socks\", \"Scarf\"))\n}\n\"17\" -> {\n+ //Update(Add) Increment Value\n+ cleverTapAPI?.incrementValue(\"score\", 50)\n+ }\n+ \"18\" -> {\n+ // Update(Add) Decrement Value\n+ cleverTapAPI?.decrementValue(\"score\", 30)\n+ }\n+ \"19\" -> {\n// Profile location\ncleverTapAPI?.location = cleverTapAPI?.location\n}\n- \"18\" -> {\n+ \"110\" -> {\n// Get Profile Info\nprintln(\"Profile Name = ${cleverTapAPI?.getProperty(\"Name\")}\")\nprintln(\"Profile CleverTapId = ${cleverTapAPI?.cleverTapID}\")\nprintln(\"Profile CleverTap AttributionIdentifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n}\n- \"19\" -> {\n+ \"111\" -> {\n// onUserLogin\nval newProfile = HashMap<String, Any>()\nvar n = (0..10_000).random()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-908)-Update sample project with incr/decr operators |
116,616 | 24.06.2021 11:19:08 | -19,080 | 773990d8e95077369a5808b647ce4893a42b3f90 | task(SDK-896)-Add test case for int/incr | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ValidationResult.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ValidationResult.java",
"diff": "@@ -44,7 +44,7 @@ public final class ValidationResult {\nthis.errorDesc = errorDesc;\n}\n- void setObject(Object object) {\n+ public void setObject(Object object) {\nthis.object = object;\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/AnalyticsManagerTest.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import com.clevertap.android.sdk.events.BaseEventQueueManager\n+import com.clevertap.android.sdk.events.EventQueueManager\n+import com.clevertap.android.sdk.validation.ValidationResult\n+import com.clevertap.android.sdk.validation.Validator\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.json.JSONObject\n+import org.junit.Before\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.mockito.ArgumentCaptor\n+import org.mockito.Mockito\n+import org.mockito.Mockito.`when`\n+import org.mockito.Mockito.verify\n+import org.robolectric.RobolectricTestRunner\n+import org.skyscreamer.jsonassert.JSONAssert\n+\n+@RunWith(RobolectricTestRunner::class)\n+class AnalyticsManagerTest : BaseTestCase() {\n+\n+ private lateinit var analyticsManagerSUT: AnalyticsManager\n+ private lateinit var corestate: MockCoreState\n+ private lateinit var validator: Validator\n+ private lateinit var baseEventQueueManager: BaseEventQueueManager\n+\n+ @Before\n+ override fun setUp() {\n+ super.setUp()\n+ validator = Mockito.mock(Validator::class.java)\n+ baseEventQueueManager= Mockito.mock(EventQueueManager::class.java)\n+ corestate = MockCoreState(application, cleverTapInstanceConfig)\n+ analyticsManagerSUT = AnalyticsManager(application,cleverTapInstanceConfig,\n+ baseEventQueueManager,validator,corestate.validationResultStack,\n+ corestate.coreMetaData, corestate.localDataStore,corestate.deviceInfo,\n+ corestate.callbackManager,corestate.controllerManager,corestate.ctLockManager)\n+ }\n+\n+ @Test\n+ fun test_incrementValue_intValueIsPassed_incrementIntValue() {\n+ val validationResult = ValidationResult()\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20)\n+ val updateObj = JSONObject().put(\"score\", commandObj)\n+ validationResult.`object` = \"score\"\n+ validationResult.errorCode = 11\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(corestate.localDataStore.getProfileValueForKey(\"score\"))\n+ .thenReturn(10)\n+ `when`(validator.cleanObjectKey(\"score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.incrementValue(\"score\",10)\n+\n+ verify(corestate.localDataStore).setProfileField(\"score\",20)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-896)-Add test case for int/incr |
116,616 | 24.06.2021 19:57:48 | -19,080 | 9ca6f6c5d64b9bd59d55b64b58cfd170a503772e | task(SDK-896)-Add remaining test cases, add check for negative value | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -1018,24 +1018,31 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nprivate void _constructIncrementDecrementValues(Number value, String key, String command) {//Change method name\ntry {\n- if (key == null) {\n+ if (key == null || value == null) {\nreturn;\n}\n- //Add value check here.\n-\n// validate the key\nValidationResult vr = validator.cleanObjectKey(key);\nkey = vr.getObject().toString();\nif (key.isEmpty()) {\n- ValidationResult error = ValidationResultFactory.create(512, Constants.KEY_EMPTY);\n+ ValidationResult error = ValidationResultFactory.create(523, Constants.INVALID_MULTI_VALUE_KEY, key);\n+ validationResultStack.pushValidationResult(error);\n+ config.getLogger().debug(config.getAccountId(), error.getErrorDesc());\n+ // Abort\n+ return;\n+ }\n+\n+ if (value.intValue() < 0 || value.doubleValue() < 0 || value.floatValue() < 0){\n+ ValidationResult error = ValidationResultFactory.create(512, Constants.INVALID_MULTI_VALUE, key);\nvalidationResultStack.pushValidationResult(error);\nconfig.getLogger().debug(config.getAccountId(), error.getErrorDesc());\n// Abort\nreturn;\n}\n+\n// Check for an error\nif (vr.getErrorCode() != 0) {\nvalidationResultStack.pushValidationResult(vr);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/AnalyticsManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/AnalyticsManagerTest.kt",
"diff": "@@ -20,7 +20,7 @@ import org.skyscreamer.jsonassert.JSONAssert\nclass AnalyticsManagerTest : BaseTestCase() {\nprivate lateinit var analyticsManagerSUT: AnalyticsManager\n- private lateinit var corestate: MockCoreState\n+ private lateinit var coreState: MockCoreState\nprivate lateinit var validator: Validator\nprivate lateinit var baseEventQueueManager: BaseEventQueueManager\n@@ -29,31 +29,169 @@ class AnalyticsManagerTest : BaseTestCase() {\nsuper.setUp()\nvalidator = Mockito.mock(Validator::class.java)\nbaseEventQueueManager= Mockito.mock(EventQueueManager::class.java)\n- corestate = MockCoreState(application, cleverTapInstanceConfig)\n+ coreState = MockCoreState(application, cleverTapInstanceConfig)\nanalyticsManagerSUT = AnalyticsManager(application,cleverTapInstanceConfig,\n- baseEventQueueManager,validator,corestate.validationResultStack,\n- corestate.coreMetaData, corestate.localDataStore,corestate.deviceInfo,\n- corestate.callbackManager,corestate.controllerManager,corestate.ctLockManager)\n+ baseEventQueueManager,validator,coreState.validationResultStack,\n+ coreState.coreMetaData, coreState.localDataStore,coreState.deviceInfo,\n+ coreState.callbackManager,coreState.controllerManager,coreState.ctLockManager)\n+ }\n+\n+ @Test\n+ fun test_incrementValue_emptyKey_throwsEmptyKeyError() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"\"\n+ validationResult.errorCode = 523\n+\n+ analyticsManagerSUT.incrementValue(\"\",10)\n+\n+ `when`(validator.cleanObjectKey(\"\"))\n+ .thenReturn(validationResult)\n+ }\n+\n+ @Test\n+ fun test_decrementValue_negativeValue_throwsMalformedValueError() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"abc\"\n+ validationResult.errorCode = 512\n+\n+ analyticsManagerSUT.decrementValue(\"abc\",-10)\n+\n+ `when`(validator.cleanObjectKey(\"abc\"))\n+ .thenReturn(validationResult)\n}\n@Test\nfun test_incrementValue_intValueIsPassed_incrementIntValue() {\nval validationResult = ValidationResult()\n+ validationResult.`object` = \"int_score\"\n+ validationResult.errorCode = 200\n+\nval commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20)\n- val updateObj = JSONObject().put(\"score\", commandObj)\n- validationResult.`object` = \"score\"\n- validationResult.errorCode = 11\n+ val updateObj = JSONObject().put(\"int_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n- `when`(corestate.localDataStore.getProfileValueForKey(\"score\"))\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"int_score\"))\n.thenReturn(10)\n- `when`(validator.cleanObjectKey(\"score\"))\n+ `when`(validator.cleanObjectKey(\"int_score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.incrementValue(\"int_score\",10)\n+\n+ verify(coreState.localDataStore).setProfileField(\"int_score\",20)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+\n+ @Test\n+ fun test_incrementValue_doubleValueIsPassed_incrementDoubleValue() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"double_score\"\n+ validationResult.errorCode = 200\n+\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20.5)\n+ val updateObj = JSONObject().put(\"double_score\", commandObj)\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"double_score\"))\n+ .thenReturn(10.25)\n+ `when`(validator.cleanObjectKey(\"double_score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.incrementValue(\"double_score\",10.25)\n+\n+ verify(coreState.localDataStore).setProfileField(\"double_score\",20.5)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+\n+ @Test\n+ fun test_incrementValue_floatValueIsPassed_incrementFloatValue() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"float_score\"\n+ validationResult.errorCode = 200\n+\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20.5f)\n+ val updateObj = JSONObject().put(\"float_score\", commandObj)\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"float_score\"))\n+ .thenReturn(10.25f)\n+ `when`(validator.cleanObjectKey(\"float_score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.incrementValue(\"float_score\",10.25f)\n+\n+ verify(coreState.localDataStore).setProfileField(\"float_score\",20.5f)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+\n+ @Test\n+ fun test_decrementValue_intValueIsPassed_decrementIntValue() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"decr_int_score\"\n+ validationResult.errorCode = 200\n+\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 20)\n+ val updateObj = JSONObject().put(\"decr_int_score\", commandObj)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"decr_int_score\"))\n+ .thenReturn(30)\n+ `when`(validator.cleanObjectKey(\"decr_int_score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.decrementValue(\"decr_int_score\",10)\n+\n+ verify(coreState.localDataStore).setProfileField(\"decr_int_score\",20)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+\n+ @Test\n+ fun test_decrementValue_doubleValueIsPassed_decrementDoubleValue() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"decr_double_score\"\n+ validationResult.errorCode = 200\n+\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 9.75)\n+ val updateObj = JSONObject().put(\"decr_double_score\", commandObj)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"decr_double_score\"))\n+ .thenReturn(20.25)\n+ `when`(validator.cleanObjectKey(\"decr_double_score\"))\n+ .thenReturn(validationResult)\n+\n+ analyticsManagerSUT.decrementValue(\"decr_double_score\",10.50)\n+\n+ verify(coreState.localDataStore).setProfileField(\"decr_double_score\",9.75)\n+ verify(baseEventQueueManager).pushBasicProfile(captor.capture())\n+ JSONAssert.assertEquals(updateObj, captor.value, true)\n+ }\n+\n+ @Test\n+ fun test_decrementValue_floatValueIsPassed_decrementFloatValue() {\n+ val validationResult = ValidationResult()\n+ validationResult.`object` = \"decr_float_score\"\n+ validationResult.errorCode = 200\n+\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 9.75f)\n+ val updateObj = JSONObject().put(\"decr_float_score\", commandObj)\n+\n+ val captor = ArgumentCaptor.forClass(JSONObject::class.java)\n+\n+ `when`(coreState.localDataStore.getProfileValueForKey(\"decr_float_score\"))\n+ .thenReturn(20.25f)\n+ `when`(validator.cleanObjectKey(\"decr_float_score\"))\n.thenReturn(validationResult)\n- analyticsManagerSUT.incrementValue(\"score\",10)\n+ analyticsManagerSUT.decrementValue(\"decr_float_score\",10.50f)\n- verify(corestate.localDataStore).setProfileField(\"score\",20)\n+ verify(coreState.localDataStore).setProfileField(\"decr_float_score\",9.75f)\nverify(baseEventQueueManager).pushBasicProfile(captor.capture())\nJSONAssert.assertEquals(updateObj, captor.value, true)\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-896)-Add remaining test cases, add check for negative value |
116,616 | 28.06.2021 09:39:51 | -19,080 | 9ea3ff3266fab60a4627fcc4a05cfe19f75cfced | task(SDK-895)-Update invalid value error code and mssg. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -1016,7 +1016,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\n}\n- private void _constructIncrementDecrementValues(Number value, String key, String command) {//Change method name\n+ private void _constructIncrementDecrementValues(Number value, String key, String command) {\ntry {\nif (key == null || value == null) {\nreturn;\n@@ -1027,7 +1027,8 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nkey = vr.getObject().toString();\nif (key.isEmpty()) {\n- ValidationResult error = ValidationResultFactory.create(523, Constants.INVALID_MULTI_VALUE_KEY, key);\n+ ValidationResult error = ValidationResultFactory.create(512,\n+ Constants.PUSH_KEY_EMPTY, key);\nvalidationResultStack.pushValidationResult(error);\nconfig.getLogger().debug(config.getAccountId(), error.getErrorDesc());\n// Abort\n@@ -1035,7 +1036,8 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\nif (value.intValue() < 0 || value.doubleValue() < 0 || value.floatValue() < 0){\n- ValidationResult error = ValidationResultFactory.create(512, Constants.INVALID_MULTI_VALUE, key);\n+ ValidationResult error = ValidationResultFactory.create(512,\n+ Constants.INVALID_INCREMENT_DECREMENT_VALUE, key);\nvalidationResultStack.pushValidationResult(error);\nconfig.getLogger().debug(config.getAccountId(), error.getErrorDesc());\n// Abort\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": "@@ -274,6 +274,7 @@ public interface Constants {\nint INVALID_CT_CUSTOM_ID = 21;\nint INVALID_MULTI_VALUE_KEY = 23;\nint RESTRICTED_MULTI_VALUE_KEY = 24;\n+ int INVALID_INCREMENT_DECREMENT_VALUE = 25;\nString CLEVERTAP_IDENTIFIER = \"CLEVERTAP_IDENTIFIER\";\nString SEPARATOR_COMMA = \",\";\nString EMPTY_STRING = \"\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ValidationResultFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/ValidationResultFactory.java",
"diff": "@@ -31,6 +31,10 @@ public class ValidationResultFactory {\nmsg = \"Invalid multi value for key \" + values[0]\n+ \", profile multi value operation aborted.\";\nbreak;\n+ case Constants.INVALID_INCREMENT_DECREMENT_VALUE:\n+ msg = \"Increment/Decrement value for profile key \" + values[0]\n+ + \", cannot be zero or negative\";\n+ break;\ncase Constants.PUSH_KEY_EMPTY:\nmsg = \"Profile push key is empty\";\nbreak;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-895)-Update invalid value error code and mssg. |
116,612 | 02.07.2021 17:14:07 | -19,080 | cf19c255bf99554f45ff77dd15e42cf72ae55730 | task(async_deviceID): move initDeviceID(),getDeviceCachedInfo(),fetchGoogleAdID(),generateDeviceID() to I/O thread pool and re-init InAppFCManager, ProductConfig, Feature Flags after deviceID created | [
{
"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": "@@ -987,6 +987,12 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\n+ /* new Thread(\"SharedPreferences-load\") {\n+ public void run() {\n+ StorageHelper.getPreferences(context.getApplicationContext());\n+ }\n+ }.start();*/\n+\nCoreState coreState = CleverTapFactory\n.getCoreState(context, config, cleverTapID);\nsetCoreState(coreState);\n@@ -1007,7 +1013,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.coreState.getConfig().setCreatedPostAppLaunch();\n}\n-\ntask = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"setStatesAsync\", new Callable<Void>() {\n@Override\n@@ -2328,22 +2333,44 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n//To be called from DeviceInfo AdID GUID generation\nvoid deviceIDCreated(String deviceId) {\n- Logger.v(\"Initializing InAppFC after Device ID Created = \" + deviceId);\n+\n+ String accountId = coreState.getConfig().getAccountId();\n+\n+ if (coreState.getControllerManager() == null) {\n+ Logger.v(accountId, \"ControllerManager not set yet! Returning from deviceIDCreated()\");\n+ return;\n+ }\n+\n+ if (coreState.getControllerManager().getInAppFCManager() == null) {\n+ Logger.v(accountId, \"Initializing InAppFC after Device ID Created = \" + deviceId);\ncoreState.getControllerManager()\n.setInAppFCManager(new InAppFCManager(context, coreState.getConfig(), deviceId));\n- Logger.v(\"Initializing ABTesting after Device ID Created = \" + deviceId);\n+ }\n/*\nReinitialising product config & Feature Flag controllers with google ad id.\n*/\n- if (coreState.getControllerManager().getCTFeatureFlagsController() != null) {\n- coreState.getControllerManager().getCTFeatureFlagsController().setGuidAndInit(deviceId);\n+ CTFeatureFlagsController ctFeatureFlagsController = coreState.getControllerManager()\n+ .getCTFeatureFlagsController();\n+\n+ if (ctFeatureFlagsController != null) {\n+ if (!ctFeatureFlagsController.isInitialized()) {\n+ Logger.v(accountId,\n+ \"Initializing Feature Flags after Device ID Created = \" + deviceId);\n}\n- if (coreState.getControllerManager().getCTProductConfigController() != null) {\n- coreState.getControllerManager().getCTProductConfigController().setGuidAndInit(deviceId);\n+ ctFeatureFlagsController.setGuidAndInit(deviceId);\n}\n- getConfigLogger()\n- .verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\n+ CTProductConfigController ctProductConfigController = coreState.getControllerManager()\n+ .getCTProductConfigController();\n+\n+ if (ctProductConfigController != null) {\n+ if (!ctProductConfigController.isInitialized()) {\n+ Logger.v(accountId,\n+ \"Initializing Product Config after Device ID Created = \" + deviceId);\n+ }\n+ ctProductConfigController.setGuidAndInit(deviceId);\n+ }\n+ Logger.v(accountId, \"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -58,7 +58,8 @@ class CleverTapFactory {\nctLockManager, callbackManager, deviceInfo, baseDatabaseManager);\ncoreState.setControllerManager(controllerManager);\n- if (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null) {\n+ if (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null\n+ && controllerManager.getInAppFCManager() == null) {\ncoreState.getConfig().getLogger()\n.verbose(\"Initializing InAppFC with device Id = \" + coreState.getDeviceInfo().getDeviceID());\ncontrollerManager\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,12 +14,16 @@ import android.net.NetworkInfo;\nimport android.os.Build;\nimport android.telephony.TelephonyManager;\nimport android.util.DisplayMetrics;\n+import android.util.Log;\nimport android.view.WindowManager;\nimport androidx.annotation.IntDef;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationManagerCompat;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\n+import com.clevertap.android.sdk.task.CTExecutorFactory;\n+import com.clevertap.android.sdk.task.OnSuccessListener;\n+import com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.CTJsonConverter;\nimport com.clevertap.android.sdk.validation.ValidationResult;\nimport com.clevertap.android.sdk.validation.ValidationResultFactory;\n@@ -28,7 +32,7 @@ import java.lang.annotation.RetentionPolicy;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.UUID;\n-\n+import java.util.concurrent.Callable;\nimport org.json.JSONObject;\n@RestrictTo(Scope.LIBRARY)\n@@ -328,17 +332,36 @@ public class DeviceInfo {\nthis.library = null;\nmCoreMetaData = coreMetaData;\nonInitDeviceInfo(cleverTapID);\n+ Log.v(\"iotask\", \"DeviceInfo() called\");\n}\nvoid onInitDeviceInfo(final String cleverTapID) {\n- Thread deviceInfoCacheThread = new Thread(new Runnable() {\n+ Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(config).ioTask();\n+ taskDeviceCachedInfo.execute(\"getDeviceCachedInfo\", new Callable<Void>() {\n@Override\n- public void run() {\n+ public Void call() throws Exception {\ngetDeviceCachedInfo();\n+ return null;\n+ }\n+ });\n+\n+ Task<Void> task = CTExecutorFactory.executors(config).ioTask();\n+ task.addOnSuccessListener(new OnSuccessListener<Void>() {\n+ @Override\n+ public void onSuccess(final Void aVoid) {\n+ getConfigLogger().verbose(config.getAccountId(), \"DeviceID initialized successfully!\");\n+ // No need to put getDeviceID() on background thread because prefs already loaded\n+ CleverTapAPI.instanceWithConfig(context, config).deviceIDCreated(getDeviceID());\n}\n});\n- deviceInfoCacheThread.start();\n+ task.execute(\"initDeviceID\", new Callable<Void>() {\n+ @Override\n+ public Void call() throws Exception {\ninitDeviceID(cleverTapID);\n+ return null;\n+ }\n+ });\n+\n}\npublic boolean isErrorDeviceId() {\n@@ -579,6 +602,7 @@ public class DeviceInfo {\n}\nprivate synchronized void fetchGoogleAdID() {\n+ Log.v(\"initDeviceID()\", \"fetchGoogleAdID() called!\");\nif (getGoogleAdID() == null && !adIdRun) {\nString advertisingID = null;\ntry {\n@@ -591,6 +615,7 @@ public class DeviceInfo {\nBoolean limitedAdTracking = (Boolean) isLimitAdTracking.invoke(adInfo);\nsynchronized (adIDLock) {\nlimitAdTracking = limitedAdTracking != null && limitedAdTracking;\n+ Log.v(\"initDeviceID()\", \"limitAdTracking = \" + limitAdTracking);\nif (limitAdTracking) {\nreturn;\n}\n@@ -610,10 +635,13 @@ public class DeviceInfo {\ngoogleAdID = advertisingID.replace(\"-\", \"\");\n}\n}\n+\n+ Log.v(\"initDeviceID()\", \"fetchGoogleAdID() done executing!\");\n}\n}\nprivate synchronized void generateDeviceID() {\n+ Log.v(\"initDeviceID()\", \"generateDeviceID() called!\");\nString generatedDeviceID;\nString adId = getGoogleAdID();\nif (adId != null) {\n@@ -624,6 +652,7 @@ public class DeviceInfo {\n}\n}\nforceUpdateDeviceId(generatedDeviceID);\n+ Log.v(\"initDeviceID()\", \"generateDeviceID() done executing!\");\n}\nprivate String generateGUID() {\n@@ -654,7 +683,7 @@ public class DeviceInfo {\n}\nprivate void initDeviceID(String cleverTapID) {\n-\n+ Log.v(\"initDeviceID()\", \"Called initDeviceID()\");\n//Show logging as per Manifest flag\nif (config.getEnableCustomCleverTapId()) {\nif (cleverTapID == null) {\n@@ -668,7 +697,9 @@ public class DeviceInfo {\n}\n}\n+ Log.v(\"initDeviceID()\", \"Calling _getDeviceID\");\nString deviceID = _getDeviceID();\n+ Log.v(\"initDeviceID()\", \"Called _getDeviceID\");\nif (deviceID != null && deviceID.trim().length() > 2) {\ngetConfigLogger().verbose(config.getAccountId(), \"CleverTap ID already present for profile\");\nif (cleverTapID != null) {\n@@ -684,21 +715,18 @@ public class DeviceInfo {\n}\nif (!this.config.isUseGoogleAdId()) {\n+ Log.v(\"initDeviceID()\", \"Calling generateDeviceID()\");\ngenerateDeviceID();\n+ Log.v(\"initDeviceID()\", \"Called generateDeviceID()\");\nreturn;\n}\n// fetch the googleAdID to generate GUID\n//has to be called on background thread\n- Thread generateGUIDFromAdIDThread = new Thread(new Runnable() {\n- @Override\n- public void run() {\nfetchGoogleAdID();\ngenerateDeviceID();\n- CleverTapAPI.instanceWithConfig(context, config).deviceIDCreated(getDeviceID());\n- }\n- });\n- generateGUIDFromAdIDThread.start();\n+\n+ Log.v(\"initDeviceID()\", \"initDeviceID() done executing!\");\n}\nprivate String recordDeviceError(int messageCode, String... varargs) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): move initDeviceID(),getDeviceCachedInfo(),fetchGoogleAdID(),generateDeviceID() to I/O thread pool and re-init InAppFCManager, ProductConfig, Feature Flags after deviceID created SDK-934 |
116,612 | 02.07.2021 17:16:51 | -19,080 | f4ca127d6cefeb9e92248956d90a2dc0014a5e8a | task(async_deviceID): add OnInitDeviceIDListener and public overloaded method getCleverTapID() to fetch ID in async manner | [
{
"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": "@@ -28,6 +28,7 @@ import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n+import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n@@ -1286,6 +1287,17 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getDeviceInfo().getDeviceID();\n}\n+ public void getCleverTapID(@NonNull OnInitDeviceIDListener onInitDeviceIDListener) {\n+ Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\n+ taskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n+ @Override\n+ public Void call() throws Exception {\n+ onInitDeviceIDListener.onInitDeviceID(coreState.getDeviceInfo().getDeviceID());\n+ return null;\n+ }\n+ });\n+ }\n+\n@RestrictTo(Scope.LIBRARY)\npublic CoreState getCoreState() {\nreturn coreState;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/OnInitDeviceIDListener.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+public interface OnInitDeviceIDListener {\n+\n+ void onInitDeviceID(String deviceID);\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): add OnInitDeviceIDListener and public overloaded method getCleverTapID() to fetch ID in async manner SDK-934 |
116,612 | 02.07.2021 17:23:02 | -19,080 | 59133a8e74b615647cdf5f258bda09e6bcd5e495 | task(async_deviceID): add identifiers public APIs to sample app | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!-- android:name=\"CLEVERTAP_REGION\" -->\n<!-- android:value=\"eu1\"/> -->\n<!-- IMPORTANT: To force use Google AD ID to uniquely identify users, use the following meta tag. GDPR mandates that if you are using this tag, there is prominent disclousure to your end customer in their application. Read more about GDPR here - https://clevertap.com/blog/in-preparation-of-gdpr-compliance/ -->\n- <meta-data\n+ <!--<meta-data\nandroid:name=\"CLEVERTAP_USE_GOOGLE_AD_ID\"\n- android:value=\"1\" />\n+ android:value=\"1\" />-->\n<meta-data\nandroid:name=\"CLEVERTAP_SSL_PINNING\"\nandroid:value=\"0\" /> <!-- Add meta data for CleverTap Notification Icon -->\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "package com.clevertap.demo\nimport android.app.NotificationManager\n+import android.os.StrictMode\nimport androidx.multidex.MultiDexApplication\nimport com.clevertap.android.sdk.ActivityLifecycleCallback\nimport com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.CleverTapAPI.LogLevel.VERBOSE\n+import com.clevertap.android.sdk.SyncListener\n+import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener\n+import org.json.JSONObject\nclass MyApplication : MultiDexApplication() {\noverride fun onCreate() {\n- CleverTapAPI.setDebugLevel(3)\n+ StrictMode.setThreadPolicy(\n+ StrictMode.ThreadPolicy.Builder()\n+ .detectDiskReads()\n+ .detectDiskWrites()\n+ .detectNetwork() // or .detectAll() for all detectable problems\n+ .penaltyLog()\n+ .build()\n+ )\n+ StrictMode.setVmPolicy(\n+ StrictMode.VmPolicy.Builder()\n+ .detectLeakedSqlLiteObjects()\n+ .detectLeakedClosableObjects()\n+ .penaltyLog()\n+ .penaltyDeath()\n+ .build()\n+ )\n+ CleverTapAPI.setDebugLevel(VERBOSE)\nActivityLifecycleCallback.register(this)\nsuper.onCreate()\n+ val defaultInstance = CleverTapAPI.getDefaultInstance(this)\n+ defaultInstance?.syncListener = object : SyncListener {\n+ override fun profileDataUpdated(updates: JSONObject?) {//no op\n+ }\n+\n+ override fun profileDidInitialize(CleverTapID: String?) {\n+ println(\n+ \"CleverTap DeviceID from Application class= $CleverTapID\"\n+ )\n+ }\n+ }\n+\n+ defaultInstance?.getCleverTapID(OnInitDeviceIDListener {\n+ println(\n+ \"CleverTap DeviceID from Application class= $it\"\n+ )\n+ })\n+\n+ /*println(\n+ \"CleverTapAttribution Identifier from Application class= \" +\n+ \"${defaultInstance?.cleverTapAttributionIdentifier}\"\n+ )*/\nCleverTapAPI.createNotificationChannel(\nthis, \"BRTesting\", \"Offers\",\n\"All Offers\", NotificationManager.IMPORTANCE_MAX, true\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -39,7 +39,8 @@ object HomeScreenModel {\n),\n\"FEATURE FLAGS\" to listOf(\"Get Feature Flag\"),\n\"WEBVIEW\" to listOf(\"Raise events from WebView\"),\n- \"GEOFENCE\" to listOf(\"Init Geofence\", \"Trigger Location\", \"Deactivate Geofence\")\n+ \"GEOFENCE\" to listOf(\"Init Geofence\", \"Trigger Location\", \"Deactivate Geofence\"),\n+ \"DEVICE IDENTIFIERS\" to listOf(\"Fetch CleverTapAttribution Identifier\", \"Fetch CleverTap ID\")\n)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -272,6 +272,12 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.featureFlag()?.get(\"is shown\", true)\n}\"\n)\n+ \"80\" -> println(\"CleverTapAttribution Identifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n+ \"81\" -> cleverTapAPI?.getCleverTapID {\n+ println(\n+ \"CleverTap DeviceID from Application class= $it\"\n+ )\n+ }\n//\"60\" -> webViewClickListener?.onWebViewClick()\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): add identifiers public APIs to sample app SDK-934 |
116,612 | 02.07.2021 18:48:33 | -19,080 | 48c7d51e6400e7d291a6982c6871f9c11b9ce010 | task(async_deviceID): add documentation | [
{
"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": "@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.EventDetail;\n@@ -1271,8 +1272,12 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Returns a unique CleverTap identifier suitable for use with install attribution providers.\n*\n* @return The attribution identifier currently being used to identify this user.\n+ *\n+ * <p><br><span style=\"color:red;background:#ffcc99\" >⚠ this method may take a long time to return,\n+ * so you should not call it from the application main thread</span></p>\n*/\n@SuppressWarnings(\"unused\")\n+ @WorkerThread\npublic String getCleverTapAttributionIdentifier() {\nreturn coreState.getDeviceInfo().getAttributionID();\n}\n@@ -1281,12 +1286,21 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Returns a unique identifier by which CleverTap identifies this user.\n*\n* @return The user identifier currently being used to identify this user.\n+ *\n+ * <p><br><span style=\"color:red;background:#ffcc99\" >⚠ this method may take a long time to return,\n+ * so you should not call it from the application main thread</span></p>\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @WorkerThread\npublic String getCleverTapID() {\nreturn coreState.getDeviceInfo().getDeviceID();\n}\n+ /**\n+ * Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n+ *\n+ * @param onInitDeviceIDListener non-null callback to retrieve identifier on main thread.\n+ */\npublic void getCleverTapID(@NonNull OnInitDeviceIDListener onInitDeviceIDListener) {\nTask<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\ntaskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\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": "@@ -347,9 +347,11 @@ public class DeviceInfo {\nTask<Void> task = CTExecutorFactory.executors(config).ioTask();\ntask.addOnSuccessListener(new OnSuccessListener<Void>() {\n+ // callback on main thread\n@Override\npublic void onSuccess(final Void aVoid) {\n- getConfigLogger().verbose(config.getAccountId(), \"DeviceID initialized successfully!\");\n+ getConfigLogger().verbose(config.getAccountId(),\n+ \"DeviceID initialized successfully!\" + Thread.currentThread());\n// No need to put getDeviceID() on background thread because prefs already loaded\nCleverTapAPI.instanceWithConfig(context, config).deviceIDCreated(getDeviceID());\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): add documentation SDK-934 |
116,616 | 03.07.2021 13:23:31 | -19,080 | 8f0a1b269c1be6c5a8168afb07b5755ad4060a7d | task(SDK-895)- Update value to push to server, code refactor
task(SDK-896)-Update values in test cases | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -7,6 +7,8 @@ import android.content.Context;\nimport android.location.Location;\nimport android.net.Uri;\nimport android.os.Bundle;\n+import android.util.Log;\n+\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\n@@ -67,6 +69,12 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n+ private NUMBER_VALUE_TYPE numberValueType;\n+\n+ enum NUMBER_VALUE_TYPE {\n+ INT_NUMBER, FLOAT_NUMBER, DOUBLE_NUMBER\n+ }\n+\nAnalyticsManager(Context context,\nCleverTapInstanceConfig config,\nBaseEventQueueManager baseEventQueueManager,\n@@ -106,16 +114,12 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n@Override\npublic void incrementValue(String key, Number value) {\n- String command = (localDataStore.getProfileValueForKey(key) != null)\n- ? Constants.COMMAND_INCREMENT : Constants.COMMAND_SET;\n- _constructIncrementDecrementValues(value,key,command);\n+ _constructIncrementDecrementValues(value,key,Constants.COMMAND_INCREMENT);\n}\n@Override\npublic void decrementValue(String key, Number value) {\n- String command = (localDataStore.getProfileValueForKey(key) != null)\n- ? Constants.COMMAND_DECREMENT : Constants.COMMAND_SET;\n- _constructIncrementDecrementValues(value,key,command);\n+ _constructIncrementDecrementValues(value,key,Constants.COMMAND_DECREMENT);\n}\n/**\n@@ -1055,11 +1059,12 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nlocalDataStore.setProfileField(key, updatedValue);\n// push to server\n- JSONObject commandObj = new JSONObject().put(command, updatedValue);\n+ JSONObject commandObj = new JSONObject().put(command, value);\nJSONObject updateObj = new JSONObject().put(key, commandObj);\nbaseEventQueueManager.pushBasicProfile(updateObj);\n} catch (Throwable t) {\n- config.getLogger().verbose(config.getAccountId(), \"Failed to update profile value for key \" + key, t);\n+ config.getLogger().verbose(config.getAccountId(), \"Failed to update profile value for key \"\n+ + key, t);\n}\n}\n@@ -1067,30 +1072,82 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nprivate Number _handleIncrementDecrementValues(@NonNull String key, Number value, String command){\nNumber updatedValue = null;\nNumber existingValue = (Number) _getProfilePropertyIgnorePersonalizationFlag(key);\n+\n+ /*When existing value is NOT present in local data store,\n+ we check the give value number type and do the necessary operation*/\nif (existingValue == null) {\n- updatedValue = value;\n+ switch (getNumberValueType(value)){\n+ case DOUBLE_NUMBER:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\n+ updatedValue = value.doubleValue();\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\n+ updatedValue = -value.doubleValue();\n+ }\n+ break;\n+ case FLOAT_NUMBER:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\n+ updatedValue = value.floatValue();\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\n+ updatedValue = -value.floatValue();\n+ }\n+ break;\n+ default:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\n+ updatedValue = value.intValue();\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\n+ updatedValue = -value.intValue();\n+ }\n+ break;\n+\n+ }\nreturn updatedValue;\n+\n}\n- if (existingValue.equals(existingValue.intValue())){\n- if (command.equals(Constants.COMMAND_INCREMENT))\n- updatedValue = existingValue.intValue() + value.intValue();\n- else if (command.equals(Constants.COMMAND_DECREMENT))\n- updatedValue = existingValue.intValue() - value.intValue();\n- }else if (existingValue.equals(existingValue.floatValue())){\n- if (command.equals(Constants.COMMAND_INCREMENT))\n- updatedValue = existingValue.floatValue() + value.floatValue();\n- else if (command.equals(Constants.COMMAND_DECREMENT))\n- updatedValue = existingValue.floatValue() - value.floatValue();\n- }else if (existingValue.equals(existingValue.doubleValue())){\n- if (command.equals(Constants.COMMAND_INCREMENT))\n+ /*When existing value is present in local data store,\n+ we check the existing number type and do the necessary operation*/\n+ switch (getNumberValueType(existingValue)){\n+ case DOUBLE_NUMBER:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\nupdatedValue = existingValue.doubleValue() + value.doubleValue();\n- else if (command.equals(Constants.COMMAND_DECREMENT))\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\nupdatedValue = existingValue.doubleValue() - value.doubleValue();\n}\n+ break;\n+ case FLOAT_NUMBER:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\n+ updatedValue = existingValue.floatValue() + value.floatValue();\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\n+ updatedValue = existingValue.floatValue() - value.floatValue();\n+ }\n+ break;\n+ default:\n+ if (command.equals(Constants.COMMAND_INCREMENT)){\n+ updatedValue = existingValue.intValue() + value.intValue();\n+ }else if (command.equals(Constants.COMMAND_DECREMENT)){\n+ updatedValue = existingValue.intValue() - value.intValue();\n+ }\n+ break;\n+\n+ }\nreturn updatedValue;\n}\n+ /*\n+ Based on the number value type returns the associated enum\n+ (INT_NUMBER,DOUBLE_NUMBER,FLOAT_NUMBER)\n+ */\n+ private NUMBER_VALUE_TYPE getNumberValueType(Number value){\n+ if (value.equals(value.intValue())) {\n+ numberValueType = NUMBER_VALUE_TYPE.INT_NUMBER;\n+ } else if (value.equals(value.doubleValue())) {\n+ numberValueType = NUMBER_VALUE_TYPE.DOUBLE_NUMBER;\n+ } else if (value.equals(value.floatValue())) {\n+ numberValueType = NUMBER_VALUE_TYPE.FLOAT_NUMBER;\n+ }\n+ return numberValueType;\n+ }\n+\nprivate void _push(Map<String, Object> profile) {\nif (profile == null || profile.isEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/AnalyticsManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/AnalyticsManagerTest.kt",
"diff": "@@ -66,7 +66,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"int_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 10)\nval updateObj = JSONObject().put(\"int_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n@@ -89,7 +89,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"double_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20.5)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 10.25)\nval updateObj = JSONObject().put(\"double_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n@@ -111,7 +111,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"float_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 20.5f)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_INCREMENT, 10.25f)\nval updateObj = JSONObject().put(\"float_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n@@ -133,7 +133,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"decr_int_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 20)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 10)\nval updateObj = JSONObject().put(\"decr_int_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n@@ -156,7 +156,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"decr_double_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 9.75)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 10.50)\nval updateObj = JSONObject().put(\"decr_double_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n@@ -179,7 +179,7 @@ class AnalyticsManagerTest : BaseTestCase() {\nvalidationResult.`object` = \"decr_float_score\"\nvalidationResult.errorCode = 200\n- val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 9.75f)\n+ val commandObj: JSONObject = JSONObject().put(Constants.COMMAND_DECREMENT, 10.50f)\nval updateObj = JSONObject().put(\"decr_float_score\", commandObj)\nval captor = ArgumentCaptor.forClass(JSONObject::class.java)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-895)- Update value to push to server, code refactor
task(SDK-896)-Update values in test cases |
116,623 | 04.07.2021 00:26:43 | -19,080 | 018da8a9a4fdb7f2a43a5db1be28978e5f36d2e5 | task(SDK-953): Added public APIs for suspend, discard and resume inapp notifications and their internal implementations | [
{
"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": "@@ -1037,6 +1037,35 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n.getAccountToken() + \" accountRegion: \" + config.getAccountRegion());\n}\n+ public void suspendInAppNotifications(){\n+ if(!getCoreState().getConfig().isAnalyticsOnly()){\n+ getConfigLogger().debug(getAccountId(),\"Suspending InApp Notifications...\");\n+ getConfigLogger().debug(getAccountId(),\"Please Note - InApp Notifications will be suspended till resumeInAppNotifications() is not called again\");\n+ getCoreState().getInAppController().suspendInApps();\n+ }else{\n+ getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot suspend InApp Notifications.\");\n+ }\n+ }\n+\n+ public void resumeInAppNotifications(){\n+ if(!getCoreState().getConfig().isAnalyticsOnly()){\n+ getConfigLogger().debug(getAccountId(),\"Resuming InApp Notifications...\");\n+ getCoreState().getInAppController().resumeInApps();\n+ }else{\n+ getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot resume InApp Notifications.\");\n+ }\n+ }\n+\n+ public void discardInAppNotifications(){\n+ if(!getCoreState().getConfig().isAnalyticsOnly()){\n+ getConfigLogger().debug(getAccountId(),\"Discarding InApp Notifications...\");\n+ getConfigLogger().debug(getAccountId(),\"Please Note - InApp Notifications will be dropped till resumeInAppNotifications() is not called again\");\n+ getCoreState().getInAppController().discardInApps();\n+ }else{\n+ getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot discard InApp Notifications.\");\n+ }\n+ }\n+\n/**\n* Add a unique value to a multi-value user profile property\n* If the property does not exist it will be created\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -66,13 +66,27 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ private enum InAppState {\n+ DISCARDED(-1),\n+ SUSPENDED(0),\n+ RESUMED(1);\n+\n+ final int state;\n+\n+ InAppState(final int inAppState) {\n+ state = inAppState;\n+ }\n+\n+ int intValue() {\n+ return state;\n+ }\n+ }\n+\nprivate static CTInAppNotification currentlyDisplayingInApp = null;\nprivate static final List<CTInAppNotification> pendingNotifications = Collections\n.synchronizedList(new ArrayList<CTInAppNotification>());\n- private HashSet<String> inappActivityExclude = null;\n-\nprivate final AnalyticsManager analyticsManager;\nprivate final BaseCallbackManager callbackManager;\n@@ -85,6 +99,10 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final CoreMetaData coreMetaData;\n+ private InAppState inAppState;\n+\n+ private HashSet<String> inappActivityExclude = null;\n+\nprivate final Logger logger;\nprivate final MainLooperHandler mainLooperHandler;\n@@ -105,6 +123,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nthis.callbackManager = callbackManager;\nthis.analyticsManager = analyticsManager;\nthis.coreMetaData = coreMetaData;\n+ this.inAppState = InAppState.RESUMED;\n}\npublic void checkExistingInAppNotifications(Activity activity) {\n@@ -148,6 +167,11 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ public void discardInApps() {\n+ this.inAppState = InAppState.DISCARDED;\n+ logger.verbose(config.getAccountId(), \"InAppState is DISCARDED\");\n+ }\n+\n@Override\npublic void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\nHashMap<String, String> keyValueMap) {\n@@ -231,6 +255,13 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\ndisplayNotification(inAppNotification);\n}\n+ public void resumeInApps() {\n+ this.inAppState = InAppState.RESUMED;\n+ logger.verbose(config.getAccountId(), \"InAppState is RESUMED\");\n+ logger.verbose(config.getAccountId(), \"Resuming InApps by calling showInAppNotificationIfAny()\");\n+ showInAppNotificationIfAny();\n+ }\n+\n//InApp\npublic void showNotificationIfAvailable(final Context context) {\nif (!config.isAnalyticsOnly()) {\n@@ -245,6 +276,11 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ public void suspendInApps() {\n+ this.inAppState = InAppState.SUSPENDED;\n+ logger.verbose(config.getAccountId(), \"InAppState is SUSPENDED\");\n+ }\n+\n//InApp\nprivate void _showNotificationIfAvailable(Context context) {\nSharedPreferences prefs = StorageHelper.getPreferences(context);\n@@ -254,6 +290,12 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nreturn;\n}\n+ if (this.inAppState == InAppState.SUSPENDED) {\n+ logger.debug(config.getAccountId(),\n+ \"InApp Notifications are set to be suspended, not showing the InApp Notification\");\n+ return;\n+ }\n+\ncheckPendingNotifications(context,\nconfig, this); // see if we have any pending notifications\n@@ -263,8 +305,13 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nreturn;\n}\n+ if (this.inAppState != InAppState.DISCARDED) {\nJSONObject inapp = inapps.getJSONObject(0);\nprepareNotificationForDisplay(inapp);\n+ } else {\n+ logger.debug(config.getAccountId(),\n+ \"InApp Notifications are set to be discarded, dropping the InApp Notification\");\n+ }\n// JSON array doesn't have the feature to remove a single element,\n// so we have to copy over the entire array, but the first element\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "@@ -8,7 +8,7 @@ import com.clevertap.android.sdk.CleverTapAPI\nclass MyApplication : MultiDexApplication() {\noverride fun onCreate() {\n- CleverTapAPI.setDebugLevel(3)\n+ CleverTapAPI.setDebugLevel(CleverTapAPI.LogLevel.VERBOSE)\nActivityLifecycleCallback.register(this)\nsuper.onCreate()\nCleverTapAPI.createNotificationChannel(\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-953): Added public APIs for suspend, discard and resume inapp notifications and their internal implementations |
116,616 | 05.07.2021 11:54:02 | -19,080 | ecbaed2cf48ff3885ba0820c81f6ef96ce00d29b | task(SDK-948) - Add check for whether FirebaseInstanceId is available for version of FirebaseMessaging greater than v20.2.4 | [
{
"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": "@@ -43,6 +43,7 @@ import org.json.JSONObject;\npublic final class Utils {\npublic static boolean haveVideoPlayerSupport;\n+ public static boolean haveDeprecatedFirebaseInstanceId;\npublic static boolean containsIgnoreCase(Collection<String> collection, String key) {\nif (collection == null || key == null) {\n@@ -477,6 +478,27 @@ public final class Utils {\nreturn exoPlayerPresent;\n}\n+ /**\n+ * Method to check whether app has upgraded to Firebase Cloud Messaging v22.0.0 or greater.\n+ *\n+ * @return boolean - true/false depending on app's availability of FirebaseInstanceId in FirebaseMessaging\n+ * dependencies\n+ */\n+ @SuppressWarnings(\"rawtypes\")\n+ private static boolean checkForFirebaseInstanceId(){\n+ boolean isFirebaseInstanceIdPresent = false;\n+ Class classname;\n+ try {\n+ classname = Class.forName(\"com.google.firebase.iid.FirebaseInstanceId\");\n+ isFirebaseInstanceIdPresent = true;\n+ Logger.d(\"Firebase Instance Id is available.\" + classname);\n+ }catch (Throwable throwable){\n+ Logger.d(\"It looks like you're using FirebaseMessaging dependency v22.0.0. \" +\n+ \"Ensure your app's version of FirebaseMessaging is less than 20.3.0.\");\n+ }\n+ return isFirebaseInstanceIdPresent;\n+ }\n+\nprivate static Bitmap getAppIcon(final Context context) throws NullPointerException {\n// Try to get the app logo first\ntry {\n@@ -494,5 +516,6 @@ public final class Utils {\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\n+ haveDeprecatedFirebaseInstanceId = checkForFirebaseInstanceId();\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -73,6 +73,12 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic void requestToken() {\n+ if (!Utils.haveDeprecatedFirebaseInstanceId){\n+ config.log(LOG_TAG, FCM_LOG_TAG + \"It looks like you're using the latest\" +\n+ \" FirebaseMessaging dependency v22.0.0.Ensure your app's version is less than 20.3.0.\");\n+ listener.onNewToken(null, getPushType());\n+ return;\n+ }\ntry {\nString tokenUsingManifestMetaEntry = Utils\n.getFcmTokenUsingManifestMetaEntry(context, config);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-948) - Add check for whether FirebaseInstanceId is available for version of FirebaseMessaging greater than v20.2.4 |
116,616 | 05.07.2021 14:01:56 | -19,080 | fa4a6dbff4a1f9173c261131439ae2a8e93c04be | task(SDK-948) - Update ct version to 4.2.0, update log messages, add log for fetching token using manifest entry | [
{
"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": "@@ -604,12 +604,20 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nLogger.d(\"Instance is Analytics Only not processing device token\");\ncontinue;\n}\n+\n+ if (!Utils.haveDeprecatedFirebaseInstanceId){\n+ instance.getConfigLogger().debug(instance.getAccountId(),\"It looks like you're using the \" +\n+ \"latest version of FCM where FirebaseInstanceId is deprecated, hence we won't be able to fetch \" +\n+ \"the token from sender id provided in manifest. Instead we will be using the token provided to us by Firebase.\");\n+ }else {\n//get token from Manifest\nString tokenUsingManifestMetaEntry = Utils\n.getFcmTokenUsingManifestMetaEntry(context, instance.getCoreState().getConfig());\n+\nif (!TextUtils.isEmpty(tokenUsingManifestMetaEntry)) {\ntoken = tokenUsingManifestMetaEntry;\n}\n+ }\ninstance.getCoreState().getPushProviders().doTokenRefresh(token, PushType.FCM);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -74,8 +74,8 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic void requestToken() {\nif (!Utils.haveDeprecatedFirebaseInstanceId){\n- config.log(LOG_TAG, FCM_LOG_TAG + \"It looks like you're using the latest\" +\n- \" FirebaseMessaging dependency v22.0.0.Ensure your app's version is less than 20.3.0.\");\n+ config.getLogger().debug(config.getAccountId(),\"It looks like you're using the \" +\n+ \"latest FCM dependency.Downgrade you're FCM dependency to v20.2.4\");\nlistener.onNewToken(null, getPushType());\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -104,7 +104,7 @@ version.androidx.work=2.3.4\nversion.com.android.installreferrer..installreferrer=2.1\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-version.com.clevertap.android..clevertap-android-sdk=4.1.1\n+version.com.clevertap.android..clevertap-android-sdk=4.2.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.0.2\nversion.com.clevertap.android..clevertap-hms-sdk=1.0.1\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.0.2\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-948) - Update ct version to 4.2.0, update log messages, add log for fetching token using manifest entry |
116,616 | 05.07.2021 15:34:23 | -19,080 | 78dfcd0db224fdf586515fa9a03bea3d9ebe3137 | task(SDK-895) - Renamed enum for numberType. removed unused import | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -7,7 +7,6 @@ import android.content.Context;\nimport android.location.Location;\nimport android.net.Uri;\nimport android.os.Bundle;\n-import android.util.Log;\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n@@ -69,9 +68,9 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n- private NUMBER_VALUE_TYPE numberValueType;\n+ private NumberValueType numberValueType;\n- enum NUMBER_VALUE_TYPE {\n+ enum NumberValueType {\nINT_NUMBER, FLOAT_NUMBER, DOUBLE_NUMBER\n}\n@@ -1137,13 +1136,13 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nBased on the number value type returns the associated enum\n(INT_NUMBER,DOUBLE_NUMBER,FLOAT_NUMBER)\n*/\n- private NUMBER_VALUE_TYPE getNumberValueType(Number value){\n+ private NumberValueType getNumberValueType(Number value){\nif (value.equals(value.intValue())) {\n- numberValueType = NUMBER_VALUE_TYPE.INT_NUMBER;\n+ numberValueType = NumberValueType.INT_NUMBER;\n} else if (value.equals(value.doubleValue())) {\n- numberValueType = NUMBER_VALUE_TYPE.DOUBLE_NUMBER;\n+ numberValueType = NumberValueType.DOUBLE_NUMBER;\n} else if (value.equals(value.floatValue())) {\n- numberValueType = NUMBER_VALUE_TYPE.FLOAT_NUMBER;\n+ numberValueType = NumberValueType.FLOAT_NUMBER;\n}\nreturn numberValueType;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-895) - Renamed enum for numberType. removed unused import |
116,616 | 05.07.2021 15:35:59 | -19,080 | d4f31c324cb9c6b089d888129866cf4c7e11d08a | task(SDK-948) - Update log messages | [
{
"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": "@@ -494,7 +494,7 @@ public final class Utils {\nLogger.d(\"Firebase Instance Id is available.\" + classname);\n}catch (Throwable throwable){\nLogger.d(\"It looks like you're using FirebaseMessaging dependency v22.0.0.\" +\n- \"Ensure your app's version of FirebaseMessaging is less than 20.3.0.\");\n+ \"Ensure your app's version of FCM is v20.2.4\");\n}\nreturn isFirebaseInstanceIdPresent;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImpl.java",
"diff": "@@ -74,8 +74,8 @@ public class FcmSdkHandlerImpl implements IFcmSdkHandler {\n@Override\npublic void requestToken() {\nif (!Utils.haveDeprecatedFirebaseInstanceId){\n- config.getLogger().debug(config.getAccountId(),\"It looks like you're using the \" +\n- \"latest FCM dependency.Downgrade you're FCM dependency to v20.2.4\");\n+ config.getLogger().debug(config.getAccountId(),\"Downgrade you're FCM dependency \" +\n+ \"to v20.2.4 or else CleverTap SDK will not be able to generate a token for this device.\");\nlistener.onNewToken(null, getPushType());\nreturn;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-948) - Update log messages |
116,616 | 05.07.2021 17:16:04 | -19,080 | ad3c6e4cecfa2bb12c9d08b756fc124772d14e4e | update README.md and CTGEOFENCE.md with ct v4.2.0 | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -24,7 +24,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.2.0\"\n}\n```\n@@ -32,7 +32,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.1.1\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.2.0\", ext: 'aar')\n}\n```\n@@ -44,7 +44,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.2.0\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:20.2.4\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.0.2\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.1.1\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.2.0\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:17.0.0\"\nimplementation \"androidx.work:work-runtime:2.3.4\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.0.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | update README.md and CTGEOFENCE.md with ct v4.2.0 |
116,623 | 05.07.2021 21:58:12 | -19,080 | 78b53fb672e849bc31ab51e1ee9230ad56afcd18 | task(SDK-953): Added javadoc for InApp control public APIs | [
{
"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": "@@ -102,10 +102,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate final Context context;\n- private WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n-\nprivate CoreState coreState;\n+ private WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n+\n/**\n* This method is used to change the credentials of CleverTap account Id and token programmatically\n*\n@@ -1007,7 +1007,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.coreState.getConfig().setCreatedPostAppLaunch();\n}\n-\ntask = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"setStatesAsync\", new Callable<Void>() {\n@Override\n@@ -1037,35 +1036,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n.getAccountToken() + \" accountRegion: \" + config.getAccountRegion());\n}\n- public void suspendInAppNotifications(){\n- if(!getCoreState().getConfig().isAnalyticsOnly()){\n- getConfigLogger().debug(getAccountId(),\"Suspending InApp Notifications...\");\n- getConfigLogger().debug(getAccountId(),\"Please Note - InApp Notifications will be suspended till resumeInAppNotifications() is not called again\");\n- getCoreState().getInAppController().suspendInApps();\n- }else{\n- getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot suspend InApp Notifications.\");\n- }\n- }\n-\n- public void resumeInAppNotifications(){\n- if(!getCoreState().getConfig().isAnalyticsOnly()){\n- getConfigLogger().debug(getAccountId(),\"Resuming InApp Notifications...\");\n- getCoreState().getInAppController().resumeInApps();\n- }else{\n- getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot resume InApp Notifications.\");\n- }\n- }\n-\n- public void discardInAppNotifications(){\n- if(!getCoreState().getConfig().isAnalyticsOnly()){\n- getConfigLogger().debug(getAccountId(),\"Discarding InApp Notifications...\");\n- getConfigLogger().debug(getAccountId(),\"Please Note - InApp Notifications will be dropped till resumeInAppNotifications() is not called again\");\n- getCoreState().getInAppController().discardInApps();\n- }else{\n- getConfigLogger().debug(getAccountId(),\"CleverTap instance is set for Analytics only! Cannot discard InApp Notifications.\");\n- }\n- }\n-\n/**\n* Add a unique value to a multi-value user profile property\n* If the property does not exist it will be created\n@@ -1141,6 +1111,23 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.coreState.getConfig().enablePersonalization(false);\n}\n+ /**\n+ * Suspends the display of InApp Notifications and discards any new InApp Notifications to be shown\n+ * after this method is called.\n+ * The InApp Notifications will be displayed only once resumeInAppNotifications() is called.\n+ */\n+ public void discardInAppNotifications() {\n+ if (!getCoreState().getConfig().isAnalyticsOnly()) {\n+ getConfigLogger().debug(getAccountId(), \"Discarding InApp Notifications...\");\n+ getConfigLogger().debug(getAccountId(),\n+ \"Please Note - InApp Notifications will be dropped till resumeInAppNotifications() is not called again\");\n+ getCoreState().getInAppController().discardInApps();\n+ } else {\n+ getConfigLogger().debug(getAccountId(),\n+ \"CleverTap instance is set for Analytics only! Cannot discard InApp Notifications.\");\n+ }\n+ }\n+\n/**\n* Use this method to enable device network-related information tracking, including IP address.\n* This reporting is disabled by default. To re-disable tracking call this method with enabled set to false.\n@@ -1226,8 +1213,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- //Debug\n-\n/**\n* Returns the CTInboxListener object\n*\n@@ -1248,6 +1233,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInboxListener(notificationInboxListener);\n}\n+ //Debug\n+\n/**\n* Returns the CTPushAmpListener object\n*\n@@ -1288,8 +1275,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setPushNotificationListener(pushNotificationListener);\n}\n- //Network Info handling\n-\n/**\n* Returns a unique CleverTap identifier suitable for use with install attribution providers.\n*\n@@ -1310,6 +1295,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getDeviceInfo().getDeviceID();\n}\n+ //Network Info handling\n+\n@RestrictTo(Scope.LIBRARY)\npublic CoreState getCoreState() {\nreturn coreState;\n@@ -1363,8 +1350,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getPushProviders().getCachedToken(type);\n}\n- //Util\n-\n/**\n* Returns the DevicePushTokenRefreshListener\n*\n@@ -1386,6 +1371,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n+ //Util\n+\n/**\n* Getter for retrieving Display Unit using the unitID\n*\n@@ -1429,8 +1416,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getCallbackManager().getGeofenceCallback();\n}\n- //DeepLink\n-\n/**\n* This method is used to set the geofence callback\n* Register to handle geofence responses from CleverTap\n@@ -1454,6 +1439,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getLocalDataStore().getEventHistory(context);\n}\n+ //DeepLink\n+\n/**\n* Returns the InAppNotificationListener object\n*\n@@ -1721,8 +1708,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- //Session\n-\n/**\n* Marks the given messageId of {@link CTInboxMessage} object as read\n*\n@@ -1745,6 +1730,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ //Session\n+\n@Override\npublic void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage,\nfinal Bundle data) {\n@@ -2060,8 +2047,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().pushNotificationClickedEvent(extras);\n}\n- //Session\n-\n/**\n* Pushes the Notification Viewed event to CleverTap.\n*\n@@ -2085,6 +2070,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().pushProfile(profile);\n}\n+ //Session\n+\n/**\n* Sends the Xiaomi registration ID to CleverTap.\n*\n@@ -2162,6 +2149,26 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().removeValueForKey(key);\n}\n+ /**\n+ * Resumes display of InApp Notifications.\n+ *\n+ * If suspendInAppNotifications() was called previously, calling this method will instantly show\n+ * all queued InApp Notifications and also resume InApp Notifications on events raised after this\n+ * method is called.\n+ *\n+ * If discardInAppNotifications() was called previously, calling this method will only resume\n+ * InApp Notifications on events raised after this method is called.\n+ */\n+ public void resumeInAppNotifications() {\n+ if (!getCoreState().getConfig().isAnalyticsOnly()) {\n+ getConfigLogger().debug(getAccountId(), \"Resuming InApp Notifications...\");\n+ getCoreState().getInAppController().resumeInApps();\n+ } else {\n+ getConfigLogger().debug(getAccountId(),\n+ \"CleverTap instance is set for Analytics only! Cannot resume InApp Notifications.\");\n+ }\n+ }\n+\n/**\n* This method is used to set the CTFeatureFlagsListener\n* Register to receive feature flag callbacks\n@@ -2184,8 +2191,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setProductConfigListener(listener);\n}\n- //Listener\n-\n/**\n* Sets the listener to get the list of currently running Display Campaigns via callback\n*\n@@ -2195,6 +2200,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setDisplayUnitListener(listener);\n}\n+ //Listener\n+\n@SuppressWarnings(\"unused\")\npublic void setInAppNotificationButtonListener(InAppNotificationButtonListener listener) {\ncoreState.getCallbackManager().setInAppNotificationButtonListener(listener);\n@@ -2355,6 +2362,23 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nshowAppInbox(styleConfig);\n}\n+ /**\n+ * Suspends display of InApp Notifications.\n+ * The InApp Notifications are queued once this method is called\n+ * and will be displayed once resumeInAppNotifications() is called.\n+ */\n+ public void suspendInAppNotifications() {\n+ if (!getCoreState().getConfig().isAnalyticsOnly()) {\n+ getConfigLogger().debug(getAccountId(), \"Suspending InApp Notifications...\");\n+ getConfigLogger().debug(getAccountId(),\n+ \"Please Note - InApp Notifications will be suspended till resumeInAppNotifications() is not called again\");\n+ getCoreState().getInAppController().suspendInApps();\n+ } else {\n+ getConfigLogger().debug(getAccountId(),\n+ \"CleverTap instance is set for Analytics only! Cannot suspend InApp Notifications.\");\n+ }\n+ }\n+\n//To be called from DeviceInfo AdID GUID generation\nvoid deviceIDCreated(String deviceId) {\nLogger.v(\"Initializing InAppFC after Device ID Created = \" + deviceId);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-953): Added javadoc for InApp control public APIs |
116,612 | 07.07.2021 16:38:38 | -19,080 | 89efc430b1ec5803fcd46322e41709a8c2476062 | task(verbose_log): Reinitialising product config & Feature Flag controllers with device id if it's null during first initialisation | [
{
"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": "@@ -814,6 +814,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n.validateCTID(cleverTapID)) {\ninstance.coreState.getLoginController().asyncProfileSwitchUser(null, null, cleverTapID);\n}\n+ Logger.v(config.getAccountId() + \":async_deviceID\", \"CleverTapAPI instance = \" + instance);\nreturn instance;\n}\n@@ -998,6 +999,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nCoreState coreState = CleverTapFactory\n.getCoreState(context, config, cleverTapID);\nsetCoreState(coreState);\n+ Logger.v(config.getAccountId() + \":async_deviceID\", \"CoreState is set\");\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"CleverTapAPI#initializeDeviceInfo\", new Callable<Void>() {\n@@ -2363,40 +2365,40 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nString accountId = coreState.getConfig().getAccountId();\nif (coreState.getControllerManager() == null) {\n- Logger.v(accountId, \"ControllerManager not set yet! Returning from deviceIDCreated()\");\n+ Logger.v(accountId + \":async_deviceID\",\n+ \"ControllerManager not set yet! Returning from deviceIDCreated()\");\nreturn;\n}\nif (coreState.getControllerManager().getInAppFCManager() == null) {\n- Logger.v(accountId, \"Initializing InAppFC after Device ID Created = \" + deviceId);\n+ Logger.v(accountId + \":async_deviceID\", \"Initializing InAppFC after Device ID Created = \" + deviceId);\ncoreState.getControllerManager()\n.setInAppFCManager(new InAppFCManager(context, coreState.getConfig(), deviceId));\n}\n- /*\n- Reinitialising product config & Feature Flag controllers with google ad id.\n+ /**\n+ * Reinitialising product config & Feature Flag controllers with device id if it's null\n+ * during first initialisation\n*/\nCTFeatureFlagsController ctFeatureFlagsController = coreState.getControllerManager()\n.getCTFeatureFlagsController();\n- if (ctFeatureFlagsController != null) {\n- if (!ctFeatureFlagsController.isInitialized()) {\n- Logger.v(accountId,\n+ if (ctFeatureFlagsController != null && TextUtils.isEmpty(ctFeatureFlagsController.getGuid())) {\n+ Logger.v(accountId + \":async_deviceID\",\n\"Initializing Feature Flags after Device ID Created = \" + deviceId);\n- }\nctFeatureFlagsController.setGuidAndInit(deviceId);\n}\nCTProductConfigController ctProductConfigController = coreState.getControllerManager()\n.getCTProductConfigController();\n- if (ctProductConfigController != null) {\n- if (!ctProductConfigController.isInitialized()) {\n- Logger.v(accountId,\n+ if (ctProductConfigController != null && TextUtils\n+ .isEmpty(ctProductConfigController.getSettings().getGuid())) {\n+ Logger.v(accountId + \":async_deviceID\",\n\"Initializing Product Config after Device ID Created = \" + deviceId);\n- }\nctProductConfigController.setGuidAndInit(deviceId);\n}\n- Logger.v(accountId, \"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\n+ Logger.v(accountId + \":async_deviceID\",\n+ \"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -58,10 +58,18 @@ class CleverTapFactory {\nctLockManager, callbackManager, deviceInfo, baseDatabaseManager);\ncoreState.setControllerManager(controllerManager);\n+ Logger.v(config.getAccountId() + \":async_deviceID\",\n+ \"coreState.getDeviceInfo() = \" + coreState.getDeviceInfo());\n+ Logger.v(config.getAccountId() + \":async_deviceID\",\n+ \"coreState.getDeviceInfo().getDeviceID() = \" + coreState.getDeviceInfo().getDeviceID());\n+ Logger.v(config.getAccountId() + \":async_deviceID\",\n+ \"controllerManager.getInAppFCManager() = \" + controllerManager.getInAppFCManager());\n+\nif (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null\n&& controllerManager.getInAppFCManager() == null) {\ncoreState.getConfig().getLogger()\n- .verbose(\"Initializing InAppFC with device Id = \" + coreState.getDeviceInfo().getDeviceID());\n+ .verbose(config.getAccountId() + \":async_deviceID\",\n+ \"Initializing InAppFC with device Id = \" + coreState.getDeviceInfo().getDeviceID());\ncontrollerManager\n.setInAppFCManager(new InAppFCManager(context, config, coreState.getDeviceInfo().getDeviceID()));\n}\n@@ -113,14 +121,17 @@ class CleverTapFactory {\nstatic void initFeatureFlags(Context context, ControllerManager controllerManager, CleverTapInstanceConfig config,\nDeviceInfo deviceInfo, BaseCallbackManager callbackManager, AnalyticsManager analyticsManager) {\n- Logger.v(\"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\n+\n+ Logger.v(config.getAccountId() + \":async_deviceID\",\n+ \"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\nif (config.isAnalyticsOnly()) {\nconfig.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n} else {\ncontrollerManager.setCTFeatureFlagsController(CTFeatureFlagsFactory.getInstance(context,\ndeviceInfo.getDeviceID(),\nconfig, callbackManager, analyticsManager));\n- config.getLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n+ config.getLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Feature Flags initialized\");\n}\n+\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -231,13 +231,14 @@ public class CoreState extends CleverTapState {\n}\nprivate void initProductConfig() {\n- Logger.v(\"Initializing Product Config with device Id = \" + getDeviceInfo().getDeviceID());\nif (getConfig().isAnalyticsOnly()) {\ngetConfig().getLogger()\n.debug(getConfig().getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\nif (getControllerManager().getCTProductConfigController() == null) {\n+ Logger.v(config.getAccountId() + \":async_deviceID\",\n+ \"Initializing Product Config with device Id = \" + getDeviceInfo().getDeviceID());\nCTProductConfigController ctProductConfigController = CTProductConfigFactory\n.getInstance(context, getDeviceInfo(),\ngetConfig(), analyticsManager, coreMetaData, callbackManager);\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": "@@ -332,7 +332,7 @@ public class DeviceInfo {\nthis.library = null;\nmCoreMetaData = coreMetaData;\nonInitDeviceInfo(cleverTapID);\n- Log.v(\"iotask\", \"DeviceInfo() called\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"DeviceInfo() called\");\n}\nvoid onInitDeviceInfo(final String cleverTapID) {\n@@ -350,7 +350,7 @@ public class DeviceInfo {\n// callback on main thread\n@Override\npublic void onSuccess(final Void aVoid) {\n- getConfigLogger().verbose(config.getAccountId(),\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\",\n\"DeviceID initialized successfully!\" + Thread.currentThread());\n// No need to put getDeviceID() on background thread because prefs already loaded\nCleverTapAPI.instanceWithConfig(context, config).deviceIDCreated(getDeviceID());\n@@ -604,7 +604,7 @@ public class DeviceInfo {\n}\nprivate synchronized void fetchGoogleAdID() {\n- Log.v(\"initDeviceID()\", \"fetchGoogleAdID() called!\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() called!\");\nif (getGoogleAdID() == null && !adIdRun) {\nString advertisingID = null;\ntry {\n@@ -617,7 +617,7 @@ public class DeviceInfo {\nBoolean limitedAdTracking = (Boolean) isLimitAdTracking.invoke(adInfo);\nsynchronized (adIDLock) {\nlimitAdTracking = limitedAdTracking != null && limitedAdTracking;\n- Log.v(\"initDeviceID()\", \"limitAdTracking = \" + limitAdTracking);\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"limitAdTracking = \" + limitAdTracking);\nif (limitAdTracking) {\nreturn;\n}\n@@ -638,12 +638,12 @@ public class DeviceInfo {\n}\n}\n- Log.v(\"initDeviceID()\", \"fetchGoogleAdID() done executing!\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() done executing!\");\n}\n}\nprivate synchronized void generateDeviceID() {\n- Log.v(\"initDeviceID()\", \"generateDeviceID() called!\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() called!\");\nString generatedDeviceID;\nString adId = getGoogleAdID();\nif (adId != null) {\n@@ -654,7 +654,7 @@ public class DeviceInfo {\n}\n}\nforceUpdateDeviceId(generatedDeviceID);\n- Log.v(\"initDeviceID()\", \"generateDeviceID() done executing!\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() done executing!\");\n}\nprivate String generateGUID() {\n@@ -685,7 +685,7 @@ public class DeviceInfo {\n}\nprivate void initDeviceID(String cleverTapID) {\n- Log.v(\"initDeviceID()\", \"Called initDeviceID()\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"Called initDeviceID()\");\n//Show logging as per Manifest flag\nif (config.getEnableCustomCleverTapId()) {\nif (cleverTapID == null) {\n@@ -699,9 +699,9 @@ public class DeviceInfo {\n}\n}\n- Log.v(\"initDeviceID()\", \"Calling _getDeviceID\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"Calling _getDeviceID\");\nString deviceID = _getDeviceID();\n- Log.v(\"initDeviceID()\", \"Called _getDeviceID\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"Called _getDeviceID\");\nif (deviceID != null && deviceID.trim().length() > 2) {\ngetConfigLogger().verbose(config.getAccountId(), \"CleverTap ID already present for profile\");\nif (cleverTapID != null) {\n@@ -717,9 +717,9 @@ public class DeviceInfo {\n}\nif (!this.config.isUseGoogleAdId()) {\n- Log.v(\"initDeviceID()\", \"Calling generateDeviceID()\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"Calling generateDeviceID()\");\ngenerateDeviceID();\n- Log.v(\"initDeviceID()\", \"Called generateDeviceID()\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"Called generateDeviceID()\");\nreturn;\n}\n@@ -728,7 +728,7 @@ public class DeviceInfo {\nfetchGoogleAdID();\ngenerateDeviceID();\n- Log.v(\"initDeviceID()\", \"initDeviceID() done executing!\");\n+ Log.v(config.getAccountId() + \":async_deviceID\", \"initDeviceID() done executing!\");\n}\nprivate String recordDeviceError(int messageCode, String... varargs) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"diff": "@@ -9,7 +9,6 @@ import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.Task;\n-\nimport java.text.SimpleDateFormat;\nimport java.util.ArrayList;\nimport java.util.Date;\n@@ -17,7 +16,6 @@ import java.util.HashMap;\nimport java.util.Locale;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\n-\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n@@ -352,6 +350,7 @@ public class InAppFCManager {\n}\nprivate void init(String deviceId) {\n+ Logger.v(config.getAccountId() + \":async_deviceID\", \"InAppFCManager init() called\");\ntry {\nmigrateToNewPrefsKey(deviceId);\nfinal String today = ddMMyyyy.format(new Date());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -25,6 +25,10 @@ public class CTFeatureFlagsController {\nfinal CleverTapInstanceConfig config;\n+ public String getGuid() {\n+ return guid;\n+ }\n+\nString guid;\nboolean isInitialized = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -166,6 +166,9 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nif (controllerManager.getInAppFCManager() != null) {\ncontrollerManager.getInAppFCManager().didDismiss(inAppNotification);\nlogger.verbose(config.getAccountId(), \"InApp Dismissed: \" + inAppNotification.getCampaignId());\n+ } else {\n+ logger.verbose(config.getAccountId(), \"Not calling InApp Dismissed: \" + inAppNotification.getCampaignId()\n+ + \" because InAppFCManager is null\");\n}\ntry {\nfinal InAppNotificationListener listener = callbackManager.getInAppNotificationListener();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginController.java",
"diff": "@@ -16,6 +16,7 @@ import com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.db.DBManager;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\nimport com.clevertap.android.sdk.events.EventGroup;\n+import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigFactory;\nimport com.clevertap.android.sdk.pushnotification.PushProviders;\n@@ -278,11 +279,11 @@ public class LoginController {\n}\nprivate void resetFeatureFlags() {\n- if (controllerManager.getCTFeatureFlagsController() != null && controllerManager\n- .getCTFeatureFlagsController()\n+ CTFeatureFlagsController ctFeatureFlagsController = controllerManager.getCTFeatureFlagsController();\n+ if (ctFeatureFlagsController != null && ctFeatureFlagsController\n.isInitialized()) {\n- controllerManager.getCTFeatureFlagsController().resetWithGuid(deviceInfo.getDeviceID());\n- controllerManager.getCTFeatureFlagsController().fetchFeatureFlags();\n+ ctFeatureFlagsController.resetWithGuid(deviceInfo.getDeviceID());\n+ ctFeatureFlagsController.fetchFeatureFlags();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -48,7 +48,6 @@ import java.security.SecureRandom;\nimport java.util.Iterator;\nimport java.util.Map;\nimport java.util.Map.Entry;\n-import java.util.Random;\nimport java.util.concurrent.Callable;\nimport javax.net.ssl.HttpsURLConnection;\nimport javax.net.ssl.SSLContext;\n@@ -500,6 +499,9 @@ public class NetworkManager extends BaseNetworkManager {\nif (controllerManager.getInAppFCManager() != null) {\nLogger.v(\"Attaching InAppFC to Header\");\ncontrollerManager.getInAppFCManager().attachToHeader(context, header);\n+ } else {\n+ logger.verbose(config.getAccountId(),\n+ \"controllerManager.getInAppFCManager() is NULL, not Attaching InAppFC to Header\");\n}\n// Resort to string concat for backward compatibility\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -476,7 +476,7 @@ public class CTProductConfigController {\nreturn CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + settings.getGuid();\n}\n- ProductConfigSettings getSettings() {\n+ public ProductConfigSettings getSettings() {\nreturn settings;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "package com.clevertap.android.sdk.product_config;\n-import android.text.TextUtils;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS;\n+import android.text.TextUtils;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.OnSuccessListener;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.utils.FileUtils;\n-\n-import org.json.JSONException;\n-import org.json.JSONObject;\n-\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.TimeUnit;\n+import org.json.JSONException;\n+import org.json.JSONObject;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_NO_OF_CALLS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS;\n-\n-class ProductConfigSettings {\n+public class ProductConfigSettings {\nprivate final CleverTapInstanceConfig config;\n@@ -76,7 +73,7 @@ class ProductConfigSettings {\nreturn getDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS;\n}\n- String getGuid() {\n+ public String getGuid() {\nreturn guid;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/response/InAppResponse.java",
"diff": "@@ -72,6 +72,10 @@ public class InAppResponse extends CleverTapResponseDecorator {\nLogger.v(\"Updating InAppFC Limits\");\ncontrollerManager.getInAppFCManager().updateLimits(context, perDay, perSession);\ncontrollerManager.getInAppFCManager().processResponse(context, response);// Handle stale_inapp\n+ } else {\n+ logger.verbose(config.getAccountId(),\n+ \"controllerManager.getInAppFCManager() is NULL, not Updating InAppFC Limits\");\n+\n}\nJSONArray inappNotifs;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(verbose_log): Reinitialising product config & Feature Flag controllers with device id if it's null during first initialisation SDK-873 |
116,612 | 07.07.2021 17:18:35 | -19,080 | 5ce0b54a1e6c5a371ec2c3c53d47687943d9a9d7 | task(async_deviceID): remove notifyUserProfileInitialized from instanceWithConfig | [
{
"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": "@@ -800,11 +800,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ninstances.put(config.getAccountId(), instance);\nfinal CleverTapAPI finalInstance = instance;\nTask<Void> task = CTExecutorFactory.executors(instance.coreState.getConfig()).postAsyncSafelyTask();\n- task.execute(\"notifyProfileInitialized\", new Callable<Void>() {\n+ task.execute(\"recordDeviceIDErrors\", new Callable<Void>() {\n@Override\npublic Void call() {\nif (finalInstance.getCleverTapID() != null) {\n- finalInstance.coreState.getCallbackManager().notifyUserProfileInitialized();\nfinalInstance.coreState.getLoginController().recordDeviceIDErrors();\n}\nreturn null;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): remove notifyUserProfileInitialized from instanceWithConfig SDK-934 |
116,612 | 07.07.2021 18:36:22 | -19,080 | ffd8f1ec2fce7f2afb340b1a77df66b305e52729 | task(async_deviceID): replace Logger.v() with verbose() and add documentation for profileDidInitialize | [
{
"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": "@@ -989,16 +989,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\n- /* new Thread(\"SharedPreferences-load\") {\n- public void run() {\n- StorageHelper.getPreferences(context.getApplicationContext());\n- }\n- }.start();*/\n-\nCoreState coreState = CleverTapFactory\n.getCoreState(context, config, cleverTapID);\nsetCoreState(coreState);\n- Logger.v(config.getAccountId() + \":async_deviceID\", \"CoreState is set\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"CoreState is set\");\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"CleverTapAPI#initializeDeviceInfo\", new Callable<Void>() {\n@@ -2364,13 +2358,14 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nString accountId = coreState.getConfig().getAccountId();\nif (coreState.getControllerManager() == null) {\n- Logger.v(accountId + \":async_deviceID\",\n+ getConfigLogger().verbose(accountId + \":async_deviceID\",\n\"ControllerManager not set yet! Returning from deviceIDCreated()\");\nreturn;\n}\nif (coreState.getControllerManager().getInAppFCManager() == null) {\n- Logger.v(accountId + \":async_deviceID\", \"Initializing InAppFC after Device ID Created = \" + deviceId);\n+ getConfigLogger().verbose(accountId + \":async_deviceID\",\n+ \"Initializing InAppFC after Device ID Created = \" + deviceId);\ncoreState.getControllerManager()\n.setInAppFCManager(new InAppFCManager(context, coreState.getConfig(), deviceId));\n}\n@@ -2383,7 +2378,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n.getCTFeatureFlagsController();\nif (ctFeatureFlagsController != null && TextUtils.isEmpty(ctFeatureFlagsController.getGuid())) {\n- Logger.v(accountId + \":async_deviceID\",\n+ getConfigLogger().verbose(accountId + \":async_deviceID\",\n\"Initializing Feature Flags after Device ID Created = \" + deviceId);\nctFeatureFlagsController.setGuidAndInit(deviceId);\n}\n@@ -2392,11 +2387,11 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nif (ctProductConfigController != null && TextUtils\n.isEmpty(ctProductConfigController.getSettings().getGuid())) {\n- Logger.v(accountId + \":async_deviceID\",\n+ getConfigLogger().verbose(accountId + \":async_deviceID\",\n\"Initializing Product Config after Device ID Created = \" + deviceId);\nctProductConfigController.setGuidAndInit(deviceId);\n}\n- Logger.v(accountId + \":async_deviceID\",\n+ getConfigLogger().verbose(accountId + \":async_deviceID\",\n\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -58,11 +58,14 @@ class CleverTapFactory {\nctLockManager, callbackManager, deviceInfo, baseDatabaseManager);\ncoreState.setControllerManager(controllerManager);\n- Logger.v(config.getAccountId() + \":async_deviceID\",\n+ coreState.getConfig().getLogger()\n+ .verbose(config.getAccountId() + \":async_deviceID\",\n\"coreState.getDeviceInfo() = \" + coreState.getDeviceInfo());\n- Logger.v(config.getAccountId() + \":async_deviceID\",\n+ coreState.getConfig().getLogger()\n+ .verbose(config.getAccountId() + \":async_deviceID\",\n\"coreState.getDeviceInfo().getDeviceID() = \" + coreState.getDeviceInfo().getDeviceID());\n- Logger.v(config.getAccountId() + \":async_deviceID\",\n+ coreState.getConfig().getLogger()\n+ .verbose(config.getAccountId() + \":async_deviceID\",\n\"controllerManager.getInAppFCManager() = \" + controllerManager.getInAppFCManager());\nif (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null\n@@ -122,7 +125,7 @@ class CleverTapFactory {\nstatic void initFeatureFlags(Context context, ControllerManager controllerManager, CleverTapInstanceConfig config,\nDeviceInfo deviceInfo, BaseCallbackManager callbackManager, AnalyticsManager analyticsManager) {\n- Logger.v(config.getAccountId() + \":async_deviceID\",\n+ config.getLogger().verbose(config.getAccountId() + \":async_deviceID\",\n\"Initializing Feature Flags with device Id = \" + deviceInfo.getDeviceID());\nif (config.isAnalyticsOnly()) {\nconfig.getLogger().debug(config.getAccountId(), \"Feature Flag is not enabled for this instance\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreState.java",
"diff": "@@ -237,7 +237,7 @@ public class CoreState extends CleverTapState {\nreturn;\n}\nif (getControllerManager().getCTProductConfigController() == null) {\n- Logger.v(config.getAccountId() + \":async_deviceID\",\n+ getConfig().getLogger().verbose(config.getAccountId() + \":async_deviceID\",\n\"Initializing Product Config with device Id = \" + getDeviceInfo().getDeviceID());\nCTProductConfigController ctProductConfigController = CTProductConfigFactory\n.getInstance(context, getDeviceInfo(),\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.net.NetworkInfo;\nimport android.os.Build;\nimport android.telephony.TelephonyManager;\nimport android.util.DisplayMetrics;\n-import android.util.Log;\nimport android.view.WindowManager;\nimport androidx.annotation.IntDef;\nimport androidx.annotation.RestrictTo;\n@@ -332,7 +331,7 @@ public class DeviceInfo {\nthis.library = null;\nmCoreMetaData = coreMetaData;\nonInitDeviceInfo(cleverTapID);\n- Log.v(config.getAccountId() + \":async_deviceID\", \"DeviceInfo() called\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"DeviceInfo() called\");\n}\nvoid onInitDeviceInfo(final String cleverTapID) {\n@@ -604,7 +603,7 @@ public class DeviceInfo {\n}\nprivate synchronized void fetchGoogleAdID() {\n- Log.v(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() called!\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() called!\");\nif (getGoogleAdID() == null && !adIdRun) {\nString advertisingID = null;\ntry {\n@@ -617,7 +616,8 @@ public class DeviceInfo {\nBoolean limitedAdTracking = (Boolean) isLimitAdTracking.invoke(adInfo);\nsynchronized (adIDLock) {\nlimitAdTracking = limitedAdTracking != null && limitedAdTracking;\n- Log.v(config.getAccountId() + \":async_deviceID\", \"limitAdTracking = \" + limitAdTracking);\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\",\n+ \"limitAdTracking = \" + limitAdTracking);\nif (limitAdTracking) {\nreturn;\n}\n@@ -638,12 +638,12 @@ public class DeviceInfo {\n}\n}\n- Log.v(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() done executing!\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"fetchGoogleAdID() done executing!\");\n}\n}\nprivate synchronized void generateDeviceID() {\n- Log.v(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() called!\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() called!\");\nString generatedDeviceID;\nString adId = getGoogleAdID();\nif (adId != null) {\n@@ -654,7 +654,7 @@ public class DeviceInfo {\n}\n}\nforceUpdateDeviceId(generatedDeviceID);\n- Log.v(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() done executing!\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"generateDeviceID() done executing!\");\n}\nprivate String generateGUID() {\n@@ -685,7 +685,7 @@ public class DeviceInfo {\n}\nprivate void initDeviceID(String cleverTapID) {\n- Log.v(config.getAccountId() + \":async_deviceID\", \"Called initDeviceID()\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Called initDeviceID()\");\n//Show logging as per Manifest flag\nif (config.getEnableCustomCleverTapId()) {\nif (cleverTapID == null) {\n@@ -699,9 +699,9 @@ public class DeviceInfo {\n}\n}\n- Log.v(config.getAccountId() + \":async_deviceID\", \"Calling _getDeviceID\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Calling _getDeviceID\");\nString deviceID = _getDeviceID();\n- Log.v(config.getAccountId() + \":async_deviceID\", \"Called _getDeviceID\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Called _getDeviceID\");\nif (deviceID != null && deviceID.trim().length() > 2) {\ngetConfigLogger().verbose(config.getAccountId(), \"CleverTap ID already present for profile\");\nif (cleverTapID != null) {\n@@ -717,9 +717,9 @@ public class DeviceInfo {\n}\nif (!this.config.isUseGoogleAdId()) {\n- Log.v(config.getAccountId() + \":async_deviceID\", \"Calling generateDeviceID()\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Calling generateDeviceID()\");\ngenerateDeviceID();\n- Log.v(config.getAccountId() + \":async_deviceID\", \"Called generateDeviceID()\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"Called generateDeviceID()\");\nreturn;\n}\n@@ -728,7 +728,7 @@ public class DeviceInfo {\nfetchGoogleAdID();\ngenerateDeviceID();\n- Log.v(config.getAccountId() + \":async_deviceID\", \"initDeviceID() done executing!\");\n+ getConfigLogger().verbose(config.getAccountId() + \":async_deviceID\", \"initDeviceID() done executing!\");\n}\nprivate String recordDeviceError(int messageCode, String... varargs) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"diff": "@@ -350,7 +350,8 @@ public class InAppFCManager {\n}\nprivate void init(String deviceId) {\n- Logger.v(config.getAccountId() + \":async_deviceID\", \"InAppFCManager init() called\");\n+ getConfigLogger()\n+ .verbose(config.getAccountId() + \":async_deviceID\", \"InAppFCManager init() called\");\ntry {\nmigrateToNewPrefsKey(deviceId);\nfinal String today = ddMMyyyy.format(new Date());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"diff": "@@ -6,5 +6,13 @@ public interface SyncListener {\nvoid profileDataUpdated(JSONObject updates);\n+ /**\n+ * Notifies Listener when deviceID is generated successfully.\n+ *\n+ * @param CleverTapID Identifier, can be Custom CleverTapID, Google AD ID or SDK generated CleverTapID\n+ *\n+ * <p><br><span style=\"color:red;background:#ffcc99\" >⚠ Callback will be received on main\n+ * thread, so avoid doing any lengthy operations from this callback </span></p>\n+ */\nvoid profileDidInitialize(String CleverTapID);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): replace Logger.v() with verbose() and add documentation for profileDidInitialize SDK-934 |
116,612 | 12.07.2021 17:59:15 | -19,080 | 91896e920be039244cbe5eefd61e57070db3f684 | task(async_deviceID): comment out failing test case on bitrise | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerTest.kt",
"diff": "@@ -210,10 +210,10 @@ class CTProductConfigControllerTest : BaseTestCase() {\nAssert.assertEquals(mProductConfigController.getLong(\"fetched_long\"), 333333L)\nAssert.assertEquals(mProductConfigController.getDouble(\"fetched_double\"), 44444.4444, 0.1212)\nAssert.assertEquals(mProductConfigController.getBoolean(\"fetched_bool\"), true)\n- Assert.assertEquals(mProductConfigController.getString(\"def_str\"), \"This is def_string\")\n- Assert.assertEquals(mProductConfigController.getLong(\"def_long\"), 11111L)\n- Assert.assertEquals(mProductConfigController.getDouble(\"def_double\"), 2222.2222, 0.1212)\n- Assert.assertEquals(mProductConfigController.getBoolean(\"def_bool\"), false)\n+ //Assert.assertEquals(mProductConfigController.getString(\"def_str\"), \"This is def_string\")\n+ //Assert.assertEquals(mProductConfigController.getLong(\"def_long\"), 11111L)\n+ //Assert.assertEquals(mProductConfigController.getDouble(\"def_double\"), 2222.2222, 0.1212)\n+ //Assert.assertEquals(mProductConfigController.getBoolean(\"def_bool\"), false)\n}\n}\n@@ -251,7 +251,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nval newGuid = \"\"\ncontroller.setGuidAndInit(newGuid)\nAssert.assertEquals(controller.settings.guid, guid)\n- verify(productConfigSettings, never()).setGuid(newGuid)\n+ verify(productConfigSettings, never()).guid = newGuid\nverify(controller, never()).initAsync()\n}\n}\n@@ -265,7 +265,7 @@ class CTProductConfigControllerTest : BaseTestCase() {\nval newGuid = \"333333333\"\ncontroller.setGuidAndInit(newGuid)\nAssert.assertEquals(controller.settings.guid, guid)\n- verify(productConfigSettings, never()).setGuid(newGuid)\n+ verify(productConfigSettings, never()).guid = newGuid\nverify(controller, never()).initAsync()\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): comment out failing test case on bitrise SDK-934 |
116,612 | 13.07.2021 13:31:07 | -19,080 | 7a82ad5313fc83a366c9026ec7b93caee0549885 | task(async_deviceID): notify onInitDeviceIDListener from deviceIDCreated() | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n+import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n@@ -64,4 +65,8 @@ public abstract class BaseCallbackManager {\nCTPushNotificationListener pushNotificationListener);\npublic abstract void setSyncListener(SyncListener syncListener);\n+\n+ public abstract OnInitDeviceIDListener getOnInitDeviceIDListener();\n+\n+ public abstract void setOnInitDeviceIDListener(OnInitDeviceIDListener onInitDeviceIDListener);\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -6,6 +6,7 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n+import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n@@ -33,6 +34,8 @@ public class CallbackManager extends BaseCallbackManager {\nprivate WeakReference<CTFeatureFlagsListener> featureFlagListenerWeakReference;\n+ private OnInitDeviceIDListener onInitDeviceIDListener;\n+\nprivate WeakReference<CTProductConfigListener> productConfigListener;\nprivate CTPushAmpListener pushAmpListener = null;\n@@ -173,6 +176,16 @@ public class CallbackManager extends BaseCallbackManager {\nthis.syncListener = syncListener;\n}\n+ @Override\n+ public OnInitDeviceIDListener getOnInitDeviceIDListener() {\n+ return onInitDeviceIDListener;\n+ }\n+\n+ @Override\n+ public void setOnInitDeviceIDListener(final OnInitDeviceIDListener onInitDeviceIDListener) {\n+ this.onInitDeviceIDListener = onInitDeviceIDListener;\n+ }\n+\n//Profile\n@Override\npublic void notifyUserProfileInitialized(String deviceID) {\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": "@@ -609,7 +609,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nif (!Utils.haveDeprecatedFirebaseInstanceId) {\ninstance.getConfigLogger().debug(instance.getAccountId(), \"It looks like you're using the \" +\n- \"latest version of FCM where FirebaseInstanceId is deprecated, hence we won't be able to fetch \" +\n+ \"latest version of FCM where FirebaseInstanceId is deprecated, hence we won't be able to fetch \"\n+ +\n\"the token from sender id provided in manifest. Instead we will be using the token provided to us by Firebase.\");\n} else {\n//get token from Manifest\n@@ -1315,19 +1316,16 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n+ * This method is used to decrement the given value\n*\n- * @param onInitDeviceIDListener non-null callback to retrieve identifier on main thread.\n+ * Number should be in positive range\n+ *\n+ * @param key String\n+ * @param value Number\n*/\n- public void getCleverTapID(@NonNull OnInitDeviceIDListener onInitDeviceIDListener) {\n- Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\n- taskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n- @Override\n- public Void call() throws Exception {\n- onInitDeviceIDListener.onInitDeviceID(coreState.getDeviceInfo().getDeviceID());\n- return null;\n- }\n- });\n+ @SuppressWarnings(\"unused\")\n+ public void decrementValue(final String key, final Number value) {\n+ coreState.getAnalyticsManager().decrementValue(key, value);\n}\n@RestrictTo(Scope.LIBRARY)\n@@ -2203,20 +2201,35 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * This method is used to increment the given value\n+ * Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n*\n- * Number should be in positive range\n+ * @param onInitDeviceIDListener non-null callback to retrieve identifier on main thread.\n+ */\n+ public void getCleverTapID(@NonNull OnInitDeviceIDListener onInitDeviceIDListener) {\n+ Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\n+ taskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n+ @Override\n+ public Void call() throws Exception {\n+ String deviceID = coreState.getDeviceInfo().getDeviceID();\n+ if (deviceID != null) {\n+ onInitDeviceIDListener.onInitDeviceID(deviceID);\n+ } else {\n+ /**\n+ * If cleverTapID not yet generated during first init then set listener, through which\n+ * cleverTapID will be notified when it's generated and ready to use from deviceIDCreated()\n*\n- * @param key String\n- * @param value Number\n+ * Setting callback here makes sure that callback will be give only once, either from\n+ * getCleverTapID() or deviceIDCreated()\n*/\n- @SuppressWarnings(\"unused\")\n- public void incrementValue(final String key, final Number value){\n- coreState.getAnalyticsManager().incrementValue(key,value);\n+ coreState.getCallbackManager().setOnInitDeviceIDListener(onInitDeviceIDListener);\n+ }\n+ return null;\n+ }\n+ });\n}\n/**\n- * This method is used to decrement the given value\n+ * This method is used to increment the given value\n*\n* Number should be in positive range\n*\n@@ -2224,8 +2237,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* @param value Number\n*/\n@SuppressWarnings(\"unused\")\n- public void decrementValue(final String key, final Number value){\n- coreState.getAnalyticsManager().decrementValue(key,value);\n+ public void incrementValue(final String key, final Number value) {\n+ coreState.getAnalyticsManager().incrementValue(key, value);\n}\n/**\n@@ -2480,6 +2493,11 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ngetConfigLogger().verbose(accountId + \":async_deviceID\",\n\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n+\n+ if (coreState.getCallbackManager().getOnInitDeviceIDListener() != null) {\n+ coreState.getCallbackManager().getOnInitDeviceIDListener().onInitDeviceID(deviceId);\n+ }\n+\n}\nprivate CleverTapInstanceConfig getConfig() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): notify onInitDeviceIDListener from deviceIDCreated() SDK-934 |
116,612 | 13.07.2021 20:54:48 | -19,080 | d1dac76f78d3e18a1770b008415be8474744cf6a | task(async_deviceID): mark getCleverTapAttributionIdentifier() as deprecated | [
{
"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": "@@ -1292,11 +1292,18 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*\n* @return The attribution identifier currently being used to identify this user.\n*\n- * <p><br><span style=\"color:red;background:#ffcc99\" >⚠ this method may take a long time to return,\n+ * <p><br><span style=\"background:#ffcc99\" >⚠ this method may take a long time to return,\n* so you should not call it from the application main thread</span></p>\n+ *\n+ * <p style=\"color:red;font-size: 25px;margin-left:10px\">☠</p>\n+ * <b><span style=\"color:#4d2e00;background:#ffcc99\" >Deprecated as of version <code>4.2.0</code> and will be\n+ * removed in future versions</span>\n+ * </b><br>\n+ * <code>Use {@link CleverTapAPI#getCleverTapID(OnInitCleverTapIDListener)} instead</code>\n*/\n@SuppressWarnings(\"unused\")\n@WorkerThread\n+ @Deprecated\npublic String getCleverTapAttributionIdentifier() {\nreturn coreState.getDeviceInfo().getAttributionID();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): mark getCleverTapAttributionIdentifier() as deprecated SDK-934 |
116,612 | 13.07.2021 20:56:37 | -19,080 | 5329904212f8da1933839143211274c8398fa01a | task(async_deviceID): refactor OnInitDeviceIDListener to OnInitCleverTapIDListener | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -2,7 +2,7 @@ package com.clevertap.android.sdk;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n-import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\n+import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n@@ -66,7 +66,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setSyncListener(SyncListener syncListener);\n- public abstract OnInitDeviceIDListener getOnInitDeviceIDListener();\n+ public abstract OnInitCleverTapIDListener getOnInitCleverTapIDListener();\n- public abstract void setOnInitDeviceIDListener(OnInitDeviceIDListener onInitDeviceIDListener);\n+ public abstract void setOnInitCleverTapIDListener(OnInitCleverTapIDListener onInitCleverTapIDListener);\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -6,7 +6,7 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n-import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\n+import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\n@@ -34,7 +34,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate WeakReference<CTFeatureFlagsListener> featureFlagListenerWeakReference;\n- private OnInitDeviceIDListener onInitDeviceIDListener;\n+ private OnInitCleverTapIDListener onInitCleverTapIDListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n@@ -177,13 +177,13 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public OnInitDeviceIDListener getOnInitDeviceIDListener() {\n- return onInitDeviceIDListener;\n+ public OnInitCleverTapIDListener getOnInitCleverTapIDListener() {\n+ return onInitCleverTapIDListener;\n}\n@Override\n- public void setOnInitDeviceIDListener(final OnInitDeviceIDListener onInitDeviceIDListener) {\n- this.onInitDeviceIDListener = onInitDeviceIDListener;\n+ public void setOnInitCleverTapIDListener(final OnInitCleverTapIDListener onInitCleverTapIDListener) {\n+ this.onInitCleverTapIDListener = onInitCleverTapIDListener;\n}\n//Profile\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": "@@ -29,7 +29,7 @@ import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n-import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener;\n+import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n@@ -2210,16 +2210,16 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n/**\n* Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n*\n- * @param onInitDeviceIDListener non-null callback to retrieve identifier on main thread.\n+ * @param onInitCleverTapIDListener non-null callback to retrieve identifier on main thread.\n*/\n- public void getCleverTapID(@NonNull OnInitDeviceIDListener onInitDeviceIDListener) {\n+ public void getCleverTapID(@NonNull OnInitCleverTapIDListener onInitCleverTapIDListener) {\nTask<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\ntaskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n@Override\npublic Void call() throws Exception {\nString deviceID = coreState.getDeviceInfo().getDeviceID();\nif (deviceID != null) {\n- onInitDeviceIDListener.onInitDeviceID(deviceID);\n+ onInitCleverTapIDListener.onInitDeviceID(deviceID);\n} else {\n/**\n* If cleverTapID not yet generated during first init then set listener, through which\n@@ -2228,7 +2228,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Setting callback here makes sure that callback will be give only once, either from\n* getCleverTapID() or deviceIDCreated()\n*/\n- coreState.getCallbackManager().setOnInitDeviceIDListener(onInitDeviceIDListener);\n+ coreState.getCallbackManager().setOnInitCleverTapIDListener(onInitCleverTapIDListener);\n}\nreturn null;\n}\n@@ -2501,8 +2501,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\n- if (coreState.getCallbackManager().getOnInitDeviceIDListener() != null) {\n- coreState.getCallbackManager().getOnInitDeviceIDListener().onInitDeviceID(deviceId);\n+ if (coreState.getCallbackManager().getOnInitCleverTapIDListener() != null) {\n+ coreState.getCallbackManager().getOnInitCleverTapIDListener().onInitDeviceID(deviceId);\n}\n}\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/OnInitDeviceIDListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/OnInitCleverTapIDListener.java",
"diff": "package com.clevertap.android.sdk.interfaces;\n-public interface OnInitDeviceIDListener {\n+public interface OnInitCleverTapIDListener {\nvoid onInitDeviceID(String deviceID);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "@@ -7,7 +7,7 @@ import com.clevertap.android.sdk.ActivityLifecycleCallback\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.CleverTapAPI.LogLevel.VERBOSE\nimport com.clevertap.android.sdk.SyncListener\n-import com.clevertap.android.sdk.interfaces.OnInitDeviceIDListener\n+import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener\nimport org.json.JSONObject\nclass MyApplication : MultiDexApplication() {\n@@ -45,7 +45,7 @@ class MyApplication : MultiDexApplication() {\n}\n}\n- defaultInstance?.getCleverTapID(OnInitDeviceIDListener {\n+ defaultInstance?.getCleverTapID(OnInitCleverTapIDListener {\nprintln(\n\"CleverTap DeviceID from Application class= $it\"\n)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): refactor OnInitDeviceIDListener to OnInitCleverTapIDListener SDK-934 |
116,612 | 13.07.2021 21:11:14 | -19,080 | af47b586f9e6074e0bd9ada3a9dbc93c99d8c39a | task(async_deviceID): mark SyncListener as deprecated | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/SyncListener.java",
"diff": "package com.clevertap.android.sdk;\n+import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport org.json.JSONObject;\n+/**\n+ * <p style=\"color:red;font-size: 25px;margin-left:10px\">☠</p>\n+ * <b><span style=\"color:#4d2e00;background:#ffcc99\" >Deprecated as of version <code>4.2.0</code> and will be\n+ * removed in future versions</span>\n+ * </b><br>\n+ * <code>Use {@link CleverTapAPI#getCleverTapID(OnInitCleverTapIDListener)} instead</code>\n+ */\n+@Deprecated\npublic interface SyncListener {\nvoid profileDataUpdated(JSONObject updates);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): mark SyncListener as deprecated SDK-934 |
116,612 | 13.07.2021 21:27:18 | -19,080 | 4d32cb3aeac15ff3dd75517031db6a5b92c243b2 | task(async_deviceID): refactor onInitDeviceID() to onInitCleverTapID() | [
{
"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": "@@ -2219,7 +2219,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic Void call() throws Exception {\nString deviceID = coreState.getDeviceInfo().getDeviceID();\nif (deviceID != null) {\n- onInitCleverTapIDListener.onInitDeviceID(deviceID);\n+ onInitCleverTapIDListener.onInitCleverTapID(deviceID);\n} else {\n/**\n* If cleverTapID not yet generated during first init then set listener, through which\n@@ -2502,7 +2502,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().notifyUserProfileInitialized(deviceId);\nif (coreState.getCallbackManager().getOnInitCleverTapIDListener() != null) {\n- coreState.getCallbackManager().getOnInitCleverTapIDListener().onInitDeviceID(deviceId);\n+ coreState.getCallbackManager().getOnInitCleverTapIDListener().onInitCleverTapID(deviceId);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/OnInitCleverTapIDListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/OnInitCleverTapIDListener.java",
"diff": "package com.clevertap.android.sdk.interfaces;\n+/**\n+ * Notifies about CleverTapID generation through callback\n+ */\npublic interface OnInitCleverTapIDListener {\n- void onInitDeviceID(String deviceID);\n+ /**\n+ * Callback to hand over generated cleverTapID to listener\n+ *\n+ * @param cleverTapID Identifier, can be Custom CleverTapID, Google AD ID or SDK generated CleverTapID\n+ * <p><br><span style=\"color:red;background:#ffcc99\" >⚠ Callback will be received on main\n+ * thread, so avoid doing any lengthy operations from this callback </span></p>\n+ */\n+ void onInitCleverTapID(String cleverTapID);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): refactor onInitDeviceID() to onInitCleverTapID() SDK-934 |
116,612 | 13.07.2021 21:32:23 | -19,080 | d763b3fb681bf81f1e7064124e55216ec4df0db9 | task(async_deviceID): 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": "@@ -2469,6 +2469,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn;\n}\n+ /**\n+ * Reinitialising InAppFCManager with device id, if it's null\n+ * during first initialisation from CleverTapFactory.getCoreState()\n+ */\nif (coreState.getControllerManager().getInAppFCManager() == null) {\ngetConfigLogger().verbose(accountId + \":async_deviceID\",\n\"Initializing InAppFC after Device ID Created = \" + deviceId);\n@@ -2477,8 +2481,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * Reinitialising product config & Feature Flag controllers with device id if it's null\n- * during first initialisation\n+ * Reinitialising product config & Feature Flag controllers with device id, if it's null\n+ * during first initialisation from CleverTapFactory.getCoreState()\n*/\nCTFeatureFlagsController ctFeatureFlagsController = coreState.getControllerManager()\n.getCTFeatureFlagsController();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): add comments SDK-934 |
116,623 | 14.07.2021 01:24:15 | -19,080 | 54557b46d22743db3293267143ba00c5cb17eaf2 | task(SDK-963): Updated HMS SDK versions and added CHANGELOG for release | [
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.2.0 (July 14, 2021)\n+* Adds public methods for suspending/discarding & resuming InApp Notifications\n+* Adds public methods to increment/decrement values set via User properties\n+* Adds a new callback to get CleverTap ID\n+* Adds new `CleverTapAPI.LogLevel.VERBOSE` level for debugging\n+* Fixes App Inbox UI for Android Tablets\n+* Fixes `recordScreen` NPE crash\n+* Fixes a few Strict Mode Read violations that caused ANRs\n+* Other performance improvements and improved logging\n+\n### Version 4.1.1 (May 4, 2021)\n* Adds `setFirstTabTitle` method to set the name of the first tab in App Inbox\n* Adds `pushChargedEvent` to `CTWebInterface` class to allow raising Charged Event from JS\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n+### Version 1.0.2 (July 15, 2021)\n+* Updated Huawei Push SDK to v5.3.0.304\n+* Supports CleverTap Android SDK v4.2.0\n+\n### Version 1.0.1 (April 13, 2021)\n* Updated Huawei Push SDK to v5.1.1.301\n* Supports CleverTap Android SDK v4.1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.2.0 (July 14, 2021)\n+* Adds public methods for suspending/discarding & resuming InApp Notifications\n+* Adds public methods to increment/decrement values set via User properties\n+* Adds a new callback to get CleverTap ID\n+* Adds new `CleverTapAPI.LogLevel.VERBOSE` level for debugging\n+* Fixes App Inbox UI for Android Tablets\n+* Fixes `recordScreen` NPE crash\n+* Fixes a few Strict Mode Read violations that caused ANRs\n+* Other performance improvements and improved logging\n+\n### Version 4.1.1 (May 4, 2021)\n* Adds `setFirstTabTitle` method to set the name of the first tab in App Inbox\n* Adds `pushChargedEvent` to `CTWebInterface` class to allow raising Charged Event from JS\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n+### Version 1.0.2 (July 15, 2021)\n+* Updated Huawei Push SDK to v5.3.0.304\n+* Supports CleverTap Android SDK v4.2.0\n+\n### Version 1.0.1 (April 13, 2021)\n* Updated Huawei Push SDK to v5.1.1.301\n* Supports CleverTap Android SDK v4.1.0\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -66,8 +66,8 @@ version.androidx.test.ext.junit=1.1.2\nversion.com.google.code.gson..gson=2.8.6\nversion.com.google.gms..google-services=4.3.3\nversion.com.google.truth..truth=1.1.3\n-version.com.huawei.agconnect..agcp=1.4.1.300\n-version.com.huawei.hms..push=5.1.1.301\n+version.com.huawei.agconnect..agcp=1.4.2.300\n+version.com.huawei.hms..push=5.3.0.304\nversion.eu.codearte.catch-exception..catch-exception=2.0\n## # available=2.0.0-ALPHA-1\n## # available=2.0.0-beta-1\n@@ -106,7 +106,7 @@ version.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\nversion.com.clevertap.android..clevertap-android-sdk=4.2.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.0.2\n-version.com.clevertap.android..clevertap-hms-sdk=1.0.1\n+version.com.clevertap.android..clevertap-hms-sdk=1.0.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.0.2\nversion.com.github.bumptech.glide..glide=4.11.0\nversion.com.google.android.exoplayer..exoplayer=2.11.5\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-963): Updated HMS SDK versions and added CHANGELOG for release |
116,612 | 14.07.2021 12:06:53 | -19,080 | 66199557c93062da1fed0aaa66b847e20b869c83 | task(async_deviceID): remove unwanted logging | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java",
"diff": "@@ -58,16 +58,6 @@ class CleverTapFactory {\nctLockManager, callbackManager, deviceInfo, baseDatabaseManager);\ncoreState.setControllerManager(controllerManager);\n- coreState.getConfig().getLogger()\n- .verbose(config.getAccountId() + \":async_deviceID\",\n- \"coreState.getDeviceInfo() = \" + coreState.getDeviceInfo());\n- coreState.getConfig().getLogger()\n- .verbose(config.getAccountId() + \":async_deviceID\",\n- \"coreState.getDeviceInfo().getDeviceID() = \" + coreState.getDeviceInfo().getDeviceID());\n- coreState.getConfig().getLogger()\n- .verbose(config.getAccountId() + \":async_deviceID\",\n- \"controllerManager.getInAppFCManager() = \" + controllerManager.getInAppFCManager());\n-\nif (coreState.getDeviceInfo() != null && coreState.getDeviceInfo().getDeviceID() != null\n&& controllerManager.getInAppFCManager() == null) {\ncoreState.getConfig().getLogger()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): remove unwanted logging SDK-934 |
116,612 | 14.07.2021 18:37:48 | -19,080 | 9ae13823404157486907703e14d7f7f07265ee37 | task(async_deviceID): remove strict mode logging | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt",
"diff": "package com.clevertap.demo\nimport android.app.NotificationManager\n-import android.os.StrictMode\nimport androidx.multidex.MultiDexApplication\nimport com.clevertap.android.sdk.ActivityLifecycleCallback\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.CleverTapAPI.LogLevel.VERBOSE\nimport com.clevertap.android.sdk.SyncListener\n-import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener\nimport org.json.JSONObject\nclass MyApplication : MultiDexApplication() {\noverride fun onCreate() {\n- StrictMode.setThreadPolicy(\n- StrictMode.ThreadPolicy.Builder()\n- .detectDiskReads()\n- .detectDiskWrites()\n- .detectNetwork() // or .detectAll() for all detectable problems\n- .penaltyLog()\n- .build()\n- )\n- StrictMode.setVmPolicy(\n- StrictMode.VmPolicy.Builder()\n- .detectLeakedSqlLiteObjects()\n- .detectLeakedClosableObjects()\n- .penaltyLog()\n- .penaltyDeath()\n- .build()\n- )\nCleverTapAPI.setDebugLevel(VERBOSE)\nActivityLifecycleCallback.register(this)\nsuper.onCreate()\n@@ -45,11 +27,11 @@ class MyApplication : MultiDexApplication() {\n}\n}\n- defaultInstance?.getCleverTapID(OnInitCleverTapIDListener {\n+ defaultInstance?.getCleverTapID {\nprintln(\n\"CleverTap DeviceID from Application class= $it\"\n)\n- })\n+ }\n/*println(\n\"CleverTapAttribution Identifier from Application class= \" +\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(async_deviceID): remove strict mode logging SDK-934 |
116,616 | 26.07.2021 12:39:32 | -19,080 | 299655f7b0b76a95462823c4bf0fe8a8863b193f | task(SDK-981)-Add default template for pushTemplates module | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/.gitignore",
"diff": "+/build\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/build.gradle",
"diff": "+plugins {\n+ id 'com.android.library'\n+ id 'kotlin-android'\n+}\n+\n+android {\n+ compileSdkVersion 30\n+ buildToolsVersion \"30.0.3\"\n+\n+ defaultConfig {\n+ minSdkVersion 16\n+ targetSdkVersion 30\n+ versionCode 1\n+ versionName \"1.0\"\n+\n+ testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\"\n+ consumerProguardFiles \"consumer-rules.pro\"\n+ }\n+\n+ buildTypes {\n+ release {\n+ minifyEnabled false\n+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'\n+ }\n+ }\n+ compileOptions {\n+ sourceCompatibility JavaVersion.VERSION_1_8\n+ targetCompatibility JavaVersion.VERSION_1_8\n+ }\n+ kotlinOptions {\n+ jvmTarget = '1.8'\n+ }\n+}\n+\n+dependencies {\n+ compileOnly project(':clevertap-core')\n+ implementation \"org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version\"\n+ implementation 'androidx.core:core-ktx:1.6.0'\n+ implementation 'androidx.appcompat:appcompat:1.3.0'\n+ implementation 'com.google.android.material:material:1.4.0'\n+ testImplementation 'junit:junit:4.+'\n+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'\n+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": "pushTemplates/consumer-rules.pro",
"new_path": "pushTemplates/consumer-rules.pro",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/proguard-rules.pro",
"diff": "+# Add project specific ProGuard rules here.\n+# You can control the set of applied configuration files using the\n+# proguardFiles setting in build.gradle.\n+#\n+# For more details, see\n+# http://developer.android.com/guide/developing/tools/proguard.html\n+\n+# If your project uses WebView with JS, uncomment the following\n+# and specify the fully qualified class name to the JavaScript interface\n+# class:\n+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {\n+# public *;\n+#}\n+\n+# Uncomment this to preserve the line number information for\n+# debugging stack traces.\n+#-keepattributes SourceFile,LineNumberTable\n+\n+# If you keep the line number information, uncomment this to\n+# hide the original source file name.\n+#-renamesourcefileattribute SourceFile\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/androidTest/java/com/clevertap/android/pushtemplates/ExampleInstrumentedTest.kt",
"diff": "+package com.clevertap.android.pushtemplates\n+\n+import androidx.test.platform.app.InstrumentationRegistry\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+\n+import org.junit.Assert.*\n+\n+/**\n+ * Instrumented test, which will execute on an Android device.\n+ *\n+ * See [testing documentation](http://d.android.com/tools/testing).\n+ */\n+@RunWith(AndroidJUnit4::class)\n+class ExampleInstrumentedTest {\n+ @Test\n+ fun useAppContext() {\n+ // Context of the app under test.\n+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext\n+ assertEquals(\"com.clevertap.android.pushtemplates.test\", appContext.packageName)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/AndroidManifest.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ package=\"com.clevertap.android.pushtemplates\">\n+\n+</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/test/java/com/clevertap/android/pushtemplates/ExampleUnitTest.kt",
"diff": "+package com.clevertap.android.pushtemplates\n+\n+import org.junit.Test\n+\n+import org.junit.Assert.*\n+\n+/**\n+ * Example local unit test, which will execute on the development machine (host).\n+ *\n+ * See [testing documentation](http://d.android.com/tools/testing).\n+ */\n+class ExampleUnitTest {\n+ @Test\n+ fun addition_isCorrect() {\n+ assertEquals(4, 2 + 2)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-981)-Add default template for pushTemplates module |
116,612 | 30.07.2021 12:59:23 | -19,080 | 86abfb1d9f44bced9c9f09bbed976e200fcc2e98 | task(streamline_pn): centralize messageReceived() and onNewToken() for FCM,XPS,HMS | [
{
"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": "@@ -29,6 +29,7 @@ import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n+import com.clevertap.android.sdk.interfaces.NotificationHandler;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -102,6 +103,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n+ private static NotificationHandler sNotificationHandler;\n+\nprivate final Context context;\nprivate CoreState coreState;\n@@ -703,6 +706,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\nCleverTapAPI instance = null;\n+ // TODO : correct\nfor (String accountId : instances.keySet()) {\ninstance = CleverTapAPI.instances.get(accountId);\n}\n@@ -2207,32 +2211,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- /**\n- * Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n- *\n- * @param onInitCleverTapIDListener non-null callback to retrieve identifier on main thread.\n- */\n- public void getCleverTapID(@NonNull OnInitCleverTapIDListener onInitCleverTapIDListener) {\n- Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\n- taskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n- @Override\n- public Void call() throws Exception {\n- String deviceID = coreState.getDeviceInfo().getDeviceID();\n- if (deviceID != null) {\n- onInitCleverTapIDListener.onInitCleverTapID(deviceID);\n- } else {\n- /**\n- * If cleverTapID not yet generated during first init then set listener, through which\n- * cleverTapID will be notified when it's generated and ready to use from deviceIDCreated()\n- *\n- * Setting callback here makes sure that callback will be give only once, either from\n- * getCleverTapID() or deviceIDCreated()\n- */\n- coreState.getCallbackManager().setOnInitCleverTapIDListener(onInitCleverTapIDListener);\n- }\n- return null;\n- }\n- });\n+ public static NotificationHandler getNotificationHandler() {\n+ return sNotificationHandler;\n}\n/**\n@@ -2700,4 +2680,40 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\nreturn instance;\n}\n+\n+ public static void setNotificationHandler(NotificationHandler notificationHandler) {\n+ sNotificationHandler = notificationHandler;\n+ }\n+\n+ public static void handleMessage(String pushType) {\n+\n+ }\n+\n+ /**\n+ * Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n+ *\n+ * @param onInitCleverTapIDListener non-null callback to retrieve identifier on main thread.\n+ */\n+ public void getCleverTapID(@NonNull final OnInitCleverTapIDListener onInitCleverTapIDListener) {\n+ Task<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(getConfig()).ioTask();\n+ taskDeviceCachedInfo.execute(\"getCleverTapID\", new Callable<Void>() {\n+ @Override\n+ public Void call() throws Exception {\n+ String deviceID = coreState.getDeviceInfo().getDeviceID();\n+ if (deviceID != null) {\n+ onInitCleverTapIDListener.onInitCleverTapID(deviceID);\n+ } else {\n+ /**\n+ * If cleverTapID not yet generated during first init then set listener, through which\n+ * cleverTapID will be notified when it's generated and ready to use from deviceIDCreated()\n+ *\n+ * Setting callback here makes sure that callback will be give only once, either from\n+ * getCleverTapID() or deviceIDCreated()\n+ */\n+ coreState.getCallbackManager().setOnInitCleverTapIDListener(onInitCleverTapIDListener);\n+ }\n+ return null;\n+ }\n+ });\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "+\npackage com.clevertap.android.sdk.db;\nimport android.annotation.SuppressLint;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/NotificationHandler.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+import android.content.Context;\n+import android.os.Bundle;\n+\n+public interface NotificationHandler {\n+\n+ /**\n+ * @param applicationContext - application context\n+ * @param message - notification message from cloud messaging owners\n+ */\n+ boolean onMessageReceived(final Context applicationContext, Bundle message, final String pushType);\n+\n+ /**\n+ * @param applicationContext - application context\n+ * @param token - token received from cloud messaging owners\n+ */\n+ boolean onNewToken(Context applicationContext, String token, final String pushType);\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"diff": "+package com.clevertap.android.sdk.pushnotification;\n+\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.XPS;\n+import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAccountIdFromNotificationBundle;\n+\n+import android.content.Context;\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.interfaces.NotificationHandler;\n+\n+public class PushNotificationHandler implements NotificationHandler {\n+\n+ private static class SingletonNotificationHandler {\n+\n+ private final static PushNotificationHandler INSTANCE = new PushNotificationHandler();\n+ }\n+\n+ public static NotificationHandler getPushNotificationHandler() {\n+ return SingletonNotificationHandler.INSTANCE;\n+ }\n+\n+ public static boolean isForPushTemplates(Bundle extras) {\n+ if (extras == null) {\n+ return false;\n+ }\n+ String pt_id = extras.getString(\"pt_id\");\n+ return !((\"0\").equals(pt_id) || pt_id == null || pt_id.isEmpty());\n+ }\n+\n+ private PushNotificationHandler() {\n+ // NO-OP\n+ }\n+\n+ @Override\n+ public synchronized boolean onMessageReceived(final Context applicationContext, final Bundle message,\n+ final String pushType) {\n+ CleverTapAPI cleverTapAPI = CleverTapAPI\n+ .getGlobalInstance(applicationContext, getAccountIdFromNotificationBundle(message));\n+ NotificationInfo info = CleverTapAPI.getNotificationInfo(message);\n+\n+ if (info.fromCleverTap) {\n+ if (cleverTapAPI != null) {\n+ cleverTapAPI.getCoreState().getConfig().log(LOG_TAG,\n+ pushType + \"received notification from CleverTap: \" + message.toString());\n+ } else {\n+ Logger.d(LOG_TAG, pushType + \"received notification from CleverTap: \" + message.toString());\n+ }\n+ if (isForPushTemplates(message) && CleverTapAPI.getNotificationHandler() != null) {\n+ CleverTapAPI.getNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n+ } else {\n+ CleverTapAPI.createNotification(applicationContext, message);\n+ }\n+ return true;\n+ }\n+\n+ return false;\n+ }\n+\n+ @Override\n+ public boolean onNewToken(final Context applicationContext, final String token, final String pushType) {\n+ if (pushType.equals(FCM.getType())) {\n+ CleverTapAPI.fcmTokenRefresh(applicationContext, token);\n+ } else if (pushType.equals(HPS.getType())) {\n+ CleverTapAPI.tokenRefresh(applicationContext, token, HPS);\n+ } else if (pushType.equals(XPS.getType())) {\n+ CleverTapAPI.tokenRefresh(applicationContext, token, XPS);\n+ }\n+ return true;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -1265,4 +1265,5 @@ public class PushProviders implements CTPushProviderListener {\n}\nreturn null;\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/fcm/FcmMessageHandlerImpl.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageHandlerImpl.java",
"diff": "@@ -2,13 +2,12 @@ package com.clevertap.android.sdk.pushnotification.fcm;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.FCM_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n-import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAccountIdFromNotificationBundle;\nimport android.content.Context;\nimport android.os.Bundle;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo;\n+import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+import com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.google.firebase.messaging.RemoteMessage;\nimport java.util.Map;\n@@ -26,20 +25,9 @@ public class FcmMessageHandlerImpl implements IFcmMessageHandler {\nfor (Map.Entry<String, String> entry : message.getData().entrySet()) {\nextras.putString(entry.getKey(), entry.getValue());\n}\n- CleverTapAPI cleverTapAPI = CleverTapAPI\n- .getGlobalInstance(context, getAccountIdFromNotificationBundle(extras));\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\n-\n- if (info.fromCleverTap) {\n- if (cleverTapAPI != null) {\n- cleverTapAPI.getCoreState().getConfig().log(LOG_TAG,\n- FCM_LOG_TAG + \"received notification from CleverTap: \" + extras.toString());\n- } else {\n- Logger.d(LOG_TAG, FCM_LOG_TAG + \"received notification from CleverTap: \" + extras.toString());\n- }\n- CleverTapAPI.createNotification(context, extras);\n- isSuccess = true;\n- }\n+\n+ isSuccess = PushNotificationHandler.getPushNotificationHandler()\n+ .onMessageReceived(context, extras, PushType.FCM.toString());\n}\n} catch (Throwable t) {\nLogger.d(LOG_TAG, FCM_LOG_TAG + \"Error parsing FCM message\", t);\n@@ -51,7 +39,9 @@ public class FcmMessageHandlerImpl implements IFcmMessageHandler {\npublic boolean onNewToken(final Context applicationContext, final String token) {\nboolean isSuccess = false;\ntry {\n- CleverTapAPI.fcmTokenRefresh(applicationContext, token);\n+ PushNotificationHandler.getPushNotificationHandler().onNewToken(applicationContext, token, PushType.FCM\n+ .getType());\n+\nLogger.d(LOG_TAG, FCM_LOG_TAG + \"New token received from FCM - \" + token);\nisSuccess = true;\n} catch (Throwable t) {\n@@ -60,4 +50,6 @@ public class FcmMessageHandlerImpl implements IFcmMessageHandler {\n}\nreturn isSuccess;\n}\n+\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": "@@ -3,20 +3,24 @@ package com.clevertap.android.hms;\nimport static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.HPS;\n-import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAccountIdFromNotificationBundle;\nimport android.content.Context;\nimport android.os.Bundle;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+import com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.huawei.hms.push.RemoteMessage;\n/**\n* Implementation of {@link IHmsMessageHandler}\n*/\n-class HmsMessageHandlerImpl implements IHmsMessageHandler {\n+public class HmsMessageHandlerImpl implements IHmsMessageHandler {\n- private IHmsNotificationParser mParser;\n+ private final IHmsNotificationParser mParser;\n+\n+ public HmsMessageHandlerImpl() {\n+ this(new HmsNotificationParser());\n+ }\nHmsMessageHandlerImpl(final IHmsNotificationParser parser) {\nmParser = parser;\n@@ -28,8 +32,8 @@ class HmsMessageHandlerImpl implements IHmsMessageHandler {\nBundle messageBundle = mParser.toBundle(remoteMessage);\nif (messageBundle != null) {\ntry {\n- createNotificationWithMessageBundle(context, messageBundle);\n- isSuccess = true;\n+ isSuccess = PushNotificationHandler\n+ .getPushNotificationHandler().onMessageReceived(context, messageBundle, HPS.toString());\n} catch (Throwable e) {\ne.printStackTrace();\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"Error Creating Notification\", e);\n@@ -38,23 +42,12 @@ class HmsMessageHandlerImpl implements IHmsMessageHandler {\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.getCoreState().getConfig().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;\ntry {\n- CleverTapAPI.tokenRefresh(context, token, HPS);\n+ PushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, PushType.HPS\n+ .getType());\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"onNewToken: \" + token);\nisSuccess = true;\n} catch (Throwable throwable) {\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": "@@ -4,10 +4,8 @@ import static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport android.os.Bundle;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.huawei.hms.push.RemoteMessage;\n/**\n@@ -19,9 +17,8 @@ public class HmsNotificationParser implements IHmsNotificationParser {\npublic Bundle toBundle(final RemoteMessage message) {\ntry {\nBundle extras = Utils.stringToBundle(message.getData());\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"Found Valid Notification Message \");\n- return info.fromCleverTap ? extras : null;\n+ return extras;\n} catch (Throwable e) {\ne.printStackTrace();\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"Invalid Notification Message \", e);\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": "package com.clevertap.android.xps;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n-import static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getAccountIdFromNotificationBundle;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.XPS;\nimport static com.clevertap.android.xps.XpsConstants.FAILED_WITH_EXCEPTION;\nimport static com.clevertap.android.xps.XpsConstants.INVALID_TOKEN;\nimport static com.clevertap.android.xps.XpsConstants.OTHER_COMMAND;\n@@ -13,9 +13,8 @@ import android.content.Context;\nimport android.os.Bundle;\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n-import com.clevertap.android.sdk.pushnotification.PushConstants;\n+import com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.xiaomi.mipush.sdk.ErrorCode;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport com.xiaomi.mipush.sdk.MiPushCommandMessage;\n@@ -25,11 +24,16 @@ import java.util.List;\n/**\n* Implementation of {@link IMiMessageHandler}\n*/\n-class XiaomiMessageHandlerImpl implements IMiMessageHandler {\n+public class XiaomiMessageHandlerImpl implements IMiMessageHandler {\nprivate @NonNull\n+ final\nIXiaomiNotificationParser mParser;\n+ public XiaomiMessageHandlerImpl() {\n+ this(new XiaomiNotificationParser());\n+ }\n+\nXiaomiMessageHandlerImpl(@NonNull final IXiaomiNotificationParser parser) {\nmParser = parser;\n}\n@@ -40,8 +44,9 @@ class XiaomiMessageHandlerImpl implements IMiMessageHandler {\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\ntry {\n- createNotificationWithBundleMessage(context, messageBundle);\n- isSuccess = true;\n+ isSuccess = PushNotificationHandler\n+ .getPushNotificationHandler().onMessageReceived(context, messageBundle, XPS.toString());\n+\n} catch (Throwable e) {\ne.printStackTrace();\nisSuccess = false;\n@@ -51,18 +56,6 @@ class XiaomiMessageHandlerImpl implements IMiMessageHandler {\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.getCoreState().getConfig().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@@ -85,7 +78,8 @@ class XiaomiMessageHandlerImpl implements IMiMessageHandler {\nLogger.d(LOG_TAG, \"onReceiveRegisterResult() : Token is null or empty\");\nreturn INVALID_TOKEN;\n}\n- CleverTapAPI.tokenRefresh(context, token, PushConstants.PushType.XPS);\n+ PushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, XPS\n+ .getType());\nreturn TOKEN_SUCCESS;\n} catch (Throwable t) {\nLogger.d(LOG_TAG, \"onReceiveRegisterResult() : Exception: \", t);\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": "@@ -4,10 +4,8 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.xps.XpsConstants.XIAOMI_LOG_TAG;\nimport android.os.Bundle;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n-import com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\n/**\n@@ -19,9 +17,8 @@ public class XiaomiNotificationParser implements IXiaomiNotificationParser {\npublic Bundle toBundle(final MiPushMessage message) {\ntry {\nBundle extras = Utils.stringToBundle(message.getContent());\n- NotificationInfo info = CleverTapAPI.getNotificationInfo(extras);\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Found Valid Notification Message \");\n- return info.fromCleverTap ? extras : null;\n+ return extras;\n} catch (Throwable e) {\ne.printStackTrace();\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Invalid Notification Message \", e);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"diff": "+package com.clevertap.demo\n+\n+import com.clevertap.android.sdk.pushnotification.fcm.FcmMessageHandlerImpl\n+import com.google.firebase.messaging.FirebaseMessagingService\n+import com.google.firebase.messaging.RemoteMessage\n+\n+class MyFcmMessageListenerService : FirebaseMessagingService() {\n+\n+ override fun onMessageReceived(message: RemoteMessage) {\n+ super.onMessageReceived(message)\n+ var pushType = \"fcm\"\n+ if (pushType.equals(\"fcm\")) {\n+ FcmMessageHandlerImpl().onMessageReceived(applicationContext, message)\n+ } else if (pushType.equals(\"hps\")) {\n+ //HmsMessageHandlerImpl().createNotification(applicationContext,message)\n+ } else if (pushType.equals(\"xps\")) {\n+ //XiaomiMessageHandlerImpl().createNotification(applicationContext,message)\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): centralize messageReceived() and onNewToken() for FCM,XPS,HMS SDK-987 |
116,616 | 03.08.2021 10:50:55 | -19,080 | 98b1a996c280c67c4f45e1eedbe37b1c0716fb34 | add basic PTApi and update build.gradle | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -3,6 +3,9 @@ apply plugin: 'org.sonarqube'\n// Top-level build file where you can add configuration options common to all sub-projects/modules.\nbuildscript {\n+ ext {\n+ kotlin_version = '1.5.21'\n+ }\nrepositories {\ngoogle()// Google's Maven repository\nmavenCentral()\n@@ -19,6 +22,7 @@ buildscript {\nclasspath Libs.org_jacoco_core\nclasspath Libs.kotlin_gradle_plugin\nclasspath Libs.sonarqube_gradle_plugin\n+ classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/CTPushTemplateAPI.kt",
"diff": "+package com.clevertap.android.pushtemplates\n+\n+import android.content.Context\n+import android.widget.Toast\n+import androidx.annotation.Nullable\n+import androidx.core.content.ContextCompat\n+import com.clevertap.android.sdk.CleverTapAPI\n+\n+class CTPushTemplateAPI (private var context: Context, private var cleverTapAPI: CleverTapAPI){\n+\n+\n+ fun showToastWithCTId(@Nullable text: String?,\n+ duration: Int,\n+ @Nullable backgroundTint: Int?){\n+ val toastEgg = Toast.makeText(context, text + \" CT_ID_\" + cleverTapAPI.cleverTapID, duration)\n+ if (backgroundTint != null) {\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {\n+ toastEgg.view?.background?.setTintList(ContextCompat.getColorStateList(context, backgroundTint))\n+ }\n+ }\n+\n+ toastEgg.show()\n+\n+ }\n+\n+ fun showToast(@Nullable text: CharSequence?,\n+ duration: Int,\n+ @Nullable backgroundTint: Int?){\n+ val toastEgg = Toast.makeText(context, text, duration)\n+ if (backgroundTint != null) {\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {\n+ toastEgg.view?.background?.setTintList(ContextCompat.getColorStateList(context, backgroundTint))\n+ }\n+ }\n+\n+ toastEgg.show()\n+\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -8,6 +8,7 @@ include ':sample'\ninclude ':clevertap-geofence'\ninclude ':clevertap-xps'\ninclude ':clevertap-hms'\n+include ':pushTemplates'\nrefreshVersions {\nenableBuildSrcLibs()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | add basic PTApi and update build.gradle |
116,612 | 09.08.2021 14:43:06 | -19,080 | ec708536683bced8b587ad6de1dd929f903b2359 | task(streamline_pn): centralize clevertap instance creation using fromAccountId() and fromBundle() | [
{
"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": "@@ -157,33 +157,33 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"WeakerAccess\"})\npublic static void createNotification(final Context context, final Bundle extras, final int notificationId) {\n- String _accountId = extras.getString(Constants.WZRK_ACCT_ID_KEY);\n- if (instances == null) {\n- CleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\n+ CleverTapAPI instance = fromBundle(context, extras);\nif (instance != null) {\n- instance.coreState.getPushProviders()._createNotification(context, extras, notificationId);\n- }\n- return;\n- }\n-\n- for (String accountId : CleverTapAPI.instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- boolean shouldProcess = false;\n- if (instance != null) {\n- shouldProcess = (_accountId == null && instance.coreState.getConfig().isDefaultInstance())\n- || instance\n- .getAccountId()\n- .equals(_accountId);\n- }\n- if (shouldProcess) {\ntry {\ninstance.coreState.getPushProviders()._createNotification(context, extras, notificationId);\n} catch (Throwable t) {\n// no-op\n}\n- break;\n}\n}\n+\n+ public static @Nullable\n+ CleverTapAPI getGlobalInstance(Context context, String _accountId) {\n+ return fromAccountId(context, _accountId);\n+ }\n+\n+ /**\n+ * Pass Push Notification Payload to CleverTap for smooth functioning of Push Amplification\n+ *\n+ * @param context - Application Context\n+ * @param extras - Bundle received via FCM/Push Amplification\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public static void processPushNotification(Context context, Bundle extras) {\n+ CleverTapAPI instance = fromBundle(context, extras);\n+ if (instance != null) {\n+ instance.coreState.getPushProviders().processCustomPushNotification(extras);\n+ }\n}\n/**\n@@ -699,20 +699,27 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn getDefaultInstance(context, null);\n}\n- public static @Nullable\n- CleverTapAPI getGlobalInstance(Context context, String _accountId) {\n+ private static CleverTapAPI fromAccountId(final Context context, final String _accountId) {\nif (instances == null) {\nreturn createInstanceIfAvailable(context, _accountId);\n}\n- CleverTapAPI instance = null;\n- // TODO : correct\n- for (String accountId : instances.keySet()) {\n- instance = CleverTapAPI.instances.get(accountId);\n+ for (String accountId : CleverTapAPI.instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ boolean shouldProcess = false;\n+ if (instance != null) {\n+ shouldProcess = (_accountId == null && instance.coreState.getConfig().isDefaultInstance())\n+ || instance\n+ .getAccountId()\n+ .equals(_accountId);\n}\n-\n+ if (shouldProcess) {\nreturn instance;\n}\n+ }\n+\n+ return null;// failed to get instance\n+ }\npublic static HashMap<String, CleverTapAPI> getInstances() {\nreturn instances;\n@@ -909,29 +916,9 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- /**\n- * Pass Push Notification Payload to CleverTap for smooth functioning of Push Amplification\n- *\n- * @param context - Application Context\n- * @param extras - Bundle received via FCM/Push Amplification\n- */\n- @SuppressWarnings(\"unused\")\n- public static void processPushNotification(Context context, Bundle extras) {\n+ private static CleverTapAPI fromBundle(final Context context, final Bundle extras) {\nString _accountId = extras.getString(Constants.WZRK_ACCT_ID_KEY);\n- if (instances == null) {\n- CleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\n- if (instance != null) {\n- instance.coreState.getPushProviders().processCustomPushNotification(extras);\n- }\n- return;\n- }\n-\n- for (String accountId : CleverTapAPI.instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- if (instance != null) {\n- instance.coreState.getPushProviders().processCustomPushNotification(extras);\n- }\n- }\n+ return fromAccountId(context, _accountId);\n}\n@RestrictTo(RestrictTo.Scope.LIBRARY)\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/IXiaomiNotificationParser.java",
"new_path": null,
"diff": "-package com.clevertap.android.xps;\n-\n-import android.os.Bundle;\n-import com.xiaomi.mipush.sdk.MiPushMessage;\n-\n-/**\n- * Impl converts the MiMessage to bundle\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": "@@ -13,7 +13,10 @@ import android.content.Context;\nimport android.os.Bundle;\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\n+import com.clevertap.android.sdk.interfaces.IPushAmpHandler;\nimport com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.xiaomi.mipush.sdk.ErrorCode;\nimport com.xiaomi.mipush.sdk.MiPushClient;\n@@ -24,17 +27,17 @@ import java.util.List;\n/**\n* Implementation of {@link IMiMessageHandler}\n*/\n-public class XiaomiMessageHandlerImpl implements IMiMessageHandler {\n+public class XiaomiMessageHandlerImpl implements IMiMessageHandler, IPushAmpHandler<MiPushMessage> {\nprivate @NonNull\nfinal\n- IXiaomiNotificationParser mParser;\n+ INotificationParser<MiPushMessage> mParser;\npublic XiaomiMessageHandlerImpl() {\nthis(new XiaomiNotificationParser());\n}\n- XiaomiMessageHandlerImpl(@NonNull final IXiaomiNotificationParser parser) {\n+ XiaomiMessageHandlerImpl(@NonNull final INotificationParser<MiPushMessage> parser) {\nmParser = parser;\n}\n@@ -86,4 +89,16 @@ public class XiaomiMessageHandlerImpl implements IMiMessageHandler {\nreturn FAILED_WITH_EXCEPTION;\n}\n}\n+\n+ @Override\n+ public void processPushAmp(final Context context, @NonNull final MiPushMessage message) {\n+ try {\n+ Bundle messageBundle = mParser.toBundle(message);\n+ if (messageBundle != null) {\n+ CleverTapAPI.processPushNotification(context, messageBundle);\n+ }\n+ } catch (Throwable t) {\n+ Logger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Error processing push amp\", t);\n+ }\n+ }\n}\n\\ No newline at end of file\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": "@@ -4,17 +4,19 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.xps.XpsConstants.XIAOMI_LOG_TAG;\nimport android.os.Bundle;\n+import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\n/**\n- * Implementation of {@link IXiaomiNotificationParser}\n+ * Implementation of {@link INotificationParser}<{@link MiPushMessage}>\n*/\n-public class XiaomiNotificationParser implements IXiaomiNotificationParser {\n+public class XiaomiNotificationParser implements INotificationParser<MiPushMessage> {\n@Override\n- public Bundle toBundle(final MiPushMessage message) {\n+ public Bundle toBundle(@NonNull final MiPushMessage message) {\ntry {\nBundle extras = Utils.stringToBundle(message.getContent());\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"Found Valid Notification Message \");\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"diff": "@@ -11,10 +11,13 @@ class MyFcmMessageListenerService : FirebaseMessagingService() {\nvar pushType = \"fcm\"\nif (pushType.equals(\"fcm\")) {\nFcmMessageHandlerImpl().onMessageReceived(applicationContext, message)\n+ //FcmMessageHandlerImpl().processPushAmp(applicationContext, message)\n} else if (pushType.equals(\"hps\")) {\n//HmsMessageHandlerImpl().createNotification(applicationContext,message)\n+ //HmsMessageHandlerImpl().processPushAmp(applicationContext,message)\n} else if (pushType.equals(\"xps\")) {\n//XiaomiMessageHandlerImpl().createNotification(applicationContext,message)\n+ //XiaomiMessageHandlerImpl().processPushAmp(applicationContext,message)\n}\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): centralize clevertap instance creation using fromAccountId() and fromBundle() SDK-987 |
116,612 | 09.08.2021 14:47:17 | -19,080 | a7955dfacfad3003ca4f1065377088c4dacbf095 | task(streamline_pn): add processPushAmp() for FCM,HMS,XPS | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/INotificationParser.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+import android.os.Bundle;\n+import androidx.annotation.NonNull;\n+\n+public interface INotificationParser<T> {\n+\n+ Bundle toBundle(@NonNull T message);\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/IPushAmpHandler.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+import android.content.Context;\n+import androidx.annotation.NonNull;\n+\n+public interface IPushAmpHandler<T> {\n+\n+ void processPushAmp(final Context context, @NonNull final T message);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"diff": "@@ -50,8 +50,10 @@ public class PushNotificationHandler implements NotificationHandler {\nLogger.d(LOG_TAG, pushType + \"received notification from CleverTap: \" + message.toString());\n}\nif (isForPushTemplates(message) && CleverTapAPI.getNotificationHandler() != null) {\n+ // render push template\nCleverTapAPI.getNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n} else {\n+ // render core push\nCleverTapAPI.createNotification(applicationContext, message);\n}\nreturn true;\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": "@@ -5,33 +5,40 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport android.content.Context;\nimport android.os.Bundle;\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\n+import com.clevertap.android.sdk.interfaces.IPushAmpHandler;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.google.firebase.messaging.RemoteMessage;\n-import java.util.Map;\n/**\n* implementation of {@link IFcmMessageHandler}\n*/\n-public class FcmMessageHandlerImpl implements IFcmMessageHandler {\n+public class FcmMessageHandlerImpl implements IFcmMessageHandler, IPushAmpHandler<RemoteMessage> {\n+\n+ private final INotificationParser<RemoteMessage> mParser;\n+\n+ public FcmMessageHandlerImpl() {\n+ this(new FcmNotificationParser());\n+ }\n+\n+ FcmMessageHandlerImpl(final INotificationParser<RemoteMessage> parser) {\n+ mParser = parser;\n+ }\n@Override\npublic boolean onMessageReceived(final Context context, final RemoteMessage message) {\nboolean isSuccess = false;\n- try {\n- if (message.getData().size() > 0) {\n- Bundle extras = new Bundle();\n- for (Map.Entry<String, String> entry : message.getData().entrySet()) {\n- extras.putString(entry.getKey(), entry.getValue());\n- }\n+ Bundle messageBundle = mParser.toBundle(message);\n+ if (messageBundle != null) {\nisSuccess = PushNotificationHandler.getPushNotificationHandler()\n- .onMessageReceived(context, extras, PushType.FCM.toString());\n- }\n- } catch (Throwable t) {\n- Logger.d(LOG_TAG, FCM_LOG_TAG + \"Error parsing FCM message\", t);\n+ .onMessageReceived(context, messageBundle, PushType.FCM.toString());\n}\n+\nreturn isSuccess;\n}\n@@ -52,4 +59,11 @@ public class FcmMessageHandlerImpl implements IFcmMessageHandler {\n}\n+ @Override\n+ public void processPushAmp(final Context context, @NonNull final RemoteMessage message) {\n+ Bundle messageBundle = mParser.toBundle(message);\n+ if (messageBundle != null) {\n+ CleverTapAPI.processPushNotification(context, messageBundle);\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/pushnotification/fcm/FcmNotificationParser.java",
"diff": "+package com.clevertap.android.sdk.pushnotification.fcm;\n+\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.FCM_LOG_TAG;\n+import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\n+\n+import android.os.Bundle;\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\n+import com.google.firebase.messaging.RemoteMessage;\n+import java.util.Map;\n+\n+/**\n+ * Implementation of {@link INotificationParser}<{@link RemoteMessage}>\n+ */\n+class FcmNotificationParser implements INotificationParser<RemoteMessage> {\n+\n+ @Override\n+ public Bundle toBundle(@NonNull final RemoteMessage message) {\n+ try {\n+ Bundle extras = new Bundle();\n+ for (Map.Entry<String, String> entry : message.getData().entrySet()) {\n+ extras.putString(entry.getKey(), entry.getValue());\n+ }\n+ Logger.d(LOG_TAG, FCM_LOG_TAG + \"Found Valid Notification Message \");\n+ return extras;\n+ } catch (Throwable e) {\n+ e.printStackTrace();\n+ Logger.d(LOG_TAG, FCM_LOG_TAG + \"Invalid Notification Message \", e);\n+ }\n+ return null;\n+ }\n+}\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": "@@ -6,7 +6,11 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.\nimport android.content.Context;\nimport android.os.Bundle;\n+import androidx.annotation.NonNull;\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\n+import com.clevertap.android.sdk.interfaces.IPushAmpHandler;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.huawei.hms.push.RemoteMessage;\n@@ -14,15 +18,15 @@ import com.huawei.hms.push.RemoteMessage;\n/**\n* Implementation of {@link IHmsMessageHandler}\n*/\n-public class HmsMessageHandlerImpl implements IHmsMessageHandler {\n+public class HmsMessageHandlerImpl implements IHmsMessageHandler, IPushAmpHandler<RemoteMessage> {\n- private final IHmsNotificationParser mParser;\n+ private final INotificationParser<RemoteMessage> mParser;\npublic HmsMessageHandlerImpl() {\nthis(new HmsNotificationParser());\n}\n- HmsMessageHandlerImpl(final IHmsNotificationParser parser) {\n+ HmsMessageHandlerImpl(final INotificationParser<RemoteMessage> parser) {\nmParser = parser;\n}\n@@ -56,4 +60,17 @@ public class HmsMessageHandlerImpl implements IHmsMessageHandler {\n}\nreturn isSuccess;\n}\n+\n+ @Override\n+ public void processPushAmp(final Context context, @NonNull final RemoteMessage message) {\n+ try {\n+ Bundle messageBundle = mParser.toBundle(message);\n+ if (messageBundle != null) {\n+ CleverTapAPI.processPushNotification(context, messageBundle);\n+ }\n+ } catch (Throwable t) {\n+ Logger.d(LOG_TAG, HMS_LOG_TAG + \"Error processing push amp\", t);\n+ }\n+ }\n+\n}\n\\ No newline at end of file\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": "@@ -4,17 +4,19 @@ import static com.clevertap.android.hms.HmsConstants.HMS_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport android.os.Bundle;\n+import androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.interfaces.INotificationParser;\nimport com.huawei.hms.push.RemoteMessage;\n/**\n- * Implementation of {@link IHmsNotificationParser}\n+ * Implementation of {@link INotificationParser}<{@link RemoteMessage}>\n*/\n-public class HmsNotificationParser implements IHmsNotificationParser {\n+public class HmsNotificationParser implements INotificationParser<RemoteMessage> {\n@Override\n- public Bundle toBundle(final RemoteMessage message) {\n+ public Bundle toBundle(@NonNull final RemoteMessage message) {\ntry {\nBundle extras = Utils.stringToBundle(message.getData());\nLogger.d(LOG_TAG, HMS_LOG_TAG + \"Found Valid Notification Message \");\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/IHmsNotificationParser.java",
"new_path": null,
"diff": "-package com.clevertap.android.hms;\n-\n-import android.os.Bundle;\n-import com.huawei.hms.push.RemoteMessage;\n-\n-/**\n- * Impl converts the RemoteMessage to bundle\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"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): add processPushAmp() for FCM,HMS,XPS SDK-987 |
116,616 | 14.08.2021 13:25:50 | -19,080 | 52c75282517797bb13e00a78423e43fac3abf92d | add PT data classes(Basic,MC,AC) | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplate.kt",
"diff": "+package com.clevertap.android.pushtemplates\n+\n+internal data class PushTemplate (\n+ internal val basicTemplate: PushTemplateType.BasicTemplate,\n+ internal val manualCarouselTemplate: PushTemplateType.ManualCarouselTemplate,\n+ internal val autoCarouselTemplate: PushTemplateType.AutoCarouselTemplate\n+)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateType.kt",
"diff": "+package com.clevertap.android.pushtemplates\n+\n+import android.graphics.Bitmap\n+\n+sealed class PushTemplateType {\n+\n+ data class BasicTemplate(\n+ var title: CharSequence,\n+ var message: CharSequence,\n+ var backgroundColor: Int,\n+ var titleColor: Int,\n+ var messageColor: Int,\n+ var messageSummary: CharSequence,\n+ var smallIcon: Bitmap,\n+ var dotSeparator: Bitmap,\n+ var bigImage: Bitmap,\n+ var largeIcon: Bitmap\n+ )\n+\n+ data class ManualCarouselTemplate(\n+ var title: CharSequence,\n+ var message: CharSequence,\n+ var backgroundColor: Int,\n+ var titleColor: Int,\n+ var messageColor: Int,\n+ var messageSummary: CharSequence,\n+ var smallIcon: Bitmap,\n+ var dotSeparator: Bitmap,\n+ var bigImage: Bitmap,\n+ var largeIcon: Bitmap,\n+ var imageList: ArrayList<String>\n+ )\n+\n+\n+ data class AutoCarouselTemplate(\n+ var title: CharSequence,\n+ var message: CharSequence,\n+ var backgroundColor: Int,\n+ var titleColor: Int,\n+ var messageColor: Int,\n+ var messageSummary: CharSequence,\n+ var smallIcon: Bitmap,\n+ var dotSeparator: Bitmap,\n+ var bigImage: Bitmap,\n+ var largeIcon: Bitmap,\n+ var imageList: ArrayList<String>\n+ )\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | add PT data classes(Basic,MC,AC) |
116,612 | 16.09.2021 13:01:53 | -19,080 | 0c858f3379847eb5467f3f7d05bc8a1051fb37be | task(streamline_pn): Implement INotificationRenderer | [
{
"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": "@@ -34,6 +34,8 @@ import com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n+import com.clevertap.android.sdk.pushnotification.CoreNotificationRenderer;\n+import com.clevertap.android.sdk.pushnotification.INotificationRenderer;\nimport com.clevertap.android.sdk.pushnotification.NotificationInfo;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n@@ -160,6 +162,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nCleverTapAPI instance = fromBundle(context, extras);\nif (instance != null) {\ntry {\n+ instance.coreState.getPushProviders().setPushNotificationRenderer(new CoreNotificationRenderer());\ninstance.coreState.getPushProviders()._createNotification(context, extras, notificationId);\n} catch (Throwable t) {\n// no-op\n@@ -2703,4 +2706,14 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n});\n}\n+\n+ public void renderPushNotification(@NonNull INotificationRenderer iNotificationRenderer, Context context,\n+ Bundle extras) {\n+ coreState.getPushProviders().setPushNotificationRenderer(iNotificationRenderer);\n+ coreState.getPushProviders()._createNotification(context, extras, Constants.EMPTY_NOTIFICATION_ID);\n+ }\n+\n+ /* public @NonNull INotificationRenderer getPushNotificationRenderer(){\n+ return coreState.getPushProviders().getPushNotificationRenderer();\n+ }*/\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/db/DBAdapter.java",
"diff": "@@ -867,7 +867,7 @@ public class DBAdapter {\nsynchronized private String fetchPushNotificationId(String id) {\nfinal String tName = Table.PUSH_NOTIFICATIONS.getName();\nCursor cursor = null;\n- String pushId = \"\";\n+ String pushId = \"\";// TODO: fix dupe failing\ntry {\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CoreNotificationRenderer.java",
"diff": "+package com.clevertap.android.sdk.pushnotification;\n+\n+import android.app.PendingIntent;\n+import android.content.Context;\n+import android.content.Intent;\n+import android.content.pm.PackageInfo;\n+import android.content.pm.PackageManager;\n+import android.content.pm.ServiceInfo;\n+import android.graphics.Bitmap;\n+import android.graphics.Color;\n+import android.net.Uri;\n+import android.os.Build;\n+import android.os.Bundle;\n+import androidx.annotation.RestrictTo;\n+import androidx.core.app.NotificationCompat;\n+import androidx.core.app.NotificationCompat.Builder;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.ManifestInfo;\n+import com.clevertap.android.sdk.Utils;\n+import org.json.JSONArray;\n+import org.json.JSONObject;\n+\n+@RestrictTo(RestrictTo.Scope.LIBRARY)\n+public class CoreNotificationRenderer implements INotificationRenderer {\n+\n+ private String notifMessage;\n+\n+ private String notifTitle;\n+\n+ private int smallIcon;\n+\n+ @Override\n+ public Object getCollapseKey(final Bundle extras) {\n+ Object collapse_key = extras.get(Constants.WZRK_COLLAPSE);\n+ return collapse_key;\n+ }\n+\n+ @Override\n+ public String getMessage(final Bundle extras) {\n+ notifMessage = extras.getString(Constants.NOTIF_MSG);\n+ return notifMessage;\n+ }\n+\n+ @Override\n+ public String getTitle(final Bundle extras, final Context context) {\n+ String title = extras.getString(Constants.NOTIF_TITLE, \"\");\n+ notifTitle = title.isEmpty() ? context.getApplicationInfo().name : title;\n+ return notifTitle;\n+ }\n+\n+ @Override\n+ public NotificationCompat.Builder renderNotification(final Bundle extras, final Context context,\n+ final Builder nb, final CleverTapInstanceConfig config, final int notificationId) {\n+ String icoPath = extras.getString(Constants.NOTIF_ICON);// uncommon\n+ Intent launchIntent = new Intent(context, CTPushNotificationReceiver.class);// uncommon 1\n+\n+ PendingIntent pIntent;\n+\n+ // Take all the properties from the notif and add it to the intent\n+ launchIntent.putExtras(extras);// u1\n+ launchIntent.removeExtra(Constants.WZRK_ACTIONS);//u1\n+ pIntent = PendingIntent.getBroadcast(context, (int) System.currentTimeMillis(),\n+ launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);//u1\n+\n+ // uncommon - START\n+ NotificationCompat.Style style;\n+ String bigPictureUrl = extras.getString(Constants.WZRK_BIG_PICTURE);\n+ if (bigPictureUrl != null && bigPictureUrl.startsWith(\"http\")) {\n+ try {\n+ Bitmap bpMap = Utils.getNotificationBitmap(bigPictureUrl, false, context);\n+\n+ if (bpMap == null) {\n+ throw new Exception(\"Failed to fetch big picture!\");\n+ }\n+\n+ if (extras.containsKey(Constants.WZRK_MSG_SUMMARY)) {\n+ String summaryText = extras.getString(Constants.WZRK_MSG_SUMMARY);\n+ style = new NotificationCompat.BigPictureStyle()\n+ .setSummaryText(summaryText)\n+ .bigPicture(bpMap);\n+ } else {\n+ style = new NotificationCompat.BigPictureStyle()\n+ .setSummaryText(notifMessage)\n+ .bigPicture(bpMap);\n+ }\n+ } catch (Throwable t) {\n+ style = new NotificationCompat.BigTextStyle()\n+ .bigText(notifMessage);\n+ config.getLogger()\n+ .verbose(config.getAccountId(),\n+ \"Falling back to big text notification, couldn't fetch big picture\",\n+ t);\n+ }\n+ } else {\n+ style = new NotificationCompat.BigTextStyle()\n+ .bigText(notifMessage);\n+ }\n+\n+ boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;\n+ if (requiresChannelId && extras.containsKey(Constants.WZRK_SUBTITLE)) {\n+ nb.setSubText(extras.getString(Constants.WZRK_SUBTITLE));\n+ }\n+\n+ if (extras.containsKey(Constants.WZRK_COLOR)) {\n+ int color = Color.parseColor(extras.getString(Constants.WZRK_COLOR));\n+ nb.setColor(color);\n+ nb.setColorized(true);\n+ }// uncommon\n+\n+ // uncommon\n+ nb.setContentTitle(notifTitle)\n+ .setContentText(notifMessage)\n+ .setContentIntent(pIntent)\n+ .setAutoCancel(true)\n+ .setStyle(style)\n+ .setSmallIcon(smallIcon);\n+\n+ // uncommon\n+ nb.setLargeIcon(Utils.getNotificationBitmap(icoPath, true, context));//uncommon\n+\n+ // Uncommon - START\n+ // add actions if any\n+ JSONArray actions = null;\n+ String actionsString = extras.getString(Constants.WZRK_ACTIONS);\n+ if (actionsString != null) {\n+ try {\n+ actions = new JSONArray(actionsString);\n+ } catch (Throwable t) {\n+ config.getLogger()\n+ .debug(config.getAccountId(),\n+ \"error parsing notification actions: \" + t.getLocalizedMessage());\n+ }\n+ }\n+\n+ String intentServiceName = ManifestInfo.getInstance(context).getIntentServiceName();\n+ Class clazz = null;\n+ if (intentServiceName != null) {\n+ try {\n+ clazz = Class.forName(intentServiceName);\n+ } catch (ClassNotFoundException e) {\n+ try {\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n+ } catch (ClassNotFoundException ex) {\n+ Logger.d(\"No Intent Service found\");\n+ }\n+ }\n+ } else {\n+ try {\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n+ } catch (ClassNotFoundException ex) {\n+ Logger.d(\"No Intent Service found\");\n+ }\n+ }\n+\n+ boolean isCTIntentServiceAvailable = isServiceAvailable(context, clazz);\n+\n+ if (actions != null && actions.length() > 0) {\n+ for (int i = 0; i < actions.length(); i++) {\n+ try {\n+ JSONObject action = actions.getJSONObject(i);\n+ String label = action.optString(\"l\");\n+ String dl = action.optString(\"dl\");\n+ String ico = action.optString(Constants.NOTIF_ICON);\n+ String id = action.optString(\"id\");\n+ boolean autoCancel = action.optBoolean(\"ac\", true);\n+ if (label.isEmpty() || id.isEmpty()) {\n+ config.getLogger().debug(config.getAccountId(),\n+ \"not adding push notification action: action label or id missing\");\n+ continue;\n+ }\n+ int icon = 0;\n+ if (!ico.isEmpty()) {\n+ try {\n+ icon = context.getResources().getIdentifier(ico, \"drawable\", context.getPackageName());\n+ } catch (Throwable t) {\n+ config.getLogger().debug(config.getAccountId(),\n+ \"unable to add notification action icon: \" + t.getLocalizedMessage());\n+ }\n+ }\n+\n+ boolean sendToCTIntentService = (autoCancel && isCTIntentServiceAvailable);\n+\n+ Intent actionLaunchIntent;\n+ if (sendToCTIntentService) {\n+ actionLaunchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\n+ actionLaunchIntent.setPackage(context.getPackageName());\n+ actionLaunchIntent.putExtra(\"ct_type\", CTNotificationIntentService.TYPE_BUTTON_CLICK);\n+ if (!dl.isEmpty()) {\n+ actionLaunchIntent.putExtra(\"dl\", dl);\n+ }\n+ } else {\n+ if (!dl.isEmpty()) {\n+ actionLaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n+ } else {\n+ actionLaunchIntent = context.getPackageManager()\n+ .getLaunchIntentForPackage(context.getPackageName());\n+ }\n+ }\n+\n+ if (actionLaunchIntent != null) {\n+ actionLaunchIntent.putExtras(extras);\n+ actionLaunchIntent.removeExtra(Constants.WZRK_ACTIONS);\n+ actionLaunchIntent.putExtra(\"actionId\", id);\n+ actionLaunchIntent.putExtra(\"autoCancel\", autoCancel);\n+ actionLaunchIntent.putExtra(\"wzrk_c2a\", id);\n+ actionLaunchIntent.putExtra(\"notificationId\", notificationId);\n+\n+ actionLaunchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);\n+ }\n+\n+ PendingIntent actionIntent;\n+ int requestCode = ((int) System.currentTimeMillis()) + i;\n+ if (sendToCTIntentService) {\n+ actionIntent = PendingIntent.getService(context, requestCode,\n+ actionLaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n+ } else {\n+ actionIntent = PendingIntent.getActivity(context, requestCode,\n+ actionLaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n+ }\n+ nb.addAction(icon, label, actionIntent);\n+\n+ } catch (Throwable t) {\n+ config.getLogger()\n+ .debug(config.getAccountId(),\n+ \"error adding notification action : \" + t.getLocalizedMessage());\n+ }\n+ }\n+ }// Uncommon - END\n+\n+ return nb;\n+\n+ }\n+\n+ @Override\n+ public void setSmallIcon(final int smallIcon, final Context context) {\n+ this.smallIcon = smallIcon;\n+ }\n+\n+ @SuppressWarnings(\"SameParameterValue\")\n+ private boolean isServiceAvailable(Context context, Class clazz) {\n+ if (clazz == null) {\n+ return false;\n+ }\n+\n+ PackageManager pm = context.getPackageManager();\n+ String packageName = context.getPackageName();\n+\n+ PackageInfo packageInfo;\n+ try {\n+ packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n+ ServiceInfo[] services = packageInfo.services;\n+ for (ServiceInfo serviceInfo : services) {\n+ if (serviceInfo.name.equals(clazz.getName())) {\n+ Logger.v(\"Service \" + serviceInfo.name + \" found\");\n+ return true;\n+ }\n+ }\n+ } catch (PackageManager.NameNotFoundException e) {\n+ Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n+ }\n+ return false;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/INotificationRenderer.java",
"diff": "+package com.clevertap.android.sdk.pushnotification;\n+\n+import android.content.Context;\n+import android.os.Bundle;\n+import androidx.core.app.NotificationCompat;\n+import androidx.core.app.NotificationCompat.Builder;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+\n+public interface INotificationRenderer {\n+\n+ Object getCollapseKey(final Bundle extras);\n+\n+ String getMessage(Bundle extras);\n+\n+ String getTitle(Bundle extras, final Context context);\n+\n+ NotificationCompat.Builder renderNotification(final Bundle extras, final Context context,\n+ final Builder nb, final CleverTapInstanceConfig config, final int notificationId);\n+\n+ void setSmallIcon(int smallIcon, final Context context);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"diff": "@@ -46,15 +46,17 @@ public class PushNotificationHandler implements NotificationHandler {\nif (cleverTapAPI != null) {\ncleverTapAPI.getCoreState().getConfig().log(LOG_TAG,\npushType + \"received notification from CleverTap: \" + message.toString());\n- } else {\n- Logger.d(LOG_TAG, pushType + \"received notification from CleverTap: \" + message.toString());\n- }\nif (isForPushTemplates(message) && CleverTapAPI.getNotificationHandler() != null) {\n// render push template\nCleverTapAPI.getNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n} else {\n// render core push\n- CleverTapAPI.createNotification(applicationContext, message);\n+ cleverTapAPI.renderPushNotification(new CoreNotificationRenderer(), applicationContext, message);\n+ //CleverTapAPI.createNotification(applicationContext, message);\n+ }\n+ } else {\n+ Logger.d(LOG_TAG, pushType + \"received notification from CleverTap: \" + message.toString());\n+ Logger.d(LOG_TAG, pushType + \" not renderning since cleverTapAPI is null\");\n}\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -20,8 +20,6 @@ import android.content.Intent;\nimport android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\nimport android.content.pm.ServiceInfo;\n-import android.graphics.Bitmap;\n-import android.graphics.Color;\nimport android.media.RingtoneManager;\nimport android.net.Uri;\nimport android.os.Build;\n@@ -61,7 +59,6 @@ import java.util.Date;\nimport java.util.List;\nimport java.util.Locale;\nimport java.util.concurrent.Callable;\n-import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n@@ -86,6 +83,8 @@ public class PushProviders implements CTPushProviderListener {\nprivate final Context context;\n+ private INotificationRenderer iNotificationRenderer = new CoreNotificationRenderer();\n+\nprivate final ValidationResultStack validationResultStack;\nprivate final Object tokenLock = new Object();\n@@ -141,16 +140,16 @@ public class PushProviders implements CTPushProviderListener {\npublic void _createNotification(final Context context, final Bundle extras, final int notificationId) {\nif (extras == null || extras.get(Constants.NOTIFICATION_TAG) == null) {\nreturn;\n- }\n+ } // Common\nif (config.isAnalyticsOnly()) {\nconfig.getLogger()\n.debug(config.getAccountId(), \"Instance is set for Analytics only, cannot create notification\");\nreturn;\n- }\n+ }// Common\ntry {\n- Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();// Common task\ntask.execute(\"CleverTapAPI#_createNotification\", new Callable<Void>() {\n@Override\npublic Void call() {\n@@ -164,9 +163,10 @@ public class PushProviders implements CTPushProviderListener {\n\"Push Notification already rendered, not showing again\");\nreturn null;\n}\n- }\n- String notifMessage = extras.getString(Constants.NOTIF_MSG);\n- notifMessage = (notifMessage != null) ? notifMessage : \"\";\n+ }// Common\n+ String notifMessage = iNotificationRenderer\n+ .getMessage(extras);//extras.getString(Constants.NOTIF_MSG);// uncommon - getMessage()\n+ notifMessage = (notifMessage != null) ? notifMessage : \"\";// common\nif (notifMessage.isEmpty()) {\n//silent notification\nconfig.getLogger()\n@@ -179,9 +179,10 @@ public class PushProviders implements CTPushProviderListener {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n}\nreturn null;\n- }\n- String notifTitle = extras.getString(Constants.NOTIF_TITLE, \"\");\n- notifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name : notifTitle;\n+ }// Common\n+ String notifTitle = iNotificationRenderer.getTitle(extras,\n+ context);//extras.getString(Constants.NOTIF_TITLE, \"\");// uncommon - getTitle()\n+ notifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name : notifTitle;//common\ntriggerNotification(context, extras, notifMessage, notifTitle, notificationId);\n} catch (Throwable t) {\n// Occurs if the notification image was null\n@@ -905,19 +906,40 @@ public class PushProviders implements CTPushProviderListener {\n}\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\n+ public @NonNull\n+ INotificationRenderer getPushNotificationRenderer() {\n+ return iNotificationRenderer;\n+ }\n+\n+ @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)\n+ private static JobInfo getJobInfo(int jobId, JobScheduler jobScheduler) {\n+ for (JobInfo jobInfo : jobScheduler.getAllPendingJobs()) {\n+ if (jobInfo.getId() == jobId) {\n+ return jobInfo;\n+ }\n+ }\n+ return null;\n+ }\n+\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\n+ public void setPushNotificationRenderer(@NonNull INotificationRenderer iNotificationRenderer) {\n+ this.iNotificationRenderer = iNotificationRenderer;\n+ }\n+\nprivate void triggerNotification(Context context, Bundle extras, String notifMessage, String notifTitle,\nint notificationId) {\nNotificationManager notificationManager =\n- (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\n+ (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);// Common\nif (notificationManager == null) {\nString notificationManagerError = \"Unable to render notification, Notification Manager is null.\";\nconfig.getLogger().debug(config.getAccountId(), notificationManagerError);\nreturn;\n- }\n+ }// common\n- String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n- boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;\n+ String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");// common\n+ boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;// common\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\nint messageCode = -1;\n@@ -936,19 +958,20 @@ public class PushProviders implements CTPushProviderListener {\nvalidationResultStack.pushValidationResult(channelIdError);\nreturn;\n}\n- }\n+ }// common\n- String icoPath = extras.getString(Constants.NOTIF_ICON);\n- Intent launchIntent = new Intent(context, CTPushNotificationReceiver.class);\n+ /*String icoPath = extras.getString(Constants.NOTIF_ICON);// uncommon\n+ Intent launchIntent = new Intent(context, CTPushNotificationReceiver.class);// uncommon 1\nPendingIntent pIntent;\n// Take all the properties from the notif and add it to the intent\n- launchIntent.putExtras(extras);\n- launchIntent.removeExtra(Constants.WZRK_ACTIONS);\n+ launchIntent.putExtras(extras);// u1\n+ launchIntent.removeExtra(Constants.WZRK_ACTIONS);//u1\npIntent = PendingIntent.getBroadcast(context, (int) System.currentTimeMillis(),\n- launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n+ launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);//u1*/\n+ /*// uncommon - START\nNotificationCompat.Style style;\nString bigPictureUrl = extras.getString(Constants.WZRK_BIG_PICTURE);\nif (bigPictureUrl != null && bigPictureUrl.startsWith(\"http\")) {\n@@ -981,7 +1004,7 @@ public class PushProviders implements CTPushProviderListener {\nstyle = new NotificationCompat.BigTextStyle()\n.bigText(notifMessage);\n}\n-\n+ // uncommon - END*/\nint smallIcon;\ntry {\nString x = ManifestInfo.getInstance(context).getNotificationIcon();\n@@ -994,7 +1017,9 @@ public class PushProviders implements CTPushProviderListener {\n}\n} catch (Throwable t) {\nsmallIcon = DeviceInfo.getAppIconAsIntId(context);\n- }\n+ }// common extract to getSmallIcon()\n+\n+ iNotificationRenderer.setSmallIcon(smallIcon, context);\nint priorityInt = NotificationCompat.PRIORITY_DEFAULT;\nString priority = extras.getString(Constants.NOTIF_PRIORITY);\n@@ -1005,12 +1030,13 @@ public class PushProviders implements CTPushProviderListener {\nif (priority.equals(Constants.PRIORITY_MAX)) {\npriorityInt = NotificationCompat.PRIORITY_MAX;\n}\n- }\n+ }// common, not there in templates\n// if we have no user set notificationID then try collapse key\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\ntry {\n- Object collapse_key = extras.get(Constants.WZRK_COLLAPSE);\n+ Object collapse_key = iNotificationRenderer\n+ .getCollapseKey(extras);//extras.get(Constants.WZRK_COLLAPSE); //use getCollapseKey()\nif (collapse_key != null) {\nif (collapse_key instanceof Number) {\nnotificationId = ((Number) collapse_key).intValue();\n@@ -1034,20 +1060,21 @@ public class PushProviders implements CTPushProviderListener {\n} else {\nconfig.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId\n+ \" won't use collapse_key (if any) as basis for notificationId\");\n- }\n+ } // common use getCollapseKey()\n// if after trying collapse_key notification is still empty set to random int\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\nnotificationId = (int) (Math.random() * 100);\nconfig.getLogger().debug(config.getAccountId(), \"Setting random notificationId: \" + notificationId);\n- }\n+ }// common use getCollapseKey()\nNotificationCompat.Builder nb;\nif (requiresChannelId) {\nnb = new NotificationCompat.Builder(context, channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n- String badgeIconParam = extras.getString(Constants.WZRK_BADGE_ICON, null);\n+ String badgeIconParam = extras\n+ .getString(Constants.WZRK_BADGE_ICON, null);// common bi - not there in template\nif (badgeIconParam != null) {\ntry {\nint badgeIconType = Integer.parseInt(badgeIconParam);\n@@ -1057,9 +1084,9 @@ public class PushProviders implements CTPushProviderListener {\n} catch (Throwable t) {\n// no-op\n}\n- }\n+ }//cbi\n- String badgeCountParam = extras.getString(Constants.WZRK_BADGE_COUNT, null);\n+ String badgeCountParam = extras.getString(Constants.WZRK_BADGE_COUNT, null);//cbi\nif (badgeCountParam != null) {\ntry {\nint badgeCount = Integer.parseInt(badgeCountParam);\n@@ -1069,21 +1096,22 @@ public class PushProviders implements CTPushProviderListener {\n} catch (Throwable t) {\n// no-op\n}\n- }\n- if (extras.containsKey(Constants.WZRK_SUBTITLE)) {\n+ }//cbi\n+ /*if (extras.containsKey(Constants.WZRK_SUBTITLE)) {\nnb.setSubText(extras.getString(Constants.WZRK_SUBTITLE));\n- }\n+ }// uncommon*/\n} else {\n// noinspection all\nnb = new NotificationCompat.Builder(context);\n}\n- if (extras.containsKey(Constants.WZRK_COLOR)) {\n+ /*if (extras.containsKey(Constants.WZRK_COLOR)) {\nint color = Color.parseColor(extras.getString(Constants.WZRK_COLOR));\nnb.setColor(color);\nnb.setColorized(true);\n- }\n+ }// uncommon\n+ // uncommon\nnb.setContentTitle(notifTitle)\n.setContentText(notifMessage)\n.setContentIntent(pIntent)\n@@ -1092,10 +1120,13 @@ public class PushProviders implements CTPushProviderListener {\n.setPriority(priorityInt)\n.setSmallIcon(smallIcon);\n- nb.setLargeIcon(Utils.getNotificationBitmap(icoPath, true, context));\n+ // uncommon\n+ nb.setLargeIcon(Utils.getNotificationBitmap(icoPath, true, context));//uncommon\n+*/\n+ nb.setPriority(priorityInt);\ntry {\n- if (extras.containsKey(Constants.WZRK_SOUND)) {\n+ if (extras.containsKey(Constants.WZRK_SOUND)) {// common not there in template\nUri soundUri = null;\nObject o = extras.get(Constants.WZRK_SOUND);\n@@ -1125,6 +1156,7 @@ public class PushProviders implements CTPushProviderListener {\nconfig.getLogger().debug(config.getAccountId(), \"Could not process sound parameter\", t);\n}\n+ /*// Uncommon - START\n// add actions if any\nJSONArray actions = null;\nString actionsString = extras.getString(Constants.WZRK_ACTIONS);\n@@ -1231,12 +1263,18 @@ public class PushProviders implements CTPushProviderListener {\n\"error adding notification action : \" + t.getLocalizedMessage());\n}\n}\n+ }// Uncommon - END*/\n+\n+ nb = iNotificationRenderer.renderNotification(extras, context, nb, config, notificationId);\n+ if (nb == null) {// template renderer can return null if template type is null\n+ return;\n}\n- Notification n = nb.build();\n- notificationManager.notify(notificationId, n);\n- config.getLogger().debug(config.getAccountId(), \"Rendered notification: \" + n.toString());\n+ Notification n = nb.build();// Common use build() b\n+ notificationManager.notify(notificationId, n);//cb\n+ config.getLogger().debug(config.getAccountId(), \"Rendered notification: \" + n.toString());//cb\n+ // common not there in template - START\nString ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\n@@ -1254,16 +1292,6 @@ public class PushProviders implements CTPushProviderListener {\nreturn;\n}\nanalyticsManager.pushNotificationViewedEvent(extras);\n+ //common not there in template - END\n}\n-\n- @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)\n- private static JobInfo getJobInfo(int jobId, JobScheduler jobScheduler) {\n- for (JobInfo jobInfo : jobScheduler.getAllPendingJobs()) {\n- if (jobInfo.getId() == jobId) {\n- return jobInfo;\n- }\n- }\n- return null;\n- }\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<activity\nandroid:name=\".WebViewActivity\"\nandroid:label=\"WebView\" />\n+ <meta-data\n+ android:name=\"CLEVERTAP_BACKGROUND_SYNC\"\n+ android:value=\"1\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "package com.clevertap.demo.ui.main\n+import android.os.Looper\nimport android.util.Log\nimport androidx.lifecycle.MutableLiveData\nimport androidx.lifecycle.ViewModel\n@@ -283,7 +284,10 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"80\" -> println(\"CleverTapAttribution Identifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n\"81\" -> cleverTapAPI?.getCleverTapID {\nprintln(\n- \"CleverTap DeviceID from Application class= $it\"\n+ \"CleverTap DeviceID from Application class= $it, thread=${\n+ if (Looper.myLooper() == Looper.getMainLooper()) \"mainthread\" else \"bg thread\"\n+ // Current Thread is Main Thread.\n+ }\"\n)\n}\n//\"60\" -> webViewClickListener?.onWebViewClick()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): Implement INotificationRenderer SDK-987 |
116,616 | 24.09.2021 13:08:38 | -19,080 | 120d78b3d4fae8cb9eb3a4cffdeb7a204705a935 | task(SDK-1056) - Add PTMessagingService | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateMessagingService.java",
"diff": "+package com.clevertap.android.pushtemplates;\n+\n+import android.content.Context;\n+import android.os.Bundle;\n+\n+import com.clevertap.android.sdk.CleverTapAPI;\n+import com.clevertap.android.sdk.interfaces.NotificationHandler;\n+import com.clevertap.android.sdk.pushnotification.INotificationRenderer;\n+import com.clevertap.android.sdk.pushnotification.PushNotificationUtil;\n+\n+import java.util.Objects;\n+\n+public class PushTemplateMessagingService implements NotificationHandler {\n+\n+ @Override\n+ public boolean onMessageReceived(final Context applicationContext, final Bundle message, final String pushType) {\n+ try {\n+ PTLog.debug(\"Inside Push Templates\");\n+ //TemplateRenderer.createNotification(applicationContext, message);\n+ // initial setup\n+ INotificationRenderer templateRenderer = new TemplateRenderer(applicationContext, message);\n+ CleverTapAPI cleverTapAPI = CleverTapAPI\n+ .getGlobalInstance(applicationContext, PushNotificationUtil.getAccountIdFromNotificationBundle(message));\n+ Objects.requireNonNull(cleverTapAPI).renderPushNotification(templateRenderer,applicationContext,message);\n+\n+ } catch (Throwable throwable) {\n+ PTLog.verbose(\"Error parsing FCM payload\", throwable);\n+ }\n+ return true;\n+ }\n+\n+ @Override\n+ public boolean onNewToken(final Context applicationContext, final String token, final String pushType) {\n+ return true;\n+ }\n+\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Add PTMessagingService |
116,616 | 24.09.2021 13:23:48 | -19,080 | 5a33e605282b3f50f1b3d34ce6bdd32b8a4be00f | task(SDK-1056) - Add Checker classes, PendingIntentFactory.kt | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/checkers/ListSizeChecker.kt",
"diff": "+package com.clevertap.android.pushtemplates.checkers\n+\n+class ListSizeChecker(entity: List<Any>, size: Int) {\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/checkers/SizeChecker.kt",
"diff": "+package com.clevertap.android.pushtemplates.checkers\n+\n+\n+class SizeChecker<Any>(private var entity: kotlin.Any,private var size: Int) {\n+\n+\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/checkers/StringSizeChecker<String>.kt",
"diff": "+package com.clevertap.android.pushtemplates.checkers\n+\n+\n+class StringSizeChecker(entity: String,size: Int) {\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"diff": "+package com.clevertap.android.pushtemplates.content\n+\n+import android.app.PendingIntent\n+import android.content.Context\n+import android.content.Intent\n+import android.os.Bundle\n+\n+class PendingIntentFactory {\n+\n+ private fun setPendingIntent(context: Context,notificationId: Int, extras: Bundle, intent: Intent,\n+ dl: String): PendingIntent{\n+\n+\n+ }\n+\n+ private fun setDismissIntent(context: Context, extras: Bundle,intent: Intent): PendingIntent{\n+\n+ }\n+\n+ fun getPendingIntent(context: Context, notificationId: Int, extras: Bundle,\n+ isLauncher: Boolean,identifier: String): PendingIntent{\n+\n+ }\n+\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Add Checker classes, PendingIntentFactory.kt |
116,612 | 28.09.2021 16:07:30 | -19,080 | c5043d71099a0b9b4930cd2c30a3a1396c7881f6 | task(refactor): rename PushTemplateMessagingService to PushTemplateNotificationHandler | [
{
"change_type": "RENAME",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateMessagingService.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateNotificationHandler.java",
"diff": "@@ -10,7 +10,7 @@ import com.clevertap.android.sdk.pushnotification.PushNotificationUtil;\nimport java.util.Objects;\n-public class PushTemplateMessagingService implements NotificationHandler {\n+public class PushTemplateNotificationHandler implements NotificationHandler {\n@Override\npublic boolean onMessageReceived(final Context applicationContext, final Bundle message, final String pushType) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): rename PushTemplateMessagingService to PushTemplateNotificationHandler SDK-981 |
116,616 | 28.09.2021 16:09:22 | -19,080 | 299f6dffa7b1d1c672996088e7bfcee234de6ce0 | task(SDK-1056) - Refactor ContentView classes | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PTLog.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PTLog.java",
"diff": "@@ -19,7 +19,7 @@ public final class PTLog {\n}\n- static void debug(String message){\n+ public static void debug(String message){\nif (getStaticDebugLevel() >= TemplateRenderer.LogLevel.DEBUG.intValue()){\nLog.d(PTConstants.LOG_TAG,message);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/AutoCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/AutoCarouselContentView.kt",
"diff": "@@ -9,7 +9,7 @@ import com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\n-class AutoCarouselContentView(private var context: Context, private var renderer: TemplateRenderer):\n+class AutoCarouselContentView(context: Context, renderer: TemplateRenderer):\nSmallContentView(context,R.layout.auto_carousel,renderer) {\ninit {\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.pushtemplates.content\nimport android.content.Context\nimport android.view.View\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.PTLog\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"diff": "@@ -81,7 +81,7 @@ open class ProductDisplayLinearBigContentView(context: Context,\n}\n}\n- internal fun setCustomContentViewButtonLabel(resourceID: Int,pt_product_display_action: String?) {\n+ private fun setCustomContentViewButtonLabel(resourceID: Int, pt_product_display_action: String?) {\nif (pt_product_display_action != null && pt_product_display_action.isNotEmpty()) {\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {\nremoteView.setTextViewText(\n@@ -95,7 +95,7 @@ open class ProductDisplayLinearBigContentView(context: Context,\n}\n- internal fun setCustomContentViewButtonColour(resourceID: Int, pt_product_display_action_clr: String?) {\n+ private fun setCustomContentViewButtonColour(resourceID: Int, pt_product_display_action_clr: String?) {\nif (pt_product_display_action_clr != null && pt_product_display_action_clr.isNotEmpty()) {\nremoteView.setInt(\nresourceID,\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.pushtemplates.content\nimport android.content.Context\nimport android.view.View\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearBigContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.PTConstants\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearSmallContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearSmallContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerBigContentView.kt",
"diff": "@@ -5,7 +5,6 @@ import android.os.Build\nimport android.os.SystemClock\nimport android.text.Html\nimport android.view.View\n-import android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Refactor ContentView classes |
116,612 | 29.09.2021 18:31:21 | -19,080 | f95a1e48f112476e69769a8a82ab476c4cbc426d | task(streamline_pn): Add interface for action button click of push notification | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/ActionButtonClickHandler.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+import android.os.Bundle;\n+\n+public interface ActionButtonClickHandler extends NotificationHandler {\n+\n+ String getType(Bundle extras);\n+\n+ boolean onActionButtonClick();\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): Add interface for action button click of push notification SDK-987 |
116,616 | 29.09.2021 18:33:28 | -19,080 | d29e3b483d3978f3aa4e7cec2f4bc03cd59e29cb | task(SDK-1056) - Update PendingIntentFactory.kt | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -64,7 +64,7 @@ class TemplateRenderer : INotificationRenderer {\nvar pt_timer_threshold = 0\nprivate var pt_input_label: String? = null\nvar pt_input_feedback: String? = null\n- private var pt_input_auto_open: String? = null\n+ internal var pt_input_auto_open: String? = null\nprivate var pt_dismiss_on_click: String? = null\nvar pt_timer_end = 0\nprivate var pt_title_alt: String? = null\n@@ -84,7 +84,7 @@ class TemplateRenderer : INotificationRenderer {\ninternal var pt_flip_interval = 0\nprivate var pt_collapse_key: Any? = null\ninternal var pt_manual_carousel_type: String? = null\n- private var config: CleverTapInstanceConfig? = null\n+ internal var config: CleverTapInstanceConfig? = null\nenum class LogLevel(private val value: Int) {\nOFF(-1), INFO(0), DEBUG(2), VERBOSE(3);\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n+import android.os.Bundle\nimport android.view.View\nimport com.clevertap.android.pushtemplates.PTLog\nimport com.clevertap.android.pushtemplates.R\n@@ -70,6 +71,25 @@ class FiveIconContentView(context: Context,renderer: TemplateRenderer):\n}\n}\nUtils.loadImageRidIntoRemoteView(R.id.close, R.drawable.pt_close, remoteView)\n+\n+ remoteView.setOnClickPendingIntent(R.id.cta1, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CTA1_PENDING_INTENT,renderer))\n+ remoteView.setOnClickPendingIntent(R.id.cta2, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CTA2_PENDING_INTENT,renderer))\n+\n+ remoteView.setOnClickPendingIntent(R.id.cta3, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CTA3_PENDING_INTENT,renderer))\n+\n+ remoteView.setOnClickPendingIntent(R.id.cta4, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CTA4_PENDING_INTENT,renderer))\n+\n+ remoteView.setOnClickPendingIntent(R.id.cta5, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CTA5_PENDING_INTENT,renderer))\n+\n+ remoteView.setOnClickPendingIntent(R.id.close, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, FIVE_ICON_CLOSE_PENDING_INTENT,renderer))\n+\n+\nif (imageCounter > 2) {\nPTLog.debug(\"More than 2 images were not retrieved in 5CTA Notification, not displaying Notification.\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.pushtemplates.content\nimport android.content.Context\nimport android.os.Build\n+import android.os.Bundle\nimport android.text.Html\nimport android.view.View\nimport android.widget.RemoteViews\n@@ -61,6 +62,18 @@ class ManualCarouselContentView(context: Context, renderer: TemplateRenderer):\ntempImageList.size - 1\n)\n+ remoteView.setOnClickPendingIntent(\n+ R.id.rightArrowPos0,\n+ PendingIntentFactory().getPendingIntent(context,1, Bundle(),false,\n+ MANUAL_CAROUSEL_RIGHT_ARROW_PENDING_INTENT,renderer)//TODO Check notifId and extras here\n+ )\n+\n+ remoteView.setOnClickPendingIntent(\n+ R.id.leftArrowPos0,\n+ PendingIntentFactory().getPendingIntent(context,1, Bundle(),false,\n+ MANUAL_CAROUSEL_LEFT_ARROW_PENDING_INTENT,renderer)//TODO Check notifId and extras here\n+ )\n+\nif (imageCounter < 2) {\nPTLog.debug(\"Need at least 2 images to display Manual Carousel, found - $imageCounter, not displaying the notification.\")\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"diff": "@@ -5,11 +5,42 @@ import android.content.Context\nimport android.content.Intent\nimport android.os.Bundle\nimport com.clevertap.android.pushtemplates.PTConstants\n+import com.clevertap.android.pushtemplates.PTPushNotificationReceiver\n+import com.clevertap.android.pushtemplates.PushTemplateReceiver\n+import com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.sdk.Constants\n+import java.util.*\n+\n+const val PENDING_INTENT_BASIC_PT = 1\n+const val MANUAL_CAROUSEL_RIGHT_ARROW_PENDING_INTENT = 2\n+const val MANUAL_CAROUSEL_LEFT_ARROW_PENDING_INTENT = 3\n+const val MANUAL_CAROUSEL_DISMISS_PENDING_INTENT = 4\n+const val RATING_NOTIFICATION_CLICK1_PENDING_INTENT = 5\n+const val RATING_NOTIFICATION_CLICK2_PENDING_INTENT = 6\n+const val RATING_NOTIFICATION_CLICK3_PENDING_INTENT = 7\n+const val RATING_NOTIFICATION_CLICK4_PENDING_INTENT = 8\n+const val RATING_NOTIFICATION_CLICK5_PENDING_INTENT = 9\n+const val FIVE_ICON_CTA1_PENDING_INTENT = 10\n+const val FIVE_ICON_CTA2_PENDING_INTENT = 11\n+const val FIVE_ICON_CTA3_PENDING_INTENT = 12\n+const val FIVE_ICON_CTA4_PENDING_INTENT = 13\n+const val FIVE_ICON_CTA5_PENDING_INTENT = 14\n+const val FIVE_ICON_CLOSE_PENDING_INTENT = 15\n+const val PRODUCT_DISPLAY_DL1_PENDING_INTENT = 16\n+const val PRODUCT_DISPLAY_DL2_PENDING_INTENT = 17\n+const val PRODUCT_DISPLAY_DL3_PENDING_INTENT = 18\n+const val PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT = 19\n+const val ZERO_BEZEL_PENDING_INTENT = 20\n+const val TIMER_NOTIFICATION_PENDING_INTENT = 21\n+const val INPUT_BOX_NOTIFICATION_PENDING_INTENT = 22\n+const val INPUT_BOX_NOTIFICATION_REPLY__PENDING_INTENT = 23\nclass PendingIntentFactory {\n- internal fun setPendingIntent(context: Context,notificationId: Int, extras: Bundle, launchIntent: Intent,\n+ lateinit var launchIntent: Intent\n+\n+ private fun setPendingIntent(\n+ context: Context, notificationId: Int, extras: Bundle, launchIntent: Intent,\ndl: String?): PendingIntent{\nlaunchIntent.putExtras(extras)\nlaunchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n@@ -38,7 +69,247 @@ class PendingIntentFactory {\n}\nfun getPendingIntent(context: Context, notificationId: Int, extras: Bundle,\n- isLauncher: Boolean,identifier: String): PendingIntent{\n+ isLauncher: Boolean,identifier: Int, renderer: TemplateRenderer): PendingIntent? {\n+\n+ if (isLauncher){\n+ launchIntent = Intent(context, PTPushNotificationReceiver::class.java)\n+ }else if (!isLauncher){\n+ launchIntent = Intent(context, PushTemplateReceiver::class.java)\n+ }\n+\n+\n+ val pIntent:PendingIntent\n+ when (identifier) {\n+ PENDING_INTENT_BASIC_PT -> {\n+ pIntent = if (renderer.deepLinkList != null && renderer.deepLinkList!!.size > 0) {\n+ setPendingIntent(context, notificationId, extras, launchIntent, renderer.deepLinkList!![0])\n+ } else {\n+ setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+\n+ return pIntent\n+ }\n+\n+ MANUAL_CAROUSEL_RIGHT_ARROW_PENDING_INTENT -> {\n+ launchIntent.putExtra(PTConstants.PT_RIGHT_SWIPE, true)\n+ launchIntent.putExtra(PTConstants.PT_MANUAL_CAROUSEL_FROM, 0)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+\n+ return setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ }\n+\n+ MANUAL_CAROUSEL_LEFT_ARROW_PENDING_INTENT -> {\n+ launchIntent.putExtra(PTConstants.PT_RIGHT_SWIPE, false)\n+ launchIntent.putExtra(PTConstants.PT_MANUAL_CAROUSEL_FROM, 0)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+\n+ return setPendingIntent(\n+ context, notificationId, extras, launchIntent, renderer.deepLinkList!![0])\n+ }\n+\n+ MANUAL_CAROUSEL_DISMISS_PENDING_INTENT -> {\n+ val dismissIntent = Intent(context, PushTemplateReceiver::class.java)//factory\n+ return setDismissIntent(context, extras, dismissIntent)\n+ }\n+\n+ RATING_NOTIFICATION_CLICK1_PENDING_INTENT -> {\n+ launchIntent.putExtra(\"click1\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+ RATING_NOTIFICATION_CLICK2_PENDING_INTENT -> {\n+ launchIntent.putExtra(\"click2\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+ RATING_NOTIFICATION_CLICK3_PENDING_INTENT -> {\n+ launchIntent.putExtra(\"click3\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+ RATING_NOTIFICATION_CLICK4_PENDING_INTENT -> {\n+ launchIntent.putExtra(\"click4\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+ RATING_NOTIFICATION_CLICK5_PENDING_INTENT -> {\n+ launchIntent.putExtra(\"click5\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+\n+ FIVE_ICON_CTA1_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"cta1\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ FIVE_ICON_CTA2_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"cta2\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ FIVE_ICON_CTA3_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"cta3\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ FIVE_ICON_CTA4_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"cta4\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ FIVE_ICON_CTA5_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"cta5\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ FIVE_ICON_CLOSE_PENDING_INTENT -> {\n+ val reqCode = Random().nextInt()\n+ launchIntent.putExtra(\"close\", true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n+ }\n+\n+ PRODUCT_DISPLAY_DL1_PENDING_INTENT -> {\n+ val requestCode = Random().nextInt()\n+ launchIntent.putExtra(PTConstants.PT_CURRENT_POSITION, 0)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(PTConstants.PT_BUY_NOW_DL, renderer.deepLinkList!![0])\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, requestCode, launchIntent, 0)\n+ }\n+\n+ PRODUCT_DISPLAY_DL2_PENDING_INTENT -> {\n+ val requestCode = Random().nextInt()\n+ launchIntent.putExtra(PTConstants.PT_CURRENT_POSITION, 1)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(PTConstants.PT_BUY_NOW_DL, renderer.deepLinkList!![1])\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, requestCode, launchIntent, 0)\n+ }\n+\n+ PRODUCT_DISPLAY_DL3_PENDING_INTENT -> {\n+ val requestCode = Random().nextInt()\n+ launchIntent.putExtra(PTConstants.PT_CURRENT_POSITION, 2)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(PTConstants.PT_BUY_NOW_DL, renderer.deepLinkList!![2])\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, requestCode, launchIntent, 0)\n+ }\n+\n+ PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT -> {\n+ launchIntent.putExtra(PTConstants.PT_IMAGE_1, true)\n+ launchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n+ launchIntent.putExtra(PTConstants.PT_BUY_NOW_DL, renderer.deepLinkList!![0])\n+ launchIntent.putExtra(PTConstants.PT_BUY_NOW, true)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+ launchIntent.putExtras(extras)\n+ return PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n+ }\n+\n+ ZERO_BEZEL_PENDING_INTENT -> {\n+ return if (renderer.deepLinkList != null) {\n+ setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ } else {\n+ setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+ }\n+\n+ TIMER_NOTIFICATION_PENDING_INTENT -> {\n+ return if (renderer.deepLinkList != null) {\n+ setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ } else {\n+ setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+ }\n+\n+ INPUT_BOX_NOTIFICATION_PENDING_INTENT -> {\n+\n+ return if (renderer.deepLinkList != null && renderer.deepLinkList!!.size > 0) {\n+ setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ } else {\n+ setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+ }\n+\n+ INPUT_BOX_NOTIFICATION_REPLY__PENDING_INTENT -> {\n+ launchIntent.putExtra(PTConstants.PT_INPUT_FEEDBACK, renderer.pt_input_feedback)\n+ launchIntent.putExtra(PTConstants.PT_INPUT_AUTO_OPEN, renderer.pt_input_auto_open)\n+ launchIntent.putExtra(\"config\", renderer.config)\n+\n+ return if (renderer.deepLinkList != null) {\n+ setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ } else {\n+ setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+ }\n+ else -> throw IllegalArgumentException(\"invalid pendingIntentType\")\n+ }\n+\n+ return null\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.pushtemplates.content\nimport android.content.Context\nimport android.os.Build\n+import android.os.Bundle\nimport android.text.Html\nimport android.view.View\nimport android.widget.RemoteViews\n@@ -24,6 +25,23 @@ open class ProductDisplayLinearBigContentView(context: Context,\nsetCustomContentViewDotSep()\nsetCustomContentViewSmallIcon()\n+\n+\n+ remoteView.setOnClickPendingIntent(R.id.small_image1, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, PRODUCT_DISPLAY_DL1_PENDING_INTENT,renderer))\n+\n+ if (renderer.deepLinkList!!.size >= 2) {\n+ remoteView.setOnClickPendingIntent(R.id.small_image2, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, PRODUCT_DISPLAY_DL2_PENDING_INTENT,renderer))\n+ }\n+\n+ if (renderer.deepLinkList!!.size >= 3) {\n+ remoteView.setOnClickPendingIntent(R.id.small_image3, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, PRODUCT_DISPLAY_DL3_PENDING_INTENT,renderer))\n+ }\n+\n+ remoteView.setOnClickPendingIntent(R.id.product_action, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false, PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT,renderer))\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n+import android.os.Bundle\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\n@@ -26,6 +27,17 @@ class RatingContentView(context: Context, renderer: TemplateRenderer):\nremoteView.setImageViewResource(R.id.star3, R.drawable.pt_star_outline)\nremoteView.setImageViewResource(R.id.star4, R.drawable.pt_star_outline)\nremoteView.setImageViewResource(R.id.star5, R.drawable.pt_star_outline)\n+\n+ remoteView.setOnClickPendingIntent(R.id.star1, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false,RATING_NOTIFICATION_CLICK1_PENDING_INTENT,renderer))//TODO Check notifId and extras here)\n+ remoteView.setOnClickPendingIntent(R.id.star2, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false,RATING_NOTIFICATION_CLICK2_PENDING_INTENT,renderer))\n+ remoteView.setOnClickPendingIntent(R.id.star3, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false,RATING_NOTIFICATION_CLICK3_PENDING_INTENT,renderer))\n+ remoteView.setOnClickPendingIntent(R.id.star4, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false,RATING_NOTIFICATION_CLICK4_PENDING_INTENT,renderer))\n+ remoteView.setOnClickPendingIntent(R.id.star5, PendingIntentFactory().getPendingIntent(context,\n+ 1, Bundle(),false,RATING_NOTIFICATION_CLICK5_PENDING_INTENT,renderer))\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Update PendingIntentFactory.kt |
116,612 | 29.09.2021 18:55:06 | -19,080 | f80ba361d8737992031609693c378f4b12a13043 | task(streamline_pn): refactor onActionButtonClick signature | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/ActionButtonClickHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/ActionButtonClickHandler.java",
"diff": "package com.clevertap.android.sdk.interfaces;\n+import android.content.Context;\nimport android.os.Bundle;\npublic interface ActionButtonClickHandler extends NotificationHandler {\nString getType(Bundle extras);\n- boolean onActionButtonClick();\n+ boolean onActionButtonClick(Context context, Bundle extras, int notificationId);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): refactor onActionButtonClick signature SDK-987 |
116,616 | 30.09.2021 10:30:11 | -19,080 | 778b45ff92d060024ee4340210cd4c50f06f58f7 | task(SDK-1056) - Update PendingIntentFactory.kt to static methods and refactor content views | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/FiveIconContentView.kt",
"diff": "@@ -72,21 +72,21 @@ class FiveIconContentView(context: Context,renderer: TemplateRenderer):\n}\nUtils.loadImageRidIntoRemoteView(R.id.close, R.drawable.pt_close, remoteView)\n- remoteView.setOnClickPendingIntent(R.id.cta1, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.cta1, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CTA1_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.cta2, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.cta2, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CTA2_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.cta3, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.cta3, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CTA3_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.cta4, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.cta4, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CTA4_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.cta5, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.cta5, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CTA5_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.close, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.close, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, FIVE_ICON_CLOSE_PENDING_INTENT,renderer))\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"diff": "@@ -64,13 +64,13 @@ class ManualCarouselContentView(context: Context, renderer: TemplateRenderer):\nremoteView.setOnClickPendingIntent(\nR.id.rightArrowPos0,\n- PendingIntentFactory().getPendingIntent(context,1, Bundle(),false,\n+ PendingIntentFactory.getPendingIntent(context,1, Bundle(),false,\nMANUAL_CAROUSEL_RIGHT_ARROW_PENDING_INTENT,renderer)//TODO Check notifId and extras here\n)\nremoteView.setOnClickPendingIntent(\nR.id.leftArrowPos0,\n- PendingIntentFactory().getPendingIntent(context,1, Bundle(),false,\n+ PendingIntentFactory.getPendingIntent(context,1, Bundle(),false,\nMANUAL_CAROUSEL_LEFT_ARROW_PENDING_INTENT,renderer)//TODO Check notifId and extras here\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"diff": "@@ -35,11 +35,12 @@ const val TIMER_NOTIFICATION_PENDING_INTENT = 21\nconst val INPUT_BOX_NOTIFICATION_PENDING_INTENT = 22\nconst val INPUT_BOX_NOTIFICATION_REPLY__PENDING_INTENT = 23\n-class PendingIntentFactory {\n+internal object PendingIntentFactory {\nlateinit var launchIntent: Intent\n- private fun setPendingIntent(\n+ @JvmStatic\n+ fun setPendingIntent(\ncontext: Context, notificationId: Int, extras: Bundle, launchIntent: Intent,\ndl: String?): PendingIntent{\nlaunchIntent.putExtras(extras)\n@@ -59,7 +60,8 @@ class PendingIntentFactory {\n}\n- private fun setDismissIntent(context: Context, extras: Bundle,intent: Intent): PendingIntent{\n+ @JvmStatic\n+ fun setDismissIntent(context: Context, extras: Bundle,intent: Intent): PendingIntent{\nintent.putExtras(extras)\nintent.putExtra(PTConstants.PT_DISMISS_INTENT, true)\nreturn PendingIntent.getBroadcast(\n@@ -68,6 +70,7 @@ class PendingIntentFactory {\n)\n}\n+ @JvmStatic\nfun getPendingIntent(context: Context, notificationId: Int, extras: Bundle,\nisLauncher: Boolean,identifier: Int, renderer: TemplateRenderer): PendingIntent? {\n@@ -308,9 +311,6 @@ class PendingIntentFactory {\n}\nelse -> throw IllegalArgumentException(\"invalid pendingIntentType\")\n}\n-\n- return null\n-\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"diff": "@@ -27,20 +27,20 @@ open class ProductDisplayLinearBigContentView(context: Context,\nsetCustomContentViewSmallIcon()\n- remoteView.setOnClickPendingIntent(R.id.small_image1, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.small_image1, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, PRODUCT_DISPLAY_DL1_PENDING_INTENT,renderer))\nif (renderer.deepLinkList!!.size >= 2) {\n- remoteView.setOnClickPendingIntent(R.id.small_image2, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.small_image2, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, PRODUCT_DISPLAY_DL2_PENDING_INTENT,renderer))\n}\nif (renderer.deepLinkList!!.size >= 3) {\n- remoteView.setOnClickPendingIntent(R.id.small_image3, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.small_image3, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, PRODUCT_DISPLAY_DL3_PENDING_INTENT,renderer))\n}\n- remoteView.setOnClickPendingIntent(R.id.product_action, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.product_action, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false, PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT,renderer))\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/RatingContentView.kt",
"diff": "@@ -28,15 +28,15 @@ class RatingContentView(context: Context, renderer: TemplateRenderer):\nremoteView.setImageViewResource(R.id.star4, R.drawable.pt_star_outline)\nremoteView.setImageViewResource(R.id.star5, R.drawable.pt_star_outline)\n- remoteView.setOnClickPendingIntent(R.id.star1, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.star1, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false,RATING_NOTIFICATION_CLICK1_PENDING_INTENT,renderer))//TODO Check notifId and extras here)\n- remoteView.setOnClickPendingIntent(R.id.star2, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.star2, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false,RATING_NOTIFICATION_CLICK2_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.star3, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.star3, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false,RATING_NOTIFICATION_CLICK3_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.star4, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.star4, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false,RATING_NOTIFICATION_CLICK4_PENDING_INTENT,renderer))\n- remoteView.setOnClickPendingIntent(R.id.star5, PendingIntentFactory().getPendingIntent(context,\n+ remoteView.setOnClickPendingIntent(R.id.star5, PendingIntentFactory.getPendingIntent(context,\n1, Bundle(),false,RATING_NOTIFICATION_CLICK5_PENDING_INTENT,renderer))\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Update PendingIntentFactory.kt to static methods and refactor content views |
116,612 | 01.10.2021 15:08:06 | -19,080 | 2c519b9267f7ea5155f84c7e8c17c3c329eba392 | task(streamline_pn): expose ActionButtonClick support for push templates | [
{
"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": "@@ -5,8 +5,10 @@ import android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\nimport android.content.pm.ResolveInfo;\n+import android.content.pm.ServiceInfo;\nimport android.graphics.Bitmap;\nimport android.graphics.BitmapFactory;\nimport android.graphics.Canvas;\n@@ -518,4 +520,29 @@ public final class Utils {\nhaveVideoPlayerSupport = checkForExoPlayer();\nhaveDeprecatedFirebaseInstanceId = checkForFirebaseInstanceId();\n}\n+\n+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+ public static boolean isServiceAvailable(Context context, Class clazz) {\n+ if (clazz == null) {\n+ return false;\n+ }\n+\n+ PackageManager pm = context.getPackageManager();\n+ String packageName = context.getPackageName();\n+\n+ PackageInfo packageInfo;\n+ try {\n+ packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n+ ServiceInfo[] services = packageInfo.services;\n+ for (ServiceInfo serviceInfo : services) {\n+ if (serviceInfo.name.equals(clazz.getName())) {\n+ Logger.v(\"Service \" + serviceInfo.name + \" found\");\n+ return true;\n+ }\n+ }\n+ } catch (PackageManager.NameNotFoundException e) {\n+ Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n+ }\n+ return false;\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/CTNotificationIntentService.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTNotificationIntentService.java",
"diff": "@@ -6,8 +6,11 @@ import android.content.Context;\nimport android.content.Intent;\nimport android.net.Uri;\nimport android.os.Bundle;\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.interfaces.ActionButtonClickHandler;\n+import com.clevertap.android.sdk.interfaces.NotificationHandler;\npublic class CTNotificationIntentService extends IntentService {\n@@ -15,6 +18,8 @@ public class CTNotificationIntentService extends IntentService {\npublic final static String TYPE_BUTTON_CLICK = \"com.clevertap.ACTION_BUTTON_CLICK\";\n+ private ActionButtonClickHandler mActionButtonClickHandler;\n+\npublic CTNotificationIntentService() {\nsuper(\"CTNotificationIntentService\");\n}\n@@ -26,7 +31,15 @@ public class CTNotificationIntentService extends IntentService {\nreturn;\n}\n- String type = extras.getString(\"ct_type\");\n+ NotificationHandler notificationHandler = CleverTapAPI.getNotificationHandler();\n+ if (PushNotificationHandler.isForPushTemplates(extras) && notificationHandler != null) {\n+ mActionButtonClickHandler = (ActionButtonClickHandler) notificationHandler;\n+ } else {\n+ mActionButtonClickHandler = (ActionButtonClickHandler) PushNotificationHandler\n+ .getPushNotificationHandler();\n+ }\n+\n+ String type = mActionButtonClickHandler.getType(extras);\nif (TYPE_BUTTON_CLICK.equals(type)) {\nLogger.v(\"CTNotificationIntentService handling \" + TYPE_BUTTON_CLICK);\nhandleActionButtonClick(extras);\n@@ -42,6 +55,13 @@ public class CTNotificationIntentService extends IntentService {\nString dl = extras.getString(\"dl\");\nContext context = getApplicationContext();\n+\n+ boolean isActionButtonClickHandled = mActionButtonClickHandler\n+ .onActionButtonClick(context, extras, notificationId);\n+ if (isActionButtonClickHandled) {\n+ return;\n+ }\n+\nIntent launchIntent;\nif (dl != null) {\nlaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CoreNotificationRenderer.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CoreNotificationRenderer.java",
"diff": "@@ -3,9 +3,6 @@ package com.clevertap.android.sdk.pushnotification;\nimport android.app.PendingIntent;\nimport android.content.Context;\nimport android.content.Intent;\n-import android.content.pm.PackageInfo;\n-import android.content.pm.PackageManager;\n-import android.content.pm.ServiceInfo;\nimport android.graphics.Bitmap;\nimport android.graphics.Color;\nimport android.net.Uri;\n@@ -154,7 +151,7 @@ public class CoreNotificationRenderer implements INotificationRenderer {\n}\n}\n- boolean isCTIntentServiceAvailable = isServiceAvailable(context, clazz);\n+ boolean isCTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz);\nif (actions != null && actions.length() > 0) {\nfor (int i = 0; i < actions.length(); i++) {\n@@ -238,28 +235,4 @@ public class CoreNotificationRenderer implements INotificationRenderer {\nthis.smallIcon = smallIcon;\n}\n- @SuppressWarnings(\"SameParameterValue\")\n- private boolean isServiceAvailable(Context context, Class clazz) {\n- if (clazz == null) {\n- return false;\n- }\n-\n- PackageManager pm = context.getPackageManager();\n- String packageName = context.getPackageName();\n-\n- PackageInfo packageInfo;\n- try {\n- packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n- ServiceInfo[] services = packageInfo.services;\n- for (ServiceInfo serviceInfo : services) {\n- if (serviceInfo.name.equals(clazz.getName())) {\n- Logger.v(\"Service \" + serviceInfo.name + \" found\");\n- return true;\n- }\n- }\n- } catch (PackageManager.NameNotFoundException e) {\n- Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n- }\n- return false;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"diff": "@@ -10,9 +10,10 @@ 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.interfaces.ActionButtonClickHandler;\nimport com.clevertap.android.sdk.interfaces.NotificationHandler;\n-public class PushNotificationHandler implements NotificationHandler {\n+public class PushNotificationHandler implements ActionButtonClickHandler {\nprivate static class SingletonNotificationHandler {\n@@ -35,6 +36,16 @@ public class PushNotificationHandler implements NotificationHandler {\n// NO-OP\n}\n+ @Override\n+ public String getType(final Bundle extras) {\n+ return extras.getString(\"ct_type\");\n+ }\n+\n+ @Override\n+ public boolean onActionButtonClick(final Context context, final Bundle extras, final int notificationId) {\n+ return false;\n+ }\n+\n@Override\npublic synchronized boolean onMessageReceived(final Context applicationContext, final Bundle message,\nfinal String pushType) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): expose ActionButtonClick support for push templates SDK-987 |
116,612 | 01.10.2021 15:18:11 | -19,080 | f70fc81509ff5f55278d568a40d1b055304e7506 | task(refactor): replace PTNotificationIntentService logic by CTNotificationIntentService and ActionButtonClickHandler | [
{
"change_type": "DELETE",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PTNotificationIntentService.java",
"new_path": null,
"diff": "-package com.clevertap.android.pushtemplates;\n-\n-import android.app.IntentService;\n-import android.app.NotificationManager;\n-import android.content.Context;\n-import android.content.Intent;\n-import android.net.Uri;\n-import android.os.Bundle;\n-\n-import com.clevertap.android.sdk.CleverTapInstanceConfig;\n-\n-public class PTNotificationIntentService extends IntentService {\n-\n- public final static String MAIN_ACTION = \"com.clevertap.PT_PUSH_EVENT\";\n- public final static String TYPE_BUTTON_CLICK = \"com.clevertap.ACTION_BUTTON_CLICK\";\n-\n- public PTNotificationIntentService() {\n- super(\"PTNotificationIntentService\");\n- }\n-\n- @Override\n- protected void onHandleIntent(Intent intent) {\n- Bundle extras = intent.getExtras();\n- if (extras == null) return;\n-\n- String type = extras.getString(PTConstants.PT_TYPE);\n- if (TYPE_BUTTON_CLICK.equals(type)) {\n- PTLog.verbose(\"PTNotificationIntentService handling \" + TYPE_BUTTON_CLICK);\n- handleActionButtonClick(extras);\n- } else {\n- PTLog.verbose(\"PTNotificationIntentService: unhandled intent \"+intent.getAction());\n- }\n- }\n-\n- private void handleActionButtonClick(Bundle extras) {\n- try {\n- boolean autoCancel = extras.getBoolean(\"autoCancel\", false);\n- int notificationId = extras.getInt(PTConstants.PT_NOTIF_ID, -1);\n- String actionID = extras.getString(PTConstants.PT_ACTION_ID);\n- String dl = extras.getString(\"dl\");\n- String dismissOnClick = extras.getString(PTConstants.PT_DISMISS_ON_CLICK);\n- CleverTapInstanceConfig config = extras.getParcelable(\"config\");\n- Context context = getApplicationContext();\n-\n- if (dismissOnClick!=null)\n- if (dismissOnClick.equalsIgnoreCase(\"true\")){\n- if(actionID != null && actionID.contains(\"remind\")){\n- Utils.raiseCleverTapEvent(context, config, extras);\n- }\n- Utils.cancelNotification(context, notificationId);\n- return;\n- }\n- Intent launchIntent;\n- if (dl != null) {\n- launchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n- Utils.setPackageNameFromResolveInfoList(context,launchIntent);\n- } else {\n- launchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());\n- }\n-\n- if (launchIntent == null) {\n- PTLog.verbose(\"PTNotificationIntentService: create launch intent.\");\n- return;\n- }\n-\n- launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);\n-\n- launchIntent.putExtras(extras);\n- launchIntent.removeExtra(\"dl\");\n-\n- if (autoCancel && notificationId > -1) {\n- NotificationManager notificationManager =\n- (NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);\n- if (notificationManager != null) {\n- notificationManager.cancel(notificationId);\n- }\n-\n- }\n- sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); // close the notification drawer\n- startActivity(launchIntent);\n- } catch (Throwable t) {\n- PTLog.verbose(\"PTNotificationIntentService: unable to process action button click: \"+ t.getLocalizedMessage());\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateNotificationHandler.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateNotificationHandler.java",
"diff": "@@ -2,15 +2,35 @@ package com.clevertap.android.pushtemplates;\nimport android.content.Context;\nimport android.os.Bundle;\n-\nimport com.clevertap.android.sdk.CleverTapAPI;\n-import com.clevertap.android.sdk.interfaces.NotificationHandler;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.interfaces.ActionButtonClickHandler;\nimport com.clevertap.android.sdk.pushnotification.INotificationRenderer;\nimport com.clevertap.android.sdk.pushnotification.PushNotificationUtil;\n-\nimport java.util.Objects;\n-public class PushTemplateNotificationHandler implements NotificationHandler {\n+public class PushTemplateNotificationHandler implements ActionButtonClickHandler {\n+\n+ @Override\n+ public String getType(final Bundle extras) {\n+ return extras.getString(PTConstants.PT_TYPE);\n+ }\n+\n+ @Override\n+ public boolean onActionButtonClick(final Context context, final Bundle extras, final int notificationId) {\n+ String actionID = extras.getString(PTConstants.PT_ACTION_ID);\n+ String dismissOnClick = extras.getString(PTConstants.PT_DISMISS_ON_CLICK);\n+ CleverTapInstanceConfig config = extras.getParcelable(\"config\");\n+\n+ if (dismissOnClick != null && dismissOnClick.equalsIgnoreCase(\"true\")) {\n+ if (actionID != null && actionID.contains(\"remind\")) {\n+ Utils.raiseCleverTapEvent(context, config, extras);\n+ }\n+ Utils.cancelNotification(context, notificationId);\n+ return true;\n+ }\n+ return false;\n+ }\n@Override\npublic boolean onMessageReceived(final Context applicationContext, final Bundle message, final String pushType) {\n@@ -20,8 +40,10 @@ public class PushTemplateNotificationHandler implements NotificationHandler {\n// initial setup\nINotificationRenderer templateRenderer = new TemplateRenderer(applicationContext, message);\nCleverTapAPI cleverTapAPI = CleverTapAPI\n- .getGlobalInstance(applicationContext, PushNotificationUtil.getAccountIdFromNotificationBundle(message));\n- Objects.requireNonNull(cleverTapAPI).renderPushNotification(templateRenderer,applicationContext,message);\n+ .getGlobalInstance(applicationContext,\n+ PushNotificationUtil.getAccountIdFromNotificationBundle(message));\n+ Objects.requireNonNull(cleverTapAPI)\n+ .renderPushNotification(templateRenderer, applicationContext, message);\n} catch (Throwable throwable) {\nPTLog.verbose(\"Error parsing FCM payload\", throwable);\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"diff": "@@ -22,12 +22,13 @@ import androidx.core.app.RemoteInput;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.pushnotification.CTNotificationIntentService;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Random;\nimport static android.content.Context.NOTIFICATION_SERVICE;\n-import static com.clevertap.android.pushtemplates.PTNotificationIntentService.TYPE_BUTTON_CLICK;\n+import static com.clevertap.android.sdk.pushnotification.CTNotificationIntentService.TYPE_BUTTON_CLICK;\npublic class PushTemplateReceiver extends BroadcastReceiver {\nboolean clicked1 = true, clicked2 = true, clicked3 = true, clicked4 = true, clicked5 = true, img1 = false, img2 = false, img3 = false, buynow = true, bigimage = true, cta1 = true, cta2 = true, cta3 = true, cta4 = true, cta5 = true, close = true;\n@@ -339,14 +340,14 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nIntent launchIntent;\nClass clazz = null;\ntry {\n- clazz = Class.forName(\"s.PTNotificationIntentService\");\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n} catch (ClassNotFoundException ex) {\nPTLog.debug(\"No Intent Service found\");\n}\nboolean isPTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz);\nif (isPTIntentServiceAvailable) {\n- launchIntent = new Intent(PTNotificationIntentService.MAIN_ACTION);\n+ launchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\nlaunchIntent.setPackage(context.getPackageName());\nlaunchIntent.putExtra(\"pt_type\", TYPE_BUTTON_CLICK);\nlaunchIntent.putExtras(extras);\n@@ -527,14 +528,14 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nClass clazz = null;\ntry {\n- clazz = Class.forName(\"s.PTNotificationIntentService\");\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n} catch (ClassNotFoundException ex) {\nPTLog.debug(\"No Intent Service found\");\n}\nboolean isPTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz);\nif (isPTIntentServiceAvailable) {\n- launchIntent = new Intent(PTNotificationIntentService.MAIN_ACTION);\n+ launchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\nlaunchIntent.putExtras(extras);\nlaunchIntent.putExtra(\"dl\", dl);\nlaunchIntent.setPackage(context.getPackageName());\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -17,6 +17,7 @@ import androidx.core.app.RemoteInput\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.CleverTapInstanceConfig\nimport com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\nimport com.clevertap.android.sdk.pushnotification.INotificationRenderer\nimport com.clevertap.android.sdk.pushnotification.PushNotificationUtil\nimport org.json.JSONArray\n@@ -1845,7 +1846,7 @@ class TemplateRenderer : INotificationRenderer {\n) {\nvar clazz: Class<*>? = null\ntry {\n- clazz = Class.forName(\"com.clevertap.pushtemplates.PTNotificationIntentService\")\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\")\n} catch (ex: ClassNotFoundException) {\nPTLog.debug(\"No Intent Service found\")\n}\n@@ -1878,11 +1879,11 @@ class TemplateRenderer : INotificationRenderer {\nval sendToPTIntentService = autoCancel && isPTIntentServiceAvailable\nvar actionLaunchIntent: Intent?\nif (sendToPTIntentService) {\n- actionLaunchIntent = Intent(PTNotificationIntentService.MAIN_ACTION)\n+ actionLaunchIntent = Intent(CTNotificationIntentService.MAIN_ACTION)\nactionLaunchIntent.setPackage(context.packageName)\nactionLaunchIntent.putExtra(\nPTConstants.PT_TYPE,\n- PTNotificationIntentService.TYPE_BUTTON_CLICK\n+ CTNotificationIntentService.TYPE_BUTTON_CLICK\n)\nif (dl.isNotEmpty()) {\nactionLaunchIntent.putExtra(\"dl\", dl)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): replace PTNotificationIntentService logic by CTNotificationIntentService and ActionButtonClickHandler SDK-981 |
116,612 | 01.10.2021 15:50:35 | -19,080 | 1347579c4e9b45fbc5e85f63196edeb502b72699 | task(refactor): replace isServiceAvailable of PushTemplates by CT core | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"diff": "@@ -345,7 +345,7 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nPTLog.debug(\"No Intent Service found\");\n}\n- boolean isPTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz);\n+ boolean isPTIntentServiceAvailable = com.clevertap.android.sdk.Utils.isServiceAvailable(context, clazz);\nif (isPTIntentServiceAvailable) {\nlaunchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\nlaunchIntent.setPackage(context.getPackageName());\n@@ -533,7 +533,7 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nPTLog.debug(\"No Intent Service found\");\n}\n- boolean isPTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz);\n+ boolean isPTIntentServiceAvailable = com.clevertap.android.sdk.Utils.isServiceAvailable(context, clazz);\nif (isPTIntentServiceAvailable) {\nlaunchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\nlaunchIntent.putExtras(extras);\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -1850,7 +1850,7 @@ class TemplateRenderer : INotificationRenderer {\n} catch (ex: ClassNotFoundException) {\nPTLog.debug(\"No Intent Service found\")\n}\n- val isPTIntentServiceAvailable = Utils.isServiceAvailable(context, clazz)\n+ val isPTIntentServiceAvailable = com.clevertap.android.sdk.Utils.isServiceAvailable(context, clazz)\nif (actions != null && actions!!.length() > 0) {\nfor (i in 0 until actions!!.length()) {\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/Utils.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/Utils.java",
"diff": "@@ -577,29 +577,6 @@ public class Utils {\nreturn ids;\n}\n- @SuppressWarnings({\"SameParameterValue\", \"rawtypes\"})\n- static boolean isServiceAvailable(Context context, Class clazz) {\n- if (clazz == null) return false;\n-\n- PackageManager pm = context.getPackageManager();\n- String packageName = context.getPackageName();\n-\n- PackageInfo packageInfo;\n- try {\n- packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n- ServiceInfo[] services = packageInfo.services;\n- for (ServiceInfo serviceInfo : services) {\n- if (serviceInfo.name.equals(clazz.getName())) {\n- PTLog.verbose(\"Service \" + serviceInfo.name + \" found\");\n- return true;\n- }\n- }\n- } catch (PackageManager.NameNotFoundException e) {\n- PTLog.debug(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n- }\n- return false;\n- }\n-\nstatic void raiseNotificationClicked(Context context, Bundle extras, CleverTapInstanceConfig config) {\nCleverTapAPI instance;\nif (config != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): replace isServiceAvailable of PushTemplates by CT core SDK-981 |
116,612 | 01.10.2021 16:00:32 | -19,080 | b0a70cbd78875eec28b1f3b583d780d7a5aea066 | task(streamline_pn): remove unwanted code from PushProviders | [
{
"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": "@@ -17,9 +17,6 @@ import android.content.ComponentName;\nimport android.content.ContentResolver;\nimport android.content.Context;\nimport android.content.Intent;\n-import android.content.pm.PackageInfo;\n-import android.content.pm.PackageManager;\n-import android.content.pm.ServiceInfo;\nimport android.media.RingtoneManager;\nimport android.net.Uri;\nimport android.os.Build;\n@@ -183,7 +180,7 @@ public class PushProviders implements CTPushProviderListener {\nString notifTitle = iNotificationRenderer.getTitle(extras,\ncontext);//extras.getString(Constants.NOTIF_TITLE, \"\");// uncommon - getTitle()\nnotifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name : notifTitle;//common\n- triggerNotification(context, extras, notifMessage, notifTitle, notificationId);\n+ triggerNotification(context, extras, notificationId);\n} catch (Throwable t) {\n// Occurs if the notification image was null\n// Let's return, as we couldn't get a handle on the app's icon\n@@ -723,31 +720,6 @@ public class PushProviders implements CTPushProviderListener {\n}\n}\n- @SuppressWarnings(\"SameParameterValue\")\n- private boolean isServiceAvailable(Context context, Class clazz) {\n- if (clazz == null) {\n- return false;\n- }\n-\n- PackageManager pm = context.getPackageManager();\n- String packageName = context.getPackageName();\n-\n- PackageInfo packageInfo;\n- try {\n- packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\n- ServiceInfo[] services = packageInfo.services;\n- for (ServiceInfo serviceInfo : services) {\n- if (serviceInfo.name.equals(clazz.getName())) {\n- Logger.v(\"Service \" + serviceInfo.name + \" found\");\n- return true;\n- }\n- }\n- } catch (PackageManager.NameNotFoundException e) {\n- Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n- }\n- return false;\n- }\n-\nprivate boolean isTimeBetweenDNDTime(Date startTime, Date stopTime, Date currentTime) {\n//Start Time\nCalendar startTimeCalendar = Calendar.getInstance();\n@@ -927,19 +899,18 @@ public class PushProviders implements CTPushProviderListener {\nthis.iNotificationRenderer = iNotificationRenderer;\n}\n- private void triggerNotification(Context context, Bundle extras, String notifMessage, String notifTitle,\n- int notificationId) {\n+ private void triggerNotification(Context context, Bundle extras, int notificationId) {\nNotificationManager notificationManager =\n- (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);// Common\n+ (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\nif (notificationManager == null) {\nString notificationManagerError = \"Unable to render notification, Notification Manager is null.\";\nconfig.getLogger().debug(config.getAccountId(), notificationManagerError);\nreturn;\n- }// common\n+ }\n- String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");// common\n- boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;// common\n+ String channelId = extras.getString(Constants.WZRK_CHANNEL_ID, \"\");\n+ boolean requiresChannelId = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\nint messageCode = -1;\n@@ -958,53 +929,7 @@ public class PushProviders implements CTPushProviderListener {\nvalidationResultStack.pushValidationResult(channelIdError);\nreturn;\n}\n- }// common\n-\n- /*String icoPath = extras.getString(Constants.NOTIF_ICON);// uncommon\n- Intent launchIntent = new Intent(context, CTPushNotificationReceiver.class);// uncommon 1\n-\n- PendingIntent pIntent;\n-\n- // Take all the properties from the notif and add it to the intent\n- launchIntent.putExtras(extras);// u1\n- launchIntent.removeExtra(Constants.WZRK_ACTIONS);//u1\n- pIntent = PendingIntent.getBroadcast(context, (int) System.currentTimeMillis(),\n- launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);//u1*/\n-\n- /*// uncommon - START\n- NotificationCompat.Style style;\n- String bigPictureUrl = extras.getString(Constants.WZRK_BIG_PICTURE);\n- if (bigPictureUrl != null && bigPictureUrl.startsWith(\"http\")) {\n- try {\n- Bitmap bpMap = Utils.getNotificationBitmap(bigPictureUrl, false, context);\n-\n- if (bpMap == null) {\n- throw new Exception(\"Failed to fetch big picture!\");\n- }\n-\n- if (extras.containsKey(Constants.WZRK_MSG_SUMMARY)) {\n- String summaryText = extras.getString(Constants.WZRK_MSG_SUMMARY);\n- style = new NotificationCompat.BigPictureStyle()\n- .setSummaryText(summaryText)\n- .bigPicture(bpMap);\n- } else {\n- style = new NotificationCompat.BigPictureStyle()\n- .setSummaryText(notifMessage)\n- .bigPicture(bpMap);\n- }\n- } catch (Throwable t) {\n- style = new NotificationCompat.BigTextStyle()\n- .bigText(notifMessage);\n- config.getLogger()\n- .verbose(config.getAccountId(),\n- \"Falling back to big text notification, couldn't fetch big picture\",\n- t);\n}\n- } else {\n- style = new NotificationCompat.BigTextStyle()\n- .bigText(notifMessage);\n- }\n- // uncommon - END*/\nint smallIcon;\ntry {\nString x = ManifestInfo.getInstance(context).getNotificationIcon();\n@@ -1017,7 +942,7 @@ public class PushProviders implements CTPushProviderListener {\n}\n} catch (Throwable t) {\nsmallIcon = DeviceInfo.getAppIconAsIntId(context);\n- }// common extract to getSmallIcon()\n+ }\niNotificationRenderer.setSmallIcon(smallIcon, context);\n@@ -1030,13 +955,13 @@ public class PushProviders implements CTPushProviderListener {\nif (priority.equals(Constants.PRIORITY_MAX)) {\npriorityInt = NotificationCompat.PRIORITY_MAX;\n}\n- }// common, not there in templates\n+ }\n// if we have no user set notificationID then try collapse key\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\ntry {\nObject collapse_key = iNotificationRenderer\n- .getCollapseKey(extras);//extras.get(Constants.WZRK_COLLAPSE); //use getCollapseKey()\n+ .getCollapseKey(extras);\nif (collapse_key != null) {\nif (collapse_key instanceof Number) {\nnotificationId = ((Number) collapse_key).intValue();\n@@ -1060,13 +985,13 @@ public class PushProviders implements CTPushProviderListener {\n} else {\nconfig.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId\n+ \" won't use collapse_key (if any) as basis for notificationId\");\n- } // common use getCollapseKey()\n+ }\n// if after trying collapse_key notification is still empty set to random int\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\nnotificationId = (int) (Math.random() * 100);\nconfig.getLogger().debug(config.getAccountId(), \"Setting random notificationId: \" + notificationId);\n- }// common use getCollapseKey()\n+ }\nNotificationCompat.Builder nb;\nif (requiresChannelId) {\n@@ -1074,7 +999,7 @@ public class PushProviders implements CTPushProviderListener {\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\nString badgeIconParam = extras\n- .getString(Constants.WZRK_BADGE_ICON, null);// common bi - not there in template\n+ .getString(Constants.WZRK_BADGE_ICON, null);\nif (badgeIconParam != null) {\ntry {\nint badgeIconType = Integer.parseInt(badgeIconParam);\n@@ -1084,7 +1009,7 @@ public class PushProviders implements CTPushProviderListener {\n} catch (Throwable t) {\n// no-op\n}\n- }//cbi\n+ }\nString badgeCountParam = extras.getString(Constants.WZRK_BADGE_COUNT, null);//cbi\nif (badgeCountParam != null) {\n@@ -1096,37 +1021,17 @@ public class PushProviders implements CTPushProviderListener {\n} catch (Throwable t) {\n// no-op\n}\n- }//cbi\n- /*if (extras.containsKey(Constants.WZRK_SUBTITLE)) {\n- nb.setSubText(extras.getString(Constants.WZRK_SUBTITLE));\n- }// uncommon*/\n+ }\n+\n} else {\n// noinspection all\nnb = new NotificationCompat.Builder(context);\n}\n- /*if (extras.containsKey(Constants.WZRK_COLOR)) {\n- int color = Color.parseColor(extras.getString(Constants.WZRK_COLOR));\n- nb.setColor(color);\n- nb.setColorized(true);\n- }// uncommon\n-\n- // uncommon\n- nb.setContentTitle(notifTitle)\n- .setContentText(notifMessage)\n- .setContentIntent(pIntent)\n- .setAutoCancel(true)\n- .setStyle(style)\n- .setPriority(priorityInt)\n- .setSmallIcon(smallIcon);\n-\n- // uncommon\n- nb.setLargeIcon(Utils.getNotificationBitmap(icoPath, true, context));//uncommon\n-*/\nnb.setPriority(priorityInt);\ntry {\n- if (extras.containsKey(Constants.WZRK_SOUND)) {// common not there in template\n+ if (extras.containsKey(Constants.WZRK_SOUND)) {\nUri soundUri = null;\nObject o = extras.get(Constants.WZRK_SOUND);\n@@ -1156,125 +1061,15 @@ public class PushProviders implements CTPushProviderListener {\nconfig.getLogger().debug(config.getAccountId(), \"Could not process sound parameter\", t);\n}\n- /*// Uncommon - START\n- // add actions if any\n- JSONArray actions = null;\n- String actionsString = extras.getString(Constants.WZRK_ACTIONS);\n- if (actionsString != null) {\n- try {\n- actions = new JSONArray(actionsString);\n- } catch (Throwable t) {\n- config.getLogger()\n- .debug(config.getAccountId(),\n- \"error parsing notification actions: \" + t.getLocalizedMessage());\n- }\n- }\n-\n- String intentServiceName = ManifestInfo.getInstance(context).getIntentServiceName();\n- Class clazz = null;\n- if (intentServiceName != null) {\n- try {\n- clazz = Class.forName(intentServiceName);\n- } catch (ClassNotFoundException e) {\n- try {\n- clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n- } catch (ClassNotFoundException ex) {\n- Logger.d(\"No Intent Service found\");\n- }\n- }\n- } else {\n- try {\n- clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\");\n- } catch (ClassNotFoundException ex) {\n- Logger.d(\"No Intent Service found\");\n- }\n- }\n-\n- boolean isCTIntentServiceAvailable = isServiceAvailable(context, clazz);\n-\n- if (actions != null && actions.length() > 0) {\n- for (int i = 0; i < actions.length(); i++) {\n- try {\n- JSONObject action = actions.getJSONObject(i);\n- String label = action.optString(\"l\");\n- String dl = action.optString(\"dl\");\n- String ico = action.optString(Constants.NOTIF_ICON);\n- String id = action.optString(\"id\");\n- boolean autoCancel = action.optBoolean(\"ac\", true);\n- if (label.isEmpty() || id.isEmpty()) {\n- config.getLogger().debug(config.getAccountId(),\n- \"not adding push notification action: action label or id missing\");\n- continue;\n- }\n- int icon = 0;\n- if (!ico.isEmpty()) {\n- try {\n- icon = context.getResources().getIdentifier(ico, \"drawable\", context.getPackageName());\n- } catch (Throwable t) {\n- config.getLogger().debug(config.getAccountId(),\n- \"unable to add notification action icon: \" + t.getLocalizedMessage());\n- }\n- }\n-\n- boolean sendToCTIntentService = (autoCancel && isCTIntentServiceAvailable);\n-\n- Intent actionLaunchIntent;\n- if (sendToCTIntentService) {\n- actionLaunchIntent = new Intent(CTNotificationIntentService.MAIN_ACTION);\n- actionLaunchIntent.setPackage(context.getPackageName());\n- actionLaunchIntent.putExtra(\"ct_type\", CTNotificationIntentService.TYPE_BUTTON_CLICK);\n- if (!dl.isEmpty()) {\n- actionLaunchIntent.putExtra(\"dl\", dl);\n- }\n- } else {\n- if (!dl.isEmpty()) {\n- actionLaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n- } else {\n- actionLaunchIntent = context.getPackageManager()\n- .getLaunchIntentForPackage(context.getPackageName());\n- }\n- }\n-\n- if (actionLaunchIntent != null) {\n- actionLaunchIntent.putExtras(extras);\n- actionLaunchIntent.removeExtra(Constants.WZRK_ACTIONS);\n- actionLaunchIntent.putExtra(\"actionId\", id);\n- actionLaunchIntent.putExtra(\"autoCancel\", autoCancel);\n- actionLaunchIntent.putExtra(\"wzrk_c2a\", id);\n- actionLaunchIntent.putExtra(\"notificationId\", notificationId);\n-\n- actionLaunchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);\n- }\n-\n- PendingIntent actionIntent;\n- int requestCode = ((int) System.currentTimeMillis()) + i;\n- if (sendToCTIntentService) {\n- actionIntent = PendingIntent.getService(context, requestCode,\n- actionLaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n- } else {\n- actionIntent = PendingIntent.getActivity(context, requestCode,\n- actionLaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n- }\n- nb.addAction(icon, label, actionIntent);\n-\n- } catch (Throwable t) {\n- config.getLogger()\n- .debug(config.getAccountId(),\n- \"error adding notification action : \" + t.getLocalizedMessage());\n- }\n- }\n- }// Uncommon - END*/\n-\nnb = iNotificationRenderer.renderNotification(extras, context, nb, config, notificationId);\nif (nb == null) {// template renderer can return null if template type is null\nreturn;\n}\n- Notification n = nb.build();// Common use build() b\n- notificationManager.notify(notificationId, n);//cb\n+ Notification n = nb.build();\n+ notificationManager.notify(notificationId, n);\nconfig.getLogger().debug(config.getAccountId(), \"Rendered notification: \" + n.toString());//cb\n- // common not there in template - START\nString ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n(System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\n@@ -1292,6 +1087,5 @@ public class PushProviders implements CTPushProviderListener {\nreturn;\n}\nanalyticsManager.pushNotificationViewedEvent(extras);\n- //common not there in template - END\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(streamline_pn): remove unwanted code from PushProviders SDK-987 |
116,612 | 01.10.2021 16:04:12 | -19,080 | 5dade0ff6b944196757135754ca8780d76e9e2a9 | task(refactor): fix compile time error - Type mismatch: inferred type is MutableMap<String, Any> but Map<String, Object>? was expected, for kotlin sample app | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -30,22 +30,22 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n}\n\"02\" -> {\n//Record a Charged (Transactional) event\n- val chargeDetails = hashMapOf(\n+ val chargeDetails = hashMapOf<String, Any>(\n\"Amount\" to 300, \"Payment Mode\" to \"Credit card\",\n\"Charged ID\" to 24052013\n)\n- val item1 = hashMapOf(\n+ val item1 = hashMapOf<String, Any>(\n\"Product category\" to \"books\",\n\"Book name\" to \"The Millionaire next door\", \"Quantity\" to 1\n)\n- val item2 = hashMapOf(\n+ val item2 = hashMapOf<String, Any>(\n\"Product category\" to \"books\",\n\"Book name\" to \"Achieving inner zen\", \"Quantity\" to 1\n)\n- val item3 = hashMapOf(\n+ val item3 = hashMapOf<String, Any>(\n\"Product category\" to \"books\",\n\"Book name\" to \"Chuck it, let's do it\", \"Quantity\" to 5\n)\n@@ -256,7 +256,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n} ?: println(\"DisplayUnit Id is null\")\n}\n\"40\" -> {\n- val hashMap = hashMapOf(\n+ val hashMap = hashMapOf<String, Any>(\n\"text color\" to \"red\", \"msg count\" to 100, \"price\" to 100.50, \"is shown\" to true,\n\"json\" to \"\"\"{\"key\":\"val\",\"key2\":50}\"\"\"\n)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(refactor): fix compile time error - Type mismatch: inferred type is MutableMap<String, Any> but Map<String, Object>? was expected, for kotlin sample app SDK-981 |
116,616 | 05.10.2021 11:46:33 | -19,080 | 1842f8b5277f9d08d9b13f2d7ca4b642fa820f16 | task(SDK-1056) - Add ProductDisplay and Input box styles, Update PendingIntentFactory.kt | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PTLog.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/PTLog.java",
"diff": "@@ -49,7 +49,7 @@ public final class PTLog {\n}\n}\n- static void verbose(String message, Throwable t){\n+ public static void verbose(String message, Throwable t){\nif (getStaticDebugLevel() >= TemplateRenderer.LogLevel.VERBOSE.intValue()){\nLog.v(PTConstants.LOG_TAG,message,t);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -64,15 +64,15 @@ class TemplateRenderer : INotificationRenderer {\n// private DBHelper dbHelper;\nvar pt_timer_threshold = 0\n- private var pt_input_label: String? = null\n+ internal var pt_input_label: String? = null\nvar pt_input_feedback: String? = null\ninternal var pt_input_auto_open: String? = null\n- private var pt_dismiss_on_click: String? = null\n+ internal var pt_dismiss_on_click: String? = null\nvar pt_timer_end = 0\nprivate var pt_title_alt: String? = null\nprivate var pt_msg_alt: String? = null\nprivate var pt_big_img_alt: String? = null\n- private var pt_product_display_linear: String? = null\n+ internal var pt_product_display_linear: String? = null\ninternal var pt_meta_clr: String? = null\ninternal var pt_product_display_action_text_clr: String? = null\nprivate var pt_small_icon_clr: String? = null\n@@ -142,7 +142,7 @@ class TemplateRenderer : INotificationRenderer {\nTemplateType.FIVE_ICONS ->\nif (hasAll5IconNotifKeys())\n- return FiveIconStyle(this,extras).builderFromStyle(context, extras, notificationId, nb)\n+ return FiveIconStyle(this,extras).builderFromStyle(context, extras, notificationId, nb).setOngoing(true)\nTemplateType.PRODUCT_DISPLAY -> if (hasAllProdDispNotifKeys()) return renderProductDisplayNotification(\ncontext,\n@@ -200,7 +200,7 @@ class TemplateRenderer : INotificationRenderer {\nPTLog.debug(\"Rendering Zero Bezel Template Push Notification with extras - $extras\")\ntry {\ncontentViewBig = RemoteViews(context.packageName, R.layout.zero_bezel)// ZBBCV\n- setCustomContentViewBasicKeys(contentViewBig!!, context)\n+ setCustomContentViewBasicKeys(contentViewBig!!, context)// ZBBCV\nval textOnlySmallView = pt_small_view != null && pt_small_view == PTConstants.TEXT_ONLY\ncontentViewSmall = if (textOnlySmallView) {\nRemoteViews(context.packageName, R.layout.cv_small_text_only)// ZBTOSCV\n@@ -610,7 +610,7 @@ class TemplateRenderer : INotificationRenderer {\npt_title,\npIntent\n)\n- nb.setOngoing(true)//Not added yet.Check\n+ nb.setOngoing(true)\nvar imageCounter = 0\nfor (imageKey in imageList!!.indices) {\nif (imageKey == 0) {\n@@ -1377,7 +1377,7 @@ class TemplateRenderer : INotificationRenderer {\npt_timer_end * PTConstants.ONE_SECOND + PTConstants.ONE_SECOND\n} else {\nPTLog.debug(\"Not rendering notification Timer End value lesser than threshold (10 seconds) from current time: \" + PTConstants.PT_TIMER_END)\n- return null\n+ return null//TODO Check this\n}\n// renderer call first -------END--------\nsetCustomContentViewBasicKeys(contentViewTimer!!, context)// TBCV super init -> TSCV\n@@ -1435,7 +1435,7 @@ class TemplateRenderer : INotificationRenderer {\npt_title,\npIntent\n)\n- nb.setTimeoutAfter(timer_end.toLong())//not added yet.Check\n+ nb.setTimeoutAfter(timer_end.toLong())//TODO not added yet.Check\nsetCustomContentViewBigImage(contentViewTimer!!, pt_big_img)// TBCV init\nsetCustomContentViewSmallIcon(contentViewTimer!!)// TBCV super init -> TSCV\nsetCustomContentViewSmallIcon(contentViewTimerCollapsed!!)// TSCV init\n@@ -2101,7 +2101,7 @@ class TemplateRenderer : INotificationRenderer {\n}\n}\n- private fun setNotificationId(notificationId: Int): Int {\n+ private fun setNotificationId(notificationId: Int): Int {//TODO Check this\nvar notificationId = notificationId\nif (notificationId == Constants.EMPTY_NOTIFICATION_ID) {\nnotificationId = (Math.random() * 100).toInt()\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/Utils.java",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/Utils.java",
"diff": "@@ -77,7 +77,7 @@ public class Utils {\n@SuppressWarnings(\"unused\")\n- static Bitmap getNotificationBitmap(String icoPath, boolean fallbackToAppIcon,\n+ public static Bitmap getNotificationBitmap(String icoPath, boolean fallbackToAppIcon,\nfinal Context context)\nthrows NullPointerException {\n// If the icon path is not specified\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"diff": "@@ -62,6 +62,10 @@ class ManualCarouselContentView(context: Context, renderer: TemplateRenderer,ext\ntempImageList.size - 1\n)\n+ extras.putInt(PTConstants.PT_MANUAL_CAROUSEL_CURRENT, currentPosition)//TODO Check extras in ManualCarousel style being updated\n+ extras.putStringArrayList(PTConstants.PT_IMAGE_LIST, tempImageList)\n+ extras.putStringArrayList(PTConstants.PT_DEEPLINK_LIST, renderer.deepLinkList)\n+\nremoteView.setOnClickPendingIntent(\nR.id.rightArrowPos0,\nPendingIntentFactory.getPendingIntent(context,renderer.notificationId, extras,false,\n@@ -78,11 +82,6 @@ class ManualCarouselContentView(context: Context, renderer: TemplateRenderer,ext\nif (imageCounter < 2) {\nPTLog.debug(\"Need at least 2 images to display Manual Carousel, found - $imageCounter, not displaying the notification.\")\n}\n-\n-\n-// extras.putInt(PTConstants.PT_MANUAL_CAROUSEL_CURRENT, currentPosition)\n-// extras.putStringArrayList(PTConstants.PT_IMAGE_LIST, tempImageList)\n-// extras.putStringArrayList(PTConstants.PT_DEEPLINK_LIST, deepLinkList)\n}\nprivate fun setCustomContentViewMessageSummary(pt_msg_summary: String?) {\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"diff": "@@ -34,12 +34,15 @@ const val PRODUCT_DISPLAY_CONTENT_PENDING_INTENT = 20\nconst val PRODUCT_DISPLAY_DL1_PENDING_INTENT = 21\nconst val PRODUCT_DISPLAY_DL2_PENDING_INTENT = 22\nconst val PRODUCT_DISPLAY_DL3_PENDING_INTENT = 23\n-const val PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT = 24\n-const val PRODUCT_DISPLAY_DISMISS_PENDING_INTENT = 25\n-const val ZERO_BEZEL_CONTENT_PENDING_INTENT = 26\n-const val TIMER_CONTENT_PENDING_INTENT = 27\n-const val INPUT_BOX_NOTIFICATION_PENDING_INTENT = 28\n-const val INPUT_BOX_NOTIFICATION_REPLY__PENDING_INTENT = 29\n+const val PRODUCT_DISPLAY_CONTENT_SMALL1_PENDING_INTENT = 24\n+const val PRODUCT_DISPLAY_CONTENT_SMALL2_PENDING_INTENT = 25\n+const val PRODUCT_DISPLAY_CONTENT_SMALL3_PENDING_INTENT = 26\n+const val PRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT = 27\n+const val PRODUCT_DISPLAY_DISMISS_PENDING_INTENT = 28\n+const val ZERO_BEZEL_CONTENT_PENDING_INTENT = 29\n+const val TIMER_CONTENT_PENDING_INTENT = 30\n+const val INPUT_BOX_CONTENT_PENDING_INTENT = 31\n+const val INPUT_BOX_REPLY_PENDING_INTENT = 32\ninternal object PendingIntentFactory {\n@@ -48,7 +51,8 @@ internal object PendingIntentFactory {\n@JvmStatic\nfun setPendingIntent(\ncontext: Context, notificationId: Int, extras: Bundle, launchIntent: Intent,\n- dl: String?): PendingIntent{\n+ dl: String?\n+ ): PendingIntent {\nlaunchIntent.putExtras(extras)\nlaunchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\nif (dl != null) {\n@@ -77,8 +81,10 @@ internal object PendingIntentFactory {\n}\n@JvmStatic\n- fun getPendingIntent(context: Context, notificationId: Int, extras: Bundle,\n- isLauncher: Boolean,identifier: Int, renderer: TemplateRenderer): PendingIntent? {\n+ fun getPendingIntent(\n+ context: Context, notificationId: Int, extras: Bundle,\n+ isLauncher: Boolean, identifier: Int, renderer: TemplateRenderer\n+ ): PendingIntent? {\nif (isLauncher) {\nlaunchIntent = Intent(context, PTPushNotificationReceiver::class.java)\n@@ -90,7 +96,7 @@ internal object PendingIntentFactory {\nwhen (identifier) {\nBASIC_CONTENT_PENDING_INTENT, AUTO_CAROUSEL_CONTENT_PENDING_INTENT,\nMANUAL_CAROUSEL_CONTENT_PENDING_INTENT, ZERO_BEZEL_CONTENT_PENDING_INTENT,\n- TIMER_CONTENT_PENDING_INTENT-> {\n+ TIMER_CONTENT_PENDING_INTENT,PRODUCT_DISPLAY_CONTENT_PENDING_INTENT -> {\nreturn if (renderer.deepLinkList != null && renderer.deepLinkList!!.size > 0) {\nsetPendingIntent(\ncontext,\n@@ -126,7 +132,8 @@ internal object PendingIntentFactory {\nlaunchIntent.putExtras(extras)\nreturn setPendingIntent(\n- context, notificationId, extras, launchIntent, renderer.deepLinkList!![0])\n+ context, notificationId, extras, launchIntent, renderer.deepLinkList!![0]\n+ )\n}\nMANUAL_CAROUSEL_DISMISS_PENDING_INTENT -> {\n@@ -134,6 +141,16 @@ internal object PendingIntentFactory {\nreturn setDismissIntent(context, extras, dismissIntent)\n}\n+ RATING_CONTENT_PENDING_INTENT -> {\n+ return setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.pt_rating_default_dl\n+ )\n+ }\n+\nRATING_CLICK1_PENDING_INTENT -> {\nlaunchIntent.putExtra(\"click1\", true)\nlaunchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n@@ -250,6 +267,41 @@ internal object PendingIntentFactory {\nreturn PendingIntent.getBroadcast(context, requestCode, launchIntent, 0)\n}\n+ PRODUCT_DISPLAY_CONTENT_SMALL1_PENDING_INTENT -> {\n+ return setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![0]\n+ )\n+ }\n+\n+ PRODUCT_DISPLAY_CONTENT_SMALL2_PENDING_INTENT -> {\n+ return setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![1]\n+ )\n+ }\n+\n+ PRODUCT_DISPLAY_CONTENT_SMALL3_PENDING_INTENT -> {\n+ return setPendingIntent(\n+ context,\n+ notificationId,\n+ extras,\n+ launchIntent,\n+ renderer.deepLinkList!![2]\n+ )\n+ }\n+\n+ PRODUCT_DISPLAY_DISMISS_PENDING_INTENT -> {\n+ val dismissIntent = Intent(context, PushTemplateReceiver::class.java)\n+ return setDismissIntent(context, extras, dismissIntent)\n+ }\n+\nPRODUCT_DISPLAY_BUY_NOW_PENDING_INTENT -> {\nlaunchIntent.putExtra(PTConstants.PT_IMAGE_1, true)\nlaunchIntent.putExtra(PTConstants.PT_NOTIF_ID, notificationId)\n@@ -260,7 +312,7 @@ internal object PendingIntentFactory {\nreturn PendingIntent.getBroadcast(context, Random().nextInt(), launchIntent, 0)\n}\n- INPUT_BOX_NOTIFICATION_PENDING_INTENT -> {\n+ INPUT_BOX_CONTENT_PENDING_INTENT -> {\nreturn if (renderer.deepLinkList != null && renderer.deepLinkList!!.size > 0) {\nsetPendingIntent(\n@@ -275,7 +327,7 @@ internal object PendingIntentFactory {\n}\n}\n- INPUT_BOX_NOTIFICATION_REPLY__PENDING_INTENT -> {\n+ INPUT_BOX_REPLY_PENDING_INTENT -> {\nlaunchIntent.putExtra(PTConstants.PT_INPUT_FEEDBACK, renderer.pt_input_feedback)\nlaunchIntent.putExtra(PTConstants.PT_INPUT_AUTO_OPEN, renderer.pt_input_auto_open)\nlaunchIntent.putExtra(\"config\", renderer.config)\n@@ -295,5 +347,4 @@ internal object PendingIntentFactory {\nelse -> throw IllegalArgumentException(\"invalid pendingIntentType\")\n}\n}\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearBigContentView.kt",
"diff": "@@ -10,7 +10,7 @@ import com.clevertap.android.pushtemplates.*\nimport java.util.ArrayList\nopen class ProductDisplayLinearBigContentView(context: Context,\n- layoutId: Int=R.layout.product_display_linear_expanded,renderer: TemplateRenderer,extras: Bundle):\n+ renderer: TemplateRenderer,extras: Bundle,layoutId: Int=R.layout.product_display_linear_expanded):\nContentView(context,layoutId ,renderer) {\ninit {\n@@ -21,7 +21,7 @@ open class ProductDisplayLinearBigContentView(context: Context,\nsetCustomContentViewButtonLabel(R.id.product_action,renderer.pt_product_display_action)\nsetCustomContentViewButtonColour(R.id.product_action,renderer.pt_product_display_action_clr)\nsetCustomContentViewButtonText(R.id.product_action,renderer.pt_product_display_action_text_clr)\n- setImageList()\n+ setImageList(extras)\nsetCustomContentViewDotSep()\nsetCustomContentViewSmallIcon()\n@@ -45,7 +45,7 @@ open class ProductDisplayLinearBigContentView(context: Context,\n}\n- internal fun setImageList(){\n+ internal fun setImageList(extras: Bundle) {\nvar imageCounter = 0\nvar isFirstImageOk = false\nval smallImageLayoutIds = ArrayList<Int>()\n@@ -79,6 +79,12 @@ open class ProductDisplayLinearBigContentView(context: Context,\n}\n}\n+ extras.putStringArrayList(PTConstants.PT_IMAGE_LIST, tempImageList)\n+ extras.putStringArrayList(PTConstants.PT_DEEPLINK_LIST, renderer.deepLinkList)\n+ extras.putStringArrayList(PTConstants.PT_BIGTEXT_LIST, renderer.bigTextList)\n+ extras.putStringArrayList(PTConstants.PT_SMALLTEXT_LIST, renderer.smallTextList)\n+ extras.putStringArrayList(PTConstants.PT_PRICE_LIST, renderer.priceList)\n+\nif (imageCounter <= 1) {\nPTLog.debug(\"2 or more images are not retrievable, not displaying the notification.\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"diff": "package com.clevertap.android.pushtemplates.content\nimport android.content.Context\n+import android.os.Bundle\nimport android.view.View\nimport com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\nimport java.util.ArrayList\n-class ProductDisplayLinearSmallContentView(context: Context, renderer: TemplateRenderer):\n+class ProductDisplayLinearSmallContentView(context: Context,\n+ renderer: TemplateRenderer, extras: Bundle\n+):\nContentView(context, R.layout.product_display_linear_collapsed, renderer) {\ninit {\n@@ -15,8 +18,30 @@ class ProductDisplayLinearSmallContentView(context: Context, renderer: TemplateR\nsetCustomContentViewMessageColour(renderer.pt_msg_clr)\nsetCustomContentViewCollapsedBackgroundColour(renderer.pt_bg)\nsetCustomContentViewLargeIcon(renderer.pt_large_icon)\n-\nsetImageList()\n+\n+ remoteView.setOnClickPendingIntent(\n+ R.id.small_image1_collapsed,\n+ PendingIntentFactory.getPendingIntent(context,renderer.notificationId,extras,\n+ true,PRODUCT_DISPLAY_CONTENT_SMALL1_PENDING_INTENT,renderer)\n+ )\n+\n+ if (renderer.deepLinkList!!.size >= 2){\n+ remoteView.setOnClickPendingIntent(\n+ R.id.small_image2_collapsed,\n+ PendingIntentFactory.getPendingIntent(context,renderer.notificationId,extras,\n+ true,PRODUCT_DISPLAY_CONTENT_SMALL2_PENDING_INTENT,renderer)\n+ )\n+ }\n+\n+ if (renderer.deepLinkList!!.size >= 3){\n+ remoteView.setOnClickPendingIntent(\n+ R.id.small_image3_collapsed,\n+ PendingIntentFactory.getPendingIntent(context,renderer.notificationId,extras,\n+ true,PRODUCT_DISPLAY_CONTENT_SMALL3_PENDING_INTENT,renderer)\n+ )\n+ }\n+\n}\ninternal fun setImageList(){\n@@ -45,7 +70,4 @@ class ProductDisplayLinearSmallContentView(context: Context, renderer: TemplateR\n}\n}\n}\n-\n-\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayNonLinearBigContentView.kt",
"diff": "@@ -8,7 +8,7 @@ import com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\nclass ProductDisplayNonLinearBigContentView(context: Context, renderer: TemplateRenderer,extras: Bundle):\n- ProductDisplayLinearBigContentView(context, R.layout.product_display_template, renderer,extras) {\n+ ProductDisplayLinearBigContentView(context, renderer,extras, R.layout.product_display_template) {\ninit {\nif (renderer.smallTextList!!.isNotEmpty())\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerBigContentView.kt",
"diff": "@@ -9,7 +9,7 @@ import com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\n-class TimerBigContentView(context: Context,timer_end: Int, renderer: TemplateRenderer):\n+class TimerBigContentView(context: Context,timer_end: Int?, renderer: TemplateRenderer):\nTimerSmallContentView(context, R.layout.timer, renderer) {\n@@ -17,7 +17,7 @@ class TimerBigContentView(context: Context,timer_end: Int, renderer: TemplateRen\nsetCustomContentViewMessageSummary(renderer.pt_msg_summary)\nremoteView.setChronometer(\nR.id.chronometer,\n- SystemClock.elapsedRealtime() + timer_end,\n+ SystemClock.elapsedRealtime() + timer_end!!,\nnull,\ntrue\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerSmallContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/TimerSmallContentView.kt",
"diff": "@@ -8,7 +8,7 @@ import com.clevertap.android.pushtemplates.R\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\n-open class TimerSmallContentView(context: Context, timer_end: Int,renderer: TemplateRenderer):\n+open class TimerSmallContentView(context: Context, timer_end: Int?,renderer: TemplateRenderer):\nContentView(context, R.layout.timer_collapsed,renderer) {\ninit {\n@@ -23,7 +23,7 @@ open class TimerSmallContentView(context: Context, timer_end: Int,renderer: Temp\nsetCustomContentViewMessageColour(renderer.pt_msg_clr)\nremoteView.setChronometer(\nR.id.chronometer,\n- SystemClock.elapsedRealtime() + timer_end,\n+ SystemClock.elapsedRealtime() + timer_end!!,\nnull,\ntrue\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ZeroBezelBigContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ZeroBezelBigContentView.kt",
"diff": "@@ -12,6 +12,7 @@ class ZeroBezelBigContentView(context: Context, renderer: TemplateRenderer):\nContentView(context, R.layout.zero_bezel,renderer) {\ninit {\n+ setCustomContentViewBasicKeys()\nsetCustomContentViewTitle(renderer.pt_title)\nsetCustomContentViewMessage(renderer.pt_msg)\nsetCustomContentViewMessageSummary(renderer.pt_msg_summary)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/InputBoxStyle.kt",
"diff": "+package com.clevertap.android.pushtemplates.styles\n+\n+import android.app.PendingIntent\n+import android.content.Context\n+import android.content.Intent\n+import android.net.Uri\n+import android.os.Bundle\n+import android.widget.RemoteViews\n+import androidx.core.app.NotificationCompat\n+import androidx.core.app.RemoteInput\n+import com.clevertap.android.pushtemplates.*\n+import com.clevertap.android.pushtemplates.content.INPUT_BOX_CONTENT_PENDING_INTENT\n+import com.clevertap.android.pushtemplates.content.INPUT_BOX_REPLY_PENDING_INTENT\n+import com.clevertap.android.pushtemplates.content.PendingIntentFactory\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\n+\n+class InputBoxStyle(private var renderer: TemplateRenderer): Style(renderer) {\n+\n+ override fun setNotificationBuilderBasics(\n+ notificationBuilder: NotificationCompat.Builder,\n+ contentViewSmall: RemoteViews?,\n+ contentViewBig: RemoteViews?,\n+ pt_title: String?,\n+ pIntent: PendingIntent?,\n+ dIntent: PendingIntent?\n+ ): NotificationCompat.Builder {\n+ return super.setNotificationBuilderBasics(notificationBuilder, contentViewSmall,\n+ contentViewBig, pt_title, pIntent, dIntent).setContentText(renderer.pt_msg)\n+ }\n+\n+ override fun makeSmallContentView(context: Context, renderer: TemplateRenderer): RemoteViews? {\n+ return null\n+ }\n+\n+ override fun makeBigContentView(context: Context, renderer: TemplateRenderer): RemoteViews? {\n+ return null\n+ }\n+\n+ override fun builderFromStyle(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int,\n+ nb: NotificationCompat.Builder\n+ ): NotificationCompat.Builder {\n+ var inputBoxNotificationBuilder = super.builderFromStyle(context, extras, notificationId, nb)\n+ inputBoxNotificationBuilder = setStandardViewBigImageStyle(renderer.pt_big_img, extras,\n+ context, inputBoxNotificationBuilder)\n+ if (renderer.pt_input_label != null && renderer.pt_input_label!!.isNotEmpty()) {\n+ //Initialise RemoteInput\n+ val remoteInput = RemoteInput.Builder(PTConstants.PT_INPUT_KEY)\n+ .setLabel(renderer.pt_input_label)\n+ .build()\n+\n+ //Notification Action with RemoteInput instance added.\n+ val replyAction = NotificationCompat.Action.Builder(\n+ android.R.drawable.sym_action_chat, renderer.pt_input_label, PendingIntentFactory.\n+ getPendingIntent(context,notificationId,extras,false,\n+ INPUT_BOX_REPLY_PENDING_INTENT,renderer))\n+ .addRemoteInput(remoteInput)\n+ .setAllowGeneratedReplies(true)\n+ .build()\n+\n+ //Notification.Action instance added to Notification Builder.\n+ inputBoxNotificationBuilder.addAction(replyAction)\n+ }\n+ if (renderer.pt_dismiss_on_click != null && renderer.pt_dismiss_on_click!!.isNotEmpty()){\n+ extras.putString(PTConstants.PT_DISMISS_ON_CLICK, renderer.pt_dismiss_on_click)\n+ }\n+ setActionButtons(context, extras, notificationId, inputBoxNotificationBuilder)\n+ return inputBoxNotificationBuilder\n+ }\n+\n+ private fun setActionButtons(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int,\n+ nb: NotificationCompat.Builder\n+ ) {\n+ var clazz: Class<*>? = null\n+ try {\n+ clazz = Class.forName(\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\")\n+ } catch (ex: ClassNotFoundException) {\n+ PTLog.debug(\"No Intent Service found\")\n+ }\n+ val isPTIntentServiceAvailable = com.clevertap.android.sdk.Utils.isServiceAvailable(context, clazz)\n+ if (renderer.actions != null && renderer.actions!!.length() > 0) {\n+ for (i in 0 until renderer.actions!!.length()) {\n+ try {\n+ val action = renderer.actions!!.getJSONObject(i)\n+ val label = action.optString(\"l\")\n+ val dl = action.optString(\"dl\")\n+ val ico = action.optString(PTConstants.PT_NOTIF_ICON)\n+ val id = action.optString(\"id\")\n+ val autoCancel = action.optBoolean(\"ac\", true)\n+ if (label.isEmpty() || id.isEmpty()) {\n+ PTLog.debug(\"not adding push notification action: action label or id missing\")\n+ continue\n+ }\n+ var icon = 0\n+ if (ico.isNotEmpty()) {\n+ try {\n+ icon = context.resources.getIdentifier(\n+ ico,\n+ \"drawable\",\n+ context.packageName\n+ )\n+ } catch (t: Throwable) {\n+ PTLog.debug(\"unable to add notification action icon: \" + t.localizedMessage)\n+ }\n+ }\n+ val sendToPTIntentService = autoCancel && isPTIntentServiceAvailable\n+ var actionLaunchIntent: Intent?\n+ if (sendToPTIntentService) {\n+ actionLaunchIntent = Intent(CTNotificationIntentService.MAIN_ACTION)\n+ actionLaunchIntent.setPackage(context.packageName)\n+ actionLaunchIntent.putExtra(\n+ PTConstants.PT_TYPE,\n+ CTNotificationIntentService.TYPE_BUTTON_CLICK\n+ )\n+ if (dl.isNotEmpty()) {\n+ actionLaunchIntent.putExtra(\"dl\", dl)\n+ }\n+ } else {\n+ actionLaunchIntent = if (dl.isNotEmpty()) {\n+ Intent(Intent.ACTION_VIEW, Uri.parse(dl))\n+ } else {\n+ context.packageManager.getLaunchIntentForPackage(context.packageName)\n+ }\n+ }\n+ if (actionLaunchIntent != null) {\n+ actionLaunchIntent.putExtras(extras)\n+ actionLaunchIntent.removeExtra(Constants.WZRK_ACTIONS)\n+ actionLaunchIntent.putExtra(PTConstants.PT_ACTION_ID, id)\n+ actionLaunchIntent.putExtra(\"autoCancel\", autoCancel)\n+ actionLaunchIntent.putExtra(\"wzrk_c2a\", id)\n+ actionLaunchIntent.putExtra(\"notificationId\", notificationId)\n+ actionLaunchIntent.flags =\n+ Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP\n+ }\n+ var actionIntent: PendingIntent? = null\n+ val requestCode = System.currentTimeMillis().toInt() + i\n+ actionIntent = if (sendToPTIntentService) {\n+ PendingIntent.getService(\n+ context, requestCode,\n+ actionLaunchIntent!!, PendingIntent.FLAG_UPDATE_CURRENT\n+ )\n+ } else {\n+ PendingIntent.getActivity(\n+ context, requestCode,\n+ actionLaunchIntent, PendingIntent.FLAG_UPDATE_CURRENT\n+ )\n+ }\n+ nb.addAction(icon, label, actionIntent)\n+ } catch (t: Throwable) {\n+ PTLog.debug(\"error adding notification action : \" + t.localizedMessage)\n+ }\n+ }\n+ }\n+ }\n+\n+ private fun setStandardViewBigImageStyle(\n+ pt_big_img: String?,\n+ extras: Bundle,\n+ context: Context,\n+ notificationBuilder: NotificationCompat.Builder\n+ ): NotificationCompat.Builder {\n+ var bigPictureStyle: NotificationCompat.Style\n+ if (pt_big_img != null && pt_big_img.startsWith(\"http\")) {\n+ try {\n+ val bpMap = Utils.getNotificationBitmap(pt_big_img, false, context)\n+ ?: throw Exception(\"Failed to fetch big picture!\")\n+ bigPictureStyle = if (extras.containsKey(PTConstants.PT_MSG_SUMMARY)) {\n+ val summaryText = renderer.pt_msg_summary\n+ NotificationCompat.BigPictureStyle()\n+ .setSummaryText(summaryText)\n+ .bigPicture(bpMap)\n+ } else {\n+ NotificationCompat.BigPictureStyle()\n+ .setSummaryText(renderer.pt_msg)\n+ .bigPicture(bpMap)\n+ }\n+ } catch (t: Throwable) {\n+ bigPictureStyle = NotificationCompat.BigTextStyle()\n+ .bigText(renderer.pt_msg)\n+ PTLog.verbose(\n+ \"Falling back to big text notification, couldn't fetch big picture\",\n+ t\n+ )\n+ }\n+ } else {\n+ bigPictureStyle = NotificationCompat.BigTextStyle()\n+ .bigText(renderer.pt_msg)\n+ }\n+ notificationBuilder.setStyle(bigPictureStyle)\n+ return notificationBuilder\n+ }\n+\n+ override fun makePendingIntent(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int\n+ ): PendingIntent? {\n+ return PendingIntentFactory.getPendingIntent(context,notificationId,extras,true,\n+ INPUT_BOX_CONTENT_PENDING_INTENT,renderer\n+ )\n+ }\n+\n+ override fun makeDismissIntent(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int\n+ ): PendingIntent? {\n+ return null\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/ProductDisplayStyle.kt",
"diff": "+package com.clevertap.android.pushtemplates.styles\n+\n+import android.app.PendingIntent\n+import android.content.Context\n+import android.os.Bundle\n+import android.widget.RemoteViews\n+import com.clevertap.android.pushtemplates.TemplateRenderer\n+import com.clevertap.android.pushtemplates.content.*\n+import com.clevertap.android.pushtemplates.content.PendingIntentFactory\n+\n+class ProductDisplayStyle(private var renderer: TemplateRenderer, private var extras: Bundle): Style(renderer) {\n+ override fun makeSmallContentView(context: Context, renderer: TemplateRenderer): RemoteViews {\n+ return if (renderer.pt_product_display_linear == null || renderer.pt_product_display_linear!!.isEmpty()) {\n+ ProductDisplayNonLinearSmallContentView(context, renderer).remoteView\n+ }else{\n+ ProductDisplayLinearSmallContentView(context, renderer,extras).remoteView\n+ }\n+ }\n+\n+ override fun makeBigContentView(context: Context, renderer: TemplateRenderer): RemoteViews {\n+ return if (renderer.pt_product_display_linear == null || renderer.pt_product_display_linear!!.isEmpty()) {\n+ ProductDisplayNonLinearBigContentView(context, renderer, extras).remoteView\n+ }else{\n+ ProductDisplayLinearBigContentView(context,renderer, extras).remoteView\n+ }\n+ }\n+\n+ override fun makePendingIntent(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int\n+ ): PendingIntent? {\n+ return PendingIntentFactory.getPendingIntent(context,notificationId,extras,true,\n+ PRODUCT_DISPLAY_CONTENT_PENDING_INTENT,renderer\n+ )\n+ }\n+\n+ override fun makeDismissIntent(\n+ context: Context,\n+ extras: Bundle,\n+ notificationId: Int\n+ ): PendingIntent? {\n+ return PendingIntentFactory.getPendingIntent(context,notificationId,extras,false,\n+ PRODUCT_DISPLAY_DISMISS_PENDING_INTENT,renderer\n+ )\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/Style.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/Style.kt",
"diff": "@@ -10,10 +10,10 @@ import com.clevertap.android.pushtemplates.TemplateRenderer\nabstract class Style(private var renderer: TemplateRenderer) {\n- protected fun setNotificationBuilderBasics(\n+ protected open fun setNotificationBuilderBasics(\nnotificationBuilder: NotificationCompat.Builder,\n- contentViewSmall: RemoteViews,\n- contentViewBig: RemoteViews,\n+ contentViewSmall: RemoteViews?,\n+ contentViewBig: RemoteViews?,\npt_title: String?,\npIntent: PendingIntent?,\ndIntent: PendingIntent? = null\n@@ -21,9 +21,13 @@ abstract class Style(private var renderer: TemplateRenderer) {\nif (dIntent != null){\nnotificationBuilder.setDeleteIntent(dIntent)\n}\n- return notificationBuilder/*.setSmallIcon(smallIcon)TODO Check this*/\n- .setCustomContentView(contentViewSmall)\n- .setCustomBigContentView(contentViewBig)\n+ if (contentViewSmall != null){\n+ notificationBuilder.setCustomContentView(contentViewSmall)\n+ }\n+ if (contentViewBig != null){\n+ notificationBuilder.setCustomBigContentView(contentViewBig)\n+ }\n+ return notificationBuilder.setSmallIcon(renderer.smallIcon)\n.setContentTitle(Html.fromHtml(pt_title))\n.setContentIntent(pIntent)\n.setVibrate(longArrayOf(0L))\n@@ -31,15 +35,15 @@ abstract class Style(private var renderer: TemplateRenderer) {\n.setAutoCancel(true)\n}\n- protected abstract fun makeSmallContentView(context: Context,renderer: TemplateRenderer): RemoteViews\n+ protected abstract fun makeSmallContentView(context: Context,renderer: TemplateRenderer): RemoteViews?\n- protected abstract fun makeBigContentView(context: Context,renderer: TemplateRenderer): RemoteViews\n+ protected abstract fun makeBigContentView(context: Context,renderer: TemplateRenderer): RemoteViews?\nprotected abstract fun makePendingIntent(context: Context, extras: Bundle, notificationId: Int): PendingIntent?\nprotected abstract fun makeDismissIntent(context: Context, extras: Bundle, notificationId: Int): PendingIntent?\n- fun builderFromStyle(context: Context,extras: Bundle,notificationId:Int,\n+ open fun builderFromStyle(context: Context,extras: Bundle,notificationId:Int,\nnb: NotificationCompat.Builder): NotificationCompat.Builder{\nreturn setNotificationBuilderBasics(nb,makeSmallContentView(context, renderer),makeBigContentView(context, renderer),\nrenderer.pt_title,makePendingIntent(context,extras,notificationId),\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/TimerStyle.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/TimerStyle.kt",
"diff": "@@ -5,17 +5,25 @@ import android.content.Context\nimport android.os.Bundle\nimport android.widget.RemoteViews\nimport com.clevertap.android.pushtemplates.PTConstants\n+import com.clevertap.android.pushtemplates.PTLog\nimport com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.content.*\nimport com.clevertap.android.pushtemplates.content.PendingIntentFactory\nclass TimerStyle(private var renderer: TemplateRenderer, private var extras: Bundle): Style(renderer) {\n- override fun makeSmallContentView(context: Context, renderer: TemplateRenderer): RemoteViews {\n+\n+ override fun makeSmallContentView(context: Context, renderer: TemplateRenderer): RemoteViews? {\n+ return if (getTimerEnd() == null)\n+ null\n+ else\nreturn TimerSmallContentView(context,getTimerEnd(),renderer).remoteView\n}\n- override fun makeBigContentView(context: Context, renderer: TemplateRenderer): RemoteViews {\n- return TimerBigContentView(context,getTimerEnd(),renderer).remoteView\n+ override fun makeBigContentView(context: Context, renderer: TemplateRenderer): RemoteViews? {\n+ return if (getTimerEnd() == null)\n+ null\n+ else\n+ TimerBigContentView(context,getTimerEnd(),renderer).remoteView\n}\noverride fun makePendingIntent(\n@@ -38,18 +46,15 @@ class TimerStyle(private var renderer: TemplateRenderer, private var extras: Bun\n@Suppress(\"LocalVariableName\")\n- private fun getTimerEnd(): Int{\n+ private fun getTimerEnd(): Int?{//Boolean\nvar timer_end: Int? = null\nif (renderer.pt_timer_threshold != -1 && renderer.pt_timer_threshold >= PTConstants.PT_TIMER_MIN_THRESHOLD) {\ntimer_end = renderer.pt_timer_threshold * PTConstants.ONE_SECOND + PTConstants.ONE_SECOND\n}else if (renderer.pt_timer_end >= PTConstants.PT_TIMER_MIN_THRESHOLD) {\ntimer_end = renderer.pt_timer_end * PTConstants.ONE_SECOND + PTConstants.ONE_SECOND\n+ }else {\n+ PTLog.debug(\"Not rendering notification Timer End value lesser than threshold (10 seconds) from current time: \" + PTConstants.PT_TIMER_END)\n}\n-\n-// else {\n-//// PTLog.debug(\"Not rendering notification Timer End value lesser than threshold (10 seconds) from current time: \" + Constants.PT_TIMER_END)\n-//// return null\n-//// }\n- return timer_end!!\n+ return timer_end\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/ZeroBezelStyle.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/styles/ZeroBezelStyle.kt",
"diff": "@@ -31,7 +31,7 @@ class ZeroBezelStyle(private var renderer: TemplateRenderer): Style(renderer) {\nnotificationId: Int\n): PendingIntent? {\nreturn PendingIntentFactory.getPendingIntent(context,notificationId,extras,true,\n- RATING_CONTENT_PENDING_INTENT,renderer\n+ ZERO_BEZEL_CONTENT_PENDING_INTENT,renderer\n)\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Add ProductDisplay and Input box styles, Update PendingIntentFactory.kt |
116,612 | 12.10.2021 12:42:57 | -19,080 | 4bcddf543ef2a87a4bc76193eae7c6abaa9160d3 | task(android12_support): Update manifest to support exported attribute | [
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/src/main/AndroidManifest.xml",
"new_path": "clevertap-geofence/src/main/AndroidManifest.xml",
"diff": "<receiver android:name=\".CTLocationUpdateReceiver\" />\n- <receiver android:name=\".CTGeofenceBootReceiver\">\n+ <receiver\n+ android:name=\".CTGeofenceBootReceiver\"\n+ android:exported=\"true\">\n<intent-filter>\n<action android:name=\"android.intent.action.BOOT_COMPLETED\" />\n</intent-filter>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(android12_support): Update manifest to support exported attribute SDK-1113 |
116,616 | 12.10.2021 13:37:18 | -19,080 | 4e61bd096f1b8d6f516212ebe432f397779f3e4e | task(SDK-1056) - Update BigImageContentView.kt, AutoCarouselContentView.kt, PendingIntentFactory.kt and PDLSCV | [
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/AutoCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/AutoCarouselContentView.kt",
"diff": "@@ -10,7 +10,7 @@ import com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\nclass AutoCarouselContentView(context: Context, renderer: TemplateRenderer):\n- SmallContentView(context,renderer,R.layout.auto_carousel,) {\n+ BigImageContentView(context,renderer,R.layout.auto_carousel) {\ninit {\nsetCustomContentViewMessageSummary(renderer.pt_msg_summary)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/BigImageContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/BigImageContentView.kt",
"diff": "@@ -10,11 +10,20 @@ import com.clevertap.android.pushtemplates.TemplateRenderer\nimport com.clevertap.android.pushtemplates.Utils\nopen class BigImageContentView(context: Context,renderer: TemplateRenderer,layoutId: Int=R.layout.image_only_big):\n- SmallContentView(context, renderer, layoutId) {\n+ ContentView(context, layoutId, renderer) {\ninit {\n+ setCustomContentViewBasicKeys()\n+ setCustomContentViewTitle(renderer.pt_title)\n+ setCustomContentViewMessage(renderer.pt_msg)\n+ setCustomContentViewExpandedBackgroundColour(renderer.pt_bg)\n+ setCustomContentViewTitleColour(renderer.pt_title_clr)\n+ setCustomContentViewMessageColour(renderer.pt_msg_clr)\nsetCustomContentViewMessageSummary(renderer.pt_msg_summary)\n+ setCustomContentViewSmallIcon()\n+ setCustomContentViewDotSep()\nsetCustomContentViewBigImage(renderer.pt_big_img)\n+ setCustomContentViewLargeIcon(renderer.pt_large_icon)\n}\nprivate fun setCustomContentViewMessageSummary(pt_msg_summary: String?) {\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ManualCarouselContentView.kt",
"diff": "@@ -10,7 +10,7 @@ import com.clevertap.android.pushtemplates.*\nimport java.util.ArrayList\nclass ManualCarouselContentView(context: Context, renderer: TemplateRenderer,extras: Bundle):\n- SmallContentView(context, renderer, R.layout.manual_carousel) {\n+ BigImageContentView(context, renderer, R.layout.manual_carousel) {\ninit {\n@@ -53,11 +53,11 @@ class ManualCarouselContentView(context: Context, renderer: TemplateRenderer,ext\nignoreCase = true\n)\n) {\n- renderer.contentViewManualCarousel!!.setViewVisibility(R.id.carousel_image_right, View.GONE)\n- renderer.contentViewManualCarousel!!.setViewVisibility(R.id.carousel_image_left, View.GONE)\n+ remoteView.setViewVisibility(R.id.carousel_image_right, View.GONE)\n+ remoteView.setViewVisibility(R.id.carousel_image_left, View.GONE)\n}\n- renderer.contentViewManualCarousel!!.setDisplayedChild(R.id.carousel_image_right, 1)\n- renderer.contentViewManualCarousel!!.setDisplayedChild(\n+ remoteView.setDisplayedChild(R.id.carousel_image_right, 1)\n+ remoteView.setDisplayedChild(\nR.id.carousel_image_left,\ntempImageList.size - 1\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/PendingIntentFactory.kt",
"diff": "@@ -232,6 +232,10 @@ internal object PendingIntentFactory {\nreturn PendingIntent.getBroadcast(context, reqCode, launchIntent, 0)\n}\n+ FIVE_ICON_CONTENT_PENDING_INTENT -> {\n+ return setPendingIntent(context, notificationId, extras, launchIntent, null)\n+ }\n+\nFIVE_ICON_CLOSE_PENDING_INTENT -> {\nval reqCode = Random().nextInt()\nlaunchIntent.putExtra(\"close\", true)\n"
},
{
"change_type": "MODIFY",
"old_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"new_path": "pushTemplates/src/main/java/com/clevertap/android/pushtemplates/content/ProductDisplayLinearSmallContentView.kt",
"diff": "@@ -11,7 +11,7 @@ import java.util.ArrayList\nclass ProductDisplayLinearSmallContentView(context: Context,\nrenderer: TemplateRenderer, extras: Bundle\n):\n- ContentView(context, R.layout.product_display_linear_collapsed, renderer) {\n+ SmallContentView(context, renderer, R.layout.product_display_linear_collapsed) {\ninit {\nsetCustomContentViewMessage(renderer.pt_msg)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1056) - Update BigImageContentView.kt, AutoCarouselContentView.kt, PendingIntentFactory.kt and PDLSCV |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.