author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
116,621 | 22.11.2019 17:34:01 | -19,080 | c08e96e5a3cacc6bd37d325467407803a7749fdb | Modified AdUnit model changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -45,7 +45,7 @@ import com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.ads.AdListener;\nimport com.clevertap.android.sdk.ads.AdUnitController;\n-import com.clevertap.android.sdk.ads.CTAdUnit;\n+import com.clevertap.android.sdk.ads.model.CTAdUnit;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -7369,10 +7369,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param response\n*/\nprivate void processAdUnitsResponse(JSONObject response) {\n- if (getConfig().isAnalyticsOnly()) {\n- getConfigLogger().verbose(getAccountId(), \"CleverTap instance is configured to analytics only, not processing Ad messages\");\n- return;\n- }\ngetConfigLogger().verbose(getAccountId(), \"Ad: Processing response\");\n@@ -7390,7 +7386,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* prepares the ad Units using the JSON response\n*\n- * @param messages\n+ * @param messages - Json array of Ad items\n*/\nprivate void parseAdUnits(JSONArray messages) {\nsynchronized (adControllerLock) {\n@@ -7406,35 +7402,40 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Notify the registered ad listener about the running ad campaigns\n*\n- * @param adUnits\n+ * @param adUnits - Array of AdUnits\n*/\n- private void notifyAdUnitsLoaded(ArrayList<CTAdUnit> adUnits) {\n+ private void notifyAdUnitsLoaded(final ArrayList<CTAdUnit> adUnits) {\nif (adUnits != null && !adUnits.isEmpty()) {\nif (adListenerWeakReference != null && adListenerWeakReference.get() != null) {\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\nadListenerWeakReference.get().onAdUnitsLoaded(adUnits);\n}\n+ });\n+ }\n}\n}\n/**\n* Register listener to receive the list of running ad campaign ids\n*\n- * @param adListener\n+ * @param adListener- Listener to set Ad unit callback\n*/\n- public void registerAdListener(@NonNull AdListener adListener) {\n+ public void registerAdListener(AdListener adListener) {\nif (adListener != null) {\nadListenerWeakReference = new WeakReference<>(adListener);\n}\n}\n/**\n- * API to get the Custom Key Value data associated with an adUnit.\n+ * API to get the Ad Unit for Ad ID\n*\n- * @param adID\n- * @return\n+ * @param adID- Ad Identifier\n+ * @return - CTAdUnit and can be null\n*/\n- public @Nullable\n- HashMap<String, String> getAdUnitForID(@NonNull String adID) {\n+ public CTAdUnit getAdUnitForID(String adID) {\n+ //TODO remove before release\nif (mAdController != null) {\nmAdController.getAdUnitForID(adID);\n}\n@@ -7447,7 +7448,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param adID - Unique id of the Ad Unit\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n- public void recordAdUnitViewedEventForID(String adID) {\n+ public void pushAdViewedEventForID(String adID) {\nJSONObject event = new JSONObject();\ntry {\n@@ -7477,7 +7478,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param adID - Unique id of the Ad Unit\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n- public void recordAdUnitClickedEventForID(String adID) {\n+ public void pushAdClickedEventForID(String adID) {\nJSONObject event = new JSONObject();\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -10,6 +10,8 @@ import android.graphics.drawable.Drawable;\nimport android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\nimport android.os.Bundle;\n+import android.os.Handler;\n+import android.os.Looper;\nimport android.telephony.TelephonyManager;\nimport org.json.JSONArray;\n@@ -263,4 +265,11 @@ public final class Utils {\n}\nreturn true;\n}\n+\n+ static void runOnUiThread(Runnable runnable) {\n+ if (runnable != null) {\n+ Handler mainHandler = new Handler(Looper.getMainLooper());\n+ mainHandler.post(runnable);\n+ }\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdConstants.java",
"diff": "+package com.clevertap.android.sdk.ads;\n+\n+import android.support.annotation.NonNull;\n+\n+public interface AdConstants {\n+\n+ enum CtAdType {\n+\n+ CUSTOM_KEY_VALUE(\"custom-key-value\");\n+\n+ private final String adType;\n+\n+ CtAdType(String type) {\n+ this.adType = type;\n+ }\n+\n+ public static CtAdType type(String type) {\n+\n+ if (\"custom-key-value\".equalsIgnoreCase(type)) {\n+ return CUSTOM_KEY_VALUE;\n+ }\n+ return null;\n+ }\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ return adType;\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdListener.java",
"diff": "package com.clevertap.android.sdk.ads;\n+import com.clevertap.android.sdk.ads.model.CTAdUnit;\n+\nimport java.util.ArrayList;\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdUnitController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdUnitController.java",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk.ads;\nimport android.text.TextUtils;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.ads.model.CTAdUnit;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n@@ -32,7 +33,7 @@ public class AdUnitController {\nfor (int i = 0; i < messages.length(); i++) {\n//parse each ad Unit\nCTAdUnit item = CTAdUnit.toAdUnit((JSONObject) messages.get(i));\n- if (item != null && !TextUtils.isEmpty(item.getError())) {\n+ if (item != null && TextUtils.isEmpty(item.getError())) {\nitems.put(item.getAdID(), item);\nlist.add(item);\n} else {\n@@ -53,12 +54,14 @@ public class AdUnitController {\n/**\n* API to get the AdUnit using the adID\n*\n- * @param adID\n- * @return\n+ * @param adID - Ad ID\n+ * @return CTAdUnit\n*/\npublic CTAdUnit getAdUnitForID(String adID) {\nif (!TextUtils.isEmpty(adID)) {\nreturn items.get(adID);\n+ } else {\n+ Logger.d(\"Can't return Ad Unit, id was null\");\n}\nreturn null;\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/CTAdUnit.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.ads;\n-\n-import android.os.Parcel;\n-import android.os.Parcelable;\n-import android.text.TextUtils;\n-\n-import com.clevertap.android.sdk.Constants;\n-\n-import org.json.JSONException;\n-import org.json.JSONObject;\n-\n-import java.util.ArrayList;\n-import java.util.HashMap;\n-import java.util.Iterator;\n-\n-/**\n- * This model class holds the data of an individual ad Unit.\n- */\n-public class CTAdUnit implements Parcelable {\n-\n- private String adID;//Ad unit identifier\n- private String adType;//can be (banner/image/video/carousel etc.)\n- private ArrayList<CTAdUnitMediaItem> mediaList;\n-\n- // Custom Key Value pairs\n- private HashMap<String, String> customExtras;\n-\n- private String error;\n-\n- private JSONObject jsonObject;\n-\n- //constructors\n- public CTAdUnit() {\n-\n- }\n-\n- public static final Creator<CTAdUnit> CREATOR = new Creator<CTAdUnit>() {\n- @Override\n- public CTAdUnit createFromParcel(Parcel in) {\n- return new CTAdUnit(in);\n- }\n-\n- @Override\n- public CTAdUnit[] newArray(int size) {\n- return new CTAdUnit[size];\n- }\n- };\n-\n- @SuppressWarnings(\"unchecked\")\n- public CTAdUnit(Parcel in) {\n- try {\n- adID = in.readString();\n- adType = in.readString();\n- customExtras = in.readHashMap(null);\n- mediaList = in.createTypedArrayList(CTAdUnitMediaItem.CREATOR);\n- jsonObject = in.readByte() == 0x00 ? null : new JSONObject(in.readString());\n- error = in.readString();\n- } catch (Exception e) {\n- error = \"Error Creating AdUnit from parcel : \" + e.getLocalizedMessage();\n- }\n- }\n-\n- @Override\n- public void writeToParcel(Parcel parcel, int i) {\n- parcel.writeString(adID);\n- parcel.writeString(adType);\n- parcel.writeMap(customExtras);\n- parcel.writeTypedList(mediaList);\n- if (jsonObject == null) {\n- parcel.writeByte((byte) (0x00));\n- } else {\n- parcel.writeByte((byte) (0x01));\n- parcel.writeString(jsonObject.toString());\n- }\n- parcel.writeString(error);\n- }\n-\n- @Override\n- public int describeContents() {\n- return 0;\n- }\n-\n- String getAdID() {\n- return adID;\n- }\n-\n- public String getError() {\n- return error;\n- }\n-\n- public HashMap<String, String> getCustomExtras() {\n- return customExtras;\n- }\n-\n- /**\n- * static API to convert json to AdUnit\n- *\n- * @param object\n- * @return\n- */\n- static CTAdUnit toAdUnit(JSONObject object) {\n- if (object != null) {\n- Iterator<?> keys = object.keys();\n- //logic to convert jsonobj to item\n- CTAdUnit item = new CTAdUnit();\n- try {\n- if (keys != null && keys.hasNext()) {\n- String key = (String) keys.next();\n- if (object.get(key) instanceof JSONObject) {\n- item.jsonObject = (JSONObject) object.get(key);\n- item.adID = item.jsonObject.has(\"wzrk_id\") ? item.jsonObject.getString(\"wzrk_id\") : \"\";\n- item.adType = item.jsonObject.has(\"ct_type\") ? item.jsonObject.getString(\"ct_type\") : \"\";\n-\n- if (item.jsonObject.has(\"kv\")) {\n- item.populateKeyValues(item.jsonObject.getJSONObject(\"kv\"));\n- }\n- }\n- }\n- } catch (Exception e) {\n- item.error = \"Error Creating AdUnit from JSON : \" + e.getLocalizedMessage();\n- }\n-\n- }\n- return null;\n- }\n-\n- /**\n- * get the wzrk fields obj to be passed in the data for recording event.\n- */\n- public JSONObject getWzrkFields() {\n- try {\n- if (jsonObject != null) {\n- Iterator<String> iterator = jsonObject.keys();\n- JSONObject wzrkFieldsObj = new JSONObject();\n- while (iterator.hasNext()) {\n- String keyName = iterator.next();\n- if (keyName.startsWith(Constants.WZRK_PREFIX)) {\n- wzrkFieldsObj.put(keyName, jsonObject.get(keyName));\n- }\n- }\n- return wzrkFieldsObj;\n- }\n- } catch (Exception e) {\n-\n- }\n- return null;\n- }\n-\n- /**\n- * populates the custom key values pairs from json\n- *\n- * @param kvObj\n- * @throws JSONException\n- */\n- private void populateKeyValues(JSONObject kvObj) throws JSONException {\n- if (kvObj != null) {\n- Iterator<String> keys = kvObj.keys();\n- if (keys != null) {\n- String key, value;\n- while (keys.hasNext()) {\n- key = keys.next();\n- value = kvObj.getString(key);\n- if (!TextUtils.isEmpty(key)) {\n- if (this.customExtras == null)\n- this.customExtras = new HashMap<>();\n- this.customExtras.put(key, value);\n- }\n- }\n- }\n- }\n- }\n-\n- /**\n- * Media meta holder for Ad Unit\n- */\n- static class CTAdUnitMediaItem implements Parcelable {\n- private String mediaUrl;\n- private String contentType;\n- private String cacheKey;\n- private int orientation;\n- private String error;\n-\n- CTAdUnitMediaItem(Parcel in) {\n- try {\n- mediaUrl = in.readString();\n- contentType = in.readString();\n- cacheKey = in.readString();\n- orientation = in.readInt();\n- } catch (Exception e) {\n- error = \"Error Creating AdUnit Media Item from Parcel : \" + e.getLocalizedMessage();\n- }\n- }\n-\n- @Override\n- public void writeToParcel(Parcel dest, int flags) {\n- dest.writeString(mediaUrl);\n- dest.writeString(contentType);\n- dest.writeString(cacheKey);\n- dest.writeInt(orientation);\n- }\n-\n- @Override\n- public int describeContents() {\n- return 0;\n- }\n-\n- public static final Creator<CTAdUnitMediaItem> CREATOR = new Creator<CTAdUnitMediaItem>() {\n- @Override\n- public CTAdUnitMediaItem createFromParcel(Parcel in) {\n- return new CTAdUnitMediaItem(in);\n- }\n-\n- @Override\n- public CTAdUnitMediaItem[] newArray(int size) {\n- return new CTAdUnitMediaItem[size];\n- }\n- };\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "+package com.clevertap.android.sdk.ads.model;\n+\n+import android.os.Parcel;\n+import android.os.Parcelable;\n+import android.text.TextUtils;\n+\n+import com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.ads.AdConstants;\n+\n+import org.json.JSONObject;\n+\n+import java.util.HashMap;\n+import java.util.Iterator;\n+\n+/**\n+ * This model class holds the data of an individual ad Unit.\n+ */\n+public class CTAdUnit implements Parcelable {\n+\n+ private String adID;//Ad unit identifier\n+ private AdConstants.CtAdType adType;//can be (banner/image/video/carousel etc.)\n+\n+ // Custom Key Value pairs\n+ private HashMap<String, String> customExtras;\n+\n+ private String error;\n+\n+ private JSONObject jsonObject;\n+\n+ //constructors\n+ private CTAdUnit(JSONObject jsonObject, String adID, AdConstants.CtAdType adType, JSONObject object, String error) {\n+ this.jsonObject = jsonObject;\n+ this.adID = adID;\n+ this.adType = adType;\n+ this.error = error;\n+ this.customExtras = getKeyValues(object);\n+ }\n+\n+ public String getAdID() {\n+ return adID;\n+ }\n+\n+ public String getError() {\n+ return error;\n+ }\n+\n+ @SuppressWarnings(\"unused\")\n+ public HashMap<String, String> getCustomExtras() {\n+ return customExtras;\n+ }\n+\n+ public JSONObject getJsonObject() {\n+ return jsonObject;\n+ }\n+\n+ /**\n+ * static API to convert json to AdUnit\n+ *\n+ * @param object - Ad Unit Item in Json form\n+ * @return - CTAdUnit\n+ */\n+ public static CTAdUnit toAdUnit(JSONObject object) {\n+ if (object != null) {\n+ Iterator<?> keys = object.keys();\n+ //logic to convert jsonobj to item\n+ try {\n+ if (keys != null && keys.hasNext()) {\n+ String key = (String) keys.next();\n+ if (object.get(key) instanceof JSONObject) {\n+\n+ JSONObject jsonObject = (JSONObject) object.get(key);\n+ String adID = jsonObject.has(\"wzrk_id\") ? jsonObject.getString(\"wzrk_id\") : \"\";\n+ AdConstants.CtAdType adType = jsonObject.has(\"type\") ? AdConstants.CtAdType.type(jsonObject.getString(\"type\")) : null;\n+ JSONObject customKV = null;\n+ if (jsonObject.has(\"custom_kv\")) {\n+ customKV = jsonObject.getJSONObject(\"custom_kv\");\n+ }\n+ return new CTAdUnit(jsonObject, adID, adType, customKV, null);\n+ }\n+ }\n+ } catch (Exception e) {\n+ return new CTAdUnit(null, null, null, null, \"Error Creating AdUnit from JSON : \" + e.getLocalizedMessage());\n+\n+ }\n+ }\n+ return null;\n+ }\n+\n+ /**\n+ * get the wzrk fields obj to be passed in the data for recording event.\n+ */\n+ public JSONObject getWzrkFields() {\n+ try {\n+ if (jsonObject != null) {\n+ Iterator<String> iterator = jsonObject.keys();\n+ JSONObject wzrkFieldsObj = new JSONObject();\n+ while (iterator.hasNext()) {\n+ String keyName = iterator.next();\n+ if (keyName.startsWith(Constants.WZRK_PREFIX)) {\n+ wzrkFieldsObj.put(keyName, jsonObject.get(keyName));\n+ }\n+ }\n+ return wzrkFieldsObj;\n+ }\n+ } catch (Exception e) {\n+ //no op\n+ }\n+ return null;\n+ }\n+\n+ /**\n+ * populates the custom key values pairs from json\n+ *\n+ * @param kvObj- Custom Key Values\n+ */\n+ private HashMap<String, String> getKeyValues(JSONObject kvObj) {\n+ try {\n+ if (kvObj != null) {\n+ Iterator<String> keys = kvObj.keys();\n+ if (keys != null) {\n+ String key, value;\n+ HashMap<String, String> hashMap = null;\n+ while (keys.hasNext()) {\n+ key = keys.next();\n+ value = kvObj.getString(key);\n+ if (!TextUtils.isEmpty(key)) {\n+ if (hashMap == null)\n+ hashMap = new HashMap<>();\n+ hashMap.put(key, value);\n+ }\n+ }\n+ return hashMap;\n+ }\n+ }\n+ } catch (Exception e) {\n+ //no op\n+ }\n+ return null;\n+ }\n+\n+ public static final Creator<CTAdUnit> CREATOR = new Creator<CTAdUnit>() {\n+ @Override\n+ public CTAdUnit createFromParcel(Parcel in) {\n+ return new CTAdUnit(in);\n+ }\n+\n+ @Override\n+ public CTAdUnit[] newArray(int size) {\n+ return new CTAdUnit[size];\n+ }\n+ };\n+\n+ @SuppressWarnings(\"unchecked\")\n+ private CTAdUnit(Parcel in) {\n+ try {\n+ this.adID = in.readString();\n+ this.adType = (AdConstants.CtAdType) in.readValue(AdConstants.CtAdType.class.getClassLoader());\n+ this.customExtras = in.readHashMap(null);\n+ this.jsonObject = in.readByte() == 0x00 ? null : new JSONObject(in.readString());\n+ this.error = in.readString();\n+ } catch (Exception e) {\n+ error = \"Error Creating AdUnit from parcel : \" + e.getLocalizedMessage();\n+ }\n+ }\n+\n+ @Override\n+ public void writeToParcel(Parcel parcel, int i) {\n+ parcel.writeString(adID);\n+ parcel.writeValue(adType);\n+ parcel.writeMap(customExtras);\n+ if (jsonObject == null) {\n+ parcel.writeByte((byte) (0x00));\n+ } else {\n+ parcel.writeByte((byte) (0x01));\n+ parcel.writeString(jsonObject.toString());\n+ }\n+ parcel.writeString(error);\n+ }\n+\n+ @Override\n+ public int describeContents() {\n+ return 0;\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Modified AdUnit model changes |
116,621 | 25.11.2019 16:03:40 | -19,080 | c3e74d7e292668080161ef6c9068c151740d5ebc | type check added for inapp & inbox KV | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotificationButton.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotificationButton.java",
"diff": "@@ -135,7 +135,9 @@ class CTInAppNotificationButton implements Parcelable {\nthis.actionUrl = action;\n}\n}\n- if (actions != null && actions.has(Constants.KEY_KV)) {\n+\n+ //Custom KEY VALUE\n+ if (isKVAction(actions)) {\nJSONObject keyValues = actions.getJSONObject(Constants.KEY_KV);\nif (keyValues != null) {\nIterator<String> keys = keyValues.keys();\n@@ -159,6 +161,10 @@ class CTInAppNotificationButton implements Parcelable {\nreturn this;\n}\n+ private boolean isKVAction(JSONObject actions) throws JSONException {\n+ return actions != null && actions.has(\"type\") && Constants.KEY_KV.equalsIgnoreCase(actions.getString(\"type\")) && actions.has(Constants.KEY_KV);\n+ }\n+\n@Override\npublic int describeContents() {\nreturn 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxButtonClickListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxButtonClickListener.java",
"diff": "@@ -55,12 +55,7 @@ class CTInboxButtonClickListener implements View.OnClickListener {\n}\n}\n- HashMap<String, String> keyValues = null;\n- if (inboxMessage != null && inboxMessage.getInboxMessageContents() != null && inboxMessage.getInboxMessageContents().get(0) != null) {\n- keyValues = inboxMessage.getInboxMessageContents().get(0).getLinkKeyValue(buttonObject);\n- }\n-\n- fragment.handleClick(this.position, buttonText, buttonObject, keyValues);\n+ fragment.handleClick(this.position, buttonText, buttonObject, getKeyValues(inboxMessage));\n}\n} else {\nif (fragment != null) {\n@@ -70,6 +65,17 @@ class CTInboxButtonClickListener implements View.OnClickListener {\n}\n}\n+ private HashMap<String, String> getKeyValues(CTInboxMessage inboxMessage) {\n+ if (inboxMessage != null\n+ && inboxMessage.getInboxMessageContents() != null\n+ && inboxMessage.getInboxMessageContents().get(0) != null\n+ && Constants.KEY_KV.equalsIgnoreCase(inboxMessage.getInboxMessageContents().get(0).getLinktype(buttonObject))) {\n+\n+ return inboxMessage.getInboxMessageContents().get(0).getLinkKeyValue(buttonObject);\n+ }\n+ return null;\n+ }\n+\nprivate void copyToClipboard(Context context) {\nClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);\nClipData clipData = ClipData.newPlainText(buttonText, inboxMessage.getInboxMessageContents().get(0).getLinkCopyText(buttonObject));\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | type check added for inapp & inbox KV |
116,621 | 25.11.2019 16:42:10 | -19,080 | 0b2da1617fc4d640585e4d742c35f1f134d95485 | Ad model changes after payload was reverted to not include dynamic keys. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -136,7 +136,7 @@ public class Constants {\nstatic final String KEY_TLC = \"tlc\";\nstatic final String KEY_TDC = \"tdc\";\nstatic final String KEY_KV = \"kv\";\n- static final String KEY_TYPE = \"type\";\n+ public static final String KEY_TYPE = \"type\";\nstatic final String KEY_IS_TABLET = \"tablet\";\nstatic final String KEY_BG = \"bg\";\nstatic final String KEY_TITLE = \"title\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -56,28 +56,20 @@ public class CTAdUnit implements Parcelable {\n/**\n* static API to convert json to AdUnit\n*\n- * @param object - Ad Unit Item in Json form\n+ * @param jsonObject - Ad Unit Item in Json form\n* @return - CTAdUnit\n*/\n- public static CTAdUnit toAdUnit(JSONObject object) {\n- if (object != null) {\n- Iterator<?> keys = object.keys();\n+ public static CTAdUnit toAdUnit(JSONObject jsonObject) {\n+ if (jsonObject != null) {\n//logic to convert jsonobj to item\ntry {\n- if (keys != null && keys.hasNext()) {\n- String key = (String) keys.next();\n- if (object.get(key) instanceof JSONObject) {\n-\n- JSONObject jsonObject = (JSONObject) object.get(key);\nString adID = jsonObject.has(\"wzrk_id\") ? jsonObject.getString(\"wzrk_id\") : \"\";\n- AdConstants.CtAdType adType = jsonObject.has(\"type\") ? AdConstants.CtAdType.type(jsonObject.getString(\"type\")) : null;\n+ AdConstants.CtAdType adType = jsonObject.has(Constants.KEY_TYPE) ? AdConstants.CtAdType.type(jsonObject.getString(Constants.KEY_TYPE)) : null;\nJSONObject customKV = null;\nif (jsonObject.has(\"custom_kv\")) {\ncustomKV = jsonObject.getJSONObject(\"custom_kv\");\n}\nreturn new CTAdUnit(jsonObject, adID, adType, customKV, null);\n- }\n- }\n} catch (Exception e) {\nreturn new CTAdUnit(null, null, null, null, \"Error Creating AdUnit from JSON : \" + e.getLocalizedMessage());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Ad model changes after payload was reverted to not include dynamic keys. |
116,621 | 25.11.2019 17:33:59 | -19,080 | f5a748299f6a3e693bce2317617880c21380bf75 | removed getter using Ad Id | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -7428,20 +7428,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- /**\n- * API to get the Ad Unit for Ad ID\n- *\n- * @param adID- Ad Identifier\n- * @return - CTAdUnit and can be null\n- */\n- public CTAdUnit getAdUnitForID(String adID) {\n- //TODO remove before release\n- if (mAdController != null) {\n- mAdController.getAdUnitForID(adID);\n- }\n- return null;\n- }\n-\n/**\n* Raises the Ad Unit Viewed event\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | removed getter using Ad Id |
116,621 | 26.11.2019 16:49:17 | -19,080 | e1cc1b2f8c71b2bafb5b2f475000448ba077d9bd | Added other template support for android | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"diff": "@@ -19,7 +19,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nvoid didClick(Bundle data, HashMap<String, String> keyValueMap) {\nInAppListener listener = getListener();\n- if (listener != null) {\n+ if (listener != null && getActivity() != null) {\nlistener.inAppNotificationDidClick(getActivity().getBaseContext(), inAppNotification, data, keyValueMap);\n}\n}\n@@ -51,6 +51,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\n}\nabstract void cleanup();\n+\nabstract void generateListener();\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdConstants.java",
"diff": "package com.clevertap.android.sdk.ads;\nimport android.support.annotation.NonNull;\n+import android.text.TextUtils;\npublic interface AdConstants {\nenum CtAdType {\n-\n+ SIMPLE(\"simple\"),\n+ SIMPLE_WITH_IMAGE(\"simple-image\"),\n+ CAROUSEL(\"carousel\"),\n+ CAROUSEL_WITH_IMAGE(\"carousel-image\"),\n+ MESSAGE_WITH_ICON(\"message-icon\"),\nCUSTOM_KEY_VALUE(\"custom-key-value\");\nprivate final String adType;\n@@ -16,7 +21,21 @@ public interface AdConstants {\npublic static CtAdType type(String type) {\n- if (\"custom-key-value\".equalsIgnoreCase(type)) {\n+ if (TextUtils.isEmpty(type))\n+ return null;\n+\n+ switch (type) {\n+ case \"simple\":\n+ return SIMPLE;\n+ case \"simple-image\":\n+ return SIMPLE_WITH_IMAGE;\n+ case \"carousel\":\n+ return CAROUSEL;\n+ case \"carousel-image\":\n+ return CAROUSEL_WITH_IMAGE;\n+ case \"message-icon\":\n+ return MESSAGE_WITH_ICON;\n+ case \"custom-key-value\":\nreturn CUSTOM_KEY_VALUE;\n}\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -9,6 +9,7 @@ import com.clevertap.android.sdk.ads.AdConstants;\nimport org.json.JSONObject;\n+import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\n@@ -18,22 +19,29 @@ import java.util.Iterator;\npublic class CTAdUnit implements Parcelable {\nprivate String adID;//Ad unit identifier\n+\nprivate AdConstants.CtAdType adType;//can be (banner/image/video/carousel etc.)\n+ private String bgColor;\n+\n+ private String orientation;\n+\n+ private ArrayList<CTAdUnitContent> adContentItems = new ArrayList<>();\n+\n// Custom Key Value pairs\nprivate HashMap<String, String> customExtras;\n- private String error;\n-\nprivate JSONObject jsonObject;\n+ private String error;\n+\n//constructors\nprivate CTAdUnit(JSONObject jsonObject, String adID, AdConstants.CtAdType adType, JSONObject object, String error) {\nthis.jsonObject = jsonObject;\nthis.adID = adID;\nthis.adType = adType;\n- this.error = error;\nthis.customExtras = getKeyValues(object);\n+ this.error = error;\n}\npublic String getAdID() {\n@@ -53,6 +61,22 @@ public class CTAdUnit implements Parcelable {\nreturn jsonObject;\n}\n+ public String getBgColor() {\n+ return bgColor;\n+ }\n+\n+ public String getOrientation() {\n+ return orientation;\n+ }\n+\n+ public AdConstants.CtAdType getAdType() {\n+ return adType;\n+ }\n+\n+ public ArrayList<CTAdUnitContent> getAdContentItems() {\n+ return adContentItems;\n+ }\n+\n/**\n* static API to convert json to AdUnit\n*\n@@ -66,6 +90,7 @@ public class CTAdUnit implements Parcelable {\nString adID = jsonObject.has(\"wzrk_id\") ? jsonObject.getString(\"wzrk_id\") : \"\";\nAdConstants.CtAdType adType = jsonObject.has(Constants.KEY_TYPE) ? AdConstants.CtAdType.type(jsonObject.getString(Constants.KEY_TYPE)) : null;\nJSONObject customKV = null;\n+ //custom KV can be added to ad unit of any types, so don't\nif (jsonObject.has(\"custom_kv\")) {\ncustomKV = jsonObject.getJSONObject(\"custom_kv\");\n}\n@@ -147,6 +172,16 @@ public class CTAdUnit implements Parcelable {\ntry {\nthis.adID = in.readString();\nthis.adType = (AdConstants.CtAdType) in.readValue(AdConstants.CtAdType.class.getClassLoader());\n+ this.bgColor = in.readString();\n+ this.orientation = in.readString();\n+\n+ if (in.readByte() == 0x01) {\n+ adContentItems = new ArrayList<>();\n+ in.readList(adContentItems, CTAdUnitContent.class.getClassLoader());\n+ } else {\n+ adContentItems = null;\n+ }\n+\nthis.customExtras = in.readHashMap(null);\nthis.jsonObject = in.readByte() == 0x00 ? null : new JSONObject(in.readString());\nthis.error = in.readString();\n@@ -159,6 +194,16 @@ public class CTAdUnit implements Parcelable {\npublic void writeToParcel(Parcel parcel, int i) {\nparcel.writeString(adID);\nparcel.writeValue(adType);\n+ parcel.writeString(bgColor);\n+ parcel.writeString(orientation);\n+\n+ if (adContentItems == null) {\n+ parcel.writeByte((byte) (0x00));\n+ } else {\n+ parcel.writeByte((byte) (0x01));\n+ parcel.writeList(adContentItems);\n+ }\n+\nparcel.writeMap(customExtras);\nif (jsonObject == null) {\nparcel.writeByte((byte) (0x00));\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"diff": "package com.clevertap.android.sdk.ads.model;\n-public class CTAdUnitContent {\n+import android.os.Parcel;\n+import android.os.Parcelable;\n+\n+import com.clevertap.android.sdk.Logger;\n+\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\n+/**\n+ * Content class for holding AdContent Data\n+ */\n+public class CTAdUnitContent implements Parcelable {\n+ private String title;\n+ private String titleColor;\n+ private String message;\n+ private String messageColor;\n+ private String media;\n+ private String contentType;\n+ private String posterUrl;\n+ private String actionUrl;\n+ private String icon;\n+ private Boolean hasUrl;\n+\n+ private CTAdUnitContent(String title, String titleColor, String message, String messageColor,\n+ String icon, String media, String contentType, String posterUrl,\n+ String actionUrl, boolean hasUrl) {\n+ this.title = title;\n+ this.titleColor = titleColor;\n+ this.message = message;\n+ this.messageColor = messageColor;\n+ this.icon = icon;\n+ this.media = media;\n+ this.contentType = contentType;\n+ this.posterUrl = posterUrl;\n+ this.actionUrl = actionUrl;\n+ this.hasUrl = hasUrl;\n+ }\n+\n+\n+ private CTAdUnitContent(Parcel in) {\n+ title = in.readString();\n+ titleColor = in.readString();\n+ message = in.readString();\n+ messageColor = in.readString();\n+ icon = in.readString();\n+ media = in.readString();\n+ contentType = in.readString();\n+ posterUrl = in.readString();\n+ actionUrl = in.readString();\n+ hasUrl = in.readByte() != 0x00;\n+ }\n+\n+ @Override\n+ public void writeToParcel(Parcel dest, int flags) {\n+ dest.writeString(title);\n+ dest.writeString(titleColor);\n+ dest.writeString(message);\n+ dest.writeString(messageColor);\n+ dest.writeString(icon);\n+ dest.writeString(media);\n+ dest.writeString(contentType);\n+ dest.writeString(posterUrl);\n+ dest.writeString(actionUrl);\n+ dest.writeByte((byte) (hasUrl ? 0x01 : 0x00));\n+ }\n+\n+ static CTAdUnitContent toContent(JSONObject contentObject) {\n+ try {\n+ String title = \"\", titleColor = \"\", message = \"\", messageColor = \"\",\n+ icon = \"\", media = \"\", contentType = \"\", posterUrl = \"\",\n+ actionUrl = \"\";\n+\n+ boolean hasUrl = false;\n+\n+\n+ JSONObject titleObject = contentObject.has(\"title\") ? contentObject.getJSONObject(\"title\") : null;\n+ if (titleObject != null) {\n+ title = titleObject.has(\"text\") ? titleObject.getString(\"text\") : \"\";\n+ titleColor = titleObject.has(\"color\") ? titleObject.getString(\"color\") : \"\";\n+ }\n+ JSONObject msgObject = contentObject.has(\"message\") ? contentObject.getJSONObject(\"message\") : null;\n+ if (msgObject != null) {\n+ message = msgObject.has(\"text\") ? msgObject.getString(\"text\") : \"\";\n+ messageColor = msgObject.has(\"color\") ? msgObject.getString(\"color\") : \"\";\n+ }\n+ JSONObject iconObject = contentObject.has(\"icon\") ? contentObject.getJSONObject(\"icon\") : null;\n+ if (iconObject != null) {\n+ icon = iconObject.has(\"url\") ? iconObject.getString(\"url\") : \"\";\n+ }\n+ JSONObject mediaObject = contentObject.has(\"media\") ? contentObject.getJSONObject(\"media\") : null;\n+ if (mediaObject != null) {\n+ media = mediaObject.has(\"url\") ? mediaObject.getString(\"url\") : \"\";\n+ contentType = mediaObject.has(\"content_type\") ? mediaObject.getString(\"content_type\") : \"\";\n+ posterUrl = mediaObject.has(\"poster\") ? mediaObject.getString(\"poster\") : \"\";\n+ }\n+\n+ JSONObject actionObject = contentObject.has(\"action\") ? contentObject.getJSONObject(\"action\") : null;\n+ if (actionObject != null) {\n+ hasUrl = actionObject.has(\"hasUrl\") && actionObject.getBoolean(\"hasUrl\");\n+ JSONObject urlObject = actionObject.has(\"url\") ? actionObject.getJSONObject(\"url\") : null;\n+ if (urlObject != null && hasUrl) {\n+ JSONObject androidObject = urlObject.has(\"android\") ? urlObject.getJSONObject(\"android\") : null;\n+ if (androidObject != null) {\n+ actionUrl = androidObject.has(\"text\") ? androidObject.getString(\"text\") : \"\";\n+ }\n+ }\n+ }\n+\n+ new CTAdUnitContent(title, titleColor, message, messageColor,\n+ icon, media, contentType, posterUrl,\n+ actionUrl, hasUrl);\n+\n+ } catch (JSONException e) {\n+ Logger.v(\"Unable to init CTInboxMessageContent with JSON - \" + e.getLocalizedMessage());\n+ }\n+ return null;\n+ }\n+\n+ /**\n+ * Returns the title section of the AdUnit\n+ *\n+ * @return String\n+ */\n+ public String getTitle() {\n+ return title;\n+ }\n+\n+ /**\n+ * Returns the message section of the AdUnit\n+ *\n+ * @return String\n+ */\n+ public String getMessage() {\n+ return message;\n+ }\n+\n+ /**\n+ * Returns the media URL of the AdUnit\n+ *\n+ * @return String\n+ */\n+ public String getMedia() {\n+ return media;\n+ }\n+\n+ /**\n+ * Return the action URL of the body of the AdUnit\n+ *\n+ * @return String\n+ */\n+ public String getActionUrl() {\n+ return actionUrl;\n+ }\n+\n+ /**\n+ * Returns the URL as String for the icon in case of Icon Message template\n+ *\n+ * @return String\n+ */\n+ public String getIcon() {\n+ return icon;\n+ }\n+\n+ /**\n+ * Returns the hexcode value of the title color as String\n+ *\n+ * @return String\n+ */\n+ public String getTitleColor() {\n+ return titleColor;\n+ }\n+\n+ /**\n+ * Returns the hexcode value of the message color as String\n+ *\n+ * @return String\n+ */\n+ public String getMessageColor() {\n+ return messageColor;\n+ }\n+\n+ /**\n+ * Returns URL for the thumbnail of the video\n+ *\n+ * @return String\n+ */\n+ public String getPosterUrl() {\n+ return posterUrl;\n+ }\n+\n+ /**\n+ * Returns the content type of the media\n+ *\n+ * @return String\n+ */\n+ public String getContentType() {\n+ return contentType;\n+ }\n+\n+ /**\n+ * Method to check whether media in the {@link CTAdUnitContent} object is an image.\n+ *\n+ * @return true if the media type is image\n+ * false if the media type is not an image\n+ */\n+ public boolean mediaIsImage() {\n+ return contentType != null && this.media != null && contentType.startsWith(\"image\") && !contentType.equals(\"image/gif\");\n+ }\n+\n+ /**\n+ * Method to check whether media in the {@link CTAdUnitContent} object is an GIF.\n+ *\n+ * @return true if the media type is GIF\n+ * false if the media type is not an GIF\n+ */\n+ public boolean mediaIsGIF() {\n+ return contentType != null && this.media != null && contentType.equals(\"image/gif\");\n+ }\n+\n+ /**\n+ * Method to check whether media in the {@link CTAdUnitContent} object is a video.\n+ *\n+ * @return true if the media type is video\n+ * false if the media type is not a video\n+ */\n+ public boolean mediaIsVideo() {\n+ return contentType != null && this.media != null && contentType.startsWith(\"video\");\n+ }\n+\n+ /**\n+ * Method to check whether media in the {@link CTAdUnitContent} object is an audio.\n+ *\n+ * @return true if the media type is audio\n+ * false if the media type is not an audio\n+ */\n+ public boolean mediaIsAudio() {\n+ return contentType != null && this.media != null && contentType.startsWith(\"audio\");\n+ }\n+\n+ public static final Creator<CTAdUnitContent> CREATOR = new Creator<CTAdUnitContent>() {\n+ @Override\n+ public CTAdUnitContent createFromParcel(Parcel in) {\n+ return new CTAdUnitContent(in);\n+ }\n+\n+ @Override\n+ public CTAdUnitContent[] newArray(int size) {\n+ return new CTAdUnitContent[size];\n+ }\n+ };\n+\n+ @Override\n+ public int describeContents() {\n+ return 0;\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added other template support for android |
116,621 | 26.11.2019 17:23:56 | -19,080 | 8bd78d571644d0bd4a0bd6990ed0e637434ced81 | Added Ad Content Support | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -138,7 +138,7 @@ public class Constants {\nstatic final String KEY_KV = \"kv\";\npublic static final String KEY_TYPE = \"type\";\nstatic final String KEY_IS_TABLET = \"tablet\";\n- static final String KEY_BG = \"bg\";\n+ public static final String KEY_BG = \"bg\";\nstatic final String KEY_TITLE = \"title\";\nstatic final String KEY_TEXT = \"text\";\nstatic final String KEY_COLOR = \"color\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -7,6 +7,7 @@ import android.text.TextUtils;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ads.AdConstants;\n+import org.json.JSONArray;\nimport org.json.JSONObject;\nimport java.util.ArrayList;\n@@ -26,7 +27,7 @@ public class CTAdUnit implements Parcelable {\nprivate String orientation;\n- private ArrayList<CTAdUnitContent> adContentItems = new ArrayList<>();\n+ private ArrayList<CTAdUnitContent> adContentItems;\n// Custom Key Value pairs\nprivate HashMap<String, String> customExtras;\n@@ -36,14 +37,58 @@ public class CTAdUnit implements Parcelable {\nprivate String error;\n//constructors\n- private CTAdUnit(JSONObject jsonObject, String adID, AdConstants.CtAdType adType, JSONObject object, String error) {\n+ private CTAdUnit(JSONObject jsonObject, String adID, AdConstants.CtAdType adType,\n+ String bgColor, String orientation, ArrayList<CTAdUnitContent> contentArray,\n+ JSONObject kvObject, String error) {\nthis.jsonObject = jsonObject;\nthis.adID = adID;\nthis.adType = adType;\n- this.customExtras = getKeyValues(object);\n+ this.bgColor = bgColor;\n+ this.orientation = orientation;\n+ this.adContentItems = contentArray;\n+ this.customExtras = getKeyValues(kvObject);\nthis.error = error;\n}\n+ /**\n+ * static API to convert json to AdUnit\n+ *\n+ * @param jsonObject - Ad Unit Item in Json form\n+ * @return - CTAdUnit\n+ */\n+ public static CTAdUnit toAdUnit(JSONObject jsonObject) {\n+ if (jsonObject != null) {\n+ //logic to convert jsonobj to item\n+ try {\n+ String adID = jsonObject.has(\"wzrk_id\") ? jsonObject.getString(\"wzrk_id\") : \"\";\n+ AdConstants.CtAdType adType = jsonObject.has(Constants.KEY_TYPE) ? AdConstants.CtAdType.type(jsonObject.getString(Constants.KEY_TYPE)) : null;\n+\n+ String bgColor = jsonObject.has(Constants.KEY_BG) ? jsonObject.getString(Constants.KEY_BG) : \"\";\n+\n+ String orientation = jsonObject.has(\"orientation\") ? jsonObject.getString(\"orientation\") : \"\";\n+\n+ JSONArray contentArray = jsonObject.has(\"content\") ? jsonObject.getJSONArray(\"content\") : null;\n+ ArrayList<CTAdUnitContent> contentArrayList = new ArrayList<>();\n+ if (contentArray != null) {\n+ for (int i = 0; i < contentArray.length(); i++) {\n+ CTAdUnitContent adUnitContent = CTAdUnitContent.toContent(contentArray.getJSONObject(i));\n+ contentArrayList.add(adUnitContent);\n+ }\n+ }\n+ JSONObject customKV = null;\n+ //custom KV can be added to ad unit of any types, so don't\n+ if (jsonObject.has(\"custom_kv\")) {\n+ customKV = jsonObject.getJSONObject(\"custom_kv\");\n+ }\n+ return new CTAdUnit(jsonObject, adID, adType, bgColor, orientation, contentArrayList, customKV, null);\n+ } catch (Exception e) {\n+ return new CTAdUnit(null, \"\", null, null, null, null, null,\"Error Creating AdUnit from JSON : \" + e.getLocalizedMessage());\n+\n+ }\n+ }\n+ return null;\n+ }\n+\npublic String getAdID() {\nreturn adID;\n}\n@@ -61,6 +106,7 @@ public class CTAdUnit implements Parcelable {\nreturn jsonObject;\n}\n+ @SuppressWarnings(\"unused\")\npublic String getBgColor() {\nreturn bgColor;\n}\n@@ -69,40 +115,16 @@ public class CTAdUnit implements Parcelable {\nreturn orientation;\n}\n+ @SuppressWarnings(\"unused\")\npublic AdConstants.CtAdType getAdType() {\nreturn adType;\n}\n+ @SuppressWarnings(\"unused\")\npublic ArrayList<CTAdUnitContent> getAdContentItems() {\nreturn adContentItems;\n}\n- /**\n- * static API to convert json to AdUnit\n- *\n- * @param jsonObject - Ad Unit Item in Json form\n- * @return - CTAdUnit\n- */\n- public static CTAdUnit toAdUnit(JSONObject jsonObject) {\n- if (jsonObject != null) {\n- //logic to convert jsonobj to item\n- try {\n- String adID = jsonObject.has(\"wzrk_id\") ? jsonObject.getString(\"wzrk_id\") : \"\";\n- AdConstants.CtAdType adType = jsonObject.has(Constants.KEY_TYPE) ? AdConstants.CtAdType.type(jsonObject.getString(Constants.KEY_TYPE)) : null;\n- JSONObject customKV = null;\n- //custom KV can be added to ad unit of any types, so don't\n- if (jsonObject.has(\"custom_kv\")) {\n- customKV = jsonObject.getJSONObject(\"custom_kv\");\n- }\n- return new CTAdUnit(jsonObject, adID, adType, customKV, null);\n- } catch (Exception e) {\n- return new CTAdUnit(null, null, null, null, \"Error Creating AdUnit from JSON : \" + e.getLocalizedMessage());\n-\n- }\n- }\n- return null;\n- }\n-\n/**\n* get the wzrk fields obj to be passed in the data for recording event.\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"diff": "@@ -22,10 +22,11 @@ public class CTAdUnitContent implements Parcelable {\nprivate String actionUrl;\nprivate String icon;\nprivate Boolean hasUrl;\n+ private String error;\nprivate CTAdUnitContent(String title, String titleColor, String message, String messageColor,\nString icon, String media, String contentType, String posterUrl,\n- String actionUrl, boolean hasUrl) {\n+ String actionUrl, boolean hasUrl, String error) {\nthis.title = title;\nthis.titleColor = titleColor;\nthis.message = message;\n@@ -36,6 +37,7 @@ public class CTAdUnitContent implements Parcelable {\nthis.posterUrl = posterUrl;\nthis.actionUrl = actionUrl;\nthis.hasUrl = hasUrl;\n+ this.error = error;\n}\n@@ -50,6 +52,7 @@ public class CTAdUnitContent implements Parcelable {\nposterUrl = in.readString();\nactionUrl = in.readString();\nhasUrl = in.readByte() != 0x00;\n+ error = in.readString();\n}\n@Override\n@@ -64,6 +67,7 @@ public class CTAdUnitContent implements Parcelable {\ndest.writeString(posterUrl);\ndest.writeString(actionUrl);\ndest.writeByte((byte) (hasUrl ? 0x01 : 0x00));\n+ dest.writeString(error);\n}\nstatic CTAdUnitContent toContent(JSONObject contentObject) {\n@@ -110,10 +114,11 @@ public class CTAdUnitContent implements Parcelable {\nnew CTAdUnitContent(title, titleColor, message, messageColor,\nicon, media, contentType, posterUrl,\n- actionUrl, hasUrl);\n+ actionUrl, hasUrl, null);\n} catch (JSONException e) {\n- Logger.v(\"Unable to init CTInboxMessageContent with JSON - \" + e.getLocalizedMessage());\n+ Logger.v(\"Unable to init CTAdUnitContent with JSON - \" + e.getLocalizedMessage());\n+ return new CTAdUnitContent(\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", false, \"Error Creating AdUnit Content from JSON : \" + e.getLocalizedMessage());\n}\nreturn null;\n}\n@@ -141,6 +146,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getMedia() {\nreturn media;\n}\n@@ -150,6 +156,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getActionUrl() {\nreturn actionUrl;\n}\n@@ -159,6 +166,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getIcon() {\nreturn icon;\n}\n@@ -168,6 +176,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getTitleColor() {\nreturn titleColor;\n}\n@@ -186,6 +195,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getPosterUrl() {\nreturn posterUrl;\n}\n@@ -195,6 +205,7 @@ public class CTAdUnitContent implements Parcelable {\n*\n* @return String\n*/\n+ @SuppressWarnings(\"unused\")\npublic String getContentType() {\nreturn contentType;\n}\n@@ -205,6 +216,7 @@ public class CTAdUnitContent implements Parcelable {\n* @return true if the media type is image\n* false if the media type is not an image\n*/\n+ @SuppressWarnings(\"unused\")\npublic boolean mediaIsImage() {\nreturn contentType != null && this.media != null && contentType.startsWith(\"image\") && !contentType.equals(\"image/gif\");\n}\n@@ -215,6 +227,7 @@ public class CTAdUnitContent implements Parcelable {\n* @return true if the media type is GIF\n* false if the media type is not an GIF\n*/\n+ @SuppressWarnings(\"unused\")\npublic boolean mediaIsGIF() {\nreturn contentType != null && this.media != null && contentType.equals(\"image/gif\");\n}\n@@ -225,6 +238,7 @@ public class CTAdUnitContent implements Parcelable {\n* @return true if the media type is video\n* false if the media type is not a video\n*/\n+ @SuppressWarnings(\"unused\")\npublic boolean mediaIsVideo() {\nreturn contentType != null && this.media != null && contentType.startsWith(\"video\");\n}\n@@ -235,6 +249,7 @@ public class CTAdUnitContent implements Parcelable {\n* @return true if the media type is audio\n* false if the media type is not an audio\n*/\n+ @SuppressWarnings(\"unused\")\npublic boolean mediaIsAudio() {\nreturn contentType != null && this.media != null && contentType.startsWith(\"audio\");\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added Ad Content Support |
116,621 | 26.11.2019 17:59:04 | -19,080 | 1d66cb43948353f23788ef9bceb1dd6e4f7c2fcf | Added to string for models | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.ads.model;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n+import android.support.annotation.NonNull;\nimport android.text.TextUtils;\nimport com.clevertap.android.sdk.Constants;\n@@ -240,4 +241,31 @@ public class CTAdUnit implements Parcelable {\npublic int describeContents() {\nreturn 0;\n}\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ StringBuilder stringBuilder = new StringBuilder();\n+ stringBuilder.append(\"[\");\n+ stringBuilder.append(\"ADid- \" + adID);\n+ stringBuilder.append(\"Type- \" + adType != null ? adType.toString() : null);\n+ stringBuilder.append(\"bgColor- \" + bgColor);\n+ stringBuilder.append(\"Orientation- \" + orientation);\n+ if (adContentItems != null && adContentItems.isEmpty()) {\n+ for (int i = 0; i < adContentItems.size(); i++) {\n+ CTAdUnitContent item = adContentItems.get(i);\n+ if (item != null) {\n+ stringBuilder.append(\"Content Item:\" + i + \" \" + item.toString());\n+ stringBuilder.append(\"\\n\");\n+ }\n+ }\n+ }\n+ if (customExtras != null) {\n+ stringBuilder.append(\"Custom KV:\" + customExtras);\n+ }\n+ stringBuilder.append(\"JSON -\" + jsonObject);\n+ stringBuilder.append(\"Error-\" + error);\n+ stringBuilder.append(\"]\");\n+ return stringBuilder.toString();\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.ads.model;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n+import android.support.annotation.NonNull;\nimport com.clevertap.android.sdk.Logger;\n@@ -270,4 +271,24 @@ public class CTAdUnitContent implements Parcelable {\npublic int describeContents() {\nreturn 0;\n}\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ StringBuilder stringBuilder = new StringBuilder();\n+ stringBuilder.append(\"[\");\n+ stringBuilder.append(\"title:\" + title);\n+ stringBuilder.append(\"titleColor:\" + titleColor);\n+ stringBuilder.append(\"message:\" + message);\n+ stringBuilder.append(\"messageColor:\" + messageColor);\n+ stringBuilder.append(\"media:\" + media);\n+ stringBuilder.append(\"contentType:\" + contentType);\n+ stringBuilder.append(\"posterUrl:\" + posterUrl);\n+ stringBuilder.append(\"actionUrl:\" + actionUrl);\n+ stringBuilder.append(\"icon:\" + icon);\n+ stringBuilder.append(\"hasUrl:\" + hasUrl);\n+ stringBuilder.append(\"error:\" + error);\n+ stringBuilder.append(\"]\");\n+ return stringBuilder.toString();\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added to string for models |
116,621 | 27.11.2019 13:02:13 | -19,080 | 527614722575e5eba22d2c1c89fa58ebd6c00696 | Removed unwanted resources & replaced with SVGs | [
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/res/drawable/ct_audio.png",
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_audio.png",
"diff": "Binary files a/clevertap-android-sdk/src/main/res/drawable/ct_audio.png and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_audio.xml",
"diff": "+<vector xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:width=\"32dp\"\n+ android:height=\"18dp\"\n+ android:viewportWidth=\"32\"\n+ android:viewportHeight=\"18\">\n+ <path\n+ android:pathData=\"M16,9m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0\"\n+ android:strokeWidth=\"0.5\"\n+ android:fillColor=\"#000000\"\n+ android:strokeColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"/>\n+ <path\n+ android:pathData=\"M14.273,6.7827L18.6053,5.2381C18.8654,5.1454 19.1514,5.2811 19.2441,5.5412C19.2633,5.5951 19.2732,5.6519 19.2732,5.7091L19.2732,11.1847C19.2732,11.3893 19.2104,11.589 19.0933,11.7568C18.8289,12.1359 18.6104,12.382 18.4379,12.495C17.7679,12.934 16.9456,12.8262 16.4157,11.9422C16.1444,11.4894 16.1444,10.86 16.8247,10.4326C17.0388,10.2981 17.481,10.1133 18.1515,9.8781L18.1515,8.0477C18.1515,7.7716 17.9277,7.5477 17.6515,7.5477C17.5957,7.5477 17.5402,7.5571 17.4875,7.5754L15.4359,8.288C15.2347,8.3579 15.0999,8.5475 15.0999,8.7604L15.0999,12.0164C15.0999,12.1969 15.051,12.3739 14.9586,12.5289C14.6743,13.0052 14.4373,13.3095 14.2475,13.4418C13.5028,13.9613 12.5421,13.6263 12.2129,13.1321C11.8836,12.6378 11.8836,11.9395 12.6204,11.4973C12.8364,11.3677 13.2766,11.1931 13.9409,10.9736L13.9409,7.2537C13.9409,7.0423 14.0738,6.8537 14.273,6.7827Z\"\n+ android:strokeWidth=\"0.5\"\n+ android:fillColor=\"#00000000\"\n+ android:strokeColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"/>\n+</vector>\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/res/drawable/ct_image.png",
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_image.png",
"diff": "Binary files a/clevertap-android-sdk/src/main/res/drawable/ct_image.png and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_image.xml",
"diff": "+<vector xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:width=\"32dp\"\n+ android:height=\"18dp\"\n+ android:viewportWidth=\"32\"\n+ android:viewportHeight=\"18\">\n+ <path\n+ android:pathData=\"M16,9m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0\"\n+ android:strokeWidth=\"0.5\"\n+ android:fillColor=\"#000000\"\n+ android:strokeColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"/>\n+ <path\n+ android:pathData=\"M12,6h8v6h-8z\"\n+ android:strokeWidth=\"0.5\"\n+ android:fillColor=\"#00000000\"\n+ android:strokeColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"/>\n+ <path\n+ android:pathData=\"M13.5,7.5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0\"\n+ android:strokeWidth=\"1\"\n+ android:fillColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"\n+ android:strokeColor=\"#00000000\"/>\n+ <path\n+ android:pathData=\"M13,11.0158L18.9958,11.0158L16.9301,8.0954C16.7707,7.8699 16.4587,7.8164 16.2332,7.9759C16.1829,8.0115 16.1396,8.056 16.1055,8.1074L15.0032,9.7663L15.0032,9.7663L14.7111,9.4619C14.5199,9.2626 14.2034,9.2561 14.0042,9.4473C13.9747,9.4755 13.9488,9.5073 13.9271,9.5418L13,11.0158L13,11.0158Z\"\n+ android:strokeWidth=\"1\"\n+ android:fillColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"\n+ android:strokeColor=\"#00000000\"/>\n+</vector>\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/res/drawable/ct_thumbnail.png",
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_thumbnail.png",
"diff": "Binary files a/clevertap-android-sdk/src/main/res/drawable/ct_thumbnail.png and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/res/drawable/ct_video_1.png",
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_video_1.png",
"diff": "Binary files a/clevertap-android-sdk/src/main/res/drawable/ct_video_1.png and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/res/drawable/ct_video_1.xml",
"diff": "+<vector xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:width=\"32dp\"\n+ android:height=\"18dp\"\n+ android:viewportWidth=\"32\"\n+ android:viewportHeight=\"18\">\n+ <path\n+ android:pathData=\"M16,9m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0\"\n+ android:strokeWidth=\"0.5\"\n+ android:fillColor=\"#000000\"\n+ android:strokeColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"/>\n+ <path\n+ android:pathData=\"M18.5,10.5C18.5,11.0523 18.0523,11.5 17.5,11.5L12,11.5C11.4477,11.5 11,11.0523 11,10.5L11,7.5C11,6.9477 11.4477,6.5 12,6.5L17.5,6.5C18.0523,6.5 18.5,6.9477 18.5,7.5L18.5,8.5L20.6214,7.2272C20.7398,7.1561 20.8933,7.1945 20.9644,7.3129C20.9877,7.3518 21,7.3962 21,7.4415L21,10.5585C21,10.6965 20.8881,10.8085 20.75,10.8085C20.7047,10.8085 20.6602,10.7961 20.6214,10.7728L18.5,9.5L18.5,10.5Z\"\n+ android:strokeWidth=\"1\"\n+ android:fillColor=\"#FFFFFF\"\n+ android:fillType=\"evenOdd\"\n+ android:strokeColor=\"#00000000\"/>\n+</vector>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Removed unwanted resources & replaced with SVGs |
116,621 | 28.11.2019 15:50:04 | -19,080 | 3f3bfb34caa59b9f8329e609809e164bfa374aed | adview code review changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -42,7 +42,7 @@ public class Constants {\nstatic final int PUSH_DELAY_MS = 1000;\nstatic final String INAPP_PREVIEW_PUSH_PAYLOAD_KEY = \"wzrk_inapp\";\nstatic final String INBOX_PREVIEW_PUSH_PAYLOAD_KEY = \"wzrk_inbox\";\n- static final String ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY = \"wzrk_adUnit\";\n+ static final String ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY = \"wzrk_adunit\";\nstatic final String INAPP_HTML_TAG = \"html\";\nstatic final String INAPP_DATA_TAG = \"d\";\nstatic final String INAPP_X_PERCENT = \"xp\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -278,6 +278,7 @@ public class CTAdUnit implements Parcelable {\n@NonNull\n@Override\npublic String toString() {\n+ try {\nStringBuilder stringBuilder = new StringBuilder();\nstringBuilder.append(\"[\");\nstringBuilder.append(\"ADid- \").append(adID);\n@@ -300,5 +301,9 @@ public class CTAdUnit implements Parcelable {\nstringBuilder.append(\"Error-\").append(error);\nstringBuilder.append(\"]\");\nreturn stringBuilder.toString();\n+ } catch (Exception e) {\n+\n+ }\n+ return super.toString();\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnitContent.java",
"diff": "@@ -72,6 +72,7 @@ public class CTAdUnitContent implements Parcelable {\n/**\n* Converts jsonContent to ADUnitContent\n+ *\n* @param contentObject - jsonObject\n* @return - CTAdUnitContent Obj\n*/\n@@ -106,9 +107,8 @@ public class CTAdUnitContent implements Parcelable {\nJSONObject actionObject = contentObject.has(\"action\") ? contentObject.getJSONObject(\"action\") : null;\nif (actionObject != null) {\n- hasUrl = actionObject.has(\"hasUrl\") && actionObject.getBoolean(\"hasUrl\");\nJSONObject urlObject = actionObject.has(\"url\") ? actionObject.getJSONObject(\"url\") : null;\n- if (urlObject != null && hasUrl) {\n+ if (urlObject != null) {\nJSONObject androidObject = urlObject.has(\"android\") ? urlObject.getJSONObject(\"android\") : null;\nif (androidObject != null) {\nactionUrl = androidObject.has(\"text\") ? androidObject.getString(\"text\") : \"\";\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | adview code review changes |
116,621 | 02.12.2019 16:33:34 | -19,080 | 741ded099063722427f44faf26041cec4eadf3e2 | Added default identifier for send test | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -214,4 +214,5 @@ public class Constants {\npublic static final String KEY_HAS_URL = \"hasUrl\";\npublic static final String KEY_HAS_LINKS = \"hasLinks\";\npublic static final String KEY_LINKS = \"links\";\n+ public static final String TEST_IDENTIFIER = \"0_0\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/model/CTAdUnit.java",
"diff": "@@ -77,7 +77,7 @@ public class CTAdUnit implements Parcelable {\npublic static CTAdUnit toAdUnit(JSONObject jsonObject) {\n//logic to convert jsonobj to item\ntry {\n- String adID = jsonObject.has(Constants.NOTIFICATION_ID_TAG) ? jsonObject.getString(Constants.NOTIFICATION_ID_TAG) : \"\";\n+ String adID = jsonObject.has(Constants.NOTIFICATION_ID_TAG) ? jsonObject.getString(Constants.NOTIFICATION_ID_TAG) : Constants.TEST_IDENTIFIER;\nCTAdConstants.CtAdType adType = jsonObject.has(Constants.KEY_TYPE) ? CTAdConstants.CtAdType.type(jsonObject.getString(Constants.KEY_TYPE)) : null;\nString bgColor = jsonObject.has(Constants.KEY_BG) ? jsonObject.getString(Constants.KEY_BG) : \"\";\n@@ -107,6 +107,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the AdId of the adUnit\n+ *\n* @return String\n*/\npublic String getAdID() {\n@@ -119,6 +120,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the Key Value pair of the adUnit\n+ *\n* @return HashMap<String, String>\n*/\n@SuppressWarnings(\"unused\")\n@@ -128,6 +130,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the JsonObject corresponding to the CTAdUnit object\n+ *\n* @return JSONObject\n*/\npublic JSONObject getJsonObject() {\n@@ -136,6 +139,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the hex-value background color of the adUnit e.g. #000000\n+ *\n* @return String\n*/\n@SuppressWarnings(\"unused\")\n@@ -145,6 +149,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the orientation of the adUnit\n+ *\n* @return String\n*/\npublic String getOrientation() {\n@@ -153,6 +158,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the AdType of the AdUnit, Refer{@link CTAdConstants.CtAdType}\n+ *\n* @return CTAdConstants.CtAdType\n*/\n@SuppressWarnings(\"unused\")\n@@ -162,6 +168,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the list of Content Ad Items.\n+ *\n* @return ArrayList<CTAdUnitContent>\n*/\n@SuppressWarnings(\"unused\")\n@@ -171,6 +178,7 @@ public class CTAdUnit implements Parcelable {\n/**\n* Getter for the wzrk fields obj to be passed in the data for recording event.\n+ *\n* @return JSONObject\n*/\npublic JSONObject getWzrkFields() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added default identifier for send test |
116,621 | 03.12.2019 09:06:10 | -19,080 | 168e59515530f270e20fd80393385086e2a48bd6 | Added adunit getters | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -7427,6 +7427,31 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * Getter for retrieving all the adUnits.\n+ *\n+ * @return ArrayList<CTAdUnit> - could be null, if there is no ad campaigns\n+ */\n+ public ArrayList<CTAdUnit> getAllAdUnits() {\n+ if (mAdController != null) {\n+ mAdController.getAllAdUnits();\n+ }\n+ return null;\n+ }\n+\n+ /**\n+ * Getter for retrieving AdUnit using AdID\n+ *\n+ * @param adUnit - ADId {@link CTAdUnit#getAdID()}\n+ * @return CTAdUnit - could be null, if there is no ad campaign with the identifier\n+ */\n+ public CTAdUnit getAdUnitForId(String adUnit) {\n+ if (mAdController != null) {\n+ mAdController.getAdUnitForID(adUnit);\n+ }\n+ return null;\n+ }\n+\n/**\n* Raises the Ad Unit Viewed event\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdUnitController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ads/AdUnitController.java",
"diff": "@@ -51,6 +51,17 @@ public class AdUnitController {\nreturn null;\n}\n+ /**\n+ * Getter for retrieving all the running adUnits in the cache.\n+ *\n+ * @return ArrayList<CTAdUnit> - Could be null in case no adUnits are there in the cache\n+ */\n+ public ArrayList<CTAdUnit> getAllAdUnits() {\n+ if (items.isEmpty())\n+ return null;\n+ return new ArrayList<>(items.values());\n+ }\n+\n/**\n* Getter to retrieve the AdUnit using the adID\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added adunit getters |
116,621 | 03.12.2019 23:27:59 | -19,080 | 6fa50df82d79d2d452008a5c0c630c6378ae5934 | Adunit parsing send test logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -4997,9 +4997,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (extras.containsKey(Constants.ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY)) {\n- pendingInappRunnable = new Runnable() {\n- @Override\n- public void run() {\ntry {\nLogger.v(\"Received adUnit via push payload: \" + extras.getString(Constants.ADUNIT_PREVIEW_PUSH_PAYLOAD_KEY));\nJSONObject r = new JSONObject();\n@@ -5011,8 +5008,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable t) {\nLogger.v(\"Failed to process Ad Unit from push notification payload\", t);\n}\n- }\n- };\nreturn;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Adunit parsing send test logic |
116,621 | 06.12.2019 15:34:25 | -19,080 | 55eb4392e9a1705196e8d26f7fcf5f9975e26d48 | updated starter project with V3.6.2 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -29,7 +29,10 @@ dependencies {\ntestImplementation 'junit:junit:4.12'\nandroidTestImplementation 'com.android.support.test:runner:1.0.2'\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n- implementation (name: 'clevertap-android-sdk-3.6.1', ext: 'aar') //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+\n+ //CleverTap Android SDK, make sure the AAR file is in the libs folder\n+ implementation (name: 'clevertap-android-sdk-3.6.2', ext: 'aar')\n+\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n//ExoPlayer Libraries for Audio/Video InApp Notifications\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.1.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.6.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/build.gradle",
"new_path": "AndroidStarter/build.gradle",
"diff": "@@ -7,7 +7,7 @@ buildscript {\njcenter()\n}\ndependencies {\n- classpath 'com.android.tools.build:gradle:3.3.2'\n+ classpath 'com.android.tools.build:gradle:3.5.3'\nclasspath 'com.google.gms:google-services:4.0.0'//Needed for FCM\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | updated starter project with V3.6.2 |
116,621 | 09.12.2019 15:38:34 | -19,080 | f8970bc5109c08977dafdced09664c467a02b219 | Updated changeLog & ReadMe for V3.6.2 Release | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.6.2 (December 9, 2019)\n+* Adds support for Native Display.\n+* Bug fixes and performance improvements\n+\n### Version 3.6.1 (October 16, 2019)\n* Bug fixes and performance improvements\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.2'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.6.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.6.2', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.2'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Updated changeLog & ReadMe for V3.6.2 Release |
116,621 | 10.12.2019 16:31:16 | -19,080 | 1822fea4b821787c3469838a77e150fee7bca413 | CleverTap SDK V3.6.2 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar and b/AndroidStarter/app/libs/clevertap-android-sdk-3.6.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n-### Version 3.6.2 (December 9, 2019)\n+### Version 3.6.2 (December 10, 2019)\n* Adds support for Native Display.\n* Bug fixes and performance improvements\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk-3.6.2.aar",
"new_path": "clevertap-android-sdk-3.6.2.aar",
"diff": "Binary files a/clevertap-android-sdk-3.6.2.aar and b/clevertap-android-sdk-3.6.2.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | CleverTap SDK V3.6.2 |
116,623 | 02.01.2020 12:02:30 | -19,080 | 0d6ca27713f5a841a9cb101faa8b12286d6e2602 | Retry mechanism and install referrer changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.6.2'\n+ libraryVersion = '3.6.3'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -154,6 +154,7 @@ dependencies {\nimplementation 'com.android.support:appcompat-v7:28.0.0'\ncompileOnly 'com.android.support:design:28.0.0'\ncompileOnly 'com.github.bumptech.glide:glide:4.9.0'\n+ compileOnly 'com.android.installreferrer:installreferrer:1.1'\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30602\"\n- android:versionName=\"3.6.2\">\n+ android:versionCode=\"30603\"\n+ android:versionName=\"3.6.3\">\n<application>\n- <receiver\n- android:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n- android:exported=\"true\">\n- <intent-filter>\n- <action android:name=\"com.android.vending.INSTALL_REFERRER\" />\n- </intent-filter>\n- </receiver>\n-\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\nandroid:configChanges=\"keyboardHidden\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -34,6 +34,7 @@ import android.os.Build;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\n+import android.os.RemoteException;\nimport android.os.SystemClock;\nimport android.support.annotation.NonNull;\nimport android.support.annotation.Nullable;\n@@ -41,6 +42,9 @@ import android.support.annotation.RequiresApi;\nimport android.support.v4.app.NotificationCompat;\nimport android.text.TextUtils;\n+import com.android.installreferrer.api.InstallReferrerClient;\n+import com.android.installreferrer.api.InstallReferrerStateListener;\n+import com.android.installreferrer.api.ReferrerDetails;\nimport com.clevertap.android.sdk.ab_testing.CTABTestController;\nimport com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\n@@ -73,6 +77,7 @@ import java.util.Iterator;\nimport java.util.List;\nimport java.util.Locale;\nimport java.util.Map;\n+import java.util.Random;\nimport java.util.TimeZone;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n@@ -217,6 +222,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate String source = null, medium = null, campaign = null;\nprivate JSONObject wzrkParams = null;\nprivate int lastVisitTime;\n+ private int maxDelayFrequency = 1000000;\n+ private int minDelayFrequency = 0;\n+ private boolean installReferrerDataSent = false;\n+ private long referrerClickTime = 0;\n+ private long appInstallTime = 0;\n+ private boolean instantExperienceLaunched = false;\n/**\n* Method to check whether app has ExoPlayer dependencies\n@@ -1290,25 +1301,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- static void handleInstallReferrer(Context context, Intent intent) {\n- if (instances == null) {\n- Logger.v(\"No CleverTap Instance found\");\n- CleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\n- if (instance != null) {\n- instance.pushInstallReferrer(intent);\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.pushInstallReferrer(intent);\n- }\n- }\n-\n- }\n-\n/**\n* This method is used to change the credentials of CleverTap account Id and token programmatically\n*\n@@ -1696,6 +1688,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!isAppLaunchPushed()) {\npushAppLaunchedEvent();\nonTokenRefresh();\n+ if(!installReferrerDataSent){\n+ handleInstallReferrerOnFirstInstall();\n+ }\n}\nif (!inCurrentSession()) {\npushInitialEventsAsync();\n@@ -2476,6 +2471,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn !newDomain.equals(oldDomain);\n}\n+ //gives delay frequency based on region\n+ //randomly adds delay to 1s delay in case of non-EU regions\n+ private int getDelayFrequency(){\n+ if(config.getAccountRegion() == null){\n+ return Constants.PUSH_DELAY_MS;\n+ }else{\n+ Random randomGen = new Random();\n+ int randomDelay = (randomGen.nextInt(10) + 1)*1000;\n+ minDelayFrequency += randomDelay;\n+ if(minDelayFrequency < maxDelayFrequency) {\n+ return minDelayFrequency;\n+ }else{\n+ minDelayFrequency = Constants.PUSH_DELAY_MS;\n+ }\n+ return minDelayFrequency;\n+ }\n+ }\n+\n//Event\nprivate void scheduleQueueFlush(final Context context) {\nif (commsRunnable == null)\n@@ -2488,7 +2501,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n};\n// Cancel any outstanding send runnables, and issue a new delayed one\ngetHandlerUsingMainLooper().removeCallbacks(commsRunnable);\n- getHandlerUsingMainLooper().postDelayed(commsRunnable, Constants.PUSH_DELAY_MS);\n+ getHandlerUsingMainLooper().postDelayed(commsRunnable, getDelayFrequency());\ngetConfigLogger().verbose(getAccountId(), \"Scheduling delayed queue flush on main event loop\");\n}\n@@ -3002,6 +3015,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nisBgPing = false;\n}\nheader.put(\"rtl\", getRenderedTargetList());\n+ if(!installReferrerDataSent){\n+ header.put(\"rct\",getReferrerClickTime());\n+ header.put(\"ait\",getAppInstallTime());\n+ header.put(\"iel\",isInstantExperienceLaunched());\n+ }\n// Attach ARP\n@@ -6221,6 +6239,37 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * This method is used to push install referrer via url String\n+ *\n+ * @param url A String with the install referrer parameters\n+ */\n+ @SuppressWarnings({\"unused\"})\n+ public void pushInstallReferrer(String url) {\n+ try {\n+ getConfigLogger().verbose(getAccountId(), \"Referrer received: \" + url);\n+\n+ if (url == null) {\n+ return;\n+ }\n+ int now = (int) (System.currentTimeMillis() / 1000);\n+\n+ //noinspection ConstantConditions\n+ if (installReferrerMap.containsKey(url) && now - installReferrerMap.get(url) < 10) {\n+ getConfigLogger().verbose(getAccountId(), \"Skipping install referrer due to duplicate within 10 seconds\");\n+ return;\n+ }\n+\n+ installReferrerMap.put(url, now);\n+\n+ Uri uri = Uri.parse(\"wzrk://track?install=true&\" + url);\n+\n+ pushDeepLink(uri, true);\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ }\n+\n/**\n* This method is used to push install referrer via UTM source, medium & campaign parameters\n*\n@@ -6256,6 +6305,61 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ public long getReferrerClickTime() {\n+ return referrerClickTime;\n+ }\n+\n+ public long getAppInstallTime() {\n+ return appInstallTime;\n+ }\n+\n+ public boolean isInstantExperienceLaunched() {\n+ return instantExperienceLaunched;\n+ }\n+\n+ private void handleInstallReferrerOnFirstInstall(){\n+ final InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();\n+ referrerClient.startConnection(new InstallReferrerStateListener() {\n+ @Override\n+ public void onInstallReferrerSetupFinished(int responseCode) {\n+ switch (responseCode){\n+ case InstallReferrerClient.InstallReferrerResponse.OK:\n+ // Connection established.\n+ ReferrerDetails response = null;\n+ try {\n+ response = referrerClient.getInstallReferrer();\n+ String referrerUrl = response.getInstallReferrer();\n+ referrerClickTime = response.getReferrerClickTimestampSeconds();\n+ appInstallTime = response.getInstallBeginTimestampSeconds();\n+ instantExperienceLaunched = response.getGooglePlayInstantParam();\n+ pushInstallReferrer(referrerUrl);\n+ installReferrerDataSent = true;\n+ } catch (RemoteException e) {\n+ e.printStackTrace();\n+ referrerClient.endConnection();\n+ }\n+ referrerClient.endConnection();\n+ break;\n+ case InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:\n+ // API not available on the current Play Store app.\n+ //TODO log something\n+ break;\n+ case InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:\n+ // Connection couldn't be established.\n+ //TODO log something\n+ break;\n+ }\n+ }\n+\n+ @Override\n+ public void onInstallReferrerServiceDisconnected() {\n+ if(!installReferrerDataSent){\n+ handleInstallReferrerOnFirstInstall();\n+ }\n+ }\n+ });\n+ }\n+\n/**\n* get the current device location\n* requires Location Permission in AndroidManifest e.g. \"android.permission.ACCESS_COARSE_LOCATION\"\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InstallReferrerBroadcastReceiver.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import android.content.BroadcastReceiver;\n-import android.content.Context;\n-import android.content.Intent;\n-\n-/**\n- * Broadcast receiver for INSTALL_REFERRAL intents.\n- */\n-public final class InstallReferrerBroadcastReceiver extends BroadcastReceiver {\n- public void onReceive(Context context, Intent intent) {\n- CleverTapAPI.handleInstallReferrer(context,intent);\n- }\n-\n-}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Retry mechanism and install referrer changes |
116,623 | 02.01.2020 15:50:30 | -19,080 | f76fa7c9d6024c61d05538a7519f40c185d26c99 | Added networkRetryCount and removed check for InstallReferrer from Validator | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -211,6 +211,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate LocalDataStore localDataStore;\nprivate CleverTapInstanceConfig config;\nprivate int mResponseFailureCount = 0;\n+ private int networkRetryCount = 0;\nprivate int currentRequestTimestamp = 0;\nprivate Location locationFromUser = null;\nprivate SyncListener syncListener = null;\n@@ -2474,17 +2475,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//gives delay frequency based on region\n//randomly adds delay to 1s delay in case of non-EU regions\nprivate int getDelayFrequency(){\n+ if(networkRetryCount < 5){\n+ getConfigLogger().debug(getAccountId(),\"Failure count is \"+networkRetryCount+\". Setting delay frequency to 1s\");\n+ return Constants.PUSH_DELAY_MS;\n+ }\n+ getConfigLogger().debug(getAccountId(),\"Network retry #\"+networkRetryCount);\n+\nif(config.getAccountRegion() == null){\n+ getConfigLogger().debug(getAccountId(),\"Setting delay frequency to 1s\");\nreturn Constants.PUSH_DELAY_MS;\n}else{\nRandom randomGen = new Random();\nint randomDelay = (randomGen.nextInt(10) + 1)*1000;\nminDelayFrequency += randomDelay;\nif(minDelayFrequency < maxDelayFrequency) {\n+ getConfigLogger().debug(getAccountId(),\"Setting delay frequency to \"+minDelayFrequency);\nreturn minDelayFrequency;\n}else{\nminDelayFrequency = Constants.PUSH_DELAY_MS;\n}\n+ getConfigLogger().debug(getAccountId(),\"Setting delay frequency to \"+minDelayFrequency);\nreturn minDelayFrequency;\n}\n}\n@@ -2538,7 +2548,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npostAsyncSafely(\"CommsManager#flushQueueAsync\", new Runnable() {\n@Override\npublic void run() {\n+ if(eventGroup == EventGroup.PUSH_NOTIFICATION_VIEWED) {\ngetConfigLogger().verbose(getAccountId(), \"Pushing Notification Viewed event onto queue flush sync\");\n+ }else{\n+ getConfigLogger().verbose(getAccountId(), \"Pushing event onto queue flush sync\");\n+ }\nflushQueueSync(context, eventGroup);\n}\n});\n@@ -2936,6 +2950,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable e) {\ngetConfigLogger().debug(getAccountId(), \"An exception occurred while sending the queue, will retry: \" + e.getLocalizedMessage());\nmResponseFailureCount++;\n+ networkRetryCount++;\nscheduleQueueFlush(context);\nreturn false;\n} finally {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"diff": "@@ -30,7 +30,6 @@ final class ManifestValidator {\nprivate static void checkReceiversServices(final Context context, DeviceInfo deviceInfo){\ntry {\nvalidateReceiverInManifest((Application) context.getApplicationContext(), CTPushNotificationReceiver.class.getName());\n- validateReceiverInManifest((Application) context.getApplicationContext(), InstallReferrerBroadcastReceiver.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTNotificationIntentService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundJobService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundIntentService.class.getName());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added networkRetryCount and removed check for InstallReferrer from Validator |
116,623 | 09.01.2020 11:43:18 | -19,080 | 9beb87f75a1f653935bdb85300f1c276bd5e01f9 | Increasing retry count and reducing max delay | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -223,7 +223,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate String source = null, medium = null, campaign = null;\nprivate JSONObject wzrkParams = null;\nprivate int lastVisitTime;\n- private int maxDelayFrequency = 1000000;\n+ private int maxDelayFrequency = 1000*60*10;\nprivate int minDelayFrequency = 0;\nprivate boolean installReferrerDataSent = false;\nprivate long referrerClickTime = 0;\n@@ -2475,7 +2475,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//gives delay frequency based on region\n//randomly adds delay to 1s delay in case of non-EU regions\nprivate int getDelayFrequency(){\n- if(networkRetryCount < 5){\n+ if(networkRetryCount < 10){\ngetConfigLogger().debug(getAccountId(),\"Failure count is \"+networkRetryCount+\". Setting delay frequency to 1s\");\nreturn Constants.PUSH_DELAY_MS;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Increasing retry count and reducing max delay |
116,623 | 09.01.2020 16:00:52 | -19,080 | cd861413bdb0907c02932a786915366c25753fa3 | Resetting network retry count and min delay frequency in case of success | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2475,16 +2475,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//gives delay frequency based on region\n//randomly adds delay to 1s delay in case of non-EU regions\nprivate int getDelayFrequency(){\n+ getConfigLogger().debug(getAccountId(),\"Network retry #\"+networkRetryCount);\n+\n+ //Retry with delay as 1s for first 10 retries\nif(networkRetryCount < 10){\ngetConfigLogger().debug(getAccountId(),\"Failure count is \"+networkRetryCount+\". Setting delay frequency to 1s\");\n- return Constants.PUSH_DELAY_MS;\n+ minDelayFrequency = Constants.PUSH_DELAY_MS; //reset minimum delay to 1s\n+ return minDelayFrequency;\n}\n- getConfigLogger().debug(getAccountId(),\"Network retry #\"+networkRetryCount);\nif(config.getAccountRegion() == null){\n+ //Retry with delay as 1s if region is null in case of eu1\ngetConfigLogger().debug(getAccountId(),\"Setting delay frequency to 1s\");\nreturn Constants.PUSH_DELAY_MS;\n}else{\n+ //Retry with delay as minimum delay frequency and add random number of seconds to scatter traffic\nRandom randomGen = new Random();\nint randomDelay = (randomGen.nextInt(10) + 1)*1000;\nminDelayFrequency += randomDelay;\n@@ -2946,6 +2951,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().debug(getAccountId(), \"Queue sent successfully\");\nmResponseFailureCount = 0;\n+ networkRetryCount = 0; //reset retry count when queue is sent successfully\nreturn true;\n} catch (Throwable e) {\ngetConfigLogger().debug(getAccountId(), \"An exception occurred while sending the queue, will retry: \" + e.getLocalizedMessage());\n@@ -6320,19 +6326,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- public long getReferrerClickTime() {\n+ private long getReferrerClickTime() {\nreturn referrerClickTime;\n}\n- public long getAppInstallTime() {\n+ private long getAppInstallTime() {\nreturn appInstallTime;\n}\n- public boolean isInstantExperienceLaunched() {\n+ private boolean isInstantExperienceLaunched() {\nreturn instantExperienceLaunched;\n}\nprivate void handleInstallReferrerOnFirstInstall(){\n+ getConfigLogger().verbose(getAccountId(),\"Starting to handle install referrer\");\nfinal InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();\nreferrerClient.startConnection(new InstallReferrerStateListener() {\n@Override\n@@ -6349,19 +6356,21 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ninstantExperienceLaunched = response.getGooglePlayInstantParam();\npushInstallReferrer(referrerUrl);\ninstallReferrerDataSent = true;\n+ getConfigLogger().debug(getAccountId(),\"Install Referrer data set\");\n} catch (RemoteException e) {\ne.printStackTrace();\nreferrerClient.endConnection();\n+ installReferrerDataSent = false;\n}\nreferrerClient.endConnection();\nbreak;\ncase InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:\n// API not available on the current Play Store app.\n- //TODO log something\n+ getConfigLogger().debug(getAccountId(),\"Install Referrer data not set, API not supported by Play Store on device\");\nbreak;\ncase InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:\n// Connection couldn't be established.\n- //TODO log something\n+ getConfigLogger().debug(getAccountId(),\"Install Referrer data not set, connection to Play Store unavailable\");\nbreak;\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Resetting network retry count and min delay frequency in case of success |
116,621 | 10.01.2020 12:28:13 | -19,080 | 37ff992095d3962bb61b78af84b1b32ff39fad3f | Added Install Referrer Receiver Logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "android:versionCode=\"30603\"\nandroid:versionName=\"3.6.3\">\n<application>\n+ <receiver\n+ android:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n+ android:exported=\"true\">\n+ <intent-filter>\n+ <action android:name=\"com.android.vending.INSTALL_REFERRER\" />\n+ </intent-filter>\n+ </receiver>\n+\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\nandroid:configChanges=\"keyboardHidden\"\n<receiver\nandroid:name=\"com.clevertap.android.sdk.CTPushNotificationReceiver\"\n- android:exported=\"false\"\n- android:enabled=\"true\">\n- </receiver>\n+ android:enabled=\"true\"\n+ android:exported=\"false\"></receiver>\n<service\nandroid:name=\"com.clevertap.android.sdk.CTBackgroundIntentService\"\n- android:permission=\"android.permission.BIND_JOB_SERVICE\"\n- android:exported=\"false\">\n+ android:exported=\"false\"\n+ android:permission=\"android.permission.BIND_JOB_SERVICE\">\n<intent-filter>\n<action android:name=\"com.clevertap.BG_EVENT\" />\n</intent-filter>\n<service\nandroid:name=\"com.clevertap.android.sdk.CTBackgroundJobService\"\n- android:permission=\"android.permission.BIND_JOB_SERVICE\"\n- android:exported=\"false\">\n- </service>\n+ android:exported=\"false\"\n+ android:permission=\"android.permission.BIND_JOB_SERVICE\"></service>\n</application>\n</manifest>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1302,6 +1302,25 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ static void handleInstallReferrerViaReceiver(Context context, Intent intent) {\n+ if (instances == null) {\n+ Logger.v(\"No CleverTap Instance found\");\n+ CleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\n+ if (instance != null) {\n+ instance.pushInstallReferrer(intent);\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.pushInstallReferrer(intent);\n+ }\n+ }\n+\n+ }\n+\n/**\n* This method is used to change the credentials of CleverTap account Id and token programmatically\n*\n@@ -7667,6 +7686,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* This method handles send Test flow for Display Units\n+ *\n* @param extras - bundled data of notification payload\n*/\nprivate void handleSendTestForDisplayUnits(Bundle extras) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InstallReferrerBroadcastReceiver.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.content.BroadcastReceiver;\n+import android.content.Context;\n+import android.content.Intent;\n+\n+/**\n+ * Broadcast receiver for INSTALL_REFERRAL intents.\n+ */\n+public final class InstallReferrerBroadcastReceiver extends BroadcastReceiver {\n+\n+ public void onReceive(Context context, Intent intent) {\n+ CleverTapAPI.handleInstallReferrerViaReceiver(context, intent);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"diff": "@@ -30,12 +30,12 @@ final class ManifestValidator {\nprivate static void checkReceiversServices(final Context context, DeviceInfo deviceInfo) {\ntry {\nvalidateReceiverInManifest((Application) context.getApplicationContext(), CTPushNotificationReceiver.class.getName());\n+ validateReceiverInManifest((Application) context.getApplicationContext(), InstallReferrerBroadcastReceiver.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTNotificationIntentService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundJobService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundIntentService.class.getName());\nvalidateActivityInManifest((Application) context.getApplicationContext(), InAppNotificationActivity.class);\n- }\n- catch (Exception e){\n+ } catch (Exception e) {\nLogger.v(\"Receiver/Service issue : \" + e.toString());\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Added Install Referrer Receiver Logic |
116,623 | 10.01.2020 16:06:07 | -19,080 | c2dac8227f6ab21a991e233466ae51a6338d7968 | Deprecation warning for InstallReferrerBroadcastReceiver and related methods | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1302,7 +1302,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- static void handleInstallReferrerViaReceiver(Context context, Intent intent) {\n+ //Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n+ @Deprecated\n+ static void handleInstallReferrer(Context context, Intent intent) {\nif (instances == null) {\nLogger.v(\"No CleverTap Instance found\");\nCleverTapAPI instance = CleverTapAPI.getDefaultInstance(context);\n@@ -6238,10 +6240,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* This method is used to push install referrer via Intent\n+ * Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n*\n* @param intent An Intent with the install referrer parameters\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ @Deprecated\npublic void pushInstallReferrer(Intent intent) {\ntry {\nfinal Bundle extras = intent.getExtras();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InstallReferrerBroadcastReceiver.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InstallReferrerBroadcastReceiver.java",
"diff": "@@ -6,10 +6,12 @@ import android.content.Intent;\n/**\n* Broadcast receiver for INSTALL_REFERRAL intents.\n+ * Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n*/\n+@Deprecated\npublic final class InstallReferrerBroadcastReceiver extends BroadcastReceiver {\npublic void onReceive(Context context, Intent intent) {\n- CleverTapAPI.handleInstallReferrerViaReceiver(context,intent);\n+ CleverTapAPI.handleInstallReferrer(context,intent);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Deprecation warning for InstallReferrerBroadcastReceiver and related methods |
116,621 | 03.02.2020 11:30:23 | -19,080 | 49ae3db212208b5ac5f3dfa41554b934aeb7d49f | branch(init):Created 3.7.0 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.6.3'\n+ libraryVersion = '3.7.0'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30603\"\n- android:versionName=\"3.6.3\">\n+ android:versionCode=\"30700\"\n+ android:versionName=\"3.7.0\">\n<application>\n<receiver\nandroid:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | branch(init):Created 3.7.0 |
116,621 | 11.02.2020 23:02:33 | -19,080 | 315a9e4339b48e298bb58045128e862c4f78ac4d | fix(bug Phone Only):Half Interstitial(Content Only) UI issue on portrait and landscape mode. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialFragment.java",
"diff": "@@ -6,6 +6,7 @@ import android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\nimport android.os.Build;\nimport android.os.Bundle;\n+import android.os.Handler;\nimport android.support.annotation.Nullable;\nimport android.support.annotation.RequiresApi;\nimport android.view.Gravity;\n@@ -70,6 +71,15 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\n} else {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.3f);\nrelativeLayout1.setLayoutParams(layoutParams);\n+\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout.getRight() - margin);\n+ closeImageView.setY(relativeLayout.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -100,6 +110,14 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\nlayoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.3f);\nlayoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout.getRight() - margin);\n+ closeImageView.setY(relativeLayout.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_half_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_half_interstitial.xml",
"diff": "android:layout_marginRight=\"124dp\"\nandroid:layout_marginEnd=\"124dp\"\nandroid:layout_marginTop=\"33dp\"\n- android:layout_marginBottom=\"33dp\"\n+ android:layout_marginBottom=\"16dp\"\n>\n<ImageView\n<LinearLayout\nandroid:id=\"@+id/half_interstitial_linear_layout\"\n- android:layout_width=\"wrap_content\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:layout_below=\"@+id/half_interstitial_message\"\nandroid:gravity=\"center\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_marginTop=\"96dp\"\n+ android:layout_marginLeft=\"30dp\"\n+ android:layout_marginRight=\"30dp\"\n+ android:layout_marginBottom=\"16dp\"\nandroid:orientation=\"horizontal\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/half_interstitial_button1\"\n- android:layout_width=\"160dp\"\n+ android:layout_width=\"0dp\"\n+ android:layout_weight=\"1\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:visibility=\"gone\"/>\n<Button\nandroid:id=\"@+id/half_interstitial_button2\"\n- android:layout_width=\"160dp\"\n+ android:layout_width=\"0dp\"\n+ android:layout_weight=\"1\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:layout_marginLeft=\"20dp\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inapp_half_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inapp_half_interstitial.xml",
"diff": "android:id=\"@+id/half_interstitial_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n+ android:layout_gravity=\"center\"\nandroid:layout_marginLeft=\"45dp\"\nandroid:layout_marginStart=\"45dp\"\nandroid:layout_marginRight=\"45dp\"\n<LinearLayout\nandroid:id=\"@+id/half_interstitial_linear_layout\"\n- android:layout_width=\"wrap_content\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\n+ android:layout_marginRight=\"30dp\"\n+ android:layout_marginLeft=\"30dp\"\nandroid:layout_marginBottom=\"26dp\"\nandroid:layout_below=\"@+id/half_interstitial_message\"\nandroid:gravity=\"bottom\"\n<Button\nandroid:id=\"@+id/half_interstitial_button1\"\n- android:layout_width=\"224dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:visibility=\"invisible\"/>\n<Button\nandroid:id=\"@+id/half_interstitial_button2\"\n- android:layout_width=\"224dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:layout_marginTop=\"12dp\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(bug Phone Only):Half Interstitial(Content Only) UI issue on portrait and landscape mode. |
116,621 | 12.02.2020 11:54:42 | -19,080 | 67f186ca1de9b2dfdd2f1b39cf027efa1009e222 | fix(bug Phone Only):Half Interstitial(Image Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeHalfInterstitialImageFragment.java",
"diff": "@@ -6,6 +6,7 @@ import android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\nimport android.os.Build;\nimport android.os.Bundle;\n+import android.os.Handler;\nimport android.support.annotation.Nullable;\nimport android.view.Gravity;\nimport android.view.LayoutInflater;\n@@ -63,6 +64,14 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\n} else {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.3f);\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout.getRight() - margin);\n+ closeImageView.setY(relativeLayout.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -93,6 +102,14 @@ public class CTInAppNativeHalfInterstitialImageFragment extends CTInAppBaseFullF\nlayoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.3f);\nlayoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout.getRight() - margin);\n+ closeImageView.setY(relativeLayout.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inapp_half_interstitial_image.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inapp_half_interstitial_image.xml",
"diff": "android:id=\"@+id/half_interstitial_image_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n+ android:layout_gravity=\"center\"\nandroid:layout_marginTop=\"120dp\"\nandroid:layout_marginRight=\"45dp\"\nandroid:layout_marginBottom=\"120dp\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(bug Phone Only):Half Interstitial(Image Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 |
116,623 | 12.02.2020 13:29:22 | -19,080 | dd4cae60bed4751def27c4a9509ed302e09aeeb4 | CLEVER-7265 #dev-complete #comment Added Public APIs for all Chinese Push Services and associated logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -280,7 +280,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate int lastLocationPingTime = 0;\nprivate final Object tokenLock = new Object();\nprivate final Object notificationMapLock = new Object();\n- private boolean havePushedDeviceToken = false;\n+ private boolean havePushedFCMToken = false;\n+ private boolean havePushedXPSToken = false;\n+ private boolean havePushedBPSToken = false;\n+ private boolean havePushedHPSToken = false;\nprivate String processingUserLoginIdentifier = null;\nprivate final Boolean processingUserLoginLock = true;\nprivate long EXECUTOR_THREAD_ID = 0;\n@@ -1245,6 +1248,51 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ private void cacheXPSToken(String token) {\n+ try {\n+ if (token == null || alreadyHaveXPSToken(token)) return;\n+\n+ final SharedPreferences prefs = getPreferences();\n+ if (prefs == null) return;\n+\n+ SharedPreferences.Editor editor = prefs.edit();\n+ editor.putString(storageKeyWithSuffix(Constants.XPS_PROPERTY_REG_ID), token);\n+ StorageHelper.persist(editor);\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Unable to cache FCM Token\", t);\n+ }\n+ }\n+\n+ private void cacheBPSToken(String token) {\n+ try {\n+ if (token == null || alreadyHaveBPSToken(token)) return;\n+\n+ final SharedPreferences prefs = getPreferences();\n+ if (prefs == null) return;\n+\n+ SharedPreferences.Editor editor = prefs.edit();\n+ editor.putString(storageKeyWithSuffix(Constants.BPS_PROPERTY_REG_ID), token);\n+ StorageHelper.persist(editor);\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Unable to cache FCM Token\", t);\n+ }\n+ }\n+\n+ private void cacheHPSToken(String token) {\n+ try {\n+ if (token == null || alreadyHaveHPSToken(token)) return;\n+\n+ final SharedPreferences prefs = getPreferences();\n+ if (prefs == null) return;\n+\n+ SharedPreferences.Editor editor = prefs.edit();\n+ editor.putString(storageKeyWithSuffix(Constants.HPS_PROPERTY_REG_ID), token);\n+ StorageHelper.persist(editor);\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"FcmManager: Unable to cache FCM Token\", t);\n+ }\n+ }\n+\n//Push\nprivate boolean alreadyHaveFCMToken(final String newToken) {\nif (newToken == null) return false;\n@@ -1252,12 +1300,45 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn (cachedToken != null && cachedToken.equals(newToken));\n}\n+ private boolean alreadyHaveXPSToken(final String newToken) {\n+ if (newToken == null) return false;\n+ String cachedToken = getCachedXPSToken();\n+ return (cachedToken != null && cachedToken.equals(newToken));\n+ }\n+\n+ private boolean alreadyHaveBPSToken(final String newToken) {\n+ if (newToken == null) return false;\n+ String cachedToken = getCachedBPSToken();\n+ return (cachedToken != null && cachedToken.equals(newToken));\n+ }\n+\n+ private boolean alreadyHaveHPSToken(final String newToken) {\n+ if (newToken == null) return false;\n+ String cachedToken = getCachedHPSToken();\n+ return (cachedToken != null && cachedToken.equals(newToken));\n+ }\n+\n//Push\nprivate String getCachedFCMToken() {\nSharedPreferences prefs = getPreferences();\nreturn (prefs == null) ? null : getStringFromPrefs(Constants.FCM_PROPERTY_REG_ID, null);\n}\n+ private String getCachedXPSToken() {\n+ SharedPreferences prefs = getPreferences();\n+ return (prefs == null) ? null : getStringFromPrefs(Constants.XPS_PROPERTY_REG_ID, null);\n+ }\n+\n+ private String getCachedBPSToken() {\n+ SharedPreferences prefs = getPreferences();\n+ return (prefs == null) ? null : getStringFromPrefs(Constants.BPS_PROPERTY_REG_ID, null);\n+ }\n+\n+ private String getCachedHPSToken() {\n+ SharedPreferences prefs = getPreferences();\n+ return (prefs == null) ? null : getStringFromPrefs(Constants.HPS_PROPERTY_REG_ID, null);\n+ }\n+\n/**\n* Launches an asynchronous task to delete the notification channel from CleverTap\n* <p/>\n@@ -1382,7 +1463,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Push\nprivate void pushFCMDeviceToken(String token, final boolean register, final boolean forceUpdate) {\nsynchronized (tokenLock) {\n- if (havePushedDeviceToken && !forceUpdate) {\n+ if (havePushedFCMToken && !forceUpdate) {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: skipping device token push - already sent.\");\nreturn;\n}\n@@ -1391,13 +1472,65 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ntoken = (token != null) ? token : getCachedFCMToken();\nif (token == null) return;\npushDeviceToken(context, token, register, PushType.FCM);\n- havePushedDeviceToken = true;\n+ havePushedFCMToken = true;\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"FcmManager: pushing device token failed\", t);\n}\n}\n}\n+ private void pushXPSDeviceToken(String token, final boolean register, final boolean forceUpdate) {\n+ synchronized (tokenLock) {\n+ if (havePushedXPSToken && !forceUpdate) {\n+ getConfigLogger().verbose(getAccountId(), \"Xiaomi: skipping device token push - already sent.\");\n+ return;\n+ }\n+\n+ try {\n+ token = (token != null) ? token : getCachedXPSToken();\n+ if (token == null) return;\n+ pushDeviceToken(context, token, register, PushType.XPS);\n+ havePushedXPSToken = true;\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"Xiaomi: pushing device token failed\", t);\n+ }\n+ }\n+ }\n+ private void pushBPSDeviceToken(String token, final boolean register, final boolean forceUpdate) {\n+ synchronized (tokenLock) {\n+ if (havePushedBPSToken && !forceUpdate) {\n+ getConfigLogger().verbose(getAccountId(), \"Baidu: skipping device token push - already sent.\");\n+ return;\n+ }\n+\n+ try {\n+ token = (token != null) ? token : getCachedBPSToken();\n+ if (token == null) return;\n+ pushDeviceToken(context, token, register, PushType.BPS);\n+ havePushedBPSToken = true;\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"Baidu: pushing device token failed\", t);\n+ }\n+ }\n+ }\n+ private void pushHPSDeviceToken(String token, final boolean register, final boolean forceUpdate) {\n+ synchronized (tokenLock) {\n+ if (havePushedHPSToken && !forceUpdate) {\n+ getConfigLogger().verbose(getAccountId(), \"Huawei: skipping device token push - already sent.\");\n+ return;\n+ }\n+\n+ try {\n+ token = (token != null) ? token : getCachedHPSToken();\n+ if (token == null) return;\n+ pushDeviceToken(context, token, register, PushType.HPS);\n+ havePushedHPSToken = true;\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), \"Huawei: pushing device token failed\", t);\n+ }\n+ }\n+ }\n+\n//Push\n@SuppressWarnings(\"SameParameterValue\")\nprivate void deviceTokenDidRefresh(String token, PushType type) {\n@@ -4971,6 +5104,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfor (PushType pushType : enabledPushTypes) {\nif (pushType == PushType.FCM) {\npushFCMDeviceToken(null, register, force);\n+ } else if (pushType == PushType.XPS){\n+ pushXPSDeviceToken(null,register,force);\n+ } else if(pushType == PushType.BPS){\n+ pushBPSDeviceToken(null,register,force);\n+ } else if(pushType == PushType.HPS){\n+ pushHPSDeviceToken(null,register,force);\n}\n}\n}\n@@ -5109,6 +5248,52 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings(\"unused\")\npublic void pushFcmRegistrationId(String fcmId, boolean register) {\npushDeviceToken(fcmId, register, PushType.FCM);\n+ cacheFCMToken(fcmId);\n+ }\n+\n+ /**\n+ * Sends the Xiaomi registration ID to CleverTap.\n+ *\n+ * @param regId The Xiaomi registration ID\n+ * @param register Boolean indicating whether to register\n+ * or not for receiving push messages from CleverTap.\n+ * Set this to true to receive push messages from CleverTap,\n+ * and false to not receive any messages from CleverTap.\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushXiaomiRegistrationId(String regId, boolean register) {\n+ pushDeviceToken(regId, register, PushType.XPS);\n+ cacheXPSToken(regId);\n+ }\n+\n+ /**\n+ * Sends the Baidu registration ID to CleverTap.\n+ *\n+ * @param regId The Baidu registration ID\n+ * @param register Boolean indicating whether to register\n+ * or not for receiving push messages from CleverTap.\n+ * Set this to true to receive push messages from CleverTap,\n+ * and false to not receive any messages from CleverTap.\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushBaiduRegistrationId(String regId, boolean register) {\n+ pushDeviceToken(regId, register, PushType.BPS);\n+ cacheBPSToken(regId);\n+ }\n+\n+ /**\n+ * Sends the Huawei registration ID to CleverTap.\n+ *\n+ * @param regId The Huawei registration ID\n+ * @param register Boolean indicating whether to register\n+ * or not for receiving push messages from CleverTap.\n+ * Set this to true to receive push messages from CleverTap,\n+ * and false to not receive any messages from CleverTap.\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void pushHuaweiRegistrationId(String regId, boolean register) {\n+ pushDeviceToken(regId, register, PushType.HPS);\n+ cacheHPSToken(regId);\n}\n//Util\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -97,6 +97,9 @@ public class Constants {\nstatic final String NOTIFICATION_TAG = \"wzrk_pn\";\nstatic final String CHARGED_EVENT = \"Charged\";\nstatic final String FCM_PROPERTY_REG_ID = \"fcm_token\";\n+ static final String XPS_PROPERTY_REG_ID = \"fcm_token\";\n+ static final String BPS_PROPERTY_REG_ID = \"fcm_token\";\n+ static final String HPS_PROPERTY_REG_ID = \"fcm_token\";\nstatic final String KEY_MUTED = \"comms_mtd\";\nstatic final int EMPTY_NOTIFICATION_ID = -1000;\nstatic final String KEY_MAX_PER_DAY = \"istmcd_inapp\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -319,7 +319,13 @@ class DeviceInfo {\nprivate static ArrayList<PushType> enabledPushTypes = null;\nprivate static Boolean isFirebasePresent = null;\n+ private static Boolean isXiaomiPresent = null;\n+ private static Boolean isBaiduPresent = null;\n+ private static Boolean isHuaweiPresent = null;\nprivate static final String FIREBASE_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";\n+ private static final String XIAOMI_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\n+ private static final String BAIDU_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\n+ private static final String HUAWEI_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\nprivate boolean isFCMAvailable() {\nif (isFirebasePresent == null) {\n@@ -335,6 +341,48 @@ class DeviceInfo {\nreturn isFirebasePresent;\n}\n+ private boolean isXiaomiAvailable(){\n+ if (isXiaomiPresent == null) {\n+ try {\n+ Class.forName(XIAOMI_CLASS_NAME);\n+ isXiaomiPresent = true;\n+ getConfigLogger().verbose(\"Xiaomi Push installed\");\n+ } catch (ClassNotFoundException e) {\n+ isXiaomiPresent = false;\n+ Logger.d(\"Xiaomi Push unavailable, will be unable to request Xiaomi Push token\");\n+ }\n+ }\n+ return isXiaomiPresent;\n+ }\n+\n+ private boolean isBaiduAvailable(){\n+ if (isBaiduPresent == null) {\n+ try {\n+ Class.forName(BAIDU_CLASS_NAME);\n+ isBaiduPresent = true;\n+ getConfigLogger().verbose(\"Baidu Push installed\");\n+ } catch (ClassNotFoundException e) {\n+ isBaiduPresent = false;\n+ Logger.d(\"Baidu Push unavailable, will be unable to request Baidu Push token\");\n+ }\n+ }\n+ return isBaiduPresent;\n+ }\n+\n+ private boolean isHuaweiAvailable(){\n+ if (isHuaweiPresent == null) {\n+ try {\n+ Class.forName(HUAWEI_CLASS_NAME);\n+ isHuaweiPresent = true;\n+ getConfigLogger().verbose(\"Huawei Push installed\");\n+ } catch (ClassNotFoundException e) {\n+ isHuaweiPresent = false;\n+ Logger.d(\"Huawei Push unavailable, will be unable to request Huawei Push token\");\n+ }\n+ }\n+ return isHuaweiPresent;\n+ }\n+\nArrayList<PushType> getEnabledPushTypes() {\nif (enabledPushTypes == null) {\nenabledPushTypes = new ArrayList<>();\n@@ -344,6 +392,18 @@ class DeviceInfo {\nif (fcmAvail) {\nenabledPushTypes.add(PushType.FCM);\n}\n+ boolean xiaomiAvail = isXiaomiAvailable();\n+ if(xiaomiAvail){\n+ enabledPushTypes.add(PushType.XPS);\n+ }\n+ boolean baiduAvail = isBaiduAvailable();\n+ if(baiduAvail){\n+ enabledPushTypes.add(PushType.BPS);\n+ }\n+ boolean huaweiAvail = isHuaweiAvailable();\n+ if(huaweiAvail){\n+ enabledPushTypes.add(PushType.HPS);\n+ }\n}\nreturn enabledPushTypes;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/PushType.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/PushType.java",
"diff": "@@ -3,7 +3,10 @@ package com.clevertap.android.sdk;\nimport android.support.annotation.NonNull;\npublic enum PushType {\n- FCM(\"fcm\");\n+ FCM(\"fcm\"),\n+ HPS(\"hps\"),\n+ XPS(\"xps\"),\n+ BPS(\"bps\");\nprivate final String type;\n@@ -15,6 +18,12 @@ public enum PushType {\nstatic PushType fromString(String type) {\nif (\"fcm\".equals(type)) {\nreturn PushType.FCM;\n+ } else if (\"hps\".equals(type)) {\n+ return PushType.HPS;\n+ } else if (\"xps\".equals(type)) {\n+ return PushType.XPS;\n+ } else if (\"bps\".equals(type)) {\n+ return PushType.BPS;\n} else {\nreturn null;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | CLEVER-7258 CLEVER-7265 CLEVER-7266 #dev-complete #comment Added Public APIs for all Chinese Push Services and associated logic |
116,621 | 12.02.2020 14:01:57 | -19,080 | 7f3dc0c00e339581e5160be59c060bc194068c30 | fix(bug Phone Only):Interstitial(Content Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -3,7 +3,6 @@ package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\nimport android.app.Dialog;\nimport android.content.res.Configuration;\n-import android.content.res.Resources;\nimport android.graphics.Bitmap;\nimport android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\n@@ -11,6 +10,7 @@ import android.graphics.drawable.Drawable;\nimport android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\n+import android.os.Handler;\nimport android.support.annotation.Nullable;\nimport android.support.annotation.RequiresApi;\nimport android.support.v4.content.ContextCompat;\n@@ -88,7 +88,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_relative_layout);\n+ final RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_relative_layout);\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n@@ -107,6 +107,14 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nLogger.d(\"Layout height = \" + layoutHeight);\nLogger.d(\"Layout width = \" + relativeLayout1.getMeasuredWidth());\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout1.getRight() - margin);\n+ closeImageView.setY(relativeLayout1.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -146,7 +154,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_relative_layout);\n+ final RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_relative_layout);\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1.getLayoutParams();\nif (!inAppNotification.isTablet() || !isTablet()) {\nif (isTablet()) {\n@@ -162,6 +170,14 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nlayoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\nlayoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout1.getRight() - margin);\n+ closeImageView.setY(relativeLayout1.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout-land/inapp_interstitial.xml",
"diff": "<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:app=\"http://schemas.android.com/apk/res-auto\"\nandroid:id=\"@+id/inapp_interstitial_frame_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n<LinearLayout\nandroid:id=\"@+id/interstitial_linear_layout\"\n- android:layout_width=\"wrap_content\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_below=\"@id/interstitial_message\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:orientation=\"horizontal\"\n+ android:layout_marginLeft=\"30dp\"\n+ android:layout_marginRight=\"30dp\"\nandroid:layout_marginTop=\"12dp\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/interstitial_button1\"\n- android:layout_width=\"206dp\"\n+ android:layout_width=\"0dp\"\n+ android:layout_weight=\"1\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:visibility=\"gone\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\n- android:layout_width=\"206dp\"\n+ android:layout_width=\"0dp\"\n+ android:layout_weight=\"1\"\nandroid:layout_height=\"40dp\"\nandroid:textSize=\"16sp\"\nandroid:layout_marginLeft=\"18dp\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inapp_interstitial.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inapp_interstitial.xml",
"diff": "<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:app=\"http://schemas.android.com/apk/res-auto\"\nandroid:id=\"@+id/inapp_interstitial_frame_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n<RelativeLayout\nandroid:id=\"@+id/interstitial_relative_layout\"\n+ android:layout_gravity=\"center\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_marginTop=\"60dp\"\n<LinearLayout\nandroid:id=\"@+id/interstitial_linear_layout\"\n- android:layout_width=\"wrap_content\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_below=\"@id/interstitial_message\"\nandroid:layout_alignParentBottom=\"true\"\nandroid:layout_centerHorizontal=\"true\"\nandroid:orientation=\"vertical\"\nandroid:gravity=\"bottom\"\n+ android:layout_marginLeft=\"30dp\"\n+ android:layout_marginRight=\"30dp\"\nandroid:layout_marginBottom=\"30dp\"\nandroid:visibility=\"visible\">\n<Button\nandroid:id=\"@+id/interstitial_button1\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\nandroid:visibility=\"invisible\" />\n<Button\nandroid:id=\"@+id/interstitial_button2\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_marginTop=\"14dp\"\nandroid:layout_height=\"42dp\"\nandroid:textSize=\"16sp\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(bug Phone Only):Interstitial(Content Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 |
116,621 | 12.02.2020 14:26:22 | -19,080 | 6c2ba8f38537c13c5a3861c137eacde04fd4710c | fix(bug Phone Only):Interstitial(Image Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialImageFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialImageFragment.java",
"diff": "@@ -6,6 +6,7 @@ import android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\nimport android.os.Build;\nimport android.os.Bundle;\n+import android.os.Handler;\nimport android.support.annotation.Nullable;\nimport android.view.Gravity;\nimport android.view.LayoutInflater;\n@@ -48,7 +49,7 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_image_relative_layout);\n+ final RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_image_relative_layout);\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1.getLayoutParams();\nif (inAppNotification.isTablet() && isTablet()) {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\n@@ -65,6 +66,14 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\n} else {\nlayoutHeight = layoutParams.height = (int) (relativeLayout1.getMeasuredWidth() * 1.78f);\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout1.getRight() - margin);\n+ closeImageView.setY(relativeLayout1.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n@@ -79,7 +88,7 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\nrelativeLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {\n@Override\npublic void onGlobalLayout() {\n- RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_image_relative_layout);\n+ final RelativeLayout relativeLayout1 = fl.findViewById(R.id.interstitial_image_relative_layout);\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout1.getLayoutParams();\nif (!inAppNotification.isTablet() || !isTablet()) {\nif (isTablet()) {\n@@ -95,6 +104,14 @@ public class CTInAppNativeInterstitialImageFragment extends CTInAppBaseFullFragm\nlayoutWidth = layoutParams.width = (int) (relativeLayout1.getMeasuredHeight() * 1.78f);\nlayoutParams.gravity = Gravity.CENTER_HORIZONTAL;\nrelativeLayout1.setLayoutParams(layoutParams);\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ int margin = closeImageView.getMeasuredWidth() / 2;\n+ closeImageView.setX(relativeLayout1.getRight() - margin);\n+ closeImageView.setY(relativeLayout1.getTop() - margin);\n+ }\n+ });\n}\n}\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/res/layout/inapp_interstitial_image.xml",
"new_path": "clevertap-android-sdk/src/main/res/layout/inapp_interstitial_image.xml",
"diff": "<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:app=\"http://schemas.android.com/apk/res-auto\"\nandroid:id=\"@+id/inapp_interstitial_image_frame_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n<RelativeLayout\nandroid:id=\"@+id/interstitial_image_relative_layout\"\n+ android:layout_gravity=\"center\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_marginRight=\"45dp\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(bug Phone Only):Interstitial(Image Only) UI issue on portrait and landscape mode
fixes:https://wizrocket.atlassian.net/browse/CLEVER-3836 |
116,623 | 19.02.2020 15:39:48 | -19,080 | 7f15ac1a7ca6b2aa1b714a83d80b561b22a2c95a | fix: Raising UTM Visited only on first launch #comment Fixes the bug where UTM Visited was raised with every App Launched | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.0.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.0.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "android:versionCode=\"30700\"\nandroid:versionName=\"3.7.0\">\n<application>\n- <receiver\n- android:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n- android:exported=\"true\">\n- <intent-filter>\n- <action android:name=\"com.android.vending.INSTALL_REFERRER\" />\n- </intent-filter>\n- </receiver>\n-\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\nandroid:configChanges=\"keyboardHidden\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1843,8 +1843,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!isAppLaunchPushed()) {\npushAppLaunchedEvent();\nonTokenRefresh();\n- if (!installReferrerDataSent) {\n+ if (!installReferrerDataSent && isFirstSession()) {\nhandleInstallReferrerOnFirstInstall();\n+ }else{\n+ getConfigLogger().verbose(getAccountId(),\"Not raising Install Referrer event as it is not first install\");\n}\n}\nif (!inCurrentSession()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -283,4 +283,21 @@ public final class Utils {\n}\n}\n}\n+\n+ /**\n+ * @param content String which contains bundle information\n+ * @return Bundle to be passed to createNotification(Context context, Bundle extras)\n+ * @throws JSONException\n+ */\n+ public static Bundle stringToBundle(String content) throws JSONException {\n+ JSONObject jsonObject = new JSONObject(content);\n+ Bundle bundle = new Bundle();\n+ Iterator iter = jsonObject.keys();\n+ while(iter.hasNext()){\n+ String key = (String)iter.next();\n+ String value = jsonObject.getString(key);\n+ bundle.putString(key,value);\n+ }\n+ return bundle;\n+ }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Raising UTM Visited only on first launch CLEVER-8572 CLEVER-8661 #comment Fixes the bug where UTM Visited was raised with every App Launched |
116,623 | 19.02.2020 16:15:44 | -19,080 | 8f09293993ffd99f06e8bb93244991838f0411ee | feat(CTA buttons): First pass at enabling CTNotificationIntentService to be extended | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -77,6 +77,7 @@ import java.util.Iterator;\nimport java.util.List;\nimport java.util.Locale;\nimport java.util.Map;\n+import java.util.Objects;\nimport java.util.Random;\nimport java.util.TimeZone;\nimport java.util.concurrent.ExecutorService;\n@@ -833,7 +834,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npackageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\nServiceInfo[] services = packageInfo.services;\nfor (ServiceInfo serviceInfo : services) {\n- if (serviceInfo.name.equals(clazz.getName())) {\n+ if (serviceInfo.name.equals(clazz.getName()) ||\n+ (serviceInfo.getClass().getSuperclass().getName() != null && serviceInfo.getClass().getSuperclass().getName().equals(clazz.getName()))) {\nLogger.v(\"Service \" + serviceInfo.name + \" found\");\nreturn true;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(CTA buttons): First pass at enabling CTNotificationIntentService to be extended CLEVER-8178 |
116,623 | 19.02.2020 18:18:04 | -19,080 | 574cf76014bcc741efd8e6e3aee99246ee11032e | feat(CTA buttons): Second pass at enabling CTNotificationIntentService to be extended | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -835,13 +835,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nServiceInfo[] services = packageInfo.services;\nfor (ServiceInfo serviceInfo : services) {\nif (serviceInfo.name.equals(clazz.getName()) ||\n- (serviceInfo.getClass().getSuperclass().getName() != null && serviceInfo.getClass().getSuperclass().getName().equals(clazz.getName()))) {\n+ (Class.forName(serviceInfo.name).getSuperclass().getName()!=null && clazz.getName().equals(Class.forName(serviceInfo.name).getSuperclass().getName()))) {\nLogger.v(\"Service \" + serviceInfo.name + \" found\");\nreturn true;\n}\n}\n} catch (PackageManager.NameNotFoundException e) {\nLogger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n+ } catch (ClassNotFoundException e) {\n+ Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n}\nreturn false;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(CTA buttons): Second pass at enabling CTNotificationIntentService to be extended CLEVER-8178 |
116,623 | 19.02.2020 20:40:33 | -19,080 | 9632849a478c0b756fbc1802f63a8f6b620d5c79 | feat(CTA buttons): Final pass at enabling CTNotificationIntentService to be extended | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -834,11 +834,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npackageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\nServiceInfo[] services = packageInfo.services;\nfor (ServiceInfo serviceInfo : services) {\n- if (serviceInfo.name.equals(clazz.getName()) ||\n- (Class.forName(serviceInfo.name).getSuperclass().getName()!=null && clazz.getName().equals(Class.forName(serviceInfo.name).getSuperclass().getName()))) {\n+ try{\n+ Class serviceClass = Class.forName(serviceInfo.name);\n+ if(serviceClass.getName().equals(clazz.getName()) ||\n+ serviceClass.getSuperclass().getName().equals(clazz.getName())){\nLogger.v(\"Service \" + serviceInfo.name + \" found\");\nreturn true;\n}\n+ }catch (NoClassDefFoundError e){\n+ //no-op move to next service\n+ }\n}\n} catch (PackageManager.NameNotFoundException e) {\nLogger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(CTA buttons): Final pass at enabling CTNotificationIntentService to be extended CLEVER-8178 |
116,623 | 26.02.2020 13:47:44 | -19,080 | dc5c08a7bb863d1bf562310e8386c22f0e7be8b4 | fix(InstallReferrer) Reverting to v1.0 of Google Play Install Referrer Lib | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.6.3', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.6.4', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n@@ -41,6 +41,7 @@ dependencies {\nimplementation 'com.google.android.exoplayer:exoplayer-ui:2.8.4'\nimplementation 'com.github.bumptech.glide:glide:4.9.0'//Mandatory if you are using Notification inbox\nimplementation 'com.android.support:design:28.0.0'//Mandatory if you are using Notification Inbox\n+ implementation 'com.android.installreferrer:installreferrer:1.0' // Mandatory for v3.6.4 and above\n}\napply plugin: 'com.google.gms.google-services'\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.3.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.3.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.6.3.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.6.4 (February 26, 2020)\n+* Reverting Google Play Install Library to v1.0\n+* Bug Fixes\n+\n### Version 3.6.3 (January 13, 2020)\n* Adds support for capturing Install Referrer via Google Play Install Referrer Library\n* Deprecation warning for `InstallReferrerBroadcastReceiver`\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.3'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.4'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.6.3', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.6.4', ext: 'aar')\n}\n```\n@@ -35,10 +35,11 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.3'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.6.4'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n+ implementation 'com.android.installreferrer:installreferrer:1.0' // Mandatory for v3.6.4 and above\n}\n```\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.6.3.aar",
"new_path": "clevertap-android-sdk-3.6.3.aar",
"diff": "Binary files a/clevertap-android-sdk-3.6.3.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.6.4.aar",
"new_path": "clevertap-android-sdk-3.6.4.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.6.4.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.6.3'\n+ libraryVersion = '3.6.4'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.4.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.2.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.4.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n@@ -154,7 +154,7 @@ dependencies {\nimplementation 'com.android.support:appcompat-v7:28.0.0'\ncompileOnly 'com.android.support:design:28.0.0'\ncompileOnly 'com.github.bumptech.glide:glide:4.9.0'\n- compileOnly 'com.android.installreferrer:installreferrer:1.1'\n+ implementation 'com.android.installreferrer:installreferrer:1.0'\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30603\"\n- android:versionName=\"3.6.3\">\n+ android:versionCode=\"30604\"\n+ android:versionName=\"3.6.4\">\n<application>\n- <receiver\n- android:name=\"com.clevertap.android.sdk.InstallReferrerBroadcastReceiver\"\n- android:exported=\"true\">\n- <intent-filter>\n- <action android:name=\"com.android.vending.INSTALL_REFERRER\" />\n- </intent-filter>\n- </receiver>\n-\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\nandroid:configChanges=\"keyboardHidden\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -228,7 +228,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate boolean installReferrerDataSent = false;\nprivate long referrerClickTime = 0;\nprivate long appInstallTime = 0;\n- private boolean instantExperienceLaunched = false;\n/**\n* Method to check whether app has ExoPlayer dependencies\n@@ -407,7 +406,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ninstance.activityResumed(activity);\n}\n} catch (Throwable t) {\n- // Ignore\n+ Logger.v(\"Throwable - \"+t.getLocalizedMessage());\n}\n}\n}\n@@ -1710,10 +1709,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!isAppLaunchPushed()) {\npushAppLaunchedEvent();\nonTokenRefresh();\n- if (!installReferrerDataSent) {\n+ postAsyncSafely(\"HandlingInstallReferrer\", new Runnable() {\n+ @Override\n+ public void run() {\n+ if (!installReferrerDataSent && isFirstSession()) {\nhandleInstallReferrerOnFirstInstall();\n}\n}\n+ });\n+ }\nif (!inCurrentSession()) {\npushInitialEventsAsync();\n}\n@@ -3060,7 +3064,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (!installReferrerDataSent) {\nheader.put(\"rct\", getReferrerClickTime());\nheader.put(\"ait\", getAppInstallTime());\n- header.put(\"iel\", isInstantExperienceLaunched());\n}\n@@ -6357,12 +6360,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn appInstallTime;\n}\n- private boolean isInstantExperienceLaunched() {\n- return instantExperienceLaunched;\n- }\n-\nprivate void handleInstallReferrerOnFirstInstall() {\ngetConfigLogger().verbose(getAccountId(), \"Starting to handle install referrer\");\n+ try {\nfinal InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();\nreferrerClient.startConnection(new InstallReferrerStateListener() {\n@Override\n@@ -6376,12 +6376,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nString referrerUrl = response.getInstallReferrer();\nreferrerClickTime = response.getReferrerClickTimestampSeconds();\nappInstallTime = response.getInstallBeginTimestampSeconds();\n- instantExperienceLaunched = response.getGooglePlayInstantParam();\npushInstallReferrer(referrerUrl);\ninstallReferrerDataSent = true;\ngetConfigLogger().debug(getAccountId(), \"Install Referrer data set\");\n} catch (RemoteException e) {\n- e.printStackTrace();\n+ getConfigLogger().debug(getAccountId(),\"Remote exception caused by Google Play Install Referrer library - \"+e.getMessage());\nreferrerClient.endConnection();\ninstallReferrerDataSent = false;\n}\n@@ -6405,6 +6404,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n});\n+ }catch(Throwable t){\n+ getConfigLogger().verbose(getAccountId(),\"Google Play Install Referrer's InstallReferrerClient Class not found - \" +t.getLocalizedMessage() + \" \\n Please add implementation \\'com.android.installreferrer:installreferrer:1.0\\' to your build.gradle\");\n+ }\n}\n/**\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InstallReferrerBroadcastReceiver.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk;\n-\n-import android.content.BroadcastReceiver;\n-import android.content.Context;\n-import android.content.Intent;\n-\n-/**\n- * Broadcast receiver for INSTALL_REFERRAL intents.\n- * Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n- */\n-@Deprecated\n-public final class InstallReferrerBroadcastReceiver extends BroadcastReceiver {\n- public void onReceive(Context context, Intent intent) {\n- CleverTapAPI.handleInstallReferrer(context,intent);\n- }\n-\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestValidator.java",
"diff": "@@ -30,7 +30,6 @@ final class ManifestValidator {\nprivate static void checkReceiversServices(final Context context, DeviceInfo deviceInfo) {\ntry {\nvalidateReceiverInManifest((Application) context.getApplicationContext(), CTPushNotificationReceiver.class.getName());\n- validateReceiverInManifest((Application) context.getApplicationContext(), InstallReferrerBroadcastReceiver.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTNotificationIntentService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundJobService.class.getName());\nvalidateServiceInManifest((Application) context.getApplicationContext(), CTBackgroundIntentService.class.getName());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(InstallReferrer) Reverting to v1.0 of Google Play Install Referrer Lib CLEVER-9055 |
116,612 | 27.02.2020 19:10:58 | -19,080 | eff94da3d099b8bffb8573edf0e1388ac275fcb2 | fix(PushAmp): Disable push amp for devices below Oreo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -7031,6 +7031,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressLint(\"MissingPermission\")\n@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)\nprivate void createOrResetJobScheduler(Context context) {\n+\n+ if (Build.VERSION.SDK_INT<Build.VERSION_CODES.O)\n+ {\n+ getConfigLogger().debug(getAccountId(),\"Push Amplification feature is not supported below Oreo\");\n+ return;\n+ }\n+\nJobScheduler jobScheduler = (JobScheduler) context.getSystemService(JOB_SCHEDULER_SERVICE);\nif (jobScheduler == null) return;\nint pingFrequency = getPingFrequency(context);\n@@ -7061,15 +7068,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nbuilder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);\nbuilder.setRequiresCharging(false);\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {\nbuilder.setPeriodic(pingFrequency * Constants.ONE_MIN_IN_MILLIS, 5 * Constants.ONE_MIN_IN_MILLIS);\n- } else {\n- builder.setPeriodic(pingFrequency * 60 * 1000);\n- }\n-\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\nbuilder.setRequiresBatteryNotLow(true);\n- }\nif (this.deviceInfo.testPermission(context, \"android.permission.RECEIVE_BOOT_COMPLETED\")) {\nbuilder.setPersisted(true);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(PushAmp): Disable push amp for devices below Oreo CLEVER-8914 |
116,623 | 26.02.2020 09:23:32 | -19,080 | fc319ca80e89e135872f8e08f1e0aeed3fb8d78d | fix: Update implementation for intent filter callback | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -77,7 +77,6 @@ import java.util.Iterator;\nimport java.util.List;\nimport java.util.Locale;\nimport java.util.Map;\n-import java.util.Objects;\nimport java.util.Random;\nimport java.util.TimeZone;\nimport java.util.concurrent.ExecutorService;\n@@ -229,6 +228,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate boolean installReferrerDataSent = false;\nprivate long referrerClickTime = 0;\nprivate long appInstallTime = 0;\n+ private String cachedGUID = null;\n/**\n* Method to check whether app has ExoPlayer dependencies\n@@ -825,6 +825,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@SuppressWarnings(\"SameParameterValue\")\nprivate static boolean isServiceAvailable(Context context, Class clazz) {\n+ if(clazz == null) return false;\n+\nPackageManager pm = context.getPackageManager();\nString packageName = context.getPackageName();\n@@ -833,21 +835,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npackageInfo = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES);\nServiceInfo[] services = packageInfo.services;\nfor (ServiceInfo serviceInfo : services) {\n- try{\n- Class serviceClass = Class.forName(serviceInfo.name);\n- if(serviceClass.getName().equals(clazz.getName()) ||\n- serviceClass.getSuperclass().getName().equals(clazz.getName())){\n+ if (serviceInfo.name.equals(clazz.getName())) {\nLogger.v(\"Service \" + serviceInfo.name + \" found\");\nreturn true;\n}\n- }catch (NoClassDefFoundError e){\n- //no-op move to next service\n- }\n}\n} catch (PackageManager.NameNotFoundException e) {\nLogger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n- } catch (ClassNotFoundException e) {\n- Logger.d(\"Intent Service name not found exception - \" + e.getLocalizedMessage());\n}\nreturn false;\n}\n@@ -2458,7 +2452,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Session\nprivate void clearUserContext(final Context context) {\nclearIJ(context);\n- _clearARP(context);\n+ //_clearARP(context);//do not clear ARP//TODO remove after testing\nclearFirstRequestTimestampIfNeeded(context);\nclearLastRequestTimestamp(context);\n}\n@@ -2472,15 +2466,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Session\n- private void _clearARP(Context context) {\n- final String nameSpaceKey = getNamespaceARPKey();\n- if (nameSpaceKey == null) return;\n-\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n- final SharedPreferences.Editor editor = prefs.edit();\n- editor.clear();\n- StorageHelper.persist(editor);\n- }\n+// private void _clearARP(Context context) {\n+// final String nameSpaceKey = getNamespaceARPKey();\n+// if (nameSpaceKey == null) return;\n+//\n+// final SharedPreferences prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n+// final SharedPreferences.Editor editor = prefs.edit();\n+// editor.clear();\n+// StorageHelper.persist(editor);\n+// }\n//Event\nprivate void processEvent(final Context context, final JSONObject event, final int eventType) {\n@@ -2931,9 +2925,19 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfinal String accountId = getAccountId();\nif (accountId == null) return null;\n+ getConfigLogger().verbose(getAccountId(),\"Old ARP Key = ARP:\" + accountId);\nreturn \"ARP:\" + accountId;\n}\n+ private String getNewNamespaceARPKey() {\n+\n+ final String accountId = getAccountId();\n+ if (accountId == null) return null;\n+\n+ getConfigLogger().verbose(getAccountId(),\"New ARP Key = ARP:\" + accountId + \":\" + getCleverTapID());\n+ return \"ARP:\" + accountId + \":\" + getCleverTapID();\n+ }\n+\nprivate void flushDBQueue(final Context context, final EventGroup eventGroup) {\ngetConfigLogger().verbose(getAccountId(), \"Somebody has invoked me to send the queue to CleverTap servers\");\n@@ -3210,14 +3214,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Attach ARP\n+ if(cachedGUID != null){\n+ if(cachedGUID.equals(getCleverTapID())){\ntry {\n- final JSONObject arp = getARP(context);\n+ final JSONObject arp = getARP();\nif (arp != null && arp.length() > 0) {\nheader.put(\"arp\", arp);\n}\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Failed to attach ARP\", t);\n}\n+ }\n+ }else{\n+ getConfigLogger().verbose(getAccountId(), \"Not attaching ARP because \");\n+ }\nJSONObject ref = new JSONObject();\ntry {\n@@ -3260,18 +3270,48 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+\n+\n+ private SharedPreferences migrateARPToNewNameSpace(String newKey, String oldKey){\n+ SharedPreferences oldPrefs = StorageHelper.getPreferences(context,oldKey);\n+ SharedPreferences newPrefs = StorageHelper.getPreferences(context,newKey);\n+ SharedPreferences.Editor editor = newPrefs.edit();\n+ Map<String, ?> all = oldPrefs.getAll();\n+\n+ for (Map.Entry<String, ?> kv : all.entrySet()) {\n+ final Object o = kv.getValue();\n+ if (o instanceof Number) {\n+ final int update = ((Number) o).intValue();\n+ editor.putInt(kv.getKey(), update);\n+ } else if (o instanceof String) {\n+ if (((String) o).length() < 100) {\n+ editor.putString(kv.getKey(), (String) o);\n+ } else {\n+ getConfigLogger().verbose(getAccountId(), \"ARP update for key \" + kv.getKey() + \" rejected (string value too long)\");\n+ }\n+ } else if (o instanceof Boolean) {\n+ editor.putBoolean(kv.getKey(), (Boolean) o);\n+ } else {\n+ getConfigLogger().verbose(getAccountId(), \"ARP update for key \" + kv.getKey() + \" rejected (invalid data type)\");\n+ }\n+ }\n+ getConfigLogger().verbose(getAccountId(), \"Completed ARP update for namespace key: \" + newKey + \"\");\n+ StorageHelper.persist(editor);\n+ return newPrefs;\n+ }\n+\n/**\n* The ARP is additional request parameters, which must be sent once\n* received after any HTTP call. This is sort of a proxy for cookies.\n*\n* @return A JSON object containing the ARP key/values. Can be null.\n*/\n- private JSONObject getARP(final Context context) {\n+ private JSONObject getARP() {\ntry {\n- final String nameSpaceKey = getNamespaceARPKey();\n+ final String nameSpaceKey = getNewNamespaceARPKey();\nif (nameSpaceKey == null) return null;\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n+ final SharedPreferences prefs = migrateARPToNewNameSpace(nameSpaceKey,getNamespaceARPKey());\nfinal Map<String, ?> all = prefs.getAll();\nfinal Iterator<? extends Map.Entry<String, ?>> iter = all.entrySet().iterator();\n@@ -3494,7 +3534,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void handleARPUpdate(final Context context, final JSONObject arp) {\nif (arp == null || arp.length() == 0) return;\n- final String nameSpaceKey = getNamespaceARPKey();\n+ final String nameSpaceKey = getNewNamespaceARPKey();\nif (nameSpaceKey == null) return;\nfinal SharedPreferences prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n@@ -5770,7 +5810,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (currentGUID == null) return;\nboolean haveIdentifier = false;\n- String cachedGUID = null;\n// check for valid identifier keys\n// use the first one we find\n@@ -6344,7 +6383,27 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- boolean isCTIntentServiceAvailable = isServiceAvailable(context, CTNotificationIntentService.class);\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(\"CTNotificationIntentService\");\n+ } catch (ClassNotFoundException ex) {\n+ Logger.d(\"No Intent Service found\");\n+ }\n+ }\n+ }else{\n+ try {\n+ clazz = Class.forName(\"CTNotificationIntentService\");\n+ } catch (ClassNotFoundException ex) {\n+ Logger.d(\"No Intent Service found\");\n+ }\n+ }\n+\n+ boolean isCTIntentServiceAvailable = isServiceAvailable(context, clazz);\nif (actions != null && actions.length() > 0) {\nfor (int i = 0; i < actions.length(); i++) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -20,6 +20,7 @@ public class Constants {\nstatic final String LABEL_FCM_SENDER_ID = \"FCM_SENDER_ID\";\nstatic final String LABEL_PACKAGE_NAME = \"CLEVERTAP_APP_PACKAGE\";\nstatic final String LABEL_BETA = \"CLEVERTAP_BETA\";\n+ static final String LABEL_INTENT_SERVICE = \"CLEVERTAP_INTENT_SERVICE\";\nstatic final String CLEVERTAP_OPTOUT = \"ct_optout\";\nstatic final String CLEVERTAP_STORAGE_TAG = \"WizRocket\";\nstatic final String CLEVERTAP_LOG_TAG = \"CleverTap\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -20,6 +20,7 @@ class ManifestInfo {\nprivate static String fcmSenderId;\nprivate static String packageName;\nprivate static boolean beta;\n+ private static String intentServiceName;\nprivate static String _getManifestStringValueForKey(Bundle manifest, String name) {\ntry {\n@@ -61,6 +62,9 @@ class ManifestInfo {\n}\npackageName = _getManifestStringValueForKey(metaData,Constants.LABEL_PACKAGE_NAME);\nbeta = \"1\".equals(_getManifestStringValueForKey(metaData, Constants.LABEL_BETA));\n+ if(intentServiceName == null){\n+ intentServiceName = _getManifestStringValueForKey(metaData, Constants.LABEL_INTENT_SERVICE);\n+ }\n}\nsynchronized static ManifestInfo getInstance(Context context){\n@@ -118,6 +122,10 @@ class ManifestInfo {\nreturn packageName;\n}\n+ String getIntentServiceName (){\n+ return intentServiceName;\n+ }\n+\nstatic void changeCredentials(String id, String token, String region){\naccountId = id;\naccountToken = token;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Update implementation for intent filter callback CLEVER-8178 |
116,623 | 02.03.2020 22:19:33 | -19,080 | 4b94a0ca905aa605c2b2a7c6968ddb0cb37b2041 | feat(AppInbox): Add public APIs for clicked and viewed event | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -4784,6 +4784,24 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ /**\n+ * Pushes the Notification Clicked event for App Inbox to CleverTap.\n+ * @param messageId String - messageId of {@link CTInboxMessage}\n+ */\n+ public void pushInboxNotificationClickedEvent(String messageId){\n+ CTInboxMessage message = getInboxMessageForId(messageId);\n+ pushInboxMessageStateEvent(true,message,null);\n+ }\n+\n+ /**\n+ * Pushes the Notification Viewed event for App Inbox to CleverTap.\n+ * @param messageId String - messageId of {@link CTInboxMessage}\n+ */\n+ public void pushInboxNotificationViewedEvent(String messageId){\n+ CTInboxMessage message = getInboxMessageForId(messageId);\n+ pushInboxMessageStateEvent(false,message,null);\n+ }\n+\n/**\n* Returns an EventDetail object for the particular event passed. EventDetail consists of event name, count, first time\n* and last time timestamp of the event.\n@@ -6390,14 +6408,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nclazz = Class.forName(intentServiceName);\n} catch (ClassNotFoundException e) {\ntry {\n- clazz = Class.forName(\"CTNotificationIntentService\");\n+ clazz = Class.forName(\"com.clevertap.android.sdk.CTNotificationIntentService\");\n} catch (ClassNotFoundException ex) {\nLogger.d(\"No Intent Service found\");\n}\n}\n}else{\ntry {\n- clazz = Class.forName(\"CTNotificationIntentService\");\n+ clazz = Class.forName(\"com.clevertap.android.sdk.CTNotificationIntentService\");\n} catch (ClassNotFoundException ex) {\nLogger.d(\"No Intent Service found\");\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(AppInbox): Add public APIs for clicked and viewed event CLEVER-8962 |
116,623 | 03.03.2020 12:50:30 | -19,080 | eb63827729d9ee0a708d40c2686de008de2837b6 | fix: Update constants for chinese push services | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -98,9 +98,9 @@ public class Constants {\nstatic final String NOTIFICATION_TAG = \"wzrk_pn\";\nstatic final String CHARGED_EVENT = \"Charged\";\nstatic final String FCM_PROPERTY_REG_ID = \"fcm_token\";\n- static final String XPS_PROPERTY_REG_ID = \"fcm_token\";\n- static final String BPS_PROPERTY_REG_ID = \"fcm_token\";\n- static final String HPS_PROPERTY_REG_ID = \"fcm_token\";\n+ static final String XPS_PROPERTY_REG_ID = \"xps_token\";\n+ static final String BPS_PROPERTY_REG_ID = \"bps_token\";\n+ static final String HPS_PROPERTY_REG_ID = \"hps_token\";\nstatic final String KEY_MUTED = \"comms_mtd\";\nstatic final int EMPTY_NOTIFICATION_ID = -1000;\nstatic final String KEY_MAX_PER_DAY = \"istmcd_inapp\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -323,9 +323,9 @@ class DeviceInfo {\nprivate static Boolean isBaiduPresent = null;\nprivate static Boolean isHuaweiPresent = null;\nprivate static final String FIREBASE_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";\n- private static final String XIAOMI_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\n- private static final String BAIDU_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\n- private static final String HUAWEI_CLASS_NAME = \"com.google.firebase.messaging.FirebaseMessaging\";//TODO\n+ private static final String XIAOMI_CLASS_NAME = \"com.xiaomi.mipush.sdk.MiPushClient\";\n+ private static final String BAIDU_CLASS_NAME = \"com.baidu.android.pushservice.PushMessageReceiver\";\n+ private static final String HUAWEI_CLASS_NAME = \"com.huawei.hms.push.HmsMessaging\";\nprivate boolean isFCMAvailable() {\nif (isFirebasePresent == null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Update constants for chinese push services CLEVER-7259 |
116,612 | 03.03.2020 15:01:54 | -19,080 | 0cebf7af1c5a384b551224d5501711caa6a3d2ed | fix(PushAmp): Cancel already running job and disable push amp for devices below Oreo | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -7120,16 +7120,23 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)\nprivate void createOrResetJobScheduler(Context context) {\n+ int existingJobId = StorageHelper.getInt(context, Constants.PF_JOB_ID, -1);\n+ JobScheduler jobScheduler = (JobScheduler) context.getSystemService(JOB_SCHEDULER_SERVICE);\n+\n+ //Disable push amp for devices below Api 26\nif (Build.VERSION.SDK_INT<Build.VERSION_CODES.O)\n{\n+ if(existingJobId>=0) {//cancel already running job\n+ jobScheduler.cancel(existingJobId);\n+ StorageHelper.putInt(context, Constants.PF_JOB_ID, -1);\n+ }\n+\ngetConfigLogger().debug(getAccountId(),\"Push Amplification feature is not supported below Oreo\");\nreturn;\n}\n- JobScheduler jobScheduler = (JobScheduler) context.getSystemService(JOB_SCHEDULER_SERVICE);\nif (jobScheduler == null) return;\nint pingFrequency = getPingFrequency(context);\n- int existingJobId = StorageHelper.getInt(context, Constants.PF_JOB_ID, -1);\nif (existingJobId < 0 && pingFrequency < 0) return; //no running job and nothing to create\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(PushAmp): Cancel already running job and disable push amp for devices below Oreo CLEVER-8914 |
116,623 | 03.03.2020 16:47:29 | -19,080 | 0a81ac7da6aa6f41fbb3083a9ae076f70690b3c4 | feat(AppInbox): Adding overloaded methods for mark read and delete APIs to accomodate messageId | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -4788,6 +4788,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Pushes the Notification Clicked event for App Inbox to CleverTap.\n* @param messageId String - messageId of {@link CTInboxMessage}\n*/\n+ @SuppressWarnings(\"unused\")\npublic void pushInboxNotificationClickedEvent(String messageId){\nCTInboxMessage message = getInboxMessageForId(messageId);\npushInboxMessageStateEvent(true,message,null);\n@@ -4797,6 +4798,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* Pushes the Notification Viewed event for App Inbox to CleverTap.\n* @param messageId String - messageId of {@link CTInboxMessage}\n*/\n+ @SuppressWarnings(\"unused\")\npublic void pushInboxNotificationViewedEvent(String messageId){\nCTInboxMessage message = getInboxMessageForId(messageId);\npushInboxMessageStateEvent(false,message,null);\n@@ -6944,6 +6946,17 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n+ /**\n+ * Deletes the {@link CTInboxMessage} object for given messageId\n+ *\n+ * @param messageId String - messageId of {@link CTInboxMessage} public object of inbox message\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void deleteInboxMessage(String messageId){\n+ CTInboxMessage message = getInboxMessageForId(messageId);\n+ deleteInboxMessage(message);\n+ }\n+\n/**\n* Marks the given {@link CTInboxMessage} object as read\n*\n@@ -6969,6 +6982,17 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n+ /**\n+ * Marks the given messageId of {@link CTInboxMessage} object as read\n+ *\n+ * @param messageId String - messageId of {@link CTInboxMessage} public object of inbox message\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void markReadInboxMessage(String messageId){\n+ CTInboxMessage message = getInboxMessageForId(messageId);\n+ markReadInboxMessage(message);\n+ }\n+\n/**\n* Returns an ArrayList of unread {@link CTInboxMessage} objects\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(AppInbox): Adding overloaded methods for mark read and delete APIs to accomodate messageId CLEVER-9378 |
116,621 | 04.03.2020 11:03:25 | -19,080 | 1b642e887171577516d0612142226c3a3e1f2cc3 | chore(branch setup) Branch for Remote Config changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.6.4'\n+ libraryVersion = '3.8.0'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.4.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.0.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.6.4.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.0.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\nandroid:versionCode=\"30604\"\n- android:versionName=\"3.6.4\">\n+ android:versionName=\"3.8.0\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(branch setup) Branch for Remote Config changes |
116,623 | 05.03.2020 20:27:31 | -19,080 | df0940704ce3530684e9e2ace0054d8fd803a3fd | fix: Final pass at ARP and InAppFC changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -137,8 +137,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.ns = Executors.newFixedThreadPool(1);\nthis.localDataStore = new LocalDataStore(context, config);\nthis.deviceInfo = new DeviceInfo(context, config, cleverTapID);\n+ if(this.deviceInfo.getDeviceID() != null){\n+ Logger.v(\"Initializing InAppFC with device Id = \"+ this.deviceInfo.getDeviceID());\n+ this.inAppFCManager = new InAppFCManager(context,config,this.deviceInfo.getDeviceID());\n+ }\nthis.validator = new Validator();\n- this.inAppFCManager = new InAppFCManager(context, config);\npostAsyncSafely(\"CleverTapAPI#initializeDeviceInfo\", new Runnable() {\n@Override\n@@ -2452,7 +2455,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Session\nprivate void clearUserContext(final Context context) {\nclearIJ(context);\n- //_clearARP(context);//do not clear ARP//TODO remove after testing\nclearFirstRequestTimestampIfNeeded(context);\nclearLastRequestTimestamp(context);\n}\n@@ -2465,17 +2467,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nStorageHelper.persist(editor);\n}\n- //Session\n-// private void _clearARP(Context context) {\n-// final String nameSpaceKey = getNamespaceARPKey();\n-// if (nameSpaceKey == null) return;\n-//\n-// final SharedPreferences prefs = StorageHelper.getPreferences(context, nameSpaceKey);\n-// final SharedPreferences.Editor editor = prefs.edit();\n-// editor.clear();\n-// StorageHelper.persist(editor);\n-// }\n-\n//Event\nprivate void processEvent(final Context context, final JSONObject event, final int eventType) {\nsynchronized (eventLock) {\n@@ -3260,7 +3251,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"wzrk_ref\", wzrkParams);\n}\n+ if(inAppFCManager != null) {\n+ Logger.v(\"Attaching InAppFC to Header\");\ninAppFCManager.attachToHeader(context, header);\n+ }\n// Resort to string concat for backward compatibility\nreturn \"[\" + header.toString() + \", \" + arr.toString().substring(1);\n@@ -3297,6 +3291,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\ngetConfigLogger().verbose(getAccountId(), \"Completed ARP update for namespace key: \" + newKey + \"\");\nStorageHelper.persist(editor);\n+ oldPrefs.edit().clear().apply();\nreturn newPrefs;\n}\n@@ -3426,7 +3421,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// Handle stale_inapp\ntry {\n+ if(inAppFCManager != null) {\ninAppFCManager.processResponse(context, response);\n+ }\n} catch (Throwable t) {\n// Ignore\n}\n@@ -3629,7 +3626,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nperDay = response.getInt(\"imp\");\n}\n+ if(inAppFCManager != null) {\n+ Logger.v(\"Updating InAppFC Limits\");\ninAppFCManager.updateLimits(context, perDay, perSession);\n+ }\nJSONArray inappNotifs;\ntry {\n@@ -5910,7 +5910,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// clear out the old data\ngetLocalDataStore().changeUser();\n- inAppFCManager.changeUser(context);\nactivityCount = 1;\ndestroySession();\n@@ -5937,6 +5936,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nresetABTesting();\nrecordDeviceIDErrors();\nresetDisplayUnits();\n+ inAppFCManager.changeUser(getCleverTapID());\n} catch (Throwable t) {\ngetConfigLogger().verbose(getAccountId(), \"Reset Profile error\", t);\n}\n@@ -6058,6 +6058,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//To be called from DeviceInfo AdID GUID generation\nvoid deviceIDCreated(String deviceId) {\n+ Logger.v(\"Initializing InAppFC after Device ID Created = \"+deviceId);\n+ this.inAppFCManager = new InAppFCManager(context, config, deviceId);\n+ Logger.v(\"Initializing ABTesting after Device ID Created = \"+deviceId);\n+ initABTesting();\ngetConfigLogger().verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nnotifyUserProfileInitialized(deviceId);\n}\n@@ -7678,14 +7682,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (getCleverTapID() == null) {\ngetConfigLogger().verbose(config.getAccountId(), \"GUID not set yet, deferring ABTesting initialization\");\n- postAsyncSafely(\"postDelayedInitABTesting\", new Runnable() {\n- @Override\n- public void run() {\n- initABTesting();\n- }\n- });\nreturn;\n}\n+\nconfig.setEnableUIEditor(isUIEditorEnabled);\nif (ctABTestController == null) {\nctABTestController = new CTABTestController(context, config, getCleverTapID(), this);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"diff": "@@ -23,12 +23,14 @@ class InAppFCManager {\nprivate final ArrayList<String> mDismissedThisSession = new ArrayList<>();\nprivate final HashMap<String, Integer> mShownThisSession = new HashMap<>();\nprivate int mShownThisSessionCount = 0;\n+ private String deviceId;\n- InAppFCManager(Context context, CleverTapInstanceConfig config){\n+ InAppFCManager(Context context, CleverTapInstanceConfig config, String deviceId){\nthis.config = config;\nthis.context = context;\n- init();\n+ this.deviceId = deviceId;\n+ init(deviceId);\n}\nprivate Logger getConfigLogger(){\n@@ -39,17 +41,59 @@ class InAppFCManager {\nreturn this.config.getAccountId();\n}\n- private void init(){\n+ private String getKeyWithDeviceId(String key, String deviceId){\n+ return key +\":\"+deviceId;\n+ }\n+\n+ private void migrateToNewPrefsKey(String deviceId){\n+\n+ if(getStringFromPrefs(storageKeyWithSuffix(getKeyWithDeviceId(\"ict_date\",deviceId)), null) != null\n+ || getStringFromPrefs(\"ict_date\",null) == null ) return;\n+\n+ Logger.v(\"Migrating InAppFC Prefs\");\n+\n+ String ict_date = getStringFromPrefs(\"ict_date\",\"20140428\");\n+ StorageHelper.putString(context,storageKeyWithSuffix(getKeyWithDeviceId(\"ict_date\",deviceId)),ict_date);\n+\n+ int keyCountsShownToday = getIntFromPrefs(storageKeyWithSuffix(Constants.KEY_COUNTS_SHOWN_TODAY),0);\n+ StorageHelper.putInt(context,storageKeyWithSuffix(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId)),keyCountsShownToday);\n+\n+ final SharedPreferences oldPrefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences.Editor editor = oldPrefs.edit();\n+\n+ final SharedPreferences newPrefs = getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\n+ final SharedPreferences.Editor newEditor = newPrefs.edit();\n+\n+ final Map<String, ?> all = oldPrefs.getAll();\n+ for (String inapp : all.keySet()) {\n+ Object ov = all.get(inapp);\n+ if (!(ov instanceof String)) {\n+ editor.remove(inapp);\n+ continue;\n+ }\n+ String[] oldValues = ((String) ov).split(\",\");\n+ if (oldValues.length != 2) {\n+ editor.remove(inapp);\n+ continue;\n+ }\n+ newEditor.putString(inapp,ov.toString());\n+ }\n+ StorageHelper.persist(newEditor);\n+ editor.clear().apply();\n+ }\n+\n+ private void init(String deviceId){\n+ migrateToNewPrefsKey(deviceId);\nfinal String today = ddMMyyyy.format(new Date());\n- final String lastUpdated = getStringFromPrefs(\"ict_date\", \"20140428\");\n+ final String lastUpdated = getStringFromPrefs(getKeyWithDeviceId(\"ict_date\",deviceId), \"20140428\");\nif (!today.equals(lastUpdated)) {\n- StorageHelper.putString(context, storageKeyWithSuffix(\"ict_date\"), today);\n+ StorageHelper.putString(context, storageKeyWithSuffix(getKeyWithDeviceId(\"ict_date\",deviceId)), today);\n// Reset today count\n- StorageHelper.putInt(context, storageKeyWithSuffix(Constants.KEY_COUNTS_SHOWN_TODAY), 0);\n+ StorageHelper.putInt(context, storageKeyWithSuffix(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId)), 0);\n// Reset the counts for each inapp\n- final SharedPreferences prefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences prefs = getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\nfinal SharedPreferences.Editor editor = prefs.edit();\nfinal Map<String, ?> all = prefs.getAll();\nfor (String inapp : all.keySet()) {\n@@ -112,8 +156,8 @@ class InAppFCManager {\nincrementInAppCountsInPersistentStore(id);\n- int shownToday = getIntFromPrefs(Constants.KEY_COUNTS_SHOWN_TODAY, 0);\n- StorageHelper.putInt(context, storageKeyWithSuffix(Constants.KEY_COUNTS_SHOWN_TODAY), ++shownToday);\n+ int shownToday = getIntFromPrefs(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId), 0);\n+ StorageHelper.putInt(context, storageKeyWithSuffix(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId)), ++shownToday);\n}\nvoid didDismiss(CTInAppNotification inapp) {\n@@ -154,7 +198,7 @@ class InAppFCManager {\n}\n// 3. Have we shown enough of in-apps this session?\n- final int c = getIntFromPrefs(Constants.INAPP_MAX_PER_SESSION, 1);\n+ final int c = getIntFromPrefs(getKeyWithDeviceId(Constants.INAPP_MAX_PER_SESSION,deviceId), 1);\nreturn (mShownThisSessionCount >= c);\n}\n@@ -179,8 +223,8 @@ class InAppFCManager {\nif (id == null) return false;\n// 1. Has the daily count maxed out globally?\n- int shownTodayCount = getIntFromPrefs(Constants.KEY_COUNTS_SHOWN_TODAY, 0);\n- int maxPerDayCount = getIntFromPrefs(Constants.KEY_MAX_PER_DAY, 1);\n+ int shownTodayCount = getIntFromPrefs(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId), 0);\n+ int maxPerDayCount = getIntFromPrefs(getKeyWithDeviceId(Constants.KEY_MAX_PER_DAY,deviceId), 1);\nif (shownTodayCount >= maxPerDayCount) return true;\n// 2. Has the daily count been maxed out for this inapp?\n@@ -198,8 +242,8 @@ class InAppFCManager {\n}\nsynchronized void updateLimits(final Context context, int perDay, int perSession) {\n- StorageHelper.putInt(context, storageKeyWithSuffix(Constants.KEY_MAX_PER_DAY), perDay);\n- StorageHelper.putInt(context, storageKeyWithSuffix(Constants.INAPP_MAX_PER_SESSION), perSession);\n+ StorageHelper.putInt(context, storageKeyWithSuffix(getKeyWithDeviceId(Constants.KEY_MAX_PER_DAY,deviceId)), perDay);\n+ StorageHelper.putInt(context, storageKeyWithSuffix(getKeyWithDeviceId(Constants.INAPP_MAX_PER_SESSION,deviceId)), perSession);\n}\nprivate void incrementInAppCountsInPersistentStore(String inappID) {\n@@ -207,7 +251,7 @@ class InAppFCManager {\ncurrent[0] = current[0] + 1;\ncurrent[1] = current[1] + 1;\n- final SharedPreferences prefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences prefs = getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\nfinal SharedPreferences.Editor editor = prefs.edit();\n// protocol: todayCount,lifeTimeCount\n@@ -216,7 +260,7 @@ class InAppFCManager {\n}\nprivate int[] getInAppCountsFromPersistentStore(String inappID) {\n- final SharedPreferences prefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences prefs = getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\nfinal String str = prefs.getString(inappID, null);\nif (str == null) return new int[]{0, 0};\n@@ -235,11 +279,11 @@ class InAppFCManager {\ntry {\n// Trigger reset for dates\n- header.put(\"imp\", getIntFromPrefs(Constants.KEY_COUNTS_SHOWN_TODAY, 0));\n+ header.put(\"imp\", getIntFromPrefs(getKeyWithDeviceId(Constants.KEY_COUNTS_SHOWN_TODAY,deviceId), 0));\n// tlc: [[targetID, todayCount, lifetime]]\nJSONArray arr = new JSONArray();\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\nfinal Map<String, ?> all = prefs.getAll();\nfor (String inapp : all.keySet()) {\nfinal Object o = all.get(inapp);\n@@ -268,7 +312,7 @@ class InAppFCManager {\nfinal JSONArray arr = response.getJSONArray(\"inapp_stale\");\n- final SharedPreferences prefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n+ final SharedPreferences prefs = getPreferences(context, getKeyWithDeviceId(Constants.KEY_COUNTS_PER_INAPP,deviceId));\nfinal SharedPreferences.Editor editor = prefs.edit();\nfor (int i = 0; i < arr.length(); i++) {\n@@ -288,17 +332,13 @@ class InAppFCManager {\n}\n}\n- void changeUser(final Context context) {\n+ void changeUser(String deviceId) {\n// reset counters\n- StorageHelper.putInt(context, Constants.KEY_COUNTS_SHOWN_TODAY, 0);\nmShownThisSession.clear();\nmShownThisSessionCount = 0;\nmDismissedThisSession.clear();\n-\n- final SharedPreferences prefs = getPreferences(context, Constants.KEY_COUNTS_PER_INAPP);\n- final SharedPreferences.Editor editor = prefs.edit();\n- editor.clear();\n- StorageHelper.persist(editor);\n+ this.deviceId = deviceId;\n+ init(deviceId);\n}\n@SuppressWarnings(\"SameParameterValue\")\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Final pass at ARP and InAppFC changes CLEVER-8085 |
116,623 | 09.03.2020 14:41:39 | -19,080 | 5901be054b5de470dea2b5029f17dfd88170364d | chore: Preparing for release v3.7.0 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.6.4', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.0', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.6.4.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.7.0 (March 11, 2020)\n+* Adds support for Xiaomi & Baidu Push Notification Services\n+* Adds public APIs for raising Notification Clicked and Viewed events for App Inbox\n+* Adds public APIS for marking inbox message as read and deleting inbox message per message ID\n+* Fixes center alignment issue of Native InApps on Mobile devices\n+* Performance improvements\n+\n### Version 3.6.4 (February 26, 2020)\n* Reverting Google Play Install Library to v1.0\n* Bug Fixes\n"
},
{
"change_type": "MODIFY",
"old_path": "EXAMPLES.md",
"new_path": "EXAMPLES.md",
"diff": "@@ -236,9 +236,21 @@ cleverTapDefaultInstance.getInboxMessageForId(messageId);\n//Delete message from the Inbox. Message id should be a String\ncleverTapDefaultInstance.deleteInboxMessage(messageId);\n-//Mark Message as Read\n+//Delete message from the Inbox. Message should object of CTInboxMessage\n+cleverTapDefaultInstance.deleteInboxMessage(message);\n+\n+//Mark Message as Read. Message id should be a String\ncleverTapDefaultInstance.markReadInboxMessage(messageId);\n+//Mark message as Read. Message should object of CTInboxMessage\n+cleverTapDefaultInstance.markReadInboxMessage(message);\n+\n+//Raise Notification Viewed event for Inbox Message. Message id should be a String\n+cleverTapDefaultInstance.pushInboxNotificationViewedEvent(messageId);\n+\n+//Raise Notification Clicked event for Inbox Message. Message id should be a String\n+cleverTapDefaultInstance.pushInboxNotificationClickedEvent(messageId);\n+\n//Callback on Inbox Message update/delete/read (any activity)\n@Override\npublic void inboxMessagesDidUpdate() { }\n@@ -349,8 +361,8 @@ Add the following between the `<application></application>` tags. This will enab\n</receiver>\n```\n-From CleverTap SDK v3.6.3 onwards, just remove the above the Broadcast Receiver if you are using it and add the following gradle dependency to capture UTM details, app install time, referrer click time and other metrics provided by the Google Install Referrer Library.\n+From CleverTap SDK v3.6.4 onwards, just remove the above the Broadcast Receiver if you are using it and add the following gradle dependency to capture UTM details, app install time, referrer click time and other metrics provided by the Google Install Referrer Library.\n```markdown\n- implementation 'com.android.installreferrer:installreferrer:1.1'\n+ implementation 'com.android.installreferrer:installreferrer:1.0'\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.4'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.0'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.6.4', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.0', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.6.4'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.0'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.6.4.aar",
"new_path": "clevertap-android-sdk-3.6.4.aar",
"diff": "Binary files a/clevertap-android-sdk-3.6.4.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.7.0.aar",
"new_path": "clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.7.0.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore: Preparing for release v3.7.0 CLEVER-8971 |
116,623 | 11.03.2020 14:49:11 | -19,080 | 46b456baa5f05fc21fd093513f67b3891973d77b | fix: SyncListener method profileDidInitialize was not being called | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar and b/AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk-3.7.0.aar",
"new_path": "clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files a/clevertap-android-sdk-3.7.0.aar and b/clevertap-android-sdk-3.7.0.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -534,10 +534,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (instance == null) {\ninstance = new CleverTapAPI(context, config, cleverTapID);\ninstances.put(config.getAccountId(), instance);\n- if (instance.getCleverTapID() != null) {\n- instance.notifyUserProfileInitialized();\n- instance.recordDeviceIDErrors();\n+ final CleverTapAPI finalInstance = instance;\n+ new Handler().post(new Runnable() {\n+ @Override\n+ public void run() {\n+ if (finalInstance.getCleverTapID() != null) {\n+ finalInstance.notifyUserProfileInitialized();\n+ finalInstance.recordDeviceIDErrors();\n}\n+ }\n+ });\n} else if (instance.isErrorDeviceId() && instance.getConfig().getEnableCustomCleverTapId() && Utils.validateCTID(cleverTapID)) {\ninstance.asyncProfileSwitchUser(null, null, cleverTapID);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: SyncListener method profileDidInitialize was not being called CLEVER-8971 |
116,621 | 12.03.2020 16:32:56 | -19,080 | 152665bd21be35853e23901325c487af7b533e18 | Init Remote Config | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -50,6 +50,7 @@ import com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n+import com.clevertap.android.sdk.product_config.ProductConfigController;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -97,7 +98,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, ProductConfigController.Listener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -128,6 +129,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n+ private ProductConfigController productConfigController;\n+\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.config = new CleverTapInstanceConfig(config);\n@@ -8016,4 +8019,20 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Failed to process Display Unit from push notification payload\", t);\n}\n}\n+\n+ /**\n+ * REMOTE CONFIG\n+ */\n+\n+ public ProductConfigController remoteConfig(){\n+ if(null == productConfigController){\n+ productConfigController = new ProductConfigController(context,getAccountId(),this);\n+ }\n+ return productConfigController;\n+ }\n+\n+ @Override\n+ public void fetchProductConfig() {\n+\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+import android.content.Context;\n+import android.content.res.Resources;\n+import android.content.res.XmlResourceParser;\n+import android.util.Log;\n+\n+import org.xmlpull.v1.XmlPullParser;\n+import org.xmlpull.v1.XmlPullParserException;\n+\n+import java.io.IOException;\n+import java.util.HashMap;\n+\n+public class DefaultXmlParser {\n+ private static final String XML_TAG_ENTRY = \"entry\";\n+ private static final String XML_TAG_KEY = \"key\";\n+ private static final String XML_TAG_VALUE = \"value\";\n+ private static final int XML_TAG_TYPE_KEY = 0;\n+ private static final int XML_TAG_TYPE_VALUE = 1;\n+\n+ public DefaultXmlParser() {\n+ }\n+\n+ static HashMap<String, String> getDefaultsFromXml(Context context, int resourceId) {\n+ HashMap defaultsMap = new HashMap();\n+\n+ try {\n+ Resources resources = context.getResources();\n+ if (resources == null) {\n+ Log.e(\"ProductConfig\", \"Could not find the resources of the current context while trying to set defaults from an XML.\");\n+ return defaultsMap;\n+ }\n+\n+ XmlResourceParser xmlParser = resources.getXml(resourceId);\n+ String curTag = null;\n+ String key = null;\n+ String value = null;\n+\n+ for (int eventType = xmlParser.getEventType(); eventType != XmlPullParser.END_DOCUMENT; eventType = xmlParser.next()) {\n+ if (eventType == XmlPullParser.START_TAG) {\n+ curTag = xmlParser.getName();\n+ } else if (eventType != XmlPullParser.END_TAG) {\n+ if (eventType == XmlPullParser.TEXT && curTag != null) {\n+ byte tagType = -1;\n+ switch (curTag) {\n+ case XML_TAG_KEY:\n+ tagType = XML_TAG_TYPE_KEY;\n+ break;\n+ case XML_TAG_VALUE:\n+ tagType = XML_TAG_TYPE_VALUE;\n+ }\n+\n+ switch (tagType) {\n+ case XML_TAG_TYPE_KEY:\n+ key = xmlParser.getText();\n+ break;\n+ case XML_TAG_TYPE_VALUE:\n+ value = xmlParser.getText();\n+ break;\n+ default:\n+ Log.w(\"RemoteConfig\", \"Encountered an unexpected tag while parsing the defaults XML.\");\n+ }\n+ }\n+ } else {\n+ if (xmlParser.getName().equals(XML_TAG_ENTRY)) {\n+ if (key != null && value != null) {\n+ defaultsMap.put(key, value);\n+ } else {\n+ Log.w(\"RemoteConfig\", \"An entry in the defaults XML has an invalid key and/or value tag.\");\n+ }\n+\n+ key = null;\n+ value = null;\n+ }\n+\n+ curTag = null;\n+ }\n+ }\n+ } catch (IOException | XmlPullParserException var11) {\n+ Log.e(\"ProductConfig\", \"Encountered an error while parsing the defaults XML file.\", var11);\n+ }\n+\n+ return defaultsMap;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigController.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+import android.content.Context;\n+\n+import java.util.HashMap;\n+\n+public final class ProductConfigController {\n+ private final String accountId;\n+ private final Context context;\n+ private HashMap<String, String> defaultConfig;\n+ private final Listener listener;\n+ private long minFetchIntervalInSeconds;\n+\n+ public ProductConfigController(Context context, String accountId, Listener listener) {\n+ this.context = context;\n+ this.accountId = accountId;\n+ this.listener = listener;\n+ }\n+\n+ public void setDefaults(int resourceID) {\n+ defaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\n+ }\n+\n+ public void fetch() {\n+ fetch(minFetchIntervalInSeconds);\n+ }\n+\n+ public void fetch(long minimumFetchIntervalInSeconds) {\n+ if (canRequest()) {\n+ listener.fetchProductConfig();\n+ }\n+ }\n+\n+ public void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\n+ this.minFetchIntervalInSeconds = fetchIntervalInSeconds;\n+ }\n+\n+ public String getString(String Key) {\n+ return defaultConfig.get(Key);\n+ }\n+\n+ public boolean getBoolean(String Key){\n+ return Boolean.parseBoolean(defaultConfig.get(Key));\n+ }\n+\n+\n+ public interface Listener {\n+ void fetchProductConfig();\n+ }\n+\n+ private boolean canRequest() {\n+ //TODO throttling logic\n+ return true;\n+ }\n+\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Init Remote Config |
116,623 | 13.03.2020 18:45:50 | -19,080 | db437b15dbb8f1d459e2d69d53e59d70ee159ab5 | feat: Added feature flags implementation | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTFeatureFlagsListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+public interface CTFeatureFlagsListener {\n+ void featureFlagsUpdated();\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -50,6 +50,8 @@ import com.clevertap.android.sdk.ab_testing.CTABTestListener;\nimport com.clevertap.android.sdk.displayunits.CTDisplayUnitController;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n+import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n+import com.clevertap.android.sdk.featureFlags.FeatureFlagListener;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -97,7 +99,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -140,6 +142,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(this.deviceInfo.getDeviceID() != null){\nLogger.v(\"Initializing InAppFC with device Id = \"+ this.deviceInfo.getDeviceID());\nthis.inAppFCManager = new InAppFCManager(context,config,this.deviceInfo.getDeviceID());\n+ initFeatureFlags();\n}\nthis.validator = new Validator();\n@@ -302,6 +305,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate boolean isBgPing = false;\nprivate CTDisplayUnitController mCTDisplayUnitController;\n+ private CTFeatureFlagsController ctFeatureFlagsController;\n+ private CTFeatureFlagsListener featureFlagsListener = null;\n+\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n// make sure we have at least the default instance created here.\n@@ -2350,14 +2356,31 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn (eventType == Constants.RAISED_EVENT && !isAppLaunchPushed());\n}\n+ private boolean shouldDropEvent(JSONObject event, int eventType){\n+ if(eventType == Constants.FETCH_EVENT){\n+ return false;\n+ }\n+\n+ if(isCurrentUserOptedOut()){\n+ String eventString = event == null ? \"null\" : event.toString();\n+ getConfigLogger().debug(getAccountId(), \"Current user is opted out dropping event: \" + eventString);\n+ return true;\n+ }\n+\n+ if(isMuted()){\n+ getConfigLogger().verbose(getAccountId(), \"CleverTap is muted, dropping event - \" + event.toString());\n+ return true;\n+ }\n+\n+ return false;\n+ }\n+\n//Event\nprivate void queueEvent(final Context context, final JSONObject event, final int eventType) {\npostAsyncSafely(\"queueEvent\", new Runnable() {\n@Override\npublic void run() {\n- if (isCurrentUserOptedOut()) {\n- String eventString = event == null ? \"null\" : event.toString();\n- getConfigLogger().debug(getAccountId(), \"Current user is opted out dropping event: \" + eventString);\n+ if(shouldDropEvent(event,eventType)){\nreturn;\n}\nif (shouldDeferProcessingEvent(event, eventType)) {\n@@ -2374,11 +2397,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n}, 2000);\n+ } else {\n+ if(eventType == Constants.FETCH_EVENT){\n+ addToQueue(context,event,eventType);\n}else {\nlazyCreateSession(context);\naddToQueue(context, event, eventType);\n}\n}\n+ }\n});\n}\n@@ -2411,9 +2438,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// only call async\nprivate void addToQueue(final Context context, final JSONObject event, final int eventType) {\n- if (isMuted()) {\n- return;\n- }\nif (eventType == Constants.NV_EVENT) {\ngetConfigLogger().verbose(getAccountId(), \"Pushing Notification Viewed event onto separate queue\");\nprocessPushNotificationViewedEvent(context, event);\n@@ -2792,9 +2816,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void performHandshakeForDomain(final Context context, final EventGroup eventGroup, final Runnable handshakeSuccessCallback) {\n- if (isMuted()) {\n- return;\n- }\nfinal String endpoint = getEndpoint(true, eventGroup);\nif (endpoint == null) {\n@@ -3508,6 +3529,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ //Handle Feature Flag response\n+ if(!getConfig().isAnalyticsOnly()){\n+ try{\n+ getConfigLogger().verbose(getAccountId(), \"Processing Feature Flags response...\");\n+ processFeatureFlagsResponse(response);\n+ }catch (Throwable t){\n+ getConfigLogger().verbose(\"Error handling Display Unit response: \" + t.getLocalizedMessage());\n+ }\n+ }\n+\n} catch (Throwable t) {\nmResponseFailureCount++;\ngetConfigLogger().verbose(getAccountId(), \"Problem process send queue response\", t);\n@@ -5940,6 +5971,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nresetInbox();\nresetABTesting();\n+ resetFeatureFlags();\nrecordDeviceIDErrors();\nresetDisplayUnits();\ninAppFCManager.changeUser(getCleverTapID());\n@@ -6068,6 +6100,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.inAppFCManager = new InAppFCManager(context, config, deviceId);\nLogger.v(\"Initializing ABTesting after Device ID Created = \"+deviceId);\ninitABTesting();\n+ initFeatureFlags();\ngetConfigLogger().verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nnotifyUserProfileInitialized(deviceId);\n}\n@@ -8016,4 +8049,116 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Failed to process Display Unit from push notification payload\", t);\n}\n}\n+\n+ // -----------------------------------------------------------------------//\n+ // ******** Feature Flags Logic *****//\n+ // -----------------------------------------------------------------------//\n+\n+\n+ @Override\n+ public void fetchFeatureFlags() {\n+ JSONObject event = new JSONObject();\n+ JSONObject notif = new JSONObject();\n+ try {\n+ notif.put(\"type\",\"ff\");\n+ event.put(\"evtName\", Constants.WZRK_FETCH);\n+ event.put(\"evtData\", notif);\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+\n+ queueEvent(context, event, Constants.FETCH_EVENT);\n+ }\n+\n+ public CTFeatureFlagsController featureFlag() {\n+ return ctFeatureFlagsController;\n+ }\n+\n+ private void processFeatureFlagsResponse(JSONObject response){\n+ if (response == null) {\n+ getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"Can't parse Feature Flags Response, JSON response object is null\");\n+ return;\n+ }\n+\n+ if (!response.has(Constants.FEATURE_FLAG_JSON_RESPONSE_KEY)) {\n+ getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"JSON object doesn't contain the Display Units key\");\n+ return;\n+ }\n+ try {\n+ getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"Processing Feature Flags response\");\n+ parseFeatureFlags(response.getJSONObject(Constants.FEATURE_FLAG_JSON_RESPONSE_KEY));\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"Failed to parse response\", t);\n+ }\n+ }\n+\n+ private void parseFeatureFlags(JSONObject responseKV) throws JSONException {\n+ JSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n+\n+ if(kvArray != null && featureFlag() != null){\n+ featureFlag().updateFeatureFlags(kvArray);\n+ }\n+ }\n+\n+ @Override\n+ public void featureFlagsDidUpdate() {\n+ try {\n+ final CTFeatureFlagsListener sl = getCTFeatureFlagsListener();\n+ if (sl != null) {\n+ sl.featureFlagsUpdated();\n+ }\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ }\n+\n+ /**\n+ * Returns the CTFeatureFlagsListener object\n+ *\n+ * @return The {@link CTFeatureFlagsListener} object\n+ */\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public CTFeatureFlagsListener getCTFeatureFlagsListener() {\n+ return featureFlagsListener;\n+ }\n+\n+ /**\n+ * This method is used to set the CTFeatureFlagsListener\n+ *\n+ * @param featureFlagsListener The {@link CTFeatureFlagsListener} object\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setCTFeatureFlagsListener(CTFeatureFlagsListener featureFlagsListener) {\n+ this.featureFlagsListener = featureFlagsListener;\n+ }\n+\n+ private void initFeatureFlags() {\n+ Logger.v(\"Initializing Feature Flags with device Id = \" + getCleverTapID());\n+ if (!config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"Feature Flags is not enabled for this instance\");\n+ return;\n+ }\n+\n+ if (getCleverTapID() == null) {\n+ getConfigLogger().verbose(config.getAccountId(), \"GUID not set yet, deferring Feature Flags initialization\");\n+ return;\n+ }\n+\n+ if (ctFeatureFlagsController == null) {\n+ ctFeatureFlagsController = new CTFeatureFlagsController(getCleverTapID(), config, this);\n+ getConfigLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n+ }\n+ }\n+\n+ private void resetFeatureFlags() {\n+ if (!this.config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"AB Testing is not enabled for this instance\");\n+ return;\n+ }\n+\n+ if (ctFeatureFlagsController != null && ctFeatureFlagsController.isIntialized()) {\n+ ctFeatureFlagsController.resetWithGuid(getCleverTapID());//TODO check whether needed\n+ ctFeatureFlagsController.fetchFeatureFlags();\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -35,6 +35,8 @@ public class Constants {\nstatic final int RAISED_EVENT = 4;\nstatic final int DATA_EVENT = 5;\nstatic final int NV_EVENT = 6;\n+ static final int FETCH_EVENT = 7;\n+ static final String WZRK_FETCH = \"wzrk_fetch\";\nstatic final String ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nstatic final String NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nstatic final String NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n@@ -61,6 +63,7 @@ public class Constants {\nstatic final String INAPP_JSON_RESPONSE_KEY = \"inapp_notifs\";\nstatic final String INBOX_JSON_RESPONSE_KEY = \"inbox_notifs\";\nstatic final String DISPLAY_UNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\n+ static final String FEATURE_FLAG_JSON_RESPONSE_KEY = \"ff_notifs\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\n@@ -220,4 +223,6 @@ public class Constants {\npublic static final String KEY_LINKS = \"links\";\npublic static final String TEST_IDENTIFIER = \"0_0\";\npublic static final String FEATURE_DISPLAY_UNIT = \"DisplayUnit : \";\n+\n+ public static final String FEATURE_FLAG_UNIT = \"Feature Flag : \";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "+package com.clevertap.android.sdk.featureFlags;\n+\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Logger;\n+\n+import org.json.JSONArray;\n+import org.json.JSONException;\n+import org.json.JSONObject;\n+\n+import java.lang.ref.WeakReference;\n+import java.util.ArrayList;\n+import java.util.HashMap;\n+\n+public class CTFeatureFlagsController {\n+\n+ private String guid;\n+ private CleverTapInstanceConfig config;\n+ private HashMap<String, Boolean> store;\n+ private boolean isIntialized = false;\n+ private WeakReference<FeatureFlagListener> listenerWeakReference;\n+\n+ public CTFeatureFlagsController(String guid, CleverTapInstanceConfig config, FeatureFlagListener listener) {\n+ this.guid = guid;\n+ this.config = config;\n+ this.store = new HashMap<>();\n+ this.setListener(listener);\n+ //TODO\n+ unarchiveData(false);\n+ }\n+\n+ private void setListener(FeatureFlagListener listener) {\n+ listenerWeakReference = new WeakReference<>(listener);\n+ }\n+\n+ private FeatureFlagListener getListener() {\n+ FeatureFlagListener listener = null;\n+ try {\n+ listener = listenerWeakReference.get();\n+ } catch (Throwable t) {\n+ // no-op\n+ }\n+ if (listener == null) {\n+ config.getLogger().verbose(config.getAccountId(),\"CTABTestListener is null in CTABTestController\" );\n+ }\n+ return listener;\n+ }\n+\n+\n+ public void updateFeatureFlags(JSONArray featureFlaglist){\n+ updateFeatureFlags(featureFlaglist,true);\n+ }\n+\n+ private void notifyFeatureFlagUpdate(){\n+ FeatureFlagListener listener = getListener();\n+ if(listener != null){\n+ listener.featureFlagsDidUpdate();\n+ }\n+ }\n+\n+ public void fetchFeatureFlags(){\n+ FeatureFlagListener listener = getListener();\n+ if(listener != null){\n+ listener.fetchFeatureFlags();\n+ }\n+ }\n+\n+ private void updateFeatureFlags(JSONArray featureFlagList, boolean isNew) {\n+ getConfigLogger().verbose(getAccountId(),\"Updating feature flags...\");\n+ try {\n+ for (int i = 0; i < featureFlagList.length(); i++) {\n+ JSONObject ff = featureFlagList.getJSONObject(i);\n+ store.put(ff.getString(\"n\"),ff.getBoolean(\"v\"));\n+ }\n+ }catch (JSONException e){\n+ getConfigLogger().verbose(getAccountId(),\"Error parsing Feature Flag array \"+e.getLocalizedMessage());\n+ }\n+\n+ if(isNew){\n+ archiveData(featureFlagList,false);\n+ notifyFeatureFlagUpdate();\n+ }\n+ }\n+\n+ private void archiveData(JSONArray featureFlagList, boolean sync){\n+ //TODO @atul\n+ }\n+\n+ private void unarchiveData(boolean sync){\n+ //TODO @atul\n+ }\n+\n+ private boolean get(String key, boolean defaultValue){\n+ getConfigLogger().verbose(getAccountId(),\"getting feature flag with key - \"+ key +\" and default value - \"+ defaultValue);\n+ if(store.get(key) != null){\n+ return store.get(key);\n+ }else{\n+ getConfigLogger().verbose(getAccountId(),\"feature flag not found, returning default value - \"+ defaultValue);\n+ return defaultValue;\n+ }\n+ }\n+\n+ private Logger getConfigLogger(){\n+ return config.getLogger();\n+ }\n+\n+ private String getAccountId(){\n+ return config.getAccountId();\n+ }\n+\n+ public void resetWithGuid(String guid){\n+ this.guid = guid;\n+ }\n+\n+ public boolean isIntialized() {\n+ return isIntialized;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/FeatureFlagListener.java",
"diff": "+package com.clevertap.android.sdk.featureFlags;\n+\n+public interface FeatureFlagListener {\n+ void featureFlagsDidUpdate();\n+ void fetchFeatureFlags();\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: Added feature flags implementation CLEVER-8860 |
116,623 | 13.03.2020 19:42:21 | -19,080 | 81914af856763e44a40c84aadfb86d894161412a | chore: Added JAVADOC for Feature Flags public methods | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8058,6 +8058,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// -----------------------------------------------------------------------//\n+ /**\n+ * Use this method to raise fetch event for Feature Flags\n+ */\n@Override\npublic void fetchFeatureFlags() {\nJSONObject event = new JSONObject();\n@@ -8073,6 +8076,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nqueueEvent(context, event, Constants.FETCH_EVENT);\n}\n+ /**\n+ * @return object of {@link CTFeatureFlagsController}\n+ */\npublic CTFeatureFlagsController featureFlag() {\nreturn ctFeatureFlagsController;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore: Added JAVADOC for Feature Flags public methods CLEVER-8860 |
116,621 | 15.03.2020 14:58:45 | -19,080 | f9eb9b660b990d347e5bbecd05f4825e28e6e99b | feat(Product Config): Added Fetch & Parse logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -52,7 +52,8 @@ import com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.featureFlags.FeatureFlagListener;\n-import com.clevertap.android.sdk.product_config.ProductConfigController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\nimport com.google.firebase.messaging.FirebaseMessaging;\n@@ -100,7 +101,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener,ProductConfigController.Listener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigListener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -131,7 +132,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n- private ProductConfigController productConfigController;\n+ private CTProductConfigController productConfigController;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -3538,7 +3539,17 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().verbose(getAccountId(), \"Processing Feature Flags response...\");\nprocessFeatureFlagsResponse(response);\n}catch (Throwable t){\n- getConfigLogger().verbose(\"Error handling Display Unit response: \" + t.getLocalizedMessage());\n+ getConfigLogger().verbose(\"Error handling Feature Flags response: \" + t.getLocalizedMessage());\n+ }\n+ }\n+\n+ //Handle Product Config response\n+ if(!getConfig().isAnalyticsOnly()){\n+ try{\n+ getConfigLogger().verbose(getAccountId(), \"Processing Product Config response...\");\n+ processProductConfigResponse(response);\n+ }catch (Throwable t){\n+ getConfigLogger().verbose(\"Error handling Product Config response: \" + t.getLocalizedMessage());\n}\n}\n@@ -8172,18 +8183,78 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n/**\n- * REMOTE CONFIG\n+ * PRODUCT CONFIG\n*/\n- public ProductConfigController remoteConfig(){\n+ public CTProductConfigController productConfig(){\nif(null == productConfigController){\n- productConfigController = new ProductConfigController(context,getAccountId(),this);\n+ productConfigController = new CTProductConfigController(context,getAccountId(),this);\n}\nreturn productConfigController;\n}\n+ /**\n+ * Use this method to raise fetch event for Product Config\n+ */\n@Override\npublic void fetchProductConfig() {\n+ JSONObject event = new JSONObject();\n+ JSONObject notif = new JSONObject();\n+ try {\n+ notif.put(\"type\",\"rc\");\n+ event.put(\"evtName\", Constants.WZRK_FETCH);\n+ event.put(\"evtData\", notif);\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+\n+ queueEvent(context, event, Constants.FETCH_EVENT);\n+ }\n+ private void processProductConfigResponse(JSONObject response) throws JSONException {\n+ JSONObject productConfig = mockProductConfigResponse();\n+ response.put(\"pc_notifs\", productConfig);\n+ if (response == null) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Can't parse Feature Flags Response, JSON response object is null\");\n+ return;\n+ }\n+\n+ if (!response.has(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY)) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"JSON object doesn't contain the Display Units key\");\n+ return;\n+ }\n+ try {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Processing Feature Flags response\");\n+ parseProductConfigs(response.getJSONObject(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY));\n+ } catch (Throwable t) {\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Failed to parse response\", t);\n+ }\n+ }\n+\n+ private JSONObject mockProductConfigResponse() throws JSONException {\n+ JSONObject object = new JSONObject();\n+ JSONArray jsonArray = new JSONArray();\n+ object.put(\"kv\", jsonArray);\n+ jsonArray.put(getJSONObject(\"discount\", 10));\n+ jsonArray.put(getJSONObject(\"customer-type\", \"gold\"));\n+ jsonArray.put(getJSONObject(\"loading_phrase\", \"Loading From Remote \"));\n+ jsonArray.put(getJSONObject(\"welcome_message_caps\", true));\n+ jsonArray.put(getJSONObject(\"welcome_message\", \"welcome from remote\"));\n+ jsonArray.put(getJSONObject(\"ts\", 1245));\n+ return object;\n+ }\n+\n+ private JSONObject getJSONObject(String key, Object value) throws JSONException {\n+ JSONObject jsonObject = new JSONObject();\n+ jsonObject.put(key, value);\n+ return jsonObject;\n+ }\n+\n+ private void parseProductConfigs(JSONObject responseKV) throws JSONException {\n+ JSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n+\n+ if(kvArray != null && productConfig()!= null){\n+ productConfig().afterFetchProductConfig(kvArray);\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -64,6 +64,7 @@ public class Constants {\nstatic final String INBOX_JSON_RESPONSE_KEY = \"inbox_notifs\";\nstatic final String DISPLAY_UNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\nstatic final String FEATURE_FLAG_JSON_RESPONSE_KEY = \"ff_notifs\";\n+ static final String REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY = \"pc_notifs\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\n@@ -225,4 +226,5 @@ public class Constants {\npublic static final String FEATURE_DISPLAY_UNIT = \"DisplayUnit : \";\npublic static final String FEATURE_FLAG_UNIT = \"Feature Flag : \";\n+ public static final String LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -2,16 +2,18 @@ package com.clevertap.android.sdk.product_config;\nimport android.content.Context;\n+import org.json.JSONArray;\n+\nimport java.util.HashMap;\n-public final class ProductConfigController {\n+public final class CTProductConfigController {\nprivate final String accountId;\nprivate final Context context;\nprivate HashMap<String, String> defaultConfig;\n- private final Listener listener;\n+ private final CTProductConfigListener listener;\nprivate long minFetchIntervalInSeconds;\n- public ProductConfigController(Context context, String accountId, Listener listener) {\n+ public CTProductConfigController(Context context, String accountId, CTProductConfigListener listener) {\nthis.context = context;\nthis.accountId = accountId;\nthis.listener = listener;\n@@ -43,14 +45,12 @@ public final class ProductConfigController {\nreturn Boolean.parseBoolean(defaultConfig.get(Key));\n}\n-\n- public interface Listener {\n- void fetchProductConfig();\n- }\n-\nprivate boolean canRequest() {\n//TODO throttling logic\nreturn true;\n}\n+ public void afterFetchProductConfig(JSONArray kvArray) {\n+\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+public interface CTProductConfigListener {\n+ void fetchProductConfig();\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/DefaultXmlParser.java",
"diff": "@@ -11,6 +11,8 @@ import org.xmlpull.v1.XmlPullParserException;\nimport java.io.IOException;\nimport java.util.HashMap;\n+import static com.clevertap.android.sdk.Constants.LOG_TAG_PRODUCT_CONFIG;\n+\npublic class DefaultXmlParser {\nprivate static final String XML_TAG_ENTRY = \"entry\";\nprivate static final String XML_TAG_KEY = \"key\";\n@@ -58,7 +60,7 @@ public class DefaultXmlParser {\nvalue = xmlParser.getText();\nbreak;\ndefault:\n- Log.w(\"RemoteConfig\", \"Encountered an unexpected tag while parsing the defaults XML.\");\n+ Log.w(LOG_TAG_PRODUCT_CONFIG, \"Encountered an unexpected tag while parsing the defaults XML.\");\n}\n}\n} else {\n@@ -66,7 +68,7 @@ public class DefaultXmlParser {\nif (key != null && value != null) {\ndefaultsMap.put(key, value);\n} else {\n- Log.w(\"RemoteConfig\", \"An entry in the defaults XML has an invalid key and/or value tag.\");\n+ Log.w(LOG_TAG_PRODUCT_CONFIG, \"An entry in the defaults XML has an invalid key and/or value tag.\");\n}\nkey = null;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product Config): Added Fetch & Parse logic
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 17.03.2020 15:38:38 | -19,080 | 9a17f52625236d03eee699cd15ee69b5fe556935 | feat(Product Config): Added Caching & Activation logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -101,7 +101,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigListener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigController.Listener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -147,6 +147,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Initializing InAppFC with device Id = \"+ this.deviceInfo.getDeviceID());\nthis.inAppFCManager = new InAppFCManager(context,config,this.deviceInfo.getDeviceID());\ninitFeatureFlags();\n+ initProductConfig();\n}\nthis.validator = new Validator();\n@@ -311,6 +312,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTFeatureFlagsController ctFeatureFlagsController;\nprivate CTFeatureFlagsListener featureFlagsListener = null;\n+ private WeakReference<CTProductConfigListener> productConfigListener;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -5986,6 +5988,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nresetInbox();\nresetABTesting();\nresetFeatureFlags();\n+ resetProductConfigs();\nrecordDeviceIDErrors();\nresetDisplayUnits();\ninAppFCManager.changeUser(getCleverTapID());\n@@ -8187,9 +8190,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\npublic CTProductConfigController productConfig(){\n- if(null == productConfigController){\n- productConfigController = new CTProductConfigController(context,getAccountId(),this);\n- }\n+ if(productConfigController == null)\n+ initProductConfig();\nreturn productConfigController;\n}\n@@ -8212,8 +8214,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void processProductConfigResponse(JSONObject response) throws JSONException {\n+ //TODO Remove the mock response\nJSONObject productConfig = mockProductConfigResponse();\n- response.put(\"pc_notifs\", productConfig);\n+ response.put(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY, productConfig);\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Can't parse Feature Flags Response, JSON response object is null\");\nreturn;\n@@ -8254,7 +8257,65 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\nif(kvArray != null && productConfig()!= null){\n- productConfig().afterFetchProductConfig(kvArray);\n+ productConfig().afterFetchProductConfig(responseKV);\n+ }\n+ }\n+\n+ private void resetProductConfigs() {\n+ if (!this.config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\n+ return;\n+ }\n+\n+ if (productConfigController != null && productConfigController.isInitialized()) {\n+ productConfigController.resetWithGuid(getCleverTapID());//TODO check whether needed\n+ productConfigController.fetch();\n+ }\n+ }\n+\n+ private void initProductConfig() {\n+ if(this.deviceInfo.getDeviceID() != null){\n+ Logger.v(\"Initializing Product Config with device Id = \" + getCleverTapID());\n+ if (!config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\n+ return;\n+ }\n+\n+ if (getCleverTapID() == null) {\n+ getConfigLogger().verbose(config.getAccountId(), \"GUID not set yet, deferring Product Config initialization\");\n+ return;\n}\n+\n+ if (productConfigController == null) {\n+ productConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\n+ getConfigLogger().verbose(config.getAccountId(), \"Product Config initialized\");\n+ }\n+ }\n+ }\n+\n+ /**\n+ * This method is used to set the {@link CTProductConfigListener} object\n+ *\n+ * @param listener The {@link CTProductConfigListener} object\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setProductConfigListener(CTProductConfigListener listener) {\n+ if(listener!= null)\n+ this.productConfigListener = new WeakReference<>(listener);\n}\n+\n+\n+ @Override\n+ public void onActivateCompleted() {\n+ if(productConfigListener!= null && productConfigListener.get()!=null){\n+ productConfigListener.get().onActivated();\n+ }\n+ }\n+ @Override\n+ public void onFetchCompleted(){\n+ if(productConfigListener!= null && productConfigListener.get()!=null){\n+ productConfigListener.get().onFetched();\n+ }\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -143,7 +143,7 @@ public class Constants {\nstatic final String KEY_EFC = \"efc\";\nstatic final String KEY_TLC = \"tlc\";\nstatic final String KEY_TDC = \"tdc\";\n- static final String KEY_KV = \"kv\";\n+ public static final String KEY_KV = \"kv\";\npublic static final String KEY_TYPE = \"type\";\nstatic final String KEY_IS_TABLET = \"tablet\";\npublic static final String KEY_BG = \"bg\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -13,14 +13,22 @@ import android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.telephony.TelephonyManager;\n+import android.text.TextUtils;\n+import android.util.Log;\nimport org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n+import java.io.BufferedReader;\nimport java.io.ByteArrayOutputStream;\n+import java.io.File;\n+import java.io.FileInputStream;\n+import java.io.FileNotFoundException;\n+import java.io.FileWriter;\nimport java.io.IOException;\nimport java.io.InputStream;\n+import java.io.InputStreamReader;\nimport java.net.HttpURLConnection;\nimport java.net.URL;\nimport java.util.ArrayList;\n@@ -30,6 +38,7 @@ import java.util.Iterator;\nimport javax.net.ssl.HttpsURLConnection;\npublic final class Utils {\n+ private static final String TAG = \"Utils\";\nstatic long getMemoryConsumption() {\nlong free = Runtime.getRuntime().freeMemory();\nlong total = Runtime.getRuntime().totalMemory();\n@@ -271,7 +280,7 @@ public final class Utils {\n*\n* @param runnable - task to be run\n*/\n- static void runOnUiThread(Runnable runnable) {\n+ public static void runOnUiThread(Runnable runnable) {\nif (runnable != null) {\n//run if already on the UI thread\nif (Looper.myLooper() == Looper.getMainLooper()) {\n@@ -300,4 +309,61 @@ public final class Utils {\n}\nreturn bundle;\n}\n+\n+ public static void writeJsonToFile(Context context, String dirName, String fileName, JSONObject jsonObject) throws Exception {\n+ try {\n+ if (jsonObject == null || TextUtils.isEmpty(dirName) || TextUtils.isEmpty(fileName))\n+ return;\n+ File file = new File(context.getFilesDir(), dirName);\n+ if (!file.exists()) {\n+ file.mkdir();\n+ }\n+\n+ File file1 = new File(file, fileName + \".json\");\n+ FileWriter writer = new FileWriter(file1);\n+ writer.append(jsonObject.toString());\n+ writer.flush();\n+ writer.close();\n+\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ Log.d(TAG, \"writeFileOnInternalStorage: failed\");\n+ throw e;\n+ }\n+ }\n+\n+ public static String readFromFile(Context context,String fileNameWithPath) {\n+\n+ String content = \"\";\n+ //Make sure to use a try-catch statement to catch any errors\n+ try {\n+ //Make your FilePath and File\n+ String yourFilePath = context.getFilesDir() + \"/\" + fileNameWithPath;\n+ File yourFile = new File(yourFilePath);\n+ //Make an InputStream with your File in the constructor\n+ InputStream inputStream = new FileInputStream(yourFile);\n+ StringBuilder stringBuilder = new StringBuilder();\n+ //Check to see if your inputStream is null\n+ //If it isn't use the inputStream to make a InputStreamReader\n+ //Use that to make a BufferedReader\n+ //Also create an empty String\n+ if (inputStream != null) {\n+ InputStreamReader inputStreamReader = new InputStreamReader(inputStream);\n+ BufferedReader bufferedReader = new BufferedReader(inputStreamReader);\n+ String receiveString = \"\";\n+ //Use a while loop to append the lines from the Buffered reader\n+ while ((receiveString = bufferedReader.readLine()) != null){\n+ stringBuilder.append(receiveString);\n+ }\n+ //Close your InputStream and save stringBuilder as a String\n+ inputStream.close();\n+ content = stringBuilder.toString();\n+ }\n+ } catch (FileNotFoundException e) {\n+ //Log your error with Log.e\n+ } catch (IOException e) {\n+ //Log your error with Log.e\n+ }\n+ return content;\n+ }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+public class CTProductConfigConstants {\n+ public static String DIR_PRODUCT_CONFIG = \"Product_Config\";\n+ public static String FILE_NAME_FETCHED = \"fetched\";\n+ public static String FILE_NAME_ACTIVATED = \"activated\";\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "package com.clevertap.android.sdk.product_config;\nimport android.content.Context;\n+import android.os.AsyncTask;\n+import android.text.TextUtils;\n+\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.Utils;\nimport org.json.JSONArray;\n+import org.json.JSONException;\n+import org.json.JSONObject;\nimport java.util.HashMap;\n+import java.util.Iterator;\npublic final class CTProductConfigController {\n- private final String accountId;\n+ private String guid;\n+\n+ public boolean isInitialized() {\n+ return isInitialized;\n+ }\n+\n+ private boolean isInitialized = false;\n+ private final CleverTapInstanceConfig config;\nprivate final Context context;\nprivate HashMap<String, String> defaultConfig;\n- private final CTProductConfigListener listener;\n+ private final HashMap<String, String> activatedConfig = new HashMap<>();\n+ private final Listener listener;\nprivate long minFetchIntervalInSeconds;\n- public CTProductConfigController(Context context, String accountId, CTProductConfigListener listener) {\n+ public CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, Listener listener) {\nthis.context = context;\n- this.accountId = accountId;\n+ this.guid = guid;\n+ this.config = config;\nthis.listener = listener;\n+ initAsync();\n+ }\n+\n+ private void initAsync() {\n+ if (TextUtils.isEmpty(guid))\n+ return;\n+ Thread thread = new Thread(new Runnable() {\n+ @Override\n+ public void run() {\n+ String content = Utils.readFromFile(context, getActivatedFullPath());\n+ //apply default config first\n+ if (defaultConfig != null && !defaultConfig.isEmpty()) {\n+ activatedConfig.putAll(defaultConfig);\n+ }\n+ if (!TextUtils.isEmpty(content)) {\n+ try {\n+ JSONObject jsonObject = new JSONObject(content);\n+ JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+\n+ if (kvArray != null && kvArray.length() > 0) {\n+ for (int i = 0; i < kvArray.length(); i++) {\n+ JSONObject object = (JSONObject) kvArray.get(i);\n+ if (object != null) {\n+ Iterator<String> iterator = object.keys();\n+ while (iterator.hasNext()) {\n+ String key = iterator.next();\n+ if (!TextUtils.isEmpty(key)) {\n+ String value = String.valueOf(object.get(key));\n+ activatedConfig.put(key, value);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ isInitialized = true;\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ listener.onActivateCompleted();\n+ }\n+ });\n+\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ }\n+ }\n+ });\n+ thread.start();\n}\npublic void setDefaults(int resourceID) {\n@@ -33,6 +100,60 @@ public final class CTProductConfigController {\n}\n}\n+ public void activate() {\n+ AsyncTask<Void, Void, Boolean> asyncTask = new AsyncTask<Void, Void, Boolean>() {\n+ @Override\n+ protected Boolean doInBackground(Void... voids) {\n+ activatedConfig.clear();\n+ //apply default config first\n+ if (defaultConfig != null && !defaultConfig.isEmpty()) {\n+ activatedConfig.putAll(defaultConfig);\n+ }\n+ //read fetched info\n+ String content = Utils.readFromFile(context, getFetchedFullPath());\n+ if (!TextUtils.isEmpty(content)) {\n+ try {\n+ JSONObject jsonObject = new JSONObject(content);\n+ JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+\n+ if (kvArray != null && kvArray.length() > 0) {\n+ for (int i = 0; i < kvArray.length(); i++) {\n+ JSONObject object = (JSONObject) kvArray.get(i);\n+ if (object != null) {\n+ Iterator<String> iterator = object.keys();\n+ while (iterator.hasNext()) {\n+ String key = iterator.next();\n+ if (!TextUtils.isEmpty(key)) {\n+ String value = String.valueOf(object.get(key));\n+ activatedConfig.put(key, value);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ Utils.writeJsonToFile(context, getActivatedDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n+\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ return false;\n+ }\n+ }\n+ return true;\n+ }\n+\n+ @Override\n+ protected void onPostExecute(Boolean isSuccess) {\n+ super.onPostExecute(isSuccess);\n+ if (isSuccess) {\n+ listener.onActivateCompleted();\n+ }\n+ }\n+ };\n+ asyncTask.execute();\n+\n+ }\n+\npublic void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\nthis.minFetchIntervalInSeconds = fetchIntervalInSeconds;\n}\n@@ -50,7 +171,56 @@ public final class CTProductConfigController {\nreturn true;\n}\n- public void afterFetchProductConfig(JSONArray kvArray) {\n+ public void afterFetchProductConfig(JSONObject kvResponse) {\n+ if (kvResponse != null) {\n+ try {\n+ Utils.writeJsonToFile(context, getFetchedDirName(), getFetchedFileName(), kvResponse);\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ listener.onFetchCompleted();\n+ }\n+ });\n+\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ }\n+ }\n+ }\n+\n+ public void resetWithGuid(String cleverTapID) {\n+ this.guid = cleverTapID;\n+ }\n+\n+ private String getActivatedFileName() {\n+ return CTProductConfigConstants.FILE_NAME_ACTIVATED + \".json\";\n+ }\n+\n+ private String getActivatedDirName() {\n+ return CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n+ }\n+\n+ private String getFetchedDirName() {\n+ return CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n+ }\n+\n+\n+ private String getFetchedFileName() {\n+ return CTProductConfigConstants.FILE_NAME_FETCHED + \".json\";\n+ }\n+\n+ private String getFetchedFullPath() {\n+ return getFetchedDirName() + \"/\" + getFetchedFileName();\n+ }\n+\n+ private String getActivatedFullPath() {\n+ return getActivatedDirName() + \"/\" + getActivatedFileName();\n+ }\n+ public interface Listener{\n+ void fetchProductConfig();\n+\n+ void onFetchCompleted();\n+ void onActivateCompleted();\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "package com.clevertap.android.sdk.product_config;\npublic interface CTProductConfigListener {\n- void fetchProductConfig();\n+ void onFetched();\n+\n+ void onActivated();\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product Config): Added Caching & Activation logic
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 19.03.2020 10:24:44 | -19,080 | dc6c0cc730cc46a1b6888b21211d33ee8b201953 | feat(Product Config):
1. Added archiving & unarchiving for Feature Flag
2. Refactored code & handled more use cases for product Config | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -132,7 +132,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\n- private CTProductConfigController productConfigController;\n+ private CTProductConfigController ctProductConfigController;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -147,8 +147,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Initializing InAppFC with device Id = \" + this.deviceInfo.getDeviceID());\nthis.inAppFCManager = new InAppFCManager(context, config, this.deviceInfo.getDeviceID());\ninitFeatureFlags();\n- initProductConfig();\n+\n}\n+ initProductConfig(false);\nthis.validator = new Validator();\npostAsyncSafely(\"CleverTapAPI#initializeDeviceInfo\", new Runnable() {\n@@ -1519,6 +1520,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n}\n+\nprivate void pushBPSDeviceToken(String token, final boolean register, final boolean forceUpdate) {\nsynchronized (tokenLock) {\nif (havePushedBPSToken && !forceUpdate) {\n@@ -1536,6 +1538,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n}\n+\nprivate void pushHPSDeviceToken(String token, final boolean register, final boolean forceUpdate) {\nsynchronized (tokenLock) {\nif (havePushedHPSToken && !forceUpdate) {\n@@ -3298,7 +3301,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n-\nprivate SharedPreferences migrateARPToNewNameSpace(String newKey, String oldKey) {\nSharedPreferences oldPrefs = StorageHelper.getPreferences(context, oldKey);\nSharedPreferences newPrefs = StorageHelper.getPreferences(context, newKey);\n@@ -4839,6 +4841,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Pushes the Notification Clicked event for App Inbox to CleverTap.\n+ *\n* @param messageId String - messageId of {@link CTInboxMessage}\n*/\n@SuppressWarnings(\"unused\")\n@@ -4849,6 +4852,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* Pushes the Notification Viewed event for App Inbox to CleverTap.\n+ *\n* @param messageId String - messageId of {@link CTInboxMessage}\n*/\n@SuppressWarnings(\"unused\")\n@@ -6118,6 +6122,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nLogger.v(\"Initializing ABTesting after Device ID Created = \" + deviceId);\ninitABTesting();\ninitFeatureFlags();\n+ initProductConfig(true);\ngetConfigLogger().verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nnotifyUserProfileInitialized(deviceId);\n}\n@@ -7208,8 +7213,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJobScheduler jobScheduler = (JobScheduler) context.getSystemService(JOB_SCHEDULER_SERVICE);\n//Disable push amp for devices below Api 26\n- if (Build.VERSION.SDK_INT<Build.VERSION_CODES.O)\n- {\n+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {\nif (existingJobId >= 0) {//cancel already running job\njobScheduler.cancel(existingJobId);\nStorageHelper.putInt(context, Constants.PF_JOB_ID, -1);\n@@ -8080,7 +8084,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nJSONObject notif = new JSONObject();\ntry {\n- notif.put(\"type\",\"ff\");\n+ notif.put(\"t\", 1);\nevent.put(\"evtName\", Constants.WZRK_FETCH);\nevent.put(\"evtData\", notif);\n} catch (JSONException e) {\n@@ -8119,7 +8123,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\nif (kvArray != null && featureFlag() != null) {\n- featureFlag().updateFeatureFlags(kvArray);\n+ featureFlag().updateFeatureFlags(responseKV);\n}\n}\n@@ -8168,7 +8172,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (ctFeatureFlagsController == null) {\n- ctFeatureFlagsController = new CTFeatureFlagsController(getCleverTapID(), config, this);\n+ ctFeatureFlagsController = new CTFeatureFlagsController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n}\n}\n@@ -8179,7 +8183,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n- if (ctFeatureFlagsController != null && ctFeatureFlagsController.isIntialized()) {\n+ if (ctFeatureFlagsController != null && ctFeatureFlagsController.isInitialized()) {\nctFeatureFlagsController.resetWithGuid(getCleverTapID());//TODO check whether needed\nctFeatureFlagsController.fetchFeatureFlags();\n}\n@@ -8190,9 +8194,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\npublic CTProductConfigController productConfig() {\n- if(productConfigController == null)\n- initProductConfig();\n- return productConfigController;\n+ if (ctProductConfigController == null)\n+ initProductConfig(false);\n+ return ctProductConfigController;\n}\n/**\n@@ -8203,7 +8207,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nJSONObject notif = new JSONObject();\ntry {\n- notif.put(\"type\",\"rc\");\n+ notif.put(\"t\", 0);\nevent.put(\"evtName\", Constants.WZRK_FETCH);\nevent.put(\"evtData\", notif);\n} catch (JSONException e) {\n@@ -8215,8 +8219,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void processProductConfigResponse(JSONObject response) throws JSONException {\n//TODO Remove the mock response\n- JSONObject productConfig = mockProductConfigResponse();\n- response.put(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY, productConfig);\n+// JSONObject productConfig = mockProductConfigResponse();\n+// response.put(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY, productConfig);\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Can't parse Feature Flags Response, JSON response object is null\");\nreturn;\n@@ -8267,34 +8271,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n- if (productConfigController != null && productConfigController.isInitialized()) {\n- productConfigController.resetWithGuid(getCleverTapID());//TODO check whether needed\n- productConfigController.fetch();\n+ if (ctProductConfigController != null && ctProductConfigController.isInitialized()) {\n+ ctProductConfigController.setGuidAndInit(getCleverTapID());//TODO check whether needed\n+ ctProductConfigController.fetch();\n}\n}\n- private void initProductConfig() {\n- if(this.deviceInfo.getDeviceID() != null){\n+ private void initProductConfig(boolean fromPlayServices) {\nLogger.v(\"Initializing Product Config with device Id = \" + getCleverTapID());\n- if (!config.isAnalyticsOnly()) {\n- getConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\n- return;\n- }\n- if (getCleverTapID() == null) {\n- getConfigLogger().verbose(config.getAccountId(), \"GUID not set yet, deferring Product Config initialization\");\n- return;\n- }\n-\n- if (productConfigController == null) {\n- productConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\n+ if (ctProductConfigController == null) {\n+ ctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Product Config initialized\");\n}\n+ if (fromPlayServices && ctProductConfigController != null && !ctProductConfigController.isInitialized()) {\n+ ctProductConfigController.setGuidAndInit(getCleverTapID());\n}\n}\n/**\n- * This method is used to set the {@link CTProductConfigListener} object\n+ * This method is used to set` the {@link CTProductConfigListener} object\n*\n* @param listener The {@link CTProductConfigListener} object\n*/\n@@ -8306,16 +8302,44 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\n- public void onActivateCompleted() {\n+ public void onActivateSuccess() {\nif (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onActivated();\n+ productConfigListener.get().onActivateSuccess();\n}\n}\n+\n@Override\n- public void onFetchCompleted(){\n+ public void onFetchSuccess() {\nif (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onFetched();\n+ productConfigListener.get().onFetchSuccess();\n}\n}\n+ @Override\n+ public void onActivateFailed() {\n+ if (productConfigListener != null && productConfigListener.get() != null) {\n+ productConfigListener.get().onActivateFailed();\n+ }\n+ }\n+\n+ @Override\n+ public void onFetchFailed() {\n+ if (productConfigListener != null && productConfigListener.get() != null) {\n+ productConfigListener.get().onFetchFailed();\n+ }\n+ }\n+\n+ @Override\n+ public void onInitFailed() {\n+ if (productConfigListener != null && productConfigListener.get() != null) {\n+ productConfigListener.get().onInitFailed();\n+ }\n+ }\n+\n+ @Override\n+ public void onInitSuccess() {\n+ if (productConfigListener != null && productConfigListener.get() != null) {\n+ productConfigListener.get().onInitSuccess();\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/TaskManager.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import java.lang.ref.WeakReference;\n+import java.util.concurrent.ExecutorService;\n+import java.util.concurrent.Executors;\n+\n+public class TaskManager {\n+\n+ private static TaskManager sInstance;\n+ private final ExecutorService service;\n+\n+ private TaskManager() {\n+ this.service = Executors.newFixedThreadPool(10);\n+ }\n+\n+ public static synchronized TaskManager getInstance() {\n+ if (sInstance == null)\n+ sInstance = new TaskManager();\n+ return sInstance;\n+ }\n+\n+ public <Params, Result> void execute(final TaskListener<Params, Result> listener) {\n+ execute(null, listener);\n+ }\n+\n+ public <Params, Result> void execute(final Params params, final TaskListener<Params, Result> listener) {\n+ final WeakReference<TaskListener<Params, Result>> listenerWeakReference = new WeakReference<>(listener);\n+ service.execute(new Runnable() {\n+ @Override\n+ public void run() {\n+ if (listenerWeakReference.get() != null) {\n+ final Result result = listenerWeakReference.get().doInBackground(params);\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ if (listenerWeakReference.get() != null) {\n+ listenerWeakReference.get().onPostExecute(result);\n+ }\n+ }\n+ });\n+ }\n+\n+\n+ }\n+ });\n+ }\n+\n+ public interface TaskListener<Params, Result> {\n+ /**\n+ * does task in the background thread\n+ */\n+ Result doInBackground(Params params);\n+\n+ /**\n+ * Gives callback on the main thread\n+ */\n+ void onPostExecute(Result result);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -319,7 +319,7 @@ public final class Utils {\nfile.mkdir();\n}\n- File file1 = new File(file, fileName + \".json\");\n+ File file1 = new File(file, fileName);\nFileWriter writer = new FileWriter(file1);\nwriter.append(jsonObject.toString());\nwriter.flush();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagConstants.java",
"diff": "+package com.clevertap.android.sdk.featureFlags;\n+\n+public interface CTFeatureFlagConstants {\n+ String CACHED_FILE_NAME = \"ff_cache.json\";\n+ String DIR_FEATURE_FLAG = \"Feature_Flag\";\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "package com.clevertap.android.sdk.featureFlags;\n+import android.content.Context;\n+import android.text.TextUtils;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.TaskManager;\n+import com.clevertap.android.sdk.Utils;\nimport org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\nimport java.lang.ref.WeakReference;\n-import java.util.ArrayList;\nimport java.util.HashMap;\n+import java.util.Iterator;\npublic class CTFeatureFlagsController {\nprivate String guid;\nprivate CleverTapInstanceConfig config;\nprivate HashMap<String, Boolean> store;\n- private boolean isIntialized = false;\n+ private boolean isInitialized = false;\nprivate WeakReference<FeatureFlagListener> listenerWeakReference;\n+ private Context mContext;\n- public CTFeatureFlagsController(String guid, CleverTapInstanceConfig config, FeatureFlagListener listener) {\n+ public CTFeatureFlagsController(Context context, String guid, CleverTapInstanceConfig config, FeatureFlagListener listener) {\nthis.guid = guid;\nthis.config = config;\nthis.store = new HashMap<>();\nthis.setListener(listener);\n- //TODO\n+ this.mContext = context.getApplicationContext();\nunarchiveData(false);\n}\n@@ -46,8 +53,9 @@ public class CTFeatureFlagsController {\n}\n- public void updateFeatureFlags(JSONArray featureFlaglist){\n- updateFeatureFlags(featureFlaglist,true);\n+ public void updateFeatureFlags(JSONObject featureFlagResponseObj) throws JSONException {\n+\n+ updateFeatureFlags(featureFlagResponseObj, true);\n}\nprivate void notifyFeatureFlagUpdate() {\n@@ -64,8 +72,9 @@ public class CTFeatureFlagsController {\n}\n}\n- private void updateFeatureFlags(JSONArray featureFlagList, boolean isNew) {\n+ private void updateFeatureFlags(JSONObject jsonObject, boolean isNew) throws JSONException {\ngetConfigLogger().verbose(getAccountId(), \"Updating feature flags...\");\n+ JSONArray featureFlagList = jsonObject.getJSONArray(Constants.KEY_KV);\ntry {\nfor (int i = 0; i < featureFlagList.length(); i++) {\nJSONObject ff = featureFlagList.getJSONObject(i);\n@@ -76,17 +85,62 @@ public class CTFeatureFlagsController {\n}\nif (isNew) {\n- archiveData(featureFlagList,false);\n+ archiveData(jsonObject, false);\nnotifyFeatureFlagUpdate();\n}\n}\n- private void archiveData(JSONArray featureFlagList, boolean sync){\n- //TODO @atul\n+ private void archiveData(JSONObject featureFlagRespObj, boolean sync) {\n+\n+ if (featureFlagRespObj != null) {\n+ try {\n+ Utils.writeJsonToFile(mContext, getCachedDirName(), getCachedFileName(), featureFlagRespObj);\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ }\n+ }\n}\nprivate void unarchiveData(boolean sync) {\n- //TODO @atul\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n+ @Override\n+ public Boolean doInBackground(Void aVoid) {\n+ store.clear();\n+ String content = Utils.readFromFile(mContext, getCachedFullPath());\n+ if (!TextUtils.isEmpty(content)) {\n+ try {\n+ JSONObject jsonObject = new JSONObject(content);\n+ JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+\n+ if (kvArray != null && kvArray.length() > 0) {\n+ for (int i = 0; i < kvArray.length(); i++) {\n+ JSONObject object = (JSONObject) kvArray.get(i);\n+ if (object != null) {\n+ Iterator<String> iterator = object.keys();\n+ while (iterator.hasNext()) {\n+ String key = iterator.next();\n+ if (!TextUtils.isEmpty(key)) {\n+ Boolean value = (Boolean) object.get(key);\n+ store.put(key, value);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ return false;\n+ }\n+ }\n+ return true;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Boolean aBoolean) {\n+\n+ }\n+ });\n+\n}\nprivate boolean get(String key, boolean defaultValue) {\n@@ -111,7 +165,21 @@ public class CTFeatureFlagsController {\nthis.guid = guid;\n}\n- public boolean isIntialized() {\n- return isIntialized;\n+ public boolean isInitialized() {\n+ return isInitialized;\n+ }\n+\n+\n+ private String getCachedFileName() {\n+ return CTFeatureFlagConstants.CACHED_FILE_NAME ;\n+ }\n+\n+ private String getCachedDirName() {\n+ return CTFeatureFlagConstants.DIR_FEATURE_FLAG + \"_\" + config.getAccountId() + \"_\" + guid;\n+ }\n+\n+\n+ private String getCachedFullPath() {\n+ return getCachedDirName() + \"/\" + getCachedFileName();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "package com.clevertap.android.sdk.product_config;\n-public class CTProductConfigConstants {\n- public static String DIR_PRODUCT_CONFIG = \"Product_Config\";\n- public static String FILE_NAME_FETCHED = \"fetched\";\n- public static String FILE_NAME_ACTIVATED = \"activated\";\n+public interface CTProductConfigConstants {\n+ String DIR_PRODUCT_CONFIG = \"Product_Config\";\n+ String FILE_NAME_FETCHED = \"fetched.json\";\n+ String FILE_NAME_ACTIVATED = \"activated.json\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "package com.clevertap.android.sdk.product_config;\nimport android.content.Context;\n-import android.os.AsyncTask;\nimport android.text.TextUtils;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.TaskManager;\nimport com.clevertap.android.sdk.Utils;\nimport org.json.JSONArray;\n-import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.util.HashMap;\n@@ -38,12 +37,13 @@ public final class CTProductConfigController {\ninitAsync();\n}\n- private void initAsync() {\n+ private synchronized void initAsync() {\nif (TextUtils.isEmpty(guid))\nreturn;\n- Thread thread = new Thread(new Runnable() {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\n- public void run() {\n+ public Boolean doInBackground(Void params) {\n+ activatedConfig.clear();\nString content = Utils.readFromFile(context, getActivatedFullPath());\n//apply default config first\nif (defaultConfig != null && !defaultConfig.isEmpty()) {\n@@ -52,42 +52,42 @@ public final class CTProductConfigController {\nif (!TextUtils.isEmpty(content)) {\ntry {\nJSONObject jsonObject = new JSONObject(content);\n- JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n-\n- if (kvArray != null && kvArray.length() > 0) {\n- for (int i = 0; i < kvArray.length(); i++) {\n- JSONObject object = (JSONObject) kvArray.get(i);\n- if (object != null) {\n- Iterator<String> iterator = object.keys();\n+ Iterator<String> iterator = jsonObject.keys();\nwhile (iterator.hasNext()) {\n+\nString key = iterator.next();\nif (!TextUtils.isEmpty(key)) {\n- String value = String.valueOf(object.get(key));\n+ String value = String.valueOf(jsonObject.get(key));\nactivatedConfig.put(key, value);\n}\n}\n- }\n- }\n- }\nisInitialized = true;\n- Utils.runOnUiThread(new Runnable() {\n- @Override\n- public void run() {\n- listener.onActivateCompleted();\n- }\n- });\n+ Utils.writeJsonToFile(context, getActivatedDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n- } catch (JSONException e) {\n+ } catch (Exception e) {\ne.printStackTrace();\n+ return false;\n+ }\n+ }\n+ return true;\n}\n+\n+ @Override\n+ public void onPostExecute(Boolean isInitSuccess) {\n+ if (isInitSuccess) {\n+ config.getLogger().verbose(config.getAccountId(), \"Init Success\");\n+ listener.onInitSuccess();\n+ } else {\n+ config.getLogger().verbose(config.getAccountId(), \"Init Failed\");\n+ listener.onInitFailed();\n}\n}\n});\n- thread.start();\n}\npublic void setDefaults(int resourceID) {\ndefaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\n+ initAsync();\n}\npublic void fetch() {\n@@ -101,9 +101,9 @@ public final class CTProductConfigController {\n}\npublic void activate() {\n- AsyncTask<Void, Void, Boolean> asyncTask = new AsyncTask<Void, Void, Boolean>() {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\n- protected Boolean doInBackground(Void... voids) {\n+ public Boolean doInBackground(Void params) {\nactivatedConfig.clear();\n//apply default config first\nif (defaultConfig != null && !defaultConfig.isEmpty()) {\n@@ -143,15 +143,16 @@ public final class CTProductConfigController {\n}\n@Override\n- protected void onPostExecute(Boolean isSuccess) {\n- super.onPostExecute(isSuccess);\n+ public void onPostExecute(Boolean isSuccess) {\nif (isSuccess) {\n- listener.onActivateCompleted();\n+ config.getLogger().verbose(config.getAccountId(), \"Activate Success\");\n+ listener.onActivateSuccess();\n+ } else {\n+ config.getLogger().verbose(config.getAccountId(), \"Activate Failed\");\n+ listener.onActivateFailed();\n}\n}\n- };\n- asyncTask.execute();\n-\n+ });\n}\npublic void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\n@@ -168,7 +169,7 @@ public final class CTProductConfigController {\nprivate boolean canRequest() {\n//TODO throttling logic\n- return true;\n+ return !TextUtils.isEmpty(guid);\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n@@ -178,22 +179,28 @@ public final class CTProductConfigController {\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n- listener.onFetchCompleted();\n+ config.getLogger().verbose(config.getAccountId(), \"fetch Success\");\n+ listener.onFetchSuccess();\n}\n});\n} catch (Exception e) {\n+ config.getLogger().verbose(config.getAccountId(), \"fetch Failed\");\n+ listener.onFetchFailed();\ne.printStackTrace();\n}\n}\n}\n- public void resetWithGuid(String cleverTapID) {\n+ public void setGuidAndInit(String cleverTapID) {\n+ if (TextUtils.isEmpty(guid))\n+ return;\nthis.guid = cleverTapID;\n+ initAsync();\n}\nprivate String getActivatedFileName() {\n- return CTProductConfigConstants.FILE_NAME_ACTIVATED + \".json\";\n+ return CTProductConfigConstants.FILE_NAME_ACTIVATED;\n}\nprivate String getActivatedDirName() {\n@@ -206,7 +213,7 @@ public final class CTProductConfigController {\nprivate String getFetchedFileName() {\n- return CTProductConfigConstants.FILE_NAME_FETCHED + \".json\";\n+ return CTProductConfigConstants.FILE_NAME_FETCHED;\n}\nprivate String getFetchedFullPath() {\n@@ -216,11 +223,20 @@ public final class CTProductConfigController {\nprivate String getActivatedFullPath() {\nreturn getActivatedDirName() + \"/\" + getActivatedFileName();\n}\n+\npublic interface Listener {\n+ void onInitSuccess();\n+\n+ void onInitFailed();\n+\nvoid fetchProductConfig();\n- void onFetchCompleted();\n+ void onFetchSuccess();\n+\n+ void onFetchFailed();\n+\n+ void onActivateSuccess();\n- void onActivateCompleted();\n+ void onActivateFailed();\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "package com.clevertap.android.sdk.product_config;\npublic interface CTProductConfigListener {\n- void onFetched();\n+ void onInitSuccess();\n- void onActivated();\n+ void onInitFailed();\n+\n+ void onFetchSuccess();\n+\n+ void onFetchFailed();\n+\n+ void onActivateSuccess();\n+\n+ void onActivateFailed();\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product Config):
1. Added archiving & unarchiving for Feature Flag
2. Refactored code & handled more use cases for product Config
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,623 | 19.03.2020 14:17:19 | -19,080 | 234dbe2cb26389ddb049e33202fb2a41201a9cbd | fix: Fixes crash due to Handler being run on background thread | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.7.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.1', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n@@ -41,7 +41,7 @@ dependencies {\nimplementation 'com.google.android.exoplayer:exoplayer-ui:2.8.4'\nimplementation 'com.github.bumptech.glide:glide:4.9.0'//Mandatory if you are using Notification inbox\nimplementation 'com.android.support:design:28.0.0'//Mandatory if you are using Notification Inbox\n- implementation 'com.android.installreferrer:installreferrer:1.0' // Mandatory for v3.6.4 and above\n+ implementation 'com.android.installreferrer:installreferrer:1.1.2' // Mandatory for v3.6.4 and above\n}\napply plugin: 'com.google.gms.google-services'\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.7.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/src/main/AndroidManifest.xml",
"new_path": "AndroidStarter/app/src/main/AndroidManifest.xml",
"diff": "<!--Add meta and set to 1 start using custom CleverTap ID-->\n<meta-data\nandroid:name=\"CLEVERTAP_USE_CUSTOM_ID\"\n- android:value=\"1\"/>\n+ android:value=\"0\"/>\n<!-- Add CleverTap Push Notification Services & Install Referrer Receivers-->\n<service\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.1'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.7.0', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.1', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.0'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.1'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.7.0.aar",
"new_path": "clevertap-android-sdk-3.7.0.aar",
"diff": "Binary files a/clevertap-android-sdk-3.7.0.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.7.1.aar",
"new_path": "clevertap-android-sdk-3.7.1.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.7.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.7.0'\n+ libraryVersion = '3.7.1'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.1.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.1.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30700\"\n- android:versionName=\"3.7.0\">\n+ android:versionCode=\"30701\"\n+ android:versionName=\"3.7.1\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -535,7 +535,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ninstance = new CleverTapAPI(context, config, cleverTapID);\ninstances.put(config.getAccountId(), instance);\nfinal CleverTapAPI finalInstance = instance;\n- new Handler().post(new Runnable() {\n+ instance.postAsyncSafely(\"notifyProfileInitialized\",new Runnable() {\n@Override\npublic void run() {\nif (finalInstance.getCleverTapID() != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Fixes crash due to Handler being run on background thread #61 CLEVER-10064 |
116,621 | 19.03.2020 21:48:48 | -19,080 | 22f2c015e6af662f1ff618a370d7725f3df0520a | feat(Product Config):
1. Added throttling logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -3599,6 +3599,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nfinal Object o = arp.get(key);\nif (o instanceof Number) {\nfinal int update = ((Number) o).intValue();\n+ if(Constants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n+ ||Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key) ){\n+ if(ctProductConfigController!= null){\n+ ctProductConfigController.setArpValue(key,update);\n+ }\n+ }\neditor.putInt(key, update);\n} else if (o instanceof String) {\nif (((String) o).length() < 100) {\n@@ -8108,7 +8114,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (!response.has(Constants.FEATURE_FLAG_JSON_RESPONSE_KEY)) {\n- getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"JSON object doesn't contain the Display Units key\");\n+ getConfigLogger().verbose(getAccountId(), Constants.FEATURE_FLAG_UNIT + \"JSON object doesn't contain the Feature Flags key\");\nreturn;\n}\ntry {\n@@ -8227,7 +8233,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (!response.has(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY)) {\n- getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"JSON object doesn't contain the Display Units key\");\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"JSON object doesn't contain the Product Config key\");\nreturn;\n}\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -227,4 +227,7 @@ public class Constants {\npublic static final String FEATURE_FLAG_UNIT = \"Feature Flag : \";\npublic static final String LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\n+ //arp\n+ public static final String PRODUCT_CONFIG_NO_OF_CALLS = \"rc_n\";\n+ public static final String PRODUCT_CONFIG_WINDOW_LENGTH_MINS = \"rc_w\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -7,7 +7,7 @@ import android.os.Build;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n-final class StorageHelper {\n+public final class StorageHelper {\nprivate static long EXECUTOR_THREAD_ID = 0;\nprivate static ExecutorService es;\n@@ -69,7 +69,7 @@ final class StorageHelper {\nreturn getPreferences(context).getBoolean(key, defaultValue);\n}\n- static SharedPreferences getPreferences(Context context, String namespace) {\n+ public static SharedPreferences getPreferences(Context context, String namespace) {\nString path = Constants.CLEVERTAP_STORAGE_TAG;\nif (namespace != null) {\n@@ -82,7 +82,7 @@ final class StorageHelper {\nreturn getPreferences(context, null);\n}\n- static void persist(final SharedPreferences.Editor editor) {\n+ public static void persist(final SharedPreferences.Editor editor) {\ntry {\nif (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\neditor.apply();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -4,4 +4,8 @@ public interface CTProductConfigConstants {\nString DIR_PRODUCT_CONFIG = \"Product_Config\";\nString FILE_NAME_FETCHED = \"fetched.json\";\nString FILE_NAME_ACTIVATED = \"activated.json\";\n+ String PRODUCT_CONFIG_PREF = \"PRODUCT_CONFIG_PREF\";\n+ String KEY_LAST_FETCHED_TIMESTAMP = \"ts\";\n+ int DEFAULT_NO_OF_CALLS = 5;\n+ int DEFAULT_WINDOW_LENGTH_MINS = 60;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "package com.clevertap.android.sdk.product_config;\nimport android.content.Context;\n+import android.content.SharedPreferences;\nimport android.text.TextUtils;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.TaskManager;\nimport com.clevertap.android.sdk.Utils;\nimport org.json.JSONArray;\n+import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.util.HashMap;\nimport java.util.Iterator;\n+import java.util.concurrent.TimeUnit;\npublic final class CTProductConfigController {\n+\nprivate String guid;\npublic boolean isInitialized() {\n@@ -28,6 +33,8 @@ public final class CTProductConfigController {\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\nprivate final Listener listener;\nprivate long minFetchIntervalInSeconds;\n+ private long lastFetchTimeStampInMillis;\n+ private int[] arpValues = new int[]{5, 60};//0 is for rc_n, 1 is for rc_w\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, Listener listener) {\nthis.context = context;\n@@ -63,7 +70,7 @@ public final class CTProductConfigController {\n}\nisInitialized = true;\nUtils.writeJsonToFile(context, getActivatedDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n-\n+ initSharedPrefValues();\n} catch (Exception e) {\ne.printStackTrace();\nreturn false;\n@@ -75,16 +82,24 @@ public final class CTProductConfigController {\n@Override\npublic void onPostExecute(Boolean isInitSuccess) {\nif (isInitSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Init Success\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Init Success\");\nlistener.onInitSuccess();\n} else {\n- config.getLogger().verbose(config.getAccountId(), \"Init Failed\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Init Failed\");\nlistener.onInitFailed();\n}\n}\n});\n}\n+ private void initSharedPrefValues() {\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n+ arpValues[0] = prefs.getInt(Constants.PRODUCT_CONFIG_NO_OF_CALLS, CTProductConfigConstants.DEFAULT_NO_OF_CALLS);\n+ arpValues[1] = prefs.getInt(Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS, CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS);\n+\n+ lastFetchTimeStampInMillis = prefs.getLong(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP, 0);\n+ }\n+\npublic void setDefaults(int resourceID) {\ndefaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\ninitAsync();\n@@ -97,6 +112,8 @@ public final class CTProductConfigController {\npublic void fetch(long minimumFetchIntervalInSeconds) {\nif (canRequest()) {\nlistener.fetchProductConfig();\n+ } else {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Throttled\");\n}\n}\n@@ -145,10 +162,10 @@ public final class CTProductConfigController {\n@Override\npublic void onPostExecute(Boolean isSuccess) {\nif (isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Activate Success\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Activate Success\");\nlistener.onActivateSuccess();\n} else {\n- config.getLogger().verbose(config.getAccountId(), \"Activate Failed\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Activate Failed\");\nlistener.onActivateFailed();\n}\n}\n@@ -160,38 +177,55 @@ public final class CTProductConfigController {\n}\npublic String getString(String Key) {\n- return defaultConfig.get(Key);\n+ return activatedConfig.get(Key);\n}\npublic boolean getBoolean(String Key) {\n- return Boolean.parseBoolean(defaultConfig.get(Key));\n+ return Boolean.parseBoolean(activatedConfig.get(Key));\n}\nprivate boolean canRequest() {\n- //TODO throttling logic\n- return !TextUtils.isEmpty(guid);\n+ if (TextUtils.isEmpty(guid))\n+ return false;\n+ if (arpValues[0] > 0 && arpValues[1] > 0) {\n+ long timeSinceLastRequest = System.currentTimeMillis() - lastFetchTimeStampInMillis;\n+ return TimeUnit.MILLISECONDS.toMinutes(timeSinceLastRequest) > (arpValues[1] / arpValues[0]);\n+ }\n+ return false;\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\nif (kvResponse != null) {\ntry {\n+ parseLastFetchTimeStamp(kvResponse);\nUtils.writeJsonToFile(context, getFetchedDirName(), getFetchedFileName(), kvResponse);\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n- config.getLogger().verbose(config.getAccountId(), \"fetch Success\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Success\");\nlistener.onFetchSuccess();\n}\n});\n} catch (Exception e) {\n- config.getLogger().verbose(config.getAccountId(), \"fetch Failed\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Failed\");\nlistener.onFetchFailed();\ne.printStackTrace();\n}\n}\n}\n+ private void parseLastFetchTimeStamp(JSONObject jsonObject) throws JSONException {\n+ Integer timestampInSeconds = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n+ if (timestampInSeconds > 0) {\n+ lastFetchTimeStampInMillis = timestampInSeconds * 1000L;\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n+ SharedPreferences.Editor editor = prefs.edit();\n+ editor.putLong(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP, lastFetchTimeStampInMillis);\n+ editor.commit();\n+ }\n+ }\n+\npublic void setGuidAndInit(String cleverTapID) {\nif (TextUtils.isEmpty(guid))\nreturn;\n@@ -224,6 +258,21 @@ public final class CTProductConfigController {\nreturn getActivatedDirName() + \"/\" + getActivatedFileName();\n}\n+ public void setArpValue(String key, int value) {\n+ final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n+ final SharedPreferences.Editor editor = prefs.edit();\n+ switch (key) {\n+ case Constants.PRODUCT_CONFIG_NO_OF_CALLS:\n+ arpValues[0] = value;\n+ break;\n+ case Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n+ arpValues[1] = value;\n+ break;\n+ }\n+ editor.putInt(key, value);\n+ StorageHelper.persist(editor);\n+ }\n+\npublic interface Listener {\nvoid onInitSuccess();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product Config):
1. Added throttling logic
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 20.03.2020 12:27:40 | -19,080 | 18671bcc15e051e28d8b2fec73ac08b134f681c9 | feat(Product Config):
1. Added feature flag fetch | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1868,6 +1868,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ncheckTimeoutSession();\nif (!isAppLaunchPushed()) {\npushAppLaunchedEvent();\n+ fetchFeatureFlags();\nonTokenRefresh();\npostAsyncSafely(\"HandlingInstallReferrer\", new Runnable() {\n@Override\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product Config):
1. Added feature flag fetch
https://wizrocket.atlassian.net/browse/CLEVER-8860 |
116,623 | 27.03.2020 16:55:31 | -19,080 | 0b170e767ebafa201f068d43ca20b5010fb42424 | fix: crash below Oreo due to FCaps | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.7.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.2', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n@@ -41,7 +41,7 @@ dependencies {\nimplementation 'com.google.android.exoplayer:exoplayer-ui:2.8.4'\nimplementation 'com.github.bumptech.glide:glide:4.9.0'//Mandatory if you are using Notification inbox\nimplementation 'com.android.support:design:28.0.0'//Mandatory if you are using Notification Inbox\n- implementation 'com.android.installreferrer:installreferrer:1.1.2' // Mandatory for v3.6.4 and above\n+ implementation 'com.android.installreferrer:installreferrer:1.0' // Mandatory for v3.6.4 and above\n}\napply plugin: 'com.google.gms.google-services'\n"
},
{
"change_type": "DELETE",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar",
"diff": "Binary files a/AndroidStarter/app/libs/clevertap-android-sdk-3.7.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.2.aar",
"new_path": "AndroidStarter/app/libs/clevertap-android-sdk-3.7.2.aar",
"diff": "Binary files /dev/null and b/AndroidStarter/app/libs/clevertap-android-sdk-3.7.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.7.2 (March 27, 2020)\n+* Adds fix for a crash caused when InApp with Frequency Caps was shown on first App Launched\n+\n### Version 3.7.1 (March 19, 2020)\n* Adds fix for a crash caused when CleverTap instance was created from background\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.2'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.7.1', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.7.2', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.1'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.7.2'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.7.1.aar",
"new_path": "clevertap-android-sdk-3.7.1.aar",
"diff": "Binary files a/clevertap-android-sdk-3.7.1.aar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-android-sdk-3.7.2.aar",
"new_path": "clevertap-android-sdk-3.7.2.aar",
"diff": "Binary files /dev/null and b/clevertap-android-sdk-3.7.2.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.7.1'\n+ libraryVersion = '3.7.2'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.2.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.1.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.7.2.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30701\"\n- android:versionName=\"3.7.1\">\n+ android:versionCode=\"30702\"\n+ android:versionName=\"3.7.2\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -137,10 +137,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.ns = Executors.newFixedThreadPool(1);\nthis.localDataStore = new LocalDataStore(context, config);\nthis.deviceInfo = new DeviceInfo(context, config, cleverTapID);\n+\nif(this.deviceInfo.getDeviceID() != null){\nLogger.v(\"Initializing InAppFC with device Id = \"+ this.deviceInfo.getDeviceID());\nthis.inAppFCManager = new InAppFCManager(context,config,this.deviceInfo.getDeviceID());\n}\n+\nthis.validator = new Validator();\npostAsyncSafely(\"CleverTapAPI#initializeDeviceInfo\", new Runnable() {\n@@ -3948,6 +3950,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n+ if(inAppFCManager != null) {\nif (!inAppFCManager.canShow(inAppNotification)) {\ngetConfigLogger().verbose(getAccountId(), \"InApp has been rejected by FC, not showing \" + inAppNotification.getCampaignId());\nshowInAppNotificationIfAny();\n@@ -3955,6 +3958,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\ninAppFCManager.didShow(context, inAppNotification);\n+ }else{\n+ getConfigLogger().verbose(getAccountId(), \"InAppFCManager is NULL, not showing \" + inAppNotification.getCampaignId());\n+ return;\n+ }\nfinal InAppNotificationListener listener = getInAppNotificationListener();\n@@ -6002,8 +6009,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\npublic void inAppNotificationDidDismiss(final Context context, final CTInAppNotification inAppNotification, Bundle formData) {\ninAppNotification.didDismiss();\n+ if(inAppFCManager != null) {\ninAppFCManager.didDismiss(inAppNotification);\ngetConfigLogger().verbose(getAccountId(), \"InApp Dismissed: \" + inAppNotification.getCampaignId());\n+ }\ntry {\nfinal InAppNotificationListener listener = getInAppNotificationListener();\nif (listener != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -8,9 +8,6 @@ import java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\nfinal class StorageHelper {\n- private static long EXECUTOR_THREAD_ID = 0;\n- private static ExecutorService es;\n-\nstatic void putString(Context context, String key, String value) {\nSharedPreferences prefs = getPreferences(context);\nSharedPreferences.Editor editor = prefs.edit().putString(key, value);\n@@ -84,44 +81,9 @@ final class StorageHelper {\nstatic void persist(final SharedPreferences.Editor editor) {\ntry {\n- if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\neditor.apply();\n- } else {\n- postAsyncSafely(new Runnable() {\n- @Override\n- public void run() {\n- editor.commit();\n- }\n- });\n- }\n} catch (Throwable t) {\nLogger.v(\"CRITICAL: Failed to persist shared preferences!\", t);\n}\n}\n-\n- private static void postAsyncSafely(final Runnable runnable) {\n- try {\n- if (es == null)\n- es = Executors.newFixedThreadPool(1);\n- final boolean executeSync = Thread.currentThread().getId() == EXECUTOR_THREAD_ID;\n-\n- if (executeSync) {\n- runnable.run();\n- } else {\n- es.submit(new Runnable() {\n- @Override\n- public void run() {\n- EXECUTOR_THREAD_ID = Thread.currentThread().getId();\n- try {\n- runnable.run();\n- } catch (Throwable t) {\n- Logger.v(\"Executor service: Failed to complete the scheduled task\", t);\n- }\n- }\n- });\n- }\n- } catch (Throwable t) {\n- Logger.v(\"Failed to submit task to the executor service\", t);\n- }\n- }\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: crash below Oreo due to FCaps CLEVER-10448 |
116,621 | 31.03.2020 18:52:54 | -19,080 | 35abef69b69093c2ad70de340d5db926fc5456cf | feat(Product_Config):
1. Refactored code for FetchAndActivate | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -15,7 +15,6 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n-import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.concurrent.TimeUnit;\n@@ -40,36 +39,23 @@ public class CTProductConfigController {\nprivate final Context context;\nprivate HashMap<String, String> defaultConfig;\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\n- private final ArrayList<CTProductConfigListener> listenerList = new ArrayList<>();\n- private final Listener cleverTapApiListener;\n+ private final Listener listener;\nprivate long minFetchIntervalInSeconds = DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\nprivate long lastFetchTimeStampInMillis;\nprivate boolean isFetching = false;\nprivate boolean isActivating = false;\n- private CTProductConfigListener localListener;\n-\n- private int[] arpValues = new int[]{DEFAULT_NO_OF_CALLS, DEFAULT_WINDOW_LENGTH_MINS};//0 is for rc_n, 1 is for rc_w\n+ private boolean isFetchAndActivating = false;\n+ private int noOfCallsInAllowedWindow = DEFAULT_NO_OF_CALLS;\n+ private int windowIntervalInMins = DEFAULT_WINDOW_LENGTH_MINS;\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, Listener listener) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\n- cleverTapApiListener = listener;\n- listenerList.add(listener);\n+ this.listener = listener;\ninitAsync();\n}\n- public void register(CTProductConfigListener listener) {\n- if (listener != null && !listenerList.contains(listener))\n- listenerList.add(listener);\n- }\n-\n- public void unRegister(CTProductConfigListener listener) {\n- if (listener != null) {\n- listenerList.remove(listener);\n- }\n- }\n-\nprivate synchronized void initAsync() {\nif (TextUtils.isEmpty(guid))\nreturn;\n@@ -122,8 +108,8 @@ public class CTProductConfigController {\nprivate void initSharedPrefValues() {\nfinal SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n- arpValues[0] = prefs.getInt(Constants.PRODUCT_CONFIG_NO_OF_CALLS, DEFAULT_NO_OF_CALLS);\n- arpValues[1] = prefs.getInt(Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS, DEFAULT_WINDOW_LENGTH_MINS);\n+ noOfCallsInAllowedWindow = prefs.getInt(Constants.PRODUCT_CONFIG_NO_OF_CALLS, DEFAULT_NO_OF_CALLS);\n+ windowIntervalInMins = prefs.getInt(Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS, DEFAULT_WINDOW_LENGTH_MINS);\nlastFetchTimeStampInMillis = prefs.getLong(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP, 0);\n}\n@@ -148,7 +134,7 @@ public class CTProductConfigController {\npublic void fetch(long interval) {\nif (canRequest()) {\nisFetching = true;\n- cleverTapApiListener.fetchProductConfig();\n+ listener.fetchProductConfig();\n} else {\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config: Throttled\");\n}\n@@ -171,6 +157,7 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\n//read fetched info\n+ //TODO optimise\nString content = FileUtils.readFromFile(context, getFetchedFullPath());\nif (!TextUtils.isEmpty(content)) {\n@@ -209,6 +196,7 @@ public class CTProductConfigController {\nsendCallback(PROCESSING_STATE.ACTIVATE_FAILED);\n}\nisActivating = false;\n+ isFetchAndActivating = false;\n}\n});\n}\n@@ -277,9 +265,10 @@ public class CTProductConfigController {\nprivate boolean canRequest() {\nif (!isFetching && !TextUtils.isEmpty(guid)) {\n- if (arpValues[0] > 0 && arpValues[1] > 0) {\nlong timeSinceLastRequest = System.currentTimeMillis() - lastFetchTimeStampInMillis;\n- return TimeUnit.MILLISECONDS.toMinutes(timeSinceLastRequest) > (arpValues[1] / arpValues[0]);\n+ if (noOfCallsInAllowedWindow > 0 && windowIntervalInMins > 0) {\n+\n+ return TimeUnit.MILLISECONDS.toMinutes(timeSinceLastRequest) > (windowIntervalInMins / noOfCallsInAllowedWindow);\n}\n}\nreturn false;\n@@ -297,11 +286,15 @@ public class CTProductConfigController {\nsendCallback(PROCESSING_STATE.FETCH_SUCCESS);\n}\n});\n+ if (isFetchAndActivating) {\n+ activate();\n+ }\n} catch (Exception e) {\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Failed\");\nsendCallback(PROCESSING_STATE.FETCH_FAILED);\ne.printStackTrace();\n+ isFetchAndActivating = false;// set fetchAndActivating flag to false if fetch fails.\n}\n}\nisFetching = false;\n@@ -350,10 +343,10 @@ public class CTProductConfigController {\nfinal SharedPreferences.Editor editor = prefs.edit();\nswitch (key) {\ncase Constants.PRODUCT_CONFIG_NO_OF_CALLS:\n- arpValues[0] = value;\n+ noOfCallsInAllowedWindow = value;\nbreak;\ncase Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n- arpValues[1] = value;\n+ windowIntervalInMins = value;\nbreak;\n}\neditor.putInt(key, value);\n@@ -402,34 +395,22 @@ public class CTProductConfigController {\nif (state != null) {\nswitch (state) {\ncase INIT_SUCCESS:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onInitSuccess();\n- }\nbreak;\ncase INIT_FAILED:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onInitFailed();\n- }\nbreak;\ncase FETCH_FAILED:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onFetchFailed();\n- }\nbreak;\ncase FETCH_SUCCESS:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onFetchSuccess();\n- }\nbreak;\ncase ACTIVATE_FAILED:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onActivateFailed();\n- }\nbreak;\ncase ACTIVATE_SUCCESS:\n- for (CTProductConfigListener listener : listenerList) {\nlistener.onActivateSuccess();\n- }\nbreak;\n}\n}\n@@ -440,39 +421,8 @@ public class CTProductConfigController {\n* Asynchronously fetches and then activates the fetched configs.\n*/\npublic void fetchAndActivate() {\n- localListener = new CTProductConfigListener() {\n- @Override\n- public void onInitSuccess() {\n-\n- }\n-\n- @Override\n- public void onInitFailed() {\n-\n- }\n-\n- @Override\n- public void onFetchSuccess() {\n- activate();\n- }\n-\n- @Override\n- public void onFetchFailed() {\n-\n- }\n-\n- @Override\n- public void onActivateSuccess() {\n- unRegister(localListener);\n- localListener = null;\n- }\n-\n- @Override\n- public void onActivateFailed() {\n-\n- }\n- };\n- register(localListener);\n+ if (isFetchAndActivating)\n+ return;\nfetch();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(Product_Config):
1. Refactored code for FetchAndActivate
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 31.03.2020 19:01:46 | -19,080 | 806a47006765987ce07fa20b6f21367ca02fceb4 | fix(merge)- build error merge with 372 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -2,10 +2,8 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n-import android.os.Build;\nimport java.util.concurrent.ExecutorService;\n-import java.util.concurrent.Executors;\npublic final class StorageHelper {\nprivate static long EXECUTOR_THREAD_ID = 0;\n@@ -82,7 +80,7 @@ public final class StorageHelper {\nreturn getPreferences(context, null);\n}\n- static void persist(final SharedPreferences.Editor editor) {\n+ public static void persist(final SharedPreferences.Editor editor) {\ntry {\neditor.apply();\n} catch (Throwable t) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(merge)- build error merge with 372 |
116,623 | 01.04.2020 12:58:17 | -19,080 | b52c51c237785a3f4145b144f7b0dab63462fa21 | fix: Dropping InApp if bitmap is null | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNotification.java",
"diff": "@@ -264,6 +264,9 @@ class CTInAppNotification implements Parcelable {\nif (!ImageCache.addBitmap(media.getCacheKey(), imageBitmap)) {\nthis.error = \"Error processing image\";\n}\n+ }else {\n+ Logger.d(\"Image Bitmap is null\");\n+ this.error = \"Error processing image as bitmap was NULL\";\n}\n}\n}else if(media.isVideo() || media.isAudio()){\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Dropping InApp if bitmap is null CLEVER-9797 |
116,621 | 01.04.2020 23:18:43 | -19,080 | 7f451b3eff05edc70dab9e4967b36aa948cbcecd | code-review(Product Config):
1. Added synchronization checks
2. Cache fetched info to be used for activation. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -92,7 +92,7 @@ public class CTFeatureFlagsController {\n}\n}\n- private void archiveData(JSONObject featureFlagRespObj, boolean sync) {\n+ private synchronized void archiveData(JSONObject featureFlagRespObj, boolean sync) {\nif (featureFlagRespObj != null) {\ntry {\n@@ -103,7 +103,7 @@ public class CTFeatureFlagsController {\n}\n}\n- private void unarchiveData(boolean sync) {\n+ private synchronized void unarchiveData(boolean sync) {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\npublic Boolean doInBackground(Void aVoid) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -39,6 +39,7 @@ public class CTProductConfigController {\nprivate final Context context;\nprivate HashMap<String, String> defaultConfig;\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\n+ private final HashMap<String, String> fetchedConfig = new HashMap<>();\nprivate final Listener listener;\nprivate long minFetchIntervalInSeconds = DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\nprivate long lastFetchTimeStampInMillis;\n@@ -62,6 +63,7 @@ public class CTProductConfigController {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\npublic Boolean doInBackground(Void params) {\n+ synchronized (this) {\ntry {\nactivatedConfig.clear();\nString content = FileUtils.readFromFile(context, getActivatedFullPath());\n@@ -92,6 +94,7 @@ public class CTProductConfigController {\n}\nreturn true;\n}\n+ }\n@Override\npublic void onPostExecute(Boolean isInitSuccess) {\n@@ -149,6 +152,7 @@ public class CTProductConfigController {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\npublic Boolean doInBackground(Void params) {\n+ synchronized (this) {\nisActivating = true;\ntry {\nactivatedConfig.clear();\n@@ -157,7 +161,9 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\n//read fetched info\n- //TODO optimise\n+ if (!fetchedConfig.isEmpty()) {\n+ activatedConfig.putAll(fetchedConfig);\n+ } else {\nString content = FileUtils.readFromFile(context, getFetchedFullPath());\nif (!TextUtils.isEmpty(content)) {\n@@ -176,6 +182,7 @@ public class CTProductConfigController {\n}\n}\n}\n+ }\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n}\n@@ -185,6 +192,7 @@ public class CTProductConfigController {\n}\nreturn true;\n}\n+ }\n@Override\npublic void onPostExecute(Boolean isSuccess) {\n@@ -275,9 +283,10 @@ public class CTProductConfigController {\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n+ synchronized (this) {\nif (kvResponse != null) {\ntry {\n- parseLastFetchTimeStamp(kvResponse);\n+ parseFetchedResponse(kvResponse);\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), getFetchedFileName(), kvResponse);\nUtils.runOnUiThread(new Runnable() {\n@Override\n@@ -299,8 +308,25 @@ public class CTProductConfigController {\n}\nisFetching = false;\n}\n+ }\n+\n+ private void parseFetchedResponse(JSONObject jsonObject) throws JSONException {\n+ JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+\n+ if (kvArray != null && kvArray.length() > 0) {\n+ fetchedConfig.clear();\n+ for (int i = 0; i < kvArray.length(); i++) {\n+ JSONObject object = (JSONObject) kvArray.get(i);\n+ if (object != null) {\n+ String Key = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_KEY);\n+ String Value = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_VALUE);\n+ if (!TextUtils.isEmpty(Key)) {\n+ fetchedConfig.put(Key, String.valueOf(Value));\n+ }\n+ }\n+ }\n+ }\n- private void parseLastFetchTimeStamp(JSONObject jsonObject) throws JSONException {\nInteger timestampInSeconds = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\nif (timestampInSeconds > 0) {\nlastFetchTimeStampInMillis = timestampInSeconds * 1000L;\n@@ -357,6 +383,7 @@ public class CTProductConfigController {\n* Deletes all activated, fetched and defaults configs and resets all Product Config settings.\n*/\npublic void reset() {\n+ synchronized (this) {\nif (null != defaultConfig) {\ndefaultConfig.clear();\n}\n@@ -369,6 +396,7 @@ public class CTProductConfigController {\n}\nsetMinimumFetchIntervalInSeconds(DEFAULT_MIN_FETCH_INTERVAL_SECONDS);\n}\n+ }\npublic void setArpValue(JSONObject arp) {\nif (arp != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added synchronization checks
2. Cache fetched info to be used for activation.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 06.04.2020 16:45:35 | -19,080 | 4ecff80086069eab2f348be2ab1b152ad60b8f5f | code-review(Product Config):
1. Added Config settings | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8280,8 +8280,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (ctProductConfigController != null && ctProductConfigController.isInitialized()) {\n- ctProductConfigController.setGuidAndInit(getCleverTapID());//TODO check whether needed\n- ctProductConfigController.fetch();\n+ ctProductConfigController.setGuidAndInit(getCleverTapID());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -227,7 +227,4 @@ public class Constants {\npublic static final String FEATURE_FLAG_UNIT = \"Feature Flag : \";\npublic static final String LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\n- //arp\n- public static final String PRODUCT_CONFIG_NO_OF_CALLS = \"rc_n\";\n- public static final String PRODUCT_CONFIG_WINDOW_LENGTH_MINS = \"rc_w\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FileUtils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FileUtils.java",
"diff": "@@ -87,4 +87,26 @@ public class FileUtils {\nthrow e;\n}\n}\n+\n+ public static boolean deleteFile(Context context, String fileName) throws Exception {\n+ if (TextUtils.isEmpty(fileName) || context == null)\n+ return false;\n+ try {\n+ File file = new File(context.getFilesDir(), fileName);\n+ if (file.exists()) {\n+ if (file.delete()) {\n+ Log.d(TAG, \"File Deleted:\" + fileName);\n+ return true;\n+ } else {\n+ Log.d(TAG, \"Failed to delete file\" + fileName);\n+ return false;\n+ }\n+ }\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ Log.d(TAG, \"writeFileOnInternalStorage: failed\" + e.getMessage());\n+ throw e;\n+ }\n+ return false;\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -6,6 +6,7 @@ public interface CTProductConfigConstants {\nString DIR_PRODUCT_CONFIG = \"Product_Config\";\nString FILE_NAME_FETCHED = \"fetched.json\";\nString FILE_NAME_ACTIVATED = \"activated.json\";\n+ String FILE_NAME_CONFIG_SETTINGS = \"config_settings.json\";\nString PRODUCT_CONFIG_PREF = \"PRODUCT_CONFIG_PREF\";\nString PRODUCT_CONFIG_JSON_KEY_FOR_KEY = \"n\";\nString PRODUCT_CONFIG_JSON_KEY_FOR_VALUE = \"v\";\n@@ -20,4 +21,8 @@ public interface CTProductConfigConstants {\nBoolean DEFAULT_VALUE_FOR_BOOLEAN = false;\nLong DEFAULT_VALUE_FOR_LONG = 0L;\nDouble DEFAULT_VALUE_FOR_DOUBLE = 0.0;\n+ //arp\n+ String PRODUCT_CONFIG_NO_OF_CALLS = \"rc_n\";\n+ String PRODUCT_CONFIG_WINDOW_LENGTH_MINS = \"rc_w\";\n+ String PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS = \"fetch_min_interval_seconds\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "package com.clevertap.android.sdk.product_config;\nimport android.content.Context;\n-import android.content.SharedPreferences;\nimport android.text.TextUtils;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.FileUtils;\n-import com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.TaskManager;\nimport com.clevertap.android.sdk.Utils;\n@@ -17,12 +15,9 @@ import org.json.JSONObject;\nimport java.util.HashMap;\nimport java.util.Iterator;\n-import java.util.concurrent.TimeUnit;\nimport 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;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_STRING;\n-import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_KEY;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_VALUE;\n@@ -41,23 +36,22 @@ public class CTProductConfigController {\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\nprivate final HashMap<String, String> fetchedConfig = new HashMap<>();\nprivate final Listener listener;\n- private long minFetchIntervalInSeconds = DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n- private long lastFetchTimeStampInMillis;\nprivate boolean isFetching = false;\nprivate boolean isActivating = false;\nprivate boolean isFetchAndActivating = false;\n- private int noOfCallsInAllowedWindow = DEFAULT_NO_OF_CALLS;\n- private int windowIntervalInMins = DEFAULT_WINDOW_LENGTH_MINS;\n+ private final ProductConfigSettings settings;\n+\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, Listener listener) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\nthis.listener = listener;\n- initAsync();\n+ this.settings = new ProductConfigSettings(context, guid, config);\n+ initAsync(false);\n}\n- private synchronized void initAsync() {\n+ private void initAsync(final boolean isProfileSwitched) {\nif (TextUtils.isEmpty(guid))\nreturn;\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@@ -66,27 +60,16 @@ public class CTProductConfigController {\nsynchronized (this) {\ntry {\nactivatedConfig.clear();\n- String content = FileUtils.readFromFile(context, getActivatedFullPath());\n//apply default config first\nif (defaultConfig != null && !defaultConfig.isEmpty()) {\nactivatedConfig.putAll(defaultConfig);\n}\n- if (!TextUtils.isEmpty(content)) {\n-\n- JSONObject jsonObject = new JSONObject(content);\n- Iterator<String> iterator = jsonObject.keys();\n- while (iterator.hasNext()) {\n-\n- String key = iterator.next();\n- if (!TextUtils.isEmpty(key)) {\n- String value = String.valueOf(jsonObject.get(key));\n- activatedConfig.put(key, value);\n- }\n- }\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n- initSharedPrefValues();\n+ activatedConfig.putAll(getStoredValues(getActivatedFullPath()));\n+ FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ settings.loadSettings();\nisInitialized = true;\n-\n+ if (isProfileSwitched) {\n+ fetch();\n}\n} catch (Exception e) {\ne.printStackTrace();\n@@ -109,33 +92,42 @@ public class CTProductConfigController {\n});\n}\n- private void initSharedPrefValues() {\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n- noOfCallsInAllowedWindow = prefs.getInt(Constants.PRODUCT_CONFIG_NO_OF_CALLS, DEFAULT_NO_OF_CALLS);\n- windowIntervalInMins = prefs.getInt(Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS, DEFAULT_WINDOW_LENGTH_MINS);\n-\n- lastFetchTimeStampInMillis = prefs.getLong(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP, 0);\n+ private HashMap<String, String> getStoredValues(String fullFilePath) throws Exception {\n+ HashMap<String, String> map = new HashMap<>();\n+ String content = FileUtils.readFromFile(context, fullFilePath);\n+ if (!TextUtils.isEmpty(content)) {\n+ JSONObject jsonObject = new JSONObject(content);\n+ Iterator<String> iterator = jsonObject.keys();\n+ while (iterator.hasNext()) {\n+ String key = iterator.next();\n+ if (!TextUtils.isEmpty(key)) {\n+ String value = String.valueOf(jsonObject.get(key));\n+ map.put(key, value);\n+ }\n+ }\n+ }\n+ return map;\n}\npublic void setDefaults(int resourceID) {\ndefaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\n- initAsync();\n+ initAsync(false);\n}\n/**\n* Starts fetching configs, adhering to the default minimum fetch interval.\n*/\npublic void fetch() {\n- fetch(minFetchIntervalInSeconds);\n+ fetch(settings.getNextFetchIntervalInSeconds());\n}\n/**\n- * Starts fetching configs, adhering to the specified minimum fetch interval.\n+ * Starts fetching configs, adhering to the specified minimum fetch interval in seconds.\n*\n- * @param interval\n+ * @param minimumFetchIntervalInSeconds\n*/\n- public void fetch(long interval) {\n- if (canRequest()) {\n+ public void fetch(long minimumFetchIntervalInSeconds) {\n+ if (canRequest(minimumFetchIntervalInSeconds)) {\nisFetching = true;\nlistener.fetchProductConfig();\n} else {\n@@ -164,27 +156,9 @@ public class CTProductConfigController {\nif (!fetchedConfig.isEmpty()) {\nactivatedConfig.putAll(fetchedConfig);\n} else {\n- String content = FileUtils.readFromFile(context, getFetchedFullPath());\n- if (!TextUtils.isEmpty(content)) {\n-\n- JSONObject jsonObject = new JSONObject(content);\n- JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n-\n- if (kvArray != null && kvArray.length() > 0) {\n- for (int i = 0; i < kvArray.length(); i++) {\n- JSONObject object = (JSONObject) kvArray.get(i);\n- if (object != null) {\n- String Key = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_KEY);\n- String Value = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_VALUE);\n- if (!TextUtils.isEmpty(Key)) {\n- activatedConfig.put(Key, String.valueOf(Value));\n- }\n- }\n- }\n- }\n- }\n-\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), getActivatedFileName(), new JSONObject(activatedConfig));\n+ activatedConfig.putAll(getStoredValues(getFetchedFullPath()));\n+ FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ FileUtils.deleteFile(context, getFetchedFullPath());\n}\n} catch (Exception e) {\ne.printStackTrace();\n@@ -210,7 +184,7 @@ public class CTProductConfigController {\n}\npublic void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\n- this.minFetchIntervalInSeconds = fetchIntervalInSeconds;\n+ settings.setMinimumFetchIntervalInSeconds(fetchIntervalInSeconds);\n}\n@@ -271,15 +245,10 @@ public class CTProductConfigController {\nreturn CTProductConfigConstants.DEFAULT_VALUE_FOR_DOUBLE;\n}\n- private boolean canRequest() {\n- if (!isFetching && !TextUtils.isEmpty(guid)) {\n- long timeSinceLastRequest = System.currentTimeMillis() - lastFetchTimeStampInMillis;\n- if (noOfCallsInAllowedWindow > 0 && windowIntervalInMins > 0) {\n-\n- return TimeUnit.MILLISECONDS.toMinutes(timeSinceLastRequest) > (windowIntervalInMins / noOfCallsInAllowedWindow);\n- }\n- }\n- return false;\n+ private boolean canRequest(long minimumFetchIntervalInSeconds) {\n+ return !isFetching\n+ && !TextUtils.isEmpty(guid)\n+ && (System.currentTimeMillis() - 1000 * minimumFetchIntervalInSeconds) > settings.getLastFetchTimeStampInMillis();\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n@@ -287,7 +256,7 @@ public class CTProductConfigController {\nif (kvResponse != null) {\ntry {\nparseFetchedResponse(kvResponse);\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), getFetchedFileName(), kvResponse);\n+ FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n@@ -311,37 +280,39 @@ public class CTProductConfigController {\n}\nprivate void parseFetchedResponse(JSONObject jsonObject) throws JSONException {\n+ HashMap<String, String> map = convertServerJsonToMap(jsonObject);\n+ fetchedConfig.clear();\n+ fetchedConfig.putAll(map);\n+ Integer timestampInSeconds = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n+ if (timestampInSeconds > 0) {\n+ settings.setLastFetchTimeStampInMillis(timestampInSeconds * 1000L);\n+ }\n+ }\n+\n+ private HashMap<String, String> convertServerJsonToMap(JSONObject jsonObject) throws JSONException {\n+ HashMap<String, String> map = new HashMap<>();\nJSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\nif (kvArray != null && kvArray.length() > 0) {\n- fetchedConfig.clear();\nfor (int i = 0; i < kvArray.length(); i++) {\nJSONObject object = (JSONObject) kvArray.get(i);\nif (object != null) {\nString Key = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_KEY);\nString Value = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_VALUE);\nif (!TextUtils.isEmpty(Key)) {\n- fetchedConfig.put(Key, String.valueOf(Value));\n+ map.put(Key, String.valueOf(Value));\n}\n}\n}\n}\n-\n- Integer timestampInSeconds = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n- if (timestampInSeconds > 0) {\n- lastFetchTimeStampInMillis = timestampInSeconds * 1000L;\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n- SharedPreferences.Editor editor = prefs.edit();\n- editor.putLong(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP, lastFetchTimeStampInMillis);\n- editor.commit();\n- }\n+ return map;\n}\npublic void setGuidAndInit(String cleverTapID) {\nif (TextUtils.isEmpty(guid))\nreturn;\nthis.guid = cleverTapID;\n- initAsync();\n+ initAsync(true);\n}\nprivate String getActivatedFileName() {\n@@ -352,31 +323,24 @@ public class CTProductConfigController {\nreturn CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n}\n- private String getFetchedFileName() {\n- return CTProductConfigConstants.FILE_NAME_FETCHED;\n- }\n-\nprivate String getFetchedFullPath() {\n- return getProductConfigDirName() + \"/\" + getFetchedFileName();\n+ return getProductConfigDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_FETCHED;\n}\nprivate String getActivatedFullPath() {\n- return getProductConfigDirName() + \"/\" + getActivatedFileName();\n+ return getProductConfigDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_ACTIVATED;\n}\npublic void setArpValue(String key, int value) {\n- final SharedPreferences prefs = StorageHelper.getPreferences(context, CTProductConfigConstants.PRODUCT_CONFIG_PREF);\n- final SharedPreferences.Editor editor = prefs.edit();\n+\nswitch (key) {\n- case Constants.PRODUCT_CONFIG_NO_OF_CALLS:\n- noOfCallsInAllowedWindow = value;\n+ case CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS:\n+ settings.setNoOfCallsInAllowedWindow(value);\nbreak;\n- case Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n- windowIntervalInMins = value;\n+ case CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n+ settings.setWindowIntervalInMinutes(value);\nbreak;\n}\n- editor.putInt(key, value);\n- StorageHelper.persist(editor);\n}\n/**\n@@ -407,8 +371,8 @@ public class CTProductConfigController {\nfinal Object o = arp.get(key);\nif (o instanceof Number) {\nfinal int update = ((Number) o).intValue();\n- if (Constants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n- || Constants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key)) {\n+ if (CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n+ || CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key)) {\nsetArpValue(key, update);\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+import android.content.Context;\n+import android.text.TextUtils;\n+\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.FileUtils;\n+import com.clevertap.android.sdk.TaskManager;\n+\n+import org.json.JSONObject;\n+\n+import java.util.HashMap;\n+import java.util.Iterator;\n+import java.util.concurrent.TimeUnit;\n+\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_WINDOW_LENGTH_MINS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS;\n+\n+class ProductConfigSettings {\n+ private final String guid;\n+ private final CleverTapInstanceConfig config;\n+ private final Context context;\n+ private final HashMap<String, String> settingsMap = new HashMap<>();\n+\n+ ProductConfigSettings(Context context, String guid, CleverTapInstanceConfig config) {\n+ this.context = context.getApplicationContext();\n+ this.guid = guid;\n+ this.config = config;\n+ initMapWithDefault();\n+ }\n+\n+ private void initMapWithDefault() {\n+ settingsMap.put(PRODUCT_CONFIG_NO_OF_CALLS, String.valueOf(DEFAULT_NO_OF_CALLS));\n+ settingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(DEFAULT_WINDOW_LENGTH_MINS));\n+ settingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(0));\n+ settingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(DEFAULT_MIN_FETCH_INTERVAL_SECONDS));\n+ }\n+\n+ /**\n+ * loads settings by reading from file. It's a sync call, please make sure to call this from a background thread\n+ */\n+ synchronized void loadSettings() throws Exception {\n+ String content = FileUtils.readFromFile(context, getFullPath());\n+ if (!TextUtils.isEmpty(content)) {\n+ JSONObject jsonObject = new JSONObject(content);\n+ Iterator<String> iterator = jsonObject.keys();\n+ while (iterator.hasNext()) {\n+ String key = iterator.next();\n+ if (!TextUtils.isEmpty(key)) {\n+ String value = String.valueOf(jsonObject.get(key));\n+ settingsMap.put(key, value);\n+ }\n+ }\n+ }\n+ }\n+\n+ long getNextFetchIntervalInSeconds() {\n+ long minFetchIntervalInSecondsSDK = getMinFetchIntervalInSeconds();\n+ long minFetchIntervalInSecondsServer = TimeUnit.MINUTES.toSeconds(getWindowIntervalInMinutes() / getNoOfCallsInAllowedWindow());\n+ return Math.max(minFetchIntervalInSecondsServer, minFetchIntervalInSecondsSDK);\n+ }\n+\n+ private long getMinFetchIntervalInSeconds() {\n+ long minInterVal = DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n+ String value = settingsMap.get(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS);\n+ try {\n+ if (value != null)\n+ minInterVal = Long.parseLong(value);\n+ } catch (Exception ignored) {\n+ }\n+ return minInterVal;\n+ }\n+\n+ long getLastFetchTimeStampInMillis() {\n+ long lastFetchedTimeStamp = 0L;\n+ String value = settingsMap.get(KEY_LAST_FETCHED_TIMESTAMP);\n+ try {\n+ if (value != null)\n+ lastFetchedTimeStamp = Long.parseLong(value);\n+ } catch (Exception ignored) {\n+ }\n+ return lastFetchedTimeStamp;\n+ }\n+\n+ private int getNoOfCallsInAllowedWindow() {\n+ int noCallsAllowedInWindow = DEFAULT_NO_OF_CALLS;\n+ String value = settingsMap.get(PRODUCT_CONFIG_NO_OF_CALLS);\n+ try {\n+ if (value != null)\n+ noCallsAllowedInWindow = Integer.parseInt(value);\n+ } catch (Exception ignored) {\n+ }\n+ return noCallsAllowedInWindow;\n+ }\n+\n+ private int getWindowIntervalInMinutes() {\n+ int windowIntervalInMinutes = DEFAULT_WINDOW_LENGTH_MINS;\n+ String value = settingsMap.get(PRODUCT_CONFIG_WINDOW_LENGTH_MINS);\n+ try {\n+ if (value != null)\n+ windowIntervalInMinutes = Integer.parseInt(value);\n+ } catch (Exception ignored) {\n+ }\n+ return windowIntervalInMinutes;\n+ }\n+\n+ synchronized void setMinimumFetchIntervalInSeconds(long intervalInSeconds) {\n+ long minFetchIntervalInSeconds = getMinFetchIntervalInSeconds();\n+ if (minFetchIntervalInSeconds != intervalInSeconds) {\n+ settingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(intervalInSeconds));\n+ updateConfigToFile();\n+ }\n+ }\n+\n+ synchronized void setLastFetchTimeStampInMillis(long timeStampInMillis) {\n+ long lastFetchTimeStampInMillis = getLastFetchTimeStampInMillis();\n+ if (lastFetchTimeStampInMillis != timeStampInMillis) {\n+ settingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(timeStampInMillis));\n+ updateConfigToFile();\n+ }\n+ }\n+\n+ synchronized void setNoOfCallsInAllowedWindow(int callsInAllowedWindow) {\n+ long noOfCallsInAllowedWindow = getNoOfCallsInAllowedWindow();\n+ if (noOfCallsInAllowedWindow != callsInAllowedWindow) {\n+ settingsMap.put(PRODUCT_CONFIG_NO_OF_CALLS, String.valueOf(callsInAllowedWindow));\n+ updateConfigToFile();\n+ }\n+ }\n+\n+ synchronized void setWindowIntervalInMinutes(int intervalInMinutes) {\n+ int windowIntervalInMinutes = getWindowIntervalInMinutes();\n+ if (windowIntervalInMinutes != intervalInMinutes) {\n+ settingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(intervalInMinutes));\n+ updateConfigToFile();\n+ }\n+ }\n+\n+ private synchronized void updateConfigToFile() {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n+ @Override\n+ public Boolean doInBackground(Void aVoid) {\n+ try {\n+ FileUtils.writeJsonToFile(context, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(settingsMap));\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ return false;\n+ }\n+ return true;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Boolean isSuccess) {\n+ if (isSuccess) {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Success\");\n+ } else {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Failed\");\n+ }\n+ }\n+ });\n+ }\n+\n+ private String getDirName() {\n+ return CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n+ }\n+\n+ private String getFullPath() {\n+ return getDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS;\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added Config settings
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 06.04.2020 21:43:38 | -19,080 | 6cb65dfa9a86111383396f8f84000ff29b03e1f9 | code-review(Product Config):
1. OnUserLogin | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8279,9 +8279,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n- if (ctProductConfigController != null && ctProductConfigController.isInitialized()) {\n- ctProductConfigController.setGuidAndInit(getCleverTapID());\n- }\n+ ctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\n+ getConfigLogger().verbose(config.getAccountId(), \"Product Config reset\");\n+ ctProductConfigController.fetch();\n}\nprivate void initProductConfig(boolean fromPlayServices) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -48,10 +48,10 @@ public class CTProductConfigController {\nthis.config = config;\nthis.listener = listener;\nthis.settings = new ProductConfigSettings(context, guid, config);\n- initAsync(false);\n+ initAsync();\n}\n- private void initAsync(final boolean isProfileSwitched) {\n+ private void initAsync() {\nif (TextUtils.isEmpty(guid))\nreturn;\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@@ -68,9 +68,6 @@ public class CTProductConfigController {\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\nsettings.loadSettings();\nisInitialized = true;\n- if (isProfileSwitched) {\n- fetch();\n- }\n} catch (Exception e) {\ne.printStackTrace();\nreturn false;\n@@ -111,7 +108,7 @@ public class CTProductConfigController {\npublic void setDefaults(int resourceID) {\ndefaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\n- initAsync(false);\n+ initAsync();\n}\n/**\n@@ -248,7 +245,7 @@ public class CTProductConfigController {\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\nreturn !isFetching\n&& !TextUtils.isEmpty(guid)\n- && (System.currentTimeMillis() - 1000 * minimumFetchIntervalInSeconds) > settings.getLastFetchTimeStampInMillis();\n+ && (System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > minimumFetchIntervalInSeconds;\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n@@ -283,9 +280,9 @@ public class CTProductConfigController {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\nfetchedConfig.clear();\nfetchedConfig.putAll(map);\n- Integer timestampInSeconds = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n- if (timestampInSeconds > 0) {\n- settings.setLastFetchTimeStampInMillis(timestampInSeconds * 1000L);\n+ Integer timestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n+ if (timestamp > 0) {\n+ settings.setLastFetchTimeStampInMillis(timestamp);\n}\n}\n@@ -312,7 +309,7 @@ public class CTProductConfigController {\nif (TextUtils.isEmpty(guid))\nreturn;\nthis.guid = cleverTapID;\n- initAsync(true);\n+ initAsync();\n}\nprivate String getActivatedFileName() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. OnUserLogin
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 07.04.2020 12:37:31 | -19,080 | 8765859895a17b9116f84039b90da14f11866c8e | code-review(Product Config):
1. Changed Fetch/Activate callbacks
2. Handled failure scenarios related to parsing. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8314,30 +8314,16 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n@Override\n- public void onActivateSuccess() {\n+ public void onActivated() {\nif (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onActivateSuccess();\n+ productConfigListener.get().onActivated();\n}\n}\n@Override\n- public void onFetchSuccess() {\n+ public void onFetched() {\nif (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onFetchSuccess();\n- }\n- }\n-\n- @Override\n- public void onActivateFailed() {\n- if (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onActivateFailed();\n- }\n- }\n-\n- @Override\n- public void onFetchFailed() {\n- if (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onFetchFailed();\n+ productConfigListener.get().onFetched();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -89,20 +89,39 @@ public class CTProductConfigController {\n});\n}\n- private HashMap<String, String> getStoredValues(String fullFilePath) throws Exception {\n+ private HashMap<String, String> getStoredValues(String fullFilePath) {\nHashMap<String, String> map = new HashMap<>();\n- String content = FileUtils.readFromFile(context, fullFilePath);\n+ String content = null;\n+ try {\n+ content = FileUtils.readFromFile(context, fullFilePath);\n+ } catch (Exception e) {\n+\n+ }\nif (!TextUtils.isEmpty(content)) {\n- JSONObject jsonObject = new JSONObject(content);\n+ JSONObject jsonObject = null;\n+ try {\n+ jsonObject = new JSONObject(content);\n+ } catch (JSONException e) {\n+\n+ }\n+ if (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\nwhile (iterator.hasNext()) {\nString key = iterator.next();\nif (!TextUtils.isEmpty(key)) {\n- String value = String.valueOf(jsonObject.get(key));\n+ String value = null;\n+ try {\n+ value = String.valueOf(jsonObject.get(key));\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ if (!TextUtils.isEmpty(value))\nmap.put(key, value);\n}\n}\n}\n+\n+ }\nreturn map;\n}\n@@ -138,9 +157,9 @@ public class CTProductConfigController {\npublic void activate() {\nif (isActivating)\nreturn;\n- TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\n- public Boolean doInBackground(Void params) {\n+ public Void doInBackground(Void params) {\nsynchronized (this) {\nisActivating = true;\ntry {\n@@ -159,21 +178,15 @@ public class CTProductConfigController {\n}\n} catch (Exception e) {\ne.printStackTrace();\n- return false;\n}\n- return true;\n+ return null;\n}\n}\n@Override\n- public void onPostExecute(Boolean isSuccess) {\n- if (isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Activate Success\");\n- sendCallback(PROCESSING_STATE.ACTIVATE_SUCCESS);\n- } else {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Activate Failed\");\n- sendCallback(PROCESSING_STATE.ACTIVATE_FAILED);\n- }\n+ public void onPostExecute(Void isSuccess) {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Activated\");\n+ sendCallback(PROCESSING_STATE.ACTIVATED);\nisActivating = false;\nisFetchAndActivating = false;\n}\n@@ -258,7 +271,7 @@ public class CTProductConfigController {\n@Override\npublic void run() {\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Success\");\n- sendCallback(PROCESSING_STATE.FETCH_SUCCESS);\n+ sendCallback(PROCESSING_STATE.FETCHED);\n}\n});\nif (isFetchAndActivating) {\n@@ -267,7 +280,7 @@ public class CTProductConfigController {\n} catch (Exception e) {\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Failed\");\n- sendCallback(PROCESSING_STATE.FETCH_FAILED);\n+ sendCallback(PROCESSING_STATE.FETCHED);\ne.printStackTrace();\nisFetchAndActivating = false;// set fetchAndActivating flag to false if fetch fails.\n}\n@@ -276,23 +289,35 @@ public class CTProductConfigController {\n}\n}\n- private void parseFetchedResponse(JSONObject jsonObject) throws JSONException {\n+ private void parseFetchedResponse(JSONObject jsonObject) {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\nfetchedConfig.clear();\nfetchedConfig.putAll(map);\n- Integer timestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n- if (timestamp > 0) {\n+ Integer timestamp = null;\n+ try {\n+ timestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ if (timestamp != null) {\nsettings.setLastFetchTimeStampInMillis(timestamp);\n}\n}\n- private HashMap<String, String> convertServerJsonToMap(JSONObject jsonObject) throws JSONException {\n+ private HashMap<String, String> convertServerJsonToMap(JSONObject jsonObject) {\nHashMap<String, String> map = new HashMap<>();\n- JSONArray kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+ JSONArray kvArray = null;\n+ try {\n+ kvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\nif (kvArray != null && kvArray.length() > 0) {\nfor (int i = 0; i < kvArray.length(); i++) {\n- JSONObject object = (JSONObject) kvArray.get(i);\n+ JSONObject object;\n+ try {\n+ object = (JSONObject) kvArray.get(i);\nif (object != null) {\nString Key = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_KEY);\nString Value = object.getString(PRODUCT_CONFIG_JSON_KEY_FOR_VALUE);\n@@ -300,6 +325,9 @@ public class CTProductConfigController {\nmap.put(Key, String.valueOf(Value));\n}\n}\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n}\n}\nreturn map;\n@@ -312,10 +340,6 @@ public class CTProductConfigController {\ninitAsync();\n}\n- private String getActivatedFileName() {\n- return CTProductConfigConstants.FILE_NAME_ACTIVATED;\n- }\n-\nprivate String getProductConfigDirName() {\nreturn CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n}\n@@ -328,18 +352,6 @@ public class CTProductConfigController {\nreturn getProductConfigDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_ACTIVATED;\n}\n- public void setArpValue(String key, int value) {\n-\n- switch (key) {\n- case CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS:\n- settings.setNoOfCallsInAllowedWindow(value);\n- break;\n- case CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n- settings.setWindowIntervalInMinutes(value);\n- break;\n- }\n- }\n-\n/**\n* Deletes all activated, fetched and defaults configs and resets all Product Config settings.\n*/\n@@ -360,24 +372,7 @@ public class CTProductConfigController {\n}\npublic void setArpValue(JSONObject arp) {\n- if (arp != null) {\n- final Iterator<String> keys = arp.keys();\n- while (keys.hasNext()) {\n- final String key = keys.next();\n- try {\n- final Object o = arp.get(key);\n- if (o instanceof Number) {\n- final int update = ((Number) o).intValue();\n- if (CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n- || CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key)) {\n- setArpValue(key, update);\n- }\n- }\n- } catch (JSONException e) {\n- // Ignore\n- }\n- }\n- }\n+ settings.setArpValue(arp);\n}\nprivate void sendCallback(PROCESSING_STATE state) {\n@@ -389,17 +384,11 @@ public class CTProductConfigController {\ncase INIT_FAILED:\nlistener.onInitFailed();\nbreak;\n- case FETCH_FAILED:\n- listener.onFetchFailed();\n- break;\n- case FETCH_SUCCESS:\n- listener.onFetchSuccess();\n- break;\n- case ACTIVATE_FAILED:\n- listener.onActivateFailed();\n+ case FETCHED:\n+ listener.onFetched();\nbreak;\n- case ACTIVATE_SUCCESS:\n- listener.onActivateSuccess();\n+ case ACTIVATED:\n+ listener.onActivated();\nbreak;\n}\n}\n@@ -416,8 +405,8 @@ public class CTProductConfigController {\n}\nprivate enum PROCESSING_STATE {\n- INIT_SUCCESS, INIT_FAILED, FETCH_SUCCESS,\n- FETCH_FAILED, ACTIVATE_SUCCESS, ACTIVATE_FAILED\n+ INIT_SUCCESS, INIT_FAILED,\n+ FETCHED, ACTIVATED\n}\npublic interface Listener extends CTProductConfigListener {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "@@ -5,11 +5,7 @@ public interface CTProductConfigListener {\nvoid onInitFailed();\n- void onFetchSuccess();\n+ void onFetched();\n- void onFetchFailed();\n-\n- void onActivateSuccess();\n-\n- void onActivateFailed();\n+ void onActivated();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -7,6 +7,7 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.FileUtils;\nimport com.clevertap.android.sdk.TaskManager;\n+import org.json.JSONException;\nimport org.json.JSONObject;\nimport java.util.HashMap;\n@@ -44,19 +45,38 @@ class ProductConfigSettings {\n/**\n* loads settings by reading from file. It's a sync call, please make sure to call this from a background thread\n*/\n- synchronized void loadSettings() throws Exception {\n- String content = FileUtils.readFromFile(context, getFullPath());\n+ synchronized void loadSettings() {\n+ String content = null;\n+ try {\n+ content = FileUtils.readFromFile(context, getFullPath());\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ }\nif (!TextUtils.isEmpty(content)) {\n- JSONObject jsonObject = new JSONObject(content);\n+ JSONObject jsonObject = null;\n+ try {\n+ jsonObject = new JSONObject(content);\n+ } catch (JSONException e) {\n+\n+ }\n+ if (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\nwhile (iterator.hasNext()) {\nString key = iterator.next();\nif (!TextUtils.isEmpty(key)) {\n- String value = String.valueOf(jsonObject.get(key));\n+ String value = null;\n+ try {\n+ value = String.valueOf(jsonObject.get(key));\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n+ }\n+ if (!TextUtils.isEmpty(value))\nsettingsMap.put(key, value);\n}\n}\n}\n+\n+ }\n}\nlong getNextFetchIntervalInSeconds() {\n@@ -172,4 +192,36 @@ class ProductConfigSettings {\nprivate String getFullPath() {\nreturn getDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS;\n}\n+\n+ void setArpValue(JSONObject arp) {\n+ if (arp != null) {\n+ final Iterator<String> keys = arp.keys();\n+ while (keys.hasNext()) {\n+ final String key = keys.next();\n+ try {\n+ final Object o = arp.get(key);\n+ if (o instanceof Number) {\n+ final int update = ((Number) o).intValue();\n+ if (CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n+ || CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key)) {\n+ setArpValue(key, update);\n+ }\n+ }\n+ } catch (JSONException e) {\n+ // Ignore\n+ }\n+ }\n+ }\n+ }\n+\n+ void setArpValue(String key, int value) {\n+ switch (key) {\n+ case CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS:\n+ setNoOfCallsInAllowedWindow(value);\n+ break;\n+ case CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS:\n+ setWindowIntervalInMinutes(value);\n+ break;\n+ }\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Changed Fetch/Activate callbacks
2. Handled failure scenarios related to parsing.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 07.04.2020 21:49:07 | -19,080 | e094a2ecc061d2a37d7e3f25fc0dbbf124ccc5d8 | code-review(Product Config):
1. Added default support using maps
2. Setting All the defaults in async manner | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -15,6 +15,8 @@ import org.json.JSONObject;\nimport java.util.HashMap;\nimport java.util.Iterator;\n+import java.util.Map;\n+import java.util.concurrent.TimeUnit;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_STRING;\n@@ -32,7 +34,7 @@ public class CTProductConfigController {\nprivate boolean isInitialized = false;\nprivate final CleverTapInstanceConfig config;\nprivate final Context context;\n- private HashMap<String, String> defaultConfig;\n+ private HashMap<String, String> defaultConfig = new HashMap<>();\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\nprivate final HashMap<String, String> fetchedConfig = new HashMap<>();\nprivate final Listener listener;\n@@ -61,11 +63,12 @@ public class CTProductConfigController {\ntry {\nactivatedConfig.clear();\n//apply default config first\n- if (defaultConfig != null && !defaultConfig.isEmpty()) {\n+ if (!defaultConfig.isEmpty()) {\nactivatedConfig.putAll(defaultConfig);\n}\nactivatedConfig.putAll(getStoredValues(getActivatedFullPath()));\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: from init \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n} catch (Exception e) {\n@@ -125,10 +128,50 @@ public class CTProductConfigController {\nreturn map;\n}\n- public void setDefaults(int resourceID) {\n- defaultConfig = DefaultXmlParser.getDefaultsFromXml(context, resourceID);\n+ public void\n+ setDefaults(final int resourceID) {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n+ @Override\n+ public Void doInBackground(Void aVoid) {\n+ defaultConfig.clear();\n+ defaultConfig.putAll(DefaultXmlParser.getDefaultsFromXml(context, resourceID));\n+ return null;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Void aVoid) {\ninitAsync();\n}\n+ });\n+ }\n+\n+ public void setDefaults(final HashMap<String, Object> map) {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n+ @Override\n+ public Void doInBackground(Void aVoid) {\n+ if (map != null && !map.isEmpty()) {\n+ defaultConfig.clear();\n+ Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();\n+ while (iterator.hasNext()) {\n+ Map.Entry<String, Object> entry = iterator.next();\n+ if (entry != null) {\n+ String key = entry.getKey();\n+ Object value = entry.getValue();\n+ if (!TextUtils.isEmpty(key) && ProductConfigUtil.isSupportedDataType(value)) {\n+ defaultConfig.put(key, String.valueOf(value));\n+ }\n+ }\n+ }\n+ }\n+ return null;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Void aVoid) {\n+ initAsync();\n+ }\n+ });\n+ }\n/**\n* Starts fetching configs, adhering to the default minimum fetch interval.\n@@ -174,6 +217,7 @@ public class CTProductConfigController {\n} else {\nactivatedConfig.putAll(getStoredValues(getFetchedFullPath()));\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: \" + activatedConfig);\nFileUtils.deleteFile(context, getFetchedFullPath());\n}\n} catch (Exception e) {\n@@ -185,7 +229,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Activated\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Activated \" + activatedConfig);\nsendCallback(PROCESSING_STATE.ACTIVATED);\nisActivating = false;\nisFetchAndActivating = false;\n@@ -216,7 +260,7 @@ public class CTProductConfigController {\n* @param Key - String\n* @return String\n*/\n- public boolean getBoolean(String Key) {\n+ public Boolean getBoolean(String Key) {\nreturn Boolean.parseBoolean(activatedConfig.get(Key));\n}\n@@ -226,7 +270,7 @@ public class CTProductConfigController {\n* @param Key - String\n* @return String\n*/\n- public long getLong(String Key) {\n+ public Long getLong(String Key) {\nif (isInitialized) {\ntry {\nreturn Long.parseLong(activatedConfig.get(Key));\n@@ -243,7 +287,7 @@ public class CTProductConfigController {\n* @param Key String\n* @return String\n*/\n- public double getDouble(String Key) {\n+ public Double getDouble(String Key) {\nif (isInitialized) {\ntry {\nreturn Double.parseDouble(activatedConfig.get(Key));\n@@ -258,7 +302,7 @@ public class CTProductConfigController {\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\nreturn !isFetching\n&& !TextUtils.isEmpty(guid)\n- && (System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > minimumFetchIntervalInSeconds;\n+ && (System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds);\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n@@ -267,6 +311,7 @@ public class CTProductConfigController {\ntry {\nparseFetchedResponse(kvResponse);\nFileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : fetch file write success: from init \" + fetchedConfig);\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n@@ -293,6 +338,7 @@ public class CTProductConfigController {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\nfetchedConfig.clear();\nfetchedConfig.putAll(map);\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: Fetched response:\" + jsonObject);\nInteger timestamp = null;\ntry {\ntimestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -177,7 +177,7 @@ class ProductConfigSettings {\n@Override\npublic void onPostExecute(Boolean isSuccess) {\nif (isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Success\");\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Success \" + settingsMap);\n} else {\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Failed\");\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigUtil.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+class ProductConfigUtil {\n+\n+ static boolean isSupportedDataType(Object object) {\n+ return object instanceof String || object instanceof Number || object instanceof Boolean;\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added default support using maps
2. Setting All the defaults in async manner
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 15.04.2020 09:10:33 | -19,080 | 970dad98eec5958d5d61271cc6e87ce2a8b96e71 | code-review(Product Config):
1. Added java doc
2. Added logging | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -53,6 +53,7 @@ import com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.featureFlags.FeatureFlagListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\n+import com.clevertap.android.sdk.product_config.CTProductConfigControllerListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.google.android.gms.plus.model.people.Person;\nimport com.google.firebase.iid.FirebaseInstanceId;\n@@ -101,7 +102,7 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigController.Listener, CTProductConfigListener {\n+ CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigControllerListener, CTProductConfigListener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -8229,8 +8230,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nqueueEvent(context, event, Constants.FETCH_EVENT);\n}\n- //TODO @atul this method doesn't throw JSONException\n- private void processProductConfigResponse(JSONObject response) throws JSONException {\n+ private void processProductConfigResponse(JSONObject response){\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Can't parse Feature Flags Response, JSON response object is null\");\nreturn;\n@@ -8248,27 +8248,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //TODO remove later\n- private JSONObject mockProductConfigResponse() throws JSONException {\n- JSONObject object = new JSONObject();\n- JSONArray jsonArray = new JSONArray();\n- object.put(\"kv\", jsonArray);\n- jsonArray.put(getJSONObject(\"discount\", 10));\n- jsonArray.put(getJSONObject(\"customer-type\", \"gold\"));\n- jsonArray.put(getJSONObject(\"loading_phrase\", \"Loading From Remote \"));\n- jsonArray.put(getJSONObject(\"welcome_message_caps\", true));\n- jsonArray.put(getJSONObject(\"welcome_message\", \"welcome from remote\"));\n- jsonArray.put(getJSONObject(\"ts\", 1245));\n- return object;\n- }\n-\n- //TODO remove later\n- private JSONObject getJSONObject(String key, Object value) throws JSONException {\n- JSONObject jsonObject = new JSONObject();\n- jsonObject.put(key, value);\n- return jsonObject;\n- }\n-\nprivate void parseProductConfigs(JSONObject responseKV) throws JSONException {\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FileUtils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FileUtils.java",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.text.TextUtils;\n-import android.util.Log;\nimport org.json.JSONObject;\n@@ -14,15 +13,15 @@ import java.io.InputStream;\nimport java.io.InputStreamReader;\npublic class FileUtils {\n- private static final String TAG = \"FileUtils\";\n- public static void writeJsonToFile(Context context, String dirName, String fileName, JSONObject jsonObject) throws Exception {\n+ public static void writeJsonToFile(Context context, CleverTapInstanceConfig config, String dirName, String fileName, JSONObject jsonObject) {\ntry {\nif (jsonObject == null || TextUtils.isEmpty(dirName) || TextUtils.isEmpty(fileName))\nreturn;\nFile file = new File(context.getFilesDir(), dirName);\nif (!file.exists()) {\n- file.mkdir();//TODO @atul Shouldn't we use the returned boolean value to proceed?\n+ if (!file.mkdir())\n+ return;// if directory is not created don't proceed and return\n}\nFile file1 = new File(file, fileName);\n@@ -32,12 +31,12 @@ public class FileUtils {\nwriter.close();\n} catch (Exception e) {\ne.printStackTrace();\n- Log.d(TAG, \"writeFileOnInternalStorage: failed\" + e.getMessage());//TODO @atul Use our Logger\n- throw e;\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"writeFileOnInternalStorage: failed\" + e.getLocalizedMessage());\n}\n}\n- public static String readFromFile(Context context, String fileNameWithPath) throws Exception {\n+ public static String readFromFile(Context context, CleverTapInstanceConfig config, String fileNameWithPath) throws Exception {\nString content = \"\";\n//Make sure to use a try-catch statement to catch any errors\n@@ -63,14 +62,14 @@ public class FileUtils {\ninputStream.close();\ncontent = stringBuilder.toString();\n} catch (Exception e) {\n- Log.d(TAG, \"[Exception While Reading: \" + fileNameWithPath + \"]\" + e.getMessage());//TODO @atul use our Logger\n- throw e;//TODO @atul you are throwing exception but not catching it anywhere\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"[Exception While Reading: \" + e.getLocalizedMessage());\n//Log your error with Log.e\n}\nreturn content;\n}\n- //TODO @atul No exception is being thrown but method has a \"throws\"\n- public static void deleteDirectory(Context context, String dirName) throws Exception {\n+\n+ public static void deleteDirectory(Context context, CleverTapInstanceConfig config, String dirName) {\nif (TextUtils.isEmpty(dirName) || context == null)\nreturn;\ntry {\n@@ -83,31 +82,29 @@ public class FileUtils {\n}\n} catch (Exception e) {\ne.printStackTrace();\n- Log.d(TAG, \"writeFileOnInternalStorage: failed\" + e.getMessage());//TODO @atul Use our Logger\n- throw e;\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"writeFileOnInternalStorage: failed\" + dirName + \" Error:\" + e.getLocalizedMessage());\n}\n}\n- //TODO @atul this method can be void, why boolean?, and use our Logger\n- public static boolean deleteFile(Context context, String fileName) throws Exception {\n+ public static void deleteFile(Context context, CleverTapInstanceConfig config, String fileName) throws Exception {\nif (TextUtils.isEmpty(fileName) || context == null)\n- return false;\n+ return;\ntry {\nFile file = new File(context.getFilesDir(), fileName);\nif (file.exists()) {\nif (file.delete()) {\n- Log.d(TAG, \"File Deleted:\" + fileName);\n- return true;\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"File Deleted:\" + fileName);\n} else {\n- Log.d(TAG, \"Failed to delete file\" + fileName);\n- return false;\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"Failed to delete file\" + fileName);\n}\n}\n} catch (Exception e) {\ne.printStackTrace();\n- Log.d(TAG, \"writeFileOnInternalStorage: failed\" + e.getMessage());\n- throw e;\n+ if (config != null)\n+ config.getLogger().verbose(config.getAccountId(), \"writeFileOnInternalStorage: failed\" + fileName + \" Error:\" + e.getLocalizedMessage());\n}\n- return false;\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/TaskManager.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/TaskManager.java",
"diff": "@@ -22,8 +22,7 @@ public class TaskManager {\nexecute(null, listener);\n}\n- //TODO @atul can we make this private?\n- public <Params, Result> void execute(final Params params, final TaskListener<Params, Result> listener) {\n+ private <Params, Result> void execute(final Params params, final TaskListener<Params, Result> listener) {\nservice.execute(new Runnable() {\n@Override\n@@ -33,10 +32,8 @@ public class TaskManager {\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n- if (listener != null) {//TODO @atul do we need this check?\nlistener.onPostExecute(result);\n}\n- }\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -34,7 +34,7 @@ public class CTFeatureFlagsController {\nthis.store = new HashMap<>();\nthis.setListener(listener);\nthis.mContext = context.getApplicationContext();\n- unarchiveData(false);\n+ unarchiveData();\n}\nprivate void setListener(FeatureFlagListener listener) {\n@@ -55,8 +55,19 @@ public class CTFeatureFlagsController {\n}\n- public void updateFeatureFlags(JSONObject featureFlagResponseObj) throws JSONException {\n- updateFeatureFlags(featureFlagResponseObj, true);\n+ public void updateFeatureFlags(JSONObject jsonObject) throws JSONException {\n+ getConfigLogger().verbose(getAccountId(), \"Updating feature flags...\");\n+ JSONArray featureFlagList = jsonObject.getJSONArray(Constants.KEY_KV);\n+ try {\n+ for (int i = 0; i < featureFlagList.length(); i++) {\n+ JSONObject ff = featureFlagList.getJSONObject(i);\n+ store.put(ff.getString(\"n\"), ff.getBoolean(\"v\"));\n+ }\n+ } catch (JSONException e) {\n+ getConfigLogger().verbose(getAccountId(), \"Error parsing Feature Flag array \" + e.getLocalizedMessage());\n+ }\n+ archiveData(jsonObject);\n+ notifyFeatureFlagUpdate();\n}\nprivate void notifyFeatureFlagUpdate() {\n@@ -73,46 +84,26 @@ public class CTFeatureFlagsController {\n}\n}\n- //TODO @atul what is the use of isNew boolean here? value is always true\n- private void updateFeatureFlags(JSONObject jsonObject, boolean isNew) throws JSONException {\n- getConfigLogger().verbose(getAccountId(), \"Updating feature flags...\");\n- JSONArray featureFlagList = jsonObject.getJSONArray(Constants.KEY_KV);\n- try {\n- for (int i = 0; i < featureFlagList.length(); i++) {\n- JSONObject ff = featureFlagList.getJSONObject(i);\n- store.put(ff.getString(\"n\"), ff.getBoolean(\"v\"));\n- }\n- } catch (JSONException e) {\n- getConfigLogger().verbose(getAccountId(), \"Error parsing Feature Flag array \" + e.getLocalizedMessage());\n- }\n-\n- if (isNew) {\n- archiveData(jsonObject, false);\n- notifyFeatureFlagUpdate();\n- }\n- }\n-\n- //TODO @atul what is the use of sync? value is not used\n- private synchronized void archiveData(JSONObject featureFlagRespObj, boolean sync) {\n+ private synchronized void archiveData(JSONObject featureFlagRespObj) {\nif (featureFlagRespObj != null) {\ntry {\n- FileUtils.writeJsonToFile(mContext, getCachedDirName(), getCachedFileName(), featureFlagRespObj);\n+ FileUtils.writeJsonToFile(mContext, config, getCachedDirName(), getCachedFileName(), featureFlagRespObj);\n} catch (Exception e) {\ne.printStackTrace();\n+ getConfigLogger().verbose(getAccountId(), \"archiveData failed - \" + e.getLocalizedMessage());\n}\n}\n}\n- //TODO @atul what is the use of sync? value is not used\n- private synchronized void unarchiveData(boolean sync) {\n+ private synchronized void unarchiveData() {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\npublic Boolean doInBackground(Void aVoid) {\ntry {\nstore.clear();\n- String content = FileUtils.readFromFile(mContext, getCachedFullPath());\n+ String content = FileUtils.readFromFile(mContext, config,getCachedFullPath());\nif (!TextUtils.isEmpty(content)) {\nJSONObject jsonObject = new JSONObject(content);\n@@ -135,6 +126,7 @@ public class CTFeatureFlagsController {\n}\n} catch (Exception e) {\ne.printStackTrace();\n+ getConfigLogger().verbose(getAccountId(), \"unArchiveData failed - \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n@@ -148,9 +140,10 @@ public class CTFeatureFlagsController {\n}\n- private boolean get(String key, boolean defaultValue) {\n+ private Boolean get(String key, boolean defaultValue) {\ngetConfigLogger().verbose(getAccountId(), \"getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\n- if (store.get(key) != null) {\n+ Boolean value = store.get(key);\n+ if (value != null) {\nreturn store.get(key);\n} else {\ngetConfigLogger().verbose(getAccountId(), \"feature flag not found, returning default value - \" + defaultValue);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -18,7 +18,6 @@ public interface CTProductConfigConstants {\n//static values\nString DEFAULT_VALUE_FOR_STRING = \"\";\n- Boolean DEFAULT_VALUE_FOR_BOOLEAN = false; //TODO @atul why is this not used? if there is no need, remove it\nLong DEFAULT_VALUE_FOR_LONG = 0L;\nDouble DEFAULT_VALUE_FOR_DOUBLE = 0.0;\n//arp\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -37,14 +37,14 @@ public class CTProductConfigController {\nprivate HashMap<String, String> defaultConfig = new HashMap<>();\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\nprivate final HashMap<String, String> fetchedConfig = new HashMap<>();\n- private final Listener listener;\n+ private final CTProductConfigControllerListener listener;\nprivate boolean isFetching = false;\nprivate boolean isActivating = false;\nprivate boolean isFetchAndActivating = false;\nprivate final ProductConfigSettings settings;\n- public CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, Listener listener) {\n+ public CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, CTProductConfigControllerListener listener) {\nthis.context = context;\nthis.guid = guid;\nthis.config = config;\n@@ -67,12 +67,13 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\nactivatedConfig.putAll(getStoredValues(getActivatedFullPath()));\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: from init \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n} catch (Exception e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"initAsync failed - \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n@@ -92,21 +93,22 @@ public class CTProductConfigController {\n});\n}\n- //TODO @atul Do not leave catch clause empty, put logging\nprivate HashMap<String, String> getStoredValues(String fullFilePath) {\nHashMap<String, String> map = new HashMap<>();\nString content = null;\ntry {\n- content = FileUtils.readFromFile(context, fullFilePath);\n+ content = FileUtils.readFromFile(context, config, fullFilePath);\n} catch (Exception e) {\n-\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues reading file failed: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(content)) {\nJSONObject jsonObject = null;\ntry {\njsonObject = new JSONObject(content);\n} catch (JSONException e) {\n-\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues failed due to malformed json: \" + e.getLocalizedMessage());\n}\nif (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\n@@ -118,6 +120,7 @@ public class CTProductConfigController {\nvalue = String.valueOf(jsonObject.get(key));\n} catch (JSONException e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues for key \" + key + \" while parsing json: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(value))\nmap.put(key, value);\n@@ -129,7 +132,11 @@ public class CTProductConfigController {\nreturn map;\n}\n- //TODO @atul add javadoc\n+ /**\n+ * Sets default configs using an XML resource.\n+ *\n+ * @param resourceID\n+ */\npublic void setDefaults(final int resourceID) {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\n@@ -146,7 +153,11 @@ public class CTProductConfigController {\n});\n}\n- //TODO @atul add javadoc\n+ /**\n+ * Sets default configs using the given Map.\n+ *\n+ * @param map\n+ */\npublic void setDefaults(final HashMap<String, Object> map) {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\n@@ -218,12 +229,13 @@ public class CTProductConfigController {\nactivatedConfig.putAll(fetchedConfig);\n} else {\nactivatedConfig.putAll(getStoredValues(getFetchedFullPath()));\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: \" + activatedConfig);\n- FileUtils.deleteFile(context, getFetchedFullPath());\n+ FileUtils.deleteFile(context, config, getFetchedFullPath());\n}\n} catch (Exception e) {\n- e.printStackTrace();//TODO @atul better logging\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : activate failed: \" + e.getLocalizedMessage());\n}\nreturn null;\n}\n@@ -239,8 +251,10 @@ public class CTProductConfigController {\n});\n}\n- //TODO @atul add javadoc\n@SuppressWarnings(\"WeakerAccess\")\n+ /**\n+ * Sets the minimum interval between successive fetch calls.\n+ */\npublic void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\nsettings.setMinimumFetchIntervalInSeconds(fetchIntervalInSeconds);\n}\n@@ -279,6 +293,7 @@ public class CTProductConfigController {\ntry {\nreturn Long.parseLong(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\n+ e.printStackTrace();\nconfig.getLogger().verbose(config.getAccountId(), \"Error getting Long for Key-\" + Key + \" \" + e.getMessage());\n}\n}\n@@ -296,6 +311,7 @@ public class CTProductConfigController {\ntry {\nreturn Double.parseDouble(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\n+ e.printStackTrace();\nconfig.getLogger().verbose(config.getAccountId(), \"Error getting Double for Key-\" + Key + \" \" + e.getMessage());\n}\n@@ -314,7 +330,7 @@ public class CTProductConfigController {\nif (kvResponse != null) {\ntry {\nparseFetchedResponse(kvResponse);\n- FileUtils.writeJsonToFile(context, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config : fetch file write success: from init \" + fetchedConfig);\nUtils.runOnUiThread(new Runnable() {\n@Override\n@@ -328,6 +344,7 @@ public class CTProductConfigController {\n}\n} catch (Exception e) {\n+ e.printStackTrace();\nconfig.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Failed\");\nsendCallback(PROCESSING_STATE.FETCHED);\ne.printStackTrace();\n@@ -338,7 +355,6 @@ public class CTProductConfigController {\n}\n}\n- //TODO @atul logging in catch clauses needed\nprivate void parseFetchedResponse(JSONObject jsonObject) {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\nfetchedConfig.clear();\n@@ -349,13 +365,13 @@ public class CTProductConfigController {\ntimestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n} catch (JSONException e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : parseFetchedResponse failed: \" + e.getLocalizedMessage());\n}\nif (timestamp != null) {\nsettings.setLastFetchTimeStampInMillis(timestamp);\n}\n}\n- //TODO @atul logging in catch clauses needed\nprivate HashMap<String, String> convertServerJsonToMap(JSONObject jsonObject) {\nHashMap<String, String> map = new HashMap<>();\nJSONArray kvArray = null;\n@@ -363,6 +379,7 @@ public class CTProductConfigController {\nkvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n} catch (JSONException e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"convertServerJsonToMap failed - \" + e.getLocalizedMessage());\n}\nif (kvArray != null && kvArray.length() > 0) {\n@@ -379,6 +396,7 @@ public class CTProductConfigController {\n}\n} catch (JSONException e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : convertServerJsonToMap failed: \" + e.getLocalizedMessage());\n}\n}\n}\n@@ -407,7 +425,6 @@ public class CTProductConfigController {\n/**\n* Deletes all activated, fetched and defaults configs and resets all Product Config settings.\n*/\n- //TODO @atul logging in catch clause needed\npublic void reset() {\nsynchronized (this) {\nif (null != defaultConfig) {\n@@ -416,9 +433,10 @@ public class CTProductConfigController {\nactivatedConfig.clear();\ntry {\n- FileUtils.deleteDirectory(context, getProductConfigDirName());\n+ FileUtils.deleteDirectory(context, config, getProductConfigDirName());\n} catch (Exception e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : reset failed: \" + e.getLocalizedMessage());\n}\nsetMinimumFetchIntervalInSeconds(DEFAULT_MIN_FETCH_INTERVAL_SECONDS);\n}\n@@ -463,9 +481,4 @@ public class CTProductConfigController {\nFETCHED,\nACTIVATED\n}\n-\n- //TODO @atul Give a better name to this Listener interface and make it a separate file for ease of reading code\n- public interface Listener extends CTProductConfigListener {\n- void fetchProductConfig();\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerListener.java",
"diff": "+package com.clevertap.android.sdk.product_config;\n+\n+public interface CTProductConfigControllerListener extends CTProductConfigListener {\n+ void fetchProductConfig();\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -45,20 +45,21 @@ class ProductConfigSettings {\n/**\n* loads settings by reading from file. It's a sync call, please make sure to call this from a background thread\n*/\n- //TODO @atul Do not leave catch empty, put proper logging in all catches\nsynchronized void loadSettings() {\nString content = null;\ntry {\n- content = FileUtils.readFromFile(context, getFullPath());\n+ content = FileUtils.readFromFile(context, config, getFullPath());\n} catch (Exception e) {\ne.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings failed while reading file: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(content)) {\nJSONObject jsonObject = null;\ntry {\njsonObject = new JSONObject(content);\n} catch (JSONException e) {\n-\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings failed: \" + e.getLocalizedMessage());\n}\nif (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\n@@ -92,7 +93,9 @@ class ProductConfigSettings {\ntry {\nif (value != null)\nminInterVal = Long.parseLong(value);\n- } catch (Exception ignored) {//TODO @atul why ignoring? should add logs\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getMinFetchIntervalInSeconds failed: \" + e.getLocalizedMessage());\n}\nreturn minInterVal;\n}\n@@ -103,7 +106,9 @@ class ProductConfigSettings {\ntry {\nif (value != null)\nlastFetchedTimeStamp = Long.parseLong(value);\n- } catch (Exception ignored) {//TODO @atul why ignoring? should add logs\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getLastFetchTimeStampInMillis failed: \" + e.getLocalizedMessage());\n}\nreturn lastFetchedTimeStamp;\n}\n@@ -114,7 +119,9 @@ class ProductConfigSettings {\ntry {\nif (value != null)\nnoCallsAllowedInWindow = Integer.parseInt(value);\n- } catch (Exception ignored) {//TODO @atul why ignoring? should add logs\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getNoOfCallsInAllowedWindow failed: \" + e.getLocalizedMessage());\n}\nreturn noCallsAllowedInWindow;\n}\n@@ -125,7 +132,9 @@ class ProductConfigSettings {\ntry {\nif (value != null)\nwindowIntervalInMinutes = Integer.parseInt(value);\n- } catch (Exception ignored) {//TODO @atul why ignoring? should add logs\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : getWindowIntervalInMinutes failed: \" + e.getLocalizedMessage());\n}\nreturn windowIntervalInMinutes;\n}\n@@ -167,9 +176,10 @@ class ProductConfigSettings {\n@Override\npublic Boolean doInBackground(Void aVoid) {\ntry {\n- FileUtils.writeJsonToFile(context, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(settingsMap));\n+ FileUtils.writeJsonToFile(context, config, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(settingsMap));\n} catch (Exception e) {\n- e.printStackTrace();//TODO @atul logging needed?\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : updateConfigToFile failed: \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n@@ -209,7 +219,8 @@ class ProductConfigSettings {\n}\n}\n} catch (JSONException e) {\n- // Ignore//TODO @atul add proper logging, cannot ignore exception in case of ARP\n+ e.printStackTrace();\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config setARPValue failed \" + e.getLocalizedMessage());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigUtil.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigUtil.java",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.sdk.product_config;\nclass ProductConfigUtil {\n- //TODO @atul Do we need a separate class for one static method?\nstatic boolean isSupportedDataType(Object object) {\nreturn object instanceof String || object instanceof Number || object instanceof Boolean;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added java doc
2. Added logging
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 15.04.2020 09:15:39 | -19,080 | d795a0d58667621df60f888688fdddf3a1c28d75 | code-review(Product Config):
1. Removed the hard cache logic for setmin interval | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -143,7 +143,6 @@ class ProductConfigSettings {\nlong minFetchIntervalInSeconds = getMinFetchIntervalInSeconds();\nif (minFetchIntervalInSeconds != intervalInSeconds) {\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(intervalInSeconds));\n- updateConfigToFile();\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Removed the hard cache logic for setmin interval
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 15.04.2020 10:40:19 | -19,080 | bd77dbb3f40793fc6d08033008ec13b41c9300d5 | code-review(Product Config):
1. adding some more checks to avoid null pointer. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -18,6 +18,7 @@ public interface CTProductConfigConstants {\n//static values\nString DEFAULT_VALUE_FOR_STRING = \"\";\n+ Boolean DEFAULT_VALUE_FOR_BOOLEAN = false;\nLong DEFAULT_VALUE_FOR_LONG = 0L;\nDouble DEFAULT_VALUE_FOR_DOUBLE = 0.0;\n//arp\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -19,6 +19,7 @@ import java.util.Map;\nimport java.util.concurrent.TimeUnit;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_BOOLEAN;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_STRING;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_KEY;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_VALUE;\n@@ -68,7 +69,7 @@ public class CTProductConfigController {\n}\nactivatedConfig.putAll(getStoredValues(getActivatedFullPath()));\nFileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: from init \" + activatedConfig);\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : initialized with configs: \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n} catch (Exception e) {\n@@ -83,10 +84,8 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Boolean isInitSuccess) {\nif (isInitSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Init Success\");\nsendCallback(PROCESSING_STATE.INIT_SUCCESS);\n} else {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Init Failed\");\nsendCallback(PROCESSING_STATE.INIT_FAILED);\n}\n}\n@@ -148,6 +147,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void aVoid) {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n});\n@@ -179,6 +179,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void aVoid) {\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n});\n@@ -230,7 +231,6 @@ public class CTProductConfigController {\n} else {\nactivatedConfig.putAll(getStoredValues(getFetchedFullPath()));\nFileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : activate file write success: \" + activatedConfig);\nFileUtils.deleteFile(context, config, getFetchedFullPath());\n}\n} catch (Exception e) {\n@@ -243,7 +243,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Activated \" + activatedConfig);\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : activated successfully with configs: \" + activatedConfig);\nsendCallback(PROCESSING_STATE.ACTIVATED);\nisActivating = false;\nisFetchAndActivating = false;\n@@ -267,8 +267,12 @@ public class CTProductConfigController {\n* @return String\n*/\npublic String getString(String Key) {\n- if (isInitialized)\n- return activatedConfig.get(Key);\n+ if (isInitialized && !TextUtils.isEmpty(Key)) {\n+ String value = activatedConfig.get(Key);\n+ if (value != null) {\n+ return value;\n+ }\n+ }\nreturn DEFAULT_VALUE_FOR_STRING;\n}\n@@ -279,8 +283,11 @@ public class CTProductConfigController {\n* @return String\n*/\npublic Boolean getBoolean(String Key) {\n+ if (isInitialized && !TextUtils.isEmpty(Key)) {\nreturn Boolean.parseBoolean(activatedConfig.get(Key));\n}\n+ return DEFAULT_VALUE_FOR_BOOLEAN;\n+ }\n/**\n* Returns the parameter value for the given key as a long.\n@@ -289,7 +296,7 @@ public class CTProductConfigController {\n* @return String\n*/\npublic Long getLong(String Key) {\n- if (isInitialized) {\n+ if (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nreturn Long.parseLong(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\n@@ -307,7 +314,7 @@ public class CTProductConfigController {\n* @return String\n*/\npublic Double getDouble(String Key) {\n- if (isInitialized) {\n+ if (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\nreturn Double.parseDouble(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -40,6 +40,7 @@ class ProductConfigSettings {\nsettingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(DEFAULT_WINDOW_LENGTH_MINS));\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(0));\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(DEFAULT_MIN_FETCH_INTERVAL_SECONDS));\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config :settings loaded with default values: \" + settingsMap);\n}\n/**\n@@ -77,7 +78,7 @@ class ProductConfigSettings {\n}\n}\n}\n-\n+ config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings completed with settings: \" + settingsMap);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. adding some more checks to avoid null pointer.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 15.04.2020 15:16:49 | -19,080 | c678d9b822b7aa3dc6a41506fc013e17783019dc | code-review(Product Config):
1. adding logs
2. Added check to handle double values from LC for int type | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk.product_config;\nimport java.util.concurrent.TimeUnit;\npublic interface CTProductConfigConstants {\n+ String TAG_PRODUCT_CONFIG = \"[Product Config]:\";\nString DIR_PRODUCT_CONFIG = \"Product_Config\";\nString FILE_NAME_FETCHED = \"fetched.json\";\nString FILE_NAME_ACTIVATED = \"activated.json\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -69,12 +69,12 @@ public class CTProductConfigController {\n}\nactivatedConfig.putAll(getStoredValues(getActivatedFullPath()));\nFileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : initialized with configs: \" + activatedConfig);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : initialized with configs: \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"initAsync failed - \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"initAsync failed - \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n@@ -99,7 +99,7 @@ public class CTProductConfigController {\ncontent = FileUtils.readFromFile(context, config, fullFilePath);\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues reading file failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getStoredValues reading file failed: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(content)) {\nJSONObject jsonObject = null;\n@@ -107,7 +107,7 @@ public class CTProductConfigController {\njsonObject = new JSONObject(content);\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues failed due to malformed json: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getStoredValues failed due to malformed json: \" + e.getLocalizedMessage());\n}\nif (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\n@@ -119,7 +119,7 @@ public class CTProductConfigController {\nvalue = String.valueOf(jsonObject.get(key));\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getStoredValues for key \" + key + \" while parsing json: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getStoredValues for key \" + key + \" while parsing json: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(value))\nmap.put(key, value);\n@@ -147,7 +147,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void aVoid) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: setDefaults Completed with: \" + defaultConfig);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n});\n@@ -179,7 +179,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void aVoid) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: setDefaults Completed with: \" + defaultConfig);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: setDefaults Completed with: \" + defaultConfig);\ninitAsync();\n}\n});\n@@ -203,7 +203,7 @@ public class CTProductConfigController {\nisFetching = true;\nlistener.fetchProductConfig();\n} else {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Throttled\");\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Throttled\");\n}\n}\n@@ -235,7 +235,7 @@ public class CTProductConfigController {\n}\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : activate failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : activate failed: \" + e.getLocalizedMessage());\n}\nreturn null;\n}\n@@ -243,7 +243,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Void isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : activated successfully with configs: \" + activatedConfig);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : activated successfully with configs: \" + activatedConfig);\nsendCallback(PROCESSING_STATE.ACTIVATED);\nisActivating = false;\nisFetchAndActivating = false;\n@@ -301,7 +301,7 @@ public class CTProductConfigController {\nreturn Long.parseLong(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Error getting Long for Key-\" + Key + \" \" + e.getMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error getting Long for Key-\" + Key + \" \" + e.getMessage());\n}\n}\nreturn CTProductConfigConstants.DEFAULT_VALUE_FOR_LONG;\n@@ -319,7 +319,7 @@ public class CTProductConfigController {\nreturn Double.parseDouble(activatedConfig.get(Key));\n} catch (NumberFormatException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Error getting Double for Key-\" + Key + \" \" + e.getMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error getting Double for Key-\" + Key + \" \" + e.getMessage());\n}\n}\n@@ -338,11 +338,11 @@ public class CTProductConfigController {\ntry {\nparseFetchedResponse(kvResponse);\nFileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : fetch file write success: from init \" + fetchedConfig);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : fetch file write success: from init \" + fetchedConfig);\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Success\");\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Success\");\nsendCallback(PROCESSING_STATE.FETCHED);\n}\n});\n@@ -352,7 +352,7 @@ public class CTProductConfigController {\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: fetch Failed\");\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Failed\");\nsendCallback(PROCESSING_STATE.FETCHED);\ne.printStackTrace();\nisFetchAndActivating = false;// set fetchAndActivating flag to false if fetch fails.\n@@ -366,13 +366,13 @@ public class CTProductConfigController {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\nfetchedConfig.clear();\nfetchedConfig.putAll(map);\n- config.getLogger().verbose(config.getAccountId(), \"Product Config: Fetched response:\" + jsonObject);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Fetched response:\" + jsonObject);\nInteger timestamp = null;\ntry {\ntimestamp = (Integer) jsonObject.get(CTProductConfigConstants.KEY_LAST_FETCHED_TIMESTAMP);\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : parseFetchedResponse failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : parseFetchedResponse failed: \" + e.getLocalizedMessage());\n}\nif (timestamp != null) {\nsettings.setLastFetchTimeStampInMillis(timestamp);\n@@ -386,7 +386,7 @@ public class CTProductConfigController {\nkvArray = jsonObject.getJSONArray(Constants.KEY_KV);\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"convertServerJsonToMap failed - \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"convertServerJsonToMap failed - \" + e.getLocalizedMessage());\n}\nif (kvArray != null && kvArray.length() > 0) {\n@@ -403,7 +403,7 @@ public class CTProductConfigController {\n}\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : convertServerJsonToMap failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : convertServerJsonToMap failed: \" + e.getLocalizedMessage());\n}\n}\n}\n@@ -443,7 +443,7 @@ public class CTProductConfigController {\nFileUtils.deleteDirectory(context, config, getProductConfigDirName());\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : reset failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : reset failed: \" + e.getLocalizedMessage());\n}\nsetMinimumFetchIntervalInSeconds(DEFAULT_MIN_FETCH_INTERVAL_SECONDS);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -40,7 +40,7 @@ class ProductConfigSettings {\nsettingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(DEFAULT_WINDOW_LENGTH_MINS));\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(0));\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(DEFAULT_MIN_FETCH_INTERVAL_SECONDS));\n- config.getLogger().verbose(config.getAccountId(), \"Product Config :settings loaded with default values: \" + settingsMap);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config :settings loaded with default values: \" + settingsMap);\n}\n/**\n@@ -52,7 +52,7 @@ class ProductConfigSettings {\ncontent = FileUtils.readFromFile(context, config, getFullPath());\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings failed while reading file: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : loadSettings failed while reading file: \" + e.getLocalizedMessage());\n}\nif (!TextUtils.isEmpty(content)) {\nJSONObject jsonObject = null;\n@@ -60,7 +60,7 @@ class ProductConfigSettings {\njsonObject = new JSONObject(content);\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : loadSettings failed: \" + e.getLocalizedMessage());\n}\nif (jsonObject != null) {\nIterator<String> iterator = jsonObject.keys();\n@@ -78,7 +78,7 @@ class ProductConfigSettings {\n}\n}\n}\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : loadSettings completed with settings: \" + settingsMap);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : loadSettings completed with settings: \" + settingsMap);\n}\n}\n@@ -93,10 +93,10 @@ class ProductConfigSettings {\nString value = settingsMap.get(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS);\ntry {\nif (value != null)\n- minInterVal = Long.parseLong(value);\n+ minInterVal = (long) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getMinFetchIntervalInSeconds failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getMinFetchIntervalInSeconds failed: \" + e.getLocalizedMessage());\n}\nreturn minInterVal;\n}\n@@ -106,10 +106,10 @@ class ProductConfigSettings {\nString value = settingsMap.get(KEY_LAST_FETCHED_TIMESTAMP);\ntry {\nif (value != null)\n- lastFetchedTimeStamp = Long.parseLong(value);\n+ lastFetchedTimeStamp = (long) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getLastFetchTimeStampInMillis failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getLastFetchTimeStampInMillis failed: \" + e.getLocalizedMessage());\n}\nreturn lastFetchedTimeStamp;\n}\n@@ -119,10 +119,10 @@ class ProductConfigSettings {\nString value = settingsMap.get(PRODUCT_CONFIG_NO_OF_CALLS);\ntry {\nif (value != null)\n- noCallsAllowedInWindow = Integer.parseInt(value);\n+ noCallsAllowedInWindow = (int) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getNoOfCallsInAllowedWindow failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getNoOfCallsInAllowedWindow failed: \" + e.getLocalizedMessage());\n}\nreturn noCallsAllowedInWindow;\n}\n@@ -132,10 +132,10 @@ class ProductConfigSettings {\nString value = settingsMap.get(PRODUCT_CONFIG_WINDOW_LENGTH_MINS);\ntry {\nif (value != null)\n- windowIntervalInMinutes = Integer.parseInt(value);\n+ windowIntervalInMinutes = (int) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : getWindowIntervalInMinutes failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : getWindowIntervalInMinutes failed: \" + e.getLocalizedMessage());\n}\nreturn windowIntervalInMinutes;\n}\n@@ -179,7 +179,7 @@ class ProductConfigSettings {\nFileUtils.writeJsonToFile(context, config, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(settingsMap));\n} catch (Exception e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config : updateConfigToFile failed: \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : updateConfigToFile failed: \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n@@ -188,9 +188,9 @@ class ProductConfigSettings {\n@Override\npublic void onPostExecute(Boolean isSuccess) {\nif (isSuccess) {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Success \" + settingsMap);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config settings: writing Success \" + settingsMap);\n} else {\n- config.getLogger().verbose(config.getAccountId(), \"Product Config settings: writing Failed\");\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config settings: writing Failed\");\n}\n}\n});\n@@ -220,7 +220,7 @@ class ProductConfigSettings {\n}\n} catch (JSONException e) {\ne.printStackTrace();\n- config.getLogger().verbose(config.getAccountId(), \"Product Config setARPValue failed \" + e.getLocalizedMessage());\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config setARPValue failed \" + e.getLocalizedMessage());\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigUtil.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigUtil.java",
"diff": "package com.clevertap.android.sdk.product_config;\n+import com.clevertap.android.sdk.CleverTapInstanceConfig;\n+\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.TAG_PRODUCT_CONFIG;\n+\nclass ProductConfigUtil {\nstatic boolean isSupportedDataType(Object object) {\nreturn object instanceof String || object instanceof Number || object instanceof Boolean;\n}\n+\n+ static String getLogTag(CleverTapInstanceConfig config) {\n+ return (config != null ? config.getAccountId() : \"\") + TAG_PRODUCT_CONFIG;\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. adding logs
2. Added check to handle double values from LC for int type
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,623 | 15.04.2020 15:35:54 | -19,080 | 7479dcbb8a428b7fb8d0abb6da5686c0ec30c0b4 | feat: Add code for custom handling push amp paylaod | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import android.os.Bundle;\n+\n+public interface CTPushListener {\n+ void onPushPayloadReceived(Bundle extras);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -227,6 +227,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate int currentRequestTimestamp = 0;\nprivate Location locationFromUser = null;\nprivate SyncListener syncListener = null;\n+ private CTPushListener pushListener = null;\nprivate ArrayList<PushType> enabledPushTypes = null;\nprivate long appLastSeen = 0;\nprivate int currentSessionId = 0;\n@@ -6193,7 +6194,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (!pushBundle.isEmpty() && !dbAdapter.doesPushNotificationIdExist(pushObject.getString(\"wzrk_pid\"))) {\ngetConfigLogger().verbose(\"Creating Push Notification locally\");\n+ if(pushListener != null){\n+ pushListener.onPushPayloadReceived(pushBundle);\n+ }else {\ncreateNotification(context, pushBundle);\n+ }\n} else {\ngetConfigLogger().verbose(getAccountId(), \"Push Notification already shown, ignoring local notification :\" + pushObject.getString(\"wzrk_pid\"));\n}\n@@ -6590,6 +6595,37 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npushNotificationViewedEvent(extras);\n}\n+ /**\n+ * Pass Push Notification Payload to CleverTap for smooth functioning of Push Amplification\n+ * @param extras - Bundle received via FCM/Push Amplification\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void passPushNotification(final Bundle extras){\n+ postAsyncSafely(\"customHandlePushAmplification\", new Runnable() {\n+ @Override\n+ public void run() {\n+ String notifMessage = extras.getString(Constants.NOTIF_MSG);\n+ notifMessage = (notifMessage != null) ? notifMessage : \"\";\n+ if (notifMessage.isEmpty()) {\n+ //silent notification\n+ getConfigLogger().verbose(getAccountId(), \"Push notification message is empty, not rendering\");\n+ loadDBAdapter(context).storeUninstallTimestamp();\n+ String pingFreq = extras.getString(\"pf\", \"\");\n+ if (!TextUtils.isEmpty(pingFreq)) {\n+ updatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n+ }\n+ }else{\n+ String wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE, (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ long wzrk_ttl = Long.parseLong(ttl);\n+ DBAdapter dbAdapter = loadDBAdapter(context);\n+ getConfigLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\n+ dbAdapter.storePushNotificationId(wzrk_pid, wzrk_ttl);\n+ }\n+ }\n+ });\n+ }\n+\n/**\n* This method is used to push install referrer via Intent\n* Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n@@ -7338,6 +7374,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n+ /**\n+ * Returns the CTPushListener object\n+ *\n+ * @return The {@link CTPushListener} object\n+ */\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public CTPushListener getCTPushListener() {\n+ return pushListener;\n+ }\n+\n+ /**\n+ * This method is used to set the CTPushListener\n+ *\n+ * @param pushListener - The{@link CTPushListener} object\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setCTPushListener(CTPushListener pushListener) {\n+ this.pushListener = pushListener;\n+ }\n+\n/**\n* Registers an ABTesting variable of type {@link Boolean} for ease of editing on the CleverTap Dashboard\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: Add code for custom handling push amp paylaod CLEVER-10971 |
116,623 | 16.04.2020 19:17:32 | -19,080 | 415bcba08c821ea86cfc5c1ee90bc3a682dd285a | feat: custom handling push amp | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -6596,12 +6596,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\npushNotificationViewedEvent(extras);\n}\n+\n/**\n- * Pass Push Notification Payload to CleverTap for smooth functioning of Push Amplification\n- * @param extras - Bundle received via FCM/Push Amplification\n+ * Stores silent push notification in DB for smooth working of Push Amplification\n+ * Background Job Service and also stores wzrk_pid to the DB to avoid duplication of Push\n+ * Notifications from Push Amplification.\n+ * @param extras - Bundle\n*/\n- @SuppressWarnings(\"unused\")\n- public void passPushNotification(final Bundle extras){\n+ private void processCustomPushNotification(final Bundle extras){\npostAsyncSafely(\"customHandlePushAmplification\", new Runnable() {\n@Override\npublic void run() {\n@@ -6627,6 +6629,29 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n});\n}\n+ /**\n+ * Pass Push Notification Payload to CleverTap for smooth functioning of Push Amplification\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+ String _accountId = extras.getString(Constants.WZRK_ACCT_ID_KEY);\n+ if (instances == null) {\n+ CleverTapAPI instance = createInstanceIfAvailable(context, _accountId);\n+ if (instance != null)\n+ instance.processCustomPushNotification(extras);\n+ return;\n+ }\n+\n+ for (String accountId : CleverTapAPI.instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ if (instance != null) {\n+ instance.processCustomPushNotification(extras);\n+ }\n+ }\n+ }\n+\n/**\n* This method is used to push install referrer via Intent\n* Deprecation warning because Google Play install referrer via intent will be deprecated in March 2020\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: custom handling push amp CLEVER-10971 |
116,623 | 19.04.2020 22:34:01 | -19,080 | ff1c4070bf1ed3e7997058e0b9ce7972fa6cffbf | feat: Enable discarding of events at SDK level | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -243,6 +243,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate long referrerClickTime = 0;\nprivate long appInstallTime = 0;\nprivate String cachedGUID = null;\n+ private boolean firstRequestInSession = false;\n/**\n* Method to check whether app has ExoPlayer dependencies\n@@ -1927,6 +1928,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n//Session\nprivate void lazyCreateSession(Context context) {\nif (!inCurrentSession()) {\n+ setFirstRequestInSession(true);\ncreateSession(context);\npushInitialEventsAsync();\n}\n@@ -2546,6 +2548,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"ep\", System.currentTimeMillis() / 1000);\nevent.put(\"f\", isFirstSession());\nevent.put(\"lsl\", getLastSessionLength());\n+ //event.put(\"frs\", firstRequestInSession);\n+ //firstRequestInSession = false;\nattachPackageNameIfRequired(context, event);\n// Report any pending validation error\n@@ -3186,6 +3190,14 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn getIntFromPrefs(Constants.KEY_FIRST_TS, 0);\n}\n+ private boolean isFirstRequestInSession() {\n+ return firstRequestInSession;\n+ }\n+\n+ private void setFirstRequestInSession(boolean firstRequestInSession) {\n+ this.firstRequestInSession = firstRequestInSession;\n+ }\n+\n//Session\nprivate int getLastRequestTimestamp() {\n@@ -3241,6 +3253,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nheader.put(\"rct\", getReferrerClickTime());\nheader.put(\"ait\", getAppInstallTime());\n}\n+ header.put(\"frs\", isFirstRequestInSession());\n+ setFirstRequestInSession(false);\n// Attach ARP\n@@ -3563,6 +3577,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ //Handle Discarded Events\n+ try {\n+ processDiscardedEventsList(response);\n+ }catch (Throwable t){\n+ getConfigLogger().verbose(\"Error handling discarded events response: \" + t.getLocalizedMessage());\n+ }\n+\n} catch (Throwable t) {\nmResponseFailureCount++;\ngetConfigLogger().verbose(getAccountId(), \"Problem process send queue response\", t);\n@@ -5655,6 +5676,13 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nreturn;\n}\n+ ValidationResult discardedResult = validator.isEventDiscarded(eventName);\n+ // Check for a discarded event name\n+ if (discardedResult.getErrorCode() > 0) {\n+ pushValidationResult(discardedResult);\n+ return;\n+ }\n+\nif (eventActions == null) {\neventActions = new HashMap<>();\n}\n@@ -8404,4 +8432,28 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nproductConfigListener.get().onInitSuccess();\n}\n}\n+\n+ private void processDiscardedEventsList(JSONObject response){\n+ if (!response.has(Constants.DISCARDED_EVENT_JSON_KEY)) {\n+ getConfigLogger().verbose(getAccountId(), \"JSON object doesn't contain the Discarded Events key\");\n+ return;\n+ }\n+\n+ try {\n+ ArrayList<String> discardedEventsList = new ArrayList<>();\n+ JSONArray discardedEventsArray = response.getJSONArray(Constants.DISCARDED_EVENT_JSON_KEY);\n+\n+ if(discardedEventsArray != null){\n+ for(int i = 0; i < discardedEventsArray.length(); i++){\n+ discardedEventsList.add(discardedEventsArray.getString(i));\n+ }\n+ }\n+ if (validator != null){\n+ validator.setDiscardedEvents(discardedEventsList);\n+ }\n+ } catch (JSONException e) {\n+ getConfigLogger().verbose(getAccountId(), \"Error parsing discarded events list\" + e.getLocalizedMessage());\n+ }\n+\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -65,6 +65,7 @@ public class Constants {\nstatic final String DISPLAY_UNIT_JSON_RESPONSE_KEY = \"adUnit_notifs\";\nstatic final String FEATURE_FLAG_JSON_RESPONSE_KEY = \"ff_notifs\";\nstatic final String REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY = \"pc_notifs\";\n+ static final String DISCARDED_EVENT_JSON_KEY = \"d_e\";\nstatic final String INAPP_MAX_DISPLAY_COUNT = \"mdc\";\nstatic final String INAPP_MAX_PER_SESSION = \"imc\";\nstatic final String INAPP_WINDOW = \"w\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"diff": "@@ -24,6 +24,7 @@ final class Validator {\nstatic final String ADD_VALUES_OPERATION = \"multiValuePropertyAddValues\";\nstatic final String REMOVE_VALUES_OPERATION = \"multiValuePropertyRemoveValues\";\n+\n@SuppressWarnings(\"unused\")\nprivate enum RestrictedMultiValueFields {\nName(), Email(), Education(),\n@@ -35,6 +36,16 @@ final class Validator {\nProfile(), Event()\n}\n+ private ArrayList<String> discardedEvents;\n+\n+ private ArrayList<String> getDiscardedEvents() {\n+ return discardedEvents;\n+ }\n+\n+ public void setDiscardedEvents(ArrayList<String> discardedEvents) {\n+ this.discardedEvents = discardedEvents;\n+ }\n+\n/**\n* Cleans the event name to the following guidelines:\n* <p>\n@@ -305,6 +316,33 @@ final class Validator {\nreturn error;\n}\n+ /**\n+ * Checks whether the specified event name has been discarded from Dashboard. If it is,\n+ * then create a pending error, and abort.\n+ *\n+ * @param name The event name\n+ * @return Boolean indication whether the event name has been discarded from Dashboard\n+ */\n+ ValidationResult isEventDiscarded(String name) {\n+ ValidationResult error = new ValidationResult();\n+ if (name == null) {\n+ error.setErrorCode(510);\n+ error.setErrorDesc(\"Event Name is null\");\n+ return error;\n+ }\n+ if(getDiscardedEvents() != null) {\n+ for (String x : getDiscardedEvents())\n+ if (name.equalsIgnoreCase(x)) {\n+ // The event name is discarded\n+ error.setErrorCode(513);\n+ error.setErrorDesc(name + \" is a discarded event name. Last event aborted.\");\n+ Logger.v(name + \" is a discarded event name. Last event aborted.\");\n+ return error;\n+ }\n+ }\n+ return error;\n+ }\n+\n// multi-value list operations\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: Enable discarding of events at SDK level CLEVER-11122 |
116,623 | 20.04.2020 21:34:59 | -19,080 | c9cee9ed2a691c42d0b7069b36d404578601e647 | feat: Final pass of handling discarded events | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -3420,6 +3420,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif(ctProductConfigController!=null){\nctProductConfigController.setArpValue(arp);\n}\n+ //Handle Discarded events in ARP\n+ try {\n+ processDiscardedEventsList(response);\n+ }catch (Throwable t){\n+ getConfigLogger().verbose(\"Error handling discarded events response: \" + t.getLocalizedMessage());\n+ }\nhandleARPUpdate(context, arp);\n}\n}\n@@ -3577,13 +3583,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n- //Handle Discarded Events\n- try {\n- processDiscardedEventsList(response);\n- }catch (Throwable t){\n- getConfigLogger().verbose(\"Error handling discarded events response: \" + t.getLocalizedMessage());\n- }\n-\n} catch (Throwable t) {\nmResponseFailureCount++;\ngetConfigLogger().verbose(getAccountId(), \"Problem process send queue response\", t);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: Final pass of handling discarded events CLEVER-11122 |
116,621 | 20.04.2020 21:35:09 | -19,080 | dc167483b3a0bcf24bd6695b7b87f8358991e9f2 | fix(Product Config):
1. crash fix feature flag
2. fetch not working for 1st time | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -147,9 +147,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (this.deviceInfo.getDeviceID() != null) {\nLogger.v(\"Initializing InAppFC with device Id = \" + this.deviceInfo.getDeviceID());\nthis.inAppFCManager = new InAppFCManager(context, config, this.deviceInfo.getDeviceID());\n- initFeatureFlags();\n-\n}\n+ initFeatureFlags(false);\nthis.validator = new Validator();\n@@ -6161,7 +6160,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.inAppFCManager = new InAppFCManager(context, config, deviceId);\nLogger.v(\"Initializing ABTesting after Device ID Created = \" + deviceId);\ninitABTesting();\n- initFeatureFlags();\n+ initFeatureFlags(true);\ninitProductConfig(true);\ngetConfigLogger().verbose(\"Got device id from DeviceInfo, notifying user profile initialized to SyncListener\");\nnotifyUserProfileInitialized(deviceId);\n@@ -8279,22 +8278,17 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.featureFlagsListener = featureFlagsListener;\n}\n- private void initFeatureFlags() {\n+ private void initFeatureFlags(boolean fromPlayServices) {\nLogger.v(\"Initializing Feature Flags with device Id = \" + getCleverTapID());\n- if (config.isAnalyticsOnly()) {\n- getConfigLogger().debug(config.getAccountId(), \"Feature Flags is not enabled for this instance\");\n- return;\n- }\n-\n- if (getCleverTapID() == null) {\n- getConfigLogger().verbose(config.getAccountId(), \"GUID not set yet, deferring Feature Flags initialization\");\n- return;\n- }\nif (ctFeatureFlagsController == null) {\nctFeatureFlagsController = new CTFeatureFlagsController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n}\n+\n+ if (fromPlayServices && ctFeatureFlagsController != null && !ctFeatureFlagsController.isInitialized()) {\n+ ctFeatureFlagsController.setGuidAndInit(getCleverTapID());\n+ }\n}\nprivate void resetFeatureFlags() {\n@@ -8378,11 +8372,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void initProductConfig(boolean fromPlayServices) {\nLogger.v(\"Initializing Product Config with device Id = \" + getCleverTapID());\n- if (config.isAnalyticsOnly()) {\n- getConfigLogger().debug(config.getAccountId(), \"Feature Flags is not enabled for this instance\");\n- return;\n- }\n-\nif (ctProductConfigController == null) {\nctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Product Config initialized\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -16,6 +16,7 @@ import org.json.JSONObject;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_BOOLEAN;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_KEY;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_VALUE;\n@@ -34,7 +35,12 @@ public class CTFeatureFlagsController {\nthis.store = new HashMap<>();\nthis.setListener(listener);\nthis.mContext = context.getApplicationContext();\n- unarchiveData();\n+ init();\n+ }\n+\n+ public void setGuidAndInit(String cleverTapID) {\n+ this.guid = cleverTapID;\n+ init();\n}\nprivate void setListener(FeatureFlagListener listener) {\n@@ -96,7 +102,9 @@ public class CTFeatureFlagsController {\n}\n}\n- private synchronized void unarchiveData() {\n+ private synchronized void init() {\n+ if (TextUtils.isEmpty(guid))\n+ return;\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Boolean>() {\n@Override\npublic Boolean doInBackground(Void aVoid) {\n@@ -122,7 +130,7 @@ public class CTFeatureFlagsController {\n}\n}\n}\n-\n+ isInitialized = true;\n}\n} catch (Exception e) {\ne.printStackTrace();\n@@ -141,6 +149,8 @@ public class CTFeatureFlagsController {\n}\nprivate Boolean get(String key, boolean defaultValue) {\n+ if(!isInitialized)\n+ return DEFAULT_VALUE_FOR_BOOLEAN;\ngetConfigLogger().verbose(getAccountId(), \"getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\nBoolean value = store.get(key);\nif (value != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -329,7 +329,7 @@ public class CTProductConfigController {\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\nreturn !isFetching\n&& !TextUtils.isEmpty(guid)\n- && (System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds);\n+ && ((System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds));\n}\npublic void afterFetchProductConfig(JSONObject kvResponse) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Product Config):
1. crash fix feature flag
2. fetch not working for 1st time
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 20.04.2020 23:21:45 | -19,080 | f31e2c20657b012df01cde9ade19bd87d5f7aa40 | fix(Product Config):
1. fix to remove default value getting stored in cache
2. fetch not working for again in case pc_config node is not coming in response | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -134,6 +134,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate WeakReference<DisplayUnitListener> displayUnitListenerWeakReference;\nprivate CTProductConfigController ctProductConfigController;\n+ private boolean isProductConfigRequested;\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\n@@ -8281,6 +8282,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void initFeatureFlags(boolean fromPlayServices) {\nLogger.v(\"Initializing Feature Flags with device Id = \" + getCleverTapID());\n+ if (config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\n+ return;\n+ }\n+\nif (ctFeatureFlagsController == null) {\nctFeatureFlagsController = new CTFeatureFlagsController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Feature Flags initialized\");\n@@ -8330,31 +8336,47 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nqueueEvent(context, event, Constants.FETCH_EVENT);\n+ isProductConfigRequested = true;\n+ getConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Fetching product config\");\n}\nprivate void processProductConfigResponse(JSONObject response){\nif (response == null) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Can't parse Feature Flags Response, JSON response object is null\");\n+ onProductConfigFailed();\nreturn;\n}\nif (!response.has(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY)) {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"JSON object doesn't contain the Product Config key\");\n+ onProductConfigFailed();\nreturn;\n}\ntry {\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Processing Feature Flags response\");\nparseProductConfigs(response.getJSONObject(Constants.REMOTE_CONFIG_FLAG_JSON_RESPONSE_KEY));\n} catch (Throwable t) {\n+ onProductConfigFailed();\ngetConfigLogger().verbose(getAccountId(), Constants.LOG_TAG_PRODUCT_CONFIG + \"Failed to parse response\", t);\n}\n}\n+ private void onProductConfigFailed() {\n+ if (isProductConfigRequested) {\n+ if (ctProductConfigController != null) {\n+ ctProductConfigController.onFetchFailed();\n+ }\n+ isProductConfigRequested = false;\n+ }\n+ }\n+\nprivate void parseProductConfigs(JSONObject responseKV) throws JSONException {\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n- if (kvArray != null && productConfig() != null) {\n- productConfig().afterFetchProductConfig(responseKV);\n+ if (kvArray != null && ctProductConfigController != null) {\n+ productConfig().onFetchSuccess(responseKV);\n+ }else {\n+ onProductConfigFailed();\n}\n}\n@@ -8372,6 +8394,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void initProductConfig(boolean fromPlayServices) {\nLogger.v(\"Initializing Product Config with device Id = \" + getCleverTapID());\n+ if (config.isAnalyticsOnly()) {\n+ getConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\n+ return;\n+ }\n+\nif (ctProductConfigController == null) {\nctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Product Config initialized\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -20,6 +20,8 @@ import java.util.concurrent.TimeUnit;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_BOOLEAN;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_DOUBLE;\n+import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_LONG;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.DEFAULT_VALUE_FOR_STRING;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_KEY;\nimport static com.clevertap.android.sdk.product_config.CTProductConfigConstants.PRODUCT_CONFIG_JSON_KEY_FOR_VALUE;\n@@ -67,8 +69,9 @@ public class CTProductConfigController {\nif (!defaultConfig.isEmpty()) {\nactivatedConfig.putAll(defaultConfig);\n}\n- activatedConfig.putAll(getStoredValues(getActivatedFullPath()));\n- FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ HashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\n+ activatedConfig.putAll(storedConfig);\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(storedConfig));\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : initialized with configs: \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n@@ -226,12 +229,15 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\n//read fetched info\n+ HashMap<String, String> toWriteValues = new HashMap<>();\nif (!fetchedConfig.isEmpty()) {\n+ toWriteValues.putAll(fetchedConfig);\nactivatedConfig.putAll(fetchedConfig);\n} else {\n- activatedConfig.putAll(getStoredValues(getFetchedFullPath()));\n+ toWriteValues = getStoredValues(getFetchedFullPath());\n+ activatedConfig.putAll(toWriteValues);\n}\n- FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(activatedConfig));\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(toWriteValues));\nFileUtils.deleteFile(context, config, getFetchedFullPath());\n} catch (Exception e) {\ne.printStackTrace();\n@@ -269,7 +275,7 @@ public class CTProductConfigController {\npublic String getString(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\nString value = activatedConfig.get(Key);\n- if (value != null) {\n+ if (!TextUtils.isEmpty(value)) {\nreturn value;\n}\n}\n@@ -284,7 +290,10 @@ public class CTProductConfigController {\n*/\npublic Boolean getBoolean(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\n- return Boolean.parseBoolean(activatedConfig.get(Key));\n+ String value = activatedConfig.get(Key);\n+ if (!TextUtils.isEmpty(value)) {\n+ return Boolean.parseBoolean(value);\n+ }\n}\nreturn DEFAULT_VALUE_FOR_BOOLEAN;\n}\n@@ -298,13 +307,16 @@ public class CTProductConfigController {\npublic Long getLong(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\n- return Long.parseLong(activatedConfig.get(Key));\n+ String value = activatedConfig.get(Key);\n+ if (!TextUtils.isEmpty(value)) {\n+ return Long.parseLong(value);\n+ }\n} catch (NumberFormatException e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error getting Long for Key-\" + Key + \" \" + e.getMessage());\n}\n}\n- return CTProductConfigConstants.DEFAULT_VALUE_FOR_LONG;\n+ return DEFAULT_VALUE_FOR_LONG;\n}\n/**\n@@ -316,14 +328,16 @@ public class CTProductConfigController {\npublic Double getDouble(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\ntry {\n- return Double.parseDouble(activatedConfig.get(Key));\n+ String value = activatedConfig.get(Key);\n+ if (!TextUtils.isEmpty(value)) {\n+ return Double.parseDouble(value);\n+ }\n} catch (NumberFormatException e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error getting Double for Key-\" + Key + \" \" + e.getMessage());\n}\n-\n}\n- return CTProductConfigConstants.DEFAULT_VALUE_FOR_DOUBLE;\n+ return DEFAULT_VALUE_FOR_DOUBLE;\n}\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\n@@ -332,7 +346,12 @@ public class CTProductConfigController {\n&& ((System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds));\n}\n- public void afterFetchProductConfig(JSONObject kvResponse) {\n+ public void onFetchFailed() {\n+ isFetching = false;\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Failed\");\n+ }\n+\n+ public void onFetchSuccess(JSONObject kvResponse) {\nsynchronized (this) {\nif (kvResponse != null) {\ntry {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Product Config):
1. fix to remove default value getting stored in cache
2. fetch not working for again in case pc_config node is not coming in response
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 21.04.2020 11:12:31 | -19,080 | 82ea73d75127c265e2d363f7288e360210b242af | fix(Product Config):
1. fix to set fetchAndActivate to true and false | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -348,6 +348,7 @@ public class CTProductConfigController {\npublic void onFetchFailed() {\nisFetching = false;\n+ isFetchAndActivating = false;\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Failed\");\n}\n@@ -499,6 +500,7 @@ public class CTProductConfigController {\nif (isFetchAndActivating)\nreturn;\nfetch();\n+ isFetchAndActivating = true;\n}\nprivate enum PROCESSING_STATE {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Product Config):
1. fix to set fetchAndActivate to true and false
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 21.04.2020 13:24:17 | -19,080 | b7305f140df74e2fa35cb09f6d42a1867b8fa3f0 | fix(Product Config):
1. remove the fetching & activating boolean to simplify the logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -41,8 +41,6 @@ public class CTProductConfigController {\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\nprivate final HashMap<String, String> fetchedConfig = new HashMap<>();\nprivate final CTProductConfigControllerListener listener;\n- private boolean isFetching = false;\n- private boolean isActivating = false;\nprivate boolean isFetchAndActivating = false;\nprivate final ProductConfigSettings settings;\n@@ -203,7 +201,6 @@ public class CTProductConfigController {\n@SuppressWarnings(\"WeakerAccess\")\npublic void fetch(long minimumFetchIntervalInSeconds) {\nif (canRequest(minimumFetchIntervalInSeconds)) {\n- isFetching = true;\nlistener.fetchProductConfig();\n} else {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Throttled\");\n@@ -215,13 +212,10 @@ public class CTProductConfigController {\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic void activate() {\n- if (isActivating)\n- return;\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\npublic Void doInBackground(Void params) {\nsynchronized (this) {\n- isActivating = true;\ntry {\nactivatedConfig.clear();\n//apply default config first\n@@ -251,7 +245,6 @@ public class CTProductConfigController {\npublic void onPostExecute(Void isSuccess) {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : activated successfully with configs: \" + activatedConfig);\nsendCallback(PROCESSING_STATE.ACTIVATED);\n- isActivating = false;\nisFetchAndActivating = false;\n}\n});\n@@ -341,13 +334,11 @@ public class CTProductConfigController {\n}\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\n- return !isFetching\n- && !TextUtils.isEmpty(guid)\n+ return !TextUtils.isEmpty(guid)\n&& ((System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds));\n}\npublic void onFetchFailed() {\n- isFetching = false;\nisFetchAndActivating = false;\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: fetch Failed\");\n}\n@@ -378,7 +369,6 @@ public class CTProductConfigController {\nisFetchAndActivating = false;// set fetchAndActivating flag to false if fetch fails.\n}\n}\n- isFetching = false;\n}\n}\n@@ -497,8 +487,6 @@ public class CTProductConfigController {\n* Asynchronously fetches and then activates the fetched configs.\n*/\npublic void fetchAndActivate() {\n- if (isFetchAndActivating)\n- return;\nfetch();\nisFetchAndActivating = true;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Product Config):
1. remove the fetching & activating boolean to simplify the logic
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,623 | 21.04.2020 22:00:40 | -19,080 | 28dc84329c22476d4ac6744b306841d695e70d61 | fix: handle app-links on all channels | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"diff": "@@ -4,6 +4,7 @@ import android.app.Activity;\nimport android.app.Fragment;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.ResolveInfo;\nimport android.net.Uri;\nimport android.os.Bundle;\nimport android.support.annotation.Nullable;\n@@ -12,6 +13,7 @@ import android.view.View;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n+import java.util.List;\nimport java.util.Set;\nimport java.util.concurrent.atomic.AtomicBoolean;\n@@ -122,6 +124,16 @@ public abstract class CTInAppBaseFragment extends Fragment {\nif (!queryBundle.isEmpty()) {\nintent.putExtras(queryBundle);\n}\n+ List<ResolveInfo> resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent,0);\n+ if(resolveInfoList != null){\n+ String appPackageName = getActivity().getPackageName();\n+ for(ResolveInfo resolveInfo : resolveInfoList){\n+ if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n+ intent.setPackage(appPackageName);\n+ break;\n+ }\n+ }\n+ }\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.ResolveInfo;\nimport android.graphics.Color;\nimport android.net.Uri;\nimport android.os.Bundle;\n@@ -26,6 +27,7 @@ import java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\n+import java.util.List;\npublic class CTInboxListViewFragment extends Fragment {\n@@ -253,6 +255,18 @@ public class CTInboxListViewFragment extends Fragment {\nvoid fireUrlThroughIntent(String url) {\ntry {\nIntent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url.replace(\"\\n\", \"\").replace(\"\\r\", \"\")));\n+ if(getActivity() != null) {\n+ List<ResolveInfo> resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent, 0);\n+ if (resolveInfoList != null) {\n+ String appPackageName = getActivity().getPackageName();\n+ for (ResolveInfo resolveInfo : resolveInfoList) {\n+ if (appPackageName.equals(resolveInfo.activityInfo.packageName)) {\n+ intent.setPackage(appPackageName);\n+ break;\n+ }\n+ }\n+ }\n+ }\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTNotificationIntentService.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTNotificationIntentService.java",
"diff": "@@ -4,9 +4,12 @@ import android.app.IntentService;\nimport android.app.NotificationManager;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.ResolveInfo;\nimport android.net.Uri;\nimport android.os.Bundle;\n+import java.util.List;\n+\npublic class CTNotificationIntentService extends IntentService {\npublic final static String MAIN_ACTION = \"com.clevertap.PUSH_EVENT\";\n@@ -40,6 +43,16 @@ public class CTNotificationIntentService extends IntentService {\nIntent launchIntent;\nif (dl != null) {\nlaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n+ List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launchIntent,0);\n+ if(resolveInfoList != null){\n+ String appPackageName = context.getPackageName();\n+ for(ResolveInfo resolveInfo : resolveInfoList){\n+ if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n+ launchIntent.setPackage(appPackageName);\n+ break;\n+ }\n+ }\n+ }\n} else {\nlaunchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushNotificationReceiver.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushNotificationReceiver.java",
"diff": "@@ -3,9 +3,12 @@ package com.clevertap.android.sdk;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.ResolveInfo;\nimport android.net.Uri;\nimport android.os.Bundle;\n+import java.util.List;\n+\npublic class CTPushNotificationReceiver extends BroadcastReceiver {\n@@ -22,6 +25,16 @@ public class CTPushNotificationReceiver extends BroadcastReceiver {\nif (extras.containsKey(Constants.DEEP_LINK_KEY)){\nlaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(intent.getStringExtra(Constants.DEEP_LINK_KEY)));\n+ List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launchIntent,0);\n+ if(resolveInfoList != null){\n+ String appPackageName = context.getPackageName();\n+ for(ResolveInfo resolveInfo : resolveInfoList){\n+ if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n+ launchIntent.setPackage(appPackageName);\n+ break;\n+ }\n+ }\n+ }\n} else {\nlaunchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());\nif (launchIntent == null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: handle app-links on all channels CLEVER-11274 |
116,623 | 21.04.2020 22:27:50 | -19,080 | 85ec61c1953f53b43d5b9c7277531b6d09942855 | feat: Clear discarded event list on new session | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1929,6 +1929,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void lazyCreateSession(Context context) {\nif (!inCurrentSession()) {\nsetFirstRequestInSession(true);\n+ if(validator != null) {\n+ validator.setDiscardedEvents(null);\n+ }\ncreateSession(context);\npushInitialEventsAsync();\n}\n@@ -8450,7 +8453,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void processDiscardedEventsList(JSONObject response){\nif (!response.has(Constants.DISCARDED_EVENT_JSON_KEY)) {\n- getConfigLogger().verbose(getAccountId(), \"JSON object doesn't contain the Discarded Events key\");\n+ getConfigLogger().verbose(getAccountId(), \"ARP doesn't contain the Discarded Events key\");\nreturn;\n}\n@@ -8465,6 +8468,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nif (validator != null){\nvalidator.setDiscardedEvents(discardedEventsList);\n+ }else{\n+ getConfigLogger().verbose(getAccountId(),\"Validator object is NULL\");\n}\n} catch (JSONException e) {\ngetConfigLogger().verbose(getAccountId(), \"Error parsing discarded events list\" + e.getLocalizedMessage());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: Clear discarded event list on new session CLEVER-11122 |
116,621 | 23.04.2020 22:22:51 | -19,080 | 3d771da832668ea7e58790495d37d68fa1655bd1 | code-review(Product Config):
1. Added changes as per the review | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8204,10 +8204,12 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n*/\n@Override\npublic void fetchFeatureFlags() {\n+ if(config.isAnalyticsOnly())\n+ return;\nJSONObject event = new JSONObject();\nJSONObject notif = new JSONObject();\ntry {\n- notif.put(\"t\", 1);\n+ notif.put(\"t\", Constants.FETCH_TYPE_FF);\nevent.put(\"evtName\", Constants.WZRK_FETCH);\nevent.put(\"evtData\", notif);\n} catch (JSONException e) {\n@@ -8219,6 +8221,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* @return object of {@link CTFeatureFlagsController}\n+ * handler to get the feature flag values\n*/\npublic CTFeatureFlagsController featureFlag() {\nreturn ctFeatureFlagsController;\n@@ -8245,8 +8248,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void parseFeatureFlags(JSONObject responseKV) throws JSONException {\nJSONArray kvArray = responseKV.getJSONArray(Constants.KEY_KV);\n- if (kvArray != null && featureFlag() != null) {\n- featureFlag().updateFeatureFlags(responseKV);\n+ if (kvArray != null && ctFeatureFlagsController != null) {\n+ ctFeatureFlagsController.updateFeatureFlags(responseKV);\n}\n}\n@@ -8301,13 +8304,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void resetFeatureFlags() {\n- if (!this.config.isAnalyticsOnly()) {\n- getConfigLogger().debug(config.getAccountId(), \"AB Testing is not enabled for this instance\");\n- return;\n- }\n-\nif (ctFeatureFlagsController != null && ctFeatureFlagsController.isInitialized()) {\n- ctFeatureFlagsController.resetWithGuid(getCleverTapID());//TODO @atul check whether needed\n+ ctFeatureFlagsController.resetWithGuid(getCleverTapID());\nctFeatureFlagsController.fetchFeatureFlags();\n}\n}\n@@ -8316,6 +8314,10 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* PRODUCT CONFIG\n*/\n+ /**\n+ * The handle to call fetch/Activate remote values.\n+ * @return\n+ */\n@SuppressWarnings(\"WeakerAccess\")\npublic CTProductConfigController productConfig() {\nif (ctProductConfigController == null)\n@@ -8331,7 +8333,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nJSONObject event = new JSONObject();\nJSONObject notif = new JSONObject();\ntry {\n- notif.put(\"t\", 0);\n+ notif.put(\"t\", Constants.FETCH_TYPE_PC);\nevent.put(\"evtName\", Constants.WZRK_FETCH);\nevent.put(\"evtData\", notif);\n} catch (JSONException e) {\n@@ -8384,7 +8386,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nprivate void resetProductConfigs() {\n- if (!this.config.isAnalyticsOnly()) {\n+ if (this.config.isAnalyticsOnly()) {\ngetConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -228,4 +228,6 @@ public class Constants {\npublic static final String FEATURE_FLAG_UNIT = \"Feature Flag : \";\npublic static final String LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\n+ public static final int FETCH_TYPE_PC = 0;\n+ public static final int FETCH_TYPE_FF = 1;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -148,7 +148,7 @@ public class CTFeatureFlagsController {\n}\n- private Boolean get(String key, boolean defaultValue) {\n+ public Boolean get(String key, boolean defaultValue) {\nif(!isInitialized)\nreturn DEFAULT_VALUE_FOR_BOOLEAN;\ngetConfigLogger().verbose(getAccountId(), \"getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\n@@ -171,6 +171,7 @@ public class CTFeatureFlagsController {\npublic void resetWithGuid(String guid) {\nthis.guid = guid;\n+ init();\n}\npublic boolean isInitialized() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -69,7 +69,6 @@ public class CTProductConfigController {\n}\nHashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\nactivatedConfig.putAll(storedConfig);\n- FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(storedConfig));\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : initialized with configs: \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n@@ -141,7 +140,6 @@ public class CTProductConfigController {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\npublic Void doInBackground(Void aVoid) {\n- defaultConfig.clear();\ndefaultConfig.putAll(DefaultXmlParser.getDefaultsFromXml(context, resourceID));\nreturn null;\n}\n@@ -164,7 +162,6 @@ public class CTProductConfigController {\n@Override\npublic Void doInBackground(Void aVoid) {\nif (map != null && !map.isEmpty()) {\n- defaultConfig.clear();\nfor (Map.Entry<String, Object> entry : map.entrySet()) {\nif (entry != null) {\nString key = entry.getKey();\n@@ -385,7 +382,7 @@ public class CTProductConfigController {\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : parseFetchedResponse failed: \" + e.getLocalizedMessage());\n}\nif (timestamp != null) {\n- settings.setLastFetchTimeStampInMillis(timestamp);\n+ settings.setLastFetchTimeStampInMillis(timestamp * 1000L);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "package com.clevertap.android.sdk.product_config;\n+/**\n+ * public interface for product config callbacks\n+ */\npublic interface CTProductConfigListener {\nvoid onInitSuccess();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -69,7 +69,9 @@ class ProductConfigSettings {\nif (!TextUtils.isEmpty(key)) {\nString value = null;\ntry {\n- value = String.valueOf(jsonObject.get(key));\n+ Object obj = jsonObject.get(key);\n+ if (obj != null)\n+ value = String.valueOf(obj);\n} catch (JSONException e) {\ne.printStackTrace();\n}\n@@ -92,7 +94,7 @@ class ProductConfigSettings {\nlong minInterVal = DEFAULT_MIN_FETCH_INTERVAL_SECONDS;\nString value = settingsMap.get(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS);\ntry {\n- if (value != null)\n+ if (!TextUtils.isEmpty(value))\nminInterVal = (long) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n@@ -105,7 +107,7 @@ class ProductConfigSettings {\nlong lastFetchedTimeStamp = 0L;\nString value = settingsMap.get(KEY_LAST_FETCHED_TIMESTAMP);\ntry {\n- if (value != null)\n+ if (!TextUtils.isEmpty(value))\nlastFetchedTimeStamp = (long) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n@@ -118,7 +120,7 @@ class ProductConfigSettings {\nint noCallsAllowedInWindow = DEFAULT_NO_OF_CALLS;\nString value = settingsMap.get(PRODUCT_CONFIG_NO_OF_CALLS);\ntry {\n- if (value != null)\n+ if (!TextUtils.isEmpty(value))\nnoCallsAllowedInWindow = (int) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n@@ -131,7 +133,7 @@ class ProductConfigSettings {\nint windowIntervalInMinutes = DEFAULT_WINDOW_LENGTH_MINS;\nString value = settingsMap.get(PRODUCT_CONFIG_WINDOW_LENGTH_MINS);\ntry {\n- if (value != null)\n+ if (!TextUtils.isEmpty(value))\nwindowIntervalInMinutes = (int) Double.parseDouble(value);\n} catch (Exception e) {\ne.printStackTrace();\n@@ -210,14 +212,17 @@ class ProductConfigSettings {\nwhile (keys.hasNext()) {\nfinal String key = keys.next();\ntry {\n- final Object o = arp.get(key);\n- if (o instanceof Number) {\n- final int update = ((Number) o).intValue();\n+ if (!TextUtils.isEmpty(key)) {\n+ final Object object = arp.get(key);\n+ if (object instanceof Number) {\n+ final int update = (int) ((Number) object).doubleValue();\nif (CTProductConfigConstants.PRODUCT_CONFIG_NO_OF_CALLS.equalsIgnoreCase(key)\n|| CTProductConfigConstants.PRODUCT_CONFIG_WINDOW_LENGTH_MINS.equalsIgnoreCase(key)) {\nsetProductConfigValuesFromARP(key, update);\n}\n}\n+ }\n+\n} catch (JSONException e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config setARPValue failed \" + e.getLocalizedMessage());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added changes as per the review
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,623 | 23.04.2020 22:41:51 | -19,080 | 5c7eeca1704b95355cece42d274c35222ff6c24a | feat: discard event final changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1929,9 +1929,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void lazyCreateSession(Context context) {\nif (!inCurrentSession()) {\nsetFirstRequestInSession(true);\n- if(validator != null) {\n- validator.setDiscardedEvents(null);\n- }\ncreateSession(context);\npushInitialEventsAsync();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: discard event final changes CLEVER-11122 |
116,623 | 24.04.2020 11:54:02 | -19,080 | 929b479e725666b116bbc7b1d1ea347dedd85c10 | feat: final changes for discarded events | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1929,6 +1929,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate void lazyCreateSession(Context context) {\nif (!inCurrentSession()) {\nsetFirstRequestInSession(true);\n+ if(validator != null){\n+ validator.setDiscardedEvents(null);\n+ }\ncreateSession(context);\npushInitialEventsAsync();\n}\n@@ -3422,7 +3425,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n//Handle Discarded events in ARP\ntry {\n- processDiscardedEventsList(response);\n+ processDiscardedEventsList(arp);\n}catch (Throwable t){\ngetConfigLogger().verbose(\"Error handling discarded events response: \" + t.getLocalizedMessage());\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat: final changes for discarded events CLEVER-11122 |
116,612 | 24.04.2020 15:51:10 | -19,080 | e155990b71c24d768238e9458cad133d5631de46 | fix(Inapp): Silent NPE when receiving test push notification | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1910,7 +1910,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nif (canShow) {\nif (currentlyDisplayingInApp != null) {\nFragment inAppFragment = activity.getFragmentManager().getFragment(new Bundle(), currentlyDisplayingInApp.getType());\n- if (getCurrentActivity() != null) {\n+ if (getCurrentActivity() != null && inAppFragment!=null) {\nFragmentTransaction fragmentTransaction = getCurrentActivity().getFragmentManager().beginTransaction();\nBundle bundle = new Bundle();\nbundle.putParcelable(\"inApp\", currentlyDisplayingInApp);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(Inapp): Silent NPE when receiving test push notification #66 |
116,623 | 25.04.2020 19:43:39 | -19,080 | 62fb42dc6705bc93b95f4504302a95c074c94374 | fix: Move resolve info list code to Utils for app links | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppBaseFragment.java",
"diff": "@@ -124,16 +124,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nif (!queryBundle.isEmpty()) {\nintent.putExtras(queryBundle);\n}\n- List<ResolveInfo> resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent,0);\n- if(resolveInfoList != null){\n- String appPackageName = getActivity().getPackageName();\n- for(ResolveInfo resolveInfo : resolveInfoList){\n- if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n- intent.setPackage(appPackageName);\n- break;\n- }\n- }\n- }\n+ Utils.setPackageNameFromResolveInfoList(getActivity(),intent);\nstartActivity(intent);\n} catch (Throwable t) {\n// Ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxListViewFragment.java",
"diff": "@@ -256,16 +256,7 @@ public class CTInboxListViewFragment extends Fragment {\ntry {\nIntent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url.replace(\"\\n\", \"\").replace(\"\\r\", \"\")));\nif(getActivity() != null) {\n- List<ResolveInfo> resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent, 0);\n- if (resolveInfoList != null) {\n- String appPackageName = getActivity().getPackageName();\n- for (ResolveInfo resolveInfo : resolveInfoList) {\n- if (appPackageName.equals(resolveInfo.activityInfo.packageName)) {\n- intent.setPackage(appPackageName);\n- break;\n- }\n- }\n- }\n+ Utils.setPackageNameFromResolveInfoList(getActivity(),intent);\n}\nstartActivity(intent);\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTNotificationIntentService.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTNotificationIntentService.java",
"diff": "@@ -4,12 +4,9 @@ import android.app.IntentService;\nimport android.app.NotificationManager;\nimport android.content.Context;\nimport android.content.Intent;\n-import android.content.pm.ResolveInfo;\nimport android.net.Uri;\nimport android.os.Bundle;\n-import java.util.List;\n-\npublic class CTNotificationIntentService extends IntentService {\npublic final static String MAIN_ACTION = \"com.clevertap.PUSH_EVENT\";\n@@ -43,16 +40,7 @@ public class CTNotificationIntentService extends IntentService {\nIntent launchIntent;\nif (dl != null) {\nlaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(dl));\n- List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launchIntent,0);\n- if(resolveInfoList != null){\n- String appPackageName = context.getPackageName();\n- for(ResolveInfo resolveInfo : resolveInfoList){\n- if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n- launchIntent.setPackage(appPackageName);\n- break;\n- }\n- }\n- }\n+ Utils.setPackageNameFromResolveInfoList(context,launchIntent);\n} else {\nlaunchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushNotificationReceiver.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushNotificationReceiver.java",
"diff": "@@ -3,12 +3,9 @@ package com.clevertap.android.sdk;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\n-import android.content.pm.ResolveInfo;\nimport android.net.Uri;\nimport android.os.Bundle;\n-import java.util.List;\n-\npublic class CTPushNotificationReceiver extends BroadcastReceiver {\n@@ -25,16 +22,7 @@ public class CTPushNotificationReceiver extends BroadcastReceiver {\nif (extras.containsKey(Constants.DEEP_LINK_KEY)){\nlaunchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(intent.getStringExtra(Constants.DEEP_LINK_KEY)));\n- List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launchIntent,0);\n- if(resolveInfoList != null){\n- String appPackageName = context.getPackageName();\n- for(ResolveInfo resolveInfo : resolveInfoList){\n- if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n- launchIntent.setPackage(appPackageName);\n- break;\n- }\n- }\n- }\n+ Utils.setPackageNameFromResolveInfoList(context,launchIntent);\n} else {\nlaunchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());\nif (launchIntent == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2551,8 +2551,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nevent.put(\"ep\", System.currentTimeMillis() / 1000);\nevent.put(\"f\", isFirstSession());\nevent.put(\"lsl\", getLastSessionLength());\n- //event.put(\"frs\", firstRequestInSession);\n- //firstRequestInSession = false;\nattachPackageNameIfRequired(context, event);\n// Report any pending validation error\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -2,6 +2,8 @@ package com.clevertap.android.sdk;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\n+import android.content.Intent;\n+import android.content.pm.ResolveInfo;\nimport android.graphics.Bitmap;\nimport android.graphics.BitmapFactory;\nimport android.graphics.Canvas;\n@@ -26,6 +28,7 @@ import java.net.URL;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.Iterator;\n+import java.util.List;\nimport javax.net.ssl.HttpsURLConnection;\n@@ -302,4 +305,17 @@ public final class Utils {\nreturn bundle;\n}\n+ static void setPackageNameFromResolveInfoList(Context context, Intent launchIntent){\n+ List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launchIntent,0);\n+ if(resolveInfoList != null){\n+ String appPackageName = context.getPackageName();\n+ for(ResolveInfo resolveInfo : resolveInfoList){\n+ if(appPackageName.equals(resolveInfo.activityInfo.packageName)){\n+ launchIntent.setPackage(appPackageName);\n+ break;\n+ }\n+ }\n+ }\n+ }\n+\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix: Move resolve info list code to Utils for app links CLEVER-10971 |
116,621 | 25.04.2020 22:42:46 | -19,080 | b950b3000e4de06043857b5431fba15a68e191da | code-review(Product Config):
1. Added FF callback on UI thread
2. Removed the unnecessary init callbacks
3. Added log for throttling | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8417,7 +8417,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n* @param listener The {@link CTProductConfigListener} object\n*/\n@SuppressWarnings(\"unused\")\n- public void setProductConfigListener(CTProductConfigListener listener) {\n+ public void setCTProductConfigListener(CTProductConfigListener listener) {\nif (listener != null)\nthis.productConfigListener = new WeakReference<>(listener);\n}\n@@ -8438,16 +8438,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n@Override\n- public void onInitFailed() {\n+ public void onInit() {\nif (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onInitFailed();\n- }\n- }\n-\n- @Override\n- public void onInitSuccess() {\n- if (productConfigListener != null && productConfigListener.get() != null) {\n- productConfigListener.get().onInitSuccess();\n+ productConfigListener.get().onInit();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -8,6 +8,7 @@ import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.FileUtils;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.TaskManager;\n+import com.clevertap.android.sdk.Utils;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -23,11 +24,11 @@ import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.\npublic class CTFeatureFlagsController {\nprivate String guid;\n- private CleverTapInstanceConfig config;\n+ private final CleverTapInstanceConfig config;\nprivate HashMap<String, Boolean> store;\nprivate boolean isInitialized = false;\nprivate WeakReference<FeatureFlagListener> listenerWeakReference;\n- private Context mContext;\n+ private final Context mContext;\npublic CTFeatureFlagsController(Context context, String guid, CleverTapInstanceConfig config, FeatureFlagListener listener) {\nthis.guid = guid;\n@@ -73,8 +74,13 @@ public class CTFeatureFlagsController {\ngetConfigLogger().verbose(getAccountId(), \"Error parsing Feature Flag array \" + e.getLocalizedMessage());\n}\narchiveData(jsonObject);\n+ Utils.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\nnotifyFeatureFlagUpdate();\n}\n+ });\n+ }\nprivate void notifyFeatureFlagUpdate() {\nFeatureFlagListener listener = getListener();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -13,6 +13,7 @@ import org.json.JSONArray;\nimport org.json.JSONException;\nimport org.json.JSONObject;\n+import java.util.Date;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.Map;\n@@ -29,11 +30,6 @@ import static com.clevertap.android.sdk.product_config.CTProductConfigConstants.\npublic class CTProductConfigController {\nprivate String guid;\n-\n- public boolean isInitialized() {\n- return isInitialized;\n- }\n-\nprivate boolean isInitialized = false;\nprivate final CleverTapInstanceConfig config;\nprivate final Context context;\n@@ -44,7 +40,6 @@ public class CTProductConfigController {\nprivate boolean isFetchAndActivating = false;\nprivate final ProductConfigSettings settings;\n-\npublic CTProductConfigController(Context context, String guid, CleverTapInstanceConfig config, CTProductConfigControllerListener listener) {\nthis.context = context;\nthis.guid = guid;\n@@ -54,6 +49,10 @@ public class CTProductConfigController {\ninitAsync();\n}\n+ public boolean isInitialized() {\n+ return isInitialized;\n+ }\n+\nprivate void initAsync() {\nif (TextUtils.isEmpty(guid))\nreturn;\n@@ -83,11 +82,7 @@ public class CTProductConfigController {\n@Override\npublic void onPostExecute(Boolean isInitSuccess) {\n- if (isInitSuccess) {\n- sendCallback(PROCESSING_STATE.INIT_SUCCESS);\n- } else {\n- sendCallback(PROCESSING_STATE.INIT_FAILED);\n- }\n+ sendCallback(PROCESSING_STATE.INIT);\n}\n});\n}\n@@ -199,8 +194,6 @@ public class CTProductConfigController {\npublic void fetch(long minimumFetchIntervalInSeconds) {\nif (canRequest(minimumFetchIntervalInSeconds)) {\nlistener.fetchProductConfig();\n- } else {\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Throttled\");\n}\n}\n@@ -209,6 +202,8 @@ public class CTProductConfigController {\n*/\n@SuppressWarnings(\"WeakerAccess\")\npublic void activate() {\n+ if (TextUtils.isEmpty(guid))\n+ return;\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@Override\npublic Void doInBackground(Void params) {\n@@ -331,8 +326,18 @@ public class CTProductConfigController {\n}\nprivate boolean canRequest(long minimumFetchIntervalInSeconds) {\n- return !TextUtils.isEmpty(guid)\n- && ((System.currentTimeMillis() - settings.getLastFetchTimeStampInMillis()) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds));\n+ boolean validGuid = !TextUtils.isEmpty(guid);\n+ if (!validGuid) {\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Throttled due to empty Guid\");\n+ }\n+ long lastRequestTime = settings.getLastFetchTimeStampInMillis();\n+\n+ boolean isTimeExpired = (System.currentTimeMillis() - lastRequestTime) > TimeUnit.SECONDS.toMillis(minimumFetchIntervalInSeconds);\n+ if (!isTimeExpired) {\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Throttled since you made frequent request- [Last Request Time-\" + new Date(lastRequestTime) + \"], Try again in \" + TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - lastRequestTime - minimumFetchIntervalInSeconds * 1000L));\n+ }\n+ return validGuid\n+ && isTimeExpired;\n}\npublic void onFetchFailed() {\n@@ -341,6 +346,8 @@ public class CTProductConfigController {\n}\npublic void onFetchSuccess(JSONObject kvResponse) {\n+ if (TextUtils.isEmpty(guid))\n+ return;\nsynchronized (this) {\nif (kvResponse != null) {\ntry {\n@@ -463,11 +470,8 @@ public class CTProductConfigController {\nprivate void sendCallback(PROCESSING_STATE state) {\nif (state != null) {\nswitch (state) {\n- case INIT_SUCCESS:\n- listener.onInitSuccess();\n- break;\n- case INIT_FAILED:\n- listener.onInitFailed();\n+ case INIT:\n+ listener.onInit();\nbreak;\ncase FETCHED:\nlistener.onFetched();\n@@ -489,8 +493,7 @@ public class CTProductConfigController {\n}\nprivate enum PROCESSING_STATE {\n- INIT_SUCCESS,\n- INIT_FAILED,\n+ INIT,\nFETCHED,\nACTIVATED\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "@@ -4,9 +4,7 @@ package com.clevertap.android.sdk.product_config;\n* public interface for product config callbacks\n*/\npublic interface CTProductConfigListener {\n- void onInitSuccess();\n-\n- void onInitFailed();\n+ void onInit();\nvoid onFetched();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added FF callback on UI thread
2. Removed the unnecessary init callbacks
3. Added log for throttling
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 26.04.2020 20:19:48 | -19,080 | 948c686b513210a6e3aa1e48c1090d671b1b8a2c | code-review(Product Config):
1. Added fix to handle empty fetch config to override activate | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -209,20 +209,23 @@ public class CTProductConfigController {\npublic Void doInBackground(Void params) {\nsynchronized (this) {\ntry {\n- activatedConfig.clear();\n- //apply default config first\n- if (defaultConfig != null && !defaultConfig.isEmpty()) {\n- activatedConfig.putAll(defaultConfig);\n- }\n//read fetched info\nHashMap<String, String> toWriteValues = new HashMap<>();\nif (!fetchedConfig.isEmpty()) {\ntoWriteValues.putAll(fetchedConfig);\n- activatedConfig.putAll(fetchedConfig);\n} else {\ntoWriteValues = getStoredValues(getFetchedFullPath());\n- activatedConfig.putAll(toWriteValues);\n}\n+ //return if we don't have any fetched values\n+ if (toWriteValues.isEmpty())\n+ return null;\n+\n+ activatedConfig.clear();\n+ //apply default config first\n+ if (defaultConfig != null && !defaultConfig.isEmpty()) {\n+ activatedConfig.putAll(defaultConfig);\n+ }\n+ activatedConfig.putAll(toWriteValues);\nFileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(toWriteValues));\nFileUtils.deleteFile(context, config, getFetchedFullPath());\n} catch (Exception e) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code-review(Product Config):
1. Added fix to handle empty fetch config to override activate
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 27.04.2020 10:26:13 | -19,080 | 48b1a08a16cb40f2858f5f8146f91415b32f1f88 | fix(NPE-inapp)(Product Config):
1. fixed NPE coming on inapp init for samsung devices | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/InAppFCManager.java",
"diff": "@@ -83,6 +83,7 @@ class InAppFCManager {\n}\nprivate void init(String deviceId){\n+ try {\nmigrateToNewPrefsKey(deviceId);\nfinal String today = ddMMyyyy.format(new Date());\nfinal String lastUpdated = getStringFromPrefs(getKeyWithDeviceId(\"ict_date\", deviceId), \"20140428\");\n@@ -119,6 +120,9 @@ class InAppFCManager {\nStorageHelper.persist(editor);\n}\n+ } catch (Exception e) {\n+ getConfigLogger().verbose(getConfigAccountId(), \"Failed to init inapp manager \" + e.getLocalizedMessage());\n+ }\n}\nboolean canShow(CTInAppNotification inapp) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(NPE-inapp)(Product Config):
1. fixed NPE coming on inapp init for samsung devices
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 27.04.2020 14:40:57 | -19,080 | 61b9ce87ab5a6abb1f72a4b95e4c2eb71c84a327 | feat(product-config)(Product Config):
1. Removed auto activation logic on init. Now developer will get an init callback on which the developer will have to call activate to activate the values. Provides more control to the developer. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -5,7 +5,6 @@ import java.util.concurrent.TimeUnit;\npublic interface CTProductConfigConstants {\nString TAG_PRODUCT_CONFIG = \"[Product Config]:\";\nString DIR_PRODUCT_CONFIG = \"Product_Config\";\n- String FILE_NAME_FETCHED = \"fetched.json\";\nString FILE_NAME_ACTIVATED = \"activated.json\";\nString FILE_NAME_CONFIG_SETTINGS = \"config_settings.json\";\nString PRODUCT_CONFIG_JSON_KEY_FOR_KEY = \"n\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -35,7 +35,7 @@ public class CTProductConfigController {\nprivate final Context context;\nprivate HashMap<String, String> defaultConfig = new HashMap<>();\nprivate final HashMap<String, String> activatedConfig = new HashMap<>();\n- private final HashMap<String, String> fetchedConfig = new HashMap<>();\n+ private final HashMap<String, String> waitingTobeActivatedConfig = new HashMap<>();\nprivate final CTProductConfigControllerListener listener;\nprivate boolean isFetchAndActivating = false;\nprivate final ProductConfigSettings settings;\n@@ -61,13 +61,10 @@ public class CTProductConfigController {\npublic Boolean doInBackground(Void params) {\nsynchronized (this) {\ntry {\n- activatedConfig.clear();\n- //apply default config first\n- if (!defaultConfig.isEmpty()) {\n- activatedConfig.putAll(defaultConfig);\n- }\nHashMap<String, String> storedConfig = getStoredValues(getActivatedFullPath());\n- activatedConfig.putAll(storedConfig);\n+ if(!storedConfig.isEmpty()){\n+ waitingTobeActivatedConfig.putAll(storedConfig);\n+ }\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : initialized with configs: \" + activatedConfig);\nsettings.loadSettings();\nisInitialized = true;\n@@ -211,10 +208,10 @@ public class CTProductConfigController {\ntry {\n//read fetched info\nHashMap<String, String> toWriteValues = new HashMap<>();\n- if (!fetchedConfig.isEmpty()) {\n- toWriteValues.putAll(fetchedConfig);\n+ if (!waitingTobeActivatedConfig.isEmpty()) {\n+ toWriteValues.putAll(waitingTobeActivatedConfig);\n} else {\n- toWriteValues = getStoredValues(getFetchedFullPath());\n+ toWriteValues = getStoredValues(getActivatedFullPath());\n}\n//return if we don't have any fetched values\nif (toWriteValues.isEmpty())\n@@ -226,8 +223,6 @@ public class CTProductConfigController {\nactivatedConfig.putAll(defaultConfig);\n}\nactivatedConfig.putAll(toWriteValues);\n- FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(toWriteValues));\n- FileUtils.deleteFile(context, config, getFetchedFullPath());\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : activate failed: \" + e.getLocalizedMessage());\n@@ -355,8 +350,8 @@ public class CTProductConfigController {\nif (kvResponse != null) {\ntry {\nparseFetchedResponse(kvResponse);\n- FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_FETCHED, new JSONObject(fetchedConfig));\n- config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : fetch file write success: from init \" + fetchedConfig);\n+ FileUtils.writeJsonToFile(context, config, getProductConfigDirName(), CTProductConfigConstants.FILE_NAME_ACTIVATED, new JSONObject(waitingTobeActivatedConfig));\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : fetch file write success: from init \" + waitingTobeActivatedConfig);\nUtils.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n@@ -381,8 +376,8 @@ public class CTProductConfigController {\nprivate void parseFetchedResponse(JSONObject jsonObject) {\nHashMap<String, String> map = convertServerJsonToMap(jsonObject);\n- fetchedConfig.clear();\n- fetchedConfig.putAll(map);\n+ waitingTobeActivatedConfig.clear();\n+ waitingTobeActivatedConfig.putAll(map);\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config: Fetched response:\" + jsonObject);\nInteger timestamp = null;\ntry {\n@@ -438,10 +433,6 @@ public class CTProductConfigController {\nreturn CTProductConfigConstants.DIR_PRODUCT_CONFIG + \"_\" + config.getAccountId() + \"_\" + guid;\n}\n- private String getFetchedFullPath() {\n- return getProductConfigDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_FETCHED;\n- }\n-\nprivate String getActivatedFullPath() {\nreturn getProductConfigDirName() + \"/\" + CTProductConfigConstants.FILE_NAME_ACTIVATED;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(product-config)(Product Config):
1. Removed auto activation logic on init. Now developer will get an init callback on which the developer will have to call activate to activate the values. Provides more control to the developer.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 27.04.2020 15:03:28 | -19,080 | df9d69e33324c5a0df51ecd69c685fbd2f56fa08 | feat(product-config)(Product Config):
1. Exposed the last fetched timestamp API | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -475,7 +475,14 @@ public class CTProductConfigController {\nbreak;\n}\n}\n+ }\n+ /**\n+ * Returns the last fetched timestamp in millis.\n+ * @return\n+ */\n+ public long getLastFetchTimeStampInMillis() {\n+ return settings.getLastFetchTimeStampInMillis();\n}\n/**\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(product-config)(Product Config):
1. Exposed the last fetched timestamp API
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 28.04.2020 11:13:27 | -19,080 | 0e3718eccb4597f26b0055c0039661696501cc61 | fix(product-config)(Product Config):
1. Don't save setMinInterval into files. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -178,7 +178,10 @@ class ProductConfigSettings {\n@Override\npublic Boolean doInBackground(Void aVoid) {\ntry {\n- FileUtils.writeJsonToFile(context, config, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(settingsMap));\n+ //Ensure that we are not saving min interval in seconds\n+ HashMap<String, String> toWriteMap = new HashMap<>(settingsMap);\n+ toWriteMap.remove(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS);\n+ FileUtils.writeJsonToFile(context, config, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(toWriteMap));\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : updateConfigToFile failed: \" + e.getLocalizedMessage());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(product-config)(Product Config):
1. Don't save setMinInterval into files.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 29.04.2020 19:07:59 | -19,080 | 07e354f1016523c1ac6cbc9da7dcf088c3c4d07b | chores(product-config)(Product Config):
1. Code Cleanups | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -148,6 +148,7 @@ public class CTProductConfigController {\nHashMap<String, String> toWriteValues = new HashMap<>();\nif (!waitingTobeActivatedConfig.isEmpty()) {\ntoWriteValues.putAll(waitingTobeActivatedConfig);\n+ waitingTobeActivatedConfig.clear();\n} else {\ntoWriteValues = getStoredValues(getActivatedFullPath());\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chores(product-config)(Product Config):
1. Code Cleanups
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 30.04.2020 12:00:00 | -19,080 | 48cec1f2d25f9d44d299f052af5670b2b4c658b4 | chores(product-config)(Product Config):
1. added some logs for FF | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -48,15 +48,15 @@ public class CTFeatureFlagsController {\npublic Boolean get(String key, boolean defaultValue) {\nif (!isInitialized) {\n- getConfigLogger().verbose(getAccountId(), \"Controller not initialized, returning default value - \" + defaultValue);\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : Controller not initialized, returning default value - \" + defaultValue);\nreturn defaultValue;\n}\n- getConfigLogger().verbose(getAccountId(), \"getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : getting feature flag with key - \" + key + \" and default value - \" + defaultValue);\nBoolean value = store.get(key);\nif (value != null) {\nreturn store.get(key);\n} else {\n- getConfigLogger().verbose(getAccountId(), \"feature flag not found, returning default value - \" + defaultValue);\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : feature flag not found, returning default value - \" + defaultValue);\nreturn defaultValue;\n}\n}\n@@ -79,15 +79,16 @@ public class CTFeatureFlagsController {\n* Developers should not use this method\n*/\npublic void updateFeatureFlags(JSONObject jsonObject) throws JSONException {\n- getConfigLogger().verbose(getAccountId(), \"Updating feature flags...\");\n+\nJSONArray featureFlagList = jsonObject.getJSONArray(Constants.KEY_KV);\ntry {\nfor (int i = 0; i < featureFlagList.length(); i++) {\nJSONObject ff = featureFlagList.getJSONObject(i);\nstore.put(ff.getString(\"n\"), ff.getBoolean(\"v\"));\n}\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : Updating feature flags...\");\n} catch (JSONException e) {\n- getConfigLogger().verbose(getAccountId(), \"Error parsing Feature Flag array \" + e.getLocalizedMessage());\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : Error parsing Feature Flag array \" + e.getLocalizedMessage());\n}\narchiveData(jsonObject);\nnotifyFeatureFlagUpdate();\n@@ -124,9 +125,10 @@ public class CTFeatureFlagsController {\nif (featureFlagRespObj != null) {\ntry {\nFileUtils.writeJsonToFile(mContext, config, getCachedDirName(), getCachedFileName(), featureFlagRespObj);\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : feature flags saved into file \" + store);\n} catch (Exception e) {\ne.printStackTrace();\n- getConfigLogger().verbose(getAccountId(), \"archiveData failed - \" + e.getLocalizedMessage());\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : archiveData failed - \" + e.getLocalizedMessage());\n}\n}\n}\n@@ -159,11 +161,12 @@ public class CTFeatureFlagsController {\n}\n}\n}\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : feature flags initialized with configs \" + store);\nisInitialized = true;\n}\n} catch (Exception e) {\ne.printStackTrace();\n- getConfigLogger().verbose(getAccountId(), \"unArchiveData failed - \" + e.getLocalizedMessage());\n+ getConfigLogger().verbose(getAccountId(), \"Feature Flag : unArchiveData failed - \" + e.getLocalizedMessage());\nreturn false;\n}\nreturn true;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chores(product-config)(Product Config):
1. added some logs for FF
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 30.04.2020 13:17:58 | -19,080 | 0aae3a8e155c1666a7a03939a42bd34e2025ea23 | chores(product-config)(Product Config):
1. added javadoc | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTFeatureFlagsListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTFeatureFlagsListener.java",
"diff": "package com.clevertap.android.sdk;\n+/**\n+ * Interface definition for a callback to be invoked when Feature Flag gets updated.\n+ */\npublic interface CTFeatureFlagsListener {\n+ /**\n+ * Receives a callback whenever feature flags get updated {@link com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController} object\n+ */\nvoid featureFlagsUpdated();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushListener.java",
"diff": "@@ -2,6 +2,12 @@ package com.clevertap.android.sdk;\nimport android.os.Bundle;\n+/**\n+ * Interface definition for a callback to be invoked whenever push amp payload is received.\n+ */\npublic interface CTPushListener {\n+ /**\n+ * Receives a callback whenever push amp payload is received.\n+ */\nvoid onPushPayloadReceived(Bundle extras);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8200,14 +8200,15 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* @return object of {@link CTFeatureFlagsController}\n- * handler to get the feature flag values\n+ * Handler to get the feature flag values\n*/\npublic CTFeatureFlagsController featureFlag() {\nreturn ctFeatureFlagsController;\n}\n/**\n- * This method is used to set the CTFeatureFlagsListener to get\n+ * This method is used to set the CTFeatureFlagsListener\n+ * Register to receive feature flag callbacks\n*\n* @param featureFlagsListener The {@link CTFeatureFlagsListener} object\n*/\n@@ -8237,8 +8238,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n/**\n- * This method is internal to the clevertap SDK.\n- * Developer should not use this method to raise fetch event for Feature Flags manually\n+ * This method is internal to the CleverTap SDK.\n+ * Developers should not use this method manually\n*/\n@Override\npublic void fetchFeatureFlags() {\n@@ -8323,7 +8324,8 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n/**\n- * This method is used to set the product config listener to receive callbacks\n+ * This method is used to set the product config listener\n+ * Register to receive callbacks\n*\n* @param listener The {@link CTProductConfigListener} instance\n*/\n@@ -8336,7 +8338,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n// ******** PRODUCT CONFIG Internal API *****//\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\n@Override\npublic void fetchProductConfig() {\n@@ -8424,7 +8426,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\n@Override\npublic void onActivated() {\n@@ -8446,7 +8448,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\n@Override\npublic void onInit() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/featureFlags/CTFeatureFlagsController.java",
"diff": "@@ -42,10 +42,20 @@ public class CTFeatureFlagsController {\n// ******** Public API *****//\n// -----------------------------------------------------------------------//\n+ /**\n+ * Method to check Feature Flag has been initialized\n+ * @return boolean- true if initialized, else false.\n+ */\npublic boolean isInitialized() {\nreturn isInitialized;\n}\n+ /**\n+ * Getter to return the feature flag configured at the dashboard\n+ * @param key - Key of the Feature flag\n+ * @param defaultValue - default value of the Key, in case we don't find any Feature Flag with the Key.\n+ * @return boolean- Value of the Feature flag.\n+ */\npublic Boolean get(String key, boolean defaultValue) {\nif (!isInitialized) {\ngetConfigLogger().verbose(getAccountId(), \"Feature Flag : Controller not initialized, returning default value - \" + defaultValue);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigConstants.java",
"diff": "@@ -10,6 +10,7 @@ public interface CTProductConfigConstants {\nString PRODUCT_CONFIG_JSON_KEY_FOR_KEY = \"n\";\nString PRODUCT_CONFIG_JSON_KEY_FOR_VALUE = \"v\";\nString KEY_LAST_FETCHED_TIMESTAMP = \"ts\";\n+\nint DEFAULT_NO_OF_CALLS = 5;\nint DEFAULT_WINDOW_LENGTH_MINS = 60;\n@@ -20,6 +21,7 @@ public interface CTProductConfigConstants {\nBoolean DEFAULT_VALUE_FOR_BOOLEAN = false;\nLong DEFAULT_VALUE_FOR_LONG = 0L;\nDouble DEFAULT_VALUE_FOR_DOUBLE = 0.0;\n+\n//arp\nString PRODUCT_CONFIG_NO_OF_CALLS = \"rc_n\";\nString PRODUCT_CONFIG_WINDOW_LENGTH_MINS = \"rc_w\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -59,7 +59,6 @@ public class CTProductConfigController {\n/**\n* Sets default configs using an XML resource.\n- *\n* @param resourceID - resource Id of the XML.\n*/\npublic void setDefaults(final int resourceID) {\n@@ -79,9 +78,8 @@ public class CTProductConfigController {\n}\n/**\n- * Sets default configs using the given Map.\n- *\n- * @param map\n+ * Sets default configs using the given HashMap.\n+ * @param map - HashMap of the default configs\n*/\npublic void setDefaults(final HashMap<String, Object> map) {\nTaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n@@ -187,24 +185,19 @@ public class CTProductConfigController {\nisFetchAndActivating = true;\n}\n-\n- public void fetchAndActivate(int interval) {\n- fetch(interval);\n- isFetchAndActivating = true;\n- }\n-\n@SuppressWarnings(\"WeakerAccess\")\n/**\n* Sets the minimum interval between successive fetch calls.\n+ * @param fetchIntervalInSeconds- interval in seconds.\n*/\n+\npublic void setMinimumFetchIntervalInSeconds(long fetchIntervalInSeconds) {\nsettings.setMinimumFetchIntervalInSeconds(fetchIntervalInSeconds);\n}\n/**\n* Returns the last fetched timestamp in millis.\n- *\n- * @return\n+ * @return - long value of timestamp in millis.\n*/\npublic long getLastFetchTimeStampInMillis() {\nreturn settings.getLastFetchTimeStampInMillis();\n@@ -212,9 +205,8 @@ public class CTProductConfigController {\n/**\n* Returns the parameter value for the given key as a String.\n- *\n* @param Key - String\n- * @return String\n+ * @return String - value of the product config,if key is not present return {@link CTProductConfigConstants#DEFAULT_VALUE_FOR_STRING}\n*/\npublic String getString(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\n@@ -230,7 +222,7 @@ public class CTProductConfigController {\n* Returns the parameter value for the given key as a boolean.\n*\n* @param Key - String\n- * @return String\n+ * @return Boolean - value of the product config,if key is not present return {@link CTProductConfigConstants#DEFAULT_VALUE_FOR_BOOLEAN}\n*/\npublic Boolean getBoolean(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\n@@ -246,7 +238,7 @@ public class CTProductConfigController {\n* Returns the parameter value for the given key as a long.\n*\n* @param Key - String\n- * @return String\n+ * @return Long - value of the product config,if key is not present return {@link CTProductConfigConstants#DEFAULT_VALUE_FOR_LONG}\n*/\npublic Long getLong(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\n@@ -267,7 +259,7 @@ public class CTProductConfigController {\n* Returns the parameter value for the given key as a double.\n*\n* @param Key String\n- * @return String\n+ * @return Double - value of the product config,if key is not present return {@link CTProductConfigConstants#DEFAULT_VALUE_FOR_DOUBLE}\n*/\npublic Double getDouble(String Key) {\nif (isInitialized && !TextUtils.isEmpty(Key)) {\n@@ -285,7 +277,7 @@ public class CTProductConfigController {\n}\n/**\n- * Deletes all activated, fetched and defaults configs and resets all Product Config settings.\n+ * Deletes all activated, fetched and defaults configs as well as all Product Config settings.\n*/\npublic void reset() {\nsynchronized (this) {\n@@ -406,7 +398,7 @@ public class CTProductConfigController {\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\npublic void onFetchFailed() {\nisFetchAndActivating = false;\n@@ -415,7 +407,7 @@ public class CTProductConfigController {\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\npublic void onFetchSuccess(JSONObject kvResponse) {\nif (TextUtils.isEmpty(guid))\n@@ -497,7 +489,7 @@ public class CTProductConfigController {\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\npublic void setGuidAndInit(String cleverTapID) {\nif (TextUtils.isEmpty(guid))\n@@ -516,7 +508,7 @@ public class CTProductConfigController {\n/**\n* This method is internal to CleverTap SDK.\n- * Developer should not use this method manually.\n+ * Developers should not use this method manually.\n*/\npublic void setArpValue(JSONObject arp) {\nsettings.setARPValue(arp);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigControllerListener.java",
"diff": "package com.clevertap.android.sdk.product_config;\n+/**\n+ * This interface is internal to CleverTap SDK\n+ * Developers should not use this.\n+ */\npublic interface CTProductConfigControllerListener extends CTProductConfigListener {\nvoid fetchProductConfig();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigListener.java",
"diff": "package com.clevertap.android.sdk.product_config;\n/**\n- * public interface for product config callbacks\n+ * Interface definition for a callback to be invoked when Product Config APIs are invoked\n*/\npublic interface CTProductConfigListener {\n+ /**\n+ * Receives a callback whenever Product Config initialises.\n+ */\nvoid onInit();\n+ /**\n+ * Receives a callback whenever Product Config is fetched.\n+ */\nvoid onFetched();\n+ /**\n+ * Receives a callback whenever Product Config gets activated.\n+ */\nvoid onActivated();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -44,11 +44,11 @@ class ProductConfigSettings {\n}\n/**\n- * loads settings by reading from file.\n+ * loads settings from file.\n* It's a sync call, please make sure to call this from a background thread\n*/\nsynchronized void loadSettings() {\n- String content = null;\n+ String content;\ntry {\ncontent = FileUtils.readFromFile(context, config, getFullPath());\n} catch (Exception e) {\n@@ -184,6 +184,7 @@ class ProductConfigSettings {\n//Ensure that we are not saving min interval in seconds\nHashMap<String, String> toWriteMap = new HashMap<>(settingsMap);\ntoWriteMap.remove(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS);\n+\nFileUtils.writeJsonToFile(context, config, getDirName(), CTProductConfigConstants.FILE_NAME_CONFIG_SETTINGS, new JSONObject(toWriteMap));\n} catch (Exception e) {\ne.printStackTrace();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chores(product-config)(Product Config):
1. added javadoc
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 05.05.2020 12:04:13 | -19,080 | cabf965c53500f55eb5e7a015469dc518b7d4180 | fix(product-config)(Product Config):
1. clearing setting in case of a new user gets identified in onUserLogin.
2. Added support for blank response to clear up the activated json
3. some more boundary checks. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8402,7 +8402,9 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\ngetConfigLogger().debug(config.getAccountId(), \"Product Config is not enabled for this instance\");\nreturn;\n}\n-\n+ if(ctProductConfigController!= null){\n+ ctProductConfigController.resetSettings();\n+ }\nctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Product Config reset\");\nctProductConfigController.fetch();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -150,9 +150,6 @@ public class CTProductConfigController {\n} else {\ntoWriteValues = getStoredValues(getActivatedFullPath());\n}\n- //return if we don't have any values to be activated\n- if (toWriteValues.isEmpty())\n- return null;\nactivatedConfig.clear();\n//apply default config first\n@@ -530,6 +527,10 @@ public class CTProductConfigController {\n}\n}\n+ public void resetSettings() {\n+ settings.reset();\n+ }\n+\nprivate enum PROCESSING_STATE {\nINIT,\nFETCHED,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -147,14 +147,14 @@ class ProductConfigSettings {\nsynchronized void setMinimumFetchIntervalInSeconds(long intervalInSeconds) {\nlong minFetchIntervalInSeconds = getMinFetchIntervalInSeconds();\n- if (minFetchIntervalInSeconds != intervalInSeconds) {\n+ if (intervalInSeconds > 0 && minFetchIntervalInSeconds != intervalInSeconds) {\nsettingsMap.put(PRODUCT_CONFIG_MIN_INTERVAL_IN_SECONDS, String.valueOf(intervalInSeconds));\n}\n}\nsynchronized void setLastFetchTimeStampInMillis(long timeStampInMillis) {\nlong lastFetchTimeStampInMillis = getLastFetchTimeStampInMillis();\n- if (lastFetchTimeStampInMillis != timeStampInMillis) {\n+ if (timeStampInMillis > 0 && lastFetchTimeStampInMillis != timeStampInMillis) {\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(timeStampInMillis));\nupdateConfigToFile();\n}\n@@ -162,7 +162,7 @@ class ProductConfigSettings {\nprivate synchronized void setNoOfCallsInAllowedWindow(int callsInAllowedWindow) {\nlong noOfCallsInAllowedWindow = getNoOfCallsInAllowedWindow();\n- if (noOfCallsInAllowedWindow != callsInAllowedWindow) {\n+ if (callsInAllowedWindow > 0 && noOfCallsInAllowedWindow != callsInAllowedWindow) {\nsettingsMap.put(PRODUCT_CONFIG_NO_OF_CALLS, String.valueOf(callsInAllowedWindow));\nupdateConfigToFile();\n}\n@@ -170,7 +170,7 @@ class ProductConfigSettings {\nprivate synchronized void setWindowIntervalInMinutes(int intervalInMinutes) {\nint windowIntervalInMinutes = getWindowIntervalInMinutes();\n- if (windowIntervalInMinutes != intervalInMinutes) {\n+ if (intervalInMinutes > 0 && windowIntervalInMinutes != intervalInMinutes) {\nsettingsMap.put(PRODUCT_CONFIG_WINDOW_LENGTH_MINS, String.valueOf(intervalInMinutes));\nupdateConfigToFile();\n}\n@@ -248,4 +248,16 @@ class ProductConfigSettings {\nbreak;\n}\n}\n+\n+ public void reset() {\n+ try {\n+ String fileName = getFullPath();\n+ FileUtils.deleteFile(context, config, fileName);\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Deleted settings file\" + fileName);\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ config.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error while resetting settings\" + e.getLocalizedMessage());\n+ }\n+ initMapWithDefault();\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(product-config)(Product Config):
1. clearing setting in case of a new user gets identified in onUserLogin.
2. Added support for blank response to clear up the activated json
3. some more boundary checks.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 05.05.2020 12:35:16 | -19,080 | 0fe3420813a97ae98b6ff11ec83b95d03bd6e2af | code review(product-config)(Product Config):
1. Offloaded the deletion logic on the background thread. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -8407,7 +8407,6 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\nctProductConfigController = new CTProductConfigController(context, getCleverTapID(), config, this);\ngetConfigLogger().verbose(config.getAccountId(), \"Product Config reset\");\n- ctProductConfigController.fetch();\n}\nprivate void initProductConfig(boolean fromPlayServices) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/CTProductConfigController.java",
"diff": "@@ -59,6 +59,7 @@ public class CTProductConfigController {\n/**\n* Sets default configs using an XML resource.\n+ *\n* @param resourceID - resource Id of the XML.\n*/\npublic void setDefaults(final int resourceID) {\n@@ -79,6 +80,7 @@ public class CTProductConfigController {\n/**\n* Sets default configs using the given HashMap.\n+ *\n* @param map - HashMap of the default configs\n*/\npublic void setDefaults(final HashMap<String, Object> map) {\n@@ -194,6 +196,7 @@ public class CTProductConfigController {\n/**\n* Returns the last fetched timestamp in millis.\n+ *\n* @return - long value of timestamp in millis.\n*/\npublic long getLastFetchTimeStampInMillis() {\n@@ -202,6 +205,7 @@ public class CTProductConfigController {\n/**\n* Returns the parameter value for the given key as a String.\n+ *\n* @param Key - String\n* @return String - value of the product config,if key is not present return {@link CTProductConfigConstants#DEFAULT_VALUE_FOR_STRING}\n*/\n@@ -283,12 +287,23 @@ public class CTProductConfigController {\n}\nactivatedConfig.clear();\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n+ @Override\n+ public Void doInBackground(Void aVoid) {\ntry {\nFileUtils.deleteDirectory(context, config, getProductConfigDirName());\n} catch (Exception e) {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Product Config : reset failed: \" + e.getLocalizedMessage());\n}\n+ return null;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Void aVoid) {\n+\n+ }\n+ });\nsetMinimumFetchIntervalInSeconds(DEFAULT_MIN_FETCH_INTERVAL_SECONDS);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -250,6 +250,9 @@ class ProductConfigSettings {\n}\npublic void reset() {\n+ TaskManager.getInstance().execute(new TaskManager.TaskListener<Void, Void>() {\n+ @Override\n+ public Void doInBackground(Void aVoid) {\ntry {\nString fileName = getFullPath();\nFileUtils.deleteFile(context, config, fileName);\n@@ -258,6 +261,14 @@ class ProductConfigSettings {\ne.printStackTrace();\nconfig.getLogger().verbose(ProductConfigUtil.getLogTag(config), \"Error while resetting settings\" + e.getLocalizedMessage());\n}\n+ return null;\n+ }\n+\n+ @Override\n+ public void onPostExecute(Void aVoid) {\n+\n+ }\n+ });\ninitMapWithDefault();\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code review(product-config)(Product Config):
1. Offloaded the deletion logic on the background thread.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 05.05.2020 14:50:35 | -19,080 | cce5d85a095f142e0fa11df1fc59254fe7467266 | code review(product-config)(Product Config):
1. Added some boundary conditions. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/product_config/ProductConfigSettings.java",
"diff": "@@ -154,7 +154,7 @@ class ProductConfigSettings {\nsynchronized void setLastFetchTimeStampInMillis(long timeStampInMillis) {\nlong lastFetchTimeStampInMillis = getLastFetchTimeStampInMillis();\n- if (timeStampInMillis > 0 && lastFetchTimeStampInMillis != timeStampInMillis) {\n+ if (timeStampInMillis >= 0 && lastFetchTimeStampInMillis != timeStampInMillis) {\nsettingsMap.put(KEY_LAST_FETCHED_TIMESTAMP, String.valueOf(timeStampInMillis));\nupdateConfigToFile();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | code review(product-config)(Product Config):
1. Added some boundary conditions.
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,621 | 06.05.2020 15:17:20 | -19,080 | a588a29e9caeb448fbb5e63b05847029aa1ab2ff | feat(SDK):SDK Release v3.8.0 | [
{
"change_type": "MODIFY",
"old_path": "AndroidStarter/app/build.gradle",
"new_path": "AndroidStarter/app/build.gradle",
"diff": "@@ -31,7 +31,7 @@ dependencies {\nandroidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'\n//CleverTap Android SDK, make sure the AAR file is in the libs folder\n- implementation (name: 'clevertap-android-sdk-3.7.2', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.8.0', ext: 'aar')\nimplementation 'com.google.firebase:firebase-messaging:17.3.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' //Needed to use Google Ad Ids\n"
},
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG\n+### Version 3.8.0 (May 06, 2020)\n+* Adds support for Product Config and Feature Flag as a part of Product Experiences feature\n+* Fixed InApp center alignment issue for tablets\n+* Adds support for custom handling payload when using Push Amplification.\n+* Other bug fixes\n+\n### Version 3.7.2 (March 27, 2020)\n* Adds fix for a crash caused when InApp with Frequency Caps was shown on first App Launched\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -19,7 +19,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.8.0'\n}\n```\n@@ -27,7 +27,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation (name: 'clevertap-android-sdk-3.7.2', ext: 'aar')\n+ implementation (name: 'clevertap-android-sdk-3.8.0', ext: 'aar')\n}\n```\n@@ -35,7 +35,7 @@ For more information check out our [website](https://clevertap.com \"CleverTap\")\n```markdown\ndependencies {\n- implementation 'com.clevertap.android:clevertap-android-sdk:3.7.2'\n+ implementation 'com.clevertap.android:clevertap-android-sdk:3.8.0'\nimplementation 'com.android.support:support-v4:28.0.0'\nimplementation 'com.google.firebase:firebase-messaging:17.3.0'\nimplementation 'com.google.android.gms:play-services-ads:15.0.1' // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-android-sdk-3.7.2.aar",
"new_path": "clevertap-android-sdk-3.7.2.aar",
"diff": "Binary files a/clevertap-android-sdk-3.7.2.aar and /dev/null differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK):SDK Release v3.8.0 |
116,621 | 06.05.2020 16:15:45 | -19,080 | d43bac48ab9c8ac74346ea47275d886e915769a3 | pr-review(product-config)(Product Config):
1. pr review comments resolved(https://github.com/CleverTap/clevertap-android-sdk/pull/70) | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -3,11 +3,7 @@ package com.clevertap.android.sdk;\nimport android.content.Context;\nimport android.content.SharedPreferences;\n-import java.util.concurrent.ExecutorService;\n-\npublic final class StorageHelper {\n- private static long EXECUTOR_THREAD_ID = 0;\n- private static ExecutorService es;\nstatic void putString(Context context, String key, String value) {\nSharedPreferences prefs = getPreferences(context);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/Validator.java",
"diff": "@@ -336,7 +336,7 @@ final class Validator {\n// The event name is discarded\nerror.setErrorCode(513);\nerror.setErrorDesc(name + \" is a discarded event name. Last event aborted.\");\n- Logger.v(name + \" is a discarded event name. Last event aborted.\");\n+ Logger.d(name + \" s a discarded event name as per CleverTap. Dropping event at SDK level. Check discarded events in CleverTap Dashboard settings.\");\nreturn error;\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | pr-review(product-config)(Product Config):
1. pr review comments resolved(https://github.com/CleverTap/clevertap-android-sdk/pull/70)
https://wizrocket.atlassian.net/browse/CLEVER-8027 |
116,623 | 19.05.2020 00:27:46 | -19,080 | 18f375d4e250dd0510e1e75ae3daebf447b06060 | task: Add security optimisations | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -29,7 +29,7 @@ ext {\nsiteUrl = 'https://github.com/CleverTap/clevertap-android-sdk'\ngitUrl = 'https://github.com/CleverTap/clevertap-android-sdk.git'\n- libraryVersion = '3.8.0'\n+ libraryVersion = '3.8.1'\ndeveloperId = 'clevertap'\ndeveloperName = 'CleverTap'\n@@ -57,11 +57,11 @@ android {\nbuildTypes {\ndebug {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\n}\nrelease {\n- buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.0.0\"'\n+ buildConfigField \"String\", \"SDK_VERSION_STRING\", '\"!SDK-VERSION-STRING!:com.clevertap.android:clevertap-android-sdk:3.8.1.0\"'\nminifyEnabled false\nproguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n}\n@@ -153,8 +153,11 @@ dependencies {\ncompileOnly 'com.google.android.exoplayer:exoplayer-ui:2.8.4'\nimplementation 'com.android.support:appcompat-v7:28.0.0'\ncompileOnly 'com.android.support:design:28.0.0'\n- compileOnly 'com.github.bumptech.glide:glide:4.9.0'\n+ compileOnly 'com.github.bumptech.glide:glide:4.11.0'\nimplementation 'com.android.installreferrer:installreferrer:1.0'\n+ // Unit testing dependencies\n+ testImplementation 'junit:junit:4.12'\n+ testImplementation 'org.mockito:mockito-core:2.11.0'\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"new_path": "clevertap-android-sdk/src/main/AndroidManifest.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\npackage=\"com.clevertap.android.sdk\"\n- android:versionCode=\"30800\"\n- android:versionName=\"3.8.0\">\n+ android:versionCode=\"30801\"\n+ android:versionName=\"3.8.1\">\n<application>\n<activity\nandroid:name=\"com.clevertap.android.sdk.InAppNotificationActivity\"\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DBAdapter.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/DBAdapter.java",
"diff": "@@ -7,6 +7,7 @@ import android.database.Cursor;\nimport android.database.sqlite.SQLiteDatabase;\nimport android.database.sqlite.SQLiteException;\nimport android.database.sqlite.SQLiteOpenHelper;\n+import android.database.sqlite.SQLiteStatement;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -125,6 +126,16 @@ class DBAdapter {\n\"CREATE INDEX IF NOT EXISTS time_idx ON \" + Table.PUSH_NOTIFICATION_VIEWED.getName() +\n\" (\" + KEY_CREATED_AT + \");\";\n+ private static final String DROP_TABLE_UNINSTALL_TS =\n+ \"DROP TABLE IF EXISTS \" + Table.UNINSTALL_TS.getName();\n+\n+ private static final String DROP_TABLE_INBOX_MESSAGES =\n+ \"DROP TABLE IF EXISTS \" + Table.INBOX_MESSAGES.getName();\n+\n+ private static final String DROP_TABLE_PUSH_NOTIFICATION_VIEWED =\n+ \"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATION_VIEWED.getName();\n+\n+\nprivate final DatabaseHelper dbHelper;\nprivate CleverTapInstanceConfig config;\n@@ -146,47 +157,125 @@ class DBAdapter {\n@Override\npublic void onCreate(SQLiteDatabase db) {\nLogger.v(\"Creating CleverTap DB\");\n- db.execSQL(CREATE_EVENTS_TABLE);\n- db.execSQL(CREATE_PROFILE_EVENTS_TABLE);\n- db.execSQL(CREATE_USER_PROFILES_TABLE);\n- db.execSQL(CREATE_INBOX_MESSAGES_TABLE);\n- db.execSQL(CREATE_PUSH_NOTIFICATIONS_TABLE);\n- db.execSQL(CREATE_UNINSTALL_TS_TABLE);\n- db.execSQL(CREATE_NOTIFICATION_VIEWED_TABLE);\n- db.execSQL(EVENTS_TIME_INDEX);\n- db.execSQL(PROFILE_EVENTS_TIME_INDEX);\n- db.execSQL(UNINSTALL_TS_INDEX);\n- db.execSQL(PUSH_NOTIFICATIONS_TIME_INDEX);\n- db.execSQL(INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n- db.execSQL(NOTIFICATION_VIEWED_INDEX);\n+ SQLiteStatement sqLiteStatement;\n+ sqLiteStatement = db.compileStatement(CREATE_EVENTS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_EVENTS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_PROFILE_EVENTS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_PROFILE_EVENTS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_USER_PROFILES_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_USER_PROFILES_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_INBOX_MESSAGES_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_INBOX_MESSAGES_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_PUSH_NOTIFICATIONS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_PUSH_NOTIFICATIONS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_UNINSTALL_TS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_UNINSTALL_TS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_NOTIFICATION_VIEWED_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_NOTIFICATION_VIEWED_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(EVENTS_TIME_INDEX);\n+ Logger.v(\"Executing - \"+EVENTS_TIME_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(PROFILE_EVENTS_TIME_INDEX);\n+ Logger.v(\"Executing - \"+PROFILE_EVENTS_TIME_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(UNINSTALL_TS_INDEX);\n+ Logger.v(\"Executing - \"+UNINSTALL_TS_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(PUSH_NOTIFICATIONS_TIME_INDEX);\n+ Logger.v(\"Executing - \"+PUSH_NOTIFICATIONS_TIME_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n+ Logger.v(\"Executing - \"+INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(NOTIFICATION_VIEWED_INDEX);\n+ Logger.v(\"Executing - \"+NOTIFICATION_VIEWED_INDEX);\n+ sqLiteStatement.execute();\n}\n@SuppressLint(\"SQLiteString\")\n@Override\npublic void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\nLogger.v(\"Upgrading CleverTap DB to version \" + newVersion);\n+ SQLiteStatement sqLiteStatement;\nswitch (oldVersion){\ncase 1 :\n// For DB Version 2, just adding Push Notifications, Uninstall TS and Inbox Messages tables and related indices\n- db.execSQL(\"DROP TABLE IF EXISTS \" + Table.UNINSTALL_TS.getName());\n- db.execSQL(\"DROP TABLE IF EXISTS \" + Table.INBOX_MESSAGES.getName());\n- db.execSQL(\"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATION_VIEWED.getName());\n-\n- db.execSQL(CREATE_PUSH_NOTIFICATIONS_TABLE);\n- db.execSQL(CREATE_UNINSTALL_TS_TABLE);\n- db.execSQL(CREATE_INBOX_MESSAGES_TABLE);\n- db.execSQL(CREATE_NOTIFICATION_VIEWED_TABLE);\n-\n- db.execSQL(UNINSTALL_TS_INDEX);\n- db.execSQL(PUSH_NOTIFICATIONS_TIME_INDEX);\n- db.execSQL(INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n- db.execSQL(NOTIFICATION_VIEWED_INDEX);\n+ sqLiteStatement = db.compileStatement(DROP_TABLE_UNINSTALL_TS);\n+ Logger.v(\"Executing - \"+DROP_TABLE_UNINSTALL_TS);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(DROP_TABLE_INBOX_MESSAGES);\n+ Logger.v(\"Executing - \"+DROP_TABLE_INBOX_MESSAGES);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(DROP_TABLE_PUSH_NOTIFICATION_VIEWED);\n+ Logger.v(\"Executing - \"+DROP_TABLE_PUSH_NOTIFICATION_VIEWED);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_INBOX_MESSAGES_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_INBOX_MESSAGES_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_PUSH_NOTIFICATIONS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_PUSH_NOTIFICATIONS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_UNINSTALL_TS_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_UNINSTALL_TS_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_NOTIFICATION_VIEWED_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_NOTIFICATION_VIEWED_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(UNINSTALL_TS_INDEX);\n+ Logger.v(\"Executing - \"+UNINSTALL_TS_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(PUSH_NOTIFICATIONS_TIME_INDEX);\n+ Logger.v(\"Executing - \"+PUSH_NOTIFICATIONS_TIME_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n+ Logger.v(\"Executing - \"+INBOX_MESSAGES_COMP_ID_USERID_INDEX);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(NOTIFICATION_VIEWED_INDEX);\n+ Logger.v(\"Executing - \"+NOTIFICATION_VIEWED_INDEX);\n+ sqLiteStatement.execute();\nbreak;\ncase 2 :\n// For DB Version 3, just adding Push Notification Viewed table and index\n- db.execSQL(\"DROP TABLE IF EXISTS \" + Table.PUSH_NOTIFICATION_VIEWED.getName());\n- db.execSQL(CREATE_NOTIFICATION_VIEWED_TABLE);\n- db.execSQL(NOTIFICATION_VIEWED_INDEX);\n+ sqLiteStatement = db.compileStatement(DROP_TABLE_PUSH_NOTIFICATION_VIEWED);\n+ Logger.v(\"Executing - \"+DROP_TABLE_PUSH_NOTIFICATION_VIEWED);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(CREATE_NOTIFICATION_VIEWED_TABLE);\n+ Logger.v(\"Executing - \"+CREATE_NOTIFICATION_VIEWED_TABLE);\n+ sqLiteStatement.execute();\n+\n+ sqLiteStatement = db.compileStatement(NOTIFICATION_VIEWED_INDEX);\n+ Logger.v(\"Executing - \"+NOTIFICATION_VIEWED_INDEX);\n+ sqLiteStatement.execute();\nbreak;\n}\n}\n@@ -238,8 +327,7 @@ class DBAdapter {\nfinal String tableName = table.getName();\n- Cursor cursor = null;\n- int count = DB_UPDATE_ERROR;\n+ long count = DB_UPDATE_ERROR;\ntry {\nfinal SQLiteDatabase db = dbHelper.getWritableDatabase();\n@@ -248,24 +336,17 @@ class DBAdapter {\ncv.put(KEY_DATA, obj.toString());\ncv.put(KEY_CREATED_AT, System.currentTimeMillis());\ndb.insert(tableName, null, cv);\n- cursor = db.rawQuery(\"SELECT COUNT(*) FROM \" + tableName, null);\n- cursor.moveToFirst();\n- count = cursor.getInt(0);\n+\n+ String sql = \"SELECT COUNT(*) FROM \" + tableName;\n+ SQLiteStatement statement = db.compileStatement(sql);\n+ count = statement.simpleQueryForLong();\n} catch (final SQLiteException e) {\ngetConfigLogger().verbose(\"Error adding data to table \" + tableName + \" Recreating DB\");\n-\n- if (cursor != null) {\n- cursor.close();\n- cursor = null;\n- }\ndbHelper.deleteDatabase();\n} finally {\n- if (cursor != null) {\n- cursor.close();\n- }\ndbHelper.close();\n}\n- return count;\n+ return (int) count;\n}\n/**\n@@ -331,7 +412,8 @@ class DBAdapter {\ntry {\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.rawQuery(\"SELECT * FROM \" + tName + \" WHERE _id = ?\", new String[]{id});\n+ cursor = db.query(tName,null,\"_id =?\",new String[]{id},null,null,null);\n+ //cursor = db.rawQuery(\"SELECT * FROM \" + tName + \" WHERE _id = ?\", new String[]{id});\nif (cursor != null && cursor.moveToFirst()) {\ntry {\n@@ -441,8 +523,9 @@ class DBAdapter {\ntry {\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n- \" ORDER BY \" + KEY_CREATED_AT + \" ASC LIMIT \" + limit, null);\n+ cursor = db.query(tName,null,null,null,null,null,KEY_CREATED_AT + \" ASC\",String.valueOf(limit));\n+ //cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n+ // \" ORDER BY \" + KEY_CREATED_AT + \" ASC LIMIT \" + limit, null);\nwhile (cursor.moveToNext()) {\n@@ -517,8 +600,9 @@ class DBAdapter {\ntry{\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n- \" WHERE \" + KEY_DATA + \" = ?\" , new String[]{id});\n+ cursor = db.query(tName,null,KEY_DATA + \" =?\",new String[]{id},null,null,null);\n+ //cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n+ // \" WHERE \" + KEY_DATA + \" = ?\" , new String[]{id});\nif(cursor!=null && cursor.moveToFirst()){\npushId = cursor.getString(cursor.getColumnIndex(KEY_DATA));\n}\n@@ -543,7 +627,8 @@ class DBAdapter {\ntry{\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.rawQuery(\"SELECT * FROM \" + tName + \" WHERE \" + IS_READ + \" = 0\", null);\n+ //cursor = db.rawQuery(\"SELECT * FROM \" + tName + \" WHERE \" + IS_READ + \" = 0\", null);\n+ cursor = db.query(tName,null,IS_READ + \" =?\",new String[]{\"0\"},null,null,null);\nif(cursor!=null){\nwhile(cursor.moveToNext()) {\nLogger.v(\"Fetching PID - \" + cursor.getString(cursor.getColumnIndex(KEY_DATA)));\n@@ -633,8 +718,9 @@ class DBAdapter {\ntry {\nfinal SQLiteDatabase db = dbHelper.getReadableDatabase();\n- cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n- \" ORDER BY \" + KEY_CREATED_AT + \" DESC LIMIT 1\",null);\n+ cursor = db.query(tName,null,null,null,null,null,KEY_CREATED_AT + \" DESC\",\"1\");\n+ //cursor = db.rawQuery(\"SELECT * FROM \" + tName +\n+ // \" ORDER BY \" + KEY_CREATED_AT + \" DESC LIMIT 1\",null);\nif(cursor!=null && cursor.moveToFirst()){\ntimestamp = cursor.getLong(cursor.getColumnIndex(KEY_CREATED_AT));\n}\n@@ -741,7 +827,8 @@ class DBAdapter {\nArrayList<CTMessageDAO> messageDAOArrayList = new ArrayList<>();\ntry{\nfinal SQLiteDatabase db = dbHelper.getWritableDatabase();\n- cursor= db.rawQuery(\"SELECT * FROM \"+tName+\" WHERE \" + USER_ID + \" = ? ORDER BY \" + KEY_CREATED_AT+ \" DESC\", new String[]{userId});\n+ //cursor= db.rawQuery(\"SELECT * FROM \"+tName+\" WHERE \" + USER_ID + \" = ? ORDER BY \" + KEY_CREATED_AT+ \" DESC\", new String[]{userId});\n+ cursor = db.query(tName,null,USER_ID + \" =?\",new String[]{userId},null,null,KEY_CREATED_AT+ \" DESC\");\nif(cursor != null) {\nwhile(cursor.moveToNext()){\nCTMessageDAO ctMessageDAO = new CTMessageDAO();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/java_websocket/drafts/Draft_6455.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/java_websocket/drafts/Draft_6455.java",
"diff": "@@ -40,6 +40,7 @@ import java.math.BigInteger;\nimport java.nio.ByteBuffer;\nimport java.security.MessageDigest;\nimport java.security.NoSuchAlgorithmException;\n+import java.security.SecureRandom;\nimport java.text.SimpleDateFormat;\nimport java.util.*;\n@@ -117,7 +118,7 @@ public class Draft_6455 extends Draft {\n/**\n* Attribute for the reusable random instance\n*/\n- private final Random reuseableRandom = new Random();\n+ private final SecureRandom reuseableRandom = new SecureRandom();\n/**\n* Attribute for the maximum allowed size of a frame\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task: Add security optimisations SDK-146 SDK-147 |
116,623 | 02.06.2020 12:44:10 | -19,080 | 7fb65ea5f152d6cdaf7f6cd2c7e1fc111839be3d | adding roboelectric dependency for tests | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -158,6 +158,7 @@ dependencies {\n// Unit testing dependencies\ntestImplementation 'junit:junit:4.12'\ntestImplementation 'org.mockito:mockito-core:2.11.0'\n+ testImplementation 'org.robolectric:robolectric:3.0'\n}\ntask sourcesJar(type: Jar) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | adding roboelectric dependency for tests SDK-176 |
116,623 | 15.06.2020 11:47:00 | -19,080 | b1abee5942bea08a9dc998d0e2a21b808ebb6277 | task(PN): add callbacks on Notification Clicked giving custom KVs | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTPushNotificationListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import java.util.HashMap;\n+\n+/**\n+ * Interface definition for a callback to be invoked whenever push notification payload is received.\n+ */\n+public interface CTPushNotificationListener {\n+\n+ /**\n+ * Receives a callback whenever push notification payload is received.\n+ */\n+ void onNotificationClickedPayloadReceived(HashMap<String,Object> payload);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -102,7 +102,11 @@ import static com.clevertap.android.sdk.Utils.runOnUiThread;\npublic class CleverTapAPI implements CTInAppNotification.CTInAppNotificationListener,\nInAppNotificationActivity.InAppActivityListener,\nCTInAppBaseFragment.InAppListener,\n- CTInboxActivity.InboxActivityListener, CTABTestListener, FeatureFlagListener, CTProductConfigControllerListener, CTProductConfigListener {\n+ CTInboxActivity.InboxActivityListener,\n+ CTABTestListener,\n+ FeatureFlagListener,\n+ CTProductConfigControllerListener,\n+ CTProductConfigListener {\nprivate final HashMap<String, Object> notificationIdTagMap = new HashMap<>();\nprivate final HashMap<String, Object> notificationViewedIdTagMap = new HashMap<>();\n@@ -229,6 +233,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate Location locationFromUser = null;\nprivate SyncListener syncListener = null;\nprivate CTPushListener pushListener = null;\n+ private CTPushNotificationListener pushNotificationListener = null;\nprivate ArrayList<PushType> enabledPushTypes = null;\nprivate long appLastSeen = 0;\nprivate int currentSessionId = 0;\n@@ -317,6 +322,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nprivate CTFeatureFlagsController ctFeatureFlagsController;\nprivate WeakReference<CTFeatureFlagsListener> featureFlagsListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n+ //private Bundle pushPayload = null;\n// static lifecycle callbacks\nstatic void onActivityCreated(Activity activity, String cleverTapID) {\n@@ -5395,6 +5401,11 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n} catch (Throwable t) {\n// We won't get here\n}\n+ if(getCTPushNotificationListener() != null){\n+ getCTPushNotificationListener().onNotificationClickedPayloadReceived(Utils.convertBundleObjectToHashMap(extras));\n+ }else{\n+ Logger.d(\"CTPushNotificationListener is not set\");\n+ }\n}\n/**\n@@ -7448,6 +7459,26 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nthis.pushListener = pushListener;\n}\n+ /**\n+ * Returns the CTPushNotificationListener object\n+ *\n+ * @return The {@link CTPushNotificationListener} object\n+ */\n+ @SuppressWarnings(\"WeakerAccess\")\n+ public CTPushNotificationListener getCTPushNotificationListener() {\n+ return pushNotificationListener;\n+ }\n+\n+ /**\n+ * This method is used to set the CTPushNotificationListener\n+ *\n+ * @param pushNotificationListener - The{@link CTPushNotificationListener} object\n+ */\n+ @SuppressWarnings(\"unused\")\n+ public void setCTPushNotificationListener(CTPushNotificationListener pushNotificationListener) {\n+ this.pushNotificationListener = pushNotificationListener;\n+ }\n+\n/**\n* Registers an ABTesting variable of type {@link Boolean} for ease of editing on the CleverTap Dashboard\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(PN): add callbacks on Notification Clicked giving custom KVs SDK-156 |
116,621 | 15.06.2020 18:46:20 | -19,080 | 5f5693f50b2c6e673710650e81825e4a62043fe7 | Unit Test(FeatureFlag):
Added unit test case for FeatureFlag. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -80,7 +80,11 @@ android {\n}\n}\n}\n- testOptions.unitTests.includeAndroidResources = true\n+ testOptions{\n+ unitTests{\n+ includeAndroidResources = true\n+ }\n+ }\n}\nProperties properties = new Properties()\n@@ -167,6 +171,8 @@ dependencies {\n// AndroidJUnitRunner and JUnit Rules\nandroidTestImplementation 'androidx.test:runner:1.2.0'\nandroidTestImplementation 'androidx.test:rules:1.2.0'\n+\n+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/BaseTestCase.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/BaseTestCase.java",
"diff": "-/* Copyright Airship and Contributors */\n-\npackage com.clevertap.android.sdk;\nimport android.os.Bundle;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.java",
"diff": "package com.clevertap.android.sdk;\n-import org.junit.Assert;\n+import android.app.Activity;\n+import android.os.Bundle;\n+\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.robolectric.RobolectricTestRunner;\n-//@RunWith(MockitoJUnitRunner.class)\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.verify;\n+\n@RunWith(RobolectricTestRunner.class)\npublic class CleverTapAPITest extends BaseTestCase {\n@@ -17,11 +21,16 @@ public class CleverTapAPITest extends BaseTestCase {\n@Before\npublic void setUp() throws Exception {\napplication = TestApplication.getApplication();\n- cleverTapAPI = CleverTapAPI.getDefaultInstance(application);\n+ cleverTapAPI = mock(CleverTapAPI.class);\n}\n@Test\n- public void test() {\n- Assert.assertEquals(1, 1);\n+ public void testActivity() {\n+ Activity activity = mock(Activity.class);\n+ Bundle bundle = new Bundle();\n+ //create\n+ activity.onCreate(bundle, null);\n+ verify(cleverTapAPI).onActivityCreated(activity, null);\n}\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/Constant.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+public interface Constant {\n+ String ACC_ID = \"ZWW-WWW-WWRZ\";\n+ String ACC_TOKEN = \"000-001\";\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/FeatureFlagTest.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n+\n+import org.junit.Assert;\n+import org.junit.Before;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.robolectric.RobolectricTestRunner;\n+\n+import static com.clevertap.android.sdk.Constant.ACC_ID;\n+import static com.clevertap.android.sdk.Constant.ACC_TOKEN;\n+import static org.mockito.Mockito.mock;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+\n+@RunWith(RobolectricTestRunner.class)\n+public class FeatureFlagTest extends BaseTestCase {\n+ private static final String TAG = \"FeatureFlagTest\";\n+ private CleverTapAPI cleverTapAPI;\n+\n+ private TestApplication application;\n+ private CleverTapInstanceConfig cleverTapInstanceConfig;\n+\n+ @Before\n+ public void setUp() throws Exception {\n+ application = TestApplication.getApplication();\n+ cleverTapAPI = mock(CleverTapAPI.class);\n+ cleverTapInstanceConfig = CleverTapInstanceConfig.createInstance(application, ACC_ID, ACC_TOKEN);\n+ }\n+\n+ @Test\n+ public void testFetch() {\n+ when(cleverTapAPI.featureFlag()).thenReturn(new CTFeatureFlagsController(application, \"12121\", cleverTapInstanceConfig, cleverTapAPI));\n+ cleverTapAPI.featureFlag().fetchFeatureFlags();\n+ verify(cleverTapAPI).fetchFeatureFlags();\n+ }\n+\n+ @Test\n+ public void testGet() {\n+ CTFeatureFlagsController ctFeatureFlagsController = mock(CTFeatureFlagsController.class);\n+ when(cleverTapAPI.featureFlag()).thenReturn(ctFeatureFlagsController);\n+ when(ctFeatureFlagsController.get(\"isFeatureA\", true)).thenReturn(false);\n+ Assert.assertFalse(cleverTapAPI.featureFlag().get(\"isFeatureA\", true));\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/TestApplication.java",
"new_path": "clevertap-android-sdk/src/test/java/com/clevertap/android/sdk/TestApplication.java",
"diff": "@@ -3,19 +3,15 @@ package com.clevertap.android.sdk;\nimport androidx.test.core.app.ApplicationProvider;\npublic class TestApplication extends Application {\n- public ActivityLifecycleCallbacks callback;\n@Override\npublic void onCreate() {\n+ CleverTapAPI.setUIEditorConnectionEnabled(true);\n+ CleverTapAPI.setDebugLevel(3);\n+ ActivityLifecycleCallback.register(this);\nsuper.onCreate();\n}\n- @Override\n- public void registerActivityLifecycleCallbacks(ActivityLifecycleCallbacks callback) {\n- super.registerActivityLifecycleCallbacks(callback);\n- this.callback = callback;\n- }\n-\npublic static TestApplication getApplication() {\nreturn (TestApplication) ApplicationProvider.getApplicationContext();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Unit Test(FeatureFlag): https://wizrocket.atlassian.net/browse/SDK-165
Added unit test case for FeatureFlag. |
116,621 | 23.06.2020 12:20:40 | -19,080 | c2afc20a30172acdc0e375ee48102370e1925981 | feat(AndroidX):Migration to Android X | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -51,7 +51,7 @@ android {\ncompileSdkVersion 29\nbuildToolsVersion '29.0.3'\ndefaultConfig {\n- minSdkVersion 14\n+ minSdkVersion 16\ntargetSdkVersion 29\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -5397,6 +5397,29 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\n}\n}\n+ public static void pushNewToken(Context context, String fcmId){\n+ if (instances == null) {\n+ CleverTapAPI.createInstanceIfAvailable(context.getApplicationContext(), null);\n+ }\n+\n+ if (instances == null) {\n+ Logger.v(\"Instances is null in pushNewToken!\");\n+ return;\n+ }\n+\n+ for (String accountId : CleverTapAPI.instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ try {\n+ if (instance != null) {\n+ Logger.v(\"Pushing token from onNewToken\");\n+ instance.pushFcmRegistrationId(fcmId,true);\n+ }\n+ } catch (Throwable t) {\n+ Logger.v(\"Throwable - \" + t.getLocalizedMessage());\n+ }\n+ }\n+ }\n+\n/**\n* Sends the FCM registration ID to CleverTap.\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FcmMessageListenerService.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/FcmMessageListenerService.java",
"diff": "@@ -32,9 +32,9 @@ public class FcmMessageListenerService extends FirebaseMessagingService {\n}\n@Override\n- public void onNewToken(@NonNull String s) {\n- super.onNewToken(s);\n- Logger.d(\"FcmMessageListenerService: onNewToken\");\n- CleverTapAPI.tokenRefresh(this);\n+ public void onNewToken(@NonNull String token) {\n+ super.onNewToken(token);\n+ Logger.d(\"New token received from FCM - \"+token);\n+ CleverTapAPI.pushNewToken(getApplicationContext(),token);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(AndroidX):Migration to Android X
https://wizrocket.atlassian.net/browse/SDK-84 |
116,621 | 23.06.2020 13:20:56 | -19,080 | c59f9460010a1fefd7f4b6aab872c6d3c2982228 | feat(AndroidX):update Exoplayer | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -28,7 +28,6 @@ import androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\nimport androidx.core.content.ContextCompat;\n-import com.google.android.exoplayer2.ExoPlayerFactory;\nimport com.google.android.exoplayer2.Player;\nimport com.google.android.exoplayer2.SimpleExoPlayer;\nimport com.google.android.exoplayer2.source.hls.HlsMediaSource;\n@@ -46,6 +45,8 @@ import com.google.android.exoplayer2.util.Util;\nimport java.util.ArrayList;\n+import static com.google.android.exoplayer2.ui.PlayerView.SHOW_BUFFERING_WHEN_PLAYING;\n+\npublic class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFragment {\nprivate GifImageView gifImageView;\n@@ -403,24 +404,24 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nlayoutParams.setMargins(0,iconTop,iconRight,0);\nfullScreenIcon.setLayoutParams(layoutParams);\n}\n- playerView.setShowBuffering(true);\n+ playerView.setShowBuffering(SHOW_BUFFERING_WHEN_PLAYING);\nplayerView.setUseArtwork(true);\nplayerView.setControllerAutoShow(false);\nvideoFrameLayout.addView(playerView);\nvideoFrameLayout.addView(fullScreenIcon);\nDrawable artwork = getActivity().getBaseContext().getResources().getDrawable(R.drawable.ct_audio);\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {\n- playerView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n+ playerView.setDefaultArtwork(artwork);\n}else{\n- playerView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n+ playerView.setDefaultArtwork(artwork);\n}\n// 1. Create a default TrackSelector\n- BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();\n- TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwidthMeter);\n- TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);\n+ BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter.Builder(getActivity().getBaseContext()).build();\n+ TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory();\n+ TrackSelector trackSelector = new DefaultTrackSelector(getActivity().getBaseContext(),videoTrackSelectionFactory);\n// 2. Create the player\n- player = ExoPlayerFactory.newSimpleInstance(getActivity().getBaseContext(), trackSelector);\n+ player = new SimpleExoPlayer.Builder(getActivity().getBaseContext()).setTrackSelector(trackSelector).build();\n// 3. Produces DataSource instances through which media data is loaded.\nDataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getActivity().getBaseContext(),\nUtil.getUserAgent(getActivity().getBaseContext(), getActivity().getApplication().getPackageName()), (TransferListener) bandwidthMeter);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxBaseMessageViewHolder.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxBaseMessageViewHolder.java",
"diff": "@@ -32,6 +32,8 @@ import java.lang.ref.WeakReference;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\n+import static com.google.android.exoplayer2.ui.PlayerView.SHOW_BUFFERING_NEVER;\n+\nclass CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n@SuppressWarnings({\"unused\"})\nRelativeLayout relativeLayout,clickLayout;\n@@ -229,8 +231,8 @@ class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\n}\nvideoSurfaceView.requestFocus();\n- videoSurfaceView.setShowBuffering(false);\n- DefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter();\n+ videoSurfaceView.setShowBuffering(SHOW_BUFFERING_NEVER);\n+ DefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();\nDataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,\nUtil.getUserAgent(context, context.getPackageName()), defaultBandwidthMeter);\nString uriString = firstContentItem.getMedia();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -254,7 +254,7 @@ public class CleverTapAPI implements CTInAppNotification.CTInAppNotificationList\nboolean exoPlayerPresent = false;\nClass className = null;\ntry {\n- className = Class.forName(\"com.google.android.exoplayer2.ExoPlayerFactory\");\n+ className = Class.forName(\"com.google.android.exoplayer2.SimpleExoPlayer\");\nclassName = Class.forName(\"com.google.android.exoplayer2.source.hls.HlsMediaSource\");\nclassName = Class.forName(\"com.google.android.exoplayer2.ui.PlayerView\");\nLogger.d(\"ExoPlayer is present\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/MediaPlayerRecyclerView.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/MediaPlayerRecyclerView.java",
"diff": "@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;\nimport androidx.recyclerview.widget.RecyclerView;\nimport com.google.android.exoplayer2.ExoPlaybackException;\n-import com.google.android.exoplayer2.ExoPlayerFactory;\nimport com.google.android.exoplayer2.PlaybackParameters;\nimport com.google.android.exoplayer2.Player;\nimport com.google.android.exoplayer2.SimpleExoPlayer;\n@@ -28,8 +27,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;\nimport com.google.android.exoplayer2.trackselection.TrackSelector;\nimport com.google.android.exoplayer2.ui.AspectRatioFrameLayout;\nimport com.google.android.exoplayer2.ui.PlayerView;\n-import com.google.android.exoplayer2.upstream.BandwidthMeter;\n-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\npublic class MediaPlayerRecyclerView extends RecyclerView {\n@@ -86,15 +83,14 @@ public class MediaPlayerRecyclerView extends RecyclerView {\n}\nvideoSurfaceView.setUseArtwork(true);\nDrawable artwork = context.getResources().getDrawable(R.drawable.ct_audio);\n- videoSurfaceView.setDefaultArtwork(Utils.drawableToBitmap(artwork));\n+ videoSurfaceView.setDefaultArtwork(artwork);\n- BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();\nTrackSelection.Factory videoTrackSelectionFactory =\n- new AdaptiveTrackSelection.Factory(bandwidthMeter);\n+ new AdaptiveTrackSelection.Factory();\nTrackSelector trackSelector =\n- new DefaultTrackSelector(videoTrackSelectionFactory);\n+ new DefaultTrackSelector(appContext,videoTrackSelectionFactory);\n- player = ExoPlayerFactory.newSimpleInstance(appContext, trackSelector);\n+ player = new SimpleExoPlayer.Builder(context).setTrackSelector(trackSelector).build();\nplayer.setVolume(0f); // start off muted\nvideoSurfaceView.setUseController(true);\nvideoSurfaceView.setControllerAutoShow(false);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(AndroidX):update Exoplayer
https://wizrocket.atlassian.net/browse/SDK-252 |
116,623 | 23.06.2020 17:36:52 | -19,080 | 58c569fb3a50e5c8d32637db26223eabbc867233 | Fixing tabs in Androidx | [
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/build.gradle",
"new_path": "clevertap-android-sdk/build.gradle",
"diff": "@@ -146,24 +146,19 @@ install {\n}\ndependencies {\ncompileOnly 'com.google.firebase:firebase-messaging:20.2.1'\n-\n- //for notification\n- compileOnly 'androidx.core:core:1.1.0'\n-\n- compileOnly 'androidx.viewpager:viewpager:1.0.0'\n-\ncompileOnly 'com.google.android.exoplayer:exoplayer:2.11.5'\ncompileOnly 'com.google.android.exoplayer:exoplayer-hls:2.11.5'\ncompileOnly 'com.google.android.exoplayer:exoplayer-ui:2.11.5'\n-\n+ compileOnly 'com.github.bumptech.glide:glide:4.11.0'\n+ //for notification\n+ compileOnly 'androidx.core:core:1.1.0'\n+ compileOnly 'androidx.viewpager:viewpager:1.0.0'\nimplementation 'androidx.appcompat:appcompat:1.1.0'\nimplementation 'androidx.recyclerview:recyclerview:1.1.0'\ncompileOnly 'com.google.android.material:material:1.1.0'\ncompileOnly 'androidx.appcompat:appcompat:1.1.0'\ncompileOnly 'androidx.fragment:fragment:1.1.0'\n-\n- compileOnly 'com.github.bumptech.glide:glide:4.11.0'\n- implementation 'com.android.installreferrer:installreferrer:1.0'\n+ implementation 'com.android.installreferrer:installreferrer:1.1.2'\n}\ntask sourcesJar(type: Jar) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"new_path": "clevertap-android-sdk/src/main/java/com/clevertap/android/sdk/CTInboxStyleConfig.java",
"diff": "@@ -17,34 +17,6 @@ public class CTInboxStyleConfig implements Parcelable {\nprivate final static int MAX_TABS = 2;\n- /**\n- * CleverTap Android SDK targets to Android 28 (Pie), hence the support libraries\n- * support-appcompat, support-v4 and support-design also point to version 28.0.0.\n- * In this version of support-design, TabLayout.OnTabSelectedListener extends TabLayout.BaseOnTabSelectedListener.\n- * While in previous versions of the support-design library (27.1.1 and below),\n- * TabLayout.OnTabSelectedListener was a standalone interface. So if your app is targeting to\n- * Android 26 or Android 27, the support-design library is missing a crucial interface needed to show\n- * Tabs on the App Inbox. To ensure that this doesn't cause your app to crash, this method checks for\n- * TabLayout.BaseOnTabSelectedListener before setting Tabs as a part of your App Inbox.\n- */\n- private static boolean platformSupportsTabs;\n- static {\n- try {\n- TabLayout.OnTabSelectedListener test = new TabLayout.OnTabSelectedListener() {\n- @Override\n- public void onTabSelected(TabLayout.Tab tab) {}\n- @Override\n- public void onTabUnselected(TabLayout.Tab tab) {}\n- @Override\n- public void onTabReselected(TabLayout.Tab tab) {}\n- };\n- // noinspection ConstantConditions\n- platformSupportsTabs = test instanceof TabLayout.BaseOnTabSelectedListener;\n- } catch (Throwable t){\n- // no-op\n- }\n- }\n-\nprivate String navBarColor;\nprivate String navBarTitle;\nprivate String navBarTitleColor;\n@@ -185,7 +157,6 @@ public class CTInboxStyleConfig implements Parcelable {\npublic void setTabs(ArrayList<String>tabs) {\nif (tabs == null || tabs.size() <= 0) return;\n- if (platformSupportsTabs) {\nArrayList<String> toAdd;\nif (tabs.size() > MAX_TABS) {\ntoAdd = new ArrayList<>(tabs.subList(0, MAX_TABS));\n@@ -193,9 +164,6 @@ public class CTInboxStyleConfig implements Parcelable {\ntoAdd = tabs;\n}\nthis.tabs = toAdd.toArray(new String[0]);\n- } else {\n- Logger.d(\"Please upgrade com.android.support:design library to v28.0.0 to enable Tabs for App Inbox, dropping Tabs\");\n- }\n}\npublic ArrayList<String> getTabs() {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | Fixing tabs in Androidx SDK-249 SDK-250 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.